diff --git a/.gitignore b/.gitignore
index d4f4b5ee..dce910ca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,17 +4,14 @@
 **/test_gen.caches/*
 **/classes_gen/*
 **/classes_jchr/*
-.mps/workspace.xml
-.mps/shelf/*
-.idea/workspace.xml
+**/.mps/workspace.xml
+**/.mps/shelf/*
+**/.idea/workspace.xml
+**/lib/*
 .gradle
 out
 build/*
 config/*
 system/*
-coderules/solutions/jetbrains.mps.logic.reactor/lib/*
-coderules/solutions/jetbrains.mps.logic.test/lib/*
-coderules/solutions/jetbrains.mps.typechecking/lib/*
-coderules/solutions/jetbrains.mps.coderules/lib/*
 MPS_HOME
 TEST-*
diff --git a/.mps/modules.xml b/.mps/modules.xml
index 5a8313b7..049919f8 100644
--- a/.mps/modules.xml
+++ b/.mps/modules.xml
@@ -2,35 +2,31 @@
 <project version="4">
   <component name="MPSProject">
     <projectModules>
-      <modulePath path="$PROJECT_DIR$/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/jetbrains.mps.baseLanguageExt.mpl" folder="baseLanguageExt" />
-      <modulePath path="$PROJECT_DIR$/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/jetbrains.mps.baseLanguageExt.test.msd" folder="baseLanguageExt" />
+      <modulePath path="$PROJECT_DIR$/coderules/languages/jetbrains.mps.dataform/jetbrains.mps.dataform.mpl" folder="logic" />
       <modulePath path="$PROJECT_DIR$/coderules/languages/jetbrains.mps.lang.coderules/jetbrains.mps.lang.coderules.mpl" folder="coderules" />
       <modulePath path="$PROJECT_DIR$/coderules/languages/jetbrains.mps.lang.coderules/runtime/jetbrains.mps.lang.coderules.runtime.msd" folder="coderules" />
-      <modulePath path="$PROJECT_DIR$/coderules/solutions/jetbrains.mps.coderules.ui/jetbrains.mps.coderules.ui.msd" folder="coderules" />
-      <modulePath path="$PROJECT_DIR$/coderules/solutions/jetbrains.mps.coderules/jetbrains.mps.coderules.msd" folder="coderules" />
-      <modulePath path="$PROJECT_DIR$/coderules/solutions/jetbrains.mps.lang.coderules.template/jetbrains.mps.lang.coderules.template.msd" folder="coderules" />
       <modulePath path="$PROJECT_DIR$/coderules/languages/jetbrains.mps.lang.controlflow/jetbrains.mps.lang.controlflow.mpl" folder="controlflow" />
-      <modulePath path="$PROJECT_DIR$/coderules/solutions/jetbrains.mps.controlflow.ui/jetbrains.mps.controlflow.ui.msd" folder="controlflow" />
-      <modulePath path="$PROJECT_DIR$/coderules/solutions/jetbrains.mps.controlflow/jetbrains.mps.controlflow.msd" folder="controlflow" />
-      <modulePath path="$PROJECT_DIR$/coderules/solutions/jetbrains.mps.lang.controlflow.runtime/jetbrains.mps.lang.controlflow.runtime.msd" folder="controlflow" />
-      <modulePath path="$PROJECT_DIR$/coderules/languages/jetbrains.mps.dataform/jetbrains.mps.dataform.mpl" folder="logic" />
-      <modulePath path="$PROJECT_DIR$/coderules/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl" folder="logic" />
-      <modulePath path="$PROJECT_DIR$/coderules/languages/jetbrains.mps.logic/runtime/jetbrains.mps.logic.runtime.msd" folder="logic" />
-      <modulePath path="$PROJECT_DIR$/coderules/solutions/jetbrains.mps.logic.reactor/jetbrains.mps.logic.reactor.msd" folder="logic" />
-      <modulePath path="$PROJECT_DIR$/coderules/solutions/jetbrains.mps.logic.test/jetbrains.mps.logic.test.msd" folder="logic" />
       <modulePath path="$PROJECT_DIR$/coderules/languages/jetbrains.mps.lang.smodel.types/jetbrains.mps.lang.smodel.types.mpl" folder="typechecking" />
       <modulePath path="$PROJECT_DIR$/coderules/languages/jetbrains.mps.lang.typechecking/jetbrains.mps.lang.typechecking.mpl" folder="typechecking" />
+      <modulePath path="$PROJECT_DIR$/coderules/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl" folder="logic" />
+      <modulePath path="$PROJECT_DIR$/coderules/languages/jetbrains.mps.logic/runtime/jetbrains.mps.logic.runtime.msd" folder="logic" />
       <modulePath path="$PROJECT_DIR$/coderules/languages/jetbrains.mps.typechecking.annotation/jetbrains.mps.typechecking.annotation.mpl" folder="typechecking.annotation" />
       <modulePath path="$PROJECT_DIR$/coderules/languages/jetbrains.mps.typechecking.testlang/jetbrains.mps.typechecking.testlang.mpl" folder="typechecking.test" />
+      <modulePath path="$PROJECT_DIR$/coderules/solutions/jetbrains.mps.coderules.ui/jetbrains.mps.coderules.ui.msd" folder="coderules" />
+      <modulePath path="$PROJECT_DIR$/coderules/solutions/jetbrains.mps.coderules/jetbrains.mps.coderules.msd" folder="coderules" />
+      <modulePath path="$PROJECT_DIR$/coderules/solutions/jetbrains.mps.controlflow.ui/jetbrains.mps.controlflow.ui.msd" folder="controlflow" />
+      <modulePath path="$PROJECT_DIR$/coderules/solutions/jetbrains.mps.controlflow/jetbrains.mps.controlflow.msd" folder="controlflow" />
+      <modulePath path="$PROJECT_DIR$/coderules/solutions/jetbrains.mps.lang.coderules.template/jetbrains.mps.lang.coderules.template.msd" folder="coderules" />
+      <modulePath path="$PROJECT_DIR$/coderules/solutions/jetbrains.mps.lang.controlflow.runtime/jetbrains.mps.lang.controlflow.runtime.msd" folder="controlflow" />
       <modulePath path="$PROJECT_DIR$/coderules/solutions/jetbrains.mps.lang.typechecking.runtime/jetbrains.mps.lang.typechecking.runtime.msd" folder="typechecking" />
+      <modulePath path="$PROJECT_DIR$/coderules/solutions/jetbrains.mps.logic.reactor/jetbrains.mps.logic.reactor.msd" folder="logic" />
+      <modulePath path="$PROJECT_DIR$/coderules/solutions/jetbrains.mps.logic.test/jetbrains.mps.logic.test.msd" folder="logic" />
       <modulePath path="$PROJECT_DIR$/coderules/solutions/jetbrains.mps.typechecking.build/jetbrains.mps.typechecking.build.msd" folder="build" />
       <modulePath path="$PROJECT_DIR$/coderules/solutions/jetbrains.mps.typechecking.reporting/jetbrains.mps.typechecking.reporting.msd" folder="typechecking" />
-      <modulePath path="$PROJECT_DIR$/samples/mpscore/solutions/jetbrains.mps.typechecking.sample.test/jetbrains.mps.typechecking.sample.test.msd" folder="baseLanguageExt" />
-      <modulePath path="$PROJECT_DIR$/samples/mpscore/solutions/jetbrains.mps.typechecking.sample/jetbrains.mps.typechecking.sample.msd" folder="baseLanguageExt" />
       <modulePath path="$PROJECT_DIR$/coderules/solutions/jetbrains.mps.typechecking.test/jetbrains.mps.typechecking.test.msd" folder="typechecking.test" />
       <modulePath path="$PROJECT_DIR$/coderules/solutions/jetbrains.mps.typechecking.testlang.sandbox/jetbrains.mps.typechecking.testlang.sandbox.msd" folder="typechecking.test" />
       <modulePath path="$PROJECT_DIR$/coderules/solutions/jetbrains.mps.typechecking.ui/jetbrains.mps.typechecking.ui.msd" folder="typechecking.ui" />
       <modulePath path="$PROJECT_DIR$/coderules/solutions/jetbrains.mps.typechecking/jetbrains.mps.typechecking.msd" folder="typechecking.service" />
     </projectModules>
   </component>
-</project>
+</project>
\ No newline at end of file
diff --git a/build.xml b/build.xml
index 0330ce78..4ed0c246 100644
--- a/build.xml
+++ b/build.xml
@@ -26,7 +26,7 @@
   </path>
   
   <target name="assemble" depends="classes, declare-mps-tasks">
-    <mkdir dir="${build.layout}/tests" />
+    <mkdir dir="${build.layout}/deploy" />
     <mkdir dir="${build.tmp}/default/jetbrains.mps.dataform.jar" />
     <mkdir dir="${build.tmp}/default/jetbrains.mps.dataform.jar/META-INF" />
     <echoxml file="${build.tmp}/default/jetbrains.mps.dataform.jar/META-INF/module.xml">
@@ -50,7 +50,7 @@
         <sources jar="jetbrains.mps.dataform-src.jar" descriptor="jetbrains.mps.dataform.mpl" />
       </module>
     </echoxml>
-    <jar destfile="${build.layout}/tests/jetbrains.mps.dataform.jar" duplicate="preserve">
+    <jar destfile="${build.layout}/deploy/jetbrains.mps.dataform.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.dataform" />
       <fileset dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.dataform/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.dataform.jar" />
@@ -78,7 +78,7 @@
         <sources jar="jetbrains.mps.dataform-src.jar" descriptor="jetbrains.mps.dataform.mpl" />
       </module>
     </echoxml>
-    <jar destfile="${build.layout}/tests/jetbrains.mps.dataform-generator.jar" duplicate="preserve">
+    <jar destfile="${build.layout}/deploy/jetbrains.mps.dataform-generator.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.dataform#01" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.dataform-generator.jar" />
     </jar>
@@ -88,7 +88,7 @@
     <copyModels todir="${build.tmp}/customProcessors/copyModels/coderules-languages-jetbrains.mps.dataform-models">
       <fileset dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.dataform/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
     </copyModels>
-    <jar destfile="${build.layout}/tests/jetbrains.mps.dataform-src.jar" duplicate="preserve">
+    <jar destfile="${build.layout}/deploy/jetbrains.mps.dataform-src.jar" duplicate="preserve">
       <fileset dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.dataform/generator/source_gen">
         <exclude name="**/trace.info" />
         <exclude name="**/exports" />
