diff --git a/build.xml b/build.xml
index 92479b07..b5824f88 100644
--- a/build.xml
+++ b/build.xml
@@ -1134,171 +1134,6 @@
       <zipfileset file="${basedir}/coderules/solutions/jetbrains.mps.lang.controlflow.runtime/jetbrains.mps.lang.controlflow.runtime.msd" prefix="module" />
       <zipfileset dir="${build.tmp}/customProcessors/copyModels/coderules-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">
-      <module namespace="jetbrains.mps.baseLanguageExt" type="language" uuid="0fda14cc-a416-4c81-869a-2175d8b3325d">
-        <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="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" />
-          <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" />
-          <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" />
-          <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" />
-          <module ref="ffcd9ef5-e931-4da9-a8d1-eb9bf80d19b4(jetbrains.mps.lang.controlflow.runtime)" />
-          <module ref="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" />
-          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" />
-          <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
-          <module ref="da80355b-a098-4248-9ec8-70d10dd7e9af(jetbrains.mps.typechecking.reporting)" />
-        </dependencies>
-        <classpath>
-          <entry path="." />
-        </classpath>
-        <sources jar="jetbrains.mps.baseLanguageExt-src.jar" descriptor="jetbrains.mps.baseLanguageExt.mpl" />
-      </module>
-    </echoxml>
-    <jar destfile="${build.layout}/tests/jetbrains.mps.baseLanguageExt.jar" duplicate="preserve">
-      <fileset dir="${build.tmp}/java/out/jetbrains.mps.baseLanguageExt" />
-      <fileset dir="${basedir}/samples/mpscore/languages/jetbrains.mps.baseLanguageExt" includes="icons/**, resources/**" />
-      <fileset dir="${mps.macro.coderules_home}/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
-      <fileset dir="${build.tmp}/default/jetbrains.mps.baseLanguageExt.jar" />
-    </jar>
-    <copyModels todir="${build.tmp}/customProcessors/copyModels/samples-mpscore-languages-jetbrains.mps.baseLanguageExt-models">
-      <fileset dir="${mps.macro.coderules_home}/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
-    </copyModels>
-    <jar destfile="${build.layout}/tests/jetbrains.mps.baseLanguageExt-src.jar" duplicate="preserve">
-      <fileset dir="${mps.macro.coderules_home}/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/source_gen">
-        <exclude name="**/trace.info" />
-        <exclude name="**/exports" />
-        <exclude name="**/checkpoints" />
-        <exclude name="**/*.mps" />
-      </fileset>
-      <zipfileset file="${basedir}/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/jetbrains.mps.baseLanguageExt.mpl" prefix="module" />
-      <zipfileset dir="${build.tmp}/customProcessors/copyModels/samples-mpscore-languages-jetbrains.mps.baseLanguageExt-models" prefix="module/models" />
-    </jar>
-    <mkdir dir="${build.tmp}/default/jetbrains.mps.baseLanguageExt.test.jar" />
-    <mkdir dir="${build.tmp}/default/jetbrains.mps.baseLanguageExt.test.jar/META-INF" />
-    <echoxml file="${build.tmp}/default/jetbrains.mps.baseLanguageExt.test.jar/META-INF/module.xml">
-      <module namespace="jetbrains.mps.baseLanguageExt.test" type="solution" uuid="e44e7802-2e40-482b-9b1c-6d42660a6a11">
-        <dependencies>
-          <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" />
-          <module ref="49808fad-9d41-4b96-83fa-9231640f6b2b(JUnit)" />
-          <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="e55e6749-03cb-4ea7-9695-2322bab791c1(jetbrains.mps.lang.test.matcher)" />
-          <module ref="707c4fde-f79a-44b5-b3d7-b5cef8844ccf(jetbrains.mps.lang.test.runtime)" />
-          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" />
-          <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
-        </dependencies>
-        <classpath>
-          <entry path="." />
-        </classpath>
-        <sources jar="jetbrains.mps.baseLanguageExt.test-src.jar" descriptor="jetbrains.mps.baseLanguageExt.test.msd" />
-      </module>
-    </echoxml>
-    <jar destfile="${build.layout}/tests/jetbrains.mps.baseLanguageExt.test.jar" duplicate="preserve">
-      <fileset dir="${build.tmp}/java/out/jetbrains.mps.baseLanguageExt.test" />
-      <fileset dir="${basedir}/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test" includes="icons/**, resources/**" />
-      <fileset dir="${mps.macro.coderules_home}/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
-      <fileset dir="${build.tmp}/default/jetbrains.mps.baseLanguageExt.test.jar" />
-    </jar>
-    <copyModels todir="${build.tmp}/customProcessors/copyModels/samples-mpscore-solutions-jetbrains.mps.baseLanguageExt.test-models">
-      <fileset dir="${mps.macro.coderules_home}/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
-    </copyModels>
-    <jar destfile="${build.layout}/tests/jetbrains.mps.baseLanguageExt.test-src.jar" duplicate="preserve">
-      <fileset dir="${mps.macro.coderules_home}/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/source_gen">
-        <exclude name="**/trace.info" />
-        <exclude name="**/exports" />
-        <exclude name="**/checkpoints" />
-        <exclude name="**/*.mps" />
-      </fileset>
-      <zipfileset file="${basedir}/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/jetbrains.mps.baseLanguageExt.test.msd" prefix="module" />
-      <zipfileset dir="${build.tmp}/customProcessors/copyModels/samples-mpscore-solutions-jetbrains.mps.baseLanguageExt.test-models" prefix="module/models" />
-    </jar>
-    <mkdir dir="${build.tmp}/default/jetbrains.mps.typechecking.sample.jar" />
-    <mkdir dir="${build.tmp}/default/jetbrains.mps.typechecking.sample.jar/META-INF" />
-    <echoxml file="${build.tmp}/default/jetbrains.mps.typechecking.sample.jar/META-INF/module.xml">
-      <module namespace="jetbrains.mps.typechecking.sample" type="solution" uuid="3ddddf69-9ff0-426b-9365-51ae7356fb82">
-        <dependencies />
-        <classpath>
-          <entry path="." />
-        </classpath>
-        <sources jar="jetbrains.mps.typechecking.sample-src.jar" descriptor="jetbrains.mps.typechecking.sample.msd" />
-      </module>
-    </echoxml>
-    <jar destfile="${build.layout}/tests/jetbrains.mps.typechecking.sample.jar" duplicate="preserve">
-      <fileset dir="${build.tmp}/java/out/jetbrains.mps.typechecking.sample" />
-      <fileset dir="${basedir}/coderules/solutions/jetbrains.mps.typechecking.sample" includes="icons/**, resources/**" />
-      <fileset dir="${mps.macro.coderules_home}/samples/mpscore/solutions/jetbrains.mps.typechecking.sample/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
-      <fileset dir="${build.tmp}/default/jetbrains.mps.typechecking.sample.jar" />
-    </jar>
-    <copyModels todir="${build.tmp}/customProcessors/copyModels/samples-mpscore-solutions-jetbrains.mps.typechecking.sample-models">
-      <fileset dir="${mps.macro.coderules_home}/samples/mpscore/solutions/jetbrains.mps.typechecking.sample/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
-    </copyModels>
-    <jar destfile="${build.layout}/tests/jetbrains.mps.typechecking.sample-src.jar" duplicate="preserve">
-      <fileset dir="${mps.macro.coderules_home}/samples/mpscore/solutions/jetbrains.mps.typechecking.sample/source_gen">
-        <exclude name="**/trace.info" />
-        <exclude name="**/exports" />
-        <exclude name="**/checkpoints" />
-        <exclude name="**/*.mps" />
-      </fileset>
-      <zipfileset file="${basedir}/samples/mpscore/solutions/jetbrains.mps.typechecking.sample/jetbrains.mps.typechecking.sample.msd" prefix="module" />
-      <zipfileset dir="${build.tmp}/customProcessors/copyModels/samples-mpscore-solutions-jetbrains.mps.typechecking.sample-models" prefix="module/models" />
-    </jar>
-    <mkdir dir="${build.tmp}/default/jetbrains.mps.typechecking.sample.test.jar" />
-    <mkdir dir="${build.tmp}/default/jetbrains.mps.typechecking.sample.test.jar/META-INF" />
-    <echoxml file="${build.tmp}/default/jetbrains.mps.typechecking.sample.test.jar/META-INF/module.xml">
-      <module namespace="jetbrains.mps.typechecking.sample.test" type="solution" uuid="1b65dfe8-24ff-41c3-9a3e-70f102942455">
-        <dependencies>
-          <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" />
-          <module ref="49808fad-9d41-4b96-83fa-9231640f6b2b(JUnit)" />
-          <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="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="e55e6749-03cb-4ea7-9695-2322bab791c1(jetbrains.mps.lang.test.matcher)" />
-          <module ref="707c4fde-f79a-44b5-b3d7-b5cef8844ccf(jetbrains.mps.lang.test.runtime)" />
-          <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
-        </dependencies>
-        <classpath>
-          <entry path="." />
-        </classpath>
-        <sources jar="jetbrains.mps.typechecking.sample.test-src.jar" descriptor="jetbrains.mps.typechecking.sample.test.msd" />
-      </module>
-    </echoxml>
-    <jar destfile="${build.layout}/tests/jetbrains.mps.typechecking.sample.test.jar" duplicate="preserve">
-      <fileset dir="${build.tmp}/java/out/jetbrains.mps.typechecking.sample.test" />
-      <fileset dir="${basedir}/coderules/solutions/jetbrains.mps.typechecking.sample.test" includes="icons/**, resources/**" />
-      <fileset dir="${mps.macro.coderules_home}/samples/mpscore/solutions/jetbrains.mps.typechecking.sample.test/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
-      <fileset dir="${build.tmp}/default/jetbrains.mps.typechecking.sample.test.jar" />
-    </jar>
-    <copyModels todir="${build.tmp}/customProcessors/copyModels/samples-mpscore-solutions-jetbrains.mps.typechecking.sample.test-models">
-      <fileset dir="${mps.macro.coderules_home}/samples/mpscore/solutions/jetbrains.mps.typechecking.sample.test/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
-    </copyModels>
-    <jar destfile="${build.layout}/tests/jetbrains.mps.typechecking.sample.test-src.jar" duplicate="preserve">
-      <fileset dir="${mps.macro.coderules_home}/samples/mpscore/solutions/jetbrains.mps.typechecking.sample.test/source_gen">
-        <exclude name="**/trace.info" />
-        <exclude name="**/exports" />
-        <exclude name="**/checkpoints" />
-        <exclude name="**/*.mps" />
-      </fileset>
-      <zipfileset file="${basedir}/samples/mpscore/solutions/jetbrains.mps.typechecking.sample.test/jetbrains.mps.typechecking.sample.test.msd" prefix="module" />
-      <zipfileset dir="${build.tmp}/customProcessors/copyModels/samples-mpscore-solutions-jetbrains.mps.typechecking.sample.test-models" prefix="module/models" />
-    </jar>
     <mkdir dir="${build.tmp}/default/jetbrains.mps.typechecking.annotation.jar" />
     <mkdir dir="${build.tmp}/default/jetbrains.mps.typechecking.annotation.jar/META-INF" />
     <echoxml file="${build.tmp}/default/jetbrains.mps.typechecking.annotation.jar/META-INF/module.xml">
