diff --git a/.gitignore b/.gitignore
index dce910ca..9340c0b6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,7 @@
 .gradle
 out
 build/*
+samples/mpscore/build/*
 config/*
 system/*
 MPS_HOME
diff --git a/build.gradle b/build.gradle
index c1157521..00c29370 100644
--- a/build.gradle
+++ b/build.gradle
@@ -123,12 +123,22 @@ fetchDependencies {
 }
 
 // ensure 'generate' runs before 'classes' ('generate' is NOT optional)
-classes {
-  dependsOn {
-    'generate'
+allprojects {
+  classes {
+    dependsOn {
+      'generate'
+    }
+    mustRunAfter {
+      'generate'
+    }
   }
-  mustRunAfter {
-    'generate'
+  test {
+    dependsOn {
+      'assemble'
+    }
+    mustRunAfter {
+      'assemble'
+    }
   }
 }
 
@@ -137,4 +147,3 @@ assemble {
     'generateUpdatePluginsXml'
   }
 }
-
diff --git a/build.xml b/build.xml
index 6c077bd0..abc6b8cc 100644
--- a/build.xml
+++ b/build.xml
@@ -5,6 +5,7 @@
   <property name="build.layout" location="${build.dir}/artifacts/typechecking-plugin" />
   <property name="ci.build.num" value="9999" />
   <property name="mps.macro.coderules_home" location="${basedir}" />
+  <property name="mps.macro.logic_home" location="${basedir}" />
   <property name="mps_home" location="${basedir}/MPS_HOME" />
   <property name="artifacts.mps" location="${mps_home}" />
   <property file="${artifacts.mps}/build.properties" prefix="import.mps" />
@@ -18,13 +19,13 @@
   <property name="environment" value="env" />
   <property name="env.JAVA_HOME" value="${java.home}/.." />
   <property name="jdk.home" value="${env.JAVA_HOME}" />
-  
+
   <path id="path.mps.ant.path">
     <pathelement location="${artifacts.mps}/lib/ant/lib/ant-mps.jar" />
     <pathelement location="${artifacts.mps}/lib/jdom.jar" />
     <pathelement location="${artifacts.mps}/lib/log4j.jar" />
   </path>
-  
+
   <target name="assemble" depends="classes, declare-mps-tasks">
     <mkdir dir="${build.layout}/deploy" />
     <mkdir dir="${build.tmp}/default/jetbrains.mps.typechecking.build.jar" />
@@ -1340,7 +1341,7 @@
         <description>Experimental support for type checking with constraint rules</description>
         <version>0.5-b${ci.build.num}</version>
         <vendor url="jetbrains.com/mps">JetBrains s.r.o.</vendor>
-        
+
         <extensions defaultExtensionNs="com.intellij">
           <mps.LanguageLibrary dir="/languages" />
         </extensions>
@@ -2518,28 +2519,28 @@
     </zip>
     <echo file="${build.layout}/build.properties">typechecking-plugin.ci.build.num=${ci.build.num}${line.separator}mps.build.number=${mps.build.number}${line.separator}mps.date=${mps.date}${line.separator}mps.build.vcs.number=${mps.build.vcs.number}${line.separator}mps.teamcity.buildConfName=${mps.teamcity.buildConfName}${line.separator}mps.idea.platform.build.number=${mps.idea.platform.build.number}${line.separator}mps.mps.build.counter=${mps.mps.build.counter}${line.separator}mpsBootstrapCore.version=${mpsBootstrapCore.version}</echo>
   </target>
-  
+
   <target name="buildDependents" />
-  
+
   <target name="fetchDependencies" />
-  
+
   <target name="build" depends="assemble" />
-  
+
   <target name="clean">
     <delete dir="${build.tmp}" />
     <delete dir="${build.layout}" />
   </target>
-  
+
   <target name="compileJava" depends="java.compile.jetbrains.mps.typechecking.build, java.compile.jetbrains.mps.dataform, java.compile.jetbrains.mps.dataform#01, 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.typechecking, java.compile.jetbrains.mps.lang.smodel.types, java.compile.jetbrains.mps.lang.smodel.types#7345257067587611144, java.compile.jetbrains.mps.typechecking.ui, java.compile.jetbrains.mps.typechecking.annotation, java.compile.jetbrains.mps.typechecking.testlang, java.compile.jetbrains.mps.typechecking.testlang#3575255234175341581, java.compile.jetbrains.mps.typechecking.testlang.sandbox, java.compile.jetbrains.mps.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, java.compile.jetbrains.mps.coderules.ui, java.compile.jetbrains.mps.typechecking.reporting" />
-  
+
   <target name="processResources" />
-  
+
   <target name="classes" depends="compileJava, processResources" />
-  
+
   <target name="test" depends="classes, module-tests" />
-  
+
   <target name="check" depends="test" />
-  
+
   <target name="generate" depends="declare-mps-tasks, fetchDependencies">
     <echo message="generating" />
     <generate strictMode="true" parallelMode="true" parallelThreads="8" useInplaceTransform="false" hideWarnings="false" createStaticRefs="true" fork="true">
@@ -2681,15 +2682,15 @@
       <macro name="mps_home" path="${mps_home}" />
     </generate>
   </target>
-  
+
   <target name="declare-mps-tasks">
     <taskdef resource="jetbrains/mps/build/ant/antlib.xml" classpathref="path.mps.ant.path" />
   </target>
-  
+
   <target name="makeDependents" />
-  
+
   <target name="module-tests" depends="assemble, test.testconfig" />
-  
+
   <target name="java.compile.jetbrains.mps.typechecking.build">
     <mkdir dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.typechecking.build/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.typechecking.build" />
@@ -2701,7 +2702,7 @@
       <classpath />
     </javac>
   </target>
-  
+
   <target name="java.compile.jetbrains.mps.dataform" depends="java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking.reporting, fetchDependencies">
     <mkdir dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.dataform/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.dataform" />
@@ -2752,7 +2753,7 @@
       </classpath>
     </javac>
   </target>
-  
+
   <target name="java.compile.jetbrains.mps.dataform#01" depends="java.compile.jetbrains.mps.dataform, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking.reporting, fetchDependencies">
     <mkdir dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.dataform/generator/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.dataform#01" />
@@ -2803,7 +2804,7 @@
       </classpath>
     </javac>
   </target>
-  
+
   <target name="java.compile.jetbrains.mps.logic.runtime" depends="fetchDependencies">
     <mkdir dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.logic/runtime/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
@@ -2839,7 +2840,7 @@
       </classpath>
     </javac>
   </target>
-  
+
   <target name="java.compile.jetbrains.mps.logic" depends="java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
     <mkdir dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.logic/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.logic" />
@@ -2891,7 +2892,7 @@
       </classpath>
     </javac>
   </target>
-  
+
   <target name="java.compile.jetbrains.mps.logic#6626732309150416985" depends="java.compile.jetbrains.mps.logic, fetchDependencies">
     <mkdir dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.logic/generator/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.logic#6626732309150416985" />
@@ -2939,7 +2940,7 @@
       </classpath>
     </javac>
   </target>
-  
+
   <target name="java.compile.jetbrains.mps.logic.test" depends="java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
     <mkdir dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.test/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.logic.test" />
@@ -2980,7 +2981,7 @@
       </classpath>
     </javac>
   </target>
-  
+
   <target name="java.compile.jetbrains.mps.lang.typechecking.runtime" depends="java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.typechecking.reporting, fetchDependencies">
     <mkdir dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.lang.typechecking.runtime/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.typechecking.runtime" />
@@ -3011,7 +3012,7 @@
       </classpath>
     </javac>
   </target>
-  
+
   <target name="java.compile.jetbrains.mps.lang.typechecking" depends="java.compile.jetbrains.mps.dataform, java.compile.jetbrains.mps.lang.coderules, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.lang.typechecking.runtime, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.typechecking.reporting, fetchDependencies">
     <mkdir dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.lang.typechecking/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.typechecking" />
@@ -3065,7 +3066,7 @@
       </classpath>
     </javac>
   </target>
-  
+
   <target name="java.compile.jetbrains.mps.lang.typechecking#01" depends="java.compile.jetbrains.mps.dataform, java.compile.jetbrains.mps.lang.coderules, java.compile.jetbrains.mps.lang.coderules#4578927328670739933, java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.lang.typechecking, java.compile.jetbrains.mps.lang.typechecking.runtime, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking.reporting, fetchDependencies">
     <mkdir dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.lang.typechecking/generator/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.typechecking#01" />
@@ -3128,7 +3129,7 @@
       </classpath>
     </javac>
   </target>
-  
+
   <target name="java.compile.jetbrains.mps.typechecking" depends="java.compile.jetbrains.mps.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.runtime, java.compile.jetbrains.mps.typechecking.reporting, fetchDependencies">
     <mkdir dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.typechecking/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.typechecking" />
@@ -3183,7 +3184,7 @@
       </classpath>
     </javac>
   </target>
-  
+
   <target name="java.compile.jetbrains.mps.lang.smodel.types" depends="fetchDependencies">
     <mkdir dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.lang.smodel.types/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.smodel.types" />
@@ -3228,7 +3229,7 @@
       </classpath>
     </javac>
   </target>
-  
+
   <target name="java.compile.jetbrains.mps.lang.smodel.types#7345257067587611144" depends="java.compile.jetbrains.mps.lang.smodel.types, fetchDependencies">
     <mkdir dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.lang.smodel.types/generator/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.smodel.types#7345257067587611144" />
@@ -3273,7 +3274,7 @@
       </classpath>
     </javac>
   </target>
-  
+
   <target name="java.compile.jetbrains.mps.typechecking.ui" depends="java.compile.jetbrains.mps.coderules, java.compile.jetbrains.mps.coderules.ui, 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.runtime, java.compile.jetbrains.mps.typechecking, java.compile.jetbrains.mps.typechecking.reporting, fetchDependencies">
     <mkdir dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.typechecking.ui/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.typechecking.ui" />
@@ -3330,7 +3331,7 @@
       </classpath>
     </javac>
   </target>
-  
+
   <target name="java.compile.jetbrains.mps.typechecking.annotation" depends="fetchDependencies">
     <mkdir dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.typechecking.annotation/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.typechecking.annotation" />
@@ -3379,7 +3380,7 @@
       </classpath>
     </javac>
   </target>
-  
+
   <target name="java.compile.jetbrains.mps.typechecking.testlang" depends="java.compile.jetbrains.mps.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.runtime, java.compile.jetbrains.mps.typechecking, java.compile.jetbrains.mps.typechecking.reporting, fetchDependencies">
     <mkdir dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.typechecking.testlang/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.typechecking.testlang" />
@@ -3436,7 +3437,7 @@
       </classpath>
     </javac>
   </target>
-  
+
   <target name="java.compile.jetbrains.mps.typechecking.testlang#3575255234175341581" depends="java.compile.jetbrains.mps.typechecking.testlang, fetchDependencies">
     <mkdir dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.typechecking.testlang/generator/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.typechecking.testlang#3575255234175341581" />
@@ -3474,7 +3475,7 @@
       </classpath>
     </javac>
   </target>
-  
+
   <target name="java.compile.jetbrains.mps.typechecking.testlang.sandbox">
     <mkdir dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.typechecking.testlang.sandbox/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.typechecking.testlang.sandbox" />
@@ -3486,7 +3487,7 @@
       <classpath />
     </javac>
   </target>
-  
+
   <target name="java.compile.jetbrains.mps.typechecking.test" depends="java.compile.jetbrains.mps.coderules, java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.lang.typechecking.runtime, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking, java.compile.jetbrains.mps.typechecking.reporting, java.compile.jetbrains.mps.typechecking.testlang, java.compile.jetbrains.mps.typechecking.testlang.sandbox, fetchDependencies">
     <mkdir dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.typechecking.test/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.typechecking.test" />
@@ -3556,7 +3557,7 @@
       </classpath>
     </javac>
   </target>
-  
+
   <target name="java.compile.jetbrains.mps.lang.controlflow.runtime" depends="java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.typechecking.reporting, fetchDependencies">
     <mkdir dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.lang.controlflow.runtime/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.controlflow.runtime" />
@@ -3587,7 +3588,7 @@
       </classpath>
     </javac>
   </target>
-  
+
   <target name="java.compile.jetbrains.mps.lang.controlflow" depends="java.compile.jetbrains.mps.dataform, java.compile.jetbrains.mps.lang.coderules, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.lang.controlflow.runtime, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.typechecking.reporting, fetchDependencies">
     <mkdir dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.lang.controlflow/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.controlflow" />
@@ -3641,7 +3642,7 @@
       </classpath>
     </javac>
   </target>
-  
+
   <target name="java.compile.jetbrains.mps.lang.controlflow#01" depends="java.compile.jetbrains.mps.dataform, java.compile.jetbrains.mps.lang.coderules, java.compile.jetbrains.mps.lang.coderules#4578927328670739933, java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.lang.controlflow, java.compile.jetbrains.mps.lang.controlflow.runtime, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking.reporting, fetchDependencies">
     <mkdir dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.lang.controlflow/generator/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.controlflow#01" />
@@ -3704,7 +3705,7 @@
       </classpath>
     </javac>
   </target>
-  
+
   <target name="java.compile.jetbrains.mps.controlflow" depends="java.compile.jetbrains.mps.coderules, java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking.reporting, fetchDependencies">
     <mkdir dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.controlflow/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.controlflow" />
@@ -3755,7 +3756,7 @@
       </classpath>
     </javac>
   </target>
-  
+
   <target name="java.compile.jetbrains.mps.controlflow.ui" depends="java.compile.jetbrains.mps.coderules, java.compile.jetbrains.mps.coderules.ui, java.compile.jetbrains.mps.controlflow, java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.lang.controlflow.runtime, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking.reporting, fetchDependencies">
     <mkdir dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.controlflow.ui/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.controlflow.ui" />
@@ -3810,7 +3811,7 @@
       </classpath>
     </javac>
   </target>
-  
+
   <target name="java.compile.jetbrains.mps.lang.coderules" depends="java.compile.jetbrains.mps.coderules, java.compile.jetbrains.mps.dataform, java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.lang.smodel.types, java.compile.jetbrains.mps.lang.typechecking.runtime, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking, java.compile.jetbrains.mps.typechecking.reporting, fetchDependencies">
     <mkdir dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.lang.coderules/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.coderules" />
@@ -3887,7 +3888,7 @@
       </classpath>
     </javac>
   </target>
-  
+
   <target name="java.compile.jetbrains.mps.lang.coderules#4578927328670739933" depends="java.compile.jetbrains.mps.coderules, java.compile.jetbrains.mps.dataform, 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.smodel.types, java.compile.jetbrains.mps.lang.typechecking.runtime, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking, java.compile.jetbrains.mps.typechecking.reporting, fetchDependencies">
     <mkdir dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.lang.coderules/generator/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.coderules#4578927328670739933" />
@@ -3961,7 +3962,7 @@
       </classpath>
     </javac>
   </target>
-  
+
   <target name="java.compile.jetbrains.mps.lang.coderules.template" depends="java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking.reporting, fetchDependencies">
     <mkdir dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.lang.coderules.template/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.coderules.template" />
@@ -4000,7 +4001,7 @@
       </classpath>
     </javac>
   </target>
-  
+
   <target name="java.compile.jetbrains.mps.lang.coderules.runtime" depends="java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking.reporting, fetchDependencies">
     <mkdir dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.lang.coderules/runtime/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.coderules.runtime" />
@@ -4041,7 +4042,7 @@
       </classpath>
     </javac>
   </target>
-  
+
   <target name="java.compile.jetbrains.mps.coderules" depends="java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking.reporting, fetchDependencies">
     <mkdir dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.coderules" />
@@ -4094,7 +4095,7 @@
       </classpath>
     </javac>
   </target>
-  
+
   <target name="java.compile.jetbrains.mps.coderules.ui" depends="java.compile.jetbrains.mps.coderules, java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking.reporting, fetchDependencies">
     <mkdir dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.ui/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.coderules.ui" />
@@ -4148,7 +4149,7 @@
       </classpath>
     </javac>
   </target>
-  
+
   <target name="java.compile.jetbrains.mps.typechecking.reporting" depends="fetchDependencies">
     <mkdir dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.typechecking.reporting/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.typechecking.reporting" />
@@ -4183,7 +4184,7 @@
       </classpath>
     </javac>
   </target>
-  
+
   <target name="test.testconfig" depends="assemble">
     <path id="mps.libraries.path">
       <pathelement location="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.jar" />
@@ -4327,23 +4328,23 @@
       <jvmarg value="-Xmx1024m" />
       <jvmarg value="-XX:MaxPermSize=256m" />
       <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
-      
+
       <classpath>
         <fileset dir="${build.tmp}">
           <include name="mps.class.path.jar" />
         </fileset>
       </classpath>
-      
+
       <sysproperty key="plugin.path" value="${mps.plugins.path.string}" />
       <sysproperty key="mps.libraries" value="${mps.libraries.path.string}" />
       <sysproperty key="mps.test.modules" value="${mps.tests.path.string}" />
       <sysproperty key="mps.macro.coderules_home" value="${basedir}" />
-      
+
       <test name="jetbrains.mps.testbench.junit.suites.AntModuleTestSuite" outfile="TEST-jetbrains.mps.testbench.junit.suites.AntModuleTestSuite-testconfig" />
       <formatter type="xml" />
     </junit>
   </target>
-  
+
   <target name="cleanSources">
     <delete dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.lang.smodel.types/source_gen" />
     <delete dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.logic/source_gen" />
@@ -4379,4 +4380,4 @@
     <delete dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.test/test_gen" />
     <delete dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.typechecking.test/test_gen" />
   </target>
-</project>
\ No newline at end of file
+</project>
diff --git a/coderules/solutions/jetbrains.mps.typechecking.test/models/jetbrains.mps.scheduling@tests.mps b/coderules/solutions/jetbrains.mps.typechecking.test/models/jetbrains.mps.scheduling@tests.mps
index 84dc91f0..410cfba3 100644
--- a/coderules/solutions/jetbrains.mps.typechecking.test/models/jetbrains.mps.scheduling@tests.mps
+++ b/coderules/solutions/jetbrains.mps.typechecking.test/models/jetbrains.mps.scheduling@tests.mps
@@ -950,7 +950,7 @@
     </node>
   </node>
   <node concept="2XOHcx" id="7t5VLKGQVAO">
-    <property role="2XOHcw" value="${logic_home}" />
+    <property role="2XOHcw" value="${coderules_home}" />
   </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 a7df3717..55b174b1 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
@@ -334,7 +334,7 @@
     </language>
   </registry>
   <node concept="2XOHcx" id="7t5VLKGQVAO">
-    <property role="2XOHcw" value="${logic_home}" />
+    <property role="2XOHcw" value="${coderules_home}" />
   </node>
   <node concept="1lH9Xt" id="6QH_LDtdSk3">
     <property role="TrG5h" value="TypeCache" />
diff --git a/gradle.properties b/gradle.properties
index e6f6057a..f4134e9e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,5 @@
 
 mpsBuildConfiguration = MPS_20181_Distribution_DownloadableArtifacts
-mpsBuildLabel = 2018.1
-mpsBuildNumber = 181.1168
+mpsBuildLabel = 2018.1.5
+mpsBuildNumber = 181.1469
 mpsRelease = 2018.1
diff --git a/samples/mpscore/.mps/libraries.xml b/samples/mpscore/.mps/libraries.xml
index 4f7e4c25..f8cd8b60 100644
--- a/samples/mpscore/.mps/libraries.xml
+++ b/samples/mpscore/.mps/libraries.xml
@@ -7,7 +7,7 @@
           <value>
             <Library>
               <option name="name" value="coderules" />
-              <option name="path" value="${logic_home}/build/artifacts/typechecking-plugin/deploy" />
+              <option name="path" value="$PROJECT_DIR$/../../build/artifacts/typechecking-plugin/deploy" />
             </Library>
           </value>
         </entry>
diff --git a/samples/mpscore/.mps/modules.xml b/samples/mpscore/.mps/modules.xml
index cdb77404..e169e4c2 100644
--- a/samples/mpscore/.mps/modules.xml
+++ b/samples/mpscore/.mps/modules.xml
@@ -4,6 +4,7 @@
     <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.coderules.samples.mpscore.build/jetbrains.mps.coderules.samples.mpscore.build.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>
diff --git a/samples/mpscore/build.gradle b/samples/mpscore/build.gradle
new file mode 100644
index 00000000..e91f15e7
--- /dev/null
+++ b/samples/mpscore/build.gradle
@@ -0,0 +1,17 @@
+configurations {
+    junitAnt
+}
+
+dependencies {
+  // initialize JUnit optional ant task
+  junitAnt 'junit:junit:4.8.2'
+  junitAnt('org.apache.ant:ant-junit:1.9.2') {
+      transitive = false
+  }
+}
+
+ant.taskdef(name: 'junit',
+            classname: 'org.apache.tools.ant.taskdefs.optional.junit.JUnitTask',
+            classpath: configurations.junitAnt.asPath)
+
+ant.importBuild('build.xml')
diff --git a/samples/mpscore/build.xml b/samples/mpscore/build.xml
new file mode 100644
index 00000000..7487d7f8
--- /dev/null
+++ b/samples/mpscore/build.xml
@@ -0,0 +1,707 @@
+<project name="mpscore" default="build">
+  <!-- Generated by MPS -->
+  <property name="build.dir" location="build" />
+  <property name="build.tmp" location="${build.dir}/tmp/mpscore" />
+  <property name="build.layout" location="${build.dir}/artifacts/mpscore" />
+  <property name="mps_home" location="${basedir}/../../MPS_HOME" />
+  <property name="mps.macro.mpscore_home" location="${basedir}" />
+  <property name="mps.macro.logic_home" location="${basedir}" />
+  <property name="coderules_plugin" location="${basedir}/../../build/artifacts/typechecking-plugin" />
+  <property name="artifacts.mps" location="${mps_home}" />
+  <property name="artifacts.typechecking-plugin" location="${coderules_plugin}" />
+  <property file="${artifacts.mps}/build.properties" prefix="import.mps" />
+  <property file="${artifacts.typechecking-plugin}/build.properties" prefix="import.typechecking-plugin" />
+  <property name="mps.build.number" value="${import.mps.mps.build.number}" />
+  <property name="mps.date" value="${import.mps.mps.date}" />
+  <property name="mps.build.vcs.number" value="${import.mps.mps.build.vcs.number}" />
+  <property name="mps.teamcity.buildConfName" value="${import.mps.mps.teamcity.buildConfName}" />
+  <property name="mps.idea.platform.build.number" value="${import.mps.mps.idea.platform.build.number}" />
+  <property name="mps.mps.build.counter" value="${import.mps.mps.mps.build.counter}" />
+  <property name="mpsBootstrapCore.version" value="${import.mps.mpsBootstrapCore.version}" />
+  <property name="typechecking-plugin.ci.build.num" value="${import.typechecking-plugin.typechecking-plugin.ci.build.num}" />
+  <property name="environment" value="env" />
+  <property name="env.JAVA_HOME" value="${java.home}/.." />
+  <property name="jdk.home" value="${env.JAVA_HOME}" />
+
+  <path id="path.mps.ant.path">
+    <pathelement location="${artifacts.mps}/lib/ant/lib/ant-mps.jar" />
+    <pathelement location="${artifacts.mps}/lib/jdom.jar" />
+    <pathelement location="${artifacts.mps}/lib/log4j.jar" />
+  </path>
+
+  <target name="assemble" depends="classes, declare-mps-tasks">
+    <mkdir dir="${build.layout}/deploy" />
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.baseLanguageExt.jar" />
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.baseLanguageExt.jar/META-INF" />
+    <echoxml file="${build.tmp}/default/jetbrains.mps.baseLanguageExt.jar/META-INF/module.xml">
+      <module namespace="jetbrains.mps.baseLanguageExt" type="language" uuid="0fda14cc-a416-4c81-869a-2175d8b3325d">
+        <dependencies>
+          <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" />
+          <module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" />
+          <module ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)" />
+          <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" />
+          <module ref="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" />
+          <module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" />
+          <module ref="a3e4657f-a76c-45bb-bbda-c764596ecc65(jetbrains.mps.baseLanguage.logging.runtime)" />
+          <module ref="d44dab97-aaac-44cb-9745-8a14db674c03(jetbrains.mps.baseLanguage.tuples.runtime)" />
+          <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" />
+          <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" />
+          <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" />
+          <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" />
+          <module ref="ffcd9ef5-e931-4da9-a8d1-eb9bf80d19b4(jetbrains.mps.lang.controlflow.runtime)" />
+          <module ref="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" />
+          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" />
+          <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
+          <module ref="da80355b-a098-4248-9ec8-70d10dd7e9af(jetbrains.mps.typechecking.reporting)" />
+        </dependencies>
+        <classpath>
+          <entry path="." />
+        </classpath>
+        <sources jar="jetbrains.mps.baseLanguageExt-src.jar" descriptor="jetbrains.mps.baseLanguageExt.mpl" />
+      </module>
+    </echoxml>
+    <jar destfile="${build.layout}/deploy/jetbrains.mps.baseLanguageExt.jar" duplicate="preserve">
+      <fileset dir="${build.tmp}/java/out/jetbrains.mps.baseLanguageExt" />
+      <fileset dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.baseLanguageExt/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
+      <fileset dir="${build.tmp}/default/jetbrains.mps.baseLanguageExt.jar" />
+    </jar>
+    <copyModels todir="${build.tmp}/customProcessors/copyModels/languages-jetbrains.mps.baseLanguageExt-models">
+      <fileset dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.baseLanguageExt/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
+    </copyModels>
+    <jar destfile="${build.layout}/deploy/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" />
+        <exclude name="**/checkpoints" />
+        <exclude name="**/*.mps" />
+      </fileset>
+      <zipfileset file="${basedir}/languages/jetbrains.mps.baseLanguageExt/jetbrains.mps.baseLanguageExt.mpl" prefix="module" />
+      <zipfileset dir="${build.tmp}/customProcessors/copyModels/languages-jetbrains.mps.baseLanguageExt-models" prefix="module/models" />
+    </jar>
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.baseLanguageExt.test.jar" />
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.baseLanguageExt.test.jar/META-INF" />
+    <echoxml file="${build.tmp}/default/jetbrains.mps.baseLanguageExt.test.jar/META-INF/module.xml">
+      <module namespace="jetbrains.mps.baseLanguageExt.test" type="solution" uuid="e44e7802-2e40-482b-9b1c-6d42660a6a11">
+        <dependencies>
+          <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" />
+          <module ref="49808fad-9d41-4b96-83fa-9231640f6b2b(JUnit)" />
+          <module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" />
+          <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" />
+          <module ref="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" />
+          <module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" />
+          <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" />
+          <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" />
+          <module ref="e55e6749-03cb-4ea7-9695-2322bab791c1(jetbrains.mps.lang.test.matcher)" />
+          <module ref="707c4fde-f79a-44b5-b3d7-b5cef8844ccf(jetbrains.mps.lang.test.runtime)" />
+          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" />
+          <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
+        </dependencies>
+        <classpath>
+          <entry path="." />
+        </classpath>
+        <sources jar="jetbrains.mps.baseLanguageExt.test-src.jar" descriptor="jetbrains.mps.baseLanguageExt.test.msd" />
+      </module>
+    </echoxml>
+    <jar destfile="${build.layout}/deploy/jetbrains.mps.baseLanguageExt.test.jar" duplicate="preserve">
+      <fileset dir="${build.tmp}/java/out/jetbrains.mps.baseLanguageExt.test" />
+      <fileset dir="${mps.macro.mpscore_home}/solutions/jetbrains.mps.baseLanguageExt.test/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
+      <fileset dir="${build.tmp}/default/jetbrains.mps.baseLanguageExt.test.jar" />
+    </jar>
+    <copyModels todir="${build.tmp}/customProcessors/copyModels/solutions-jetbrains.mps.baseLanguageExt.test-models">
+      <fileset dir="${mps.macro.mpscore_home}/solutions/jetbrains.mps.baseLanguageExt.test/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
+    </copyModels>
+    <jar destfile="${build.layout}/deploy/jetbrains.mps.baseLanguageExt.test-src.jar" duplicate="preserve">
+      <fileset dir="${mps.macro.mpscore_home}/solutions/jetbrains.mps.baseLanguageExt.test/source_gen">
+        <exclude name="**/trace.info" />
+        <exclude name="**/exports" />
+        <exclude name="**/checkpoints" />
+        <exclude name="**/*.mps" />
+      </fileset>
+      <zipfileset file="${basedir}/solutions/jetbrains.mps.baseLanguageExt.test/jetbrains.mps.baseLanguageExt.test.msd" prefix="module" />
+      <zipfileset dir="${build.tmp}/customProcessors/copyModels/solutions-jetbrains.mps.baseLanguageExt.test-models" prefix="module/models" />
+    </jar>
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.typechecking.sample.jar" />
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.typechecking.sample.jar/META-INF" />
+    <echoxml file="${build.tmp}/default/jetbrains.mps.typechecking.sample.jar/META-INF/module.xml">
+      <module namespace="jetbrains.mps.typechecking.sample" type="solution" uuid="3ddddf69-9ff0-426b-9365-51ae7356fb82">
+        <dependencies />
+        <classpath>
+          <entry path="." />
+        </classpath>
+        <sources jar="jetbrains.mps.typechecking.sample-src.jar" descriptor="jetbrains.mps.typechecking.sample.msd" />
+      </module>
+    </echoxml>
+    <jar destfile="${build.layout}/deploy/jetbrains.mps.typechecking.sample.jar" duplicate="preserve">
+      <fileset dir="${build.tmp}/java/out/jetbrains.mps.typechecking.sample" />
+      <fileset dir="${mps.macro.mpscore_home}/solutions/jetbrains.mps.typechecking.sample/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
+      <fileset dir="${build.tmp}/default/jetbrains.mps.typechecking.sample.jar" />
+    </jar>
+    <copyModels todir="${build.tmp}/customProcessors/copyModels/solutions-jetbrains.mps.typechecking.sample-models">
+      <fileset dir="${mps.macro.mpscore_home}/solutions/jetbrains.mps.typechecking.sample/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
+    </copyModels>
+    <jar destfile="${build.layout}/deploy/jetbrains.mps.typechecking.sample-src.jar" duplicate="preserve">
+      <fileset dir="${mps.macro.mpscore_home}/solutions/jetbrains.mps.typechecking.sample/source_gen">
+        <exclude name="**/trace.info" />
+        <exclude name="**/exports" />
+        <exclude name="**/checkpoints" />
+        <exclude name="**/*.mps" />
+      </fileset>
+      <zipfileset file="${basedir}/solutions/jetbrains.mps.typechecking.sample/jetbrains.mps.typechecking.sample.msd" prefix="module" />
+      <zipfileset dir="${build.tmp}/customProcessors/copyModels/solutions-jetbrains.mps.typechecking.sample-models" prefix="module/models" />
+    </jar>
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.typechecking.sample.test.jar" />
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.typechecking.sample.test.jar/META-INF" />
+    <echoxml file="${build.tmp}/default/jetbrains.mps.typechecking.sample.test.jar/META-INF/module.xml">
+      <module namespace="jetbrains.mps.typechecking.sample.test" type="solution" uuid="1b65dfe8-24ff-41c3-9a3e-70f102942455">
+        <dependencies>
+          <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" />
+          <module ref="49808fad-9d41-4b96-83fa-9231640f6b2b(JUnit)" />
+          <module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" />
+          <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" />
+          <module ref="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" />
+          <module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" />
+          <module ref="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" />
+          <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" />
+          <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" />
+          <module ref="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" />
+          <module ref="e55e6749-03cb-4ea7-9695-2322bab791c1(jetbrains.mps.lang.test.matcher)" />
+          <module ref="707c4fde-f79a-44b5-b3d7-b5cef8844ccf(jetbrains.mps.lang.test.runtime)" />
+          <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
+        </dependencies>
+        <classpath>
+          <entry path="." />
+        </classpath>
+        <sources jar="jetbrains.mps.typechecking.sample.test-src.jar" descriptor="jetbrains.mps.typechecking.sample.test.msd" />
+      </module>
+    </echoxml>
+    <jar destfile="${build.layout}/deploy/jetbrains.mps.typechecking.sample.test.jar" duplicate="preserve">
+      <fileset dir="${build.tmp}/java/out/jetbrains.mps.typechecking.sample.test" />
+      <fileset dir="${mps.macro.mpscore_home}/solutions/jetbrains.mps.typechecking.sample.test/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
+      <fileset dir="${build.tmp}/default/jetbrains.mps.typechecking.sample.test.jar" />
+    </jar>
+    <copyModels todir="${build.tmp}/customProcessors/copyModels/solutions-jetbrains.mps.typechecking.sample.test-models">
+      <fileset dir="${mps.macro.mpscore_home}/solutions/jetbrains.mps.typechecking.sample.test/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
+    </copyModels>
+    <jar destfile="${build.layout}/deploy/jetbrains.mps.typechecking.sample.test-src.jar" duplicate="preserve">
+      <fileset dir="${mps.macro.mpscore_home}/solutions/jetbrains.mps.typechecking.sample.test/source_gen">
+        <exclude name="**/trace.info" />
+        <exclude name="**/exports" />
+        <exclude name="**/checkpoints" />
+        <exclude name="**/*.mps" />
+      </fileset>
+      <zipfileset file="${basedir}/solutions/jetbrains.mps.typechecking.sample.test/jetbrains.mps.typechecking.sample.test.msd" prefix="module" />
+      <zipfileset dir="${build.tmp}/customProcessors/copyModels/solutions-jetbrains.mps.typechecking.sample.test-models" prefix="module/models" />
+    </jar>
+    <echo file="${build.layout}/build.properties">mps.build.number=${mps.build.number}${line.separator}mps.date=${mps.date}${line.separator}mps.build.vcs.number=${mps.build.vcs.number}${line.separator}mps.teamcity.buildConfName=${mps.teamcity.buildConfName}${line.separator}mps.idea.platform.build.number=${mps.idea.platform.build.number}${line.separator}mps.mps.build.counter=${mps.mps.build.counter}${line.separator}mpsBootstrapCore.version=${mpsBootstrapCore.version}${line.separator}typechecking-plugin.ci.build.num=${typechecking-plugin.ci.build.num}</echo>
+  </target>
+
+  <target name="buildDependents" />
+
+  <target name="fetchDependencies" />
+
+  <target name="build" depends="assemble" />
+
+  <target name="clean">
+    <delete dir="${build.tmp}" />
+    <delete dir="${build.layout}" />
+  </target>
+
+  <target name="compileJava" depends="java.compile.jetbrains.mps.baseLanguageExt, java.compile.jetbrains.mps.baseLanguageExt.test, java.compile.jetbrains.mps.typechecking.sample, java.compile.jetbrains.mps.typechecking.sample.test" />
+
+  <target name="processResources" />
+
+  <target name="classes" depends="compileJava, processResources" />
+
+  <target name="test" depends="classes, module-tests" />
+
+  <target name="check" depends="test" />
+
+  <target name="generate" depends="declare-mps-tasks, fetchDependencies">
+    <echo message="generating" />
+    <generate strictMode="true" parallelMode="true" parallelThreads="8" useInplaceTransform="false" hideWarnings="false" createStaticRefs="true" fork="true">
+      <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.jar" />
+      <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.checkedDots.jar" />
+      <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.classifiers.jar" />
+      <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
+      <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.jar" />
+      <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.extensionMethods.jar" />
+      <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
+      <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.javadoc.jar" />
+      <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jdk7.jar" />
+      <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.jar" />
+      <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
+      <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.regexp.jar" />
+      <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.regexp.runtime.jar" />
+      <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
+      <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.tuples.jar" />
+      <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguageInternal.jar" />
+      <library file="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.aspect.constraints.jar" />
+      <library file="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.aspect.structure.jar" />
+      <library file="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.aspect.typesystem.jar" />
+      <library file="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.general-purpose.jar" />
+      <library file="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.language-descriptor.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.baseLanguage.lightweightdsl.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.access.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.actions.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.aspect.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.behavior.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.checkedName.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.constraints.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.dataFlow.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.aspects.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.editor.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.findUsages.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.generator.generationContext.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.generator.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.intentions.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.migration.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.migration.runtime.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.modelapi.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.pattern.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.plugin.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.project.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.quotation.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.refactoring.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.resources.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.script.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.sharedConcepts.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.textGen.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.typesystem.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.util.order.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.refactoring.participant.jar" />
+      <library file="${artifacts.mps}/languages/make/jetbrains.mps.make.reduced.jar" />
+      <library file="${artifacts.mps}/languages/make/jetbrains.mps.tool.gentest.jar" />
+      <library file="${artifacts.mps}/languages/text/jetbrains.mps.lang.text.jar" />
+      <library file="${artifacts.mps}/languages/xml/jetbrains.mps.core.xml.jar" />
+      <library file="${artifacts.mps}/lib/mps-behavior-api.jar" />
+      <library file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
+      <library file="${artifacts.mps}/lib/mps-closures.jar" />
+      <library file="${artifacts.mps}/lib/mps-collections.jar" />
+      <library file="${artifacts.mps}/lib/mps-core.jar" />
+      <library file="${artifacts.mps}/lib/mps-editor.jar" />
+      <library file="${artifacts.mps}/lib/mps-environment.jar" />
+      <library file="${artifacts.mps}/lib/mps-openapi.jar" />
+      <library file="${artifacts.mps}/lib/mps-platform.jar" />
+      <library file="${artifacts.mps}/lib/mps-stubs.jar" />
+      <library file="${artifacts.mps}/lib/mps-test.jar" />
+      <library file="${artifacts.mps}/lib/mps-tool.jar" />
+      <library file="${artifacts.mps}/lib/mps-tuples.jar" />
+      <library file="${artifacts.mps}/plugins/mps-testing/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.jar" />
+      <library file="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.jar" />
+      <library file="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.matcher.jar" />
+      <library file="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.runtime.jar" />
+      <library file="${artifacts.mps}/plugins/mps-testing/lib/jetbrains.mps.lang.test.util.jar" />
+      <library file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.coderules.jar" />
+      <library file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.controlflow.jar" />
+      <library file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.dataform.jar" />
+      <library file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.lang.coderules.jar" />
+      <library file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.lang.coderules.runtime.jar" />
+      <library file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.lang.coderules.template.jar" />
+      <library file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.lang.controlflow.jar" />
+      <library file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.lang.controlflow.runtime.jar" />
+      <library file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.lang.smodel.types.jar" />
+      <library file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.lang.typechecking.jar" />
+      <library file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.lang.typechecking.runtime.jar" />
+      <library file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.logic.jar" />
+      <library file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.logic.reactor.jar" />
+      <library file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.logic.runtime.jar" />
+      <library file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.logic.test.jar" />
+      <library file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.typechecking.jar" />
+      <library file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.typechecking.reporting.jar" />
+      <chunk>
+        <module file="${basedir}/languages/jetbrains.mps.baseLanguageExt/jetbrains.mps.baseLanguageExt.mpl" />
+        <module file="${basedir}/solutions/jetbrains.mps.baseLanguageExt.test/jetbrains.mps.baseLanguageExt.test.msd" />
+        <module file="${basedir}/solutions/jetbrains.mps.typechecking.sample/jetbrains.mps.typechecking.sample.msd" />
+      </chunk>
+      <chunk>
+        <module file="${basedir}/solutions/jetbrains.mps.typechecking.sample.test/jetbrains.mps.typechecking.sample.test.msd" />
+      </chunk>
+      <jvmargs>
+        <arg value="-Xmx512m" />
+      </jvmargs>
+      <macro name="mps_home" path="${mps_home}" />
+      <macro name="mps.macro.mpscore_home" path="${mps.macro.mpscore_home}" />
+      <macro name="coderules_plugin" path="${coderules_plugin}" />
+    </generate>
+  </target>
+
+  <target name="declare-mps-tasks">
+    <taskdef resource="jetbrains/mps/build/ant/antlib.xml" classpathref="path.mps.ant.path" />
+  </target>
+
+  <target name="makeDependents" />
+
+  <target name="module-tests" depends="assemble, test.testconfig" />
+
+  <target name="java.compile.jetbrains.mps.baseLanguageExt" depends="fetchDependencies">
+    <mkdir dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.baseLanguageExt/source_gen" />
+    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.baseLanguageExt" />
+    <javac destdir="${build.tmp}/java/out/jetbrains.mps.baseLanguageExt" fork="true" encoding="utf8" includeantruntime="false" debug="true">
+      <compilerarg value="-Xlint:none" />
+      <src>
+        <path location="${mps.macro.mpscore_home}/languages/jetbrains.mps.baseLanguageExt/source_gen" />
+      </src>
+      <classpath>
+        <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-closures.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-collections.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-core.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-logging.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
+        <fileset file="${artifacts.mps}/lib/annotations.jar" />
+        <fileset file="${artifacts.mps}/lib/log4j.jar" />
+        <fileset file="${artifacts.mps}/lib/jdom.jar" />
+        <fileset file="${artifacts.mps}/lib/trove4j.jar" />
+        <fileset file="${artifacts.mps}/lib/ecj-4.7.2.jar" />
+        <fileset dir="${artifacts.mps}/lib" includes="*.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
+        <fileset file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.coderules.jar" />
+        <fileset file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.controlflow.jar" />
+        <fileset file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.lang.coderules.runtime.jar" />
+        <fileset file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.lang.coderules.template.jar" />
+        <fileset file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.lang.controlflow.runtime.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.aspects.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
+        <fileset file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.lang.typechecking.runtime.jar" />
+        <fileset file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.logic.runtime.jar" />
+        <fileset file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.typechecking.jar" />
+        <fileset file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.typechecking.reporting.jar" />
+        <fileset dir="${artifacts.typechecking-plugin}/deploy/lib" includes="reactive-streams-1.0.0.final.jar" />
+        <fileset dir="${artifacts.typechecking-plugin}/deploy/lib" includes="rxjava-2.1.1.jar" />
+        <fileset dir="${artifacts.typechecking-plugin}/deploy/lib" includes="rxjava2-swing-0.2.1.jar" />
+        <fileset dir="${artifacts.typechecking-plugin}/deploy/lib" includes="collection-0.7.jar" />
+        <fileset dir="${artifacts.typechecking-plugin}/deploy/lib" includes="conreactor-api-0.9.jar" />
+        <fileset dir="${artifacts.typechecking-plugin}/deploy/lib" includes="conreactor-core-0.9.jar" />
+        <fileset dir="${artifacts.typechecking-plugin}/deploy/lib" includes="trove4j-3.0.3.jar" />
+        <fileset dir="${artifacts.typechecking-plugin}/deploy/lib" includes="kotlin-runtime-1.2.30.jar" />
+        <fileset dir="${artifacts.typechecking-plugin}/deploy/lib" includes="kotlin-stdlib-1.2.30.jar" />
+      </classpath>
+    </javac>
+  </target>
+
+  <target name="java.compile.jetbrains.mps.baseLanguageExt.test" depends="java.compile.jetbrains.mps.baseLanguageExt, fetchDependencies">
+    <mkdir dir="${mps.macro.mpscore_home}/solutions/jetbrains.mps.baseLanguageExt.test/source_gen" />
+    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.baseLanguageExt.test" />
+    <javac destdir="${build.tmp}/java/out/jetbrains.mps.baseLanguageExt.test" fork="true" encoding="utf8" includeantruntime="false" debug="true">
+      <compilerarg value="-Xlint:none" />
+      <src>
+        <path location="${mps.macro.mpscore_home}/solutions/jetbrains.mps.baseLanguageExt.test/source_gen" />
+        <pathelement path="${mps.macro.mpscore_home}/solutions/jetbrains.mps.baseLanguageExt.test/test_gen/" />
+      </src>
+      <classpath>
+        <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-closures.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-collections.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-core.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-logging.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.baseLanguageExt" />
+        <fileset file="${artifacts.mps}/lib/mps-test.jar" />
+        <fileset file="${artifacts.mps}/plugins/mps-testing/lib/jetbrains.mps.lang.test.util.jar" />
+        <fileset file="${artifacts.mps}/lib/ant/lib/ant.jar" />
+        <fileset file="${artifacts.mps}/lib/junit-4.12.jar" />
+        <fileset file="${artifacts.mps}/lib/annotations.jar" />
+        <fileset file="${artifacts.mps}/lib/log4j.jar" />
+        <fileset file="${artifacts.mps}/lib/jdom.jar" />
+        <fileset file="${artifacts.mps}/lib/trove4j.jar" />
+        <fileset file="${artifacts.mps}/lib/ecj-4.7.2.jar" />
+        <fileset dir="${artifacts.mps}/lib" includes="*.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.classifiers.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
+        <fileset file="${artifacts.mps}/plugins/mps-testing/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguageInternal.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
+        <fileset file="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.jar" />
+        <fileset file="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.matcher.jar" />
+        <fileset file="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.runtime.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
+        <fileset file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.logic.runtime.jar" />
+        <fileset file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.logic.test.jar" />
+        <fileset dir="${artifacts.typechecking-plugin}/deploy/lib" includes="collection-0.7.jar" />
+        <fileset dir="${artifacts.typechecking-plugin}/deploy/lib" includes="conreactor-api-0.9.jar" />
+        <fileset dir="${artifacts.typechecking-plugin}/deploy/lib" includes="conreactor-core-0.9.jar" />
+        <fileset dir="${artifacts.typechecking-plugin}/deploy/lib" includes="trove4j-3.0.3.jar" />
+        <fileset dir="${artifacts.typechecking-plugin}/deploy/lib" includes="kotlin-runtime-1.2.30.jar" />
+        <fileset dir="${artifacts.typechecking-plugin}/deploy/lib" includes="kotlin-stdlib-1.2.30.jar" />
+        <fileset dir="${artifacts.typechecking-plugin}/deploy/lib" includes="mockito-core-2.0.3-beta.jar" />
+        <fileset dir="${artifacts.typechecking-plugin}/deploy/lib" includes="objenesis-2.1.jar" />
+      </classpath>
+    </javac>
+  </target>
+
+  <target name="java.compile.jetbrains.mps.typechecking.sample">
+    <mkdir dir="${mps.macro.mpscore_home}/solutions/jetbrains.mps.typechecking.sample/source_gen" />
+    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.typechecking.sample" />
+    <javac destdir="${build.tmp}/java/out/jetbrains.mps.typechecking.sample" fork="true" encoding="utf8" includeantruntime="false" debug="true">
+      <compilerarg value="-Xlint:none" />
+      <src>
+        <path location="${mps.macro.mpscore_home}/solutions/jetbrains.mps.typechecking.sample/source_gen" />
+      </src>
+      <classpath />
+    </javac>
+  </target>
+
+  <target name="java.compile.jetbrains.mps.typechecking.sample.test" depends="java.compile.jetbrains.mps.typechecking.sample, fetchDependencies">
+    <mkdir dir="${mps.macro.mpscore_home}/solutions/jetbrains.mps.typechecking.sample.test/source_gen" />
+    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.typechecking.sample.test" />
+    <javac destdir="${build.tmp}/java/out/jetbrains.mps.typechecking.sample.test" fork="true" encoding="utf8" includeantruntime="false" debug="true">
+      <compilerarg value="-Xlint:none" />
+      <src>
+        <path location="${mps.macro.mpscore_home}/solutions/jetbrains.mps.typechecking.sample.test/source_gen" />
+        <pathelement path="${mps.macro.mpscore_home}/solutions/jetbrains.mps.typechecking.sample.test/test_gen/" />
+      </src>
+      <classpath>
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking.sample" />
+        <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-closures.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-collections.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-core.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-logging.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-test.jar" />
+        <fileset file="${artifacts.mps}/plugins/mps-testing/lib/jetbrains.mps.lang.test.util.jar" />
+        <fileset file="${artifacts.mps}/lib/ant/lib/ant.jar" />
+        <fileset file="${artifacts.mps}/lib/junit-4.12.jar" />
+        <fileset file="${artifacts.mps}/lib/annotations.jar" />
+        <fileset file="${artifacts.mps}/lib/log4j.jar" />
+        <fileset file="${artifacts.mps}/lib/jdom.jar" />
+        <fileset file="${artifacts.mps}/lib/trove4j.jar" />
+        <fileset file="${artifacts.mps}/lib/ecj-4.7.2.jar" />
+        <fileset dir="${artifacts.mps}/lib" includes="*.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.classifiers.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
+        <fileset file="${artifacts.mps}/plugins/mps-testing/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.jar" />
+        <fileset file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.coderules.jar" />
+        <fileset file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.lang.coderules.runtime.jar" />
+        <fileset file="${artifacts.typechecking-plugin}/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.scopes.runtime.jar" />
+        <fileset file="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.jar" />
+        <fileset file="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.matcher.jar" />
+        <fileset file="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.runtime.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
+        <fileset file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.lang.typechecking.runtime.jar" />
+        <fileset file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.logic.runtime.jar" />
+        <fileset file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.typechecking.jar" />
+        <fileset file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.typechecking.reporting.jar" />
+        <fileset dir="${artifacts.typechecking-plugin}/deploy/lib" includes="reactive-streams-1.0.0.final.jar" />
+        <fileset dir="${artifacts.typechecking-plugin}/deploy/lib" includes="rxjava-2.1.1.jar" />
+        <fileset dir="${artifacts.typechecking-plugin}/deploy/lib" includes="rxjava2-swing-0.2.1.jar" />
+        <fileset dir="${artifacts.typechecking-plugin}/deploy/lib" includes="collection-0.7.jar" />
+        <fileset dir="${artifacts.typechecking-plugin}/deploy/lib" includes="conreactor-api-0.9.jar" />
+        <fileset dir="${artifacts.typechecking-plugin}/deploy/lib" includes="conreactor-core-0.9.jar" />
+        <fileset dir="${artifacts.typechecking-plugin}/deploy/lib" includes="trove4j-3.0.3.jar" />
+        <fileset dir="${artifacts.typechecking-plugin}/deploy/lib" includes="kotlin-runtime-1.2.30.jar" />
+        <fileset dir="${artifacts.typechecking-plugin}/deploy/lib" includes="kotlin-stdlib-1.2.30.jar" />
+      </classpath>
+    </javac>
+  </target>
+
+  <target name="test.testconfig" depends="assemble">
+    <path id="mps.libraries.path">
+      <pathelement location="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.jar" />
+      <pathelement location="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.checkedDots.jar" />
+      <pathelement location="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.classifiers.jar" />
+      <pathelement location="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
+      <pathelement location="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.jar" />
+      <pathelement location="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
+      <pathelement location="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.javadoc.jar" />
+      <pathelement location="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jdk7.jar" />
+      <pathelement location="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.jar" />
+      <pathelement location="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
+      <pathelement location="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.regexp.jar" />
+      <pathelement location="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.regexp.runtime.jar" />
+      <pathelement location="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
+      <pathelement location="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.tuples.jar" />
+      <pathelement location="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguageInternal.jar" />
+      <pathelement location="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.aspect.constraints.jar" />
+      <pathelement location="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.aspect.structure.jar" />
+      <pathelement location="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.aspect.typesystem.jar" />
+      <pathelement location="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.general-purpose.jar" />
+      <pathelement location="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.language-descriptor.jar" />
+      <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.baseLanguage.lightweightdsl.jar" />
+      <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.access.jar" />
+      <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.actions.jar" />
+      <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.behavior.jar" />
+      <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.checkedName.jar" />
+      <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.constraints.jar" />
+      <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
+      <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.dataFlow.jar" />
+      <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.aspects.jar" />
+      <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.jar" />
+      <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.editor.jar" />
+      <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.findUsages.jar" />
+      <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.generator.generationContext.jar" />
+      <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.generator.jar" />
+      <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.intentions.jar" />
+      <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.migration.jar" />
+      <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.migration.runtime.jar" />
+      <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.modelapi.jar" />
+      <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.pattern.jar" />
+      <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.plugin.jar" />
+      <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.project.jar" />
+      <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.quotation.jar" />
+      <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.refactoring.jar" />
+      <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.resources.jar" />
+      <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
+      <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.script.jar" />
+      <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.sharedConcepts.jar" />
+      <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
+      <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
+      <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.textGen.jar" />
+      <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
+      <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.typesystem.jar" />
+      <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.refactoring.participant.jar" />
+      <pathelement location="${artifacts.mps}/languages/make/jetbrains.mps.make.reduced.jar" />
+      <pathelement location="${artifacts.mps}/languages/make/jetbrains.mps.tool.gentest.jar" />
+      <pathelement location="${artifacts.mps}/languages/text/jetbrains.mps.lang.text.jar" />
+      <pathelement location="${artifacts.mps}/lib/mps-behavior-api.jar" />
+      <pathelement location="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
+      <pathelement location="${artifacts.mps}/lib/mps-closures.jar" />
+      <pathelement location="${artifacts.mps}/lib/mps-collections.jar" />
+      <pathelement location="${artifacts.mps}/lib/mps-core.jar" />
+      <pathelement location="${artifacts.mps}/lib/mps-editor.jar" />
+      <pathelement location="${artifacts.mps}/lib/mps-environment.jar" />
+      <pathelement location="${artifacts.mps}/lib/mps-openapi.jar" />
+      <pathelement location="${artifacts.mps}/lib/mps-platform.jar" />
+      <pathelement location="${artifacts.mps}/lib/mps-stubs.jar" />
+      <pathelement location="${artifacts.mps}/lib/mps-test.jar" />
+      <pathelement location="${artifacts.mps}/lib/mps-tool.jar" />
+      <pathelement location="${artifacts.mps}/lib/mps-tuples.jar" />
+      <pathelement location="${artifacts.mps}/plugins/mps-testing/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.jar" />
+      <pathelement location="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.jar" />
+      <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="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.coderules.jar" />
+      <pathelement location="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.controlflow.jar" />
+      <pathelement location="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.dataform.jar" />
+      <pathelement location="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.lang.coderules.jar" />
+      <pathelement location="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.lang.coderules.runtime.jar" />
+      <pathelement location="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.lang.coderules.template.jar" />
+      <pathelement location="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.lang.controlflow.jar" />
+      <pathelement location="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.lang.controlflow.runtime.jar" />
+      <pathelement location="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.lang.smodel.types.jar" />
+      <pathelement location="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.lang.typechecking.jar" />
+      <pathelement location="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.lang.typechecking.runtime.jar" />
+      <pathelement location="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.logic.jar" />
+      <pathelement location="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.logic.reactor.jar" />
+      <pathelement location="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.logic.runtime.jar" />
+      <pathelement location="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.logic.test.jar" />
+      <pathelement location="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.typechecking.jar" />
+      <pathelement location="${artifacts.typechecking-plugin}/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">
+      <pathelement location="${artifacts.mps}/plugins/mps-core/META-INF/plugin.xml/../.." />
+      <pathelement location="${artifacts.mps}/plugins/mps-testing" />
+    </path>
+    <pathconvert pathsep="${path.separator}" property="mps.plugins.path.string" refid="mps.plugins.path" />
+    <path id="mps.tests.path">
+      <pathelement location="${build.layout}/deploy/jetbrains.mps.baseLanguageExt.jar" />
+      <pathelement location="${build.layout}/deploy/jetbrains.mps.baseLanguageExt.test.jar" />
+      <pathelement location="${build.layout}/deploy/jetbrains.mps.typechecking.sample.jar" />
+      <pathelement location="${build.layout}/deploy/jetbrains.mps.typechecking.sample.test.jar" />
+    </path>
+    <pathconvert pathsep="${path.separator}" property="mps.tests.path.string" refid="mps.tests.path" />
+    <path id="long.class.path">
+      <fileset dir="${artifacts.mps}/plugins/mps-core/META-INF/plugin.xml/../..">
+        <include name="lib/**/*.jar" />
+        <include name="languages/**/*.jar" />
+      </fileset>
+      <fileset dir="${artifacts.mps}/plugins/mps-testing">
+        <include name="lib/**/*.jar" />
+        <include name="languages/**/*.jar" />
+      </fileset>
+      <fileset dir="${artifacts.mps}/lib">
+        <include name="**/*.jar" />
+      </fileset>
+      <pathelement path="${jdk.home}/lib/tools.jar" />
+    </path>
+    <pathconvert pathsep=" " targetos="unix" property="manifest.classpath">
+      <path refid="long.class.path" />
+      <chainedmapper>
+        <filtermapper>
+          <replacestring from=" " to="%20" />
+        </filtermapper>
+        <globmapper from="*" to="file:///*" />
+      </chainedmapper>
+    </pathconvert>
+    <jar jarfile="${build.tmp}/mps.class.path.jar">
+      <manifest>
+        <attribute name="Class-Path" value="${manifest.classpath}" />
+      </manifest>
+    </jar>
+    <junit showoutput="true" fork="true" haltonfailure="false" dir="${basedir}">
+      <jvmarg value="-ea" />
+      <jvmarg value="-Xss2048k" />
+      <jvmarg value="-Xmx1024m" />
+      <jvmarg value="-XX:MaxPermSize=256m" />
+      <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
+
+      <classpath>
+        <fileset dir="${build.tmp}">
+          <include name="mps.class.path.jar" />
+        </fileset>
+      </classpath>
+
+      <sysproperty key="plugin.path" value="${mps.plugins.path.string}" />
+      <sysproperty key="mps.libraries" value="${mps.libraries.path.string}" />
+      <sysproperty key="mps.test.modules" value="${mps.tests.path.string}" />
+      <sysproperty key="mps.macro.mpscore_home" value="${basedir}" />
+
+      <test name="jetbrains.mps.testbench.junit.suites.AntModuleTestSuite" outfile="TEST-jetbrains.mps.testbench.junit.suites.AntModuleTestSuite-testconfig" />
+      <formatter type="xml" />
+    </junit>
+  </target>
+
+  <target name="cleanSources">
+    <delete dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.baseLanguageExt/source_gen" />
+    <delete dir="${mps.macro.mpscore_home}/solutions/jetbrains.mps.baseLanguageExt.test/source_gen" />
+    <delete dir="${mps.macro.mpscore_home}/solutions/jetbrains.mps.typechecking.sample/source_gen" />
+    <delete dir="${mps.macro.mpscore_home}/solutions/jetbrains.mps.typechecking.sample.test/source_gen" />
+    <delete dir="${mps.macro.mpscore_home}/solutions/jetbrains.mps.baseLanguageExt.test/test_gen" />
+    <delete dir="${mps.macro.mpscore_home}/solutions/jetbrains.mps.typechecking.sample.test/test_gen" />
+  </target>
+</project>
diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.types@tests.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.types@tests.mps
index e081938f..3fa838ac 100644
--- a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.types@tests.mps
+++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.types@tests.mps
@@ -1070,7 +1070,7 @@
     </node>
   </node>
   <node concept="2XOHcx" id="7t5VLKGQVAO">