@@ -135,7 +135,7 @@
         <sources jar="jetbrains.mps.logic-src.jar" descriptor="jetbrains.mps.logic.mpl" />
       </module>
     </echoxml>
-    <jar destfile="${build.layout}/tests/jetbrains.mps.logic.jar" duplicate="preserve">
+    <jar destfile="${build.layout}/deploy/jetbrains.mps.logic.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.logic" />
       <fileset dir="${basedir}/coderules/languages/jetbrains.mps.logic" includes="icons/**, resources/**" />
       <fileset dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.logic/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
@@ -163,7 +163,7 @@
         <sources jar="jetbrains.mps.logic-src.jar" descriptor="jetbrains.mps.logic.mpl" />
       </module>
     </echoxml>
-    <jar destfile="${build.layout}/tests/jetbrains.mps.logic-generator.jar" duplicate="preserve">
+    <jar destfile="${build.layout}/deploy/jetbrains.mps.logic-generator.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.logic#6626732309150416985" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.logic-generator.jar" />
     </jar>
@@ -173,7 +173,7 @@
     <copyModels todir="${build.tmp}/customProcessors/copyModels/coderules-languages-jetbrains.mps.logic-languageModels">
       <fileset dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.logic/languageModels" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
     </copyModels>
-    <jar destfile="${build.layout}/tests/jetbrains.mps.logic-src.jar" duplicate="preserve">
+    <jar destfile="${build.layout}/deploy/jetbrains.mps.logic-src.jar" duplicate="preserve">
       <fileset dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.logic/generator/source_gen">
         <exclude name="**/trace.info" />
         <exclude name="**/exports" />
@@ -207,11 +207,11 @@
         <sources jar="jetbrains.mps.logic.reactor-src.jar" descriptor="jetbrains.mps.logic.reactor.msd" />
       </module>
     </echoxml>
-    <jar destfile="${build.layout}/tests/jetbrains.mps.logic.reactor.jar" duplicate="preserve">
+    <jar destfile="${build.layout}/deploy/jetbrains.mps.logic.reactor.jar" duplicate="preserve">
       <fileset dir="${basedir}/coderules/solutions/jetbrains.mps.logic.reactor" includes="icons/**, resources/**" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.logic.reactor.jar" />
     </jar>
-    <jar destfile="${build.layout}/tests/jetbrains.mps.logic.reactor-src.jar" duplicate="preserve">
+    <jar destfile="${build.layout}/deploy/jetbrains.mps.logic.reactor-src.jar" duplicate="preserve">
       <zipfileset file="${basedir}/coderules/solutions/jetbrains.mps.logic.reactor/jetbrains.mps.logic.reactor.msd" prefix="module" />
     </jar>
     <mkdir dir="${build.tmp}/default/jetbrains.mps.logic.runtime.jar" />
@@ -236,7 +236,7 @@
         <sources jar="jetbrains.mps.logic.runtime-src.jar" descriptor="jetbrains.mps.logic.runtime.msd" />
       </module>
     </echoxml>
-    <jar destfile="${build.layout}/tests/jetbrains.mps.logic.runtime.jar" duplicate="preserve">
+    <jar destfile="${build.layout}/deploy/jetbrains.mps.logic.runtime.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
       <fileset dir="${basedir}/coderules/languages/jetbrains.mps.logic/runtime" includes="icons/**, resources/**" />
       <fileset dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.logic/runtime/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
@@ -245,7 +245,7 @@
     <copyModels todir="${build.tmp}/customProcessors/copyModels/coderules-languages-jetbrains.mps.logic-runtime-models">
       <fileset dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.logic/runtime/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
     </copyModels>
-    <jar destfile="${build.layout}/tests/jetbrains.mps.logic.runtime-src.jar" duplicate="preserve">
+    <jar destfile="${build.layout}/deploy/jetbrains.mps.logic.runtime-src.jar" duplicate="preserve">
       <fileset dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.logic/runtime/source_gen">
         <exclude name="**/trace.info" />
         <exclude name="**/exports" />
@@ -281,7 +281,7 @@
         <sources jar="jetbrains.mps.logic.test-src.jar" descriptor="jetbrains.mps.logic.test.msd" />
       </module>
     </echoxml>
-    <jar destfile="${build.layout}/tests/jetbrains.mps.logic.test.jar" duplicate="preserve">
+    <jar destfile="${build.layout}/deploy/jetbrains.mps.logic.test.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.logic.test" />
       <fileset dir="${basedir}/coderules/solutions/jetbrains.mps.logic.test" includes="icons/**, resources/**" />
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.test/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
@@ -290,7 +290,7 @@
     <copyModels todir="${build.tmp}/customProcessors/copyModels/coderules-solutions-jetbrains.mps.logic.test-models">
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.test/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
     </copyModels>
-    <jar destfile="${build.layout}/tests/jetbrains.mps.logic.test-src.jar" duplicate="preserve">
+    <jar destfile="${build.layout}/deploy/jetbrains.mps.logic.test-src.jar" duplicate="preserve">
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.test/source_gen">
         <exclude name="**/trace.info" />
         <exclude name="**/exports" />
@@ -331,7 +331,7 @@
         <sources jar="jetbrains.mps.lang.coderules-src.jar" descriptor="jetbrains.mps.lang.coderules.mpl" />
       </module>
     </echoxml>
