diff --git a/.mps/modules.xml b/.mps/modules.xml
index 9f174f32..72580987 100644
--- a/.mps/modules.xml
+++ b/.mps/modules.xml
@@ -6,6 +6,10 @@
       <modulePath path="$PROJECT_DIR$/coderules/languages/jetbrains.mps.lang.coderules/runtime/jetbrains.mps.lang.coderules.runtime.msd" folder="coderules" />
       <modulePath path="$PROJECT_DIR$/coderules/solutions/jetbrains.mps.coderules/jetbrains.mps.coderules.msd" folder="coderules" />
       <modulePath path="$PROJECT_DIR$/coderules/solutions/jetbrains.mps.lang.coderules.template/jetbrains.mps.lang.coderules.template.msd" folder="coderules" />
+      <modulePath path="$PROJECT_DIR$/controlflow/languages/jetbrains.mps.lang.controlflow/jetbrains.mps.lang.controlflow.mpl" folder="controlflow" />
+      <modulePath path="$PROJECT_DIR$/controlflow/solutions/jetbrains.mps.controlflow.ui/jetbrains.mps.controlflow.ui.msd" folder="controlflow" />
+      <modulePath path="$PROJECT_DIR$/controlflow/solutions/jetbrains.mps.controlflow/jetbrains.mps.controlflow.msd" folder="controlflow" />
+      <modulePath path="$PROJECT_DIR$/controlflow/solutions/jetbrains.mps.lang.controlflow.runtime/jetbrains.mps.lang.controlflow.runtime.msd" folder="controlflow" />
       <modulePath path="$PROJECT_DIR$/logic/languages/jetbrains.mps.dataform/jetbrains.mps.dataform.mpl" folder="logic" />
       <modulePath path="$PROJECT_DIR$/logic/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl" folder="logic" />
       <modulePath path="$PROJECT_DIR$/logic/languages/jetbrains.mps.logic/runtime/jetbrains.mps.logic.runtime.msd" folder="logic" />
diff --git a/build.xml b/build.xml
index cb5d47ac..cd8e6599 100644
--- a/build.xml
+++ b/build.xml
@@ -810,6 +810,270 @@
       <zipfileset file="${basedir}/typechecking/solutions/jetbrains.mps.typechecking.test/jetbrains.mps.typechecking.test.msd" prefix="module" />
       <zipfileset dir="${build.tmp}/customProcessors/copyModels/typechecking-solutions-jetbrains.mps.typechecking.test-models" prefix="module/models" />
     </jar>
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.lang.smodel.types.jar" />
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.lang.smodel.types.jar/META-INF" />
+    <echoxml file="${build.tmp}/default/jetbrains.mps.lang.smodel.types.jar/META-INF/module.xml">
+      <module namespace="jetbrains.mps.lang.smodel.types" type="language" uuid="cba985fe-1e96-4f16-9f8d-b07434405d4f">
+        <dependencies>
+          <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" />
+          <module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" />
+          <module ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)" />
+          <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" />
+          <module ref="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" />
+          <module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" />
+          <module ref="a3e4657f-a76c-45bb-bbda-c764596ecc65(jetbrains.mps.baseLanguage.logging.runtime)" />
+          <module ref="d44dab97-aaac-44cb-9745-8a14db674c03(jetbrains.mps.baseLanguage.tuples.runtime)" />
+          <module ref="2af156ab-65c1-4a62-bd0d-ea734f71eab6(jetbrains.mps.dataFlow.runtime)" />
+          <module ref="34e84b8f-afa8-4364-abcd-a279fddddbe7(jetbrains.mps.editor.runtime)" />
+          <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" />
+          <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" />
+          <module ref="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" />
+          <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
+        </dependencies>
+        <classpath>
+          <entry path="." />
+        </classpath>
+        <sources jar="jetbrains.mps.lang.smodel.types-src.jar" descriptor="jetbrains.mps.lang.smodel.types.mpl" />
+      </module>
+    </echoxml>
+    <jar destfile="${build.layout}/tests/jetbrains.mps.lang.smodel.types.jar" duplicate="preserve">
+      <fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.smodel.types" />
+      <fileset dir="${basedir}/typechecking/languages/jetbrains.mps.lang.smodel.types" includes="icons/**, resources/**" />
+      <fileset dir="${mps.macro.logic_home}/typechecking/languages/jetbrains.mps.lang.smodel.types/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
+      <fileset dir="${build.tmp}/default/jetbrains.mps.lang.smodel.types.jar" />
+    </jar>
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.lang.smodel.types-generator.jar" />
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.lang.smodel.types-generator.jar/META-INF" />
+    <echoxml file="${build.tmp}/default/jetbrains.mps.lang.smodel.types-generator.jar/META-INF/module.xml">
+      <module namespace="jetbrains.mps.lang.smodel.types#7345257067587611144" type="generator" uuid="ceb57370-a04c-41e9-91e3-f36110b5e4aa">
+        <dependencies>
+          <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" />
+          <module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" />
+          <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" />
+          <module ref="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" />
+          <module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" />
+          <module ref="a3e4657f-a76c-45bb-bbda-c764596ecc65(jetbrains.mps.baseLanguage.logging.runtime)" />
+          <module ref="d44dab97-aaac-44cb-9745-8a14db674c03(jetbrains.mps.baseLanguage.tuples.runtime)" />
+          <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" />
+          <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" />
+          <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
+        </dependencies>
+        <classpath>
+          <entry path="." />
+        </classpath>
+        <sources jar="jetbrains.mps.lang.smodel.types-src.jar" descriptor="jetbrains.mps.lang.smodel.types.mpl" />
+      </module>
+    </echoxml>
+    <jar destfile="${build.layout}/tests/jetbrains.mps.lang.smodel.types-generator.jar" duplicate="preserve">
+      <fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.smodel.types#7345257067587611144" />
+      <fileset dir="${build.tmp}/default/jetbrains.mps.lang.smodel.types-generator.jar" />
+    </jar>
+    <copyModels todir="${build.tmp}/customProcessors/copyModels/typechecking-languages-jetbrains.mps.lang.smodel.types-generator-template">
+      <fileset dir="${mps.macro.logic_home}/typechecking/languages/jetbrains.mps.lang.smodel.types/generator/template" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
+    </copyModels>
+    <copyModels todir="${build.tmp}/customProcessors/copyModels/typechecking-languages-jetbrains.mps.lang.smodel.types-models">
+      <fileset dir="${mps.macro.logic_home}/typechecking/languages/jetbrains.mps.lang.smodel.types/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
+    </copyModels>
+    <jar destfile="${build.layout}/tests/jetbrains.mps.lang.smodel.types-src.jar" duplicate="preserve">
+      <fileset dir="${mps.macro.logic_home}/typechecking/languages/jetbrains.mps.lang.smodel.types/generator/source_gen">
+        <exclude name="**/trace.info" />
+        <exclude name="**/exports" />
+        <exclude name="**/checkpoints" />
+        <exclude name="**/*.mps" />
+      </fileset>
+      <fileset dir="${mps.macro.logic_home}/typechecking/languages/jetbrains.mps.lang.smodel.types/source_gen">
+        <exclude name="**/trace.info" />
+        <exclude name="**/exports" />
+        <exclude name="**/checkpoints" />
+        <exclude name="**/*.mps" />
+      </fileset>
+      <zipfileset file="${basedir}/typechecking/languages/jetbrains.mps.lang.smodel.types/jetbrains.mps.lang.smodel.types.mpl" prefix="module" />
+      <zipfileset dir="${build.tmp}/customProcessors/copyModels/typechecking-languages-jetbrains.mps.lang.smodel.types-generator-template" prefix="module/generator/template" />
+      <zipfileset dir="${build.tmp}/customProcessors/copyModels/typechecking-languages-jetbrains.mps.lang.smodel.types-models" prefix="module/models" />
+    </jar>
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.controlflow.jar" />
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.controlflow.jar/META-INF" />
+    <echoxml file="${build.tmp}/default/jetbrains.mps.controlflow.jar/META-INF/module.xml">
+      <module namespace="jetbrains.mps.controlflow" type="solution" uuid="517911e5-605f-4310-831b-10d44e0f5237">
+        <dependencies />
+        <classpath>
+          <entry path="." />
+        </classpath>
+        <sources jar="jetbrains.mps.controlflow-src.jar" descriptor="jetbrains.mps.controlflow.msd" />
+      </module>
+    </echoxml>
+    <jar destfile="${build.layout}/tests/jetbrains.mps.controlflow.jar" duplicate="preserve">
+      <fileset dir="${build.tmp}/java/out/jetbrains.mps.controlflow" />
+      <fileset dir="${mps.macro.logic_home}/controlflow/solutions/jetbrains.mps.controlflow/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
+      <fileset dir="${build.tmp}/default/jetbrains.mps.controlflow.jar" />
+    </jar>
+    <copyModels todir="${build.tmp}/customProcessors/copyModels/controlflow-solutions-jetbrains.mps.controlflow-models">
+      <fileset dir="${mps.macro.logic_home}/controlflow/solutions/jetbrains.mps.controlflow/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
+    </copyModels>
+    <jar destfile="${build.layout}/tests/jetbrains.mps.controlflow-src.jar" duplicate="preserve">
+      <fileset dir="${mps.macro.logic_home}/controlflow/solutions/jetbrains.mps.controlflow/source_gen">
+        <exclude name="**/trace.info" />
+        <exclude name="**/exports" />
+        <exclude name="**/checkpoints" />
+        <exclude name="**/*.mps" />
+      </fileset>
+      <zipfileset file="${basedir}/controlflow/solutions/jetbrains.mps.controlflow/jetbrains.mps.controlflow.msd" prefix="module" />
+      <zipfileset dir="${build.tmp}/customProcessors/copyModels/controlflow-solutions-jetbrains.mps.controlflow-models" prefix="module/models" />
+    </jar>
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.controlflow.ui.jar" />
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.controlflow.ui.jar/META-INF" />
+    <echoxml file="${build.tmp}/default/jetbrains.mps.controlflow.ui.jar/META-INF/module.xml">
+      <module namespace="jetbrains.mps.controlflow.ui" type="solution" uuid="eacb1d2f-fed3-4344-a1dd-143fac2e9c20">
+        <dependencies>
+          <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" />
+          <module ref="86441d7a-e194-42da-81a5-2161ec62a379(MPS.Workbench)" />
+          <module ref="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" />
+          <module ref="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" />
+          <module ref="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" />
+        </dependencies>
+        <classpath>
+          <entry path="." />
+        </classpath>
+        <sources jar="jetbrains.mps.controlflow.ui-src.jar" descriptor="jetbrains.mps.controlflow.ui.msd" />
+      </module>
+    </echoxml>
+    <jar destfile="${build.layout}/tests/jetbrains.mps.controlflow.ui.jar" duplicate="preserve">
+      <fileset dir="${build.tmp}/java/out/jetbrains.mps.controlflow.ui" />
+      <fileset dir="${mps.macro.logic_home}/controlflow/solutions/jetbrains.mps.controlflow.ui/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
+      <fileset dir="${build.tmp}/default/jetbrains.mps.controlflow.ui.jar" />
+    </jar>
+    <copyModels todir="${build.tmp}/customProcessors/copyModels/controlflow-solutions-jetbrains.mps.controlflow.ui-models">
+      <fileset dir="${mps.macro.logic_home}/controlflow/solutions/jetbrains.mps.controlflow.ui/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
+    </copyModels>
+    <jar destfile="${build.layout}/tests/jetbrains.mps.controlflow.ui-src.jar" duplicate="preserve">
+      <fileset dir="${mps.macro.logic_home}/controlflow/solutions/jetbrains.mps.controlflow.ui/source_gen">
+        <exclude name="**/trace.info" />
+        <exclude name="**/exports" />
+        <exclude name="**/checkpoints" />
+        <exclude name="**/*.mps" />
+      </fileset>
+      <zipfileset file="${basedir}/controlflow/solutions/jetbrains.mps.controlflow.ui/jetbrains.mps.controlflow.ui.msd" prefix="module" />
+      <zipfileset dir="${build.tmp}/customProcessors/copyModels/controlflow-solutions-jetbrains.mps.controlflow.ui-models" prefix="module/models" />
+    </jar>
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.lang.controlflow.jar" />
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.lang.controlflow.jar/META-INF" />
+    <echoxml file="${build.tmp}/default/jetbrains.mps.lang.controlflow.jar/META-INF/module.xml">
+      <module namespace="jetbrains.mps.lang.controlflow" type="language" uuid="2e120f68-abfb-4980-bb1c-bc70159b1f95">
+        <dependencies>
+          <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" />
+          <module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" />
+          <module ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)" />
+          <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" />
+          <module ref="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" />
+          <module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" />
+          <module ref="a3e4657f-a76c-45bb-bbda-c764596ecc65(jetbrains.mps.baseLanguage.logging.runtime)" />
+          <module ref="d44dab97-aaac-44cb-9745-8a14db674c03(jetbrains.mps.baseLanguage.tuples.runtime)" />
+          <module ref="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" />
+          <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" />
+          <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" />
+          <module ref="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" />
+          <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
+        </dependencies>
+        <classpath>
+          <entry path="." />
+        </classpath>
+        <sources jar="jetbrains.mps.lang.controlflow-src.jar" descriptor="jetbrains.mps.lang.controlflow.mpl" />
+      </module>
+    </echoxml>
+    <jar destfile="${build.layout}/tests/jetbrains.mps.lang.controlflow.jar" duplicate="preserve">
+      <fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.controlflow" />
+      <fileset dir="${mps.macro.logic_home}/controlflow/languages/jetbrains.mps.lang.controlflow/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
+      <fileset dir="${build.tmp}/default/jetbrains.mps.lang.controlflow.jar" />
+    </jar>
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.lang.controlflow-generator.jar" />
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.lang.controlflow-generator.jar/META-INF" />
+    <echoxml file="${build.tmp}/default/jetbrains.mps.lang.controlflow-generator.jar/META-INF/module.xml">
+      <module namespace="jetbrains.mps.lang.controlflow#01" type="generator" uuid="67306c43-4604-4dad-9b74-7e808a66bee5">
+        <dependencies>
+          <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" />
+          <module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" />
+          <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" />
+          <module ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" />
+          <module ref="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" />
+          <module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" />
+          <module ref="a3e4657f-a76c-45bb-bbda-c764596ecc65(jetbrains.mps.baseLanguage.logging.runtime)" />
+          <module ref="d44dab97-aaac-44cb-9745-8a14db674c03(jetbrains.mps.baseLanguage.tuples.runtime)" />
+          <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" />
+          <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" />
+          <module ref="31f56055-9d30-42b3-a2b1-fb3f554d7075(jetbrains.mps.lang.smodel.query.runtime)" />
+          <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
+        </dependencies>
+        <classpath>
+          <entry path="." />
+        </classpath>
+        <sources jar="jetbrains.mps.lang.controlflow-src.jar" descriptor="jetbrains.mps.lang.controlflow.mpl" />
+      </module>
+    </echoxml>
+    <jar destfile="${build.layout}/tests/jetbrains.mps.lang.controlflow-generator.jar" duplicate="preserve">
+      <fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.controlflow#01" />
+      <fileset dir="${build.tmp}/default/jetbrains.mps.lang.controlflow-generator.jar" />
+    </jar>
+    <copyModels todir="${build.tmp}/customProcessors/copyModels/controlflow-languages-jetbrains.mps.lang.controlflow-generator-template">
+      <fileset dir="${mps.macro.logic_home}/controlflow/languages/jetbrains.mps.lang.controlflow/generator/template" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
+    </copyModels>
+    <copyModels todir="${build.tmp}/customProcessors/copyModels/controlflow-languages-jetbrains.mps.lang.controlflow-models">
+      <fileset dir="${mps.macro.logic_home}/controlflow/languages/jetbrains.mps.lang.controlflow/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
+    </copyModels>
+    <jar destfile="${build.layout}/tests/jetbrains.mps.lang.controlflow-src.jar" duplicate="preserve">
+      <fileset dir="${mps.macro.logic_home}/controlflow/languages/jetbrains.mps.lang.controlflow/generator/source_gen">
+        <exclude name="**/trace.info" />
+        <exclude name="**/exports" />
+        <exclude name="**/checkpoints" />
+        <exclude name="**/*.mps" />
+      </fileset>
+      <fileset dir="${mps.macro.logic_home}/controlflow/languages/jetbrains.mps.lang.controlflow/source_gen">
+        <exclude name="**/trace.info" />
+        <exclude name="**/exports" />
+        <exclude name="**/checkpoints" />
+        <exclude name="**/*.mps" />
+      </fileset>
+      <zipfileset file="${basedir}/controlflow/languages/jetbrains.mps.lang.controlflow/jetbrains.mps.lang.controlflow.mpl" prefix="module" />
+      <zipfileset dir="${build.tmp}/customProcessors/copyModels/controlflow-languages-jetbrains.mps.lang.controlflow-generator-template" prefix="module/generator/template" />
+      <zipfileset dir="${build.tmp}/customProcessors/copyModels/controlflow-languages-jetbrains.mps.lang.controlflow-models" prefix="module/models" />
+    </jar>
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.lang.controlflow.runtime.jar" />
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.lang.controlflow.runtime.jar/META-INF" />
+    <echoxml file="${build.tmp}/default/jetbrains.mps.lang.controlflow.runtime.jar/META-INF/module.xml">
+      <module namespace="jetbrains.mps.lang.controlflow.runtime" type="solution" uuid="ffcd9ef5-e931-4da9-a8d1-eb9bf80d19b4">
+        <dependencies>
+          <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" />
+          <module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" />
+          <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" />
+          <module ref="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" />
+          <module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" />
+          <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" />
+          <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" />
+          <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
+        </dependencies>
+        <classpath>
+          <entry path="." />
+        </classpath>
+        <sources jar="jetbrains.mps.lang.controlflow.runtime-src.jar" descriptor="jetbrains.mps.lang.controlflow.runtime.msd" />
+      </module>
+    </echoxml>
+    <jar destfile="${build.layout}/tests/jetbrains.mps.lang.controlflow.runtime.jar" duplicate="preserve">
+      <fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.controlflow.runtime" />
+      <fileset dir="${mps.macro.logic_home}/controlflow/solutions/jetbrains.mps.lang.controlflow.runtime/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
+      <fileset dir="${build.tmp}/default/jetbrains.mps.lang.controlflow.runtime.jar" />
+    </jar>
+    <copyModels todir="${build.tmp}/customProcessors/copyModels/controlflow-solutions-jetbrains.mps.lang.controlflow.runtime-models">
+      <fileset dir="${mps.macro.logic_home}/controlflow/solutions/jetbrains.mps.lang.controlflow.runtime/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
+    </copyModels>
+    <jar destfile="${build.layout}/tests/jetbrains.mps.lang.controlflow.runtime-src.jar" duplicate="preserve">
+      <fileset dir="${mps.macro.logic_home}/controlflow/solutions/jetbrains.mps.lang.controlflow.runtime/source_gen">
+        <exclude name="**/trace.info" />
+        <exclude name="**/exports" />
+        <exclude name="**/checkpoints" />
+        <exclude name="**/*.mps" />
+      </fileset>
+      <zipfileset file="${basedir}/controlflow/solutions/jetbrains.mps.lang.controlflow.runtime/jetbrains.mps.lang.controlflow.runtime.msd" prefix="module" />
+      <zipfileset dir="${build.tmp}/customProcessors/copyModels/controlflow-solutions-jetbrains.mps.lang.controlflow.runtime-models" prefix="module/models" />
+    </jar>
     <mkdir dir="${build.tmp}/default/jetbrains.mps.baseLanguageExt.jar" />
     <mkdir dir="${build.tmp}/default/jetbrains.mps.baseLanguageExt.jar/META-INF" />
     <echoxml file="${build.tmp}/default/jetbrains.mps.baseLanguageExt.jar/META-INF/module.xml">
@@ -1020,87 +1284,6 @@
       <zipfileset file="${basedir}/typechecking/languages/jetbrains.mps.typechecking.annotation/jetbrains.mps.typechecking.annotation.mpl" prefix="module" />
       <zipfileset dir="${build.tmp}/customProcessors/copyModels/typechecking-languages-jetbrains.mps.typechecking.annotation-languageModels" prefix="module/languageModels" />
     </jar>