@@ -2524,7 +2359,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.coderules.ui, 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.typechecking.test, 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.baseLanguageExt, java.compile.jetbrains.mps.baseLanguageExt.test, java.compile.jetbrains.mps.typechecking.sample, 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.coderules.ui, 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.typechecking.test, 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" />
   
   <target name="processResources" />
   
@@ -2633,7 +2468,6 @@
         <module file="${basedir}/coderules/languages/jetbrains.mps.logic/runtime/jetbrains.mps.logic.runtime.msd" />
         <module file="${basedir}/coderules/languages/jetbrains.mps.typechecking.annotation/jetbrains.mps.typechecking.annotation.mpl" />
         <module file="${basedir}/coderules/solutions/jetbrains.mps.typechecking.reporting/jetbrains.mps.typechecking.reporting.msd" />
-        <module file="${basedir}/samples/mpscore/solutions/jetbrains.mps.typechecking.sample/jetbrains.mps.typechecking.sample.msd" />
       </chunk>
       <chunk>
         <module file="${basedir}/coderules/solutions/jetbrains.mps.coderules/jetbrains.mps.coderules.msd" />
@@ -2650,15 +2484,8 @@
         <module file="${basedir}/coderules/solutions/jetbrains.mps.lang.typechecking.runtime/jetbrains.mps.lang.typechecking.runtime.msd" />
         <module file="${basedir}/coderules/solutions/jetbrains.mps.logic.test/jetbrains.mps.logic.test.msd" />
         <module file="${basedir}/coderules/solutions/jetbrains.mps.typechecking/jetbrains.mps.typechecking.msd" />