-    <jar destfile="${build.layout}/tests/jetbrains.mps.lang.coderules.jar" duplicate="preserve">
+    <jar destfile="${build.layout}/deploy/jetbrains.mps.lang.coderules.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.coderules" />
       <fileset dir="${basedir}/coderules/languages/jetbrains.mps.lang.coderules" includes="icons/**, resources/**" />
       <fileset dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.lang.coderules/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
@@ -362,7 +362,7 @@
         <sources jar="jetbrains.mps.lang.coderules-src.jar" descriptor="jetbrains.mps.lang.coderules.mpl" />
       </module>
     </echoxml>
-    <jar destfile="${build.layout}/tests/jetbrains.mps.lang.coderules-generator.jar" duplicate="preserve">
+    <jar destfile="${build.layout}/deploy/jetbrains.mps.lang.coderules-generator.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.coderules#4578927328670739933" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.lang.coderules-generator.jar" />
     </jar>
@@ -372,7 +372,7 @@
     <copyModels todir="${build.tmp}/customProcessors/copyModels/coderules-languages-jetbrains.mps.lang.coderules-languageModels">
       <fileset dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.lang.coderules/languageModels" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
     </copyModels>
-    <jar destfile="${build.layout}/tests/jetbrains.mps.lang.coderules-src.jar" duplicate="preserve">
+    <jar destfile="${build.layout}/deploy/jetbrains.mps.lang.coderules-src.jar" duplicate="preserve">
       <fileset dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.lang.coderules/generator/source_gen">
         <exclude name="**/trace.info" />
         <exclude name="**/exports" />
@@ -413,7 +413,7 @@
         <sources jar="jetbrains.mps.lang.coderules.runtime-src.jar" descriptor="jetbrains.mps.lang.coderules.runtime.msd" />
       </module>
     </echoxml>
-    <jar destfile="${build.layout}/tests/jetbrains.mps.lang.coderules.runtime.jar" duplicate="preserve">
+    <jar destfile="${build.layout}/deploy/jetbrains.mps.lang.coderules.runtime.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.coderules.runtime" />
       <fileset dir="${basedir}/coderules/languages/jetbrains.mps.lang.coderules/runtime" includes="icons/**, resources/**" />
       <fileset dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.lang.coderules/runtime/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
@@ -422,7 +422,7 @@
     <copyModels todir="${build.tmp}/customProcessors/copyModels/coderules-languages-jetbrains.mps.lang.coderules-runtime-models">
       <fileset dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.lang.coderules/runtime/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
     </copyModels>
-    <jar destfile="${build.layout}/tests/jetbrains.mps.lang.coderules.runtime-src.jar" duplicate="preserve">
+    <jar destfile="${build.layout}/deploy/jetbrains.mps.lang.coderules.runtime-src.jar" duplicate="preserve">
       <fileset dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.lang.coderules/runtime/source_gen">
         <exclude name="**/trace.info" />
         <exclude name="**/exports" />
@@ -455,7 +455,7 @@
         <sources jar="jetbrains.mps.lang.coderules.template-src.jar" descriptor="jetbrains.mps.lang.coderules.template.msd" />
       </module>
     </echoxml>
-    <jar destfile="${build.layout}/tests/jetbrains.mps.lang.coderules.template.jar" duplicate="preserve">
+    <jar destfile="${build.layout}/deploy/jetbrains.mps.lang.coderules.template.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.coderules.template" />
       <fileset dir="${basedir}/coderules/solutions/jetbrains.mps.lang.coderules.template" includes="icons/**, resources/**" />
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.lang.coderules.template/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
@@ -464,7 +464,7 @@
     <copyModels todir="${build.tmp}/customProcessors/copyModels/coderules-solutions-jetbrains.mps.lang.coderules.template-models">
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.lang.coderules.template/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
     </copyModels>
-    <jar destfile="${build.layout}/tests/jetbrains.mps.lang.coderules.template-src.jar" duplicate="preserve">
+    <jar destfile="${build.layout}/deploy/jetbrains.mps.lang.coderules.template-src.jar" duplicate="preserve">
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.lang.coderules.template/source_gen">
         <exclude name="**/trace.info" />
         <exclude name="**/exports" />
@@ -502,7 +502,7 @@
         <sources jar="jetbrains.mps.coderules-src.jar" descriptor="jetbrains.mps.coderules.msd" />
       </module>
     </echoxml>
-    <jar destfile="${build.layout}/tests/jetbrains.mps.coderules.jar" duplicate="preserve">
+    <jar destfile="${build.layout}/deploy/jetbrains.mps.coderules.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.coderules" />
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.coderules.jar" />
@@ -510,7 +510,7 @@
     <copyModels todir="${build.tmp}/customProcessors/copyModels/coderules-solutions-jetbrains.mps.coderules-models">
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
     </copyModels>
-    <jar destfile="${build.layout}/tests/jetbrains.mps.coderules-src.jar" duplicate="preserve">
+    <jar destfile="${build.layout}/deploy/jetbrains.mps.coderules-src.jar" duplicate="preserve">
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules/source_gen">
         <exclude name="**/trace.info" />
         <exclude name="**/exports" />
@@ -545,7 +545,7 @@
         <sources jar="jetbrains.mps.coderules.ui-src.jar" descriptor="jetbrains.mps.coderules.ui.msd" />
       </module>
     </echoxml>
-    <jar destfile="${build.layout}/tests/jetbrains.mps.coderules.ui.jar" duplicate="preserve">
+    <jar destfile="${build.layout}/deploy/jetbrains.mps.coderules.ui.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.coderules.ui" />
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.ui/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.coderules.ui.jar" />
@@ -553,7 +553,7 @@
     <copyModels todir="${build.tmp}/customProcessors/copyModels/coderules-solutions-jetbrains.mps.coderules.ui-models">
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.ui/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
     </copyModels>
-    <jar destfile="${build.layout}/tests/jetbrains.mps.coderules.ui-src.jar" duplicate="preserve">
+    <jar destfile="${build.layout}/deploy/jetbrains.mps.coderules.ui-src.jar" duplicate="preserve">
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.ui/source_gen">
         <exclude name="**/trace.info" />
         <exclude name="**/exports" />
@@ -588,7 +588,7 @@
         <sources jar="jetbrains.mps.lang.typechecking-src.jar" descriptor="jetbrains.mps.lang.typechecking.mpl" />
       </module>
     </echoxml>
-    <jar destfile="${build.layout}/tests/jetbrains.mps.lang.typechecking.jar" duplicate="preserve">
+    <jar destfile="${build.layout}/deploy/jetbrains.mps.lang.typechecking.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.typechecking" />
       <fileset dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.lang.typechecking/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.lang.typechecking.jar" />
@@ -617,7 +617,7 @@
         <sources jar="jetbrains.mps.lang.typechecking-src.jar" descriptor="jetbrains.mps.lang.typechecking.mpl" />
       </module>
     </echoxml>
-    <jar destfile="${build.layout}/tests/jetbrains.mps.lang.typechecking-generator.jar" duplicate="preserve">
+    <jar destfile="${build.layout}/deploy/jetbrains.mps.lang.typechecking-generator.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.typechecking#01" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.lang.typechecking-generator.jar" />
     </jar>
@@ -627,7 +627,7 @@
     <copyModels todir="${build.tmp}/customProcessors/copyModels/coderules-languages-jetbrains.mps.lang.typechecking-models">
       <fileset dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.lang.typechecking/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
     </copyModels>
-    <jar destfile="${build.layout}/tests/jetbrains.mps.lang.typechecking-src.jar" duplicate="preserve">
+    <jar destfile="${build.layout}/deploy/jetbrains.mps.lang.typechecking-src.jar" duplicate="preserve">
       <fileset dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.lang.typechecking/generator/source_gen">
         <exclude name="**/trace.info" />
         <exclude name="**/exports" />