-    <mkdir dir="${build.tmp}/default/jetbrains.mps.lang.smodel.types.jar" />
-    <mkdir dir="${build.tmp}/default/jetbrains.mps.lang.smodel.types.jar/META-INF" />
-    <echoxml file="${build.tmp}/default/jetbrains.mps.lang.smodel.types.jar/META-INF/module.xml">
-      <module namespace="jetbrains.mps.lang.smodel.types" type="language" uuid="cba985fe-1e96-4f16-9f8d-b07434405d4f">
-        <dependencies>
-          <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" />
-          <module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" />
-          <module ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)" />
-          <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" />
-          <module ref="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" />
-          <module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" />
-          <module ref="a3e4657f-a76c-45bb-bbda-c764596ecc65(jetbrains.mps.baseLanguage.logging.runtime)" />
-          <module ref="d44dab97-aaac-44cb-9745-8a14db674c03(jetbrains.mps.baseLanguage.tuples.runtime)" />
-          <module ref="2af156ab-65c1-4a62-bd0d-ea734f71eab6(jetbrains.mps.dataFlow.runtime)" />
-          <module ref="34e84b8f-afa8-4364-abcd-a279fddddbe7(jetbrains.mps.editor.runtime)" />
-          <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" />
-          <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" />
-          <module ref="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" />
-          <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
-        </dependencies>
-        <classpath>
-          <entry path="." />
-        </classpath>
-        <sources jar="jetbrains.mps.lang.smodel.types-src.jar" descriptor="jetbrains.mps.lang.smodel.types.mpl" />
-      </module>
-    </echoxml>
-    <jar destfile="${build.layout}/tests/jetbrains.mps.lang.smodel.types.jar" duplicate="preserve">
-      <fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.smodel.types" />
-      <fileset dir="${basedir}/typechecking/languages/jetbrains.mps.lang.smodel.types" includes="icons/**, resources/**" />
-      <fileset dir="${mps.macro.logic_home}/typechecking/languages/jetbrains.mps.lang.smodel.types/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
-      <fileset dir="${build.tmp}/default/jetbrains.mps.lang.smodel.types.jar" />
-    </jar>
-    <mkdir dir="${build.tmp}/default/jetbrains.mps.lang.smodel.types-generator.jar" />
-    <mkdir dir="${build.tmp}/default/jetbrains.mps.lang.smodel.types-generator.jar/META-INF" />
-    <echoxml file="${build.tmp}/default/jetbrains.mps.lang.smodel.types-generator.jar/META-INF/module.xml">
-      <module namespace="jetbrains.mps.lang.smodel.types#7345257067587611144" type="generator" uuid="ceb57370-a04c-41e9-91e3-f36110b5e4aa">
-        <dependencies>
-          <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" />
-          <module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" />
-          <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" />
-          <module ref="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" />
-          <module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" />
-          <module ref="a3e4657f-a76c-45bb-bbda-c764596ecc65(jetbrains.mps.baseLanguage.logging.runtime)" />
-          <module ref="d44dab97-aaac-44cb-9745-8a14db674c03(jetbrains.mps.baseLanguage.tuples.runtime)" />
-          <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" />
-          <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" />
-          <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
-        </dependencies>
-        <classpath>
-          <entry path="." />
-        </classpath>
-        <sources jar="jetbrains.mps.lang.smodel.types-src.jar" descriptor="jetbrains.mps.lang.smodel.types.mpl" />
-      </module>
-    </echoxml>
-    <jar destfile="${build.layout}/tests/jetbrains.mps.lang.smodel.types-generator.jar" duplicate="preserve">
-      <fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.smodel.types#7345257067587611144" />
-      <fileset dir="${build.tmp}/default/jetbrains.mps.lang.smodel.types-generator.jar" />
-    </jar>
-    <copyModels todir="${build.tmp}/customProcessors/copyModels/typechecking-languages-jetbrains.mps.lang.smodel.types-generator-template">
-      <fileset dir="${mps.macro.logic_home}/typechecking/languages/jetbrains.mps.lang.smodel.types/generator/template" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
-    </copyModels>
-    <copyModels todir="${build.tmp}/customProcessors/copyModels/typechecking-languages-jetbrains.mps.lang.smodel.types-models">
-      <fileset dir="${mps.macro.logic_home}/typechecking/languages/jetbrains.mps.lang.smodel.types/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
-    </copyModels>
-    <jar destfile="${build.layout}/tests/jetbrains.mps.lang.smodel.types-src.jar" duplicate="preserve">
-      <fileset dir="${mps.macro.logic_home}/typechecking/languages/jetbrains.mps.lang.smodel.types/generator/source_gen">
-        <exclude name="**/trace.info" />
-        <exclude name="**/exports" />
-        <exclude name="**/checkpoints" />
-        <exclude name="**/*.mps" />
-      </fileset>
-      <fileset dir="${mps.macro.logic_home}/typechecking/languages/jetbrains.mps.lang.smodel.types/source_gen">
-        <exclude name="**/trace.info" />
-        <exclude name="**/exports" />
-        <exclude name="**/checkpoints" />
-        <exclude name="**/*.mps" />
-      </fileset>
-      <zipfileset file="${basedir}/typechecking/languages/jetbrains.mps.lang.smodel.types/jetbrains.mps.lang.smodel.types.mpl" prefix="module" />
-      <zipfileset dir="${build.tmp}/customProcessors/copyModels/typechecking-languages-jetbrains.mps.lang.smodel.types-generator-template" prefix="module/generator/template" />
-      <zipfileset dir="${build.tmp}/customProcessors/copyModels/typechecking-languages-jetbrains.mps.lang.smodel.types-models" prefix="module/models" />
-    </jar>
     <mkdir dir="${build.layout}/tests/lib" />
     <copy todir="${build.layout}/tests/lib">
       <fileset dir="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.test/lib" />
@@ -2020,6 +2203,189 @@
       <zipfileset dir="${build.tmp}/customProcessors/copyModels/typechecking-languages-jetbrains.mps.lang.smodel.types-generator-template1" prefix="module/generator/template" />
       <zipfileset dir="${build.tmp}/customProcessors/copyModels/typechecking-languages-jetbrains.mps.lang.smodel.types-models1" prefix="module/models" />
     </jar>
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.controlflow.jar1" />
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.controlflow.jar1/META-INF" />
+    <echoxml file="${build.tmp}/default/jetbrains.mps.controlflow.jar1/META-INF/module.xml">
+      <module namespace="jetbrains.mps.controlflow" type="solution" uuid="517911e5-605f-4310-831b-10d44e0f5237">
+        <dependencies />
+        <classpath>
+          <entry path="." />
+        </classpath>
+        <sources jar="jetbrains.mps.controlflow-src.jar" descriptor="jetbrains.mps.controlflow.msd" />
+      </module>
+    </echoxml>
+    <jar destfile="${build.tmp}/default/typechecking-0.5.zip/typechecking/languages/jetbrains.mps.controlflow.jar" duplicate="preserve">
+      <fileset dir="${build.tmp}/java/out/jetbrains.mps.controlflow" />
+      <fileset dir="${mps.macro.logic_home}/controlflow/solutions/jetbrains.mps.controlflow/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
+      <fileset dir="${build.tmp}/default/jetbrains.mps.controlflow.jar1" />
+    </jar>
+    <copyModels todir="${build.tmp}/customProcessors/copyModels/controlflow-solutions-jetbrains.mps.controlflow-models1">
+      <fileset dir="${mps.macro.logic_home}/controlflow/solutions/jetbrains.mps.controlflow/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
+    </copyModels>
+    <jar destfile="${build.tmp}/default/typechecking-0.5.zip/typechecking/languages/jetbrains.mps.controlflow-src.jar" duplicate="preserve">
+      <fileset dir="${mps.macro.logic_home}/controlflow/solutions/jetbrains.mps.controlflow/source_gen">
+        <exclude name="**/trace.info" />
+        <exclude name="**/exports" />
+        <exclude name="**/checkpoints" />
+        <exclude name="**/*.mps" />
+      </fileset>
+      <zipfileset file="${basedir}/controlflow/solutions/jetbrains.mps.controlflow/jetbrains.mps.controlflow.msd" prefix="module" />
+      <zipfileset dir="${build.tmp}/customProcessors/copyModels/controlflow-solutions-jetbrains.mps.controlflow-models1" prefix="module/models" />
+    </jar>
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.controlflow.ui.jar1" />
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.controlflow.ui.jar1/META-INF" />
+    <echoxml file="${build.tmp}/default/jetbrains.mps.controlflow.ui.jar1/META-INF/module.xml">
+      <module namespace="jetbrains.mps.controlflow.ui" type="solution" uuid="eacb1d2f-fed3-4344-a1dd-143fac2e9c20">
+        <dependencies>
+          <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" />
+          <module ref="86441d7a-e194-42da-81a5-2161ec62a379(MPS.Workbench)" />
+          <module ref="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" />
+          <module ref="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" />
+          <module ref="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" />
+        </dependencies>
+        <classpath>
+          <entry path="." />
+        </classpath>
+        <sources jar="jetbrains.mps.controlflow.ui-src.jar" descriptor="jetbrains.mps.controlflow.ui.msd" />
+      </module>
+    </echoxml>
+    <jar destfile="${build.tmp}/default/typechecking-0.5.zip/typechecking/languages/jetbrains.mps.controlflow.ui.jar" duplicate="preserve">
+      <fileset dir="${build.tmp}/java/out/jetbrains.mps.controlflow.ui" />
+      <fileset dir="${mps.macro.logic_home}/controlflow/solutions/jetbrains.mps.controlflow.ui/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
+      <fileset dir="${build.tmp}/default/jetbrains.mps.controlflow.ui.jar1" />
+    </jar>
+    <copyModels todir="${build.tmp}/customProcessors/copyModels/controlflow-solutions-jetbrains.mps.controlflow.ui-models1">
+      <fileset dir="${mps.macro.logic_home}/controlflow/solutions/jetbrains.mps.controlflow.ui/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
+    </copyModels>
+    <jar destfile="${build.tmp}/default/typechecking-0.5.zip/typechecking/languages/jetbrains.mps.controlflow.ui-src.jar" duplicate="preserve">
+      <fileset dir="${mps.macro.logic_home}/controlflow/solutions/jetbrains.mps.controlflow.ui/source_gen">
+        <exclude name="**/trace.info" />
+        <exclude name="**/exports" />
+        <exclude name="**/checkpoints" />
+        <exclude name="**/*.mps" />
+      </fileset>
+      <zipfileset file="${basedir}/controlflow/solutions/jetbrains.mps.controlflow.ui/jetbrains.mps.controlflow.ui.msd" prefix="module" />
+      <zipfileset dir="${build.tmp}/customProcessors/copyModels/controlflow-solutions-jetbrains.mps.controlflow.ui-models1" prefix="module/models" />
+    </jar>
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.lang.controlflow.jar1" />
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.lang.controlflow.jar1/META-INF" />
+    <echoxml file="${build.tmp}/default/jetbrains.mps.lang.controlflow.jar1/META-INF/module.xml">
+      <module namespace="jetbrains.mps.lang.controlflow" type="language" uuid="2e120f68-abfb-4980-bb1c-bc70159b1f95">
+        <dependencies>
+          <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" />
+          <module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" />
+          <module ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)" />
+          <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" />
+          <module ref="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" />
+          <module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" />
+          <module ref="a3e4657f-a76c-45bb-bbda-c764596ecc65(jetbrains.mps.baseLanguage.logging.runtime)" />
+          <module ref="d44dab97-aaac-44cb-9745-8a14db674c03(jetbrains.mps.baseLanguage.tuples.runtime)" />
+          <module ref="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" />
+          <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" />
+          <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" />
+          <module ref="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" />
+          <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
+        </dependencies>
+        <classpath>
+          <entry path="." />
+        </classpath>
+        <sources jar="jetbrains.mps.lang.controlflow-src.jar" descriptor="jetbrains.mps.lang.controlflow.mpl" />
+      </module>
+    </echoxml>
+    <jar destfile="${build.tmp}/default/typechecking-0.5.zip/typechecking/languages/jetbrains.mps.lang.controlflow.jar" duplicate="preserve">
+      <fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.controlflow" />
+      <fileset dir="${mps.macro.logic_home}/controlflow/languages/jetbrains.mps.lang.controlflow/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
+      <fileset dir="${build.tmp}/default/jetbrains.mps.lang.controlflow.jar1" />
+    </jar>
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.lang.controlflow-generator.jar1" />
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.lang.controlflow-generator.jar1/META-INF" />
+    <echoxml file="${build.tmp}/default/jetbrains.mps.lang.controlflow-generator.jar1/META-INF/module.xml">
+      <module namespace="jetbrains.mps.lang.controlflow#01" type="generator" uuid="67306c43-4604-4dad-9b74-7e808a66bee5">
+        <dependencies>
+          <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" />
+          <module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" />
+          <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" />
+          <module ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" />
+          <module ref="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" />
+          <module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" />
+          <module ref="a3e4657f-a76c-45bb-bbda-c764596ecc65(jetbrains.mps.baseLanguage.logging.runtime)" />
+          <module ref="d44dab97-aaac-44cb-9745-8a14db674c03(jetbrains.mps.baseLanguage.tuples.runtime)" />
+          <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" />
+          <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" />
+          <module ref="31f56055-9d30-42b3-a2b1-fb3f554d7075(jetbrains.mps.lang.smodel.query.runtime)" />
+          <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
+        </dependencies>
+        <classpath>
+          <entry path="." />
+        </classpath>
+        <sources jar="jetbrains.mps.lang.controlflow-src.jar" descriptor="jetbrains.mps.lang.controlflow.mpl" />
+      </module>
+    </echoxml>
+    <jar destfile="${build.tmp}/default/typechecking-0.5.zip/typechecking/languages/jetbrains.mps.lang.controlflow-generator.jar" duplicate="preserve">
+      <fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.controlflow#01" />
+      <fileset dir="${build.tmp}/default/jetbrains.mps.lang.controlflow-generator.jar1" />
+    </jar>
+    <copyModels todir="${build.tmp}/customProcessors/copyModels/controlflow-languages-jetbrains.mps.lang.controlflow-generator-template1">
+      <fileset dir="${mps.macro.logic_home}/controlflow/languages/jetbrains.mps.lang.controlflow/generator/template" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
+    </copyModels>
+    <copyModels todir="${build.tmp}/customProcessors/copyModels/controlflow-languages-jetbrains.mps.lang.controlflow-models1">
+      <fileset dir="${mps.macro.logic_home}/controlflow/languages/jetbrains.mps.lang.controlflow/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
+    </copyModels>
+    <jar destfile="${build.tmp}/default/typechecking-0.5.zip/typechecking/languages/jetbrains.mps.lang.controlflow-src.jar" duplicate="preserve">
+      <fileset dir="${mps.macro.logic_home}/controlflow/languages/jetbrains.mps.lang.controlflow/generator/source_gen">
+        <exclude name="**/trace.info" />
+        <exclude name="**/exports" />
+        <exclude name="**/checkpoints" />
+        <exclude name="**/*.mps" />
+      </fileset>
+      <fileset dir="${mps.macro.logic_home}/controlflow/languages/jetbrains.mps.lang.controlflow/source_gen">
+        <exclude name="**/trace.info" />
+        <exclude name="**/exports" />
+        <exclude name="**/checkpoints" />
+        <exclude name="**/*.mps" />
+      </fileset>
+      <zipfileset file="${basedir}/controlflow/languages/jetbrains.mps.lang.controlflow/jetbrains.mps.lang.controlflow.mpl" prefix="module" />
+      <zipfileset dir="${build.tmp}/customProcessors/copyModels/controlflow-languages-jetbrains.mps.lang.controlflow-generator-template1" prefix="module/generator/template" />
+      <zipfileset dir="${build.tmp}/customProcessors/copyModels/controlflow-languages-jetbrains.mps.lang.controlflow-models1" prefix="module/models" />
+    </jar>
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.lang.controlflow.runtime.jar1" />
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.lang.controlflow.runtime.jar1/META-INF" />
+    <echoxml file="${build.tmp}/default/jetbrains.mps.lang.controlflow.runtime.jar1/META-INF/module.xml">
+      <module namespace="jetbrains.mps.lang.controlflow.runtime" type="solution" uuid="ffcd9ef5-e931-4da9-a8d1-eb9bf80d19b4">
+        <dependencies>
+          <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" />
+          <module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" />
+          <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" />
+          <module ref="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" />
+          <module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" />
+          <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" />
+          <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" />
+          <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
+        </dependencies>
+        <classpath>
+          <entry path="." />
+        </classpath>
+        <sources jar="jetbrains.mps.lang.controlflow.runtime-src.jar" descriptor="jetbrains.mps.lang.controlflow.runtime.msd" />
+      </module>
+    </echoxml>
+    <jar destfile="${build.tmp}/default/typechecking-0.5.zip/typechecking/languages/jetbrains.mps.lang.controlflow.runtime.jar" duplicate="preserve">
+      <fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.controlflow.runtime" />
+      <fileset dir="${mps.macro.logic_home}/controlflow/solutions/jetbrains.mps.lang.controlflow.runtime/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
+      <fileset dir="${build.tmp}/default/jetbrains.mps.lang.controlflow.runtime.jar1" />
+    </jar>
+    <copyModels todir="${build.tmp}/customProcessors/copyModels/controlflow-solutions-jetbrains.mps.lang.controlflow.runtime-models1">
+      <fileset dir="${mps.macro.logic_home}/controlflow/solutions/jetbrains.mps.lang.controlflow.runtime/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
+    </copyModels>
+    <jar destfile="${build.tmp}/default/typechecking-0.5.zip/typechecking/languages/jetbrains.mps.lang.controlflow.runtime-src.jar" duplicate="preserve">
+      <fileset dir="${mps.macro.logic_home}/controlflow/solutions/jetbrains.mps.lang.controlflow.runtime/source_gen">
+        <exclude name="**/trace.info" />
+        <exclude name="**/exports" />
+        <exclude name="**/checkpoints" />
+        <exclude name="**/*.mps" />
+      </fileset>
+      <zipfileset file="${basedir}/controlflow/solutions/jetbrains.mps.lang.controlflow.runtime/jetbrains.mps.lang.controlflow.runtime.msd" prefix="module" />
+      <zipfileset dir="${build.tmp}/customProcessors/copyModels/controlflow-solutions-jetbrains.mps.lang.controlflow.runtime-models1" prefix="module/models" />
+    </jar>
     <zip destfile="${build.layout}/typechecking-0.5.zip">
       <zipfileset dir="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib" prefix="typechecking/lib" />
       <zipfileset dir="${basedir}/coderules/solutions/jetbrains.mps.coderules/lib" prefix="typechecking/lib" />
@@ -2039,7 +2405,7 @@
     <delete dir="${build.layout}" />
   </target>
   
-  <target name="compileJava" depends="java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic#6626732309150416985, java.compile.jetbrains.mps.dataform, java.compile.jetbrains.mps.dataform#01, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.logic.test, java.compile.jetbrains.mps.coderules, java.compile.jetbrains.mps.lang.coderules, java.compile.jetbrains.mps.lang.coderules#4578927328670739933, java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.typechecking, java.compile.jetbrains.mps.typechecking.reporting, java.compile.jetbrains.mps.lang.typechecking, java.compile.jetbrains.mps.lang.typechecking#01, java.compile.jetbrains.mps.lang.typechecking.runtime, java.compile.jetbrains.mps.lang.smodel.types, java.compile.jetbrains.mps.lang.smodel.types#7345257067587611144, java.compile.jetbrains.mps.typechecking.ui, java.compile.jetbrains.mps.typechecking.annotation, java.compile.jetbrains.mps.baseLanguageExt, java.compile.jetbrains.mps.typechecking.sample, java.compile.jetbrains.mps.typechecking.test, java.compile.jetbrains.mps.baseLanguageExt.test, java.compile.jetbrains.mps.typechecking.sample.test" />
+  <target name="compileJava" depends="java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic#6626732309150416985, java.compile.jetbrains.mps.dataform, java.compile.jetbrains.mps.dataform#01, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.logic.test, java.compile.jetbrains.mps.coderules, java.compile.jetbrains.mps.lang.coderules, java.compile.jetbrains.mps.lang.coderules#4578927328670739933, java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.typechecking, java.compile.jetbrains.mps.typechecking.reporting, java.compile.jetbrains.mps.lang.typechecking, java.compile.jetbrains.mps.lang.typechecking#01, java.compile.jetbrains.mps.lang.typechecking.runtime, java.compile.jetbrains.mps.lang.smodel.types, java.compile.jetbrains.mps.lang.smodel.types#7345257067587611144, java.compile.jetbrains.mps.typechecking.ui, java.compile.jetbrains.mps.typechecking.annotation, java.compile.jetbrains.mps.baseLanguageExt, java.compile.jetbrains.mps.typechecking.sample, java.compile.jetbrains.mps.controlflow, java.compile.jetbrains.mps.controlflow.ui, java.compile.jetbrains.mps.lang.controlflow, java.compile.jetbrains.mps.lang.controlflow#01, java.compile.jetbrains.mps.lang.controlflow.runtime, java.compile.jetbrains.mps.typechecking.test, java.compile.jetbrains.mps.baseLanguageExt.test, java.compile.jetbrains.mps.typechecking.sample.test" />
   
   <target name="processResources" />
   