-        <module file="${basedir}/coderules/solutions/jetbrains.mps.typechecking.ui/jetbrains.mps.typechecking.ui.msd" />
-      </chunk>
-      <chunk>
-        <module file="${basedir}/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/jetbrains.mps.baseLanguageExt.mpl" />
-        <module file="${basedir}/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/jetbrains.mps.baseLanguageExt.test.msd" />
-      </chunk>
-      <chunk>
-        <module file="${basedir}/samples/mpscore/solutions/jetbrains.mps.typechecking.sample.test/jetbrains.mps.typechecking.sample.test.msd" />
         <module file="${basedir}/coderules/solutions/jetbrains.mps.typechecking.test/jetbrains.mps.typechecking.test.msd" />
+        <module file="${basedir}/coderules/solutions/jetbrains.mps.typechecking.ui/jetbrains.mps.typechecking.ui.msd" />
       </chunk>
       <jvmargs>
         <arg value="-Xmx512m" />
@@ -4074,207 +3901,6 @@
     </javac>
   </target>
   
-  <target name="java.compile.jetbrains.mps.baseLanguageExt" depends="java.compile.jetbrains.mps.coderules, java.compile.jetbrains.mps.controlflow, java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.lang.controlflow.runtime, java.compile.jetbrains.mps.lang.typechecking.runtime, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking, java.compile.jetbrains.mps.typechecking.reporting, fetchDependencies">
-    <mkdir dir="${mps.macro.coderules_home}/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/source_gen" />
-    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.baseLanguageExt" />
-    <javac destdir="${build.tmp}/java/out/jetbrains.mps.baseLanguageExt" fork="true" encoding="utf8" includeantruntime="false" debug="true">
-      <compilerarg value="-Xlint:none" />
-      <src>
-        <path location="${mps.macro.coderules_home}/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/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.controlflow" />
-        <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.runtime" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typechecking.runtime" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking.reporting" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules/lib/reactive-streams-1.0.0.final.jar" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules/lib/rxjava-2.1.1.jar" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules/lib/rxjava2-swing-0.2.1.jar" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/collection-0.7.jar" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/conreactor-api-0.9.jar" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.jar" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/trove4j-3.0.3.jar" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.2.30.jar" />
-        <fileset file="${mps.macro.coderules_home}/coderules/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.logging.runtime.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.aspects.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
-      </classpath>
-    </javac>
-  </target>
-  
-  <target name="java.compile.jetbrains.mps.baseLanguageExt.test" depends="java.compile.jetbrains.mps.baseLanguageExt, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.logic.test, fetchDependencies">
-    <mkdir dir="${mps.macro.coderules_home}/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/source_gen" />
-    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.baseLanguageExt.test" />
-    <javac destdir="${build.tmp}/java/out/jetbrains.mps.baseLanguageExt.test" fork="true" encoding="utf8" includeantruntime="false" debug="true">
-      <compilerarg value="-Xlint:none" />
-      <src>
-        <path location="${mps.macro.coderules_home}/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/source_gen" />
-        <pathelement path="${mps.macro.coderules_home}/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/test_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.baseLanguageExt" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.test" />
-        <fileset file="${artifacts.mps}/lib/mps-test.jar" />
-        <fileset file="${artifacts.mps}/plugins/mps-testing/lib/jetbrains.mps.lang.test.util.jar" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/collection-0.7.jar" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/conreactor-api-0.9.jar" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.jar" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/trove4j-3.0.3.jar" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.2.30.jar" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.2.30.jar" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.test/lib/mockito-core-2.0.3-beta.jar" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.test/lib/objenesis-2.1.jar" />
-        <fileset file="${artifacts.mps}/lib/ant/lib/ant.jar" />
-        <fileset file="${artifacts.mps}/lib/junit-4.12.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.classifiers.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
-        <fileset file="${artifacts.mps}/plugins/mps-testing/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguageInternal.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
-        <fileset file="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.jar" />
-        <fileset file="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.matcher.jar" />
-        <fileset file="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.runtime.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
-      </classpath>
-    </javac>
-  </target>
-  
-  <target name="java.compile.jetbrains.mps.typechecking.sample">
-    <mkdir dir="${mps.macro.coderules_home}/samples/mpscore/solutions/jetbrains.mps.typechecking.sample/source_gen" />
-    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.typechecking.sample" />
-    <javac destdir="${build.tmp}/java/out/jetbrains.mps.typechecking.sample" fork="true" encoding="utf8" includeantruntime="false" debug="true">
-      <compilerarg value="-Xlint:none" />
-      <src>
-        <path location="${mps.macro.coderules_home}/samples/mpscore/solutions/jetbrains.mps.typechecking.sample/source_gen" />
-      </src>
-      <classpath />
-    </javac>
-  </target>
-  
-  <target name="java.compile.jetbrains.mps.typechecking.sample.test" depends="java.compile.jetbrains.mps.coderules, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking, java.compile.jetbrains.mps.typechecking.reporting, java.compile.jetbrains.mps.typechecking.sample, fetchDependencies">
-    <mkdir dir="${mps.macro.coderules_home}/samples/mpscore/solutions/jetbrains.mps.typechecking.sample.test/source_gen" />
-    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.typechecking.sample.test" />
-    <javac destdir="${build.tmp}/java/out/jetbrains.mps.typechecking.sample.test" fork="true" encoding="utf8" includeantruntime="false" debug="true">
-      <compilerarg value="-Xlint:none" />
-      <src>
-        <path location="${mps.macro.coderules_home}/samples/mpscore/solutions/jetbrains.mps.typechecking.sample.test/source_gen" />
-        <pathelement path="${mps.macro.coderules_home}/samples/mpscore/solutions/jetbrains.mps.typechecking.sample.test/test_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.lang.coderules.template" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking.reporting" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking.sample" />
-        <fileset file="${artifacts.mps}/lib/mps-test.jar" />
-        <fileset file="${artifacts.mps}/plugins/mps-testing/lib/jetbrains.mps.lang.test.util.jar" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules/lib/reactive-streams-1.0.0.final.jar" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules/lib/rxjava-2.1.1.jar" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules/lib/rxjava2-swing-0.2.1.jar" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/collection-0.7.jar" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/conreactor-api-0.9.jar" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.jar" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/trove4j-3.0.3.jar" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.2.30.jar" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.2.30.jar" />
-        <fileset file="${artifacts.mps}/lib/ant/lib/ant.jar" />
-        <fileset file="${artifacts.mps}/lib/junit-4.12.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.classifiers.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
-        <fileset file="${artifacts.mps}/plugins/mps-testing/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
-        <fileset file="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.jar" />
-        <fileset file="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.matcher.jar" />
-        <fileset file="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.runtime.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
-      </classpath>
-    </javac>
-  </target>
-  
   <target name="test.testconfig" depends="assemble">
     <path id="mps.libraries.path">
       <pathelement location="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.jar" />
