diff --git a/build.xml b/build.xml
index b24a866e..7c55b1bf 100644
--- a/build.xml
+++ b/build.xml
@@ -873,7 +873,6 @@
           <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" kind="cl" />
           <module ref="f113d56b-63e3-4120-a89c-2f5dcb8c6290(jetbrains.mps.coderules.runtime)" kind="cl" />
           <module ref="6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.coderules.typechecking)" kind="cl" />
-          <module ref="c9670c16-a215-41fb-8784-04b14329799d(jetbrains.mps.coderules.typechecking.test)" kind="cl" />
           <module ref="c4803b19-6d89-4a3b-bf82-390769514add(jetbrains.mps.lang.coderules)" kind="cl" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="cl" />
           <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" kind="cl" />
@@ -1988,8 +1987,8 @@
           <language id="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" />
           <language id="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" />
         </uses>
-        <library jar="../lib/reactive-streams-1.0.0.final-0.7.jar" />
-        <library jar="../lib/rxjava-2.2.1.8jar" />
+        <library jar="../lib/reactive-streams-1.0.0.final.jar" />
+        <library jar="../lib/rxjava-2.2.18.jar" />
         <library jar="../lib/rxjava2-swing-0.3.7.jar" />
         <classpath>
           <entry path="." />
@@ -2518,7 +2517,6 @@
           <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" kind="cl" />
           <module ref="f113d56b-63e3-4120-a89c-2f5dcb8c6290(jetbrains.mps.coderules.runtime)" kind="cl" />
           <module ref="6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.coderules.typechecking)" kind="cl" />
-          <module ref="c9670c16-a215-41fb-8784-04b14329799d(jetbrains.mps.coderules.typechecking.test)" kind="cl" />
           <module ref="c4803b19-6d89-4a3b-bf82-390769514add(jetbrains.mps.lang.coderules)" kind="cl" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="cl" />
           <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" kind="cl" />
@@ -3218,7 +3216,7 @@
     <delete dir="${build.layout}" />
   </target>
   
-  <target name="compileJava" depends="java.compile.jetbrains.mps.coderules.build, java.compile.java.modules.cycle.1, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic#6626732309150416985, java.compile.jetbrains.mps.logic.test, java.compile.jetbrains.mps.lang.typechecking.runtime, java.compile.jetbrains.mps.lang.typechecking, java.compile.jetbrains.mps.lang.typechecking#01, java.compile.jetbrains.mps.coderules.typechecking, java.compile.jetbrains.mps.coderules.typechecking.ui, java.compile.jetbrains.mps.typechecking.annotation, java.compile.java.modules.cycle.2, java.compile.jetbrains.mps.coderules.testhelper, java.compile.jetbrains.mps.typechecking.testlang, java.compile.jetbrains.mps.typechecking.testlang#3575255234175341581, java.compile.jetbrains.mps.coderules.typechecking.testlang.sandbox, java.compile.jetbrains.mps.coderules.typechecking.test, java.compile.jetbrains.mps.lang.controlflow.runtime, java.compile.jetbrains.mps.lang.controlflow, java.compile.jetbrains.mps.lang.controlflow#01, java.compile.jetbrains.mps.controlflow, java.compile.jetbrains.mps.controlflow.ui, java.compile.jetbrains.mps.lang.coderules, java.compile.jetbrains.mps.lang.coderules#4578927328670739933, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.coderules.runtime, java.compile.jetbrains.mps.coderules, java.compile.jetbrains.mps.coderules.ui, java.compile.jetbrains.mps.coderules.test" />
+  <target name="compileJava" depends="java.compile.jetbrains.mps.coderules.build, java.compile.java.modules.cycle.1, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic#6626732309150416985, java.compile.jetbrains.mps.logic.test, java.compile.jetbrains.mps.lang.typechecking.runtime, java.compile.jetbrains.mps.lang.typechecking, java.compile.jetbrains.mps.lang.typechecking#01, java.compile.jetbrains.mps.coderules.typechecking, java.compile.jetbrains.mps.coderules.typechecking.ui, java.compile.jetbrains.mps.typechecking.annotation, java.compile.jetbrains.mps.coderules.testhelper, java.compile.jetbrains.mps.typechecking.testlang, java.compile.jetbrains.mps.typechecking.testlang#3575255234175341581, java.compile.jetbrains.mps.coderules.typechecking.testlang.sandbox, java.compile.jetbrains.mps.coderules.typechecking.test, java.compile.jetbrains.mps.lang.controlflow.runtime, java.compile.jetbrains.mps.lang.controlflow, java.compile.jetbrains.mps.lang.controlflow#01, java.compile.jetbrains.mps.controlflow, java.compile.jetbrains.mps.controlflow.ui, java.compile.jetbrains.mps.lang.coderules, java.compile.jetbrains.mps.lang.coderules#4578927328670739933, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.coderules.runtime, java.compile.jetbrains.mps.coderules, java.compile.jetbrains.mps.coderules.ui, java.compile.jetbrains.mps.coderules.test" />
   
   <target name="processResources" />
   
@@ -3377,6 +3375,7 @@
       </chunk>
       <chunk>
         <module file="${basedir}/coderules/solutions/jetbrains.mps.coderules.test/jetbrains.mps.coderules.test.msd" />
+        <module file="${basedir}/coderules/solutions/jetbrains.mps.coderules.testhelper/jetbrains.mps.coderules.testhelper.msd" />
         <module file="${basedir}/coderules/solutions/jetbrains.mps.coderules.typechecking.ui/jetbrains.mps.coderules.typechecking.ui.msd" />
         <module file="${basedir}/coderules/solutions/jetbrains.mps.coderules.ui/jetbrains.mps.coderules.ui.msd" />
         <module file="${basedir}/coderules/solutions/jetbrains.mps.controlflow/jetbrains.mps.controlflow.msd" />
@@ -3387,7 +3386,6 @@
         <module file="${basedir}/coderules/languages/jetbrains.mps.typechecking.testlang/jetbrains.mps.typechecking.testlang.mpl" />
       </chunk>
       <chunk>
-        <module file="${basedir}/coderules/solutions/jetbrains.mps.coderules.testhelper/jetbrains.mps.coderules.testhelper.msd" />
         <module file="${basedir}/coderules/solutions/jetbrains.mps.coderules.typechecking.test/jetbrains.mps.coderules.typechecking.test.msd" />
         <module file="${basedir}/coderules/solutions/jetbrains.mps.coderules.typechecking.testlang.sandbox/jetbrains.mps.coderules.typechecking.testlang.sandbox.msd" />
       </chunk>
@@ -4063,93 +4061,7 @@
     </javac>
   </target>
   
-  <target name="java.compile.java.modules.cycle.2" depends="java.compile.jetbrains.mps.coderules, java.compile.jetbrains.mps.coderules.runtime, java.compile.jetbrains.mps.coderules.typechecking, java.compile.jetbrains.mps.lang.coderules, java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.lang.typechecking.runtime, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.coderules.typechecking.testlang.sandbox, java.compile.jetbrains.mps.logic.test, java.compile.jetbrains.mps.typechecking.testlang, fetchDependencies">
-    <mkdir dir="${build.tmp}/java.modules.cycle.2" />
-    <javac destdir="${build.tmp}/java.modules.cycle.2" fork="true" encoding="utf8" nowarn="true" includeantruntime="false">
-      <compilerarg value="-Xlint:none" />
-      <src>
-        <path location="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.testhelper/source_gen" />
-        <path location="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.typechecking.test/source_gen" />
-        <pathelement path="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.typechecking.test/test_gen/" />
-      </src>
-      <classpath>
-        <fileset file="${artifacts.mps}/lib/mps-core.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-annotations.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-closures.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-collections.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-references.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-context.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-constraints-runtime.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-generator.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-persistence.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-project-check.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-textgen.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-icons.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-workbench.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-test.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-problem.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-messages-for-rules.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.2.18.jar" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules/lib/rxjava2-swing-0.3.7.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/trove4j-3.0.3.jar" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.14.jar" />
-        <fileset file="${artifacts.mps}/lib/junit4.jar" />
-        <fileset dir="${artifacts.mps}/lib" includes="*.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.16.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.closures.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.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.descriptor.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.modelapi.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.structure.jar" />
-        <fileset file="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.typesystem.jar" />
-        <fileset file="${artifacts.mps}/lib/ant/lib/ant.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.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" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.coderules" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.coderules.runtime" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.coderules.typechecking" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules" />
-        <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.typechecking.runtime" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.coderules.typechecking.testlang.sandbox" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.test" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking.testlang" />
-      </classpath>
-    </javac>
-  </target>
-  
-  <target name="java.compile.jetbrains.mps.coderules.testhelper" depends="java.compile.jetbrains.mps.coderules, java.compile.jetbrains.mps.coderules.runtime, java.compile.jetbrains.mps.coderules.typechecking, java.compile.jetbrains.mps.lang.coderules, java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.lang.typechecking.runtime, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic.runtime, java.compile.java.modules.cycle.2, fetchDependencies">
+  <target name="java.compile.jetbrains.mps.coderules.testhelper" depends="java.compile.jetbrains.mps.coderules, java.compile.jetbrains.mps.coderules.runtime, java.compile.jetbrains.mps.coderules.typechecking, java.compile.jetbrains.mps.lang.coderules, java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.lang.typechecking.runtime, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
     <mkdir dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.testhelper/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.coderules.testhelper" />
     <javac destdir="${build.tmp}/java/out/jetbrains.mps.coderules.testhelper" fork="true" encoding="utf8" includeantruntime="false" debug="true">
@@ -4186,7 +4098,6 @@
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.coderules" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.coderules.runtime" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.coderules.typechecking" />
-        <fileset file="${artifacts.mps}/lib/mps-test.jar" />
         <fileset file="${artifacts.mps}/lib/mps-problem.jar" />
         <fileset file="${artifacts.mps}/lib/mps-messages-for-rules.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules" />
@@ -4223,7 +4134,6 @@
         <fileset file="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.typesystem.jar" />
-        <pathelement path="${build.tmp}/java.modules.cycle.2" />
       </classpath>
     </javac>
   </target>
@@ -4350,7 +4260,7 @@
     </javac>
   </target>
   
-  <target name="java.compile.jetbrains.mps.coderules.typechecking.test" depends="java.compile.jetbrains.mps.coderules, java.compile.jetbrains.mps.coderules.runtime, java.compile.jetbrains.mps.coderules.typechecking, java.compile.jetbrains.mps.coderules.typechecking.testlang.sandbox, java.compile.jetbrains.mps.lang.coderules, java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.lang.typechecking.runtime, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.logic.test, java.compile.jetbrains.mps.typechecking.testlang, java.compile.java.modules.cycle.2, fetchDependencies">
+  <target name="java.compile.jetbrains.mps.coderules.typechecking.test" depends="java.compile.jetbrains.mps.coderules, java.compile.jetbrains.mps.coderules.runtime, java.compile.jetbrains.mps.coderules.testhelper, java.compile.jetbrains.mps.coderules.typechecking, java.compile.jetbrains.mps.coderules.typechecking.testlang.sandbox, java.compile.jetbrains.mps.lang.coderules, java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.lang.typechecking.runtime, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.logic.test, java.compile.jetbrains.mps.typechecking.testlang, fetchDependencies">
     <mkdir dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.typechecking.test/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.coderules.typechecking.test" />
     <javac destdir="${build.tmp}/java/out/jetbrains.mps.coderules.typechecking.test" fork="true" encoding="utf8" includeantruntime="false" debug="true">
@@ -4387,6 +4297,7 @@
         <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.coderules.runtime" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.coderules.testhelper" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.coderules.typechecking" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.coderules.typechecking.testlang.sandbox" />
         <fileset file="${artifacts.mps}/lib/mps-problem.jar" />
@@ -4432,7 +4343,6 @@
         <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" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.typesystem.jar" />
-        <pathelement path="${build.tmp}/java.modules.cycle.2" />
       </classpath>
     </javac>
   </target>
@@ -5387,6 +5297,7 @@
     <delete dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.build/source_gen" />
     <delete dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.runtime/source_gen" />
     <delete dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.test/source_gen" />