@@ -2142,6 +2508,8 @@
       <library file="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.runtime.jar" />
       <library file="${artifacts.mps}/plugins/mps-testing/lib/jetbrains.mps.lang.test.util.jar" />
       <chunk>
+        <module file="${basedir}/controlflow/solutions/jetbrains.mps.controlflow/jetbrains.mps.controlflow.msd" />
+        <module file="${basedir}/controlflow/solutions/jetbrains.mps.controlflow.ui/jetbrains.mps.controlflow.ui.msd" />
         <module file="${basedir}/typechecking/languages/jetbrains.mps.lang.smodel.types/jetbrains.mps.lang.smodel.types.mpl" />
         <module file="${basedir}/logic/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl" />
         <module file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/jetbrains.mps.logic.reactor.msd" />
@@ -2155,6 +2523,8 @@
         <module file="${basedir}/coderules/languages/jetbrains.mps.lang.coderules/jetbrains.mps.lang.coderules.mpl" />
         <module file="${basedir}/coderules/languages/jetbrains.mps.lang.coderules/runtime/jetbrains.mps.lang.coderules.runtime.msd" />
         <module file="${basedir}/coderules/solutions/jetbrains.mps.lang.coderules.template/jetbrains.mps.lang.coderules.template.msd" />
+        <module file="${basedir}/controlflow/languages/jetbrains.mps.lang.controlflow/jetbrains.mps.lang.controlflow.mpl" />
+        <module file="${basedir}/controlflow/solutions/jetbrains.mps.lang.controlflow.runtime/jetbrains.mps.lang.controlflow.runtime.msd" />
         <module file="${basedir}/typechecking/languages/jetbrains.mps.lang.typechecking/jetbrains.mps.lang.typechecking.mpl" />
         <module file="${basedir}/typechecking/solutions/jetbrains.mps.lang.typechecking.runtime/jetbrains.mps.lang.typechecking.runtime.msd" />
         <module file="${basedir}/logic/solutions/jetbrains.mps.logic.test/jetbrains.mps.logic.test.msd" />
@@ -3258,6 +3628,225 @@
     </javac>
   </target>
   
+  <target name="java.compile.jetbrains.mps.controlflow">
+    <mkdir dir="${mps.macro.logic_home}/controlflow/solutions/jetbrains.mps.controlflow/source_gen" />
+    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.controlflow" />
+    <javac destdir="${build.tmp}/java/out/jetbrains.mps.controlflow" fork="true" encoding="utf8" includeantruntime="false" debug="true">
+      <compilerarg value="-Xlint:none" />
+      <src>
+        <path location="${mps.macro.logic_home}/controlflow/solutions/jetbrains.mps.controlflow/source_gen" />
+      </src>
+      <classpath />
+    </javac>
+  </target>
+  
+  <target name="java.compile.jetbrains.mps.controlflow.ui" depends="fetchDependencies">
+    <mkdir dir="${mps.macro.logic_home}/controlflow/solutions/jetbrains.mps.controlflow.ui/source_gen" />
+    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.controlflow.ui" />
+    <javac destdir="${build.tmp}/java/out/jetbrains.mps.controlflow.ui" fork="true" encoding="utf8" includeantruntime="false" debug="true">
+      <compilerarg value="-Xlint:none" />
+      <src>
+        <path location="${mps.macro.logic_home}/controlflow/solutions/jetbrains.mps.controlflow.ui/source_gen" />
+      </src>
+      <classpath>
+        <fileset file="${artifacts.mps}/lib/mps-closures.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-core.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-logging.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-collections.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-icons.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-workbench.jar" />
+        <fileset file="${artifacts.mps}/lib/annotations.jar" />
+        <fileset file="${artifacts.mps}/lib/log4j.jar" />
+        <fileset file="${artifacts.mps}/lib/jdom.jar" />
+        <fileset file="${artifacts.mps}/lib/trove4j.jar" />
+        <fileset file="${artifacts.mps}/lib/ecj-4.7.2.jar" />
+        <fileset dir="${artifacts.mps}/lib" includes="*.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
+      </classpath>
+    </javac>
+  </target>
+  
+  <target name="java.compile.jetbrains.mps.lang.controlflow" depends="java.compile.jetbrains.mps.coderules, java.compile.jetbrains.mps.dataform, java.compile.jetbrains.mps.lang.coderules, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.lang.controlflow.runtime, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.typechecking.reporting, fetchDependencies">
+    <mkdir dir="${mps.macro.logic_home}/controlflow/languages/jetbrains.mps.lang.controlflow/source_gen" />
+    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.controlflow" />
+    <javac destdir="${build.tmp}/java/out/jetbrains.mps.lang.controlflow" fork="true" encoding="utf8" includeantruntime="false" debug="true">
+      <compilerarg value="-Xlint:none" />
+      <src>
+        <path location="${mps.macro.logic_home}/controlflow/languages/jetbrains.mps.lang.controlflow/source_gen" />
+      </src>
+      <classpath>
+        <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-closures.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-collections.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-core.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-logging.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-icons.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-workbench.jar" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.coderules" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.dataform" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.template" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.controlflow.runtime" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking.reporting" />
+        <fileset file="${mps.macro.logic_home}/coderules/solutions/jetbrains.mps.coderules/lib/reactive-streams-1.0.0.final.jar" />
+        <fileset file="${mps.macro.logic_home}/coderules/solutions/jetbrains.mps.coderules/lib/rxjava-2.1.1.jar" />
+        <fileset file="${mps.macro.logic_home}/coderules/solutions/jetbrains.mps.coderules/lib/rxjava2-swing-0.2.1.jar" />
+        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/collection-0.7.jar" />
+        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/conreactor-api-0.9.jar" />
+        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.jar" />
+        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/trove4j-3.0.3.jar" />
+        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.2.30.jar" />
+        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.2.30.jar" />
+        <fileset file="${artifacts.mps}/lib/annotations.jar" />
+        <fileset file="${artifacts.mps}/lib/log4j.jar" />
+        <fileset file="${artifacts.mps}/lib/jdom.jar" />
+        <fileset file="${artifacts.mps}/lib/trove4j.jar" />
+        <fileset file="${artifacts.mps}/lib/ecj-4.7.2.jar" />
+        <fileset dir="${artifacts.mps}/lib" includes="*.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.baseLanguage.lightweightdsl.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.aspect.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.aspects.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.modelapi.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.project.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.util.order.jar" />
+      </classpath>
+    </javac>
+  </target>
+  
+  <target name="java.compile.jetbrains.mps.lang.controlflow#01" depends="java.compile.jetbrains.mps.dataform, java.compile.jetbrains.mps.lang.coderules, java.compile.jetbrains.mps.lang.coderules#4578927328670739933, java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.lang.controlflow, java.compile.jetbrains.mps.lang.controlflow.runtime, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.typechecking.reporting, fetchDependencies">
+    <mkdir dir="${mps.macro.logic_home}/controlflow/languages/jetbrains.mps.lang.controlflow/generator/source_gen" />
+    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.controlflow#01" />
+    <javac destdir="${build.tmp}/java/out/jetbrains.mps.lang.controlflow#01" fork="true" encoding="utf8" includeantruntime="false" debug="true">
+      <compilerarg value="-Xlint:none" />
+      <src>
+        <path location="${mps.macro.logic_home}/controlflow/languages/jetbrains.mps.lang.controlflow/generator/source_gen" />
+      </src>
+      <classpath>
+        <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-closures.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-collections.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-core.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-logging.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.dataform" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules#4578927328670739933" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.runtime" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.template" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.controlflow" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.controlflow.runtime" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking.reporting" />
+        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/collection-0.7.jar" />
+        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/conreactor-api-0.9.jar" />
+        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.jar" />
+        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/trove4j-3.0.3.jar" />
+        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.2.30.jar" />
+        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.2.30.jar" />
+        <fileset file="${artifacts.mps}/lib/annotations.jar" />
+        <fileset file="${artifacts.mps}/lib/log4j.jar" />
+        <fileset file="${artifacts.mps}/lib/jdom.jar" />
+        <fileset file="${artifacts.mps}/lib/trove4j.jar" />
+        <fileset file="${artifacts.mps}/lib/ecj-4.7.2.jar" />
+        <fileset dir="${artifacts.mps}/lib" includes="*.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.aspect-generator.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor-generator.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.modelapi.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.project.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
+      </classpath>
+    </javac>
+  </target>
+  
+  <target name="java.compile.jetbrains.mps.lang.controlflow.runtime" depends="java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.typechecking.reporting, fetchDependencies">
+    <mkdir dir="${mps.macro.logic_home}/controlflow/solutions/jetbrains.mps.lang.controlflow.runtime/source_gen" />
+    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.controlflow.runtime" />
+    <javac destdir="${build.tmp}/java/out/jetbrains.mps.lang.controlflow.runtime" fork="true" encoding="utf8" includeantruntime="false" debug="true">
+      <compilerarg value="-Xlint:none" />
+      <src>
+        <path location="${mps.macro.logic_home}/controlflow/solutions/jetbrains.mps.lang.controlflow.runtime/source_gen" />
+      </src>
+      <classpath>
+        <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-closures.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-collections.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-core.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-logging.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.template" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking.reporting" />
+        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/collection-0.7.jar" />
+        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/conreactor-api-0.9.jar" />
+        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.jar" />
+        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/trove4j-3.0.3.jar" />
+        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.2.30.jar" />
+        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.2.30.jar" />
+        <fileset file="${artifacts.mps}/lib/annotations.jar" />
+        <fileset file="${artifacts.mps}/lib/log4j.jar" />
+        <fileset file="${artifacts.mps}/lib/jdom.jar" />
+        <fileset file="${artifacts.mps}/lib/trove4j.jar" />
+        <fileset file="${artifacts.mps}/lib/ecj-4.7.2.jar" />
+      </classpath>
+    </javac>
+  </target>
+  
   <target name="java.compile.jetbrains.mps.typechecking.test" depends="java.compile.jetbrains.mps.coderules, java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking, java.compile.jetbrains.mps.typechecking.reporting, fetchDependencies">
     <mkdir dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking.test/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.typechecking.test" />
@@ -3608,6 +4197,8 @@
   </target>
   
   <target name="cleanSources">
+    <delete dir="${mps.macro.logic_home}/controlflow/solutions/jetbrains.mps.controlflow/source_gen" />
+    <delete dir="${mps.macro.logic_home}/controlflow/solutions/jetbrains.mps.controlflow.ui/source_gen" />
     <delete dir="${mps.macro.logic_home}/typechecking/languages/jetbrains.mps.lang.smodel.types/source_gen" />
     <delete dir="${mps.macro.logic_home}/logic/languages/jetbrains.mps.logic/source_gen" />
     <delete dir="${mps.macro.logic_home}/logic/languages/jetbrains.mps.logic/generator/source_gen" />
@@ -3621,6 +4212,9 @@
     <delete dir="${mps.macro.logic_home}/coderules/languages/jetbrains.mps.lang.coderules/generator/source_gen" />
     <delete dir="${mps.macro.logic_home}/coderules/languages/jetbrains.mps.lang.coderules/runtime/source_gen" />
     <delete dir="${mps.macro.logic_home}/coderules/solutions/jetbrains.mps.lang.coderules.template/source_gen" />
+    <delete dir="${mps.macro.logic_home}/controlflow/languages/jetbrains.mps.lang.controlflow/source_gen" />
+    <delete dir="${mps.macro.logic_home}/controlflow/languages/jetbrains.mps.lang.controlflow/generator/source_gen" />
+    <delete dir="${mps.macro.logic_home}/controlflow/solutions/jetbrains.mps.lang.controlflow.runtime/source_gen" />
     <delete dir="${mps.macro.logic_home}/typechecking/languages/jetbrains.mps.lang.smodel.types/generator/source_gen" />
     <delete dir="${mps.macro.logic_home}/typechecking/languages/jetbrains.mps.lang.typechecking/source_gen" />
     <delete dir="${mps.macro.logic_home}/typechecking/languages/jetbrains.mps.lang.typechecking/generator/source_gen" />
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps b/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps
index e9144a45..67c91bbe 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps
@@ -465,6 +465,7 @@
       <concept id="1217889960776" name="jetbrains.mps.lang.generator.generationContext.structure.GenerationContextOp_UserObjectAccessBase" flags="nn" index="2fTw9j">
         <child id="1217890689512" name="userKey" index="2fWi3N" />
       </concept>
+      <concept id="1217894033795" name="jetbrains.mps.lang.generator.generationContext.structure.GenerationContextOp_TransientObjectAccess" flags="nn" index="2g92yo" />
       <concept id="1217960179967" name="jetbrains.mps.lang.generator.generationContext.structure.GenerationContextOp_ShowErrorMessage" flags="nn" index="2k5nB$" />
       <concept id="1217960314443" name="jetbrains.mps.lang.generator.generationContext.structure.GenerationContextOp_ShowMessageBase" flags="nn" index="2k5Stg">
         <child id="1217960314448" name="messageText" index="2k5Stb" />
@@ -558,6 +559,9 @@
         <child id="1140725362529" name="linkTarget" index="2oxUTC" />
       </concept>
       <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
+      <concept id="7400021826771268254" name="jetbrains.mps.lang.smodel.structure.SNodePointerType" flags="ig" index="2sp9CU">
+        <reference id="7400021826771268269" name="concept" index="2sp9C9" />
+      </concept>
       <concept id="7400021826774799413" name="jetbrains.mps.lang.smodel.structure.NodePointerExpression" flags="ng" index="2tJFMh">
         <child id="7400021826774799510" name="ref" index="2tJFKM" />
       </concept>
@@ -15628,6 +15632,29 @@
     </node>
     <node concept="3uibUv" id="NKt6yp1FJg" role="1zkMxy">
       <ref role="3uigEE" to="fqlx:NKt6yp1COZ" resolve="DefaultCoderulesAspect" />
+      <node concept="1ZhdrF" id="78H58odLtQH" role="lGtFl">
+        <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1107535904670/1107535924139" />
+        <property role="2qtEX8" value="classifier" />
+        <node concept="3$xsQk" id="78H58odLtQI" role="3$ytzL">
+          <node concept="3clFbS" id="78H58odLtQJ" role="2VODD2">
+            <node concept="3clFbF" id="78H58odQ4Ko" role="3cqZAp">
+              <node concept="10QFUN" id="78H58odQ5en" role="3clFbG">
+                <node concept="2OqwBi" id="78H58odQ5ej" role="10QFUP">
+                  <node concept="1iwH7S" id="78H58odQ5ek" role="2Oq$k0" />
+                  <node concept="2g92yo" id="78H58odQ5el" role="2OqNvi">
+                    <node concept="Xl_RD" id="78H58odQ5em" role="2fWi3N">
+                      <property role="Xl_RC" value="CODERULES_ASPECT_RUNTIME" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="2sp9CU" id="78H58odQ5g$" role="10QFUM">
+                  <ref role="2sp9C9" to="tpee:g7pOWCK" resolve="Classifier" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
     </node>
   </node>
 </model>
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps
index 8d618df3..16e16cbc 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps
@@ -4810,8 +4810,8 @@
       <node concept="37vLTG" id="7DvO2M9VeM8" role="3clF46">
         <property role="TrG5h" value="descriptors" />
         <node concept="A3Dl8" id="6UWSvq5dhn_" role="1tU5fm">
-          <node concept="3uibUv" id="NKt6yoT9YX" role="A3Ik2">
-            <ref role="3uigEE" to="fqlx:NKt6yomNZE" resolve="CoderulesAspect" />
+          <node concept="3uibUv" id="78H58oe5sHh" role="A3Ik2">
+            <ref role="3uigEE" to="u46i:7km57Pkjxf4" resolve="TypecheckingAspect" />
           </node>
         </node>
       </node>
@@ -4824,8 +4824,8 @@
       <node concept="37vLTG" id="7DvO2M9VeMe" role="3clF46">
         <property role="TrG5h" value="descriptors" />
         <node concept="A3Dl8" id="6UWSvq5dh__" role="1tU5fm">
-          <node concept="3uibUv" id="NKt6yoTa0P" role="A3Ik2">
-            <ref role="3uigEE" to="fqlx:NKt6yomNZE" resolve="CoderulesAspect" />
+          <node concept="3uibUv" id="78H58oe5sL4" role="A3Ik2">
+            <ref role="3uigEE" to="u46i:7km57Pkjxf4" resolve="TypecheckingAspect" />
           </node>
         </node>
       </node>
diff --git a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.aspect.mps b/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.aspect.mps
index 7838c340..cf3f02b3 100644
--- a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.aspect.mps
+++ b/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.aspect.mps
@@ -17,6 +17,7 @@
     <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
     <import index="w1kc" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel(MPS.Core/)" />
     <import index="i5cy" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.concurrent.atomic(JDK/)" />
+    <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -50,6 +51,10 @@
       <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
         <property id="1070475926801" name="value" index="Xl_RC" />
       </concept>
+      <concept id="1182160077978" name="jetbrains.mps.baseLanguage.structure.AnonymousClassCreator" flags="nn" index="YeOm9">
+        <child id="1182160096073" name="cls" index="YeSDq" />
+      </concept>
+      <concept id="1081236700938" name="jetbrains.mps.baseLanguage.structure.StaticMethodDeclaration" flags="ig" index="2YIFZL" />
       <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
         <reference id="1144433194310" name="classConcept" index="1Pybhc" />
       </concept>
@@ -60,6 +65,7 @@
         <child id="1095933932569" name="implementedInterface" index="EKbjA" />
       </concept>
       <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
+        <property id="1176718929932" name="isFinal" index="3TUv4t" />
         <child id="1068431790190" name="initializer" index="33vP2m" />
       </concept>
       <concept id="1109279763828" name="jetbrains.mps.baseLanguage.structure.TypeVariableDeclaration" flags="ng" index="16euLQ">
@@ -158,6 +164,10 @@
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
       <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
+      <concept id="1170345865475" name="jetbrains.mps.baseLanguage.structure.AnonymousClass" flags="ig" index="1Y3b0j">
+        <reference id="1170346070688" name="classifier" index="1Y3XeK" />
+        <child id="1201186121363" name="typeParameter" index="2Ghqu4" />
+      </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
@@ -272,6 +282,47 @@
   <node concept="312cEu" id="NKt6ynorWQ">
     <property role="TrG5h" value="AspectLookup" />
     <node concept="2tJIrI" id="NKt6ynosjc" role="jymVt" />