@@ -4352,12 +3978,9 @@
       <pathelement location="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.matcher.jar" />
       <pathelement location="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.runtime.jar" />
       <pathelement location="${artifacts.mps}/plugins/mps-testing/lib/jetbrains.mps.lang.test.util.jar" />
-      <pathelement location="${build.layout}/tests/jetbrains.mps.baseLanguageExt.jar" />
       <pathelement location="${build.layout}/tests/jetbrains.mps.coderules.jar" />
-      <pathelement location="${build.layout}/tests/jetbrains.mps.controlflow.jar" />
       <pathelement location="${build.layout}/tests/jetbrains.mps.lang.coderules.runtime.jar" />
       <pathelement location="${build.layout}/tests/jetbrains.mps.lang.coderules.template.jar" />
-      <pathelement location="${build.layout}/tests/jetbrains.mps.lang.controlflow.runtime.jar" />
       <pathelement location="${build.layout}/tests/jetbrains.mps.lang.smodel.types.jar" />
       <pathelement location="${build.layout}/tests/jetbrains.mps.lang.typechecking.runtime.jar" />
       <pathelement location="${build.layout}/tests/jetbrains.mps.logic.jar" />
@@ -4435,7 +4058,6 @@
     <delete dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.logic/runtime/source_gen" />
     <delete dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.typechecking.annotation/source_gen" />
     <delete dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.typechecking.reporting/source_gen" />
-    <delete dir="${mps.macro.coderules_home}/samples/mpscore/solutions/jetbrains.mps.typechecking.sample/source_gen" />
     <delete dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules/source_gen" />
     <delete dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.ui/source_gen" />
     <delete dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.controlflow/source_gen" />
@@ -4455,14 +4077,9 @@
     <delete dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.lang.typechecking.runtime/source_gen" />
     <delete dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.test/source_gen" />
     <delete dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.typechecking/source_gen" />