+    <delete dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.testhelper/source_gen" />
     <delete dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.typechecking.ui/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" />
@@ -5400,7 +5311,6 @@
     <delete dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.test/source_gen" />
     <delete dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.typechecking.testlang/source_gen" />
     <delete dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.typechecking.testlang/generator/source_gen" />
-    <delete dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.testhelper/source_gen" />
     <delete dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.typechecking.test/source_gen" />
     <delete dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.typechecking.testlang.sandbox/source_gen" />
     <delete dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.test/test_gen" />
diff --git a/coderules/solutions/jetbrains.mps.coderules.build/models/jetbrains.mps.coderules.build.mps b/coderules/solutions/jetbrains.mps.coderules.build/models/jetbrains.mps.coderules.build.mps
index d733fdc7..a7e4f542 100644
--- a/coderules/solutions/jetbrains.mps.coderules.build/models/jetbrains.mps.coderules.build.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.build/models/jetbrains.mps.coderules.build.mps
@@ -345,6 +345,7 @@
         <property role="TrG5h" value="jetbrains.mps.logic.reactor" />
         <property role="3LESm3" value="bbf5c548-7111-4a53-a117-cdefc664cf34" />
         <property role="2GAjPV" value="true" />
+        <property role="BnDLt" value="true" />
         <node concept="55IIr" id="7BVjoXzUxoU" role="3LF7KH">
           <node concept="2Ry0Ak" id="7BVjoXzUxpK" role="iGT6I">
             <property role="2Ry0Am" value="coderules" />
@@ -1490,11 +1491,6 @@
             <ref role="3bR37D" to="ffeo:7Kfy9QB6KXW" resolve="jetbrains.mps.lang.core" />
           </node>
         </node>
-        <node concept="1SiIV0" id="4XsNDZX1udq" role="3bR37C">
-          <node concept="3bR9La" id="4XsNDZX1udr" role="1SiIV1">
-            <ref role="3bR37D" node="7mB3viLwG3m" resolve="jetbrains.mps.coderules.typechecking.test" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="4XsNDZX1uds" role="3bR37C">
           <node concept="3bR9La" id="4XsNDZX1udt" role="1SiIV1">
             <ref role="3bR37D" to="ffeo:1TaHNgiIbIQ" resolve="MPS.Core" />
@@ -3446,7 +3442,7 @@
             <node concept="L2wRC" id="5wYq9r5FcuF" role="39821P">
               <ref role="L2wRA" node="NKt6yn9_8p" resolve="jetbrains.mps.coderules" />
               <node concept="3yLZsm" id="5wYq9r5FcuG" role="3yL2VB">
-                <property role="3yLZsk" value="../lib/reactive-streams-1.0.0.final-0.7.jar" />
+                <property role="3yLZsk" value="../lib/reactive-streams-1.0.0.final.jar" />
                 <node concept="398BVA" id="5wYq9r5FcuH" role="3yLZsn">
                   <ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.coderules_home" />
                   <node concept="2Ry0Ak" id="5wYq9r5FcuI" role="iGT6I">
@@ -3467,7 +3463,7 @@
                 </node>
               </node>
               <node concept="3yLZsm" id="5wYq9r5FcuN" role="3yL2VB">
-                <property role="3yLZsk" value="../lib/rxjava-2.2.1.8jar" />
+                <property role="3yLZsk" value="../lib/rxjava-2.2.18.jar" />
                 <node concept="398BVA" id="5wYq9r5FcuO" role="3yLZsn">
                   <ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.coderules_home" />
                   <node concept="2Ry0Ak" id="5wYq9r5FcuP" role="iGT6I">
diff --git a/coderules/solutions/jetbrains.mps.coderules.testhelper/jetbrains.mps.coderules.testhelper.msd b/coderules/solutions/jetbrains.mps.coderules.testhelper/jetbrains.mps.coderules.testhelper.msd
index 56068517..c8b49237 100644
--- a/coderules/solutions/jetbrains.mps.coderules.testhelper/jetbrains.mps.coderules.testhelper.msd
+++ b/coderules/solutions/jetbrains.mps.coderules.testhelper/jetbrains.mps.coderules.testhelper.msd
@@ -17,7 +17,6 @@
     <dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
     <dependency reexport="false">6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.coderules.typechecking)</dependency>
     <dependency reexport="false">26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)</dependency>
-    <dependency reexport="false">c9670c16-a215-41fb-8784-04b14329799d(jetbrains.mps.coderules.typechecking.test)</dependency>
     <dependency reexport="false">8585453e-6bfb-4d80-98de-b16074f1d86c(jetbrains.mps.lang.test)</dependency>
     <dependency reexport="false">ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)</dependency>
     <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
@@ -56,7 +55,6 @@
     <module reference="f113d56b-63e3-4120-a89c-2f5dcb8c6290(jetbrains.mps.coderules.runtime)" version="0" />
     <module reference="02473356-2f59-4de1-ba87-e88f9d606180(jetbrains.mps.coderules.testhelper)" version="0" />
     <module reference="6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.coderules.typechecking)" version="0" />
-    <module reference="c9670c16-a215-41fb-8784-04b14329799d(jetbrains.mps.coderules.typechecking.test)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
     <module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
     <module reference="c4803b19-6d89-4a3b-bf82-390769514add(jetbrains.mps.lang.coderules)" version="0" />
diff --git a/samples/mpscore/build.xml b/samples/mpscore/build.xml
index 5536afc2..7e92f588 100644
--- a/samples/mpscore/build.xml
+++ b/samples/mpscore/build.xml
@@ -2601,6 +2601,149 @@
       <zipfileset dir="${build.tmp}/customProcessors/copyModels/languages-jetbrains.mps.logicExt-models" prefix="module/models" />
       <zipfileset dir="${build.tmp}/customProcessors/copyModels/languages-jetbrains.mps.logicExt-generator-templates" prefix="module/generator/templates" />
     </jar>
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.lang.coderulesExt.jar" />
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.lang.coderulesExt.jar/META-INF" />
+    <echoxml file="${build.tmp}/default/jetbrains.mps.lang.coderulesExt.jar/META-INF/module.xml">
+      <module namespace="jetbrains.mps.lang.coderulesExt" type="language" uuid="6a5b4bb9-0a56-4618-aa9a-7068c528ce90">
+        <dependencies>
+          <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" kind="rt" />
+          <module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" kind="rt" />
+          <module ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)" kind="rt" />
+          <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" kind="rt" />
+          <module ref="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" kind="rt" />
+          <module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" kind="rt" />
+          <module ref="a3e4657f-a76c-45bb-bbda-c764596ecc65(jetbrains.mps.baseLanguage.logging.runtime)" kind="rt" />
+          <module ref="52b81ac7-93fd-4e9e-b972-4995882da6d4(jetbrains.mps.baseLanguage.references.runtime)" kind="rt" />
+          <module ref="d44dab97-aaac-44cb-9745-8a14db674c03(jetbrains.mps.baseLanguage.tuples.runtime)" kind="rt" />
+          <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" kind="rt" />
+          <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" kind="rt" />
+          <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="rt" />
+          <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" kind="rt" />
+          <module ref="8e98f4e2-decf-4e97-bf80-9109e8b759ee(jetbrains.mps.lang.constraints.rules.runtime)" kind="rt" />
+          <module ref="0a98f3e2-decf-4e97-bf80-9109eccc59bb(jetbrains.mps.lang.feedback.problem.rules)" kind="rt" />
+          <module ref="9abaaae2-decf-4e97-bf80-9109e8b759cc(jetbrains.mps.lang.messages.api)" kind="rt" />
+          <module ref="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" kind="rt" />
+          <module ref="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" kind="rt" />
+          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="rt" />
+          <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
+          <module ref="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" kind="cl" />
+          <module ref="88dcbb14-19c3-4776-8f81-33611ca4d87c(jetbrains.mps.baseLanguage.sequence)" kind="cl" />
+          <module ref="0fda14cc-a416-4c81-869a-2175d8b3325d(jetbrains.mps.baseLanguageExt)" kind="cl" />
+          <module ref="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" kind="cl" />
+          <module ref="65e59b42-e7f3-45ec-8692-6c7829780afe(jetbrains.mps.lang.smodelExt)" kind="cl" />
+          <module ref="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" kind="cl" />
+          <module ref="ad4d7d30-3da5-4d56-8273-c9d815b12234(jetbrains.mps.logicExt)" kind="cl" />
+        </dependencies>
+        <uses>
+          <language id="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" />
+          <language id="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" />
+          <language id="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" />
+          <language id="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" />
+          <language id="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" />
+          <language id="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" />
+          <language id="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" />
+          <language id="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" />
+          <language id="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" />
+          <language id="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" />
+          <language id="l:e51810c5-7308-4642-bcb6-469e61b5dd18:jetbrains.mps.lang.constraints.msg.specification" />
+          <language id="l:47257bf3-78d3-470b-89d9-8c3261a61d15:jetbrains.mps.lang.constraints.rules" />
+          <language id="l:5dae8159-ab99-46bb-a40d-0cee30ee7018:jetbrains.mps.lang.constraints.rules.kinds" />
+          <language id="l:134c38d4-e3af-4d9e-b069-1c7df0a4005d:jetbrains.mps.lang.constraints.rules.skeleton" />
+          <language id="l:3ad5badc-1d9c-461c-b7b1-fa2fcd0a0ae7:jetbrains.mps.lang.context" />
+          <language id="l:ea3159bf-f48e-4720-bde2-86dba75f0d34:jetbrains.mps.lang.context.defs" />
+          <language id="l:f4ad079d-bc71-4ffb-9600-9328705cf998:jetbrains.mps.lang.descriptor" />
+          <language id="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" />
+          <language id="l:ad93155d-79b2-4759-b10c-55123e763903:jetbrains.mps.lang.messages" />
+          <language id="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" />
+          <language id="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" />
+          <language id="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" />
+          <language id="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" />
+          <language id="l:d8f591ec-4d86-4af2-9f92-a9e93c803ffa:jetbrains.mps.lang.scopes" />
+          <language id="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" />
+          <language id="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" />
+          <language id="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" />
+          <language id="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" />
+          <language id="l:4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462:jetbrains.mps.lang.typechecking" />
+          <language id="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" />
+        </uses>
+        <classpath>
+          <entry path="." />
+        </classpath>
+        <sources jar="jetbrains.mps.lang.coderulesExt-src.jar" descriptor="jetbrains.mps.lang.coderulesExt.mpl" />
+      </module>
+    </echoxml>
+    <jar destfile="${build.layout}/deploy/jetbrains.mps.lang.coderulesExt.jar" duplicate="preserve">
+      <fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.coderulesExt" />
+      <fileset dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.lang.coderulesExt/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
+      <fileset dir="${build.tmp}/default/jetbrains.mps.lang.coderulesExt.jar" />
+    </jar>
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.lang.coderulesExt-generator.jar" />
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.lang.coderulesExt-generator.jar/META-INF" />
+    <echoxml file="${build.tmp}/default/jetbrains.mps.lang.coderulesExt-generator.jar/META-INF/module.xml">
+      <module namespace="jetbrains.mps.lang.coderulesExt#01" type="generator" uuid="3d598314-84de-4985-8c2f-ce6664af759f">
+        <dependencies>
+          <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" kind="rt" />
+          <module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" kind="rt" />
+          <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" kind="rt" />
+          <module ref="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" kind="rt" />
+          <module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" kind="rt" />
+          <module ref="a3e4657f-a76c-45bb-bbda-c764596ecc65(jetbrains.mps.baseLanguage.logging.runtime)" kind="rt" />
+          <module ref="52b81ac7-93fd-4e9e-b972-4995882da6d4(jetbrains.mps.baseLanguage.references.runtime)" kind="rt" />
+          <module ref="d44dab97-aaac-44cb-9745-8a14db674c03(jetbrains.mps.baseLanguage.tuples.runtime)" kind="rt" />
+          <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" kind="rt" />
+          <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" kind="rt" />
+          <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
+          <module ref="6a5b4bb9-0a56-4618-aa9a-7068c528ce90(jetbrains.mps.lang.coderulesExt)" kind="cl" />
+        </dependencies>
+        <uses>
+          <language id="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" />
+          <language id="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" />
+          <language id="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" />
+          <language id="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" />
+          <language id="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" />
+          <language id="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" />
+          <language id="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" />
+          <language id="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" />
+          <language id="l:289fcc83-6543-41e8-a5ca-768235715ce4:jetbrains.mps.lang.generator.generationParameters" />
+          <language id="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" />
+          <language id="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" />
+          <language id="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" />
+          <language id="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" />
+        </uses>
+        <classpath>
+          <entry path="." />
+        </classpath>
+        <sources jar="jetbrains.mps.lang.coderulesExt-src.jar" descriptor="jetbrains.mps.lang.coderulesExt.mpl" />
+      </module>
+    </echoxml>
+    <jar destfile="${build.layout}/deploy/jetbrains.mps.lang.coderulesExt-generator.jar" duplicate="preserve">
+      <fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.coderulesExt#01" />
+      <fileset dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.lang.coderulesExt/generator/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
+      <fileset dir="${build.tmp}/default/jetbrains.mps.lang.coderulesExt-generator.jar" />
+    </jar>
+    <copyModels todir="${build.tmp}/customProcessors/copyModels/languages-jetbrains.mps.lang.coderulesExt-models">
+      <fileset dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.lang.coderulesExt/models" includes="**/*.mps, **/*.mpsr, **/.model" />
+    </copyModels>
+    <copyModels todir="${build.tmp}/customProcessors/copyModels/languages-jetbrains.mps.lang.coderulesExt-generator-templates">
+      <fileset dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.lang.coderulesExt/generator/templates" includes="**/*.mps, **/*.mpsr, **/.model" />
+    </copyModels>
+    <jar destfile="${build.layout}/deploy/jetbrains.mps.lang.coderulesExt-src.jar" duplicate="preserve">
+      <fileset dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.lang.coderulesExt/generator/source_gen">
+        <exclude name="**/trace.info" />
+        <exclude name="**/exports" />
+        <exclude name="**/checkpoints" />
+        <exclude name="**/*.mps" />
+      </fileset>
+      <fileset dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.lang.coderulesExt/source_gen">
+        <exclude name="**/trace.info" />
+        <exclude name="**/exports" />
+        <exclude name="**/checkpoints" />
+        <exclude name="**/*.mps" />
+      </fileset>
+      <zipfileset file="${basedir}/languages/jetbrains.mps.lang.coderulesExt/jetbrains.mps.lang.coderulesExt.mpl" prefix="module" />
+      <zipfileset dir="${build.tmp}/customProcessors/copyModels/languages-jetbrains.mps.lang.coderulesExt-models" prefix="module/models" />
+      <zipfileset dir="${build.tmp}/customProcessors/copyModels/languages-jetbrains.mps.lang.coderulesExt-generator-templates" prefix="module/generator/templates" />
+    </jar>
     <mkdir dir="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip" />
     <mkdir dir="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types" />
     <mkdir dir="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types/META-INF" />