+    <node concept="2YIFZL" id="78H58oefSjC" role="jymVt">
+      <property role="TrG5h" value="lookup" />
+      <node concept="37vLTG" id="78H58oefUc4" role="3clF46">
+        <property role="TrG5h" value="discoverable" />
+        <node concept="3uibUv" id="78H58oefUcY" role="1tU5fm">
+          <ref role="3uigEE" node="NKt6ynom3d" resolve="AspectDiscoverable" />
+          <node concept="16syzq" id="78H58oefUf$" role="11_B2D">
+            <ref role="16sUi3" node="78H58oefU3u" resolve="T" />
+          </node>
+        </node>
+      </node>
+      <node concept="3uibUv" id="78H58oefUg_" role="3clF45">
+        <ref role="3uigEE" node="NKt6ynorWQ" resolve="AspectLookup" />
+        <node concept="16syzq" id="78H58oefUo2" role="11_B2D">
+          <ref role="16sUi3" node="78H58oefU3u" resolve="T" />
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="78H58oefSjF" role="1B3o_S" />
+      <node concept="3clFbS" id="78H58oefSjG" role="3clF47">
+        <node concept="3clFbF" id="78H58oefUrm" role="3cqZAp">
+          <node concept="2ShNRf" id="78H58oefUrk" role="3clFbG">
+            <node concept="1pGfFk" id="78H58oefUNA" role="2ShVmc">
+              <ref role="37wK5l" node="NKt6yno$sR" resolve="AspectLookup" />
+              <node concept="37vLTw" id="78H58oefUXe" role="37wK5m">
+                <ref role="3cqZAo" node="78H58oefUc4" resolve="discoverable" />
+              </node>
+              <node concept="16syzq" id="78H58oefV3C" role="1pMfVU">
+                <ref role="16sUi3" node="78H58oefU3u" resolve="T" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="16euLQ" id="78H58oefU3u" role="16eVyc">
+        <property role="TrG5h" value="T" />
+        <node concept="3uibUv" id="78H58oefU7h" role="3ztrMU">
+          <ref role="3uigEE" to="ze1i:~ILanguageAspect" resolve="ILanguageAspect" />
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="78H58oefOMp" role="jymVt" />
     <node concept="3clFbW" id="NKt6yno$sR" role="jymVt">
       <node concept="37vLTG" id="NKt6yno_xa" role="3clF46">
         <property role="TrG5h" value="discoverable" />
@@ -1511,6 +1562,131 @@
   <node concept="312cEu" id="NKt6yp1COZ">
     <property role="TrG5h" value="DefaultCoderulesAspect" />
     <property role="1sVAO0" value="true" />
+    <node concept="2YIFZL" id="78H58oefoaA" role="jymVt">
+      <property role="DiZV1" value="false" />
+      <property role="od$2w" value="false" />
+      <property role="TrG5h" value="discoverable" />
+      <node concept="37vLTG" id="78H58oefoFj" role="3clF46">
+        <property role="TrG5h" value="aspectClass" />
+        <property role="3TUv4t" value="true" />
+        <node concept="3uibUv" id="78H58oefoHS" role="1tU5fm">
+          <ref role="3uigEE" to="wyt6:~Class" resolve="Class" />
+          <node concept="16syzq" id="78H58oefoIS" role="11_B2D">
+            <ref role="16sUi3" node="78H58oefoAe" resolve="T" />
+          </node>
+        </node>
+      </node>
+      <node concept="3clFbS" id="78H58oefnLj" role="3clF47">
+        <node concept="3clFbH" id="78H58oefoRD" role="3cqZAp" />
+        <node concept="3clFbF" id="78H58oefpuN" role="3cqZAp">
+          <node concept="2ShNRf" id="78H58oefpuJ" role="3clFbG">
+            <node concept="YeOm9" id="78H58oefpDG" role="2ShVmc">
+              <node concept="1Y3b0j" id="78H58oefpDJ" role="YeSDq">
+                <property role="2bfB8j" value="true" />
+                <ref role="1Y3XeK" node="NKt6ynom3d" resolve="AspectDiscoverable" />
+                <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
+                <node concept="3Tm1VV" id="78H58oefpDK" role="1B3o_S" />
+                <node concept="3clFb_" id="78H58oefpDL" role="jymVt">
+                  <property role="1EzhhJ" value="false" />
+                  <property role="TrG5h" value="discover" />
+                  <node concept="37vLTG" id="78H58oefpDM" role="3clF46">
+                    <property role="TrG5h" value="lr" />
+                    <node concept="3uibUv" id="78H58oefpDN" role="1tU5fm">
+                      <ref role="3uigEE" to="vndm:~LanguageRuntime" resolve="LanguageRuntime" />
+                    </node>
+                  </node>
+                  <node concept="16syzq" id="78H58oefq5S" role="3clF45">
+                    <ref role="16sUi3" node="78H58oefoAe" resolve="T" />
+                  </node>
+                  <node concept="3Tm1VV" id="78H58oefpDP" role="1B3o_S" />
+                  <node concept="3clFbS" id="78H58oefpDR" role="3clF47">
+                    <node concept="3cpWs8" id="78H58oefro8" role="3cqZAp">
+                      <node concept="3cpWsn" id="78H58oefro9" role="3cpWs9">
+                        <property role="TrG5h" value="aspect" />
+                        <node concept="16syzq" id="78H58oefrnW" role="1tU5fm">
+                          <ref role="16sUi3" node="78H58oefoAe" resolve="T" />
+                        </node>
+                        <node concept="2OqwBi" id="78H58oefroa" role="33vP2m">
+                          <node concept="37vLTw" id="78H58oefrob" role="2Oq$k0">
+                            <ref role="3cqZAo" node="78H58oefpDM" resolve="lr" />
+                          </node>
+                          <node concept="liA8E" id="78H58oefroc" role="2OqNvi">
+                            <ref role="37wK5l" to="vndm:~LanguageRuntime.getAspect(java.lang.Class):jetbrains.mps.smodel.runtime.ILanguageAspect" resolve="getAspect" />
+                            <node concept="37vLTw" id="78H58oefrod" role="37wK5m">
+                              <ref role="3cqZAo" node="78H58oefoFj" resolve="aspectClass" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3clFbJ" id="78H58oefrrA" role="3cqZAp">
+                      <node concept="3clFbS" id="78H58oefrrB" role="3clFbx">
+                        <node concept="3clFbJ" id="78H58oefrrC" role="3cqZAp">
+                          <node concept="3clFbS" id="78H58oefrrD" role="3clFbx">
+                            <node concept="3clFbF" id="78H58oefrrE" role="3cqZAp">
+                              <node concept="2OqwBi" id="78H58oefrrF" role="3clFbG">
+                                <node concept="37vLTw" id="78H58oefrrG" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="78H58oefro9" resolve="aspect" />
+                                </node>
+                                <node concept="liA8E" id="78H58oefrrH" role="2OqNvi">
+                                  <ref role="37wK5l" node="7P_FdVQ2EWw" resolve="setLanguageRuntime" />
+                                  <node concept="37vLTw" id="78H58oefrrI" role="37wK5m">
+                                    <ref role="3cqZAo" node="78H58oefpDM" resolve="lr" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="3clFbC" id="78H58oefrrJ" role="3clFbw">
+                            <node concept="10Nm6u" id="78H58oefrrK" role="3uHU7w" />
+                            <node concept="2OqwBi" id="78H58oefrrL" role="3uHU7B">
+                              <node concept="37vLTw" id="78H58oefrrM" role="2Oq$k0">
+                                <ref role="3cqZAo" node="78H58oefro9" resolve="aspect" />
+                              </node>
+                              <node concept="liA8E" id="78H58oefrrN" role="2OqNvi">
+                                <ref role="37wK5l" node="7P_FdVQ2VEI" resolve="languageRuntime" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3y3z36" id="78H58oefrrO" role="3clFbw">
+                        <node concept="10Nm6u" id="78H58oefrrP" role="3uHU7w" />
+                        <node concept="37vLTw" id="78H58oefrrQ" role="3uHU7B">
+                          <ref role="3cqZAo" node="78H58oefro9" resolve="aspect" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3clFbF" id="78H58oefqIz" role="3cqZAp">
+                      <node concept="37vLTw" id="78H58oefroe" role="3clFbG">
+                        <ref role="3cqZAo" node="78H58oefro9" resolve="aspect" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="16syzq" id="78H58oefpTf" role="2Ghqu4">
+                  <ref role="16sUi3" node="78H58oefoAe" resolve="T" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="78H58oefoRF" role="3cqZAp" />
+      </node>
+      <node concept="3uibUv" id="78H58oefqi0" role="3clF45">
+        <ref role="3uigEE" node="NKt6ynom3d" resolve="AspectDiscoverable" />
+        <node concept="16syzq" id="78H58oefqAI" role="11_B2D">
+          <ref role="16sUi3" node="78H58oefoAe" resolve="T" />
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="78H58oefnLi" role="1B3o_S" />
+      <node concept="16euLQ" id="78H58oefoAe" role="16eVyc">
+        <property role="TrG5h" value="T" />
+        <node concept="3uibUv" id="78H58oefoCM" role="3ztrMU">
+          <ref role="3uigEE" node="NKt6yp1COZ" resolve="DefaultCoderulesAspect" />
+        </node>
+      </node>
+    </node>
     <node concept="2tJIrI" id="NKt6yp1Fd6" role="jymVt" />
     <node concept="3clFb_" id="7P_FdVQ2VEI" role="jymVt">
       <property role="TrG5h" value="languageRuntime" />