@@ -664,7 +664,7 @@
         <sources jar="jetbrains.mps.lang.typechecking.runtime-src.jar" descriptor="jetbrains.mps.lang.typechecking.runtime.msd" />
       </module>
     </echoxml>
-    <jar destfile="${build.layout}/tests/jetbrains.mps.lang.typechecking.runtime.jar" duplicate="preserve">
+    <jar destfile="${build.layout}/deploy/jetbrains.mps.lang.typechecking.runtime.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.typechecking.runtime" />
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.lang.typechecking.runtime/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.lang.typechecking.runtime.jar" />
@@ -672,7 +672,7 @@
     <copyModels todir="${build.tmp}/customProcessors/copyModels/coderules-solutions-jetbrains.mps.lang.typechecking.runtime-models">
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.lang.typechecking.runtime/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
     </copyModels>
-    <jar destfile="${build.layout}/tests/jetbrains.mps.lang.typechecking.runtime-src.jar" duplicate="preserve">
+    <jar destfile="${build.layout}/deploy/jetbrains.mps.lang.typechecking.runtime-src.jar" duplicate="preserve">
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.lang.typechecking.runtime/source_gen">
         <exclude name="**/trace.info" />
         <exclude name="**/exports" />
@@ -707,7 +707,7 @@
         <sources jar="jetbrains.mps.typechecking-src.jar" descriptor="jetbrains.mps.typechecking.msd" />
       </module>
     </echoxml>
-    <jar destfile="${build.layout}/tests/jetbrains.mps.typechecking.jar" duplicate="preserve">
+    <jar destfile="${build.layout}/deploy/jetbrains.mps.typechecking.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.typechecking" />
       <fileset dir="${basedir}/coderules/solutions/jetbrains.mps.typechecking" includes="icons/**, resources/**" />
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.typechecking/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
@@ -716,7 +716,7 @@
     <copyModels todir="${build.tmp}/customProcessors/copyModels/coderules-solutions-jetbrains.mps.typechecking-models">
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.typechecking/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
     </copyModels>
-    <jar destfile="${build.layout}/tests/jetbrains.mps.typechecking-src.jar" duplicate="preserve">
+    <jar destfile="${build.layout}/deploy/jetbrains.mps.typechecking-src.jar" duplicate="preserve">
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.typechecking/source_gen">
         <exclude name="**/trace.info" />
         <exclude name="**/exports" />
@@ -746,7 +746,7 @@
         <sources jar="jetbrains.mps.typechecking.reporting-src.jar" descriptor="jetbrains.mps.typechecking.reporting.msd" />
       </module>
     </echoxml>
-    <jar destfile="${build.layout}/tests/jetbrains.mps.typechecking.reporting.jar" duplicate="preserve">
+    <jar destfile="${build.layout}/deploy/jetbrains.mps.typechecking.reporting.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.typechecking.reporting" />
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.typechecking.reporting/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.typechecking.reporting.jar" />
@@ -754,7 +754,7 @@
     <copyModels todir="${build.tmp}/customProcessors/copyModels/coderules-solutions-jetbrains.mps.typechecking.reporting-models">
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.typechecking.reporting/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
     </copyModels>
-    <jar destfile="${build.layout}/tests/jetbrains.mps.typechecking.reporting-src.jar" duplicate="preserve">
+    <jar destfile="${build.layout}/deploy/jetbrains.mps.typechecking.reporting-src.jar" duplicate="preserve">
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.typechecking.reporting/source_gen">
         <exclude name="**/trace.info" />
         <exclude name="**/exports" />
@@ -789,7 +789,7 @@
         <sources jar="jetbrains.mps.typechecking.ui-src.jar" descriptor="jetbrains.mps.typechecking.ui.msd" />
       </module>
     </echoxml>
-    <jar destfile="${build.layout}/tests/jetbrains.mps.typechecking.ui.jar" duplicate="preserve">
+    <jar destfile="${build.layout}/deploy/jetbrains.mps.typechecking.ui.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.typechecking.ui" />
       <fileset dir="${basedir}/coderules/solutions/jetbrains.mps.typechecking.ui" includes="icons/**, resources/**" />
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.typechecking.ui/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
@@ -798,7 +798,7 @@
     <copyModels todir="${build.tmp}/customProcessors/copyModels/coderules-solutions-jetbrains.mps.typechecking.ui-models">
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.typechecking.ui/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
     </copyModels>
-    <jar destfile="${build.layout}/tests/jetbrains.mps.typechecking.ui-src.jar" duplicate="preserve">
+    <jar destfile="${build.layout}/deploy/jetbrains.mps.typechecking.ui-src.jar" duplicate="preserve">
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.typechecking.ui/source_gen">
         <exclude name="**/trace.info" />
         <exclude name="**/exports" />
@@ -839,7 +839,7 @@
         <sources jar="jetbrains.mps.typechecking.testlang-src.jar" descriptor="jetbrains.mps.typechecking.testlang.mpl" />
       </module>
     </echoxml>
-    <jar destfile="${build.layout}/tests/jetbrains.mps.typechecking.testlang.jar" duplicate="preserve">
+    <jar destfile="${build.layout}/deploy/jetbrains.mps.typechecking.testlang.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.typechecking.testlang" />
       <fileset dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.typechecking.testlang/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.typechecking.testlang.jar" />
@@ -866,7 +866,7 @@
         <sources jar="jetbrains.mps.typechecking.testlang-src.jar" descriptor="jetbrains.mps.typechecking.testlang.mpl" />
       </module>
     </echoxml>
-    <jar destfile="${build.layout}/tests/jetbrains.mps.typechecking.testlang-generator.jar" duplicate="preserve">
+    <jar destfile="${build.layout}/deploy/jetbrains.mps.typechecking.testlang-generator.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.typechecking.testlang#3575255234175341581" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.typechecking.testlang-generator.jar" />
     </jar>
@@ -876,7 +876,7 @@
     <copyModels todir="${build.tmp}/customProcessors/copyModels/coderules-languages-jetbrains.mps.typechecking.testlang-models">
       <fileset dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.typechecking.testlang/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
     </copyModels>
-    <jar destfile="${build.layout}/tests/jetbrains.mps.typechecking.testlang-src.jar" duplicate="preserve">
+    <jar destfile="${build.layout}/deploy/jetbrains.mps.typechecking.testlang-src.jar" duplicate="preserve">
       <fileset dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.typechecking.testlang/generator/source_gen">
         <exclude name="**/trace.info" />
         <exclude name="**/exports" />
@@ -904,7 +904,7 @@
         <sources jar="jetbrains.mps.typechecking.testlang.sandbox-src.jar" descriptor="jetbrains.mps.typechecking.testlang.sandbox.msd" />
       </module>
     </echoxml>
-    <jar destfile="${build.layout}/tests/jetbrains.mps.typechecking.testlang.sandbox.jar" duplicate="preserve">
+    <jar destfile="${build.layout}/deploy/jetbrains.mps.typechecking.testlang.sandbox.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.typechecking.testlang.sandbox" />
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.typechecking.testlang.sandbox/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.typechecking.testlang.sandbox.jar" />
@@ -912,7 +912,7 @@
     <copyModels todir="${build.tmp}/customProcessors/copyModels/coderules-solutions-jetbrains.mps.typechecking.testlang.sandbox-models">
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.typechecking.testlang.sandbox/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
     </copyModels>
-    <jar destfile="${build.layout}/tests/jetbrains.mps.typechecking.testlang.sandbox-src.jar" duplicate="preserve">
+    <jar destfile="${build.layout}/deploy/jetbrains.mps.typechecking.testlang.sandbox-src.jar" duplicate="preserve">
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.typechecking.testlang.sandbox/source_gen">
         <exclude name="**/trace.info" />
         <exclude name="**/exports" />
@@ -949,7 +949,7 @@
         <sources jar="jetbrains.mps.typechecking.test-src.jar" descriptor="jetbrains.mps.typechecking.test.msd" />
       </module>
     </echoxml>