@@ -2609,7 +2752,7 @@
         <id>jetbrains.mps.core.types</id>
         <name>MPS Core Types</name>
         <description>Types for core MPS languages (experimental)</description>
-        <version>${coderules.ci.mps.release}-0.9-b${coderules.ci.build.num}</version>
+        <version>${ci.mps.release}-0.9-b${ci.build.num}</version>
         <vendor url="jetbrains.com/mps">JetBrains s.r.o.</vendor>
         <depends>jetbrains.mps.coderules</depends>
         <idea-version since-build="211.1" />
@@ -2619,6 +2762,7 @@
         </extensions>
       </idea-plugin>
     </echoxml>
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types/languages" />
     <mkdir dir="${build.tmp}/default/jetbrains.mps.baseLanguage.blTypesExt.jar1" />
     <mkdir dir="${build.tmp}/default/jetbrains.mps.baseLanguage.blTypesExt.jar1/META-INF" />
     <echoxml file="${build.tmp}/default/jetbrains.mps.baseLanguage.blTypesExt.jar1/META-INF/module.xml">
@@ -2683,7 +2827,7 @@
         <sources jar="jetbrains.mps.baseLanguage.blTypesExt-src.jar" descriptor="jetbrains.mps.baseLanguage.blTypesExt.mpl" />
       </module>
     </echoxml>
-    <jar destfile="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types/jetbrains.mps.baseLanguage.blTypesExt.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types/languages/jetbrains.mps.baseLanguage.blTypesExt.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.baseLanguage.blTypesExt" />
       <fileset dir="${basedir}/languages/jetbrains.mps.baseLanguage.blTypesExt" includes="icons/**, resources/**" />
       <fileset dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.baseLanguage.blTypesExt/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
@@ -2728,7 +2872,7 @@
         <sources jar="jetbrains.mps.baseLanguage.blTypesExt-src.jar" descriptor="jetbrains.mps.baseLanguage.blTypesExt.mpl" />
       </module>
     </echoxml>
-    <jar destfile="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types/jetbrains.mps.baseLanguage.blTypesExt-generator.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types/languages/jetbrains.mps.baseLanguage.blTypesExt-generator.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.baseLanguage.blTypesExt#01" />
       <fileset dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.baseLanguage.blTypesExt/generator/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.baseLanguage.blTypesExt-generator.jar1" />
@@ -2739,7 +2883,7 @@
     <copyModels todir="${build.tmp}/customProcessors/copyModels/languages-jetbrains.mps.baseLanguage.blTypesExt-generator-templates1">
       <fileset dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.baseLanguage.blTypesExt/generator/templates" includes="**/*.mps, **/*.mpsr, **/.model" />
     </copyModels>
-    <jar destfile="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types/jetbrains.mps.baseLanguage.blTypesExt-src.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types/languages/jetbrains.mps.baseLanguage.blTypesExt-src.jar" duplicate="preserve">
       <fileset dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.baseLanguage.blTypesExt/generator/source_gen">
         <exclude name="**/trace.info" />
         <exclude name="**/exports" />
@@ -2830,7 +2974,7 @@
         <sources jar="jetbrains.mps.baseLanguageExt-src.jar" descriptor="jetbrains.mps.baseLanguageExt.mpl" />
       </module>
     </echoxml>
-    <jar destfile="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types/jetbrains.mps.baseLanguageExt.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types/languages/jetbrains.mps.baseLanguageExt.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.baseLanguageExt" />
       <fileset dir="${basedir}/languages/jetbrains.mps.baseLanguageExt" includes="icons/**, resources/**" />
       <fileset dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.baseLanguageExt/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
@@ -2839,7 +2983,7 @@
     <copyModels todir="${build.tmp}/customProcessors/copyModels/languages-jetbrains.mps.baseLanguageExt-models1">
       <fileset dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.baseLanguageExt/models" includes="**/*.mps, **/*.mpsr, **/.model" />
     </copyModels>
-    <jar destfile="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types/jetbrains.mps.baseLanguageExt-src.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types/languages/jetbrains.mps.baseLanguageExt-src.jar" duplicate="preserve">
       <fileset dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.baseLanguageExt/source_gen">
         <exclude name="**/trace.info" />
         <exclude name="**/exports" />
@@ -2915,7 +3059,7 @@
         <sources jar="jetbrains.mps.baseLanguageInternalExt-src.jar" descriptor="jetbrains.mps.baseLanguageInternalExt.mpl" />
       </module>
     </echoxml>
-    <jar destfile="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types/jetbrains.mps.baseLanguageInternalExt.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types/languages/jetbrains.mps.baseLanguageInternalExt.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.baseLanguageInternalExt" />
       <fileset dir="${basedir}/languages/jetbrains.mps.baseLanguageExt" includes="icons/**, resources/**" />
       <fileset dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.baseLanguageInternalExt/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
@@ -2960,7 +3104,7 @@
         <sources jar="jetbrains.mps.baseLanguageInternalExt-src.jar" descriptor="jetbrains.mps.baseLanguageInternalExt.mpl" />
       </module>
     </echoxml>
-    <jar destfile="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types/jetbrains.mps.baseLanguageInternalExt-generator.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types/languages/jetbrains.mps.baseLanguageInternalExt-generator.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.baseLanguageInternalExt#01" />
       <fileset dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.baseLanguageInternalExt/generator/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.baseLanguageInternalExt-generator.jar1" />
@@ -2971,7 +3115,7 @@
     <copyModels todir="${build.tmp}/customProcessors/copyModels/languages-jetbrains.mps.baseLanguageInternalExt-generator-templates1">
       <fileset dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.baseLanguageInternalExt/generator/templates" includes="**/*.mps, **/*.mpsr, **/.model" />
     </copyModels>
-    <jar destfile="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types/jetbrains.mps.baseLanguageInternalExt-src.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types/languages/jetbrains.mps.baseLanguageInternalExt-src.jar" duplicate="preserve">
       <fileset dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.baseLanguageInternalExt/generator/source_gen">
         <exclude name="**/trace.info" />
         <exclude name="**/exports" />
@@ -3059,7 +3203,7 @@
         <sources jar="jetbrains.mps.baseLanguage.javadocExt-src.jar" descriptor="jetbrains.mps.baseLanguage.javadocExt.mpl" />
       </module>
     </echoxml>
-    <jar destfile="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types/jetbrains.mps.baseLanguage.javadocExt.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types/languages/jetbrains.mps.baseLanguage.javadocExt.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.baseLanguage.javadocExt" />
       <fileset dir="${basedir}/languages/jetbrains.mps.baseLanguage.javadocExt" includes="icons/**" />
       <fileset dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.baseLanguage.javadocExt/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
@@ -3068,7 +3212,7 @@
     <copyModels todir="${build.tmp}/customProcessors/copyModels/languages-jetbrains.mps.baseLanguage.javadocExt-models1">
       <fileset dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.baseLanguage.javadocExt/models" includes="**/*.mps, **/*.mpsr, **/.model" />
     </copyModels>
-    <jar destfile="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types/jetbrains.mps.baseLanguage.javadocExt-src.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types/languages/jetbrains.mps.baseLanguage.javadocExt-src.jar" duplicate="preserve">
       <fileset dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.baseLanguage.javadocExt/source_gen">
         <exclude name="**/trace.info" />
         <exclude name="**/exports" />
@@ -3147,7 +3291,7 @@
         <sources jar="jetbrains.mps.baseLanguage.tuplesExt-src.jar" descriptor="jetbrains.mps.baseLanguage.tuplesExt.mpl" />
       </module>
     </echoxml>
-    <jar destfile="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types/jetbrains.mps.baseLanguage.tuplesExt.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types/languages/jetbrains.mps.baseLanguage.tuplesExt.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.baseLanguage.tuplesExt" />
       <fileset dir="${basedir}/languages" includes="icons/**" />
       <fileset dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.baseLanguage.tuplesExt/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
@@ -3192,7 +3336,7 @@
         <sources jar="jetbrains.mps.baseLanguage.tuplesExt-src.jar" descriptor="jetbrains.mps.baseLanguage.tuplesExt.mpl" />
       </module>
     </echoxml>
-    <jar destfile="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types/jetbrains.mps.baseLanguage.tuplesExt-generator.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types/languages/jetbrains.mps.baseLanguage.tuplesExt-generator.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.baseLanguage.tuplesExt#01" />
       <fileset dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.baseLanguage.tuplesExt/generator/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.baseLanguage.tuplesExt-generator.jar1" />
@@ -3203,7 +3347,7 @@
     <copyModels todir="${build.tmp}/customProcessors/copyModels/languages-jetbrains.mps.baseLanguage.tuplesExt-generator-templates1">
       <fileset dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.baseLanguage.tuplesExt/generator/templates" includes="**/*.mps, **/*.mpsr, **/.model" />
     </copyModels>
-    <jar destfile="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types/jetbrains.mps.baseLanguage.tuplesExt-src.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types/languages/jetbrains.mps.baseLanguage.tuplesExt-src.jar" duplicate="preserve">
       <fileset dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.baseLanguage.tuplesExt/generator/source_gen">
         <exclude name="**/trace.info" />
         <exclude name="**/exports" />
@@ -3286,7 +3430,7 @@
         <sources jar="jetbrains.mps.baseLanguage.sequence-src.jar" descriptor="jetbrains.mps.baseLanguage.sequence.mpl" />
       </module>
     </echoxml>