-    <delete dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.typechecking.ui/source_gen" />
-    <delete dir="${mps.macro.coderules_home}/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/source_gen" />
-    <delete dir="${mps.macro.coderules_home}/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/source_gen" />
-    <delete dir="${mps.macro.coderules_home}/samples/mpscore/solutions/jetbrains.mps.typechecking.sample.test/source_gen" />
     <delete dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.typechecking.test/source_gen" />
+    <delete dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.typechecking.ui/source_gen" />
     <delete dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.test/test_gen" />
-    <delete dir="${mps.macro.coderules_home}/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/test_gen" />
-    <delete dir="${mps.macro.coderules_home}/samples/mpscore/solutions/jetbrains.mps.typechecking.sample.test/test_gen" />
     <delete dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.typechecking.test/test_gen" />
   </target>
 </project>
\ No newline at end of file
diff --git a/coderules/solutions/jetbrains.mps.typechecking.build/models/jetbrains.mps.typechecking.build.mps b/coderules/solutions/jetbrains.mps.typechecking.build/models/jetbrains.mps.typechecking.build.mps
index 6ce7e469..c38e9bcc 100644
--- a/coderules/solutions/jetbrains.mps.typechecking.build/models/jetbrains.mps.typechecking.build.mps
+++ b/coderules/solutions/jetbrains.mps.typechecking.build/models/jetbrains.mps.typechecking.build.mps
@@ -54,6 +54,7 @@
       <concept id="7389400916848050060" name="jetbrains.mps.build.structure.BuildLayout_NamedContainer" flags="ng" index="3981dR">
         <child id="4380385936562148502" name="containerName" index="Nbhlr" />
       </concept>
+      <concept id="7389400916848036997" name="jetbrains.mps.build.structure.BuildLayout_Node" flags="ng" index="39821Y" />
       <concept id="7389400916848036984" name="jetbrains.mps.build.structure.BuildLayout_Folder" flags="ng" index="398223" />
       <concept id="7389400916848136194" name="jetbrains.mps.build.structure.BuildFolderMacro" flags="ng" index="398rNT">
         <child id="7389400916848144618" name="defaultPath" index="398pKh" />
@@ -2223,295 +2224,6 @@
         </node>
       </node>
     </node>