-    <jar destfile="${build.layout}/tests/jetbrains.mps.typechecking.test.jar" duplicate="preserve">
+    <jar destfile="${build.layout}/deploy/jetbrains.mps.typechecking.test.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.typechecking.test" />
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.typechecking.test/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.typechecking.test.jar" />
@@ -957,7 +957,7 @@
     <copyModels todir="${build.tmp}/customProcessors/copyModels/coderules-solutions-jetbrains.mps.typechecking.test-models">
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.typechecking.test/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
     </copyModels>
-    <jar destfile="${build.layout}/tests/jetbrains.mps.typechecking.test-src.jar" duplicate="preserve">
+    <jar destfile="${build.layout}/deploy/jetbrains.mps.typechecking.test-src.jar" duplicate="preserve">
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.typechecking.test/source_gen">
         <exclude name="**/trace.info" />
         <exclude name="**/exports" />
@@ -993,7 +993,7 @@
         <sources jar="jetbrains.mps.lang.smodel.types-src.jar" descriptor="jetbrains.mps.lang.smodel.types.mpl" />
       </module>
     </echoxml>
-    <jar destfile="${build.layout}/tests/jetbrains.mps.lang.smodel.types.jar" duplicate="preserve">
+    <jar destfile="${build.layout}/deploy/jetbrains.mps.lang.smodel.types.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.smodel.types" />
       <fileset dir="${basedir}/coderules/languages/jetbrains.mps.lang.smodel.types" includes="icons/**, resources/**" />
       <fileset dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.lang.smodel.types/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
@@ -1021,7 +1021,7 @@
         <sources jar="jetbrains.mps.lang.smodel.types-src.jar" descriptor="jetbrains.mps.lang.smodel.types.mpl" />
       </module>
     </echoxml>
-    <jar destfile="${build.layout}/tests/jetbrains.mps.lang.smodel.types-generator.jar" duplicate="preserve">
+    <jar destfile="${build.layout}/deploy/jetbrains.mps.lang.smodel.types-generator.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.smodel.types#7345257067587611144" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.lang.smodel.types-generator.jar" />
     </jar>
@@ -1031,7 +1031,7 @@
     <copyModels todir="${build.tmp}/customProcessors/copyModels/coderules-languages-jetbrains.mps.lang.smodel.types-models">
       <fileset dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.lang.smodel.types/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
     </copyModels>
-    <jar destfile="${build.layout}/tests/jetbrains.mps.lang.smodel.types-src.jar" duplicate="preserve">
+    <jar destfile="${build.layout}/deploy/jetbrains.mps.lang.smodel.types-src.jar" duplicate="preserve">
       <fileset dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.lang.smodel.types/generator/source_gen">
         <exclude name="**/trace.info" />
         <exclude name="**/exports" />
@@ -1068,7 +1068,7 @@
         <sources jar="jetbrains.mps.controlflow-src.jar" descriptor="jetbrains.mps.controlflow.msd" />
       </module>
     </echoxml>
-    <jar destfile="${build.layout}/tests/jetbrains.mps.controlflow.jar" duplicate="preserve">
+    <jar destfile="${build.layout}/deploy/jetbrains.mps.controlflow.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.controlflow" />
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.controlflow/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.controlflow.jar" />
@@ -1076,7 +1076,7 @@
     <copyModels todir="${build.tmp}/customProcessors/copyModels/coderules-solutions-jetbrains.mps.controlflow-models">
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.controlflow/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
     </copyModels>
-    <jar destfile="${build.layout}/tests/jetbrains.mps.controlflow-src.jar" duplicate="preserve">
+    <jar destfile="${build.layout}/deploy/jetbrains.mps.controlflow-src.jar" duplicate="preserve">
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.controlflow/source_gen">
         <exclude name="**/trace.info" />
         <exclude name="**/exports" />
@@ -1110,7 +1110,7 @@
         <sources jar="jetbrains.mps.controlflow.ui-src.jar" descriptor="jetbrains.mps.controlflow.ui.msd" />
       </module>
     </echoxml>
-    <jar destfile="${build.layout}/tests/jetbrains.mps.controlflow.ui.jar" duplicate="preserve">
+    <jar destfile="${build.layout}/deploy/jetbrains.mps.controlflow.ui.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.controlflow.ui" />
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.controlflow.ui/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.controlflow.ui.jar" />
@@ -1118,7 +1118,7 @@
     <copyModels todir="${build.tmp}/customProcessors/copyModels/coderules-solutions-jetbrains.mps.controlflow.ui-models">
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.controlflow.ui/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
     </copyModels>
-    <jar destfile="${build.layout}/tests/jetbrains.mps.controlflow.ui-src.jar" duplicate="preserve">
+    <jar destfile="${build.layout}/deploy/jetbrains.mps.controlflow.ui-src.jar" duplicate="preserve">
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.controlflow.ui/source_gen">
         <exclude name="**/trace.info" />
         <exclude name="**/exports" />
@@ -1153,7 +1153,7 @@
         <sources jar="jetbrains.mps.lang.controlflow-src.jar" descriptor="jetbrains.mps.lang.controlflow.mpl" />
       </module>
     </echoxml>
-    <jar destfile="${build.layout}/tests/jetbrains.mps.lang.controlflow.jar" duplicate="preserve">
+    <jar destfile="${build.layout}/deploy/jetbrains.mps.lang.controlflow.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.controlflow" />
       <fileset dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.lang.controlflow/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.lang.controlflow.jar" />
@@ -1182,7 +1182,7 @@
         <sources jar="jetbrains.mps.lang.controlflow-src.jar" descriptor="jetbrains.mps.lang.controlflow.mpl" />
       </module>
     </echoxml>
-    <jar destfile="${build.layout}/tests/jetbrains.mps.lang.controlflow-generator.jar" duplicate="preserve">
+    <jar destfile="${build.layout}/deploy/jetbrains.mps.lang.controlflow-generator.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.controlflow#01" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.lang.controlflow-generator.jar" />
     </jar>
@@ -1192,7 +1192,7 @@
     <copyModels todir="${build.tmp}/customProcessors/copyModels/coderules-languages-jetbrains.mps.lang.controlflow-models">
       <fileset dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.lang.controlflow/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
     </copyModels>
-    <jar destfile="${build.layout}/tests/jetbrains.mps.lang.controlflow-src.jar" duplicate="preserve">
+    <jar destfile="${build.layout}/deploy/jetbrains.mps.lang.controlflow-src.jar" duplicate="preserve">
       <fileset dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.lang.controlflow/generator/source_gen">
         <exclude name="**/trace.info" />
         <exclude name="**/exports" />
@@ -1229,7 +1229,7 @@
         <sources jar="jetbrains.mps.lang.controlflow.runtime-src.jar" descriptor="jetbrains.mps.lang.controlflow.runtime.msd" />
       </module>
     </echoxml>
-    <jar destfile="${build.layout}/tests/jetbrains.mps.lang.controlflow.runtime.jar" duplicate="preserve">
+    <jar destfile="${build.layout}/deploy/jetbrains.mps.lang.controlflow.runtime.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.controlflow.runtime" />
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.lang.controlflow.runtime/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.lang.controlflow.runtime.jar" />
@@ -1237,7 +1237,7 @@
     <copyModels todir="${build.tmp}/customProcessors/copyModels/coderules-solutions-jetbrains.mps.lang.controlflow.runtime-models">
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.lang.controlflow.runtime/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
     </copyModels>
-    <jar destfile="${build.layout}/tests/jetbrains.mps.lang.controlflow.runtime-src.jar" duplicate="preserve">
+    <jar destfile="${build.layout}/deploy/jetbrains.mps.lang.controlflow.runtime-src.jar" duplicate="preserve">
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.lang.controlflow.runtime/source_gen">
         <exclude name="**/trace.info" />
         <exclude name="**/exports" />