-    <jar destfile="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types/jetbrains.mps.baseLanguage.sequence.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types/languages/jetbrains.mps.baseLanguage.sequence.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.baseLanguage.sequence" />
       <fileset dir="${basedir}/languages/jetbrains.mps.baseLanguage.sequence" includes="icons/**, resources/**" />
       <fileset dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.baseLanguage.sequence/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
@@ -3331,7 +3475,7 @@
         <sources jar="jetbrains.mps.baseLanguage.sequence-src.jar" descriptor="jetbrains.mps.baseLanguage.sequence.mpl" />
       </module>
     </echoxml>
-    <jar destfile="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types/jetbrains.mps.baseLanguage.sequence-generator.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types/languages/jetbrains.mps.baseLanguage.sequence-generator.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.baseLanguage.sequence#01" />
       <fileset dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.baseLanguage.sequence/generator/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.baseLanguage.sequence-generator.jar1" />
@@ -3342,7 +3486,7 @@
     <copyModels todir="${build.tmp}/customProcessors/copyModels/languages-jetbrains.mps.baseLanguage.sequence-generator-templates1">
       <fileset dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.baseLanguage.sequence/generator/templates" includes="**/*.mps, **/*.mpsr, **/.model" />
     </copyModels>
-    <jar destfile="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types/jetbrains.mps.baseLanguage.sequence-src.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types/languages/jetbrains.mps.baseLanguage.sequence-src.jar" duplicate="preserve">
       <fileset dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.baseLanguage.sequence/generator/source_gen">
         <exclude name="**/trace.info" />
         <exclude name="**/exports" />
@@ -3425,7 +3569,7 @@
         <sources jar="jetbrains.mps.baseLanguage.function-src.jar" descriptor="jetbrains.mps.baseLanguage.function.mpl" />
       </module>
     </echoxml>
-    <jar destfile="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types/jetbrains.mps.baseLanguage.function.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types/languages/jetbrains.mps.baseLanguage.function.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.baseLanguage.function" />
       <fileset dir="${basedir}/languages/jetbrains.mps.baseLanguage.function" includes="icons/**, resources/**" />
       <fileset dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.baseLanguage.function/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
@@ -3470,7 +3614,7 @@
         <sources jar="jetbrains.mps.baseLanguage.function-src.jar" descriptor="jetbrains.mps.baseLanguage.function.mpl" />
       </module>
     </echoxml>
-    <jar destfile="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types/jetbrains.mps.baseLanguage.function-generator.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types/languages/jetbrains.mps.baseLanguage.function-generator.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.baseLanguage.function#01" />
       <fileset dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.baseLanguage.function/generator/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.baseLanguage.function-generator.jar1" />
@@ -3481,7 +3625,7 @@
     <copyModels todir="${build.tmp}/customProcessors/copyModels/languages-jetbrains.mps.baseLanguage.function-generator-templates1">
       <fileset dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.baseLanguage.function/generator/templates" includes="**/*.mps, **/*.mpsr, **/.model" />
     </copyModels>
-    <jar destfile="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types/jetbrains.mps.baseLanguage.function-src.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types/languages/jetbrains.mps.baseLanguage.function-src.jar" duplicate="preserve">
       <fileset dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.baseLanguage.function/generator/source_gen">
         <exclude name="**/trace.info" />
         <exclude name="**/exports" />
@@ -3563,7 +3707,7 @@
         <sources jar="jetbrains.mps.baseLanguage.collectionsExt-src.jar" descriptor="jetbrains.mps.baseLanguage.collectionsExt.mpl" />
       </module>
     </echoxml>
-    <jar destfile="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types/jetbrains.mps.baseLanguage.collectionsExt.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types/languages/jetbrains.mps.baseLanguage.collectionsExt.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.baseLanguage.collectionsExt" />
       <fileset dir="${basedir}/languages/jetbrains.mps.baseLanguage.collectionsExt" includes="icons/**, resources/**" />
       <fileset dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.baseLanguage.collectionsExt/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
@@ -3608,7 +3752,7 @@
         <sources jar="jetbrains.mps.baseLanguage.collectionsExt-src.jar" descriptor="jetbrains.mps.baseLanguage.collectionsExt.mpl" />
       </module>
     </echoxml>
-    <jar destfile="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types/jetbrains.mps.baseLanguage.collectionsExt-generator.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types/languages/jetbrains.mps.baseLanguage.collectionsExt-generator.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.baseLanguage.collectionsExt#01" />
       <fileset dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.baseLanguage.collectionsExt/generator/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.baseLanguage.collectionsExt-generator.jar1" />
@@ -3619,7 +3763,7 @@
     <copyModels todir="${build.tmp}/customProcessors/copyModels/languages-jetbrains.mps.baseLanguage.collectionsExt-generator-templates1">
       <fileset dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.baseLanguage.collectionsExt/generator/templates" includes="**/*.mps, **/*.mpsr, **/.model" />
     </copyModels>
-    <jar destfile="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types/jetbrains.mps.baseLanguage.collectionsExt-src.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types/languages/jetbrains.mps.baseLanguage.collectionsExt-src.jar" duplicate="preserve">
       <fileset dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.baseLanguage.collectionsExt/generator/source_gen">
         <exclude name="**/trace.info" />
         <exclude name="**/exports" />
@@ -3704,7 +3848,7 @@
         <sources jar="jetbrains.mps.baseLanguage.closuresExt-src.jar" descriptor="jetbrains.mps.baseLanguage.closuresExt.mpl" />
       </module>
     </echoxml>
-    <jar destfile="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types/jetbrains.mps.baseLanguage.closuresExt.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types/languages/jetbrains.mps.baseLanguage.closuresExt.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.baseLanguage.closuresExt" />
       <fileset dir="${basedir}/languages/jetbrains.mps.baseLanguage.closuresExt" includes="icons/**, resources/**" />
       <fileset dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.baseLanguage.closuresExt/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
@@ -3749,7 +3893,7 @@
         <sources jar="jetbrains.mps.baseLanguage.closuresExt-src.jar" descriptor="jetbrains.mps.baseLanguage.closuresExt.mpl" />
       </module>
     </echoxml>
-    <jar destfile="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types/jetbrains.mps.baseLanguage.closuresExt-generator.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types/languages/jetbrains.mps.baseLanguage.closuresExt-generator.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.baseLanguage.closuresExt#1312156863939371938" />
       <fileset dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.baseLanguage.closuresExt/generator/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.baseLanguage.closuresExt-generator.jar1" />
@@ -3760,7 +3904,7 @@
     <copyModels todir="${build.tmp}/customProcessors/copyModels/languages-jetbrains.mps.baseLanguage.closuresExt-generator-templates1">
       <fileset dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.baseLanguage.closuresExt/generator/templates" includes="**/*.mps, **/*.mpsr, **/.model" />
     </copyModels>
-    <jar destfile="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types/jetbrains.mps.baseLanguage.closuresExt-src.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types/languages/jetbrains.mps.baseLanguage.closuresExt-src.jar" duplicate="preserve">
       <fileset dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.baseLanguage.closuresExt/generator/source_gen">
         <exclude name="**/trace.info" />
         <exclude name="**/exports" />
@@ -3855,7 +3999,7 @@
         <sources jar="jetbrains.mps.lang.smodelExt-src.jar" descriptor="jetbrains.mps.lang.smodelExt.mpl" />
       </module>
     </echoxml>
-    <jar destfile="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types/jetbrains.mps.lang.smodelExt.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types/languages/jetbrains.mps.lang.smodelExt.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.smodelExt" />
       <fileset dir="${basedir}/languages/jetbrains.mps.lang.smodelExt" includes="icons/**, resources/**" />
       <fileset dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.lang.smodelExt/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
@@ -3900,7 +4044,7 @@
         <sources jar="jetbrains.mps.lang.smodelExt-src.jar" descriptor="jetbrains.mps.lang.smodelExt.mpl" />
       </module>
     </echoxml>
-    <jar destfile="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types/jetbrains.mps.lang.smodelExt-generator.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types/languages/jetbrains.mps.lang.smodelExt-generator.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.smodelExt#01" />
       <fileset dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.lang.smodelExt/generator/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.lang.smodelExt-generator.jar1" />
@@ -3911,7 +4055,7 @@
     <copyModels todir="${build.tmp}/customProcessors/copyModels/languages-jetbrains.mps.lang.smodelExt-generator-templates1">
       <fileset dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.lang.smodelExt/generator/templates" includes="**/*.mps, **/*.mpsr, **/.model" />
     </copyModels>
-    <jar destfile="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types/jetbrains.mps.lang.smodelExt-src.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types/languages/jetbrains.mps.lang.smodelExt-src.jar" duplicate="preserve">
       <fileset dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.lang.smodelExt/generator/source_gen">
         <exclude name="**/trace.info" />
         <exclude name="**/exports" />
@@ -3999,7 +4143,7 @@
         <sources jar="jetbrains.mps.lang.typesystemExt-src.jar" descriptor="jetbrains.mps.lang.typesystemExt.mpl" />
       </module>
     </echoxml>
-    <jar destfile="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types/jetbrains.mps.lang.typesystemExt.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types/languages/jetbrains.mps.lang.typesystemExt.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.typesystemExt" />
       <fileset dir="${basedir}/languages/jetbrains.mps.lang.typesystemExt" includes="icons/**, resources/**" />
       <fileset dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.lang.typesystemExt/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
@@ -4044,7 +4188,7 @@
         <sources jar="jetbrains.mps.lang.typesystemExt-src.jar" descriptor="jetbrains.mps.lang.typesystemExt.mpl" />
       </module>
     </echoxml>
-    <jar destfile="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types/jetbrains.mps.lang.typesystemExt-generator.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types/languages/jetbrains.mps.lang.typesystemExt-generator.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.typesystemExt#01" />
       <fileset dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.lang.typesystemExt/generator/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.lang.typesystemExt-generator.jar1" />
@@ -4055,7 +4199,7 @@
     <copyModels todir="${build.tmp}/customProcessors/copyModels/languages-jetbrains.mps.lang.typesystemExt-generator-templates1">
       <fileset dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.lang.typesystemExt/generator/templates" includes="**/*.mps, **/*.mpsr, **/.model" />
     </copyModels>
-    <jar destfile="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types/jetbrains.mps.lang.typesystemExt-src.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types/languages/jetbrains.mps.lang.typesystemExt-src.jar" duplicate="preserve">
       <fileset dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.lang.typesystemExt/generator/source_gen">
         <exclude name="**/trace.info" />
         <exclude name="**/exports" />
@@ -4144,7 +4288,7 @@
         <sources jar="jetbrains.mps.lang.quotationExt-src.jar" descriptor="jetbrains.mps.lang.quotationExt.mpl" />
       </module>
     </echoxml>
-    <jar destfile="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types/jetbrains.mps.lang.quotationExt.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types/languages/jetbrains.mps.lang.quotationExt.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.quotationExt" />
       <fileset dir="${basedir}/languages/jetbrains.mps.lang.quotationExt" includes="icons/**, resources/**" />
       <fileset dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.lang.quotationExt/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
@@ -4189,7 +4333,7 @@
         <sources jar="jetbrains.mps.lang.quotationExt-src.jar" descriptor="jetbrains.mps.lang.quotationExt.mpl" />
       </module>
     </echoxml>
-    <jar destfile="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types/jetbrains.mps.lang.quotationExt-generator.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types/languages/jetbrains.mps.lang.quotationExt-generator.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.quotationExt#01" />
       <fileset dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.lang.quotationExt/generator/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.lang.quotationExt-generator.jar1" />
@@ -4200,7 +4344,7 @@
     <copyModels todir="${build.tmp}/customProcessors/copyModels/languages-jetbrains.mps.lang.quotationExt-generator-templates1">
       <fileset dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.lang.quotationExt/generator/templates" includes="**/*.mps, **/*.mpsr, **/.model" />
     </copyModels>
-    <jar destfile="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types/jetbrains.mps.lang.quotationExt-src.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types/languages/jetbrains.mps.lang.quotationExt-src.jar" duplicate="preserve">
       <fileset dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.lang.quotationExt/generator/source_gen">
         <exclude name="**/trace.info" />
         <exclude name="**/exports" />