-    <node concept="2G$12M" id="7baUIk88rpb" role="3989C9">
-      <property role="TrG5h" value="baselanguageExt" />
-      <node concept="1E1JtD" id="7Ant4WkHLsF" role="2G$12L">
-        <property role="BnDLt" value="true" />
-        <property role="TrG5h" value="jetbrains.mps.baseLanguageExt" />
-        <property role="3LESm3" value="0fda14cc-a416-4c81-869a-2175d8b3325d" />
-        <property role="2GAjPV" value="false" />
-        <node concept="55IIr" id="7Ant4WkHLsG" role="3LF7KH">
-          <node concept="2Ry0Ak" id="7Ant4WkHLsH" role="iGT6I">
-            <property role="2Ry0Am" value="samples" />
-            <node concept="2Ry0Ak" id="2telgBuBcw5" role="2Ry0An">
-              <property role="2Ry0Am" value="mpscore" />
-              <node concept="2Ry0Ak" id="2telgBuBcw2" role="2Ry0An">
-                <property role="2Ry0Am" value="languages" />
-                <node concept="2Ry0Ak" id="2telgBuBcw3" role="2Ry0An">
-                  <property role="2Ry0Am" value="jetbrains.mps.baseLanguageExt" />
-                  <node concept="2Ry0Ak" id="2telgBuBcw4" role="2Ry0An">
-                    <property role="2Ry0Am" value="jetbrains.mps.baseLanguageExt.mpl" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="7Ant4WkHLsL" role="3bR37C">
-          <node concept="3bR9La" id="7Ant4WkHLsM" role="1SiIV1">
-            <property role="3bR36h" value="false" />
-            <ref role="3bR37D" node="7BVjoXzUxee" resolve="jetbrains.mps.lang.coderules.runtime" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="7Ant4WkHLsN" role="3bR37C">
-          <node concept="3bR9La" id="7Ant4WkHLsO" role="1SiIV1">
-            <property role="3bR36h" value="false" />
-            <ref role="3bR37D" node="7BVjoXzUx$V" resolve="jetbrains.mps.logic.runtime" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="7Ant4WkHLsV" role="3bR37C">
-          <node concept="1Busua" id="7Ant4WkHLsW" role="1SiIV1">
-            <ref role="1Busuk" to="ffeo:7Kfy9QB6KYb" resolve="jetbrains.mps.baseLanguage" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="363KUOxL2_0" role="3bR37C">
-          <node concept="3bR9La" id="363KUOxL2_1" role="1SiIV1">
-            <property role="3bR36h" value="false" />
-            <ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="wfREvqakZl" role="3bR37C">
-          <node concept="3bR9La" id="wfREvqakZm" role="1SiIV1">
-            <property role="3bR36h" value="false" />
-            <ref role="3bR37D" node="7BVjoXzUxoR" resolve="jetbrains.mps.logic.reactor" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="4QPCta1lHYE" role="3bR37C">
-          <node concept="3bR9La" id="4QPCta1lHYF" role="1SiIV1">
-            <property role="3bR36h" value="false" />
-            <ref role="3bR37D" node="7BVjoXzUx9d" resolve="jetbrains.mps.lang.coderules.template" />
-          </node>
-        </node>
-        <node concept="3rtmxn" id="3Z6zOnxMp$e" role="3bR31x">
-          <node concept="3LXTmp" id="3Z6zOnxMp$f" role="3rtmxm">
-            <node concept="3qWCbU" id="3Z6zOnxMp$g" role="3LXTna">
-              <property role="3qWCbO" value="icons/**, resources/**" />
-            </node>
-            <node concept="55IIr" id="3Z6zOnxMp$h" role="3LXTmr">
-              <node concept="2Ry0Ak" id="3Z6zOnxMp$i" role="iGT6I">
-                <property role="2Ry0Am" value="samples" />
-                <node concept="2Ry0Ak" id="2telgBuBcEw" role="2Ry0An">
-                  <property role="2Ry0Am" value="mpscore" />
-                  <node concept="2Ry0Ak" id="2telgBuBcEu" role="2Ry0An">
-                    <property role="2Ry0Am" value="languages" />
-                    <node concept="2Ry0Ak" id="2telgBuBcEv" role="2Ry0An">
-                      <property role="2Ry0Am" value="jetbrains.mps.baseLanguageExt" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="4t7Xo7iJJJg" role="3bR37C">
-          <node concept="3bR9La" id="4t7Xo7iJJJh" role="1SiIV1">
-            <property role="3bR36h" value="false" />
-            <ref role="3bR37D" node="65DJywFj0Fi" resolve="jetbrains.mps.typechecking" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="78H58oewGW7" role="3bR37C">
-          <node concept="3bR9La" id="78H58oewGW8" role="1SiIV1">
-            <property role="3bR36h" value="false" />
-            <ref role="3bR37D" node="78H58oeeGcw" resolve="jetbrains.mps.controlflow" />
-          </node>
-        </node>
-      </node>
-      <node concept="1E1JtA" id="46o4wsHqZu7" role="2G$12L">
-        <property role="BnDLt" value="true" />
-        <property role="TrG5h" value="jetbrains.mps.baseLanguageExt.test" />
-        <property role="3LESm3" value="e44e7802-2e40-482b-9b1c-6d42660a6a11" />
-        <property role="2GAjPV" value="false" />
-        <property role="aoJFB" value="sources and tests" />
-        <node concept="55IIr" id="46o4wsHqZur" role="3LF7KH">
-          <node concept="2Ry0Ak" id="46o4wsHqZIp" role="iGT6I">
-            <property role="2Ry0Am" value="samples" />
-            <node concept="2Ry0Ak" id="2telgBuBcwe" role="2Ry0An">
-              <property role="2Ry0Am" value="mpscore" />
-              <node concept="2Ry0Ak" id="2telgBuBcwb" role="2Ry0An">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="2telgBuBcwc" role="2Ry0An">
-                  <property role="2Ry0Am" value="jetbrains.mps.baseLanguageExt.test" />
-                  <node concept="2Ry0Ak" id="2telgBuBcwd" role="2Ry0An">
-                    <property role="2Ry0Am" value="jetbrains.mps.baseLanguageExt.test.msd" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="46o4wsHr0g$" role="3bR37C">
-          <node concept="3bR9La" id="46o4wsHr0g_" role="1SiIV1">
-            <property role="3bR36h" value="false" />
-            <ref role="3bR37D" to="ffeo:1H905DlDUSw" resolve="MPS.OpenAPI" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="46o4wsHr0gA" role="3bR37C">
-          <node concept="3bR9La" id="46o4wsHr0gB" role="1SiIV1">
-            <property role="3bR36h" value="false" />
-            <ref role="3bR37D" node="7BVjoXzUxoR" resolve="jetbrains.mps.logic.reactor" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="46o4wsHr0gC" role="3bR37C">
-          <node concept="3bR9La" id="46o4wsHr0gD" role="1SiIV1">
-            <property role="3bR36h" value="false" />
-            <ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="46o4wsHr0gE" role="3bR37C">
-          <node concept="3bR9La" id="46o4wsHr0gF" role="1SiIV1">
-            <property role="3bR36h" value="false" />
-            <ref role="3bR37D" to="ffeo:7Kfy9QB6KZ0" resolve="jetbrains.mps.baseLanguageInternal" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="46o4wsHr0gG" role="3bR37C">
-          <node concept="3bR9La" id="46o4wsHr0gH" role="1SiIV1">
-            <property role="3bR36h" value="false" />
-            <ref role="3bR37D" node="7Ant4WkHLsF" resolve="jetbrains.mps.baseLanguageExt" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="20Ay2Vfc9oG" role="3bR37C">
-          <node concept="3bR9La" id="20Ay2Vfc9oH" role="1SiIV1">
-            <property role="3bR36h" value="false" />
-            <ref role="3bR37D" node="7Ant4WkHLpd" resolve="jetbrains.mps.logic.test" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="wfREvqakZT" role="3bR37C">
-          <node concept="3bR9La" id="wfREvqakZU" role="1SiIV1">
-            <property role="3bR36h" value="false" />
-            <ref role="3bR37D" node="7BVjoXzUx$V" resolve="jetbrains.mps.logic.runtime" />
-          </node>
-        </node>
-        <node concept="3rtmxn" id="3Z6zOnxMpyX" role="3bR31x">
-          <node concept="3LXTmp" id="3Z6zOnxMpyY" role="3rtmxm">
-            <node concept="3qWCbU" id="3Z6zOnxMpyZ" role="3LXTna">
-              <property role="3qWCbO" value="icons/**, resources/**" />
-            </node>
-            <node concept="55IIr" id="3Z6zOnxMpz0" role="3LXTmr">
-              <node concept="2Ry0Ak" id="3Z6zOnxMpz1" role="iGT6I">
-                <property role="2Ry0Am" value="samples" />
-                <node concept="2Ry0Ak" id="2telgBuBcEB" role="2Ry0An">
-                  <property role="2Ry0Am" value="mpscore" />
-                  <node concept="2Ry0Ak" id="2telgBuBcE_" role="2Ry0An">
-                    <property role="2Ry0Am" value="solutions" />
-                    <node concept="2Ry0Ak" id="2telgBuBcEA" role="2Ry0An">
-                      <property role="2Ry0Am" value="jetbrains.mps.baseLanguageExt.test" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="1E1JtA" id="46o4wsH5O3R" role="2G$12L">
-        <property role="BnDLt" value="true" />
-        <property role="TrG5h" value="jetbrains.mps.typechecking.sample" />
-        <property role="3LESm3" value="3ddddf69-9ff0-426b-9365-51ae7356fb82" />
-        <property role="2GAjPV" value="false" />
-        <property role="aoJFB" value="sources" />
-        <node concept="55IIr" id="46o4wsH5O3U" role="3LF7KH">
-          <node concept="2Ry0Ak" id="46o4wsH5OhX" role="iGT6I">
-            <property role="2Ry0Am" value="samples" />
-            <node concept="2Ry0Ak" id="46o4wsH5OqI" role="2Ry0An">
-              <property role="2Ry0Am" value="mpscore" />
-              <node concept="2Ry0Ak" id="V93sVItQKJ" role="2Ry0An">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="V93sVItQKH" role="2Ry0An">
-                  <property role="2Ry0Am" value="jetbrains.mps.typechecking.sample" />
-                  <node concept="2Ry0Ak" id="V93sVItQKI" role="2Ry0An">
-                    <property role="2Ry0Am" value="jetbrains.mps.typechecking.sample.msd" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="46o4wsH5OKC" role="3bR37C">
-          <node concept="3bR9La" id="46o4wsH5OKD" role="1SiIV1">
-            <property role="3bR36h" value="true" />
-            <ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
-          </node>
-        </node>
-        <node concept="3rtmxn" id="3Z6zOnxMpyP" role="3bR31x">
-          <node concept="3LXTmp" id="3Z6zOnxMpyQ" role="3rtmxm">
-            <node concept="3qWCbU" id="3Z6zOnxMpyR" role="3LXTna">
-              <property role="3qWCbO" value="icons/**, resources/**" />
-            </node>
-            <node concept="55IIr" id="3Z6zOnxMpyS" role="3LXTmr">
-              <node concept="2Ry0Ak" id="3Z6zOnxMpyT" role="iGT6I">
-                <property role="2Ry0Am" value="coderules" />
-                <node concept="2Ry0Ak" id="3Z6zOnxMpyU" role="2Ry0An">
-                  <property role="2Ry0Am" value="solutions" />
-                  <node concept="2Ry0Ak" id="3Z6zOnxMpyV" role="2Ry0An">
-                    <property role="2Ry0Am" value="jetbrains.mps.typechecking.sample" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="1E1JtA" id="46o4wsH5Nat" role="2G$12L">
-        <property role="BnDLt" value="true" />
-        <property role="TrG5h" value="jetbrains.mps.typechecking.sample.test" />
-        <property role="3LESm3" value="1b65dfe8-24ff-41c3-9a3e-70f102942455" />
-        <property role="2GAjPV" value="false" />
-        <property role="aoJFB" value="sources and tests" />
-        <node concept="55IIr" id="46o4wsH5Naw" role="3LF7KH">
-          <node concept="2Ry0Ak" id="46o4wsH5NjF" role="iGT6I">
-            <property role="2Ry0Am" value="samples" />
-            <node concept="2Ry0Ak" id="V93sVItR4b" role="2Ry0An">
-              <property role="2Ry0Am" value="mpscore" />
-              <node concept="2Ry0Ak" id="V93sVItR48" role="2Ry0An">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="V93sVItR49" role="2Ry0An">
-                  <property role="2Ry0Am" value="jetbrains.mps.typechecking.sample.test" />
-                  <node concept="2Ry0Ak" id="V93sVItR4a" role="2Ry0An">
-                    <property role="2Ry0Am" value="jetbrains.mps.typechecking.sample.test.msd" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="46o4wsH5NLk" role="3bR37C">
-          <node concept="3bR9La" id="46o4wsH5NLl" role="1SiIV1">
-            <property role="3bR36h" value="false" />
-            <ref role="3bR37D" to="ffeo:7Kfy9QB6KYb" resolve="jetbrains.mps.baseLanguage" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="46o4wsH5OPm" role="3bR37C">
-          <node concept="3bR9La" id="46o4wsH5OPn" role="1SiIV1">
-            <property role="3bR36h" value="false" />
-            <ref role="3bR37D" node="46o4wsH5O3R" resolve="jetbrains.mps.typechecking.sample" />
-          </node>
-        </node>
-        <node concept="3rtmxn" id="3Z6zOnxMpzl" role="3bR31x">
-          <node concept="3LXTmp" id="3Z6zOnxMpzm" role="3rtmxm">
-            <node concept="3qWCbU" id="3Z6zOnxMpzn" role="3LXTna">
-              <property role="3qWCbO" value="icons/**, resources/**" />
-            </node>
-            <node concept="55IIr" id="3Z6zOnxMpzo" role="3LXTmr">
-              <node concept="2Ry0Ak" id="3Z6zOnxMpzp" role="iGT6I">
-                <property role="2Ry0Am" value="coderules" />
-                <node concept="2Ry0Ak" id="3Z6zOnxMpzq" role="2Ry0An">
-                  <property role="2Ry0Am" value="solutions" />
-                  <node concept="2Ry0Ak" id="3Z6zOnxMpzr" role="2Ry0An">
-                    <property role="2Ry0Am" value="jetbrains.mps.typechecking.sample.test" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="6d0cWF2ZBvC" role="3bR37C">
-          <node concept="3bR9La" id="6d0cWF2ZBvD" role="1SiIV1">
-            <property role="3bR36h" value="false" />
-            <ref role="3bR37D" node="65DJywFj0Fi" resolve="jetbrains.mps.typechecking" />
-          </node>
-        </node>
-      </node>
-    </node>
     <node concept="2sgV4H" id="7Ant4WkHLmd" role="1l3spa">
       <ref role="1l3spb" to="ffeo:3IKDaVZmzS6" resolve="mps" />
       <node concept="398BVA" id="7Ant4WkHLme" role="2JcizS">