-    <property role="2XOHcw" value="${logic_home}" />
+    <property role="2XOHcw" value="${mpscore_home}" />
   </node>
   <node concept="3s_ewN" id="7t5VLKGALSG">
     <property role="3s_ewP" value="Lub" />
diff --git a/samples/mpscore/solutions/jetbrains.mps.coderules.samples.mpscore.build/jetbrains.mps.coderules.samples.mpscore.build.msd b/samples/mpscore/solutions/jetbrains.mps.coderules.samples.mpscore.build/jetbrains.mps.coderules.samples.mpscore.build.msd
new file mode 100644
index 00000000..e0eaa7af
--- /dev/null
+++ b/samples/mpscore/solutions/jetbrains.mps.coderules.samples.mpscore.build/jetbrains.mps.coderules.samples.mpscore.build.msd
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<solution name="jetbrains.mps.coderules.samples.mpscore.build" uuid="d1dbf8e7-cee5-45f7-8159-4c825af0fe7d" moduleVersion="0" compileInMPS="true">
+  <models>
+    <modelRoot contentPath="${module}" type="default">
+      <sourceRoot location="models" />
+    </modelRoot>
+  </models>
+  <sourcePath />
+  <dependencies>
+    <dependency reexport="false">bc9cd1e7-827b-4d61-b111-d2c896dcae6f(jetbrains.mps.typechecking.build)</dependency>
+    <dependency reexport="false">422c2909-59d6-41a9-b318-40e6256b250f(jetbrains.mps.ide.build)</dependency>
+  </dependencies>
+  <languageVersions>
+    <language slang="l:798100da-4f0a-421a-b991-71f8c50ce5d2:jetbrains.mps.build" version="0" />
+    <language slang="l:0cf935df-4699-4e9c-a132-fa109541cba3:jetbrains.mps.build.mps" version="5" />
+    <language slang="l:427a473d-5177-432c-9905-bcbceb71b996:jetbrains.mps.build.mps.runner" version="0" />
+    <language slang="l:9f846aef-4e4a-4a84-828e-7e83fe2697f2:jetbrains.mps.build.mps.testManifest" version="0" />
+    <language slang="l:3600cb0a-44dd-4a5b-9968-22924406419e:jetbrains.mps.build.mps.tests" version="0" />
+    <language slang="l:d5033cee-f632-44b6-b308-89d4fbde34ff:jetbrains.mps.build.startup" version="0" />
+    <language slang="l:698a8d22-a104-47a0-ba8d-10e3ec237f13:jetbrains.mps.build.workflow" version="0" />
+    <language slang="l:479c7a8c-02f9-43b5-9139-d910cb22f298:jetbrains.mps.core.xml" version="0" />
+    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
+    <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
+    <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
+  </languageVersions>
+  <dependencyVersions>
+    <module reference="d1dbf8e7-cee5-45f7-8159-4c825af0fe7d(jetbrains.mps.coderules.samples.mpscore.build)" version="0" />
+    <module reference="422c2909-59d6-41a9-b318-40e6256b250f(jetbrains.mps.ide.build)" version="0" />
+    <module reference="bc9cd1e7-827b-4d61-b111-d2c896dcae6f(jetbrains.mps.typechecking.build)" version="0" />
+  </dependencyVersions>
+</solution>
+
diff --git a/samples/mpscore/solutions/jetbrains.mps.coderules.samples.mpscore.build/models/jetbrains.mps.coderules.samples.mpscore.build.mps b/samples/mpscore/solutions/jetbrains.mps.coderules.samples.mpscore.build/models/jetbrains.mps.coderules.samples.mpscore.build.mps
new file mode 100644
index 00000000..bb520723
--- /dev/null
+++ b/samples/mpscore/solutions/jetbrains.mps.coderules.samples.mpscore.build/models/jetbrains.mps.coderules.samples.mpscore.build.mps
@@ -0,0 +1,383 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model ref="r:249acb2d-9b26-41a4-8655-23aafe76a717(jetbrains.mps.coderules.samples.mpscore.build)">
+  <persistence version="9" />
+  <languages>
+    <use id="427a473d-5177-432c-9905-bcbceb71b996" name="jetbrains.mps.build.mps.runner" version="0" />
+    <use id="698a8d22-a104-47a0-ba8d-10e3ec237f13" name="jetbrains.mps.build.workflow" version="0" />
+    <use id="0cf935df-4699-4e9c-a132-fa109541cba3" name="jetbrains.mps.build.mps" version="5" />
+    <use id="d5033cee-f632-44b6-b308-89d4fbde34ff" name="jetbrains.mps.build.startup" version="0" />
+    <use id="798100da-4f0a-421a-b991-71f8c50ce5d2" name="jetbrains.mps.build" version="0" />
+    <use id="9f846aef-4e4a-4a84-828e-7e83fe2697f2" name="jetbrains.mps.build.mps.testManifest" version="0" />
+    <use id="3600cb0a-44dd-4a5b-9968-22924406419e" name="jetbrains.mps.build.mps.tests" version="0" />
+  </languages>
+  <imports>
+    <import index="zqd8" ref="r:4f157831-48e7-4c8f-a144-b5bbd1be1539(jetbrains.mps.typechecking.build)" />
+    <import index="ffeo" ref="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)" />
+  </imports>
+  <registry>
+    <language id="3600cb0a-44dd-4a5b-9968-22924406419e" name="jetbrains.mps.build.mps.tests">
+      <concept id="4560297596904469355" name="jetbrains.mps.build.mps.tests.structure.BuildMpsLayout_TestModuleGroup" flags="ng" index="22LTRF">
+        <reference id="4560297596904469356" name="group" index="22LTRG" />
+      </concept>
+      <concept id="4560297596904469357" name="jetbrains.mps.build.mps.tests.structure.BuildMpsLayout_TestModules" flags="nn" index="22LTRH">
+        <child id="4560297596904469360" name="modules" index="22LTRK" />
+      </concept>
+      <concept id="4005526075820600484" name="jetbrains.mps.build.mps.tests.structure.BuildModuleTestsPlugin" flags="ng" index="1gjT0q" />
+    </language>
+    <language id="798100da-4f0a-421a-b991-71f8c50ce5d2" name="jetbrains.mps.build">
+      <concept id="5481553824944787378" name="jetbrains.mps.build.structure.BuildSourceProjectRelativePath" flags="ng" index="55IIr" />
+      <concept id="7321017245476976379" name="jetbrains.mps.build.structure.BuildRelativePath" flags="ng" index="iG8Mu">
+        <child id="7321017245477039051" name="compositePart" index="iGT6I" />
+      </concept>
+      <concept id="4993211115183325728" name="jetbrains.mps.build.structure.BuildProjectDependency" flags="ng" index="2sgV4H">
+        <reference id="5617550519002745380" name="script" index="1l3spb" />
+        <child id="4129895186893471026" name="artifacts" index="2JcizS" />
+      </concept>
+      <concept id="4380385936562003279" name="jetbrains.mps.build.structure.BuildString" flags="ng" index="NbPM2">
+        <child id="4903714810883783243" name="parts" index="3MwsjC" />
+      </concept>
+      <concept id="8618885170173601777" name="jetbrains.mps.build.structure.BuildCompositePath" flags="nn" index="2Ry0Ak">
+        <property id="8618885170173601779" name="head" index="2Ry0Am" />
+        <child id="8618885170173601778" name="tail" index="2Ry0An" />
+      </concept>
+      <concept id="6647099934206700647" name="jetbrains.mps.build.structure.BuildJavaPlugin" flags="ng" index="10PD9b" />
+      <concept id="7389400916848050060" name="jetbrains.mps.build.structure.BuildLayout_NamedContainer" flags="ng" index="3981dR">
+        <child id="4380385936562148502" name="containerName" index="Nbhlr" />
+      </concept>
+      <concept id="7389400916848036984" name="jetbrains.mps.build.structure.BuildLayout_Folder" flags="ng" index="398223" />
+      <concept id="7389400916848136194" name="jetbrains.mps.build.structure.BuildFolderMacro" flags="ng" index="398rNT">
+        <child id="7389400916848144618" name="defaultPath" index="398pKh" />
+      </concept>
+      <concept id="7389400916848153117" name="jetbrains.mps.build.structure.BuildSourceMacroRelativePath" flags="ng" index="398BVA">
+        <reference id="7389400916848153130" name="macro" index="398BVh" />
+      </concept>
+      <concept id="5617550519002745364" name="jetbrains.mps.build.structure.BuildLayout" flags="ng" index="1l3spV" />
+      <concept id="5617550519002745363" name="jetbrains.mps.build.structure.BuildProject" flags="ng" index="1l3spW">
+        <property id="5204048710541015587" name="internalBaseDirectory" index="2DA0ip" />
+        <child id="4796668409958418110" name="scriptsDir" index="auvoZ" />
+        <child id="6647099934206700656" name="plugins" index="10PD9s" />
+        <child id="7389400916848080626" name="parts" index="3989C9" />
+        <child id="3542413272732620719" name="aspects" index="1hWBAP" />
+        <child id="5617550519002745381" name="dependencies" index="1l3spa" />
+        <child id="5617550519002745378" name="macros" index="1l3spd" />
+        <child id="5617550519002745372" name="layout" index="1l3spN" />
+      </concept>
+      <concept id="4701820937132344003" name="jetbrains.mps.build.structure.BuildLayout_Container" flags="ng" index="1y1bJS">
+        <child id="7389400916848037006" name="children" index="39821P" />
+      </concept>
+      <concept id="841011766566059607" name="jetbrains.mps.build.structure.BuildStringNotEmpty" flags="ng" index="3_J27D" />
+      <concept id="4903714810883702019" name="jetbrains.mps.build.structure.BuildTextStringPart" flags="ng" index="3Mxwew">
+        <property id="4903714810883755350" name="text" index="3MwjfP" />
+      </concept>
+    </language>
+    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+        <property id="1169194664001" name="name" index="TrG5h" />
+      </concept>
+    </language>
+    <language id="0cf935df-4699-4e9c-a132-fa109541cba3" name="jetbrains.mps.build.mps">
+      <concept id="1500819558095907805" name="jetbrains.mps.build.mps.structure.BuildMps_Group" flags="ng" index="2G$12M">
+        <child id="1500819558095907806" name="modules" index="2G$12L" />
+      </concept>
+      <concept id="1265949165890536423" name="jetbrains.mps.build.mps.structure.BuildMpsLayout_ModuleJars" flags="ng" index="L2wRC">
+        <reference id="1265949165890536425" name="module" index="L2wRA" />
+      </concept>
+      <concept id="868032131020265945" name="jetbrains.mps.build.mps.structure.BuildMPSPlugin" flags="ng" index="3b7kt6" />
+      <concept id="5253498789149381388" name="jetbrains.mps.build.mps.structure.BuildMps_Module" flags="ng" index="3bQrTs">
+        <property id="1500819558096356884" name="doNotCompile" index="2GAjPV" />
+        <child id="5253498789149547704" name="dependencies" index="3bR37C" />
+      </concept>
+      <concept id="5253498789149585690" name="jetbrains.mps.build.mps.structure.BuildMps_ModuleDependencyOnModule" flags="ng" index="3bR9La">
+        <property id="5253498789149547713" name="reexport" index="3bR36h" />
+        <reference id="5253498789149547705" name="module" index="3bR37D" />
+      </concept>
+      <concept id="4278635856200794926" name="jetbrains.mps.build.mps.structure.BuildMps_ModuleDependencyExtendLanguage" flags="ng" index="1Busua">
+        <reference id="4278635856200794928" name="language" index="1Busuk" />
+      </concept>
+      <concept id="3189788309731840247" name="jetbrains.mps.build.mps.structure.BuildMps_Solution" flags="ng" index="1E1JtA">
+        <property id="269707337715731330" name="sourcesKind" index="aoJFB" />
+      </concept>
+      <concept id="3189788309731840248" name="jetbrains.mps.build.mps.structure.BuildMps_Language" flags="ng" index="1E1JtD" />
+      <concept id="322010710375871467" name="jetbrains.mps.build.mps.structure.BuildMps_AbstractModule" flags="ng" index="3LEN3z">
+        <property id="8369506495128725901" name="compact" index="BnDLt" />
+        <property id="322010710375892619" name="uuid" index="3LESm3" />
+        <child id="322010710375956261" name="path" index="3LF7KH" />
+      </concept>
+      <concept id="7259033139236285166" name="jetbrains.mps.build.mps.structure.BuildMps_ExtractedModuleDependency" flags="nn" index="1SiIV0">
+        <child id="7259033139236285167" name="dependency" index="1SiIV1" />
+      </concept>
+    </language>
+  </registry>
+  <node concept="1l3spW" id="5nRGIxgpOuU">
+    <property role="2DA0ip" value="../../" />
+    <property role="TrG5h" value="mpscore" />
+    <node concept="398rNT" id="7Ant4WkHLn3" role="1l3spd">
+      <property role="TrG5h" value="mps_home" />
+      <node concept="55IIr" id="7Ant4WkHLn4" role="398pKh">
+        <node concept="2Ry0Ak" id="69UmpDmJW1O" role="iGT6I">
+          <property role="2Ry0Am" value=".." />
+          <node concept="2Ry0Ak" id="69UmpDmJW1T" role="2Ry0An">
+            <property role="2Ry0Am" value=".." />
+            <node concept="2Ry0Ak" id="69UmpDmJW1Y" role="2Ry0An">
+              <property role="2Ry0Am" value="MPS_HOME" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="398rNT" id="46o4wsH3mv_" role="1l3spd">
+      <property role="TrG5h" value="mps.macro.mpscore_home" />
+      <node concept="55IIr" id="46o4wsH3mGg" role="398pKh" />
+    </node>
+    <node concept="398rNT" id="5VQ8Sex_oaS" role="1l3spd">
+      <property role="TrG5h" value="coderules_plugin" />
+      <node concept="55IIr" id="5VQ8Sex_odz" role="398pKh">
+        <node concept="2Ry0Ak" id="5VQ8Sex_odA" role="iGT6I">
+          <property role="2Ry0Am" value=".." />
+          <node concept="2Ry0Ak" id="5VQ8Sex_oep" role="2Ry0An">
+            <property role="2Ry0Am" value=".." />
+            <node concept="2Ry0Ak" id="5VQ8Sex_oeY" role="2Ry0An">
+              <property role="2Ry0Am" value="build" />
+              <node concept="2Ry0Ak" id="5VQ8Sex_og3" role="2Ry0An">
+                <property role="2Ry0Am" value="artifacts" />
+                <node concept="2Ry0Ak" id="5VQ8Sex_ohC" role="2Ry0An">
+                  <property role="2Ry0Am" value="typechecking-plugin" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="10PD9b" id="1BDNG5xBZhR" role="10PD9s" />
+    <node concept="3b7kt6" id="1BDNG5xBZhW" role="10PD9s" />
+    <node concept="1gjT0q" id="1BDNG5xBZi4" role="10PD9s" />
+    <node concept="55IIr" id="5nRGIxgpOuV" role="auvoZ" />
+    <node concept="1l3spV" id="5nRGIxgpOuW" role="1l3spN">
+      <node concept="398223" id="69UmpDmJWbU" role="39821P">
+        <node concept="3_J27D" id="69UmpDmJWbV" role="Nbhlr">
+          <node concept="3Mxwew" id="69UmpDmJWce" role="3MwsjC">
+            <property role="3MwjfP" value="deploy" />
+          </node>
+        </node>
+        <node concept="L2wRC" id="69UmpDmJWcg" role="39821P">
+          <ref role="L2wRA" node="69UmpDmJW26" resolve="jetbrains.mps.baseLanguageExt" />
+        </node>
+        <node concept="L2wRC" id="69UmpDmJWcM" role="39821P">
+          <ref role="L2wRA" node="69UmpDmJW8I" resolve="jetbrains.mps.baseLanguageExt.test" />
+        </node>
+        <node concept="L2wRC" id="69UmpDmJWdl" role="39821P">
+          <ref role="L2wRA" node="69UmpDmJW3w" resolve="jetbrains.mps.typechecking.sample" />
+        </node>
+        <node concept="L2wRC" id="69UmpDmJWdT" role="39821P">
+          <ref role="L2wRA" node="69UmpDmJW5y" resolve="jetbrains.mps.typechecking.sample.test" />
+        </node>
+      </node>
+    </node>
+    <node concept="2sgV4H" id="7Ant4WkHLmd" role="1l3spa">
+      <ref role="1l3spb" to="ffeo:3IKDaVZmzS6" resolve="mps" />
+      <node concept="398BVA" id="7Ant4WkHLme" role="2JcizS">
+        <ref role="398BVh" node="7Ant4WkHLn3" resolve="mps_home" />
+      </node>
+    </node>
+    <node concept="2sgV4H" id="69UmpDmJQIZ" role="1l3spa">
+      <ref role="1l3spb" to="zqd8:1BDNG5xBZgg" resolve="typechecking-plugin" />
+      <node concept="398BVA" id="5VQ8Sex_oug" role="2JcizS">
+        <ref role="398BVh" node="5VQ8Sex_oaS" resolve="coderules_plugin" />
+      </node>
+    </node>
+    <node concept="2G$12M" id="69UmpDmJW20" role="3989C9">
+      <property role="TrG5h" value="baseLanguageExt" />
+      <node concept="1E1JtD" id="69UmpDmJW26" role="2G$12L">
+        <property role="BnDLt" value="true" />
+        <property role="TrG5h" value="jetbrains.mps.baseLanguageExt" />
+        <property role="3LESm3" value="0fda14cc-a416-4c81-869a-2175d8b3325d" />
+        <property role="2GAjPV" value="false" />
+        <node concept="55IIr" id="69UmpDmJW29" role="3LF7KH">
+          <node concept="2Ry0Ak" id="69UmpDmJW2f" role="iGT6I">
+            <property role="2Ry0Am" value="languages" />
+            <node concept="2Ry0Ak" id="69UmpDmJW2k" role="2Ry0An">
+              <property role="2Ry0Am" value="jetbrains.mps.baseLanguageExt" />
+              <node concept="2Ry0Ak" id="69UmpDmJW2p" role="2Ry0An">
+                <property role="2Ry0Am" value="jetbrains.mps.baseLanguageExt.mpl" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1SiIV0" id="69UmpDmJW2r" role="3bR37C">
+          <node concept="3bR9La" id="69UmpDmJW2s" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" to="zqd8:7BVjoXzUxee" resolve="jetbrains.mps.lang.coderules.runtime" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="69UmpDmJW2t" role="3bR37C">
+          <node concept="3bR9La" id="69UmpDmJW2u" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" to="zqd8:7BVjoXzUxoR" resolve="jetbrains.mps.logic.reactor" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="69UmpDmJW2v" role="3bR37C">
+          <node concept="3bR9La" id="69UmpDmJW2w" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" to="zqd8:7BVjoXzUx$V" resolve="jetbrains.mps.logic.runtime" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="69UmpDmJW2x" role="3bR37C">
+          <node concept="3bR9La" id="69UmpDmJW2y" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="69UmpDmJW2z" role="3bR37C">
+          <node concept="3bR9La" id="69UmpDmJW2$" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" to="zqd8:7BVjoXzUx9d" resolve="jetbrains.mps.lang.coderules.template" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="69UmpDmJW2_" role="3bR37C">
+          <node concept="3bR9La" id="69UmpDmJW2A" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" to="zqd8:78H58oeeGcw" resolve="jetbrains.mps.controlflow" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="69UmpDmJW2B" role="3bR37C">
+          <node concept="3bR9La" id="69UmpDmJW2C" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" to="zqd8:65DJywFj0Fi" resolve="jetbrains.mps.typechecking" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="69UmpDmJW2D" role="3bR37C">
+          <node concept="1Busua" id="69UmpDmJW2E" role="1SiIV1">
+            <ref role="1Busuk" to="ffeo:7Kfy9QB6KYb" resolve="jetbrains.mps.baseLanguage" />
+          </node>
+        </node>
+      </node>
+      <node concept="1E1JtA" id="69UmpDmJW8I" role="2G$12L">
+        <property role="BnDLt" value="true" />
+        <property role="TrG5h" value="jetbrains.mps.baseLanguageExt.test" />
+        <property role="3LESm3" value="e44e7802-2e40-482b-9b1c-6d42660a6a11" />
+        <property role="2GAjPV" value="false" />
+        <property role="aoJFB" value="sources and tests" />
+        <node concept="55IIr" id="69UmpDmJW8L" role="3LF7KH">
+          <node concept="2Ry0Ak" id="69UmpDmJW9Q" role="iGT6I">
+            <property role="2Ry0Am" value="solutions" />
+            <node concept="2Ry0Ak" id="69UmpDmJWaj" role="2Ry0An">
+              <property role="2Ry0Am" value="jetbrains.mps.baseLanguageExt.test" />
+              <node concept="2Ry0Ak" id="69UmpDmJWaK" role="2Ry0An">
+                <property role="2Ry0Am" value="jetbrains.mps.baseLanguageExt.test.msd" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1SiIV0" id="69UmpDmJWb2" role="3bR37C">
+          <node concept="3bR9La" id="69UmpDmJWb3" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" to="ffeo:1H905DlDUSw" resolve="MPS.OpenAPI" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="69UmpDmJWb4" role="3bR37C">
+          <node concept="3bR9La" id="69UmpDmJWb5" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" to="zqd8:7BVjoXzUxoR" resolve="jetbrains.mps.logic.reactor" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="69UmpDmJWb6" role="3bR37C">
+          <node concept="3bR9La" id="69UmpDmJWb7" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="69UmpDmJWb8" role="3bR37C">
+          <node concept="3bR9La" id="69UmpDmJWb9" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" to="zqd8:7BVjoXzUx$V" resolve="jetbrains.mps.logic.runtime" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="69UmpDmJWba" role="3bR37C">
+          <node concept="3bR9La" id="69UmpDmJWbb" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" to="ffeo:7Kfy9QB6KZ0" resolve="jetbrains.mps.baseLanguageInternal" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="69UmpDmJWbc" role="3bR37C">
+          <node concept="3bR9La" id="69UmpDmJWbd" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" to="zqd8:7Ant4WkHLpd" resolve="jetbrains.mps.logic.test" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="69UmpDmJWbe" role="3bR37C">
+          <node concept="3bR9La" id="69UmpDmJWbf" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" node="69UmpDmJW26" resolve="jetbrains.mps.baseLanguageExt" />
+          </node>
+        </node>
+      </node>
+      <node concept="1E1JtA" id="69UmpDmJW3w" role="2G$12L">
+        <property role="BnDLt" value="true" />
+        <property role="TrG5h" value="jetbrains.mps.typechecking.sample" />
+        <property role="3LESm3" value="3ddddf69-9ff0-426b-9365-51ae7356fb82" />
+        <property role="2GAjPV" value="false" />
+        <node concept="55IIr" id="69UmpDmJW3z" role="3LF7KH">
+          <node concept="2Ry0Ak" id="69UmpDmJW46" role="iGT6I">
+            <property role="2Ry0Am" value="solutions" />
+            <node concept="2Ry0Ak" id="69UmpDmJW4j" role="2Ry0An">
+              <property role="2Ry0Am" value="jetbrains.mps.typechecking.sample" />
+              <node concept="2Ry0Ak" id="69UmpDmJW4w" role="2Ry0An">
+                <property role="2Ry0Am" value="jetbrains.mps.typechecking.sample.msd" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1SiIV0" id="69UmpDmJW4E" role="3bR37C">
+          <node concept="3bR9La" id="69UmpDmJW4F" role="1SiIV1">
+            <property role="3bR36h" value="true" />
+            <ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
+          </node>
+        </node>
+      </node>
+      <node concept="1E1JtA" id="69UmpDmJW5y" role="2G$12L">
+        <property role="BnDLt" value="true" />
+        <property role="TrG5h" value="jetbrains.mps.typechecking.sample.test" />
+        <property role="3LESm3" value="1b65dfe8-24ff-41c3-9a3e-70f102942455" />
+        <property role="2GAjPV" value="false" />
+        <property role="aoJFB" value="sources and tests" />
+        <node concept="55IIr" id="69UmpDmJW5_" role="3LF7KH">
+          <node concept="2Ry0Ak" id="69UmpDmJW6n" role="iGT6I">
+            <property role="2Ry0Am" value="solutions" />
+            <node concept="2Ry0Ak" id="69UmpDmJW6G" role="2Ry0An">
+              <property role="2Ry0Am" value="jetbrains.mps.typechecking.sample.test" />
+              <node concept="2Ry0Ak" id="69UmpDmJW79" role="2Ry0An">
+                <property role="2Ry0Am" value="jetbrains.mps.typechecking.sample.test.msd" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1SiIV0" id="69UmpDmJW7r" role="3bR37C">
+          <node concept="3bR9La" id="69UmpDmJW7s" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" to="ffeo:7Kfy9QB6KYb" resolve="jetbrains.mps.baseLanguage" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="69UmpDmJW7t" role="3bR37C">
+          <node concept="3bR9La" id="69UmpDmJW7u" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" node="69UmpDmJW3w" resolve="jetbrains.mps.typechecking.sample" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="69UmpDmJW7v" role="3bR37C">
+          <node concept="3bR9La" id="69UmpDmJW7w" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" to="zqd8:65DJywFj0Fi" resolve="jetbrains.mps.typechecking" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="22LTRH" id="69UmpDmJWeu" role="1hWBAP">
+      <property role="TrG5h" value="testconfig" />
+      <node concept="22LTRF" id="69UmpDmJWgM" role="22LTRK">
+        <ref role="22LTRG" node="69UmpDmJW20" resolve="baseLanguageExt" />
+      </node>
+    </node>
+  </node>
+</model>
+
diff --git a/samples/mpscore/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.bounds.bad@tests.mps b/samples/mpscore/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.bounds.bad@tests.mps
index 44258d6e..8c59164d 100644
--- a/samples/mpscore/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.bounds.bad@tests.mps
+++ b/samples/mpscore/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.bounds.bad@tests.mps
@@ -274,7 +274,7 @@
     </node>
   </node>
   <node concept="2XOHcx" id="1N_0WA5DT60">