@@ -4285,7 +4429,7 @@
         <sources jar="jetbrains.mps.lang.constraintsExt-src.jar" descriptor="jetbrains.mps.lang.constraintsExt.mpl" />
       </module>
     </echoxml>
-    <jar destfile="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types/jetbrains.mps.lang.constraintsExt.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types/languages/jetbrains.mps.lang.constraintsExt.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.constraintsExt" />
       <fileset dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.lang.constraintsExt/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.lang.constraintsExt.jar1" />
@@ -4329,7 +4473,7 @@
         <sources jar="jetbrains.mps.lang.constraintsExt-src.jar" descriptor="jetbrains.mps.lang.constraintsExt.mpl" />
       </module>
     </echoxml>
-    <jar destfile="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types/jetbrains.mps.lang.constraintsExt-generator.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types/languages/jetbrains.mps.lang.constraintsExt-generator.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.constraintsExt#01" />
       <fileset dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.lang.constraintsExt/generator/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.lang.constraintsExt-generator.jar1" />
@@ -4340,7 +4484,7 @@
     <copyModels todir="${build.tmp}/customProcessors/copyModels/languages-jetbrains.mps.lang.constraintsExt-generator-templates1">
       <fileset dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.lang.constraintsExt/generator/templates" includes="**/*.mps, **/*.mpsr, **/.model" />
     </copyModels>
-    <jar destfile="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types/jetbrains.mps.lang.constraintsExt-src.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types/languages/jetbrains.mps.lang.constraintsExt-src.jar" duplicate="preserve">
       <fileset dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.lang.constraintsExt/generator/source_gen">
         <exclude name="**/trace.info" />
         <exclude name="**/exports" />
@@ -4427,7 +4571,7 @@
         <sources jar="jetbrains.mps.lang.generatorExt-src.jar" descriptor="jetbrains.mps.lang.generatorExt.mpl" />
       </module>
     </echoxml>
-    <jar destfile="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types/jetbrains.mps.lang.generatorExt.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types/languages/jetbrains.mps.lang.generatorExt.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.generatorExt" />
       <fileset dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.lang.generatorExt/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.lang.generatorExt.jar1" />
@@ -4471,7 +4615,7 @@
         <sources jar="jetbrains.mps.lang.generatorExt-src.jar" descriptor="jetbrains.mps.lang.generatorExt.mpl" />
       </module>
     </echoxml>
-    <jar destfile="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types/jetbrains.mps.lang.generatorExt-generator.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types/languages/jetbrains.mps.lang.generatorExt-generator.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.generatorExt#01" />
       <fileset dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.lang.generatorExt/generator/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.lang.generatorExt-generator.jar1" />
@@ -4482,7 +4626,7 @@
     <copyModels todir="${build.tmp}/customProcessors/copyModels/languages-jetbrains.mps.lang.generatorExt-generator-templates1">
       <fileset dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.lang.generatorExt/generator/templates" includes="**/*.mps, **/*.mpsr, **/.model" />
     </copyModels>
-    <jar destfile="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types/jetbrains.mps.lang.generatorExt-src.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types/languages/jetbrains.mps.lang.generatorExt-src.jar" duplicate="preserve">
       <fileset dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.lang.generatorExt/generator/source_gen">
         <exclude name="**/trace.info" />
         <exclude name="**/exports" />
@@ -4567,7 +4711,7 @@
         <sources jar="jetbrains.mps.lang.generator.generationContextExt-src.jar" descriptor="jetbrains.mps.lang.generator.generationContextExt.mpl" />
       </module>
     </echoxml>
-    <jar destfile="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types/jetbrains.mps.lang.generator.generationContextExt.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types/languages/jetbrains.mps.lang.generator.generationContextExt.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.generator.generationContextExt" />
       <fileset dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.lang.generator.generationContextExt/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.lang.generator.generationContextExt.jar1" />
@@ -4611,7 +4755,7 @@
         <sources jar="jetbrains.mps.lang.generator.generationContextExt-src.jar" descriptor="jetbrains.mps.lang.generator.generationContextExt.mpl" />
       </module>
     </echoxml>
-    <jar destfile="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types/jetbrains.mps.lang.generator.generationContextExt-generator.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types/languages/jetbrains.mps.lang.generator.generationContextExt-generator.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.generator.generationContextExt#01" />
       <fileset dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.lang.generator.generationContextExt/generator/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.lang.generator.generationContextExt-generator.jar1" />
@@ -4622,7 +4766,7 @@
     <copyModels todir="${build.tmp}/customProcessors/copyModels/languages-jetbrains.mps.lang.generator.generationContextExt-generator-templates1">
       <fileset dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.lang.generator.generationContextExt/generator/templates" includes="**/*.mps, **/*.mpsr, **/.model" />
     </copyModels>
-    <jar destfile="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types/jetbrains.mps.lang.generator.generationContextExt-src.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types/languages/jetbrains.mps.lang.generator.generationContextExt-src.jar" duplicate="preserve">
       <fileset dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.lang.generator.generationContextExt/generator/source_gen">
         <exclude name="**/trace.info" />
         <exclude name="**/exports" />
@@ -4709,7 +4853,7 @@
         <sources jar="jetbrains.mps.logicExt-src.jar" descriptor="jetbrains.mps.logicExt.mpl" />
       </module>
     </echoxml>
-    <jar destfile="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types/jetbrains.mps.logicExt.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types/languages/jetbrains.mps.logicExt.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.logicExt" />
       <fileset dir="${basedir}/languages/jetbrains.mps.logicExt" includes="icons/**, resources/**" />
       <fileset dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.logicExt/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
@@ -4754,7 +4898,7 @@
         <sources jar="jetbrains.mps.logicExt-src.jar" descriptor="jetbrains.mps.logicExt.mpl" />
       </module>
     </echoxml>
-    <jar destfile="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types/jetbrains.mps.logicExt-generator.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types/languages/jetbrains.mps.logicExt-generator.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.logicExt#01" />
       <fileset dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.logicExt/generator/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.logicExt-generator.jar1" />
@@ -4765,7 +4909,7 @@
     <copyModels todir="${build.tmp}/customProcessors/copyModels/languages-jetbrains.mps.logicExt-generator-templates1">
       <fileset dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.logicExt/generator/templates" includes="**/*.mps, **/*.mpsr, **/.model" />
     </copyModels>
-    <jar destfile="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types/jetbrains.mps.logicExt-src.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types/languages/jetbrains.mps.logicExt-src.jar" duplicate="preserve">
       <fileset dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.logicExt/generator/source_gen">
         <exclude name="**/trace.info" />
         <exclude name="**/exports" />
@@ -4782,6 +4926,149 @@
       <zipfileset dir="${build.tmp}/customProcessors/copyModels/languages-jetbrains.mps.logicExt-models1" prefix="module/models" />
       <zipfileset dir="${build.tmp}/customProcessors/copyModels/languages-jetbrains.mps.logicExt-generator-templates1" prefix="module/generator/templates" />
     </jar>
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.lang.coderulesExt.jar1" />
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.lang.coderulesExt.jar1/META-INF" />
+    <echoxml file="${build.tmp}/default/jetbrains.mps.lang.coderulesExt.jar1/META-INF/module.xml">
+      <module namespace="jetbrains.mps.lang.coderulesExt" type="language" uuid="6a5b4bb9-0a56-4618-aa9a-7068c528ce90">
+        <dependencies>
+          <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" kind="rt" />
+          <module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" kind="rt" />
+          <module ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)" kind="rt" />
+          <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" kind="rt" />
+          <module ref="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" kind="rt" />
+          <module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" kind="rt" />
+          <module ref="a3e4657f-a76c-45bb-bbda-c764596ecc65(jetbrains.mps.baseLanguage.logging.runtime)" kind="rt" />
+          <module ref="52b81ac7-93fd-4e9e-b972-4995882da6d4(jetbrains.mps.baseLanguage.references.runtime)" kind="rt" />
+          <module ref="d44dab97-aaac-44cb-9745-8a14db674c03(jetbrains.mps.baseLanguage.tuples.runtime)" kind="rt" />
+          <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" kind="rt" />
+          <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" kind="rt" />
+          <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="rt" />
+          <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" kind="rt" />
+          <module ref="8e98f4e2-decf-4e97-bf80-9109e8b759ee(jetbrains.mps.lang.constraints.rules.runtime)" kind="rt" />
+          <module ref="0a98f3e2-decf-4e97-bf80-9109eccc59bb(jetbrains.mps.lang.feedback.problem.rules)" kind="rt" />
+          <module ref="9abaaae2-decf-4e97-bf80-9109e8b759cc(jetbrains.mps.lang.messages.api)" kind="rt" />
+          <module ref="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" kind="rt" />
+          <module ref="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" kind="rt" />
+          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="rt" />
+          <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
+          <module ref="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" kind="cl" />
+          <module ref="88dcbb14-19c3-4776-8f81-33611ca4d87c(jetbrains.mps.baseLanguage.sequence)" kind="cl" />
+          <module ref="0fda14cc-a416-4c81-869a-2175d8b3325d(jetbrains.mps.baseLanguageExt)" kind="cl" />
+          <module ref="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" kind="cl" />
+          <module ref="65e59b42-e7f3-45ec-8692-6c7829780afe(jetbrains.mps.lang.smodelExt)" kind="cl" />
+          <module ref="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" kind="cl" />
+          <module ref="ad4d7d30-3da5-4d56-8273-c9d815b12234(jetbrains.mps.logicExt)" kind="cl" />
+        </dependencies>
+        <uses>
+          <language id="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" />
+          <language id="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" />
+          <language id="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" />
+          <language id="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" />
+          <language id="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" />
+          <language id="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" />
+          <language id="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" />
+          <language id="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" />
+          <language id="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" />
+          <language id="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" />
+          <language id="l:e51810c5-7308-4642-bcb6-469e61b5dd18:jetbrains.mps.lang.constraints.msg.specification" />
+          <language id="l:47257bf3-78d3-470b-89d9-8c3261a61d15:jetbrains.mps.lang.constraints.rules" />
+          <language id="l:5dae8159-ab99-46bb-a40d-0cee30ee7018:jetbrains.mps.lang.constraints.rules.kinds" />
+          <language id="l:134c38d4-e3af-4d9e-b069-1c7df0a4005d:jetbrains.mps.lang.constraints.rules.skeleton" />
+          <language id="l:3ad5badc-1d9c-461c-b7b1-fa2fcd0a0ae7:jetbrains.mps.lang.context" />
+          <language id="l:ea3159bf-f48e-4720-bde2-86dba75f0d34:jetbrains.mps.lang.context.defs" />
+          <language id="l:f4ad079d-bc71-4ffb-9600-9328705cf998:jetbrains.mps.lang.descriptor" />
+          <language id="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" />
+          <language id="l:ad93155d-79b2-4759-b10c-55123e763903:jetbrains.mps.lang.messages" />
+          <language id="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" />
+          <language id="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" />
+          <language id="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" />
+          <language id="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" />
+          <language id="l:d8f591ec-4d86-4af2-9f92-a9e93c803ffa:jetbrains.mps.lang.scopes" />
+          <language id="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" />
+          <language id="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" />
+          <language id="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" />
+          <language id="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" />
+          <language id="l:4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462:jetbrains.mps.lang.typechecking" />
+          <language id="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" />
+        </uses>
+        <classpath>
+          <entry path="." />
+        </classpath>
+        <sources jar="jetbrains.mps.lang.coderulesExt-src.jar" descriptor="jetbrains.mps.lang.coderulesExt.mpl" />
+      </module>
+    </echoxml>
+    <jar destfile="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types/languages/jetbrains.mps.lang.coderulesExt.jar" duplicate="preserve">
+      <fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.coderulesExt" />
+      <fileset dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.lang.coderulesExt/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
+      <fileset dir="${build.tmp}/default/jetbrains.mps.lang.coderulesExt.jar1" />
+    </jar>
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.lang.coderulesExt-generator.jar1" />
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.lang.coderulesExt-generator.jar1/META-INF" />
+    <echoxml file="${build.tmp}/default/jetbrains.mps.lang.coderulesExt-generator.jar1/META-INF/module.xml">
+      <module namespace="jetbrains.mps.lang.coderulesExt#01" type="generator" uuid="3d598314-84de-4985-8c2f-ce6664af759f">
+        <dependencies>
+          <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" kind="rt" />
+          <module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" kind="rt" />
+          <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" kind="rt" />
+          <module ref="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" kind="rt" />
+          <module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" kind="rt" />
+          <module ref="a3e4657f-a76c-45bb-bbda-c764596ecc65(jetbrains.mps.baseLanguage.logging.runtime)" kind="rt" />
+          <module ref="52b81ac7-93fd-4e9e-b972-4995882da6d4(jetbrains.mps.baseLanguage.references.runtime)" kind="rt" />
+          <module ref="d44dab97-aaac-44cb-9745-8a14db674c03(jetbrains.mps.baseLanguage.tuples.runtime)" kind="rt" />
+          <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" kind="rt" />
+          <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" kind="rt" />
+          <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
+          <module ref="6a5b4bb9-0a56-4618-aa9a-7068c528ce90(jetbrains.mps.lang.coderulesExt)" kind="cl" />
+        </dependencies>
+        <uses>
+          <language id="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" />
+          <language id="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" />
+          <language id="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" />
+          <language id="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" />
+          <language id="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" />
+          <language id="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" />
+          <language id="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" />
+          <language id="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" />
+          <language id="l:289fcc83-6543-41e8-a5ca-768235715ce4:jetbrains.mps.lang.generator.generationParameters" />
+          <language id="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" />
+          <language id="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" />
+          <language id="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" />
+          <language id="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" />
+        </uses>
+        <classpath>
+          <entry path="." />
+        </classpath>
+        <sources jar="jetbrains.mps.lang.coderulesExt-src.jar" descriptor="jetbrains.mps.lang.coderulesExt.mpl" />
+      </module>
+    </echoxml>
+    <jar destfile="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types/languages/jetbrains.mps.lang.coderulesExt-generator.jar" duplicate="preserve">
+      <fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.coderulesExt#01" />
+      <fileset dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.lang.coderulesExt/generator/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
+      <fileset dir="${build.tmp}/default/jetbrains.mps.lang.coderulesExt-generator.jar1" />
+    </jar>
+    <copyModels todir="${build.tmp}/customProcessors/copyModels/languages-jetbrains.mps.lang.coderulesExt-models1">
+      <fileset dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.lang.coderulesExt/models" includes="**/*.mps, **/*.mpsr, **/.model" />
+    </copyModels>
+    <copyModels todir="${build.tmp}/customProcessors/copyModels/languages-jetbrains.mps.lang.coderulesExt-generator-templates1">
+      <fileset dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.lang.coderulesExt/generator/templates" includes="**/*.mps, **/*.mpsr, **/.model" />
+    </copyModels>
+    <jar destfile="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip/jetbrains.mps.core.types/languages/jetbrains.mps.lang.coderulesExt-src.jar" duplicate="preserve">
+      <fileset dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.lang.coderulesExt/generator/source_gen">
+        <exclude name="**/trace.info" />
+        <exclude name="**/exports" />
+        <exclude name="**/checkpoints" />
+        <exclude name="**/*.mps" />
+      </fileset>
+      <fileset dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.lang.coderulesExt/source_gen">
+        <exclude name="**/trace.info" />
+        <exclude name="**/exports" />
+        <exclude name="**/checkpoints" />
+        <exclude name="**/*.mps" />
+      </fileset>
+      <zipfileset file="${basedir}/languages/jetbrains.mps.lang.coderulesExt/jetbrains.mps.lang.coderulesExt.mpl" prefix="module" />
+      <zipfileset dir="${build.tmp}/customProcessors/copyModels/languages-jetbrains.mps.lang.coderulesExt-models1" prefix="module/models" />
+      <zipfileset dir="${build.tmp}/customProcessors/copyModels/languages-jetbrains.mps.lang.coderulesExt-generator-templates1" prefix="module/generator/templates" />
+    </jar>
     <zip destfile="${build.layout}/jetbrains.mps.core.types-0.9-SNAPSHOT.zip">
       <fileset dir="${build.tmp}/default/jetbrains.mps.core.types-0.9-SNAPSHOT.zip" />
     </zip>