diff --git a/controlflow/languages/jetbrains.mps.lang.controlflow/generator/template/main@generator.mps b/controlflow/languages/jetbrains.mps.lang.controlflow/generator/template/main@generator.mps
new file mode 100644
index 00000000..6673f9e8
--- /dev/null
+++ b/controlflow/languages/jetbrains.mps.lang.controlflow/generator/template/main@generator.mps
@@ -0,0 +1,207 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model ref="r:7be25111-db66-40e7-be84-6d98fca6b94a(main@generator)">
+  <persistence version="9" />
+  <languages>
+    <use id="69b8a993-9b87-4d96-bf0c-3559f4bb0c63" name="jetbrains.mps.lang.slanguage" version="0" />
+    <devkit ref="a2eb3a43-fcc2-4200-80dc-c60110c4862d(jetbrains.mps.devkit.templates)" />
+  </languages>
+  <imports>
+    <import index="z0r2" ref="r:9d6fe210-6699-4ffe-b3e4-567da3cd1f1d(jetbrains.mps.lang.controlflow.structure)" />
+    <import index="ba7m" ref="r:4c5ac278-3ad7-4902-ab86-6c60b350f168(jetbrains.mps.lang.aspect.generator.template.main@generator)" />
+    <import index="ogv8" ref="r:c0702ee3-be79-48ac-aa39-b7cd0d895de6(jetbrains.mps.lang.coderules.generator.template.main@generator)" />
+    <import index="hypd" ref="r:aa31e43e-9240-4f4d-b6db-5c1c9a86c59e(jetbrains.mps.lang.project.structure)" />
+    <import index="ucur" ref="r:1dfaf07d-c77a-451e-91d3-b6f80f0f8508(jetbrains.mps.lang.descriptor.generator.template.main@generator)" />
+    <import index="vrzs" ref="r:bf5143f7-9856-43e8-8ae7-57cecc1fe6a9(jetbrains.mps.lang.controlflow.aspect)" />
+    <import index="w57s" ref="r:1e2f03b6-f778-4cc1-92d4-edb9161f4aa6(jetbrains.mps.lang.controlflow.plugin)" />
+  </imports>
+  <registry>
+    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
+      <concept id="1215693861676" name="jetbrains.mps.baseLanguage.structure.BaseAssignmentExpression" flags="nn" index="d038R">
+        <child id="1068498886297" name="rValue" index="37vLTx" />
+        <child id="1068498886295" name="lValue" index="37vLTJ" />
+      </concept>
+      <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
+        <child id="1197027771414" name="operand" index="2Oq$k0" />
+        <child id="1197027833540" name="operation" index="2OqNvi" />
+      </concept>
+      <concept id="1137021947720" name="jetbrains.mps.baseLanguage.structure.ConceptFunction" flags="in" index="2VMwT0">
+        <child id="1137022507850" name="body" index="2VODD2" />
+      </concept>
+      <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
+        <property id="1070475926801" name="value" index="Xl_RC" />
+      </concept>
+      <concept id="1068498886294" name="jetbrains.mps.baseLanguage.structure.AssignmentExpression" flags="nn" index="37vLTI" />
+      <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
+        <child id="1068580123156" name="expression" index="3clFbG" />
+      </concept>
+      <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
+        <child id="1068581517665" name="statement" index="3cqZAp" />
+      </concept>
+      <concept id="1068581242875" name="jetbrains.mps.baseLanguage.structure.PlusExpression" flags="nn" index="3cpWs3" />
+      <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
+        <child id="1081773367579" name="rightExpression" index="3uHU7w" />
+        <child id="1081773367580" name="leftExpression" index="3uHU7B" />
+      </concept>
+    </language>
+    <language id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator">
+      <concept id="1095416546421" name="jetbrains.mps.lang.generator.structure.MappingConfiguration" flags="ig" index="bUwia">
+        <child id="1167088157977" name="createRootRule" index="2VS0gm" />
+      </concept>
+      <concept id="1168559333462" name="jetbrains.mps.lang.generator.structure.TemplateDeclarationReference" flags="ln" index="j$656" />
+      <concept id="1112730859144" name="jetbrains.mps.lang.generator.structure.TemplateSwitch" flags="ig" index="jVnub">
+        <reference id="1112820671508" name="modifiedSwitch" index="phYkn" />
+        <child id="1167340453568" name="reductionMappingRule" index="3aUrZf" />
+      </concept>
+      <concept id="5005282049925926521" name="jetbrains.mps.lang.generator.structure.TemplateArgumentParameterExpression" flags="nn" index="v3LJS">
+        <reference id="5005282049925926522" name="parameter" index="v3LJV" />
+      </concept>
+      <concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ng" index="v9R3L">
+        <reference id="1722980698497626483" name="template" index="v9R2y" />
+        <child id="1722980698497626405" name="actualArgument" index="v9R3O" />
+      </concept>
+      <concept id="1167087469898" name="jetbrains.mps.lang.generator.structure.CreateRootRule" flags="lg" index="2VPoh5">
+        <reference id="1167087469901" name="templateNode" index="2VPoh2" />
+        <child id="1167087469900" name="conditionFunction" index="2VPoh3" />
+      </concept>
+      <concept id="1167087518662" name="jetbrains.mps.lang.generator.structure.CreateRootRule_Condition" flags="in" index="2VP$b9" />
+      <concept id="1167168920554" name="jetbrains.mps.lang.generator.structure.BaseMappingRule_Condition" flags="in" index="30G5F_" />
+      <concept id="1167169308231" name="jetbrains.mps.lang.generator.structure.BaseMappingRule" flags="ng" index="30H$t8">
+        <property id="1167272244852" name="applyToConceptInheritors" index="36QftV" />
+        <reference id="1167169349424" name="applicableConcept" index="30HIoZ" />
+        <child id="1167169362365" name="conditionFunction" index="30HLyM" />
+      </concept>
+      <concept id="1167327847730" name="jetbrains.mps.lang.generator.structure.Reduction_MappingRule" flags="lg" index="3aamgX">
+        <child id="1169672767469" name="ruleConsequence" index="1lVwrX" />
+      </concept>
+      <concept id="982871510064032177" name="jetbrains.mps.lang.generator.structure.IParameterizedTemplate" flags="ng" index="1s_3nv">
+        <child id="982871510064032342" name="parameter" index="1s_3oS" />
+      </concept>
+      <concept id="1805153994415891174" name="jetbrains.mps.lang.generator.structure.TemplateParameterDeclaration" flags="ng" index="1N15co">
+        <child id="1805153994415893199" name="type" index="1N15GL" />
+      </concept>
+    </language>
+    <language id="69b8a993-9b87-4d96-bf0c-3559f4bb0c63" name="jetbrains.mps.lang.slanguage">
+      <concept id="2030416617761226491" name="jetbrains.mps.lang.slanguage.structure.Model_IsAspectOperation" flags="nn" index="3zA4fs">
+        <reference id="2030416617761226680" name="aspect" index="3zA4av" />
+      </concept>
+    </language>
+    <language id="d7706f63-9be2-479c-a3da-ae92af1e64d5" name="jetbrains.mps.lang.generator.generationContext">
+      <concept id="1217889960776" name="jetbrains.mps.lang.generator.generationContext.structure.GenerationContextOp_UserObjectAccessBase" flags="nn" index="2fTw9j">
+        <child id="1217890689512" name="userKey" index="2fWi3N" />
+      </concept>
+      <concept id="1217894033795" name="jetbrains.mps.lang.generator.generationContext.structure.GenerationContextOp_TransientObjectAccess" flags="nn" index="2g92yo" />
+      <concept id="1216860049635" name="jetbrains.mps.lang.generator.generationContext.structure.TemplateFunctionParameter_generationContext" flags="nn" index="1iwH7S" />
+      <concept id="1217026863835" name="jetbrains.mps.lang.generator.generationContext.structure.GenerationContextOp_GetOriginalInputModel" flags="nn" index="1st3f0" />
+    </language>
+    <language id="446c26eb-2b7b-4bf0-9b35-f83fa582753e" name="jetbrains.mps.lang.modelapi">
+      <concept id="4733039728785194814" name="jetbrains.mps.lang.modelapi.structure.NamedNodeReference" flags="ng" index="ZC_QK">
+        <reference id="7256306938026143658" name="target" index="2aWVGs" />
+      </concept>
+    </language>
+    <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
+      <concept id="7400021826774799413" name="jetbrains.mps.lang.smodel.structure.NodePointerExpression" flags="ng" index="2tJFMh">
+        <child id="7400021826774799510" name="ref" index="2tJFKM" />
+      </concept>
+      <concept id="1143226024141" name="jetbrains.mps.lang.smodel.structure.SModelType" flags="in" index="H_c77" />
+      <concept id="1212008292747" name="jetbrains.mps.lang.smodel.structure.Model_GetLongNameOperation" flags="nn" index="LkI2h" />
+      <concept id="1219352745532" name="jetbrains.mps.lang.smodel.structure.NodeRefExpression" flags="nn" index="3B5_sB">
+        <reference id="1219352800908" name="referentNode" index="3B5MYn" />
+      </concept>
+    </language>
+    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
+      <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
+        <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
+      </concept>
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+        <property id="1169194664001" name="name" index="TrG5h" />
+      </concept>
+    </language>
+  </registry>
+  <node concept="bUwia" id="78H58oe2rze">
+    <property role="TrG5h" value="main" />
+  </node>
+  <node concept="bUwia" id="7km57PkeXwx">
+    <property role="TrG5h" value="aspect" />
+    <property role="3GE5qa" value="aspect" />
+    <node concept="2VPoh5" id="7km57PkeXwI" role="2VS0gm">
+      <ref role="2VPoh2" to="ogv8:7km57PkeUQV" resolve="AspectDescriptor" />
+      <node concept="2VP$b9" id="7km57PkeXwK" role="2VPoh3">
+        <node concept="3clFbS" id="7km57PkeXwL" role="2VODD2">
+          <node concept="3clFbF" id="78H58odLysS" role="3cqZAp">
+            <node concept="37vLTI" id="78H58odL$5P" role="3clFbG">
+              <node concept="2OqwBi" id="78H58odLyFa" role="37vLTJ">
+                <node concept="1iwH7S" id="78H58odLysQ" role="2Oq$k0" />
+                <node concept="2g92yo" id="78H58odLyR4" role="2OqNvi">
+                  <node concept="Xl_RD" id="78H58odLvyN" role="2fWi3N">
+                    <property role="Xl_RC" value="CODERULES_ASPECT_RUNTIME" />
+                  </node>
+                </node>
+              </node>
+              <node concept="2tJFMh" id="78H58odQ5Tl" role="37vLTx">
+                <node concept="ZC_QK" id="78H58oe2APM" role="2tJFKM">
+                  <ref role="2aWVGs" to="vrzs:7km57Pkjxf4" resolve="ControlflowAspect" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="7km57PkeXBU" role="3cqZAp">
+            <node concept="2OqwBi" id="7km57PkeYm$" role="3clFbG">
+              <node concept="2OqwBi" id="7km57PkeXPH" role="2Oq$k0">
+                <node concept="1iwH7S" id="7km57PkeXBT" role="2Oq$k0" />
+                <node concept="1st3f0" id="7km57PkeY4N" role="2OqNvi" />
+              </node>
+              <node concept="3zA4fs" id="7km57PkeZxH" role="2OqNvi">
+                <ref role="3zA4av" to="w57s:7km57PkcIgQ" resolve="controlflow" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
+  <node concept="jVnub" id="7km57PkguX9">
+    <property role="TrG5h" value="instantiate_aspect_descriptor" />
+    <property role="3GE5qa" value="aspect" />
+    <ref role="phYkn" to="ucur:1KHvivZJsL7" resolve="InstantiateAspectDescriptor" />
+    <node concept="3aamgX" id="7km57PkgvmN" role="3aUrZf">
+      <property role="36QftV" value="true" />
+      <ref role="30HIoZ" to="hypd:5xDtKQA7vSB" resolve="ModelReference" />
+      <node concept="j$656" id="7km57Pkgww4" role="1lVwrX">
+        <ref role="v9R2y" to="ba7m:4WrOGsLZ$AX" resolve="GeneratedClassInstantiation" />
+        <node concept="3cpWs3" id="2aiW7BvqBQ" role="v9R3O">
+          <node concept="2OqwBi" id="7km57Pkgw_v" role="3uHU7B">
+            <node concept="v3LJS" id="7km57Pkgwwc" role="2Oq$k0">
+              <ref role="v3LJV" node="7km57Pkgvk2" resolve="model" />
+            </node>
+            <node concept="LkI2h" id="7km57PkgwKW" role="2OqNvi" />
+          </node>
+          <node concept="Xl_RD" id="2aiW7Bvrvo" role="3uHU7w">
+            <property role="Xl_RC" value=".TypesAspectDescriptor" />
+          </node>
+        </node>
+        <node concept="3B5_sB" id="2hteS6Cje6U" role="v9R3O">
+          <ref role="3B5MYn" to="vrzs:7km57Pkjxf4" resolve="ControlflowAspect" />
+        </node>
+      </node>
+      <node concept="30G5F_" id="7km57PkgvmR" role="30HLyM">
+        <node concept="3clFbS" id="7km57PkgvmS" role="2VODD2">
+          <node concept="3clFbF" id="2hteS6CjfwK" role="3cqZAp">
+            <node concept="2OqwBi" id="7km57PkuzZJ" role="3clFbG">
+              <node concept="v3LJS" id="7km57PkuzZK" role="2Oq$k0">
+                <ref role="v3LJV" node="7km57Pkgvk2" resolve="model" />
+              </node>
+              <node concept="3zA4fs" id="7km57PkuzZL" role="2OqNvi">
+                <ref role="3zA4av" to="w57s:7km57PkcIgQ" resolve="controlflow" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="1N15co" id="7km57Pkgvk2" role="1s_3oS">
+      <property role="TrG5h" value="model" />
+      <node concept="H_c77" id="7km57PkgvmI" role="1N15GL" />
+    </node>
+  </node>
+</model>
+
diff --git a/controlflow/languages/jetbrains.mps.lang.controlflow/jetbrains.mps.lang.controlflow.mpl b/controlflow/languages/jetbrains.mps.lang.controlflow/jetbrains.mps.lang.controlflow.mpl
new file mode 100644
index 00000000..81d9ff44
--- /dev/null
+++ b/controlflow/languages/jetbrains.mps.lang.controlflow/jetbrains.mps.lang.controlflow.mpl
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<language namespace="jetbrains.mps.lang.controlflow" uuid="2e120f68-abfb-4980-bb1c-bc70159b1f95" languageVersion="0" moduleVersion="0">
+  <models>
+    <modelRoot contentPath="${module}" type="default">
+      <sourceRoot location="models" />
+    </modelRoot>
+  </models>
+  <accessoryModels />
+  <generators>
+    <generator alias="main" namespace="jetbrains.mps.lang.controlflow#01" uuid="67306c43-4604-4dad-9b74-7e808a66bee5">
+      <models>
+        <modelRoot contentPath="${module}/generator/template" type="default">
+          <sourceRoot location="." />
+        </modelRoot>
+      </models>
+      <external-templates />
+      <dependencies>
+        <dependency reexport="false">21d5540d-cd6b-44dd-b6ab-6835bf032803(jetbrains.mps.lang.coderules#4578927328670739933)</dependency>
+        <dependency reexport="false">e45a8b22-94f2-427f-b849-77f254c4eef5(jetbrains.mps.lang.aspect#3274906159125927726)</dependency>
+        <dependency reexport="false">86ef8290-12bb-4ca7-947f-093788f263a9(jetbrains.mps.lang.project)</dependency>
+        <dependency reexport="false">3ac18869-0828-4401-abad-822a47bf83f1(jetbrains.mps.lang.descriptor#9020561928507175817)</dependency>
+        <dependency reexport="false">ffcd9ef5-e931-4da9-a8d1-eb9bf80d19b4(jetbrains.mps.lang.controlflow.runtime)</dependency>
+      </dependencies>
+      <languageVersions>
+        <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="6" />
+        <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
+        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="0" />
+        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+        <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
+        <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
+        <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
+        <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="0" />
+        <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="0" />
+        <language slang="l:289fcc83-6543-41e8-a5ca-768235715ce4:jetbrains.mps.lang.generator.generationParameters" version="0" />
+        <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
+        <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
+        <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
+        <language slang="l:69b8a993-9b87-4d96-bf0c-3559f4bb0c63:jetbrains.mps.lang.slanguage" version="0" />
+        <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="11" />
+        <language slang="l:1a8554c4-eb84-43ba-8c34-6f0d90c6e75a:jetbrains.mps.lang.smodel.query" version="3" />
+        <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
+        <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
+      </languageVersions>
+      <dependencyVersions>
+        <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
+        <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
+        <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
+        <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
+        <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
+        <module reference="fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)" version="0" />
+        <module reference="83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)" version="0" />
+        <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
+        <module reference="942985d5-7bcf-46ee-8b79-7b662eaebb4e(jetbrains.mps.dataform)" version="0" />
+        <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
+        <module reference="e45a8b22-94f2-427f-b849-77f254c4eef5(jetbrains.mps.lang.aspect#3274906159125927726)" version="0" />
+        <module reference="c4803b19-6d89-4a3b-bf82-390769514add(jetbrains.mps.lang.coderules)" version="0" />
+        <module reference="21d5540d-cd6b-44dd-b6ab-6835bf032803(jetbrains.mps.lang.coderules#4578927328670739933)" version="0" />
+        <module reference="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" version="0" />
+        <module reference="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" version="0" />
+        <module reference="2e120f68-abfb-4980-bb1c-bc70159b1f95(jetbrains.mps.lang.controlflow)" version="0" />
+        <module reference="67306c43-4604-4dad-9b74-7e808a66bee5(jetbrains.mps.lang.controlflow#01)" version="0" />
+        <module reference="ffcd9ef5-e931-4da9-a8d1-eb9bf80d19b4(jetbrains.mps.lang.controlflow.runtime)" version="0" />
+        <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
+        <module reference="f4ad079d-bc71-4ffb-9600-9328705cf998(jetbrains.mps.lang.descriptor)" version="0" />
+        <module reference="3ac18869-0828-4401-abad-822a47bf83f1(jetbrains.mps.lang.descriptor#9020561928507175817)" version="0" />
+        <module reference="446c26eb-2b7b-4bf0-9b35-f83fa582753e(jetbrains.mps.lang.modelapi)" version="0" />
+        <module reference="86ef8290-12bb-4ca7-947f-093788f263a9(jetbrains.mps.lang.project)" version="0" />
+        <module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="1" />
+        <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
+        <module reference="b19b2d23-1869-41e0-9ee6-8eaad9ffcd84(jetbrains.mps.lang.util.order#174635545557533742)" version="0" />
+        <module reference="35320f26-77cb-4c55-be9f-a97a27770af1(jetbrains.mps.logic)" version="0" />
+        <module reference="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" version="0" />
+        <module reference="da80355b-a098-4248-9ec8-70d10dd7e9af(jetbrains.mps.typechecking.reporting)" version="0" />
+      </dependencyVersions>
+      <mapping-priorities />
+    </generator>
+  </generators>
+  <sourcePath />
+  <dependencies>
+    <dependency reexport="false">f97d84b2-8bad-4fdd-8ede-da17b3eacf4c(jetbrains.mps.coderules)</dependency>
+  </dependencies>
+  <languageVersions>
+    <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="6" />
+    <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
+    <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="0" />
+    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
+    <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
+    <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
+    <language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
+    <language slang="l:f159adf4-3c93-40f9-9c5a-1f245a8697af:jetbrains.mps.lang.aspect" version="2" />
+    <language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="1" />
+    <language slang="l:fe9d76d7-5809-45c9-ae28-a40915b4d6ff:jetbrains.mps.lang.checkedName" version="0" />
+    <language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="4" />
+    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
+    <language slang="l:f4ad079d-bc71-4ffb-9600-9328705cf998:jetbrains.mps.lang.descriptor" version="0" />
+    <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="11" />
+    <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
+    <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="1" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="2" />
+    <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
+    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="11" />
+    <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="6" />
+    <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
+    <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
+    <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="1" />
+    <language slang="l:c9d137c4-3259-44f8-80ff-33ab2b506ee4:jetbrains.mps.lang.util.order" version="0" />
+    <language slang="l:696c1165-4a59-463b-bc5d-902caab85dd0:jetbrains.mps.make.facet" version="0" />
+  </languageVersions>
+  <dependencyVersions>
+    <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
+    <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
+    <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
+    <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
+    <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
+    <module reference="fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)" version="0" />
+    <module reference="83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)" version="0" />
+    <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
+    <module reference="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c(jetbrains.mps.coderules)" version="0" />
+    <module reference="942985d5-7bcf-46ee-8b79-7b662eaebb4e(jetbrains.mps.dataform)" version="0" />
+    <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
+    <module reference="c4803b19-6d89-4a3b-bf82-390769514add(jetbrains.mps.lang.coderules)" version="0" />
+    <module reference="2e120f68-abfb-4980-bb1c-bc70159b1f95(jetbrains.mps.lang.controlflow)" version="0" />
+    <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
+    <module reference="f4ad079d-bc71-4ffb-9600-9328705cf998(jetbrains.mps.lang.descriptor)" version="0" />
+    <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
+    <module reference="446c26eb-2b7b-4bf0-9b35-f83fa582753e(jetbrains.mps.lang.modelapi)" version="0" />
+    <module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="1" />
+    <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
+    <module reference="35320f26-77cb-4c55-be9f-a97a27770af1(jetbrains.mps.logic)" version="0" />
+  </dependencyVersions>
+  <extendedLanguages>
+    <extendedLanguage>c4803b19-6d89-4a3b-bf82-390769514add(jetbrains.mps.lang.coderules)</extendedLanguage>
+  </extendedLanguages>
+</language>
+
diff --git a/controlflow/languages/jetbrains.mps.lang.controlflow/models/behavior.mps b/controlflow/languages/jetbrains.mps.lang.controlflow/models/behavior.mps
new file mode 100644
index 00000000..446246f7
--- /dev/null
+++ b/controlflow/languages/jetbrains.mps.lang.controlflow/models/behavior.mps
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model ref="r:ab67c11c-5d04-4721-93bf-69a8fd4ca5dd(jetbrains.mps.lang.controlflow.behavior)">
+  <persistence version="9" />
+  <languages>
+    <use id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior" version="1" />
+    <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
+  </languages>
+  <imports />
+  <registry />
+</model>
+
diff --git a/controlflow/languages/jetbrains.mps.lang.controlflow/models/constraints.mps b/controlflow/languages/jetbrains.mps.lang.controlflow/models/constraints.mps
new file mode 100644
index 00000000..4116ee75
--- /dev/null
+++ b/controlflow/languages/jetbrains.mps.lang.controlflow/models/constraints.mps
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model ref="r:8cd6dfa2-2ff4-42f2-82df-5e0463e7dd79(jetbrains.mps.lang.controlflow.constraints)">
+  <persistence version="9" />
+  <languages>
+    <use id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" name="jetbrains.mps.lang.constraints" version="4" />
+    <devkit ref="00000000-0000-4000-0000-5604ebd4f22c(jetbrains.mps.devkit.aspect.constraints)" />
+  </languages>
+  <imports />
+  <registry />
+</model>
+
diff --git a/controlflow/languages/jetbrains.mps.lang.controlflow/models/editor.mps b/controlflow/languages/jetbrains.mps.lang.controlflow/models/editor.mps
new file mode 100644
index 00000000..edf52817
--- /dev/null
+++ b/controlflow/languages/jetbrains.mps.lang.controlflow/models/editor.mps
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model ref="r:8f5297f2-a3b0-4e96-9303-d7a878892926(jetbrains.mps.lang.controlflow.editor)">
+  <persistence version="9" />
+  <languages>
+    <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="11" />
+    <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
+  </languages>
+  <imports />
+  <registry />
+</model>
+
diff --git a/controlflow/languages/jetbrains.mps.lang.controlflow/models/plugin.mps b/controlflow/languages/jetbrains.mps.lang.controlflow/models/plugin.mps
new file mode 100644
index 00000000..9858d053
--- /dev/null
+++ b/controlflow/languages/jetbrains.mps.lang.controlflow/models/plugin.mps
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model ref="r:1e2f03b6-f778-4cc1-92d4-edb9161f4aa6(jetbrains.mps.lang.controlflow.plugin)">
+  <persistence version="9" />
+  <languages>
+    <use id="f159adf4-3c93-40f9-9c5a-1f245a8697af" name="jetbrains.mps.lang.aspect" version="2" />
+    <use id="696c1165-4a59-463b-bc5d-902caab85dd0" name="jetbrains.mps.make.facet" version="0" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="2" />
+    <use id="c9d137c4-3259-44f8-80ff-33ab2b506ee4" name="jetbrains.mps.lang.util.order" version="0" />
+    <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
+  </languages>
+  <imports />
+  <registry>
+    <language id="f159adf4-3c93-40f9-9c5a-1f245a8697af" name="jetbrains.mps.lang.aspect">
+      <concept id="3433054418424672374" name="jetbrains.mps.lang.aspect.structure.SimpleLanguageAspectDescriptor" flags="ng" index="3vrhyV">
+        <child id="6106419185511570295" name="mainLanguages" index="QG$2i" />
+      </concept>
+    </language>
+    <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
+      <concept id="3542851458883438784" name="jetbrains.mps.lang.smodel.structure.LanguageId" flags="nn" index="2V$Bhx">
+        <property id="3542851458883439831" name="namespace" index="2V$B1Q" />
+        <property id="3542851458883439832" name="languageId" index="2V$B1T" />
+      </concept>
+    </language>
+    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+        <property id="1169194664001" name="name" index="TrG5h" />
+      </concept>
+    </language>
+  </registry>
+  <node concept="3vrhyV" id="7km57PkcIgQ">
+    <property role="TrG5h" value="controlflow" />
+    <node concept="2V$Bhx" id="78H58oe2B0L" role="QG$2i">
+      <property role="2V$B1T" value="2e120f68-abfb-4980-bb1c-bc70159b1f95" />
+      <property role="2V$B1Q" value="jetbrains.mps.lang.controlflow" />
+    </node>
+  </node>
+</model>
+
diff --git a/controlflow/languages/jetbrains.mps.lang.controlflow/models/structure.mps b/controlflow/languages/jetbrains.mps.lang.controlflow/models/structure.mps
new file mode 100644
index 00000000..5225f7bd
--- /dev/null
+++ b/controlflow/languages/jetbrains.mps.lang.controlflow/models/structure.mps
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model ref="r:9d6fe210-6699-4ffe-b3e4-567da3cd1f1d(jetbrains.mps.lang.controlflow.structure)">
+  <persistence version="9" />
+  <languages>
+    <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="6" />
+    <devkit ref="78434eb8-b0e5-444b-850d-e7c4ad2da9ab(jetbrains.mps.devkit.aspect.structure)" />
+  </languages>
+  <imports />
+  <registry />
+</model>
+
diff --git a/controlflow/languages/jetbrains.mps.lang.controlflow/models/typesystem.mps b/controlflow/languages/jetbrains.mps.lang.controlflow/models/typesystem.mps
new file mode 100644
index 00000000..610ddb49
--- /dev/null
+++ b/controlflow/languages/jetbrains.mps.lang.controlflow/models/typesystem.mps
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model ref="r:f19bed53-b05b-4c70-8516-9de1db10b1ae(jetbrains.mps.lang.controlflow.typesystem)">
+  <persistence version="9" />
+  <languages>
+    <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="1" />
+    <devkit ref="00000000-0000-4000-0000-1de82b3a4936(jetbrains.mps.devkit.aspect.typesystem)" />
+  </languages>
+  <imports />
+  <registry />
+</model>
+
diff --git a/controlflow/solutions/jetbrains.mps.controlflow.ui/jetbrains.mps.controlflow.ui.msd b/controlflow/solutions/jetbrains.mps.controlflow.ui/jetbrains.mps.controlflow.ui.msd
new file mode 100644
index 00000000..2b7a91fd
--- /dev/null
+++ b/controlflow/solutions/jetbrains.mps.controlflow.ui/jetbrains.mps.controlflow.ui.msd
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<solution name="jetbrains.mps.controlflow.ui" uuid="eacb1d2f-fed3-4344-a1dd-143fac2e9c20" moduleVersion="0" compileInMPS="true">
+  <models>
+    <modelRoot contentPath="${module}" type="default">
+      <sourceRoot location="models" />
+    </modelRoot>
+  </models>
+  <sourcePath />
+  <languageVersions>
+    <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="6" />
+    <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
+    <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
+    <language slang="l:fe9d76d7-5809-45c9-ae28-a40915b4d6ff:jetbrains.mps.lang.checkedName" version="0" />
+    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="2" />
+    <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
+    <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
+  </languageVersions>
+  <dependencyVersions>
+    <module reference="eacb1d2f-fed3-4344-a1dd-143fac2e9c20(jetbrains.mps.controlflow.ui)" version="0" />
+  </dependencyVersions>
+</solution>
+
diff --git a/controlflow/solutions/jetbrains.mps.controlflow.ui/models/plugin.mps b/controlflow/solutions/jetbrains.mps.controlflow.ui/models/plugin.mps
new file mode 100644
index 00000000..1c1496cc
--- /dev/null
+++ b/controlflow/solutions/jetbrains.mps.controlflow.ui/models/plugin.mps
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model ref="r:b859c207-50e8-4b38-8c4f-e5c74daf3d45(jetbrains.mps.controlflow.ui.plugin)">
+  <persistence version="9" />
+  <languages>
+    <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="0" />
+  </languages>
+  <imports />
+  <registry>
+    <language id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone">
+      <concept id="7520713872864775836" name="jetbrains.mps.lang.plugin.standalone.structure.StandalonePluginDescriptor" flags="ng" index="2DaZZR" />
+    </language>
+  </registry>
+  <node concept="2DaZZR" id="NKt6ynodGH" />
+</model>
+
diff --git a/controlflow/solutions/jetbrains.mps.controlflow/jetbrains.mps.controlflow.msd b/controlflow/solutions/jetbrains.mps.controlflow/jetbrains.mps.controlflow.msd
new file mode 100644
index 00000000..c9a13c3f
--- /dev/null
+++ b/controlflow/solutions/jetbrains.mps.controlflow/jetbrains.mps.controlflow.msd
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<solution name="jetbrains.mps.controlflow" uuid="517911e5-605f-4310-831b-10d44e0f5237" moduleVersion="0" compileInMPS="true">
+  <models>
+    <modelRoot contentPath="${module}" type="default">
+      <sourceRoot location="models" />
+    </modelRoot>
+  </models>
+  <sourcePath />
+  <languageVersions />
+  <dependencyVersions>
+    <module reference="517911e5-605f-4310-831b-10d44e0f5237(jetbrains.mps.controlflow)" version="0" />
+  </dependencyVersions>
+</solution>
+
diff --git a/controlflow/solutions/jetbrains.mps.controlflow/models/service.mps b/controlflow/solutions/jetbrains.mps.controlflow/models/service.mps
new file mode 100644
index 00000000..97f46324
--- /dev/null
+++ b/controlflow/solutions/jetbrains.mps.controlflow/models/service.mps
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model ref="r:5cb7c45c-18d8-4304-8c38-29c80242b908(jetbrains.mps.controlflow.service)">
+  <persistence version="9" />
+  <languages />
+  <imports />
+  <registry />
+</model>
+
diff --git a/controlflow/solutions/jetbrains.mps.lang.controlflow.runtime/jetbrains.mps.lang.controlflow.runtime.msd b/controlflow/solutions/jetbrains.mps.lang.controlflow.runtime/jetbrains.mps.lang.controlflow.runtime.msd
new file mode 100644
index 00000000..fc2a1863
--- /dev/null
+++ b/controlflow/solutions/jetbrains.mps.lang.controlflow.runtime/jetbrains.mps.lang.controlflow.runtime.msd
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<solution name="jetbrains.mps.lang.controlflow.runtime" uuid="ffcd9ef5-e931-4da9-a8d1-eb9bf80d19b4" moduleVersion="0" compileInMPS="true">
+  <models>
+    <modelRoot contentPath="${module}" type="default">
+      <sourceRoot location="models" />
+    </modelRoot>
+  </models>
+  <sourcePath />
+  <dependencies>
+    <dependency reexport="true">ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)</dependency>
+    <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
+    <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
+    <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
+  </dependencies>
+  <languageVersions>
+    <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="6" />
+    <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="0" />
+    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
+    <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="11" />
+    <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
+  </languageVersions>
+  <dependencyVersions>
+    <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
+    <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
+    <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
+    <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
+    <module reference="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" version="0" />
+    <module reference="ffcd9ef5-e931-4da9-a8d1-eb9bf80d19b4(jetbrains.mps.lang.controlflow.runtime)" version="0" />
+    <module reference="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" version="0" />
+    <module reference="da80355b-a098-4248-9ec8-70d10dd7e9af(jetbrains.mps.typechecking.reporting)" version="0" />
+  </dependencyVersions>
+</solution>
+
diff --git a/controlflow/solutions/jetbrains.mps.lang.controlflow.runtime/models/jetbrains.mps.lang.controlflow.aspect.mps b/controlflow/solutions/jetbrains.mps.lang.controlflow.runtime/models/jetbrains.mps.lang.controlflow.aspect.mps
new file mode 100644
index 00000000..d94dff39
--- /dev/null
+++ b/controlflow/solutions/jetbrains.mps.lang.controlflow.runtime/models/jetbrains.mps.lang.controlflow.aspect.mps
@@ -0,0 +1,327 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model ref="r:bf5143f7-9856-43e8-8ae7-57cecc1fe6a9(jetbrains.mps.lang.controlflow.aspect)">
+  <persistence version="9" />
+  <languages>
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="11" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="0" />
+    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="6" />
+  </languages>
+  <imports>
+    <import index="fqlx" ref="r:2cc226a9-8a78-4010-b962-823343fd28ff(jetbrains.mps.lang.coderules.aspect)" />
+    <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" />
+    <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
+    <import index="i348" ref="r:42a15dec-83a9-4fe1-80d6-3bf898c512bd(jetbrains.mps.lang.coderules.template)" />
+    <import index="psr6" ref="r:ce187d46-c94b-47d6-8d77-26aa6af239e8(jetbrains.mps.lang.coderules.macro)" />
+    <import index="ze1i" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel.runtime(MPS.Core/)" />
+    <import index="vndm" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel.language(MPS.Core/)" />
+    <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
+  </imports>
+  <registry>
+    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
+      <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
+      <concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="ng" index="2tJIrI" />
+      <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
+        <child id="1197027771414" name="operand" index="2Oq$k0" />
+        <child id="1197027833540" name="operation" index="2OqNvi" />
+      </concept>
+      <concept id="1081236700938" name="jetbrains.mps.baseLanguage.structure.StaticMethodDeclaration" flags="ig" index="2YIFZL" />
+      <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
+        <reference id="1144433194310" name="classConcept" index="1Pybhc" />
+      </concept>
+      <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu">
+        <property id="1075300953594" name="abstractClass" index="1sVAO0" />
+        <child id="1095933932569" name="implementedInterface" index="EKbjA" />
+        <child id="1165602531693" name="superclass" index="1zkMxy" />
+      </concept>
+      <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
+        <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
+      </concept>
+      <concept id="1068498886292" name="jetbrains.mps.baseLanguage.structure.ParameterDeclaration" flags="ir" index="37vLTG" />
+      <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
+        <child id="5680397130376446158" name="type" index="1tU5fm" />
+      </concept>
+      <concept id="1068580123132" name="jetbrains.mps.baseLanguage.structure.BaseMethodDeclaration" flags="ng" index="3clF44">
+        <property id="4276006055363816570" name="isSynchronized" index="od$2w" />
+        <property id="1181808852946" name="isFinal" index="DiZV1" />
+        <child id="1068580123133" name="returnType" index="3clF45" />
+        <child id="1068580123134" name="parameter" index="3clF46" />
+        <child id="1068580123135" name="body" index="3clF47" />
+      </concept>
+      <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
+        <child id="1068580123156" name="expression" index="3clFbG" />
+      </concept>
+      <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
+        <child id="1068581517665" name="statement" index="3cqZAp" />
+      </concept>
+      <concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
+        <child id="1068581517676" name="expression" index="3cqZAk" />
+      </concept>
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+        <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
+        <child id="1068499141038" name="actualArgument" index="37wK5m" />
+      </concept>
+      <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
+        <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
+      </concept>
+      <concept id="7812454656619025412" name="jetbrains.mps.baseLanguage.structure.LocalMethodCall" flags="nn" index="1rXfSq" />
+      <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
+        <reference id="1107535924139" name="classifier" index="3uigEE" />
+        <child id="1109201940907" name="parameter" index="11_B2D" />
+      </concept>
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+        <child id="1178549979242" name="visibility" index="1B3o_S" />
+      </concept>
+      <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
+      <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
+      <concept id="1116615150612" name="jetbrains.mps.baseLanguage.structure.ClassifierClassExpression" flags="nn" index="3VsKOn">
+        <reference id="1116615189566" name="classifier" index="3VsUkX" />
+      </concept>
+    </language>
+    <language id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc">
+      <concept id="5349172909345501395" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseDocComment" flags="ng" index="P$AiS">
+        <child id="8465538089690331502" name="body" index="TZ5H$" />
+      </concept>
+      <concept id="8465538089690331500" name="jetbrains.mps.baseLanguage.javadoc.structure.CommentLine" flags="ng" index="TZ5HA">
+        <child id="8970989240999019149" name="part" index="1dT_Ay" />
+      </concept>
+      <concept id="8970989240999019143" name="jetbrains.mps.baseLanguage.javadoc.structure.TextCommentLinePart" flags="ng" index="1dT_AC">
+        <property id="8970989240999019144" name="text" index="1dT_AB" />
+      </concept>
+      <concept id="2068944020170241612" name="jetbrains.mps.baseLanguage.javadoc.structure.ClassifierDocComment" flags="ng" index="3UR2Jj" />
+    </language>
+    <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
+      <concept id="1143226024141" name="jetbrains.mps.lang.smodel.structure.SModelType" flags="in" index="H_c77" />
+    </language>
+    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
+      <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
+        <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
+      </concept>
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+        <property id="1169194664001" name="name" index="TrG5h" />
+      </concept>
+    </language>
+    <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
+      <concept id="7125221305512719026" name="jetbrains.mps.baseLanguage.collections.structure.CollectionType" flags="in" index="3vKaQO" />
+      <concept id="5686963296372573083" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerType" flags="in" index="3O5elB">
+        <child id="5686963296372573084" name="elementType" index="3O5elw" />
+      </concept>
+    </language>
+  </registry>
+  <node concept="312cEu" id="7km57Pkjxf4">
+    <property role="TrG5h" value="ControlflowAspect" />
+    <property role="1sVAO0" value="true" />
+    <node concept="2tJIrI" id="78H58oefMK4" role="jymVt" />
+    <node concept="2YIFZL" id="2hteS6Cndm6" role="jymVt">
+      <property role="TrG5h" value="forLanguage" />
+      <node concept="37vLTG" id="2hteS6Cndm7" role="3clF46">
+        <property role="TrG5h" value="slang" />
+        <node concept="3uibUv" id="2hteS6Cndm8" role="1tU5fm">
+          <ref role="3uigEE" to="c17a:~SLanguage" resolve="SLanguage" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="2hteS6Cndm9" role="3clF46">
+        <property role="TrG5h" value="repository" />
+        <node concept="3uibUv" id="3GlpCDS_m$F" role="1tU5fm">
+          <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+        </node>
+      </node>
+      <node concept="3uibUv" id="78H58oefNdl" role="3clF45">
+        <ref role="3uigEE" node="7km57Pkjxf4" resolve="ControlflowAspect" />
+      </node>
+      <node concept="3Tm1VV" id="2hteS6Cndmc" role="1B3o_S" />
+      <node concept="3clFbS" id="2hteS6Cndmd" role="3clF47">
+        <node concept="3clFbF" id="NKt6ynqkPu" role="3cqZAp">
+          <node concept="2OqwBi" id="NKt6ynqlte" role="3clFbG">
+            <node concept="liA8E" id="NKt6ynqlFW" role="2OqNvi">
+              <ref role="37wK5l" to="fqlx:NKt6ynp3Wc" resolve="forLanguage" />
+              <node concept="37vLTw" id="NKt6ynqlMF" role="37wK5m">
+                <ref role="3cqZAo" node="2hteS6Cndm7" resolve="slang" />
+              </node>
+              <node concept="37vLTw" id="NKt6ynqlZL" role="37wK5m">
+                <ref role="3cqZAo" node="2hteS6Cndm9" resolve="repository" />
+              </node>
+            </node>
+            <node concept="2YIFZM" id="78H58oefVIX" role="2Oq$k0">
+              <ref role="1Pybhc" to="fqlx:NKt6ynorWQ" resolve="AspectLookup" />
+              <ref role="37wK5l" to="fqlx:78H58oefSjC" resolve="lookup" />
+              <node concept="1rXfSq" id="78H58oefWuI" role="37wK5m">
+                <ref role="37wK5l" node="78H58oefGzt" resolve="controlflowDiscoverable" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="6UWSvq5bjXg" role="jymVt" />
+    <node concept="2YIFZL" id="7P_FdVPW9uU" role="jymVt">
+      <property role="TrG5h" value="allForModel" />
+      <node concept="37vLTG" id="7P_FdVPWb2y" role="3clF46">
+        <property role="TrG5h" value="model" />
+        <node concept="H_c77" id="7P_FdVPWp2I" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="7P_FdVPWb2$" role="3clF46">
+        <property role="TrG5h" value="repository" />
+        <node concept="3uibUv" id="7P_FdVPWb2_" role="1tU5fm">
+          <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+        </node>
+      </node>
+      <node concept="3vKaQO" id="7P_FdVPWaUF" role="3clF45">
+        <node concept="3uibUv" id="78H58oefO8e" role="3O5elw">
+          <ref role="3uigEE" node="7km57Pkjxf4" resolve="ControlflowAspect" />
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="7P_FdVPW9uX" role="1B3o_S" />
+      <node concept="3clFbS" id="7P_FdVPW9uY" role="3clF47">
+        <node concept="3clFbF" id="NKt6ynqt5n" role="3cqZAp">
+          <node concept="2OqwBi" id="NKt6ynqt5o" role="3clFbG">
+            <node concept="liA8E" id="NKt6ynqt5u" role="2OqNvi">
+              <ref role="37wK5l" to="fqlx:NKt6ynoYr0" resolve="allForModel" />
+              <node concept="37vLTw" id="NKt6ynqtVi" role="37wK5m">
+                <ref role="3cqZAo" node="7P_FdVPWb2y" resolve="model" />
+              </node>
+              <node concept="37vLTw" id="NKt6ynqt5w" role="37wK5m">
+                <ref role="3cqZAo" node="7P_FdVPWb2$" resolve="repository" />
+              </node>
+            </node>
+            <node concept="2YIFZM" id="78H58oefWHA" role="2Oq$k0">
+              <ref role="37wK5l" to="fqlx:78H58oefSjC" resolve="lookup" />
+              <ref role="1Pybhc" to="fqlx:NKt6ynorWQ" resolve="AspectLookup" />
+              <node concept="1rXfSq" id="78H58oefWHB" role="37wK5m">
+                <ref role="37wK5l" node="78H58oefGzt" resolve="controlflowDiscoverable" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="7P_FdVQ35vN" role="jymVt" />
+    <node concept="2YIFZL" id="7P_FdVPWn7D" role="jymVt">
+      <property role="TrG5h" value="allForLanguage" />
+      <node concept="37vLTG" id="7P_FdVPWn7E" role="3clF46">
+        <property role="TrG5h" value="slang" />
+        <node concept="3uibUv" id="7P_FdVPWn7F" role="1tU5fm">
+          <ref role="3uigEE" to="c17a:~SLanguage" resolve="SLanguage" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="7P_FdVPWn7G" role="3clF46">
+        <property role="TrG5h" value="repository" />
+        <node concept="3uibUv" id="7P_FdVPWn7H" role="1tU5fm">
+          <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+        </node>
+      </node>
+      <node concept="3vKaQO" id="7P_FdVPWn7I" role="3clF45">
+        <node concept="3uibUv" id="78H58oefOc5" role="3O5elw">
+          <ref role="3uigEE" node="7km57Pkjxf4" resolve="ControlflowAspect" />
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="7P_FdVPWn7K" role="1B3o_S" />
+      <node concept="3clFbS" id="7P_FdVPWn7L" role="3clF47">
+        <node concept="3clFbF" id="NKt6ynquya" role="3cqZAp">
+          <node concept="2OqwBi" id="NKt6ynquyb" role="3clFbG">
+            <node concept="liA8E" id="NKt6ynquyh" role="2OqNvi">
+              <ref role="37wK5l" to="fqlx:NKt6ynoU4W" resolve="allForLanguage" />
+              <node concept="37vLTw" id="NKt6ynquyi" role="37wK5m">
+                <ref role="3cqZAo" node="7P_FdVPWn7E" resolve="slang" />
+              </node>
+              <node concept="37vLTw" id="NKt6ynquyj" role="37wK5m">
+                <ref role="3cqZAo" node="7P_FdVPWn7G" resolve="repository" />
+              </node>
+            </node>
+            <node concept="2YIFZM" id="78H58oefWMR" role="2Oq$k0">
+              <ref role="37wK5l" to="fqlx:78H58oefSjC" resolve="lookup" />
+              <ref role="1Pybhc" to="fqlx:NKt6ynorWQ" resolve="AspectLookup" />
+              <node concept="1rXfSq" id="78H58oefWMS" role="37wK5m">
+                <ref role="37wK5l" node="78H58oefGzt" resolve="controlflowDiscoverable" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="7P_FdVPWn7C" role="jymVt" />
+    <node concept="2YIFZL" id="7P_FdVPWjGf" role="jymVt">
+      <property role="DiZV1" value="false" />
+      <property role="od$2w" value="false" />
+      <property role="TrG5h" value="allForLanguage" />
+      <node concept="37vLTG" id="7P_FdVPWjGg" role="3clF46">
+        <property role="TrG5h" value="langrt" />
+        <node concept="3uibUv" id="7P_FdVPWjGh" role="1tU5fm">
+          <ref role="3uigEE" to="vndm:~LanguageRuntime" resolve="LanguageRuntime" />
+        </node>
+      </node>
+      <node concept="3clFbS" id="7P_FdVPWjGi" role="3clF47">
+        <node concept="3clFbF" id="NKt6ynqzV4" role="3cqZAp">
+          <node concept="2OqwBi" id="NKt6ynqzV5" role="3clFbG">
+            <node concept="liA8E" id="NKt6ynqzVb" role="2OqNvi">
+              <ref role="37wK5l" to="fqlx:NKt6ynoAJU" resolve="allForLanguage" />
+              <node concept="37vLTw" id="NKt6ynq$s_" role="37wK5m">
+                <ref role="3cqZAo" node="7P_FdVPWjGg" resolve="langrt" />
+              </node>
+            </node>
+            <node concept="2YIFZM" id="78H58oefWRp" role="2Oq$k0">
+              <ref role="37wK5l" to="fqlx:78H58oefSjC" resolve="lookup" />
+              <ref role="1Pybhc" to="fqlx:NKt6ynorWQ" resolve="AspectLookup" />
+              <node concept="1rXfSq" id="78H58oefWRq" role="37wK5m">
+                <ref role="37wK5l" node="78H58oefGzt" resolve="controlflowDiscoverable" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3vKaQO" id="7P_FdVPWlen" role="3clF45">
+        <node concept="3uibUv" id="78H58oefOfX" role="3O5elw">
+          <ref role="3uigEE" node="7km57Pkjxf4" resolve="ControlflowAspect" />
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="7P_FdVPWjGp" role="1B3o_S" />
+    </node>
+    <node concept="2tJIrI" id="7P_FdVPWjGe" role="jymVt" />
+    <node concept="2YIFZL" id="78H58oefGzt" role="jymVt">
+      <property role="TrG5h" value="controlflowDiscoverable" />
+      <node concept="3Tm6S6" id="78H58oefGzu" role="1B3o_S" />
+      <node concept="3uibUv" id="78H58oefGzv" role="3clF45">
+        <ref role="3uigEE" to="fqlx:NKt6ynom3d" resolve="AspectDiscoverable" />
+        <node concept="3uibUv" id="78H58oefNmj" role="11_B2D">
+          <ref role="3uigEE" node="7km57Pkjxf4" resolve="ControlflowAspect" />
+        </node>
+      </node>
+      <node concept="3clFbS" id="78H58oefGxh" role="3clF47">
+        <node concept="3cpWs6" id="78H58oefGyl" role="3cqZAp">
+          <node concept="2YIFZM" id="78H58oefKuE" role="3cqZAk">
+            <ref role="1Pybhc" to="fqlx:NKt6yp1COZ" resolve="DefaultCoderulesAspect" />
+            <ref role="37wK5l" to="fqlx:78H58oefoaA" resolve="discoverable" />
+            <node concept="3VsKOn" id="78H58oefGyn" role="37wK5m">
+              <ref role="3VsUkX" node="7km57Pkjxf4" resolve="ControlflowAspect" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="2hteS6Cleqc" role="jymVt" />
+    <node concept="2tJIrI" id="78H58oefMKa" role="jymVt" />
+    <node concept="3Tm1VV" id="7km57Pkjxf5" role="1B3o_S" />
+    <node concept="3uibUv" id="NKt6yomOJv" role="EKbjA">
+      <ref role="3uigEE" to="fqlx:NKt6yomNZE" resolve="CoderulesAspect" />
+    </node>
+    <node concept="3uibUv" id="7km57PkjxgV" role="EKbjA">
+      <ref role="3uigEE" to="ze1i:~ILanguageAspect" resolve="ILanguageAspect" />
+    </node>
+    <node concept="3UR2Jj" id="7P_FdVPWD2k" role="lGtFl">
+      <node concept="TZ5HA" id="7P_FdVPWD2l" role="TZ5H$">
+        <node concept="1dT_AC" id="7P_FdVPWD2m" role="1dT_Ay">
+          <property role="1dT_AB" value="All allFor* methods return the list sorted in topological order, so that the extending" />
+        </node>
+      </node>
+      <node concept="TZ5HA" id="7P_FdVPWEBW" role="TZ5H$">
+        <node concept="1dT_AC" id="7P_FdVPWEBX" role="1dT_Ay">
+          <property role="1dT_AB" value="aspects come first. " />
+        </node>
+      </node>
+    </node>
+    <node concept="3uibUv" id="NKt6yp1DsV" role="1zkMxy">
+      <ref role="3uigEE" to="fqlx:NKt6yp1COZ" resolve="DefaultCoderulesAspect" />
+    </node>
+  </node>
+</model>
+
diff --git a/typechecking/languages/jetbrains.mps.lang.typechecking/generator/template/main@generator.mps b/typechecking/languages/jetbrains.mps.lang.typechecking/generator/template/main@generator.mps
index cb5067b4..31a922b2 100644
--- a/typechecking/languages/jetbrains.mps.lang.typechecking/generator/template/main@generator.mps
+++ b/typechecking/languages/jetbrains.mps.lang.typechecking/generator/template/main@generator.mps
@@ -27,6 +27,10 @@
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
+      <concept id="1215693861676" name="jetbrains.mps.baseLanguage.structure.BaseAssignmentExpression" flags="nn" index="d038R">
+        <child id="1068498886297" name="rValue" index="37vLTx" />
+        <child id="1068498886295" name="lValue" index="37vLTJ" />
+      </concept>
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
         <child id="1197027771414" name="operand" index="2Oq$k0" />
         <child id="1197027833540" name="operation" index="2OqNvi" />
@@ -37,6 +41,7 @@
       <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
         <property id="1070475926801" name="value" index="Xl_RC" />
       </concept>
+      <concept id="1068498886294" name="jetbrains.mps.baseLanguage.structure.AssignmentExpression" flags="nn" index="37vLTI" />
       <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
         <child id="1068580123156" name="expression" index="3clFbG" />
       </concept>
@@ -92,10 +97,22 @@
       </concept>
     </language>
     <language id="d7706f63-9be2-479c-a3da-ae92af1e64d5" name="jetbrains.mps.lang.generator.generationContext">
+      <concept id="1217889960776" name="jetbrains.mps.lang.generator.generationContext.structure.GenerationContextOp_UserObjectAccessBase" flags="nn" index="2fTw9j">
+        <child id="1217890689512" name="userKey" index="2fWi3N" />
+      </concept>
+      <concept id="1217894033795" name="jetbrains.mps.lang.generator.generationContext.structure.GenerationContextOp_TransientObjectAccess" flags="nn" index="2g92yo" />
       <concept id="1216860049635" name="jetbrains.mps.lang.generator.generationContext.structure.TemplateFunctionParameter_generationContext" flags="nn" index="1iwH7S" />
       <concept id="1217026863835" name="jetbrains.mps.lang.generator.generationContext.structure.GenerationContextOp_GetOriginalInputModel" flags="nn" index="1st3f0" />
     </language>
+    <language id="446c26eb-2b7b-4bf0-9b35-f83fa582753e" name="jetbrains.mps.lang.modelapi">
+      <concept id="4733039728785194814" name="jetbrains.mps.lang.modelapi.structure.NamedNodeReference" flags="ng" index="ZC_QK">
+        <reference id="7256306938026143658" name="target" index="2aWVGs" />
+      </concept>
+    </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
+      <concept id="7400021826774799413" name="jetbrains.mps.lang.smodel.structure.NodePointerExpression" flags="ng" index="2tJFMh">
+        <child id="7400021826774799510" name="ref" index="2tJFKM" />
+      </concept>
       <concept id="1143226024141" name="jetbrains.mps.lang.smodel.structure.SModelType" flags="in" index="H_c77" />
       <concept id="1212008292747" name="jetbrains.mps.lang.smodel.structure.Model_GetLongNameOperation" flags="nn" index="LkI2h" />
       <concept id="1219352745532" name="jetbrains.mps.lang.smodel.structure.NodeRefExpression" flags="nn" index="3B5_sB">
@@ -115,7 +132,7 @@
     <property role="TrG5h" value="main" />
   </node>
   <node concept="jVnub" id="7km57PkguX9">
-    <property role="TrG5h" value="aspect_descriptor" />
+    <property role="TrG5h" value="instantiate_aspect_descriptor" />
     <property role="3GE5qa" value="aspect" />
     <ref role="phYkn" to="ucur:1KHvivZJsL7" resolve="InstantiateAspectDescriptor" />
     <node concept="3aamgX" id="7km57PkgvmN" role="3aUrZf">
@@ -135,7 +152,7 @@
           </node>
         </node>
         <node concept="3B5_sB" id="2hteS6Cje6U" role="v9R3O">
-          <ref role="3B5MYn" to="fqlx:NKt6yp1COZ" resolve="DefaultCoderulesAspect" />
+          <ref role="3B5MYn" to="u46i:7km57Pkjxf4" resolve="TypecheckingAspect" />
         </node>
       </node>
       <node concept="30G5F_" id="7km57PkgvmR" role="30HLyM">
@@ -165,6 +182,23 @@
       <ref role="2VPoh2" to="ogv8:7km57PkeUQV" resolve="AspectDescriptor" />
       <node concept="2VP$b9" id="7km57PkeXwK" role="2VPoh3">
         <node concept="3clFbS" id="7km57PkeXwL" role="2VODD2">
+          <node concept="3clFbF" id="78H58odLysS" role="3cqZAp">
+            <node concept="37vLTI" id="78H58odL$5P" role="3clFbG">
+              <node concept="2OqwBi" id="78H58odLyFa" role="37vLTJ">
+                <node concept="1iwH7S" id="78H58odLysQ" role="2Oq$k0" />
+                <node concept="2g92yo" id="78H58odLyR4" role="2OqNvi">
+                  <node concept="Xl_RD" id="78H58odLvyN" role="2fWi3N">
+                    <property role="Xl_RC" value="CODERULES_ASPECT_RUNTIME" />
+                  </node>
+                </node>
+              </node>
+              <node concept="2tJFMh" id="78H58odQ5Tl" role="37vLTx">
+                <node concept="ZC_QK" id="78H58odQ61O" role="2tJFKM">
+                  <ref role="2aWVGs" to="u46i:7km57Pkjxf4" resolve="TypecheckingAspect" />
+                </node>
+              </node>
+            </node>
+          </node>
           <node concept="3clFbF" id="7km57PkeXBU" role="3cqZAp">
             <node concept="2OqwBi" id="7km57PkeYm$" role="3clFbG">
               <node concept="2OqwBi" id="7km57PkeXPH" role="2Oq$k0">
diff --git a/typechecking/solutions/jetbrains.mps.lang.typechecking.runtime/models/jetbrains.mps.lang.typechecking.aspect.mps b/typechecking/solutions/jetbrains.mps.lang.typechecking.runtime/models/jetbrains.mps.lang.typechecking.aspect.mps
index 5d8ad1fc..eb43b39b 100644
--- a/typechecking/solutions/jetbrains.mps.lang.typechecking.runtime/models/jetbrains.mps.lang.typechecking.aspect.mps
+++ b/typechecking/solutions/jetbrains.mps.lang.typechecking.runtime/models/jetbrains.mps.lang.typechecking.aspect.mps
@@ -22,32 +22,19 @@
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
       <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
       <concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="ng" index="2tJIrI" />
-      <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
-        <reference id="1188208074048" name="annotation" index="2AI5Lk" />
-      </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
-        <child id="1188208488637" name="annotation" index="2AJF6D" />
-      </concept>
-      <concept id="2820489544401957797" name="jetbrains.mps.baseLanguage.structure.DefaultClassCreator" flags="nn" index="HV5vD">
-        <reference id="2820489544401957798" name="classifier" index="HV5vE" />
-      </concept>
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
         <child id="1197027771414" name="operand" index="2Oq$k0" />
         <child id="1197027833540" name="operation" index="2OqNvi" />
       </concept>
-      <concept id="1145552977093" name="jetbrains.mps.baseLanguage.structure.GenericNewExpression" flags="nn" index="2ShNRf">
-        <child id="1145553007750" name="creator" index="2ShVmc" />
-      </concept>
       <concept id="1081236700938" name="jetbrains.mps.baseLanguage.structure.StaticMethodDeclaration" flags="ig" index="2YIFZL" />
-      <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
+      <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
+        <reference id="1144433194310" name="classConcept" index="1Pybhc" />
+      </concept>
       <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu">
         <property id="1075300953594" name="abstractClass" index="1sVAO0" />
         <child id="1095933932569" name="implementedInterface" index="EKbjA" />
         <child id="1165602531693" name="superclass" index="1zkMxy" />
       </concept>
-      <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
-        <child id="1068431790190" name="initializer" index="33vP2m" />
-      </concept>
       <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
         <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
       </concept>
@@ -62,48 +49,32 @@
         <child id="1068580123134" name="parameter" index="3clF46" />
         <child id="1068580123135" name="body" index="3clF47" />
       </concept>
-      <concept id="1068580123165" name="jetbrains.mps.baseLanguage.structure.InstanceMethodDeclaration" flags="ig" index="3clFb_">
-        <property id="1178608670077" name="isAbstract" index="1EzhhJ" />
-      </concept>
-      <concept id="1068580123152" name="jetbrains.mps.baseLanguage.structure.EqualsExpression" flags="nn" index="3clFbC" />
       <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
         <child id="1068580123156" name="expression" index="3clFbG" />
       </concept>
-      <concept id="1068580123159" name="jetbrains.mps.baseLanguage.structure.IfStatement" flags="nn" index="3clFbJ">
-        <child id="1068580123160" name="condition" index="3clFbw" />
-        <child id="1068580123161" name="ifTrue" index="3clFbx" />
-      </concept>
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
-        <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
+      <concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
+        <child id="1068581517676" name="expression" index="3cqZAk" />
       </concept>
-      <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
-      <concept id="1212685548494" name="jetbrains.mps.baseLanguage.structure.ClassCreator" flags="nn" index="1pGfFk">
-        <child id="1212687122400" name="typeParameter" index="1pMfVU" />
-      </concept>
       <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
-        <property id="521412098689998745" name="nonStatic" index="2bfB8j" />
         <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
       </concept>
+      <concept id="7812454656619025412" name="jetbrains.mps.baseLanguage.structure.LocalMethodCall" flags="nn" index="1rXfSq" />
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
         <child id="1109201940907" name="parameter" index="11_B2D" />
       </concept>
-      <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
-        <child id="1081773367579" name="rightExpression" index="3uHU7w" />
-        <child id="1081773367580" name="leftExpression" index="3uHU7B" />
-      </concept>
-      <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
       <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
+      <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
       <concept id="1116615150612" name="jetbrains.mps.baseLanguage.structure.ClassifierClassExpression" flags="nn" index="3VsKOn">
         <reference id="1116615189566" name="classifier" index="3VsUkX" />
       </concept>
@@ -156,24 +127,18 @@
           <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
         </node>
       </node>
-      <node concept="3uibUv" id="NKt6yoQCF0" role="3clF45">
-        <ref role="3uigEE" to="fqlx:NKt6yomNZE" resolve="CoderulesAspect" />
+      <node concept="3uibUv" id="78H58oe2vCL" role="3clF45">
+        <ref role="3uigEE" node="7km57Pkjxf4" resolve="TypecheckingAspect" />
       </node>
       <node concept="3Tm1VV" id="2hteS6Cndmc" role="1B3o_S" />
       <node concept="3clFbS" id="2hteS6Cndmd" role="3clF47">
         <node concept="3clFbF" id="NKt6ynqkPu" role="3cqZAp">
           <node concept="2OqwBi" id="NKt6ynqlte" role="3clFbG">
-            <node concept="2ShNRf" id="NKt6ynqkPq" role="2Oq$k0">
-              <node concept="1pGfFk" id="NKt6ynql7n" role="2ShVmc">
-                <ref role="37wK5l" to="fqlx:NKt6yno$sR" resolve="AspectLookup" />
-                <node concept="2ShNRf" id="NKt6ynql9X" role="37wK5m">
-                  <node concept="HV5vD" id="NKt6ynqlji" role="2ShVmc">
-                    <ref role="HV5vE" node="NKt6ynqgZw" resolve="TypecheckingAspect.CoderulesAspectDiscoverable" />
-                  </node>
-                </node>
-                <node concept="3uibUv" id="NKt6yoQDGr" role="1pMfVU">
-                  <ref role="3uigEE" to="fqlx:NKt6yomNZE" resolve="CoderulesAspect" />
-                </node>
+            <node concept="2YIFZM" id="78H58oefVIX" role="2Oq$k0">
+              <ref role="37wK5l" to="fqlx:78H58oefSjC" resolve="lookup" />
+              <ref role="1Pybhc" to="fqlx:NKt6ynorWQ" resolve="AspectLookup" />
+              <node concept="1rXfSq" id="78H58oefJz9" role="37wK5m">
+                <ref role="37wK5l" node="78H58oefGzt" resolve="typecheckingDiscoverable" />
               </node>
             </node>
             <node concept="liA8E" id="NKt6ynqlFW" role="2OqNvi">
@@ -203,27 +168,14 @@
         </node>
       </node>
       <node concept="3vKaQO" id="7P_FdVPWaUF" role="3clF45">
-        <node concept="3uibUv" id="NKt6yoQCQN" role="3O5elw">
-          <ref role="3uigEE" to="fqlx:NKt6yomNZE" resolve="CoderulesAspect" />
+        <node concept="3uibUv" id="78H58oe2xvT" role="3O5elw">
+          <ref role="3uigEE" node="7km57Pkjxf4" resolve="TypecheckingAspect" />
         </node>
       </node>
       <node concept="3Tm1VV" id="7P_FdVPW9uX" role="1B3o_S" />
       <node concept="3clFbS" id="7P_FdVPW9uY" role="3clF47">
         <node concept="3clFbF" id="NKt6ynqt5n" role="3cqZAp">
           <node concept="2OqwBi" id="NKt6ynqt5o" role="3clFbG">
-            <node concept="2ShNRf" id="NKt6ynqt5p" role="2Oq$k0">
-              <node concept="1pGfFk" id="NKt6ynqt5q" role="2ShVmc">
-                <ref role="37wK5l" to="fqlx:NKt6yno$sR" resolve="AspectLookup" />
-                <node concept="2ShNRf" id="NKt6ynqt5r" role="37wK5m">
-                  <node concept="HV5vD" id="NKt6ynqt5s" role="2ShVmc">
-                    <ref role="HV5vE" node="NKt6ynqgZw" resolve="TypecheckingAspect.CoderulesAspectDiscoverable" />
-                  </node>
-                </node>
-                <node concept="3uibUv" id="NKt6yoQDx4" role="1pMfVU">
-                  <ref role="3uigEE" to="fqlx:NKt6yomNZE" resolve="CoderulesAspect" />
-                </node>
-              </node>
-            </node>
             <node concept="liA8E" id="NKt6ynqt5u" role="2OqNvi">
               <ref role="37wK5l" to="fqlx:NKt6ynoYr0" resolve="allForModel" />
               <node concept="37vLTw" id="NKt6ynqtVi" role="37wK5m">
@@ -233,6 +185,13 @@
                 <ref role="3cqZAo" node="7P_FdVPWb2$" resolve="repository" />
               </node>
             </node>
+            <node concept="2YIFZM" id="78H58oefVUw" role="2Oq$k0">
+              <ref role="1Pybhc" to="fqlx:NKt6ynorWQ" resolve="AspectLookup" />
+              <ref role="37wK5l" to="fqlx:78H58oefSjC" resolve="lookup" />
+              <node concept="1rXfSq" id="78H58oefVUx" role="37wK5m">
+                <ref role="37wK5l" node="78H58oefGzt" resolve="typecheckingDiscoverable" />
+              </node>
+            </node>
           </node>
         </node>
       </node>
@@ -253,27 +212,14 @@
         </node>
       </node>
       <node concept="3vKaQO" id="7P_FdVPWn7I" role="3clF45">
-        <node concept="3uibUv" id="NKt6yoQCXl" role="3O5elw">
-          <ref role="3uigEE" to="fqlx:NKt6yomNZE" resolve="CoderulesAspect" />
+        <node concept="3uibUv" id="78H58oe2xpU" role="3O5elw">
+          <ref role="3uigEE" node="7km57Pkjxf4" resolve="TypecheckingAspect" />
         </node>
       </node>
       <node concept="3Tm1VV" id="7P_FdVPWn7K" role="1B3o_S" />
       <node concept="3clFbS" id="7P_FdVPWn7L" role="3clF47">
         <node concept="3clFbF" id="NKt6ynquya" role="3cqZAp">
           <node concept="2OqwBi" id="NKt6ynquyb" role="3clFbG">
-            <node concept="2ShNRf" id="NKt6ynquyc" role="2Oq$k0">
-              <node concept="1pGfFk" id="NKt6ynquyd" role="2ShVmc">
-                <ref role="37wK5l" to="fqlx:NKt6yno$sR" resolve="AspectLookup" />
-                <node concept="2ShNRf" id="NKt6ynquye" role="37wK5m">
-                  <node concept="HV5vD" id="NKt6ynquyf" role="2ShVmc">
-                    <ref role="HV5vE" node="NKt6ynqgZw" resolve="TypecheckingAspect.CoderulesAspectDiscoverable" />
-                  </node>
-                </node>
-                <node concept="3uibUv" id="NKt6yoQDlF" role="1pMfVU">
-                  <ref role="3uigEE" to="fqlx:NKt6yomNZE" resolve="CoderulesAspect" />
-                </node>
-              </node>
-            </node>
             <node concept="liA8E" id="NKt6ynquyh" role="2OqNvi">
               <ref role="37wK5l" to="fqlx:NKt6ynoU4W" resolve="allForLanguage" />
               <node concept="37vLTw" id="NKt6ynquyi" role="37wK5m">
@@ -283,6 +229,13 @@
                 <ref role="3cqZAo" node="7P_FdVPWn7G" resolve="repository" />
               </node>
             </node>
+            <node concept="2YIFZM" id="78H58oefW3x" role="2Oq$k0">
+              <ref role="1Pybhc" to="fqlx:NKt6ynorWQ" resolve="AspectLookup" />
+              <ref role="37wK5l" to="fqlx:78H58oefSjC" resolve="lookup" />
+              <node concept="1rXfSq" id="78H58oefW3y" role="37wK5m">
+                <ref role="37wK5l" node="78H58oefGzt" resolve="typecheckingDiscoverable" />
+              </node>
+            </node>
           </node>
         </node>
       </node>
@@ -301,153 +254,49 @@
       <node concept="3clFbS" id="7P_FdVPWjGi" role="3clF47">
         <node concept="3clFbF" id="NKt6ynqzV4" role="3cqZAp">
           <node concept="2OqwBi" id="NKt6ynqzV5" role="3clFbG">
-            <node concept="2ShNRf" id="NKt6ynqzV6" role="2Oq$k0">
-              <node concept="1pGfFk" id="NKt6ynqzV7" role="2ShVmc">
-                <ref role="37wK5l" to="fqlx:NKt6yno$sR" resolve="AspectLookup" />
-                <node concept="2ShNRf" id="NKt6ynqzV8" role="37wK5m">
-                  <node concept="HV5vD" id="NKt6ynqzV9" role="2ShVmc">
-                    <ref role="HV5vE" node="NKt6ynqgZw" resolve="TypecheckingAspect.CoderulesAspectDiscoverable" />
-                  </node>
-                </node>
-                <node concept="3uibUv" id="NKt6yoQDam" role="1pMfVU">
-                  <ref role="3uigEE" to="fqlx:NKt6yomNZE" resolve="CoderulesAspect" />
-                </node>
-              </node>
-            </node>
             <node concept="liA8E" id="NKt6ynqzVb" role="2OqNvi">
               <ref role="37wK5l" to="fqlx:NKt6ynoAJU" resolve="allForLanguage" />
               <node concept="37vLTw" id="NKt6ynq$s_" role="37wK5m">
                 <ref role="3cqZAo" node="7P_FdVPWjGg" resolve="langrt" />
               </node>
             </node>
+            <node concept="2YIFZM" id="78H58oefWbN" role="2Oq$k0">
+              <ref role="1Pybhc" to="fqlx:NKt6ynorWQ" resolve="AspectLookup" />
+              <ref role="37wK5l" to="fqlx:78H58oefSjC" resolve="lookup" />
+              <node concept="1rXfSq" id="78H58oefWbO" role="37wK5m">
+                <ref role="37wK5l" node="78H58oefGzt" resolve="typecheckingDiscoverable" />
+              </node>
+            </node>
           </node>
         </node>
       </node>
       <node concept="3vKaQO" id="7P_FdVPWlen" role="3clF45">
-        <node concept="3uibUv" id="NKt6yoQD3Q" role="3O5elw">
-          <ref role="3uigEE" to="fqlx:NKt6yomNZE" resolve="CoderulesAspect" />
+        <node concept="3uibUv" id="78H58oe2xL5" role="3O5elw">
+          <ref role="3uigEE" node="7km57Pkjxf4" resolve="TypecheckingAspect" />
         </node>
       </node>
       <node concept="3Tm1VV" id="7P_FdVPWjGp" role="1B3o_S" />
     </node>
     <node concept="2tJIrI" id="7P_FdVPWjGe" role="jymVt" />
-    <node concept="312cEu" id="NKt6ynqgZw" role="jymVt">
-      <property role="2bfB8j" value="false" />
-      <property role="TrG5h" value="CoderulesAspectDiscoverable" />
-      <node concept="2tJIrI" id="NKt6ynqkgH" role="jymVt" />
-      <node concept="3clFb_" id="NKt6ynqkof" role="jymVt">
-        <property role="1EzhhJ" value="false" />
-        <property role="TrG5h" value="discover" />
-        <node concept="37vLTG" id="NKt6ynqkog" role="3clF46">
-          <property role="TrG5h" value="lr" />
-          <node concept="3uibUv" id="NKt6ynqkoh" role="1tU5fm">
-            <ref role="3uigEE" to="vndm:~LanguageRuntime" resolve="LanguageRuntime" />
-          </node>
-        </node>
-        <node concept="3uibUv" id="NKt6yp1BXm" role="3clF45">
-          <ref role="3uigEE" to="fqlx:NKt6yomNZE" resolve="CoderulesAspect" />
-        </node>
-        <node concept="3Tm1VV" id="NKt6ynqkoj" role="1B3o_S" />
-        <node concept="3clFbS" id="NKt6ynqkom" role="3clF47">
-          <node concept="3cpWs8" id="NKt6ynqkuq" role="3cqZAp">
-            <node concept="3cpWsn" id="NKt6ynqkur" role="3cpWs9">
-              <property role="TrG5h" value="aspect" />
-              <node concept="3uibUv" id="NKt6yp1FMk" role="1tU5fm">
-                <ref role="3uigEE" to="fqlx:NKt6yp1COZ" resolve="DefaultCoderulesAspect" />
-              </node>
-              <node concept="2OqwBi" id="NKt6ynqkut" role="33vP2m">
-                <node concept="37vLTw" id="NKt6ynqkuu" role="2Oq$k0">
-                  <ref role="3cqZAo" node="NKt6ynqkog" resolve="lr" />
-                </node>
-                <node concept="liA8E" id="NKt6ynqkuv" role="2OqNvi">
-                  <ref role="37wK5l" to="vndm:~LanguageRuntime.getAspect(java.lang.Class):jetbrains.mps.smodel.runtime.ILanguageAspect" resolve="getAspect" />
-                  <node concept="3VsKOn" id="NKt6ynqkuw" role="37wK5m">
-                    <ref role="3VsUkX" to="fqlx:NKt6yp1COZ" resolve="DefaultCoderulesAspect" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbJ" id="NKt6ynqkux" role="3cqZAp">
-            <node concept="3clFbS" id="NKt6ynqkuy" role="3clFbx">
-              <node concept="3clFbJ" id="NKt6ynqkA2" role="3cqZAp">
-                <node concept="3clFbS" id="NKt6ynqkA3" role="3clFbx">
-                  <node concept="3clFbF" id="NKt6ynqkA4" role="3cqZAp">
-                    <node concept="2OqwBi" id="NKt6ynqkA5" role="3clFbG">
-                      <node concept="37vLTw" id="NKt6ynqkAe" role="2Oq$k0">
-                        <ref role="3cqZAo" node="NKt6ynqkur" resolve="aspect" />
-                      </node>
-                      <node concept="liA8E" id="NKt6ynqkA7" role="2OqNvi">
-                        <ref role="37wK5l" to="fqlx:7P_FdVQ2EWw" resolve="setLanguageRuntime" />
-                        <node concept="37vLTw" id="NKt6ynqkAf" role="37wK5m">
-                          <ref role="3cqZAo" node="NKt6ynqkog" resolve="lr" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbC" id="NKt6ynqkA9" role="3clFbw">
-                  <node concept="10Nm6u" id="NKt6ynqkAa" role="3uHU7w" />
-                  <node concept="2OqwBi" id="NKt6ynqkAb" role="3uHU7B">
-                    <node concept="37vLTw" id="NKt6ynqkAg" role="2Oq$k0">
-                      <ref role="3cqZAo" node="NKt6ynqkur" resolve="aspect" />
-                    </node>
-                    <node concept="liA8E" id="NKt6ynqkAd" role="2OqNvi">
-                      <ref role="37wK5l" to="fqlx:7P_FdVQ2VEI" resolve="languageRuntime" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3y3z36" id="NKt6ynqkuB" role="3clFbw">
-              <node concept="10Nm6u" id="NKt6ynqkuC" role="3uHU7w" />
-              <node concept="37vLTw" id="NKt6ynqkuD" role="3uHU7B">
-                <ref role="3cqZAo" node="NKt6ynqkur" resolve="aspect" />
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbF" id="NKt6ynqkuE" role="3cqZAp">
-            <node concept="37vLTw" id="NKt6ynqkuF" role="3clFbG">
-              <ref role="3cqZAo" node="NKt6ynqkur" resolve="aspect" />
-            </node>
-          </node>
-        </node>
-        <node concept="2AHcQZ" id="NKt6ynqkon" role="2AJF6D">
-          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="NKt6ynqgZx" role="1B3o_S" />
-      <node concept="3uibUv" id="NKt6ynqkjf" role="EKbjA">
+    <node concept="2YIFZL" id="78H58oefGzt" role="jymVt">
+      <property role="TrG5h" value="typecheckingDiscoverable" />
+      <node concept="3Tm6S6" id="78H58oefGzu" role="1B3o_S" />
+      <node concept="3uibUv" id="78H58oefGzv" role="3clF45">
         <ref role="3uigEE" to="fqlx:NKt6ynom3d" resolve="AspectDiscoverable" />
-        <node concept="3uibUv" id="NKt6yoQCkO" role="11_B2D">
-          <ref role="3uigEE" to="fqlx:NKt6yomNZE" resolve="CoderulesAspect" />
+        <node concept="3uibUv" id="78H58oefGzw" role="11_B2D">
+          <ref role="3uigEE" node="7km57Pkjxf4" resolve="TypecheckingAspect" />
         </node>
       </node>
-    </node>
-    <node concept="2tJIrI" id="NKt6ynqdSf" role="jymVt" />
-    <node concept="3clFb_" id="2hteS6ClmbE" role="jymVt">
-      <property role="TrG5h" value="createMacroManifest" />
-      <property role="1EzhhJ" value="true" />
-      <node concept="3uibUv" id="2hteS6ClmeA" role="3clF45">
-        <ref role="3uigEE" to="psr6:2N2MQGCMVqD" resolve="AbstractMacroManifest" />
-      </node>
-      <node concept="3Tm1VV" id="2hteS6ClmbH" role="1B3o_S" />
-      <node concept="3clFbS" id="2hteS6ClmbI" role="3clF47" />
-      <node concept="2AHcQZ" id="NKt6yomP83" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="2hteS6Clmfw" role="jymVt" />
-    <node concept="3clFb_" id="2hteS6ClmfS" role="jymVt">
-      <property role="TrG5h" value="createRuleManifest" />
-      <property role="1EzhhJ" value="true" />
-      <node concept="3uibUv" id="2hteS6Clmgy" role="3clF45">
-        <ref role="3uigEE" to="i348:4OKkcnfu_xe" resolve="AbstractRuleTemplateManifest" />
-      </node>
-      <node concept="3Tm1VV" id="2hteS6ClmfV" role="1B3o_S" />
-      <node concept="3clFbS" id="2hteS6ClmfW" role="3clF47" />
-      <node concept="2AHcQZ" id="NKt6yomPxd" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      <node concept="3clFbS" id="78H58oefGxh" role="3clF47">
+        <node concept="3cpWs6" id="78H58oefGyl" role="3cqZAp">
+          <node concept="2YIFZM" id="78H58oefKuE" role="3cqZAk">
+            <ref role="37wK5l" to="fqlx:78H58oefoaA" resolve="discoverable" />
+            <ref role="1Pybhc" to="fqlx:NKt6yp1COZ" resolve="DefaultCoderulesAspect" />
+            <node concept="3VsKOn" id="78H58oefGyn" role="37wK5m">
+              <ref role="3VsUkX" node="7km57Pkjxf4" resolve="TypecheckingAspect" />
+            </node>
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="2hteS6Cleqc" role="jymVt" />
diff --git a/typechecking/solutions/jetbrains.mps.typechecking.build/models/jetbrains.mps.typechecking.build.mps b/typechecking/solutions/jetbrains.mps.typechecking.build/models/jetbrains.mps.typechecking.build.mps
index bbbb3878..7ae609a4 100644
--- a/typechecking/solutions/jetbrains.mps.typechecking.build/models/jetbrains.mps.typechecking.build.mps
+++ b/typechecking/solutions/jetbrains.mps.typechecking.build/models/jetbrains.mps.typechecking.build.mps
@@ -1896,6 +1896,159 @@
         </node>
       </node>
     </node>
+    <node concept="2G$12M" id="78H58oeeFzd" role="3989C9">
+      <property role="TrG5h" value="controlflow" />
+      <node concept="1E1JtA" id="78H58oeeGcw" role="2G$12L">
+        <property role="BnDLt" value="true" />
+        <property role="TrG5h" value="jetbrains.mps.controlflow" />
+        <property role="3LESm3" value="517911e5-605f-4310-831b-10d44e0f5237" />
+        <property role="2GAjPV" value="false" />
+        <node concept="55IIr" id="78H58oeeGcx" role="3LF7KH">
+          <node concept="2Ry0Ak" id="78H58oeeG_n" role="iGT6I">
+            <property role="2Ry0Am" value="controlflow" />
+            <node concept="2Ry0Ak" id="78H58oeeGLO" role="2Ry0An">
+              <property role="2Ry0Am" value="solutions" />
+              <node concept="2Ry0Ak" id="78H58oeeGYh" role="2Ry0An">
+                <property role="2Ry0Am" value="jetbrains.mps.controlflow" />
+                <node concept="2Ry0Ak" id="78H58oeeHgU" role="2Ry0An">
+                  <property role="2Ry0Am" value="jetbrains.mps.controlflow.msd" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="1E1JtA" id="78H58oeeI52" role="2G$12L">
+        <property role="BnDLt" value="true" />
+        <property role="TrG5h" value="jetbrains.mps.controlflow.ui" />
+        <property role="3LESm3" value="eacb1d2f-fed3-4344-a1dd-143fac2e9c20" />
+        <property role="2GAjPV" value="false" />
+        <node concept="55IIr" id="78H58oeeI53" role="3LF7KH">
+          <node concept="2Ry0Ak" id="78H58oeeI54" role="iGT6I">
+            <property role="2Ry0Am" value="controlflow" />
+            <node concept="2Ry0Ak" id="78H58oeeI55" role="2Ry0An">
+              <property role="2Ry0Am" value="solutions" />
+              <node concept="2Ry0Ak" id="78H58oeeI56" role="2Ry0An">
+                <property role="2Ry0Am" value="jetbrains.mps.controlflow.ui" />
+                <node concept="2Ry0Ak" id="78H58oeeIjb" role="2Ry0An">
+                  <property role="2Ry0Am" value="jetbrains.mps.controlflow.ui.msd" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="1E1JtD" id="78H58oeeJaR" role="2G$12L">
+        <property role="BnDLt" value="true" />
+        <property role="TrG5h" value="jetbrains.mps.lang.controlflow" />
+        <property role="3LESm3" value="2e120f68-abfb-4980-bb1c-bc70159b1f95" />
+        <property role="2GAjPV" value="false" />
+        <node concept="55IIr" id="78H58oeeJaU" role="3LF7KH">
+          <node concept="2Ry0Ak" id="78H58oeeJoI" role="iGT6I">
+            <property role="2Ry0Am" value="controlflow" />
+            <node concept="2Ry0Ak" id="78H58oeeJA7" role="2Ry0An">
+              <property role="2Ry0Am" value="languages" />
+              <node concept="2Ry0Ak" id="78H58oeeJNw" role="2Ry0An">
+                <property role="2Ry0Am" value="jetbrains.mps.lang.controlflow" />
+                <node concept="2Ry0Ak" id="78H58oeeK0T" role="2Ry0An">
+                  <property role="2Ry0Am" value="jetbrains.mps.lang.controlflow.mpl" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1SiIV0" id="78H58oeeKbP" role="3bR37C">
+          <node concept="3bR9La" id="78H58oeeKbQ" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" node="NKt6yn9_8p" resolve="jetbrains.mps.coderules" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="78H58oeeKbR" role="3bR37C">
+          <node concept="1Busua" id="78H58oeeKbS" role="1SiIV1">
+            <ref role="1Busuk" node="7BVjoXzUx6U" resolve="jetbrains.mps.lang.coderules" />
+          </node>
+        </node>
+        <node concept="1yeLz9" id="78H58oeeKbT" role="1TViLv">
+          <property role="TrG5h" value="jetbrains.mps.lang.controlflow#01" />
+          <property role="3LESm3" value="67306c43-4604-4dad-9b74-7e808a66bee5" />
+          <property role="2GAjPV" value="false" />
+          <node concept="1SiIV0" id="78H58oeeKbU" role="3bR37C">
+            <node concept="3bR9La" id="78H58oeeKbV" role="1SiIV1">
+              <property role="3bR36h" value="false" />
+              <ref role="3bR37D" to="ffeo:7YI57w6K0jH" resolve="jetbrains.mps.lang.descriptor#9020561928507175817" />
+            </node>
+          </node>
+          <node concept="1SiIV0" id="78H58oeeKbW" role="3bR37C">
+            <node concept="3bR9La" id="78H58oeeKbX" role="1SiIV1">
+              <property role="3bR36h" value="false" />
+              <ref role="3bR37D" to="ffeo:6zkSwmUIjUj" resolve="jetbrains.mps.lang.aspect#3274906159125927726" />
+            </node>
+          </node>
+          <node concept="1SiIV0" id="78H58oeeKbY" role="3bR37C">
+            <node concept="3bR9La" id="78H58oeeKbZ" role="1SiIV1">
+              <property role="3bR36h" value="false" />
+              <ref role="3bR37D" node="7BVjoXzUxWX" resolve="jetbrains.mps.lang.coderules#4578927328670739933" />
+            </node>
+          </node>
+          <node concept="1SiIV0" id="78H58oeeKc0" role="3bR37C">
+            <node concept="3bR9La" id="78H58oeeKc1" role="1SiIV1">
+              <property role="3bR36h" value="false" />
+              <ref role="3bR37D" to="ffeo:7Kfy9QB6L8Y" resolve="jetbrains.mps.lang.project" />
+            </node>
+          </node>
+          <node concept="1SiIV0" id="78H58oeeKc2" role="3bR37C">
+            <node concept="3bR9La" id="78H58oeeKc3" role="1SiIV1">
+              <property role="3bR36h" value="false" />
+              <ref role="3bR37D" node="78H58oeeH$3" resolve="jetbrains.mps.lang.controlflow.runtime" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="1E1JtA" id="78H58oeeH$3" role="2G$12L">
+        <property role="BnDLt" value="true" />
+        <property role="TrG5h" value="jetbrains.mps.lang.controlflow.runtime" />
+        <property role="3LESm3" value="ffcd9ef5-e931-4da9-a8d1-eb9bf80d19b4" />
+        <property role="2GAjPV" value="false" />
+        <node concept="55IIr" id="78H58oeeH$4" role="3LF7KH">
+          <node concept="2Ry0Ak" id="78H58oeeH$5" role="iGT6I">
+            <property role="2Ry0Am" value="controlflow" />
+            <node concept="2Ry0Ak" id="78H58oeeH$6" role="2Ry0An">
+              <property role="2Ry0Am" value="solutions" />
+              <node concept="2Ry0Ak" id="78H58oeeH$7" role="2Ry0An">
+                <property role="2Ry0Am" value="jetbrains.mps.lang.controlflow.runtime" />
+                <node concept="2Ry0Ak" id="78H58oeeHLb" role="2Ry0An">
+                  <property role="2Ry0Am" value="jetbrains.mps.lang.controlflow.runtime.msd" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1SiIV0" id="78H58oeeHVD" role="3bR37C">
+          <node concept="3bR9La" id="78H58oeeHVE" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" to="ffeo:1H905DlDUSw" resolve="MPS.OpenAPI" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="78H58oeeHVF" role="3bR37C">
+          <node concept="3bR9La" id="78H58oeeHVG" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="78H58oeeHVH" role="3bR37C">
+          <node concept="3bR9La" id="78H58oeeHVI" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" to="ffeo:1TaHNgiIbIQ" resolve="MPS.Core" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="78H58oeeHVJ" role="3bR37C">
+          <node concept="3bR9La" id="78H58oeeHVK" role="1SiIV1">
+            <property role="3bR36h" value="true" />
+            <ref role="3bR37D" node="7BVjoXzUx9d" resolve="jetbrains.mps.lang.coderules.template" />
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="2G$12M" id="5pz4PwHqqGu" role="3989C9">
       <property role="TrG5h" value="typechecking-test" />
       <node concept="1E1JtA" id="5pz4PwHqqS4" role="2G$12L">
@@ -2206,6 +2359,21 @@
         <node concept="L2wRC" id="5pz4PwHqt4r" role="39821P">
           <ref role="L2wRA" node="5pz4PwHqqS4" resolve="jetbrains.mps.typechecking.test" />
         </node>
+        <node concept="L2wRC" id="7ee4LalqWl7" role="39821P">
+          <ref role="L2wRA" node="3u5wJtgiSM" resolve="jetbrains.mps.lang.smodel.types" />
+        </node>
+        <node concept="L2wRC" id="78H58oeeKZj" role="39821P">
+          <ref role="L2wRA" node="78H58oeeGcw" resolve="jetbrains.mps.controlflow" />
+        </node>
+        <node concept="L2wRC" id="78H58oeeLe0" role="39821P">
+          <ref role="L2wRA" node="78H58oeeI52" resolve="jetbrains.mps.controlflow.ui" />
+        </node>
+        <node concept="L2wRC" id="78H58oeeLsH" role="39821P">
+          <ref role="L2wRA" node="78H58oeeJaR" resolve="jetbrains.mps.lang.controlflow" />
+        </node>
+        <node concept="L2wRC" id="78H58oeeLFr" role="39821P">
+          <ref role="L2wRA" node="78H58oeeH$3" resolve="jetbrains.mps.lang.controlflow.runtime" />
+        </node>
         <node concept="3_J27D" id="7Ant4WkHLAr" role="Nbhlr">
           <node concept="3Mxwew" id="7Ant4WkHLDj" role="3MwsjC">
             <property role="3MwjfP" value="tests" />
@@ -2226,9 +2394,6 @@
         <node concept="L2wRC" id="46o4wsHrP6K" role="39821P">
           <ref role="L2wRA" node="46o4wsH5PJF" resolve="jetbrains.mps.typechecking.annotation" />
         </node>
-        <node concept="L2wRC" id="7ee4LalqWl7" role="39821P">
-          <ref role="L2wRA" node="3u5wJtgiSM" resolve="jetbrains.mps.lang.smodel.types" />
-        </node>
         <node concept="398223" id="7Ant4WkHLmR" role="39821P">
           <node concept="3_J27D" id="7Ant4WkHLmS" role="Nbhlr">
             <node concept="3Mxwew" id="7Ant4WkHLmT" role="3MwsjC">
@@ -2519,6 +2684,18 @@
             <node concept="L2wRC" id="3u5wJtgSbK" role="39821P">
               <ref role="L2wRA" node="3u5wJtgiSM" resolve="jetbrains.mps.lang.smodel.types" />
             </node>
+            <node concept="L2wRC" id="78H58oeeM2l" role="39821P">
+              <ref role="L2wRA" node="78H58oeeGcw" resolve="jetbrains.mps.controlflow" />
+            </node>
+            <node concept="L2wRC" id="78H58oeeMhx" role="39821P">
+              <ref role="L2wRA" node="78H58oeeI52" resolve="jetbrains.mps.controlflow.ui" />
+            </node>
+            <node concept="L2wRC" id="78H58oeeMJU" role="39821P">
+              <ref role="L2wRA" node="78H58oeeJaR" resolve="jetbrains.mps.lang.controlflow" />
+            </node>
+            <node concept="L2wRC" id="78H58oeeMwH" role="39821P">
+              <ref role="L2wRA" node="78H58oeeH$3" resolve="jetbrains.mps.lang.controlflow.runtime" />
+            </node>
           </node>
           <node concept="398223" id="65DJywFkElN" role="39821P">
             <node concept="2HvfSZ" id="65DJywFkaRZ" role="39821P">
diff --git a/typechecking/solutions/jetbrains.mps.typechecking.ui/models/ui.plugin.mps b/typechecking/solutions/jetbrains.mps.typechecking.ui/models/ui.plugin.mps
index 00e4a59b..5afc0619 100644
--- a/typechecking/solutions/jetbrains.mps.typechecking.ui/models/ui.plugin.mps
+++ b/typechecking/solutions/jetbrains.mps.typechecking.ui/models/ui.plugin.mps
@@ -30229,8 +30229,8 @@
           <node concept="3cpWsn" id="7WKNeR8ULi1" role="3cpWs9">
             <property role="TrG5h" value="aspects" />
             <node concept="3vKaQO" id="7WKNeR8ULhW" role="1tU5fm">
-              <node concept="3uibUv" id="NKt6yoWG9c" role="3O5elw">
-                <ref role="3uigEE" to="fqlx:NKt6yomNZE" resolve="CoderulesAspect" />
+              <node concept="3uibUv" id="78H58oe9cIE" role="3O5elw">
+                <ref role="3uigEE" to="u46i:7km57Pkjxf4" resolve="TypecheckingAspect" />
               </node>
             </node>
             <node concept="2YIFZM" id="NKt6yomRVQ" role="33vP2m">