@@ -1272,7 +1272,7 @@
         <sources jar="jetbrains.mps.typechecking.annotation-src.jar" descriptor="jetbrains.mps.typechecking.annotation.mpl" />
       </module>
     </echoxml>
-    <jar destfile="${build.layout}/tests/jetbrains.mps.typechecking.annotation.jar" duplicate="preserve">
+    <jar destfile="${build.layout}/deploy/jetbrains.mps.typechecking.annotation.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.typechecking.annotation" />
       <fileset dir="${basedir}/coderules/languages/jetbrains.mps.typechecking.annotation" includes="icons/**, resources/**" />
       <fileset dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.typechecking.annotation/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
@@ -1281,7 +1281,7 @@
     <copyModels todir="${build.tmp}/customProcessors/copyModels/coderules-languages-jetbrains.mps.typechecking.annotation-languageModels">
       <fileset dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.typechecking.annotation/languageModels" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
     </copyModels>
-    <jar destfile="${build.layout}/tests/jetbrains.mps.typechecking.annotation-src.jar" duplicate="preserve">
+    <jar destfile="${build.layout}/deploy/jetbrains.mps.typechecking.annotation-src.jar" duplicate="preserve">
       <fileset dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.typechecking.annotation/source_gen">
         <exclude name="**/trace.info" />
         <exclude name="**/exports" />
@@ -1291,14 +1291,14 @@
       <zipfileset file="${basedir}/coderules/languages/jetbrains.mps.typechecking.annotation/jetbrains.mps.typechecking.annotation.mpl" prefix="module" />
       <zipfileset dir="${build.tmp}/customProcessors/copyModels/coderules-languages-jetbrains.mps.typechecking.annotation-languageModels" prefix="module/languageModels" />
     </jar>
-    <mkdir dir="${build.layout}/tests/lib" />
-    <copy todir="${build.layout}/tests/lib">
+    <mkdir dir="${build.layout}/deploy/lib" />
+    <copy todir="${build.layout}/deploy/lib">
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.test/lib" />
     </copy>
-    <copy todir="${build.layout}/tests/lib">
+    <copy todir="${build.layout}/deploy/lib">
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib" />
     </copy>
-    <copy todir="${build.layout}/tests/lib">
+    <copy todir="${build.layout}/deploy/lib">
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules/lib" />
     </copy>
     <mkdir dir="${build.tmp}/default/typechecking-0.5.zip" />
@@ -1489,7 +1489,7 @@
         <library jar="../lib/collection-0.7.jar" />
         <library jar="../lib/conreactor-api-0.9.jar" />
         <library jar="../lib/conreactor-core-0.9.jar" />
-        <library jar="../../../tests/lib/trove4j-3.0.3.jar" />
+        <library jar="../../../deploy/lib/trove4j-3.0.3.jar" />
         <library jar="../lib/kotlin-runtime-1.2.30.jar" />
         <library jar="../lib/kotlin-stdlib-1.2.30.jar" />
         <classpath>
@@ -4186,18 +4186,18 @@
       <pathelement location="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.matcher.jar" />
       <pathelement location="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.runtime.jar" />
       <pathelement location="${artifacts.mps}/plugins/mps-testing/lib/jetbrains.mps.lang.test.util.jar" />
-      <pathelement location="${build.layout}/tests/jetbrains.mps.coderules.jar" />
-      <pathelement location="${build.layout}/tests/jetbrains.mps.dataform.jar" />
-      <pathelement location="${build.layout}/tests/jetbrains.mps.lang.coderules.jar" />
-      <pathelement location="${build.layout}/tests/jetbrains.mps.lang.coderules.runtime.jar" />
-      <pathelement location="${build.layout}/tests/jetbrains.mps.lang.coderules.template.jar" />
-      <pathelement location="${build.layout}/tests/jetbrains.mps.lang.smodel.types.jar" />
-      <pathelement location="${build.layout}/tests/jetbrains.mps.lang.typechecking.runtime.jar" />
-      <pathelement location="${build.layout}/tests/jetbrains.mps.logic.jar" />
-      <pathelement location="${build.layout}/tests/jetbrains.mps.logic.reactor.jar" />
-      <pathelement location="${build.layout}/tests/jetbrains.mps.logic.runtime.jar" />
-      <pathelement location="${build.layout}/tests/jetbrains.mps.typechecking.jar" />
-      <pathelement location="${build.layout}/tests/jetbrains.mps.typechecking.reporting.jar" />
+      <pathelement location="${build.layout}/deploy/jetbrains.mps.coderules.jar" />
+      <pathelement location="${build.layout}/deploy/jetbrains.mps.dataform.jar" />
+      <pathelement location="${build.layout}/deploy/jetbrains.mps.lang.coderules.jar" />
+      <pathelement location="${build.layout}/deploy/jetbrains.mps.lang.coderules.runtime.jar" />
+      <pathelement location="${build.layout}/deploy/jetbrains.mps.lang.coderules.template.jar" />
+      <pathelement location="${build.layout}/deploy/jetbrains.mps.lang.smodel.types.jar" />
+      <pathelement location="${build.layout}/deploy/jetbrains.mps.lang.typechecking.runtime.jar" />
+      <pathelement location="${build.layout}/deploy/jetbrains.mps.logic.jar" />
+      <pathelement location="${build.layout}/deploy/jetbrains.mps.logic.reactor.jar" />
+      <pathelement location="${build.layout}/deploy/jetbrains.mps.logic.runtime.jar" />
+      <pathelement location="${build.layout}/deploy/jetbrains.mps.typechecking.jar" />
+      <pathelement location="${build.layout}/deploy/jetbrains.mps.typechecking.reporting.jar" />
     </path>
     <pathconvert pathsep="${path.separator}" property="mps.libraries.path.string" refid="mps.libraries.path" />
     <path id="mps.plugins.path">
@@ -4206,11 +4206,11 @@
     </path>
     <pathconvert pathsep="${path.separator}" property="mps.plugins.path.string" refid="mps.plugins.path" />
     <path id="mps.tests.path">
-      <pathelement location="${build.layout}/tests/jetbrains.mps.logic.test.jar" />
-      <pathelement location="${build.layout}/tests/jetbrains.mps.typechecking.test.jar" />
-      <pathelement location="${build.layout}/tests/jetbrains.mps.typechecking.testlang-generator.jar" />
-      <pathelement location="${build.layout}/tests/jetbrains.mps.typechecking.testlang.jar" />
-      <pathelement location="${build.layout}/tests/jetbrains.mps.typechecking.testlang.sandbox.jar" />
+      <pathelement location="${build.layout}/deploy/jetbrains.mps.logic.test.jar" />
+      <pathelement location="${build.layout}/deploy/jetbrains.mps.typechecking.test.jar" />
+      <pathelement location="${build.layout}/deploy/jetbrains.mps.typechecking.testlang-generator.jar" />
+      <pathelement location="${build.layout}/deploy/jetbrains.mps.typechecking.testlang.jar" />
+      <pathelement location="${build.layout}/deploy/jetbrains.mps.typechecking.testlang.sandbox.jar" />
     </path>
     <pathconvert pathsep="${path.separator}" property="mps.tests.path.string" refid="mps.tests.path" />
     <path id="long.class.path">
diff --git a/coderules/solutions/jetbrains.mps.typechecking.build/models/jetbrains.mps.typechecking.build.mps b/coderules/solutions/jetbrains.mps.typechecking.build/models/jetbrains.mps.typechecking.build.mps
index 1cf7fccb..3b13456b 100644
--- a/coderules/solutions/jetbrains.mps.typechecking.build/models/jetbrains.mps.typechecking.build.mps
+++ b/coderules/solutions/jetbrains.mps.typechecking.build/models/jetbrains.mps.typechecking.build.mps
@@ -2244,7 +2244,7 @@
         </node>
         <node concept="3_J27D" id="7Ant4WkHLAr" role="Nbhlr">
           <node concept="3Mxwew" id="7Ant4WkHLDj" role="3MwsjC">