@@ -4801,7 +5088,7 @@
     <delete dir="${build.layout}" />
   </target>
   
-  <target name="compileJava" depends="java.compile.jetbrains.mps.lang.smodelExt, java.compile.jetbrains.mps.lang.smodelExt#01, java.compile.jetbrains.mps.lang.smodel.queryExt, java.compile.jetbrains.mps.lang.smodel.queryExt.generator, java.compile.jetbrains.mps.lang.smodelExt.test, java.compile.jetbrains.mps.lang.behaviorExt, java.compile.jetbrains.mps.lang.behaviorExt.generator, java.compile.jetbrains.mps.lang.typesystemExt, java.compile.jetbrains.mps.lang.typesystemExt#01, java.compile.jetbrains.mps.lang.quotationExt, java.compile.jetbrains.mps.lang.quotationExt#01, java.compile.jetbrains.mps.lang.constraintsExt, java.compile.jetbrains.mps.lang.constraintsExt#01, java.compile.jetbrains.mps.lang.generatorExt, java.compile.jetbrains.mps.lang.generatorExt#01, java.compile.jetbrains.mps.lang.generator.generationContextExt, java.compile.jetbrains.mps.lang.generator.generationContextExt#01, java.compile.jetbrains.mps.lang.testExt, java.compile.jetbrains.mps.lang.testExt.generator, java.compile.jetbrains.mps.lang.scriptExt, java.compile.jetbrains.mps.lang.scriptExt.generator, java.compile.jetbrains.mps.lang.scopesExt, java.compile.jetbrains.mps.lang.scopesExt.generator, java.compile.jetbrains.mps.baseLanguageExt, java.compile.jetbrains.mps.baseLanguageInternalExt, java.compile.jetbrains.mps.baseLanguageInternalExt#01, java.compile.jetbrains.mps.baseLanguage.blTypesExt, java.compile.jetbrains.mps.baseLanguage.blTypesExt#01, java.compile.jetbrains.mps.baseLanguage.javadocExt, java.compile.java.modules.cycle.1, java.compile.jetbrains.mps.baseLanguageExt.test, java.compile.typechecking.samples.baseLanguage, java.compile.jetbrains.mps.baseLanguage.tuplesExt, java.compile.jetbrains.mps.baseLanguage.tuplesExt#01, java.compile.jetbrains.mps.baseLanguage.tuplesExt.test, java.compile.jetbrains.mps.baseLanguage.sequence, java.compile.jetbrains.mps.baseLanguage.sequence#01, java.compile.jetbrains.mps.baseLanguage.function, java.compile.jetbrains.mps.baseLanguage.function#01, java.compile.jetbrains.mps.baseLanguage.collectionsExt, java.compile.jetbrains.mps.baseLanguage.collectionsExt#01, java.compile.jetbrains.mps.baseLanguage.collectionsExt.test, java.compile.jetbrains.mps.baseLanguage.closuresExt, java.compile.jetbrains.mps.baseLanguage.closuresExt#1312156863939371938, java.compile.jetbrains.mps.baseLanguage.closuresExt.test, java.compile.jetbrains.mps.logicExt, java.compile.jetbrains.mps.logicExt#01" />
+  <target name="compileJava" depends="java.compile.jetbrains.mps.lang.smodelExt, java.compile.jetbrains.mps.lang.smodelExt#01, java.compile.jetbrains.mps.lang.smodel.queryExt, java.compile.jetbrains.mps.lang.smodel.queryExt.generator, java.compile.jetbrains.mps.lang.smodelExt.test, java.compile.jetbrains.mps.lang.behaviorExt, java.compile.jetbrains.mps.lang.behaviorExt.generator, java.compile.jetbrains.mps.lang.typesystemExt, java.compile.jetbrains.mps.lang.typesystemExt#01, java.compile.jetbrains.mps.lang.quotationExt, java.compile.jetbrains.mps.lang.quotationExt#01, java.compile.jetbrains.mps.lang.constraintsExt, java.compile.jetbrains.mps.lang.constraintsExt#01, java.compile.jetbrains.mps.lang.generatorExt, java.compile.jetbrains.mps.lang.generatorExt#01, java.compile.jetbrains.mps.lang.generator.generationContextExt, java.compile.jetbrains.mps.lang.generator.generationContextExt#01, java.compile.jetbrains.mps.lang.testExt, java.compile.jetbrains.mps.lang.testExt.generator, java.compile.jetbrains.mps.lang.scriptExt, java.compile.jetbrains.mps.lang.scriptExt.generator, java.compile.jetbrains.mps.lang.scopesExt, java.compile.jetbrains.mps.lang.scopesExt.generator, java.compile.jetbrains.mps.baseLanguageExt, java.compile.jetbrains.mps.baseLanguageInternalExt, java.compile.jetbrains.mps.baseLanguageInternalExt#01, java.compile.jetbrains.mps.baseLanguage.blTypesExt, java.compile.jetbrains.mps.baseLanguage.blTypesExt#01, java.compile.jetbrains.mps.baseLanguage.javadocExt, java.compile.java.modules.cycle.1, java.compile.jetbrains.mps.baseLanguageExt.test, java.compile.typechecking.samples.baseLanguage, java.compile.jetbrains.mps.baseLanguage.tuplesExt, java.compile.jetbrains.mps.baseLanguage.tuplesExt#01, java.compile.jetbrains.mps.baseLanguage.tuplesExt.test, java.compile.jetbrains.mps.baseLanguage.sequence, java.compile.jetbrains.mps.baseLanguage.sequence#01, java.compile.jetbrains.mps.baseLanguage.function, java.compile.jetbrains.mps.baseLanguage.function#01, java.compile.jetbrains.mps.baseLanguage.collectionsExt, java.compile.jetbrains.mps.baseLanguage.collectionsExt#01, java.compile.jetbrains.mps.baseLanguage.collectionsExt.test, java.compile.jetbrains.mps.baseLanguage.closuresExt, java.compile.jetbrains.mps.baseLanguage.closuresExt#1312156863939371938, java.compile.jetbrains.mps.baseLanguage.closuresExt.test, java.compile.jetbrains.mps.logicExt, java.compile.jetbrains.mps.logicExt#01, java.compile.jetbrains.mps.lang.coderulesExt, java.compile.jetbrains.mps.lang.coderulesExt#01" />
   
   <target name="processResources" />
   
@@ -4820,8 +5107,6 @@
       <library file="${artifacts.coderules}/deploy/jetbrains.mps.coderules.runtime.jar" />
       <library file="${artifacts.coderules}/deploy/jetbrains.mps.coderules.testhelper.jar" />
       <library file="${artifacts.coderules}/deploy/jetbrains.mps.coderules.typechecking.jar" />
-      <library file="${artifacts.coderules}/deploy/jetbrains.mps.coderules.typechecking.test.jar" />
-      <library file="${artifacts.coderules}/deploy/jetbrains.mps.coderules.typechecking.testlang.sandbox.jar" />
       <library file="${artifacts.coderules}/deploy/jetbrains.mps.lang.coderules.jar" />
       <library file="${artifacts.coderules}/deploy/jetbrains.mps.lang.coderules.runtime.jar" />
       <library file="${artifacts.coderules}/deploy/jetbrains.mps.lang.coderules.template.jar" />
@@ -4830,9 +5115,7 @@
       <library file="${artifacts.coderules}/deploy/jetbrains.mps.logic.jar" />
       <library file="${artifacts.coderules}/deploy/jetbrains.mps.logic.reactor.jar" />
       <library file="${artifacts.coderules}/deploy/jetbrains.mps.logic.runtime.jar" />
-      <library file="${artifacts.coderules}/deploy/jetbrains.mps.logic.test.jar" />
       <library file="${artifacts.coderules}/deploy/jetbrains.mps.typechecking.annotation.jar" />
-      <library file="${artifacts.coderules}/deploy/jetbrains.mps.typechecking.testlang.jar" />
       <library file="${artifacts.mps}/languages/baseLanguage/closures.runtime.jar" />
       <library file="${artifacts.mps}/languages/baseLanguage/collections.runtime.jar" />
       <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.jar" />