-    <property role="2XOHcw" value="${logic_home}" />
+    <property role="2XOHcw" value="${mpscore_home}" />
   </node>
 </model>
 
diff --git a/samples/mpscore/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.bounds@tests.mps b/samples/mpscore/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.bounds@tests.mps
index 7ceca8a2..0fa1dd9f 100644
--- a/samples/mpscore/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.bounds@tests.mps
+++ b/samples/mpscore/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.bounds@tests.mps
@@ -404,7 +404,7 @@
     </node>
   </node>
   <node concept="2XOHcx" id="1N_0WA5DT60">
-    <property role="2XOHcw" value="${logic_home}" />
+    <property role="2XOHcw" value="${mpscore_home}" />
   </node>
 </model>
 
diff --git a/samples/mpscore/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.codeAnal@tests.mps b/samples/mpscore/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.codeAnal@tests.mps
index 354f32a4..6aa5854c 100644
--- a/samples/mpscore/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.codeAnal@tests.mps
+++ b/samples/mpscore/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.codeAnal@tests.mps
@@ -125,7 +125,7 @@
     </language>
   </registry>
   <node concept="2XOHcx" id="1N_0WA5DT60">
-    <property role="2XOHcw" value="${logic_home}" />
+    <property role="2XOHcw" value="${mpscore_home}" />
   </node>
   <node concept="1lH9Xt" id="1N_0WA5DT3k">
     <property role="TrG5h" value="Typechecking" />