@@ -2542,6 +2254,7 @@
     </node>
     <node concept="55IIr" id="1BDNG5xBZgh" role="auvoZ" />
     <node concept="1l3spV" id="1BDNG5xBZgi" role="1l3spN">
+      <node concept="39821Y" id="5zsw4w2PYzi" role="39821P" />
       <node concept="398223" id="7Ant4WkHLAp" role="39821P">
         <node concept="L2wRC" id="JOGAOsFE1x" role="39821P">
           <ref role="L2wRA" node="JOGAOsFCCM" resolve="jetbrains.mps.dataform" />
@@ -2611,18 +2324,6 @@
             <property role="3MwjfP" value="tests" />
           </node>
         </node>
-        <node concept="L2wRC" id="7Ant4WkHLmQ" role="39821P">
-          <ref role="L2wRA" node="7Ant4WkHLsF" resolve="jetbrains.mps.baseLanguageExt" />
-        </node>
-        <node concept="L2wRC" id="46o4wsHqYX3" role="39821P">
-          <ref role="L2wRA" node="46o4wsHqZu7" resolve="jetbrains.mps.baseLanguageExt.test" />
-        </node>
-        <node concept="L2wRC" id="46o4wsHr0Fr" role="39821P">
-          <ref role="L2wRA" node="46o4wsH5O3R" resolve="jetbrains.mps.typechecking.sample" />
-        </node>
-        <node concept="L2wRC" id="46o4wsHr0QF" role="39821P">
-          <ref role="L2wRA" node="46o4wsH5Nat" resolve="jetbrains.mps.typechecking.sample.test" />
-        </node>
         <node concept="L2wRC" id="46o4wsHrP6K" role="39821P">
           <ref role="L2wRA" node="46o4wsH5PJF" resolve="jetbrains.mps.typechecking.annotation" />
         </node>