@@ -4961,6 +5244,7 @@
         <module file="${basedir}/languages/jetbrains.mps.baseLanguageExt/jetbrains.mps.baseLanguageExt.mpl" />
         <module file="${basedir}/languages/jetbrains.mps.baseLanguageInternalExt/jetbrains.mps.baseLanguageInternalExt.mpl" />
         <module file="${basedir}/languages/jetbrains.mps.lang.behaviorExt/jetbrains.mps.lang.behaviorExt.mpl" />
+        <module file="${basedir}/languages/jetbrains.mps.lang.coderulesExt/jetbrains.mps.lang.coderulesExt.mpl" />
         <module file="${basedir}/languages/jetbrains.mps.lang.constraintsExt/jetbrains.mps.lang.constraintsExt.mpl" />
         <module file="${basedir}/languages/jetbrains.mps.lang.generator.generationContextExt/jetbrains.mps.lang.generator.generationContextExt.mpl" />
         <module file="${basedir}/languages/jetbrains.mps.lang.generatorExt/jetbrains.mps.lang.generatorExt.mpl" />
@@ -8068,14 +8352,145 @@
     </javac>
   </target>
   
+  <target name="java.compile.jetbrains.mps.lang.coderulesExt" depends="java.compile.jetbrains.mps.baseLanguage.sequence, java.compile.jetbrains.mps.baseLanguageExt, java.compile.jetbrains.mps.lang.smodelExt, java.compile.jetbrains.mps.logicExt, fetchDependencies">
+    <mkdir dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.lang.coderulesExt/source_gen" />
+    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.coderulesExt" />
+    <javac destdir="${build.tmp}/java/out/jetbrains.mps.lang.coderulesExt" fork="true" encoding="utf8" includeantruntime="false" debug="true">
+      <compilerarg value="-Xlint:none" />
+      <src>
+        <path location="${mps.macro.mpscore_home}/languages/jetbrains.mps.lang.coderulesExt/source_gen" />
+      </src>
+      <classpath>
+        <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-context.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-constraints-runtime.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-problem.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-feedback-api.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-messages-api.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-messages-for-rules.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-closures.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-collections.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-logging.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-references.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-generator.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-persistence.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-project-check.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-textgen.jar" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.baseLanguage.sequence" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.baseLanguageExt" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.smodelExt" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logicExt" />
+        <fileset file="${artifacts.mps}/lib/annotations.jar" />
+        <fileset dir="${artifacts.mps}/lib" includes="*.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.16.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.coderules}/deploy/jetbrains.mps.lang.coderules.jar" />
+        <fileset file="${artifacts.coderules}/deploy/jetbrains.mps.lang.coderules.runtime.jar" />
+        <fileset file="${artifacts.coderules}/deploy/jetbrains.mps.lang.coderules.template.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.scopes.runtime.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
+        <fileset file="${artifacts.coderules}/deploy/jetbrains.mps.lang.typechecking.runtime.jar" />
+        <fileset file="${artifacts.coderules}/deploy/jetbrains.mps.logic.jar" />
+        <fileset file="${artifacts.coderules}/deploy/jetbrains.mps.logic.runtime.jar" />
+        <fileset dir="${artifacts.coderules}/deploy/lib" includes="collection-0.7.jar" />
+        <fileset dir="${artifacts.coderules}/deploy/lib" includes="trove4j-3.0.3.jar" />
+        <fileset dir="${artifacts.coderules}/deploy/lib" includes="conreactor-core-0.9.14.jar" />
+      </classpath>
+    </javac>
+  </target>
+  
+  <target name="java.compile.jetbrains.mps.lang.coderulesExt#01" depends="java.compile.jetbrains.mps.lang.coderulesExt, fetchDependencies">
+    <mkdir dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.lang.coderulesExt/generator/source_gen" />
+    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.coderulesExt#01" />
+    <javac destdir="${build.tmp}/java/out/jetbrains.mps.lang.coderulesExt#01" fork="true" encoding="utf8" includeantruntime="false" debug="true">
+      <compilerarg value="-Xlint:none" />
+      <src>
+        <path location="${mps.macro.mpscore_home}/languages/jetbrains.mps.lang.coderulesExt/generator/source_gen" />
+      </src>
+      <classpath>
+        <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-context.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-constraints-runtime.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-problem.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-feedback-api.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-messages-api.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-messages-for-rules.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-closures.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-collections.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-logging.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-references.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-generator.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-persistence.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-project-check.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-textgen.jar" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderulesExt" />
+        <fileset file="${artifacts.mps}/lib/annotations.jar" />
+        <fileset dir="${artifacts.mps}/lib" includes="*.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.16.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.coderules}/deploy/jetbrains.mps.lang.coderules.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.modelapi.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.structure.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
+        <fileset file="${artifacts.coderules}/deploy/jetbrains.mps.logic.jar" />
+      </classpath>
+    </javac>
+  </target>
+  
   <target name="test.testconfig" depends="assemble">
     <path id="mps.libraries.path">
       <pathelement location="${artifacts.coderules}/deploy/jetbrains.mps.coderules.jar" />
       <pathelement location="${artifacts.coderules}/deploy/jetbrains.mps.coderules.runtime.jar" />
       <pathelement location="${artifacts.coderules}/deploy/jetbrains.mps.coderules.testhelper.jar" />
       <pathelement location="${artifacts.coderules}/deploy/jetbrains.mps.coderules.typechecking.jar" />
-      <pathelement location="${artifacts.coderules}/deploy/jetbrains.mps.coderules.typechecking.test.jar" />
-      <pathelement location="${artifacts.coderules}/deploy/jetbrains.mps.coderules.typechecking.testlang.sandbox.jar" />
       <pathelement location="${artifacts.coderules}/deploy/jetbrains.mps.lang.coderules.jar" />
       <pathelement location="${artifacts.coderules}/deploy/jetbrains.mps.lang.coderules.runtime.jar" />
       <pathelement location="${artifacts.coderules}/deploy/jetbrains.mps.lang.coderules.template.jar" />
@@ -8084,9 +8499,7 @@
       <pathelement location="${artifacts.coderules}/deploy/jetbrains.mps.logic.jar" />
       <pathelement location="${artifacts.coderules}/deploy/jetbrains.mps.logic.reactor.jar" />
       <pathelement location="${artifacts.coderules}/deploy/jetbrains.mps.logic.runtime.jar" />
-      <pathelement location="${artifacts.coderules}/deploy/jetbrains.mps.logic.test.jar" />
       <pathelement location="${artifacts.coderules}/deploy/jetbrains.mps.typechecking.annotation.jar" />
-      <pathelement location="${artifacts.coderules}/deploy/jetbrains.mps.typechecking.testlang.jar" />
       <pathelement location="${artifacts.mps}/languages/baseLanguage/closures.runtime.jar" />
       <pathelement location="${artifacts.mps}/languages/baseLanguage/collections.runtime.jar" />
       <pathelement location="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.jar" />
@@ -8306,6 +8719,8 @@
     <delete dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.baseLanguageInternalExt/generator/source_gen" />
     <delete dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.lang.behaviorExt/source_gen" />
     <delete dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.lang.behaviorExt/generator/source_gen" />
+    <delete dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.lang.coderulesExt/source_gen" />
+    <delete dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.lang.coderulesExt/generator/source_gen" />
     <delete dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.lang.constraintsExt/source_gen" />
     <delete dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.lang.constraintsExt/generator/source_gen" />
     <delete dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.lang.generator.generationContextExt/source_gen" />
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.coderulesExt/jetbrains.mps.lang.coderulesExt.mpl b/samples/mpscore/languages/jetbrains.mps.lang.coderulesExt/jetbrains.mps.lang.coderulesExt.mpl
index 6663fa9c..2cb84567 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.coderulesExt/jetbrains.mps.lang.coderulesExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.lang.coderulesExt/jetbrains.mps.lang.coderulesExt.mpl
@@ -120,6 +120,7 @@
     <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="9" />
     <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:4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462:jetbrains.mps.lang.typechecking" version="0" />
     <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="5" />
     <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="13" />
   </languageVersions>
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.coderulesExt/models/jetbrains.mps.lang.coderulesExt.types.mps b/samples/mpscore/languages/jetbrains.mps.lang.coderulesExt/models/jetbrains.mps.lang.coderulesExt.types.mps
index 84ce4c27..0ba4c428 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.coderulesExt/models/jetbrains.mps.lang.coderulesExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.lang.coderulesExt/models/jetbrains.mps.lang.coderulesExt.types.mps
@@ -3,6 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="23" />
+    <use id="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462" name="jetbrains.mps.lang.typechecking" version="0" />
     <engage id="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462" name="jetbrains.mps.lang.typechecking" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
diff --git a/samples/mpscore/solutions/samples.mpscore.build/models/samples.mpscore.build.mps b/samples/mpscore/solutions/samples.mpscore.build/models/samples.mpscore.build.mps
index a63b2157..e88e9be7 100644
--- a/samples/mpscore/solutions/samples.mpscore.build/models/samples.mpscore.build.mps
+++ b/samples/mpscore/solutions/samples.mpscore.build/models/samples.mpscore.build.mps
@@ -224,13 +224,13 @@
       </node>
       <node concept="3_J27D" id="7BVjoXzUx6a" role="m$_w8">
         <node concept="3Mxwey" id="4XsNDZX0EoU" role="3MwsjC">
-          <ref role="3Mxwex" to="zqd8:5Hdh9$IhmQ$" resolve="ci.mps.release" />
+          <ref role="3Mxwex" node="5Hdh9$IhmQ$" resolve="ci.mps.release" />
         </node>
         <node concept="3Mxwew" id="2BiN_P7R7Wi" role="3MwsjC">
           <property role="3MwjfP" value="-0.9-b" />
         </node>
         <node concept="3Mxwey" id="2BiN_P7R81m" role="3MwsjC">
-          <ref role="3Mxwex" to="zqd8:2BiN_P7R7jO" resolve="ci.build.num" />
+          <ref role="3Mxwex" node="2BiN_P7R7jO" resolve="ci.build.num" />
         </node>
       </node>
       <node concept="3_J27D" id="3AC_dXTSEnT" role="3s6cr7">
@@ -370,6 +370,9 @@
         <node concept="L2wRC" id="7LI_gNMBoJc" role="39821P">
           <ref role="L2wRA" node="7LI_gNMBoG$" resolve="jetbrains.mps.logicExt" />
         </node>
+        <node concept="L2wRC" id="C1f6iDm0l$" role="39821P">
+          <ref role="L2wRA" node="C1f6iDkSr$" resolve="jetbrains.mps.lang.coderulesExt" />
+        </node>
       </node>
       <node concept="3981dG" id="53G0zZLgOeZ" role="39821P">
         <node concept="3_J27D" id="53G0zZLgOf1" role="Nbhlr">
@@ -379,53 +382,63 @@
         </node>
         <node concept="m$_wl" id="53G0zZLgOfy" role="39821P">
           <ref role="m_rDy" node="7BVjoXzUx67" resolve="jetbrains.mps.core.types" />