-            <property role="3MwjfP" value="tests" />
+            <property role="3MwjfP" value="deploy" />
           </node>
         </node>
         <node concept="L2wRC" id="46o4wsHrP6K" role="39821P">
diff --git a/coderules/solutions/jetbrains.mps.typechecking.test/models/data.mps b/coderules/solutions/jetbrains.mps.typechecking.test/models/data.mps
deleted file mode 100644
index 9224d48c..00000000
--- a/coderules/solutions/jetbrains.mps.typechecking.test/models/data.mps
+++ /dev/null
@@ -1,220 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:bc54949b-877a-412d-bb6d-5859d76db7ae(jetbrains.mps.typechecking.test.data)" doNotGenerate="true">
-  <persistence version="9" />
-  <languages>
-    <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="2" />
-    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="6" />
-    <use id="0fda14cc-a416-4c81-869a-2175d8b3325d" name="jetbrains.mps.baseLanguageExt" version="0" />
-  </languages>
-  <imports>
-    <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
-  </imports>
-  <registry>
-    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
-      <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
-      <concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="ng" index="2tJIrI" />
-      <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
-        <child id="1197027771414" name="operand" index="2Oq$k0" />
-        <child id="1197027833540" name="operation" index="2OqNvi" />
-      </concept>
-      <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu" />
-      <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
-        <child id="1068431790190" name="initializer" index="33vP2m" />
-      </concept>
-      <concept id="1109279763828" name="jetbrains.mps.baseLanguage.structure.TypeVariableDeclaration" flags="ng" index="16euLQ" />
-      <concept id="1109279851642" name="jetbrains.mps.baseLanguage.structure.GenericDeclaration" flags="ng" index="16eOlS">
-        <child id="1109279881614" name="typeVariableDeclaration" index="16eVyc" />
-      </concept>
-      <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
-        <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
-      </concept>
-      <concept id="1068498886292" name="jetbrains.mps.baseLanguage.structure.ParameterDeclaration" flags="ir" index="37vLTG" />
-      <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
-        <child id="5680397130376446158" name="type" index="1tU5fm" />
-      </concept>
-      <concept id="1068580123132" name="jetbrains.mps.baseLanguage.structure.BaseMethodDeclaration" flags="ng" index="3clF44">
-        <child id="1068580123133" name="returnType" index="3clF45" />
-        <child id="1068580123134" name="parameter" index="3clF46" />
-        <child id="1068580123135" name="body" index="3clF47" />
-      </concept>
-      <concept id="1068580123165" name="jetbrains.mps.baseLanguage.structure.InstanceMethodDeclaration" flags="ig" index="3clFb_">
-        <property id="1178608670077" name="isAbstract" index="1EzhhJ" />
-      </concept>
-      <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
-        <child id="1068580123156" name="expression" index="3clFbG" />
-      </concept>
-      <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
-        <child id="1068581517665" name="statement" index="3cqZAp" />
-      </concept>
-      <concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
-        <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
-      </concept>
-      <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
-        <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
-        <child id="1068499141038" name="actualArgument" index="37wK5m" />
-      </concept>
-      <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
-        <property id="521412098689998745" name="nonStatic" index="2bfB8j" />
-        <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
-      </concept>
-      <concept id="7812454656619025412" name="jetbrains.mps.baseLanguage.structure.LocalMethodCall" flags="nn" index="1rXfSq" />
-      <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
-        <reference id="1107535924139" name="classifier" index="3uigEE" />
-        <child id="1109201940907" name="parameter" index="11_B2D" />
-      </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
-        <child id="1178549979242" name="visibility" index="1B3o_S" />
-      </concept>
-      <concept id="1107796713796" name="jetbrains.mps.baseLanguage.structure.Interface" flags="ig" index="3HP615" />
-      <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
-    </language>
-    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
-        <property id="1169194664001" name="name" index="TrG5h" />
-      </concept>
-    </language>
-  </registry>
-  <node concept="312cEu" id="4nxCIBqyl_d">
-    <property role="TrG5h" value="Test" />
-    <node concept="2tJIrI" id="1eKXYsjuV4O" role="jymVt" />
-    <node concept="3HP615" id="4cKdPpqIRLR" role="jymVt">
-      <property role="2bfB8j" value="true" />
-      <property role="TrG5h" value="A" />
-      <node concept="3clFb_" id="4BHjwwGzeH3" role="jymVt">
-        <property role="1EzhhJ" value="true" />
-        <property role="TrG5h" value="a" />
-        <node concept="3uibUv" id="4BHjwwGzeJR" role="3clF45">
-          <ref role="3uigEE" node="4cKdPpqIRLR" resolve="Test.A" />
-        </node>
-        <node concept="3Tm1VV" id="4BHjwwGzeH6" role="1B3o_S" />
-        <node concept="3clFbS" id="4BHjwwGzeH7" role="3clF47" />
-      </node>
-      <node concept="3Tm1VV" id="4cKdPpqIRLS" role="1B3o_S" />
-    </node>
-    <node concept="2tJIrI" id="7y50OW6ZXx0" role="jymVt" />
-    <node concept="3HP615" id="7y50OW6ZXcE" role="jymVt">
-      <property role="2bfB8j" value="true" />
-      <property role="TrG5h" value="B" />
-      <node concept="3Tm1VV" id="7y50OW6ZXcF" role="1B3o_S" />
-      <node concept="16euLQ" id="7y50OW6ZXOs" role="16eVyc">
-        <property role="TrG5h" value="T" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="4BHjwwGxjyG" role="jymVt" />
-    <node concept="3clFb_" id="4BHjwwGxjBc" role="jymVt">
-      <property role="TrG5h" value="foo" />
-      <node concept="37vLTG" id="4BHjwwGza0K" role="3clF46">
-        <property role="TrG5h" value="a" />
-        <node concept="3uibUv" id="4BHjwwGza18" role="1tU5fm">
-          <ref role="3uigEE" node="4cKdPpqIRLR" resolve="Test.A" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="4BHjwwGza1Q" role="3clF46">
-        <property role="TrG5h" value="b" />
-        <node concept="3uibUv" id="4BHjwwGza2g" role="1tU5fm">
-          <ref role="3uigEE" node="7y50OW6ZXcE" resolve="Test.B" />
-          <node concept="3uibUv" id="4BHjwwGza2X" role="11_B2D">
-            <ref role="3uigEE" node="4cKdPpqIRLR" resolve="Test.A" />
-          </node>
-        </node>
-      </node>
-      <node concept="3cqZAl" id="4BHjwwGxjBe" role="3clF45" />
-      <node concept="3Tm1VV" id="4BHjwwGxjBf" role="1B3o_S" />
-      <node concept="3clFbS" id="4BHjwwGxjBg" role="3clF47">
-        <node concept="3cpWs8" id="4BHjwwGxjLy" role="3cqZAp">
-          <node concept="3cpWsn" id="4BHjwwGxjLz" role="3cpWs9">
-            <property role="TrG5h" value="varA" />
-            <node concept="3uibUv" id="4BHjwwGxjL$" role="1tU5fm">
-              <ref role="3uigEE" node="4cKdPpqIRLR" resolve="Test.A" />
-            </node>
-            <node concept="2OqwBi" id="4BHjwwGzeP1" role="33vP2m">
-              <node concept="37vLTw" id="4BHjwwGza4o" role="2Oq$k0">
-                <ref role="3cqZAo" node="4BHjwwGza0K" resolve="a" />
-              </node>
-              <node concept="liA8E" id="4BHjwwGzeWc" role="2OqNvi">
-                <ref role="37wK5l" node="4BHjwwGzeH3" resolve="a" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs8" id="4BHjwwGxjNu" role="3cqZAp">
-          <node concept="3cpWsn" id="4BHjwwGxjN$" role="3cpWs9">
-            <property role="TrG5h" value="varB" />
-            <node concept="3uibUv" id="4BHjwwGxjNA" role="1tU5fm">
-              <ref role="3uigEE" node="7y50OW6ZXcE" resolve="Test.B" />
-              <node concept="3uibUv" id="4BHjwwGxjOG" role="11_B2D">
-                <ref role="3uigEE" node="4cKdPpqIRLR" resolve="Test.A" />
-              </node>
-            </node>
-            <node concept="37vLTw" id="4BHjwwGza5s" role="33vP2m">
-              <ref role="3cqZAo" node="4BHjwwGza1Q" resolve="b" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="4BHjwwGCpKM" role="3cqZAp">
-          <node concept="1rXfSq" id="4BHjwwGCpKK" role="3clFbG">
-            <ref role="37wK5l" node="4BHjwwGxjBc" resolve="foo" />
-            <node concept="37vLTw" id="4BHjwwGCpM2" role="37wK5m">
-              <ref role="3cqZAo" node="4BHjwwGxjLz" resolve="varA" />
-            </node>
-            <node concept="37vLTw" id="4BHjwwGCpPQ" role="37wK5m">
-              <ref role="3cqZAo" node="4BHjwwGxjN$" resolve="varB" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="3Tm1VV" id="4nxCIBqyl_e" role="1B3o_S" />
-  </node>
-  <node concept="312cEu" id="6$7vuu2uamo">
-    <property role="TrG5h" value="Foo" />
-    <node concept="3clFb_" id="6$7vuu2uaoc" role="jymVt">
-      <property role="TrG5h" value="bar" />
-      <node concept="37vLTG" id="6$7vuu2uaoM" role="3clF46">
-        <property role="TrG5h" value="str" />
-        <node concept="3uibUv" id="6$7vuu2uapo" role="1tU5fm">
-          <ref role="3uigEE" to="wyt6:~String" resolve="String" />
-        </node>
-      </node>
-      <node concept="3cqZAl" id="6$7vuu2uaoe" role="3clF45" />
-      <node concept="3Tm1VV" id="6$7vuu2uaof" role="1B3o_S" />
-      <node concept="3clFbS" id="6$7vuu2uaog" role="3clF47">
-        <node concept="3clFbF" id="6$7vuu2uasa" role="3cqZAp">
-          <node concept="1rXfSq" id="6$7vuu2uas9" role="3clFbG">
-            <ref role="37wK5l" node="6$7vuu2uaqf" resolve="bazz" />
-            <node concept="37vLTw" id="6$7vuu2woUY" role="37wK5m">
-              <ref role="3cqZAo" node="6$7vuu2uaoM" resolve="str" />
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs8" id="14$_tTxxems" role="3cqZAp">
-          <node concept="3cpWsn" id="14$_tTxxemt" role="3cpWs9">
-            <property role="TrG5h" value="o" />
-            <node concept="3uibUv" id="14$_tTxxemu" role="1tU5fm">
-              <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-            </node>
-            <node concept="37vLTw" id="14$_tTxxenZ" role="33vP2m">
-              <ref role="3cqZAo" node="6$7vuu2uaoM" resolve="str" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="3clFb_" id="6$7vuu2uaqf" role="jymVt">
-      <property role="TrG5h" value="bazz" />
-      <node concept="37vLTG" id="6$7vuu2uaqV" role="3clF46">
-        <property role="TrG5h" value="obj" />
-        <node concept="3uibUv" id="6$7vuu2uarh" role="1tU5fm">
-          <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-        </node>
-      </node>
-      <node concept="3cqZAl" id="6$7vuu2uaqh" role="3clF45" />
-      <node concept="3Tm1VV" id="6$7vuu2uaqi" role="1B3o_S" />
-      <node concept="3clFbS" id="6$7vuu2uaqj" role="3clF47" />
-    </node>
-    <node concept="3Tm1VV" id="6$7vuu2uamp" role="1B3o_S" />
-  </node>
-</model>
-
diff --git a/coderules/solutions/jetbrains.mps.typechecking.test/models/jetbrains.mps.typechecking@tests.mps b/coderules/solutions/jetbrains.mps.typechecking.test/models/jetbrains.mps.typechecking@tests.mps
index da178884..a7df3717 100644
--- a/coderules/solutions/jetbrains.mps.typechecking.test/models/jetbrains.mps.typechecking@tests.mps
+++ b/coderules/solutions/jetbrains.mps.typechecking.test/models/jetbrains.mps.typechecking@tests.mps
@@ -39,7 +39,6 @@
     <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" />
     <import index="w1kc" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel(MPS.Core/)" />
     <import index="tj24" ref="r:0fbbb63a-fd15-46e1-8136-78049f6d6e63(jetbrains.mps.typechecking.service)" />