diff --git a/samples/mpscore/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.helloWorld@tests.mps b/samples/mpscore/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.helloWorld@tests.mps
index 5f808d34..81ad51e0 100644
--- a/samples/mpscore/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.helloWorld@tests.mps
+++ b/samples/mpscore/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.helloWorld@tests.mps
@@ -120,7 +120,7 @@
     </language>
   </registry>
   <node concept="2XOHcx" id="1N_0WA5DT60">
-    <property role="2XOHcw" value="${logic_home}" />
+    <property role="2XOHcw" value="${mpscore_home}" />
   </node>
   <node concept="1lH9Xt" id="1N_0WA5DT3k">
     <property role="TrG5h" value="Typechecking" />
diff --git a/samples/mpscore/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.simpleGenerics@tests.mps b/samples/mpscore/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.simpleGenerics@tests.mps
index e86e3a01..b954120a 100644
--- a/samples/mpscore/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.simpleGenerics@tests.mps
+++ b/samples/mpscore/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.simpleGenerics@tests.mps
@@ -120,7 +120,7 @@
     </language>
   </registry>
   <node concept="2XOHcx" id="1N_0WA5DT60">
-    <property role="2XOHcw" value="${logic_home}" />
+    <property role="2XOHcw" value="${mpscore_home}" />
   </node>
   <node concept="1lH9Xt" id="1N_0WA5DT3k">
     <property role="TrG5h" value="Typechecking" />
diff --git a/samples/mpscore/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.slice@tests.mps b/samples/mpscore/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.slice@tests.mps
index 62c83936..de7e1a18 100644
--- a/samples/mpscore/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.slice@tests.mps
+++ b/samples/mpscore/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.slice@tests.mps
@@ -120,7 +120,7 @@
     </language>
   </registry>
   <node concept="2XOHcx" id="1N_0WA5DT60">
-    <property role="2XOHcw" value="${logic_home}" />
+    <property role="2XOHcw" value="${mpscore_home}" />
   </node>
   <node concept="1lH9Xt" id="1N_0WA5DT3k">
     <property role="TrG5h" value="Typechecking" />
diff --git a/settings.gradle b/settings.gradle
index 55ff0b52..13dd88c0 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -2,3 +2,4 @@ include 'coderules/solutions/jetbrains.mps.logic.reactor'
 include 'coderules/solutions/jetbrains.mps.logic.test'
 include 'coderules/solutions/jetbrains.mps.typechecking'
 include 'coderules/solutions/jetbrains.mps.coderules'
+include 'samples/mpscore'