-          <node concept="L2wRC" id="53G0zZLgOfD" role="39821P">
-            <ref role="L2wRA" node="2n$L_Zi7QGo" resolve="jetbrains.mps.baseLanguage.blTypesExt" />
-          </node>
-          <node concept="L2wRC" id="53G0zZLgOfE" role="39821P">
-            <ref role="L2wRA" node="69UmpDmJW26" resolve="jetbrains.mps.baseLanguageExt" />
-          </node>
-          <node concept="L2wRC" id="53G0zZLgOfF" role="39821P">
-            <ref role="L2wRA" node="7gMIJIxVu2L" resolve="jetbrains.mps.baseLanguageInternalExt" />
-          </node>
-          <node concept="L2wRC" id="53G0zZLgOfG" role="39821P">
-            <ref role="L2wRA" node="3DveV8qz3Qm" resolve="jetbrains.mps.baseLanguage.javadocExt" />
-          </node>
-          <node concept="L2wRC" id="53G0zZLgOfH" role="39821P">
-            <ref role="L2wRA" node="3mSr9E04JuF" resolve="jetbrains.mps.baseLanguage.tuplesExt" />
-          </node>
-          <node concept="L2wRC" id="53G0zZLgOfI" role="39821P">
-            <ref role="L2wRA" node="4NtT$ZxGT_H" resolve="jetbrains.mps.baseLanguage.sequence" />
-          </node>
-          <node concept="L2wRC" id="53G0zZLgOfJ" role="39821P">
-            <ref role="L2wRA" node="6BFOg89KVoY" resolve="jetbrains.mps.baseLanguage.function" />
-          </node>
-          <node concept="L2wRC" id="53G0zZLgOfK" role="39821P">
-            <ref role="L2wRA" node="4NtT$ZxGTIW" resolve="jetbrains.mps.baseLanguage.collectionsExt" />
-          </node>
-          <node concept="L2wRC" id="53G0zZLgOfL" role="39821P">
-            <ref role="L2wRA" node="6$MmqWflyOZ" resolve="jetbrains.mps.baseLanguage.closuresExt" />
-          </node>
-          <node concept="L2wRC" id="53G0zZLgOfQ" role="39821P">
-            <ref role="L2wRA" node="6Dg__VJQ3B2" resolve="jetbrains.mps.lang.smodelExt" />
-          </node>
-          <node concept="L2wRC" id="53G0zZLgOfS" role="39821P">
-            <ref role="L2wRA" node="61G6TdEeMYr" resolve="jetbrains.mps.lang.typesystemExt" />
-          </node>
-          <node concept="L2wRC" id="53G0zZLgOfT" role="39821P">
-            <ref role="L2wRA" node="5c7SrrUYK2Y" resolve="jetbrains.mps.lang.quotationExt" />
-          </node>
-          <node concept="L2wRC" id="53G0zZLgOfU" role="39821P">
-            <ref role="L2wRA" node="3ZfjIHtDg2T" resolve="jetbrains.mps.lang.constraintsExt" />
-          </node>
-          <node concept="L2wRC" id="53G0zZLgOfV" role="39821P">
-            <ref role="L2wRA" node="3ZfjIHumNxk" resolve="jetbrains.mps.lang.generatorExt" />
-          </node>
-          <node concept="L2wRC" id="53G0zZLgOfW" role="39821P">
-            <ref role="L2wRA" node="3ZfjIHuwEAU" resolve="jetbrains.mps.lang.generator.generationContextExt" />
-          </node>
-          <node concept="L2wRC" id="53G0zZLgOfY" role="39821P">
-            <ref role="L2wRA" node="7LI_gNMBoG$" resolve="jetbrains.mps.logicExt" />
+          <node concept="398223" id="C1f6iDuYoR" role="39821P">
+            <node concept="3_J27D" id="C1f6iDuYoT" role="Nbhlr">
+              <node concept="3Mxwew" id="C1f6iDuYpe" role="3MwsjC">
+                <property role="3MwjfP" value="languages" />
+              </node>
+            </node>
+            <node concept="L2wRC" id="53G0zZLgOfD" role="39821P">
+              <ref role="L2wRA" node="2n$L_Zi7QGo" resolve="jetbrains.mps.baseLanguage.blTypesExt" />
+            </node>
+            <node concept="L2wRC" id="53G0zZLgOfE" role="39821P">
+              <ref role="L2wRA" node="69UmpDmJW26" resolve="jetbrains.mps.baseLanguageExt" />
+            </node>
+            <node concept="L2wRC" id="53G0zZLgOfF" role="39821P">
+              <ref role="L2wRA" node="7gMIJIxVu2L" resolve="jetbrains.mps.baseLanguageInternalExt" />
+            </node>
+            <node concept="L2wRC" id="53G0zZLgOfG" role="39821P">
+              <ref role="L2wRA" node="3DveV8qz3Qm" resolve="jetbrains.mps.baseLanguage.javadocExt" />
+            </node>
+            <node concept="L2wRC" id="53G0zZLgOfH" role="39821P">
+              <ref role="L2wRA" node="3mSr9E04JuF" resolve="jetbrains.mps.baseLanguage.tuplesExt" />
+            </node>
+            <node concept="L2wRC" id="53G0zZLgOfI" role="39821P">
+              <ref role="L2wRA" node="4NtT$ZxGT_H" resolve="jetbrains.mps.baseLanguage.sequence" />
+            </node>
+            <node concept="L2wRC" id="53G0zZLgOfJ" role="39821P">
+              <ref role="L2wRA" node="6BFOg89KVoY" resolve="jetbrains.mps.baseLanguage.function" />
+            </node>
+            <node concept="L2wRC" id="53G0zZLgOfK" role="39821P">
+              <ref role="L2wRA" node="4NtT$ZxGTIW" resolve="jetbrains.mps.baseLanguage.collectionsExt" />
+            </node>
+            <node concept="L2wRC" id="53G0zZLgOfL" role="39821P">
+              <ref role="L2wRA" node="6$MmqWflyOZ" resolve="jetbrains.mps.baseLanguage.closuresExt" />
+            </node>
+            <node concept="L2wRC" id="53G0zZLgOfQ" role="39821P">
+              <ref role="L2wRA" node="6Dg__VJQ3B2" resolve="jetbrains.mps.lang.smodelExt" />
+            </node>
+            <node concept="L2wRC" id="53G0zZLgOfS" role="39821P">
+              <ref role="L2wRA" node="61G6TdEeMYr" resolve="jetbrains.mps.lang.typesystemExt" />
+            </node>
+            <node concept="L2wRC" id="53G0zZLgOfT" role="39821P">
+              <ref role="L2wRA" node="5c7SrrUYK2Y" resolve="jetbrains.mps.lang.quotationExt" />
+            </node>
+            <node concept="L2wRC" id="53G0zZLgOfU" role="39821P">
+              <ref role="L2wRA" node="3ZfjIHtDg2T" resolve="jetbrains.mps.lang.constraintsExt" />
+            </node>
+            <node concept="L2wRC" id="53G0zZLgOfV" role="39821P">
+              <ref role="L2wRA" node="3ZfjIHumNxk" resolve="jetbrains.mps.lang.generatorExt" />
+            </node>
+            <node concept="L2wRC" id="53G0zZLgOfW" role="39821P">
+              <ref role="L2wRA" node="3ZfjIHuwEAU" resolve="jetbrains.mps.lang.generator.generationContextExt" />
+            </node>
+            <node concept="L2wRC" id="53G0zZLgOfY" role="39821P">
+              <ref role="L2wRA" node="7LI_gNMBoG$" resolve="jetbrains.mps.logicExt" />
+            </node>
+            <node concept="L2wRC" id="C1f6iDm0kT" role="39821P">
+              <ref role="L2wRA" node="C1f6iDkSr$" resolve="jetbrains.mps.lang.coderulesExt" />
+            </node>
           </node>
           <node concept="pUk6x" id="53G0zZLgOfA" role="pUk7w" />
         </node>
@@ -3212,6 +3225,108 @@
           </node>
         </node>
       </node>
+      <node concept="1E1JtD" id="C1f6iDkSr$" role="2G$12L">
+        <property role="BnDLt" value="true" />
+        <property role="TrG5h" value="jetbrains.mps.lang.coderulesExt" />
+        <property role="3LESm3" value="6a5b4bb9-0a56-4618-aa9a-7068c528ce90" />
+        <node concept="55IIr" id="C1f6iDkSrB" role="3LF7KH">
+          <node concept="2Ry0Ak" id="C1f6iDkSsg" role="iGT6I">
+            <property role="2Ry0Am" value="languages" />
+            <node concept="2Ry0Ak" id="C1f6iDkSsl" role="2Ry0An">
+              <property role="2Ry0Am" value="jetbrains.mps.lang.coderulesExt" />
+              <node concept="2Ry0Ak" id="C1f6iDkSEo" role="2Ry0An">
+                <property role="2Ry0Am" value="jetbrains.mps.lang.coderulesExt.mpl" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1SiIV0" id="C1f6iDkSKK" role="3bR37C">
+          <node concept="3bR9La" id="C1f6iDkSKL" role="1SiIV1">
+            <ref role="3bR37D" node="4NtT$ZxGT_H" resolve="jetbrains.mps.baseLanguage.sequence" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="C1f6iDkSKM" role="3bR37C">
+          <node concept="3bR9La" id="C1f6iDkSKN" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:7Kfy9QB6KYb" resolve="jetbrains.mps.baseLanguage" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="C1f6iDkSKO" role="3bR37C">
+          <node concept="3bR9La" id="C1f6iDkSKP" role="1SiIV1">
+            <ref role="3bR37D" node="7LI_gNMBoG$" resolve="jetbrains.mps.logicExt" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="C1f6iDkSKQ" role="3bR37C">
+          <node concept="3bR9La" id="C1f6iDkSKR" role="1SiIV1">
+            <ref role="3bR37D" node="69UmpDmJW26" resolve="jetbrains.mps.baseLanguageExt" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="C1f6iDkSKS" role="3bR37C">
+          <node concept="3bR9La" id="C1f6iDkSKT" role="1SiIV1">
+            <ref role="3bR37D" node="6Dg__VJQ3B2" resolve="jetbrains.mps.lang.smodelExt" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="C1f6iDkSKU" role="3bR37C">
+          <node concept="3bR9La" id="C1f6iDkSKV" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:7Kfy9QB6LaO" resolve="jetbrains.mps.lang.structure" />
+          </node>
+        </node>
+        <node concept="1BupzO" id="C1f6iDkSL4" role="3bR31x">
+          <property role="3ZfqAx" value="models" />
+          <property role="1Hdu6h" value="true" />
+          <property role="1HemKv" value="true" />
+          <node concept="3LXTmp" id="C1f6iDkSL5" role="1HemKq">
+            <node concept="398BVA" id="C1f6iDkSKW" role="3LXTmr">
+              <ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.mpscore_home" />
+              <node concept="2Ry0Ak" id="C1f6iDkSKX" role="iGT6I">
+                <property role="2Ry0Am" value="languages" />
+                <node concept="2Ry0Ak" id="C1f6iDkSKY" role="2Ry0An">
+                  <property role="2Ry0Am" value="jetbrains.mps.lang.coderulesExt" />
+                  <node concept="2Ry0Ak" id="C1f6iDkSKZ" role="2Ry0An">
+                    <property role="2Ry0Am" value="models" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3qWCbU" id="C1f6iDkSL6" role="3LXTna">
+              <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
+            </node>
+          </node>
+        </node>
+        <node concept="1SiIV0" id="C1f6iDkSL7" role="3bR37C">
+          <node concept="1Busua" id="C1f6iDkSL8" role="1SiIV1">
+            <ref role="1Busuk" to="zqd8:7BVjoXzUx6U" resolve="jetbrains.mps.lang.coderules" />
+          </node>
+        </node>
+        <node concept="1yeLz9" id="C1f6iDkSL9" role="1TViLv">
+          <property role="TrG5h" value="jetbrains.mps.lang.coderulesExt#01" />
+          <property role="3LESm3" value="3d598314-84de-4985-8c2f-ce6664af759f" />
+          <node concept="1BupzO" id="C1f6iDkSLk" role="3bR31x">
+            <property role="3ZfqAx" value="generator/templates" />
+            <property role="1Hdu6h" value="true" />
+            <property role="1HemKv" value="true" />
+            <node concept="3LXTmp" id="C1f6iDkSLl" role="1HemKq">
+              <node concept="398BVA" id="C1f6iDkSLa" role="3LXTmr">
+                <ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.mpscore_home" />
+                <node concept="2Ry0Ak" id="C1f6iDkSLb" role="iGT6I">
+                  <property role="2Ry0Am" value="languages" />
+                  <node concept="2Ry0Ak" id="C1f6iDkSLc" role="2Ry0An">
+                    <property role="2Ry0Am" value="jetbrains.mps.lang.coderulesExt" />
+                    <node concept="2Ry0Ak" id="C1f6iDkSLd" role="2Ry0An">
+                      <property role="2Ry0Am" value="generator" />
+                      <node concept="2Ry0Ak" id="C1f6iDkSLe" role="2Ry0An">
+                        <property role="2Ry0Am" value="templates" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3qWCbU" id="C1f6iDkSLm" role="3LXTna">
+                <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
     </node>
   </node>
 </model>