diff --git a/coderules/solutions/jetbrains.mps.typechecking.test/jetbrains.mps.typechecking.test.msd b/coderules/solutions/jetbrains.mps.typechecking.test/jetbrains.mps.typechecking.test.msd
index 13ef5598..a188c61e 100644
--- a/coderules/solutions/jetbrains.mps.typechecking.test/jetbrains.mps.typechecking.test.msd
+++ b/coderules/solutions/jetbrains.mps.typechecking.test/jetbrains.mps.typechecking.test.msd
@@ -25,7 +25,6 @@
     <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:f61473f9-130f-42f6-b98d-6c438812c2f6:jetbrains.mps.baseLanguage.unitTest" version="0" />
-    <language slang="l:0fda14cc-a416-4c81-869a-2175d8b3325d:jetbrains.mps.baseLanguageExt" version="0" />
     <language slang="l:df345b11-b8c7-4213-ac66-48d2a9b75d88:jetbrains.mps.baseLanguageInternal" version="0" />
     <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
     <language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
diff --git a/coderules/solutions/jetbrains.mps.typechecking.test/models/data.mps b/coderules/solutions/jetbrains.mps.typechecking.test/models/data.mps
index 9224d48c..49a34adf 100644
--- a/coderules/solutions/jetbrains.mps.typechecking.test/models/data.mps
+++ b/coderules/solutions/jetbrains.mps.typechecking.test/models/data.mps
@@ -4,7 +4,6 @@
   <languages>
     <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="2" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="6" />
-    <use id="0fda14cc-a416-4c81-869a-2175d8b3325d" name="jetbrains.mps.baseLanguageExt" version="0" />
   </languages>
   <imports>
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
diff --git a/coderules/solutions/jetbrains.mps.typechecking.test/models/jetbrains.mps.typechecking@tests.mps b/coderules/solutions/jetbrains.mps.typechecking.test/models/jetbrains.mps.typechecking@tests.mps
index e388f5cc..bff5fcb6 100644
--- a/coderules/solutions/jetbrains.mps.typechecking.test/models/jetbrains.mps.typechecking@tests.mps
+++ b/coderules/solutions/jetbrains.mps.typechecking.test/models/jetbrains.mps.typechecking@tests.mps
@@ -9,7 +9,6 @@
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
     <use id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation" version="0" />
     <use id="cba985fe-1e96-4f16-9f8d-b07434405d4f" name="jetbrains.mps.lang.smodel.types" version="0" />
-    <use id="0fda14cc-a416-4c81-869a-2175d8b3325d" name="jetbrains.mps.baseLanguageExt" version="0" />
     <use id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers" version="0" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="0" />
     <use id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions" version="4" />