-    <import index="tlxd" ref="r:bc54949b-877a-412d-bb6d-5859d76db7ae(jetbrains.mps.typechecking.test.data)" />
     <import index="tpek" ref="r:00000000-0000-4000-0000-011c895902c0(jetbrains.mps.baseLanguage.behavior)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
     <import index="qox2" ref="r:7ff0776c-aea4-4df2-88a3-2efb6b568dc3(jetbrains.mps.typechecking.plugin)" />
diff --git a/samples/mpscore/.mps/encodings.xml b/samples/mpscore/.mps/encodings.xml
new file mode 100644
index 00000000..97626ba4
--- /dev/null
+++ b/samples/mpscore/.mps/encodings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding">
+    <file url="PROJECT" charset="UTF-8" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/samples/mpscore/.mps/libraries.xml b/samples/mpscore/.mps/libraries.xml
new file mode 100644
index 00000000..4f7e4c25
--- /dev/null
+++ b/samples/mpscore/.mps/libraries.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectLibraryManager">
+    <option name="libraries">
+      <map>
+        <entry key="coderules">
+          <value>
+            <Library>
+              <option name="name" value="coderules" />
+              <option name="path" value="${logic_home}/build/artifacts/typechecking-plugin/deploy" />
+            </Library>
+          </value>
+        </entry>
+      </map>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/samples/mpscore/.mps/migration.xml b/samples/mpscore/.mps/migration.xml
new file mode 100644
index 00000000..f5b58e7f
--- /dev/null
+++ b/samples/mpscore/.mps/migration.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="MigrationProperties">
+    <entry key="jetbrains.mps.ide.mpsmigration.v172.JUnitLibsRepackaging" value="executed" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/samples/mpscore/.mps/misc.xml b/samples/mpscore/.mps/misc.xml
new file mode 100644
index 00000000..8e3bf350
--- /dev/null
+++ b/samples/mpscore/.mps/misc.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="MPSFavoritesManager">
+    <option name="keepMe" value="true" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/samples/mpscore/.mps/modules.xml b/samples/mpscore/.mps/modules.xml
new file mode 100644
index 00000000..cdb77404
--- /dev/null
+++ b/samples/mpscore/.mps/modules.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="MPSProject">
+    <projectModules>
+      <modulePath path="$PROJECT_DIR$/languages/jetbrains.mps.baseLanguageExt/jetbrains.mps.baseLanguageExt.mpl" folder="" />
+      <modulePath path="$PROJECT_DIR$/solutions/jetbrains.mps.baseLanguageExt.test/jetbrains.mps.baseLanguageExt.test.msd" folder="" />
+      <modulePath path="$PROJECT_DIR$/solutions/jetbrains.mps.typechecking.sample.test/jetbrains.mps.typechecking.sample.test.msd" folder="" />
+      <modulePath path="$PROJECT_DIR$/solutions/jetbrains.mps.typechecking.sample/jetbrains.mps.typechecking.sample.msd" folder="" />
+    </projectModules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/samples/mpscore/.mps/vcs.xml b/samples/mpscore/.mps/vcs.xml
new file mode 100644
index 00000000..cd597741
--- /dev/null
+++ b/samples/mpscore/.mps/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$logic_home$" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file