diff --git a/.mps/modules.xml b/.mps/modules.xml
index eb6f98e9..b893be04 100644
--- a/.mps/modules.xml
+++ b/.mps/modules.xml
@@ -6,13 +6,13 @@
       <modulePath path="$PROJECT_DIR$/logic/languages/jetbrains.mps.logic/runtime/jetbrains.mps.logic.runtime.msd" folder="logic" />
       <modulePath path="$PROJECT_DIR$/logic/solutions/jetbrains.mps.logic.reactor/jetbrains.mps.logic.reactor.msd" folder="logic" />
       <modulePath path="$PROJECT_DIR$/logic/solutions/jetbrains.mps.logic.test/jetbrains.mps.logic.test.msd" folder="logic" />
-      <modulePath path="$PROJECT_DIR$/plugin/solutions/jetbrains.mps.typechecking.build/jetbrains.mps.typechecking.build.msd" folder="build" />
       <modulePath path="$PROJECT_DIR$/typechecking/languages/jetbrains.mps.baseLanguageExt/jetbrains.mps.baseLanguageExt.mpl" folder="typechecking.baseLanguageExt" />
       <modulePath path="$PROJECT_DIR$/typechecking/languages/jetbrains.mps.typechecking.annotation/jetbrains.mps.typechecking.annotation.mpl" folder="typechecking.annotation" />
       <modulePath path="$PROJECT_DIR$/typechecking/solutions/jetbrains.mps.baseLanguageExt.test/jetbrains.mps.baseLanguageExt.test.msd" folder="typechecking.baseLanguageExt" />
+      <modulePath path="$PROJECT_DIR$/typechecking/solutions/jetbrains.mps.typechecking.build/jetbrains.mps.typechecking.build.msd" folder="build" />
+      <modulePath path="$PROJECT_DIR$/typechecking/solutions/jetbrains.mps.typechecking/jetbrains.mps.typechecking.msd" folder="typechecking.plugin" />
       <modulePath path="$PROJECT_DIR$/typechecking/solutions/jetbrains.mps.typechecking.sample.test/jetbrains.mps.typechecking.sample.test.msd" folder="typechecking.sample" />
       <modulePath path="$PROJECT_DIR$/typechecking/solutions/jetbrains.mps.typechecking.sample/jetbrains.mps.typechecking.sample.msd" folder="typechecking.sample" />
-      <modulePath path="$PROJECT_DIR$/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/jetbrains.mps.lang.typesystem2.sampleplugin.msd" folder="typechecking.plugin" />
       <modulePath path="$PROJECT_DIR$/typechecking/solutions/jetbrains.mps.typechecking.test/jetbrains.mps.lang.typechecking.test.msd" folder="typechecking" />
       <modulePath path="$PROJECT_DIR$/typesystem2/languages/jetbrains.mps.lang.smodel.types/jetbrains.mps.lang.smodel.types.mpl" folder="typesystem2" />
       <modulePath path="$PROJECT_DIR$/typesystem2/languages/jetbrains.mps.lang.typesystem2/jetbrains.mps.lang.typesystem2.mpl" folder="typesystem2" />
diff --git a/build.xml b/build.xml
index f8dfc9a5..f07b0a1b 100644
--- a/build.xml
+++ b/build.xml
@@ -437,10 +437,10 @@
       <zipfileset file="${basedir}/typesystem2/solutions/jetbrains.mps.lang.typesystem2.helper/jetbrains.mps.lang.typesystem2.helper.msd" prefix="module" />
       <zipfileset dir="${build.tmp}/customProcessors/copyModels/typesystem2-solutions-jetbrains.mps.lang.typesystem2.helper-models" prefix="module/models" />
     </jar>
-    <mkdir dir="${build.tmp}/default/jetbrains.mps.lang.typesystem2.sampleplugin.jar" />
-    <mkdir dir="${build.tmp}/default/jetbrains.mps.lang.typesystem2.sampleplugin.jar/META-INF" />
-    <echoxml file="${build.tmp}/default/jetbrains.mps.lang.typesystem2.sampleplugin.jar/META-INF/module.xml">
-      <module namespace="jetbrains.mps.lang.typesystem2.sampleplugin" type="solution" uuid="35e2a720-13d8-4eda-88d3-ff9d78d5a3ae">
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.typechecking.jar" />
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.typechecking.jar/META-INF" />
+    <echoxml file="${build.tmp}/default/jetbrains.mps.typechecking.jar/META-INF/module.xml">
+      <module namespace="jetbrains.mps.typechecking" type="solution" uuid="35e2a720-13d8-4eda-88d3-ff9d78d5a3ae">
         <dependencies>
           <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" />
           <module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" />
@@ -459,27 +459,27 @@
         <classpath>
           <entry path="." />
         </classpath>
-        <sources jar="jetbrains.mps.lang.typesystem2.sampleplugin-src.jar" descriptor="jetbrains.mps.lang.typesystem2.sampleplugin.msd" />
+        <sources jar="jetbrains.mps.typechecking-src.jar" descriptor="jetbrains.mps.typechecking.msd" />
       </module>
     </echoxml>
-    <jar destfile="${build.layout}/tests/jetbrains.mps.lang.typesystem2.sampleplugin.jar" duplicate="preserve">
-      <fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.sampleplugin" />
-      <fileset dir="${basedir}/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin" includes="icons/**, resources/**" />
-      <fileset dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
-      <fileset dir="${build.tmp}/default/jetbrains.mps.lang.typesystem2.sampleplugin.jar" />
+    <jar destfile="${build.layout}/tests/jetbrains.mps.typechecking.jar" duplicate="preserve">
+      <fileset dir="${build.tmp}/java/out/jetbrains.mps.typechecking" />
+      <fileset dir="${basedir}/typechecking/solutions/jetbrains.mps.typechecking" includes="icons/**, resources/**" />
+      <fileset dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
+      <fileset dir="${build.tmp}/default/jetbrains.mps.typechecking.jar" />
     </jar>
-    <copyModels todir="${build.tmp}/customProcessors/copyModels/typechecking-solutions-jetbrains.mps.lang.typesystem2.sampleplugin-models">
-      <fileset dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
+    <copyModels todir="${build.tmp}/customProcessors/copyModels/typechecking-solutions-jetbrains.mps.typechecking-models">
+      <fileset dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
     </copyModels>
-    <jar destfile="${build.layout}/tests/jetbrains.mps.lang.typesystem2.sampleplugin-src.jar" duplicate="preserve">
-      <fileset dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/source_gen">
+    <jar destfile="${build.layout}/tests/jetbrains.mps.typechecking-src.jar" duplicate="preserve">
+      <fileset dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/source_gen">
         <exclude name="**/trace.info" />
         <exclude name="**/exports" />
         <exclude name="**/checkpoints" />
         <exclude name="**/*.mps" />
       </fileset>
-      <zipfileset file="${basedir}/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/jetbrains.mps.lang.typesystem2.sampleplugin.msd" prefix="module" />
-      <zipfileset dir="${build.tmp}/customProcessors/copyModels/typechecking-solutions-jetbrains.mps.lang.typesystem2.sampleplugin-models" prefix="module/models" />
+      <zipfileset file="${basedir}/typechecking/solutions/jetbrains.mps.typechecking/jetbrains.mps.typechecking.msd" prefix="module" />
+      <zipfileset dir="${build.tmp}/customProcessors/copyModels/typechecking-solutions-jetbrains.mps.typechecking-models" prefix="module/models" />
     </jar>
     <mkdir dir="${build.tmp}/default/jetbrains.mps.lang.typechecking.test.jar" />
     <mkdir dir="${build.tmp}/default/jetbrains.mps.lang.typechecking.test.jar/META-INF" />
@@ -819,13 +819,13 @@
     <copy todir="${build.layout}/tests/lib">
       <fileset dir="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib" />
     </copy>
-    <mkdir dir="${build.tmp}/default/samplechecker.zip" />
-    <mkdir dir="${build.tmp}/default/samplechecker.zip/samplechecker" />
-    <mkdir dir="${build.tmp}/default/samplechecker.zip/samplechecker/META-INF" />
-    <echoxml file="${build.tmp}/default/samplechecker.zip/samplechecker/META-INF/plugin.xml">
+    <mkdir dir="${build.tmp}/default/typechecking-0.1.zip" />
+    <mkdir dir="${build.tmp}/default/typechecking-0.1.zip/typechecking" />
+    <mkdir dir="${build.tmp}/default/typechecking-0.1.zip/typechecking/META-INF" />
+    <echoxml file="${build.tmp}/default/typechecking-0.1.zip/typechecking/META-INF/plugin.xml">
       <idea-plugin version="2" xmlns:xi="http://www.w3.org/2001/XInclude">
-        <id>jetbrains.mps.lang.typesystem2.samplechecker</id>
-        <name>Sample Typechecker</name>
+        <id>jetbrains.mps.typechecking</id>
+        <name>Typechecking with Constraints</name>
         <version>0.1</version>
         
         <extensions defaultExtensionNs="com.intellij">
@@ -833,7 +833,7 @@
         </extensions>
       </idea-plugin>
     </echoxml>
-    <mkdir dir="${build.tmp}/default/samplechecker.zip/samplechecker/languages" />
+    <mkdir dir="${build.tmp}/default/typechecking-0.1.zip/typechecking/languages" />
     <mkdir dir="${build.tmp}/default/jetbrains.mps.logic.jar1" />
     <mkdir dir="${build.tmp}/default/jetbrains.mps.logic.jar1/META-INF" />
     <echoxml file="${build.tmp}/default/jetbrains.mps.logic.jar1/META-INF/module.xml">
@@ -859,7 +859,7 @@
         <sources jar="jetbrains.mps.logic-src.jar" descriptor="jetbrains.mps.logic.mpl" />
       </module>
     </echoxml>
-    <jar destfile="${build.tmp}/default/samplechecker.zip/samplechecker/languages/jetbrains.mps.logic.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/typechecking-0.1.zip/typechecking/languages/jetbrains.mps.logic.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.logic" />
       <fileset dir="${basedir}/logic/languages/jetbrains.mps.logic" includes="icons/**, resources/**" />
       <fileset dir="${mps.macro.logic_home}/logic/languages/jetbrains.mps.logic/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
@@ -887,7 +887,7 @@
         <sources jar="jetbrains.mps.logic-src.jar" descriptor="jetbrains.mps.logic.mpl" />
       </module>
     </echoxml>
-    <jar destfile="${build.tmp}/default/samplechecker.zip/samplechecker/languages/jetbrains.mps.logic-generator.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/typechecking-0.1.zip/typechecking/languages/jetbrains.mps.logic-generator.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.logic#6626732309150416985" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.logic-generator.jar1" />
     </jar>
@@ -897,7 +897,7 @@
     <copyModels todir="${build.tmp}/customProcessors/copyModels/logic-languages-jetbrains.mps.logic-languageModels1">
       <fileset dir="${mps.macro.logic_home}/logic/languages/jetbrains.mps.logic/languageModels" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
     </copyModels>
-    <jar destfile="${build.tmp}/default/samplechecker.zip/samplechecker/languages/jetbrains.mps.logic-src.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/typechecking-0.1.zip/typechecking/languages/jetbrains.mps.logic-src.jar" duplicate="preserve">
       <fileset dir="${mps.macro.logic_home}/logic/languages/jetbrains.mps.logic/generator/source_gen">
         <exclude name="**/trace.info" />
         <exclude name="**/exports" />
@@ -932,7 +932,7 @@
         <sources jar="jetbrains.mps.logic.reactor-src.jar" descriptor="jetbrains.mps.logic.reactor.msd" />
       </module>
     </echoxml>
-    <jar destfile="${build.tmp}/default/samplechecker.zip/samplechecker/languages/jetbrains.mps.logic.reactor.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/typechecking-0.1.zip/typechecking/languages/jetbrains.mps.logic.reactor.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
       <fileset dir="${basedir}/logic/solutions/jetbrains.mps.logic.reactor" includes="icons/**, resources/**" />
       <fileset dir="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
@@ -941,7 +941,7 @@
     <copyModels todir="${build.tmp}/customProcessors/copyModels/logic-solutions-jetbrains.mps.logic.reactor-models1">
       <fileset dir="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
     </copyModels>
-    <jar destfile="${build.tmp}/default/samplechecker.zip/samplechecker/languages/jetbrains.mps.logic.reactor-src.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/typechecking-0.1.zip/typechecking/languages/jetbrains.mps.logic.reactor-src.jar" duplicate="preserve">
       <fileset dir="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/source_gen">
         <exclude name="**/trace.info" />
         <exclude name="**/exports" />
@@ -973,7 +973,7 @@
         <sources jar="jetbrains.mps.logic.runtime-src.jar" descriptor="jetbrains.mps.logic.runtime.msd" />
       </module>
     </echoxml>
-    <jar destfile="${build.tmp}/default/samplechecker.zip/samplechecker/languages/jetbrains.mps.logic.runtime.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/typechecking-0.1.zip/typechecking/languages/jetbrains.mps.logic.runtime.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
       <fileset dir="${basedir}/logic/languages/jetbrains.mps.logic/runtime" includes="icons/**, resources/**" />
       <fileset dir="${mps.macro.logic_home}/logic/languages/jetbrains.mps.logic/runtime/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
@@ -982,7 +982,7 @@
     <copyModels todir="${build.tmp}/customProcessors/copyModels/logic-languages-jetbrains.mps.logic-runtime-models1">
       <fileset dir="${mps.macro.logic_home}/logic/languages/jetbrains.mps.logic/runtime/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
     </copyModels>
-    <jar destfile="${build.tmp}/default/samplechecker.zip/samplechecker/languages/jetbrains.mps.logic.runtime-src.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/typechecking-0.1.zip/typechecking/languages/jetbrains.mps.logic.runtime-src.jar" duplicate="preserve">
       <fileset dir="${mps.macro.logic_home}/logic/languages/jetbrains.mps.logic/runtime/source_gen">
         <exclude name="**/trace.info" />
         <exclude name="**/exports" />
@@ -1022,7 +1022,7 @@
         <sources jar="jetbrains.mps.lang.typesystem2-src.jar" descriptor="jetbrains.mps.lang.typesystem2.mpl" />
       </module>
     </echoxml>
-    <jar destfile="${build.tmp}/default/samplechecker.zip/samplechecker/languages/jetbrains.mps.lang.typesystem2.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/typechecking-0.1.zip/typechecking/languages/jetbrains.mps.lang.typesystem2.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2" />
       <fileset dir="${basedir}/typesystem2/languages/jetbrains.mps.lang.typesystem2" includes="icons/**, resources/**" />
       <fileset dir="${mps.macro.logic_home}/typesystem2/languages/jetbrains.mps.lang.typesystem2/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
@@ -1051,7 +1051,7 @@
         <sources jar="jetbrains.mps.lang.typesystem2-src.jar" descriptor="jetbrains.mps.lang.typesystem2.mpl" />
       </module>
     </echoxml>
-    <jar destfile="${build.tmp}/default/samplechecker.zip/samplechecker/languages/jetbrains.mps.lang.typesystem2-generator.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/typechecking-0.1.zip/typechecking/languages/jetbrains.mps.lang.typesystem2-generator.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2#4578927328670739933" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.lang.typesystem2-generator.jar1" />
     </jar>
@@ -1061,7 +1061,7 @@
     <copyModels todir="${build.tmp}/customProcessors/copyModels/typesystem2-languages-jetbrains.mps.lang.typesystem2-languageModels1">
       <fileset dir="${mps.macro.logic_home}/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
     </copyModels>
-    <jar destfile="${build.tmp}/default/samplechecker.zip/samplechecker/languages/jetbrains.mps.lang.typesystem2-src.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/typechecking-0.1.zip/typechecking/languages/jetbrains.mps.lang.typesystem2-src.jar" duplicate="preserve">
       <fileset dir="${mps.macro.logic_home}/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/source_gen">
         <exclude name="**/trace.info" />
         <exclude name="**/exports" />
@@ -1102,7 +1102,7 @@
         <sources jar="jetbrains.mps.lang.typesystem2.runtime-src.jar" descriptor="jetbrains.mps.lang.typesystem2.runtime.msd" />
       </module>
     </echoxml>
-    <jar destfile="${build.tmp}/default/samplechecker.zip/samplechecker/languages/jetbrains.mps.lang.typesystem2.runtime.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/typechecking-0.1.zip/typechecking/languages/jetbrains.mps.lang.typesystem2.runtime.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.runtime" />
       <fileset dir="${basedir}/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime" includes="icons/**, resources/**" />
       <fileset dir="${mps.macro.logic_home}/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
@@ -1111,7 +1111,7 @@
     <copyModels todir="${build.tmp}/customProcessors/copyModels/typesystem2-languages-jetbrains.mps.lang.typesystem2-runtime-models1">
       <fileset dir="${mps.macro.logic_home}/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
     </copyModels>
-    <jar destfile="${build.tmp}/default/samplechecker.zip/samplechecker/languages/jetbrains.mps.lang.typesystem2.runtime-src.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/typechecking-0.1.zip/typechecking/languages/jetbrains.mps.lang.typesystem2.runtime-src.jar" duplicate="preserve">
       <fileset dir="${mps.macro.logic_home}/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/source_gen">
         <exclude name="**/trace.info" />
         <exclude name="**/exports" />
@@ -1143,7 +1143,7 @@
         <sources jar="jetbrains.mps.lang.typesystem2.template-src.jar" descriptor="jetbrains.mps.lang.typesystem2.template.msd" />
       </module>
     </echoxml>
-    <jar destfile="${build.tmp}/default/samplechecker.zip/samplechecker/languages/jetbrains.mps.lang.typesystem2.template.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/typechecking-0.1.zip/typechecking/languages/jetbrains.mps.lang.typesystem2.template.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.template" />
       <fileset dir="${basedir}/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template" includes="icons/**, resources/**" />
       <fileset dir="${mps.macro.logic_home}/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
@@ -1152,7 +1152,7 @@
     <copyModels todir="${build.tmp}/customProcessors/copyModels/typesystem2-solutions-jetbrains.mps.lang.typesystem2.template-models1">
       <fileset dir="${mps.macro.logic_home}/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
     </copyModels>
-    <jar destfile="${build.tmp}/default/samplechecker.zip/samplechecker/languages/jetbrains.mps.lang.typesystem2.template-src.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/typechecking-0.1.zip/typechecking/languages/jetbrains.mps.lang.typesystem2.template-src.jar" duplicate="preserve">
       <fileset dir="${mps.macro.logic_home}/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/source_gen">
         <exclude name="**/trace.info" />
         <exclude name="**/exports" />
@@ -1181,7 +1181,7 @@
         <sources jar="jetbrains.mps.lang.typesystem2.helper-src.jar" descriptor="jetbrains.mps.lang.typesystem2.helper.msd" />
       </module>
     </echoxml>
-    <jar destfile="${build.tmp}/default/samplechecker.zip/samplechecker/languages/jetbrains.mps.lang.typesystem2.helper.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/typechecking-0.1.zip/typechecking/languages/jetbrains.mps.lang.typesystem2.helper.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.helper" />
       <fileset dir="${basedir}/typesystem2/solutions/jetbrains.mps.lang.typesystem2.helper" includes="icons/**, resources/**" />
       <fileset dir="${mps.macro.logic_home}/typesystem2/solutions/jetbrains.mps.lang.typesystem2.helper/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
@@ -1190,7 +1190,7 @@
     <copyModels todir="${build.tmp}/customProcessors/copyModels/typesystem2-solutions-jetbrains.mps.lang.typesystem2.helper-models1">
       <fileset dir="${mps.macro.logic_home}/typesystem2/solutions/jetbrains.mps.lang.typesystem2.helper/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
     </copyModels>
-    <jar destfile="${build.tmp}/default/samplechecker.zip/samplechecker/languages/jetbrains.mps.lang.typesystem2.helper-src.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/typechecking-0.1.zip/typechecking/languages/jetbrains.mps.lang.typesystem2.helper-src.jar" duplicate="preserve">
       <fileset dir="${mps.macro.logic_home}/typesystem2/solutions/jetbrains.mps.lang.typesystem2.helper/source_gen">
         <exclude name="**/trace.info" />
         <exclude name="**/exports" />
@@ -1200,10 +1200,10 @@
       <zipfileset file="${basedir}/typesystem2/solutions/jetbrains.mps.lang.typesystem2.helper/jetbrains.mps.lang.typesystem2.helper.msd" prefix="module" />
       <zipfileset dir="${build.tmp}/customProcessors/copyModels/typesystem2-solutions-jetbrains.mps.lang.typesystem2.helper-models1" prefix="module/models" />
     </jar>
-    <mkdir dir="${build.tmp}/default/jetbrains.mps.lang.typesystem2.sampleplugin.jar1" />
-    <mkdir dir="${build.tmp}/default/jetbrains.mps.lang.typesystem2.sampleplugin.jar1/META-INF" />
-    <echoxml file="${build.tmp}/default/jetbrains.mps.lang.typesystem2.sampleplugin.jar1/META-INF/module.xml">
-      <module namespace="jetbrains.mps.lang.typesystem2.sampleplugin" type="solution" uuid="35e2a720-13d8-4eda-88d3-ff9d78d5a3ae">
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.typechecking.jar1" />
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.typechecking.jar1/META-INF" />
+    <echoxml file="${build.tmp}/default/jetbrains.mps.typechecking.jar1/META-INF/module.xml">
+      <module namespace="jetbrains.mps.typechecking" type="solution" uuid="35e2a720-13d8-4eda-88d3-ff9d78d5a3ae">
         <dependencies>
           <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" />
           <module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" />
@@ -1222,27 +1222,27 @@
         <classpath>
           <entry path="." />
         </classpath>
-        <sources jar="jetbrains.mps.lang.typesystem2.sampleplugin-src.jar" descriptor="jetbrains.mps.lang.typesystem2.sampleplugin.msd" />
+        <sources jar="jetbrains.mps.typechecking-src.jar" descriptor="jetbrains.mps.typechecking.msd" />
       </module>
     </echoxml>
-    <jar destfile="${build.tmp}/default/samplechecker.zip/samplechecker/languages/jetbrains.mps.lang.typesystem2.sampleplugin.jar" duplicate="preserve">
-      <fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.sampleplugin" />
-      <fileset dir="${basedir}/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin" includes="icons/**, resources/**" />
-      <fileset dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
-      <fileset dir="${build.tmp}/default/jetbrains.mps.lang.typesystem2.sampleplugin.jar1" />
+    <jar destfile="${build.tmp}/default/typechecking-0.1.zip/typechecking/languages/jetbrains.mps.typechecking.jar" duplicate="preserve">
+      <fileset dir="${build.tmp}/java/out/jetbrains.mps.typechecking" />
+      <fileset dir="${basedir}/typechecking/solutions/jetbrains.mps.typechecking" includes="icons/**, resources/**" />
+      <fileset dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
+      <fileset dir="${build.tmp}/default/jetbrains.mps.typechecking.jar1" />
     </jar>
-    <copyModels todir="${build.tmp}/customProcessors/copyModels/typechecking-solutions-jetbrains.mps.lang.typesystem2.sampleplugin-models1">
-      <fileset dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
+    <copyModels todir="${build.tmp}/customProcessors/copyModels/typechecking-solutions-jetbrains.mps.typechecking-models1">
+      <fileset dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
     </copyModels>
-    <jar destfile="${build.tmp}/default/samplechecker.zip/samplechecker/languages/jetbrains.mps.lang.typesystem2.sampleplugin-src.jar" duplicate="preserve">
-      <fileset dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/source_gen">
+    <jar destfile="${build.tmp}/default/typechecking-0.1.zip/typechecking/languages/jetbrains.mps.typechecking-src.jar" duplicate="preserve">
+      <fileset dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/source_gen">
         <exclude name="**/trace.info" />
         <exclude name="**/exports" />
         <exclude name="**/checkpoints" />
         <exclude name="**/*.mps" />
       </fileset>
-      <zipfileset file="${basedir}/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/jetbrains.mps.lang.typesystem2.sampleplugin.msd" prefix="module" />
-      <zipfileset dir="${build.tmp}/customProcessors/copyModels/typechecking-solutions-jetbrains.mps.lang.typesystem2.sampleplugin-models1" prefix="module/models" />
+      <zipfileset file="${basedir}/typechecking/solutions/jetbrains.mps.typechecking/jetbrains.mps.typechecking.msd" prefix="module" />
+      <zipfileset dir="${build.tmp}/customProcessors/copyModels/typechecking-solutions-jetbrains.mps.typechecking-models1" prefix="module/models" />
     </jar>
     <mkdir dir="${build.tmp}/default/jetbrains.mps.lang.smodel.types.jar1" />
     <mkdir dir="${build.tmp}/default/jetbrains.mps.lang.smodel.types.jar1/META-INF" />
@@ -1270,7 +1270,7 @@
         <sources jar="jetbrains.mps.lang.smodel.types-src.jar" descriptor="jetbrains.mps.lang.smodel.types.mpl" />
       </module>
     </echoxml>
-    <jar destfile="${build.tmp}/default/samplechecker.zip/samplechecker/languages/jetbrains.mps.lang.smodel.types.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/typechecking-0.1.zip/typechecking/languages/jetbrains.mps.lang.smodel.types.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.smodel.types" />
       <fileset dir="${basedir}/typesystem2/languages/jetbrains.mps.lang.smodel.types" includes="icons/**, resources/**" />
       <fileset dir="${mps.macro.logic_home}/typesystem2/languages/jetbrains.mps.lang.smodel.types/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
@@ -1298,7 +1298,7 @@
         <sources jar="jetbrains.mps.lang.smodel.types-src.jar" descriptor="jetbrains.mps.lang.smodel.types.mpl" />
       </module>
     </echoxml>
-    <jar destfile="${build.tmp}/default/samplechecker.zip/samplechecker/languages/jetbrains.mps.lang.smodel.types-generator.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/typechecking-0.1.zip/typechecking/languages/jetbrains.mps.lang.smodel.types-generator.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.smodel.types#7345257067587611144" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.lang.smodel.types-generator.jar1" />
     </jar>
@@ -1308,7 +1308,7 @@
     <copyModels todir="${build.tmp}/customProcessors/copyModels/typesystem2-languages-jetbrains.mps.lang.smodel.types-models1">
       <fileset dir="${mps.macro.logic_home}/typesystem2/languages/jetbrains.mps.lang.smodel.types/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
     </copyModels>
-    <jar destfile="${build.tmp}/default/samplechecker.zip/samplechecker/languages/jetbrains.mps.lang.smodel.types-src.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/typechecking-0.1.zip/typechecking/languages/jetbrains.mps.lang.smodel.types-src.jar" duplicate="preserve">
       <fileset dir="${mps.macro.logic_home}/typesystem2/languages/jetbrains.mps.lang.smodel.types/generator/source_gen">
         <exclude name="**/trace.info" />
         <exclude name="**/exports" />
@@ -1325,9 +1325,9 @@
       <zipfileset dir="${build.tmp}/customProcessors/copyModels/typesystem2-languages-jetbrains.mps.lang.smodel.types-generator-template1" prefix="module/generator/template" />
       <zipfileset dir="${build.tmp}/customProcessors/copyModels/typesystem2-languages-jetbrains.mps.lang.smodel.types-models1" prefix="module/models" />
     </jar>
-    <zip destfile="${build.layout}/samplechecker.zip">
-      <zipfileset dir="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib" prefix="samplechecker/lib" />
-      <fileset dir="${build.tmp}/default/samplechecker.zip" />
+    <zip destfile="${build.layout}/typechecking-0.1.zip">
+      <zipfileset dir="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib" prefix="typechecking/lib" />
+      <fileset dir="${build.tmp}/default/typechecking-0.1.zip" />
     </zip>
     <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}</echo>
   </target>
@@ -1343,7 +1343,7 @@
     <delete dir="${build.layout}" />
   </target>
   
-  <target name="compileJava" depends="java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic#6626732309150416985, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.test, java.compile.jetbrains.mps.lang.typesystem2, java.compile.jetbrains.mps.lang.typesystem2#4578927328670739933, java.compile.java.modules.cycle.1, java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.lang.typesystem2.helper, java.compile.jetbrains.mps.lang.smodel.types, java.compile.jetbrains.mps.lang.smodel.types#7345257067587611144, java.compile.jetbrains.mps.lang.typechecking.test, java.compile.jetbrains.mps.lang.typesystem2.sampleplugin, java.compile.jetbrains.mps.typechecking.annotation, java.compile.jetbrains.mps.baseLanguageExt, java.compile.jetbrains.mps.typechecking.sample, java.compile.jetbrains.mps.baseLanguageExt.test, java.compile.jetbrains.mps.typechecking.sample.test" />
+  <target name="compileJava" depends="java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic#6626732309150416985, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.test, java.compile.jetbrains.mps.lang.typesystem2, java.compile.jetbrains.mps.lang.typesystem2#4578927328670739933, java.compile.java.modules.cycle.1, java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.lang.typesystem2.helper, java.compile.jetbrains.mps.lang.smodel.types, java.compile.jetbrains.mps.lang.smodel.types#7345257067587611144, java.compile.jetbrains.mps.lang.typechecking.test, java.compile.jetbrains.mps.typechecking, java.compile.jetbrains.mps.typechecking.annotation, java.compile.jetbrains.mps.baseLanguageExt, java.compile.jetbrains.mps.typechecking.sample, java.compile.jetbrains.mps.baseLanguageExt.test, java.compile.jetbrains.mps.typechecking.sample.test" />
   
   <target name="processResources" />
   
@@ -1448,9 +1448,9 @@
         <module file="${basedir}/typesystem2/languages/jetbrains.mps.lang.smodel.types/jetbrains.mps.lang.smodel.types.mpl" />
         <module file="${basedir}/typesystem2/languages/jetbrains.mps.lang.typesystem2/jetbrains.mps.lang.typesystem2.mpl" />
         <module file="${basedir}/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/jetbrains.mps.lang.typesystem2.runtime.msd" />
-        <module file="${basedir}/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/jetbrains.mps.lang.typesystem2.sampleplugin.msd" />
         <module file="${basedir}/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/jetbrains.mps.lang.typesystem2.template.msd" />
         <module file="${basedir}/logic/solutions/jetbrains.mps.logic.test/jetbrains.mps.logic.test.msd" />
+        <module file="${basedir}/typechecking/solutions/jetbrains.mps.typechecking/jetbrains.mps.typechecking.msd" />
       </chunk>
       <chunk>
         <module file="${basedir}/typechecking/languages/jetbrains.mps.baseLanguageExt/jetbrains.mps.baseLanguageExt.mpl" />
@@ -2097,7 +2097,7 @@
     </javac>
   </target>
   
-  <target name="java.compile.jetbrains.mps.lang.typechecking.test" depends="java.compile.jetbrains.mps.baseLanguageExt, java.compile.jetbrains.mps.lang.typesystem2.helper, java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.lang.typesystem2.sampleplugin, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
+  <target name="java.compile.jetbrains.mps.lang.typechecking.test" depends="java.compile.jetbrains.mps.baseLanguageExt, java.compile.jetbrains.mps.lang.typesystem2.helper, java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking, fetchDependencies">
     <mkdir dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking.test/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.typechecking.test" />
     <javac destdir="${build.tmp}/java/out/jetbrains.mps.lang.typechecking.test" fork="true" encoding="utf8" includeantruntime="false" debug="true">
@@ -2128,10 +2128,10 @@
         <fileset file="${artifacts.mps}/lib/mps-workbench.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.helper" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.runtime" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.sampleplugin" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.template" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking" />
         <fileset file="${artifacts.mps}/lib/mps-test.jar" />
         <fileset file="${artifacts.mps}/plugins/mps-testing/lib/jetbrains.mps.lang.test.util.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.1.2.jar" />
@@ -2172,13 +2172,13 @@
     </javac>
   </target>
   
-  <target name="java.compile.jetbrains.mps.lang.typesystem2.sampleplugin" depends="java.compile.jetbrains.mps.lang.typesystem2.helper, java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
-    <mkdir dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/source_gen" />
-    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.sampleplugin" />
-    <javac destdir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.sampleplugin" fork="true" encoding="utf8" includeantruntime="false" debug="true">
+  <target name="java.compile.jetbrains.mps.typechecking" depends="java.compile.jetbrains.mps.lang.typesystem2.helper, java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
+    <mkdir dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/source_gen" />
+    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.typechecking" />
+    <javac destdir="${build.tmp}/java/out/jetbrains.mps.typechecking" fork="true" encoding="utf8" includeantruntime="false" debug="true">
       <compilerarg value="-Xlint:none" />
       <src>
-        <path location="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/source_gen" />
+        <path location="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/source_gen" />
       </src>
       <classpath>
         <fileset file="${artifacts.mps}/lib/mps-closures.jar" />
@@ -2409,7 +2409,7 @@
     </javac>
   </target>
   
-  <target name="java.compile.jetbrains.mps.typechecking.sample.test" depends="java.compile.jetbrains.mps.lang.typesystem2.sampleplugin, java.compile.jetbrains.mps.typechecking.sample, fetchDependencies">
+  <target name="java.compile.jetbrains.mps.typechecking.sample.test" depends="java.compile.jetbrains.mps.typechecking, java.compile.jetbrains.mps.typechecking.sample, fetchDependencies">
     <mkdir dir="${mps.macro.logic_home}/typechecking/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">
@@ -2437,7 +2437,7 @@
         <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
         <fileset file="${artifacts.mps}/lib/mps-icons.jar" />
         <fileset file="${artifacts.mps}/lib/mps-workbench.jar" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.sampleplugin" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking.sample" />
         <fileset file="${artifacts.mps}/lib/mps-test.jar" />
         <fileset file="${artifacts.mps}/plugins/mps-testing/lib/jetbrains.mps.lang.test.util.jar" />
@@ -2547,11 +2547,11 @@
       <pathelement location="${build.layout}/tests/jetbrains.mps.lang.smodel.types.jar" />
       <pathelement location="${build.layout}/tests/jetbrains.mps.lang.typesystem2.helper.jar" />
       <pathelement location="${build.layout}/tests/jetbrains.mps.lang.typesystem2.runtime.jar" />
-      <pathelement location="${build.layout}/tests/jetbrains.mps.lang.typesystem2.sampleplugin.jar" />
       <pathelement location="${build.layout}/tests/jetbrains.mps.lang.typesystem2.template.jar" />
       <pathelement location="${build.layout}/tests/jetbrains.mps.logic.jar" />
       <pathelement location="${build.layout}/tests/jetbrains.mps.logic.reactor.jar" />
       <pathelement location="${build.layout}/tests/jetbrains.mps.logic.runtime.jar" />
+      <pathelement location="${build.layout}/tests/jetbrains.mps.typechecking.jar" />
       <pathelement location="${build.layout}/tests/jetbrains.mps.typechecking.sample.jar" />
     </path>
     <pathconvert pathsep="${path.separator}" property="mps.libraries.path.string" refid="mps.libraries.path" />
@@ -2629,9 +2629,9 @@
     <delete dir="${mps.macro.logic_home}/typesystem2/languages/jetbrains.mps.lang.typesystem2/source_gen" />
     <delete dir="${mps.macro.logic_home}/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/source_gen" />
     <delete dir="${mps.macro.logic_home}/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/source_gen" />
-    <delete dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/source_gen" />
     <delete dir="${mps.macro.logic_home}/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/source_gen" />
     <delete dir="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.test/source_gen" />
+    <delete dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/source_gen" />
     <delete dir="${mps.macro.logic_home}/typechecking/languages/jetbrains.mps.baseLanguageExt/source_gen" />
     <delete dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.baseLanguageExt.test/source_gen" />
     <delete dir="${mps.macro.logic_home}/typesystem2/languages/jetbrains.mps.lang.smodel.types/generator/source_gen" />
diff --git a/plugin/solutions/jetbrains.mps.typechecking.build/jetbrains.mps.typechecking.build.msd b/typechecking/solutions/jetbrains.mps.typechecking.build/jetbrains.mps.typechecking.build.msd
similarity index 100%
rename from plugin/solutions/jetbrains.mps.typechecking.build/jetbrains.mps.typechecking.build.msd
rename to typechecking/solutions/jetbrains.mps.typechecking.build/jetbrains.mps.typechecking.build.msd
diff --git a/plugin/solutions/jetbrains.mps.typechecking.build/models/jetbrains.mps.typechecking.build.mps b/typechecking/solutions/jetbrains.mps.typechecking.build/models/jetbrains.mps.typechecking.build.mps
similarity index 98%
rename from plugin/solutions/jetbrains.mps.typechecking.build/models/jetbrains.mps.typechecking.build.mps
rename to typechecking/solutions/jetbrains.mps.typechecking.build/models/jetbrains.mps.typechecking.build.mps
index d22357a8..a933a55d 100644
--- a/plugin/solutions/jetbrains.mps.typechecking.build/models/jetbrains.mps.typechecking.build.mps
+++ b/typechecking/solutions/jetbrains.mps.typechecking.build/models/jetbrains.mps.typechecking.build.mps
@@ -152,15 +152,15 @@
       </node>
     </node>
     <node concept="m$_wf" id="7BVjoXzUx67" role="3989C9">
-      <property role="m$_wk" value="jetbrains.mps.lang.typesystem2.samplechecker" />
+      <property role="m$_wk" value="jetbrains.mps.typechecking" />
       <node concept="3_J27D" id="7BVjoXzUx68" role="m$_yQ">
         <node concept="3Mxwew" id="7BVjoXzUx6h" role="3MwsjC">
-          <property role="3MwjfP" value="Sample Typechecker" />
+          <property role="3MwjfP" value="Typechecking with Constraints" />
         </node>
       </node>
       <node concept="3_J27D" id="7BVjoXzUx69" role="m_cZH">
         <node concept="3Mxwew" id="7BVjoXzUx6j" role="3MwsjC">
-          <property role="3MwjfP" value="samplechecker" />
+          <property role="3MwjfP" value="typechecking" />
         </node>
       </node>
       <node concept="3_J27D" id="7BVjoXzUx6a" role="m$_w8">
@@ -1050,16 +1050,16 @@
         <node concept="1SiIV0" id="5w_kaFFWUQc" role="3bR37C">
           <node concept="3bR9La" id="5w_kaFFWUQd" role="1SiIV1">
             <property role="3bR36h" value="false" />
-            <ref role="3bR37D" node="65DJywFj0Fi" resolve="jetbrains.mps.lang.typesystem2.sampleplugin" />
+            <ref role="3bR37D" node="65DJywFj0Fi" resolve="jetbrains.mps.typechecking" />
           </node>
         </node>
       </node>
     </node>
     <node concept="2G$12M" id="65DJywFj0uW" role="3989C9">
-      <property role="TrG5h" value="samplechecker" />
+      <property role="TrG5h" value="typechecking" />
       <node concept="1E1JtA" id="65DJywFj0Fi" role="2G$12L">
         <property role="BnDLt" value="true" />
-        <property role="TrG5h" value="jetbrains.mps.lang.typesystem2.sampleplugin" />
+        <property role="TrG5h" value="jetbrains.mps.typechecking" />
         <property role="3LESm3" value="35e2a720-13d8-4eda-88d3-ff9d78d5a3ae" />
         <property role="2GAjPV" value="false" />
         <node concept="55IIr" id="65DJywFj0Fj" role="3LF7KH">
@@ -1068,9 +1068,9 @@
             <node concept="2Ry0Ak" id="65DJywFj0Qg" role="2Ry0An">
               <property role="2Ry0Am" value="solutions" />
               <node concept="2Ry0Ak" id="65DJywFj0UD" role="2Ry0An">
-                <property role="2Ry0Am" value="jetbrains.mps.lang.typesystem2.sampleplugin" />
-                <node concept="2Ry0Ak" id="65DJywFj164" role="2Ry0An">
-                  <property role="2Ry0Am" value="jetbrains.mps.lang.typesystem2.sampleplugin.msd" />
+                <property role="2Ry0Am" value="jetbrains.mps.typechecking" />
+                <node concept="2Ry0Ak" id="6HVcbo5Ffp0" role="2Ry0An">
+                  <property role="2Ry0Am" value="jetbrains.mps.typechecking.msd" />
                 </node>
               </node>
             </node>
@@ -1167,9 +1167,6 @@
           </node>
         </node>
       </node>
-    </node>
-    <node concept="2G$12M" id="46o4wsH$idP" role="3989C9">
-      <property role="TrG5h" value="sample" />
       <node concept="1E1JtD" id="46o4wsH5PJF" role="2G$12L">
         <property role="BnDLt" value="true" />
         <property role="TrG5h" value="jetbrains.mps.typechecking.annotation" />
@@ -1379,7 +1376,7 @@
         <node concept="1SiIV0" id="46o4wsH5OPq" role="3bR37C">
           <node concept="3bR9La" id="46o4wsH5OPr" role="1SiIV1">
             <property role="3bR36h" value="false" />
-            <ref role="3bR37D" node="65DJywFj0Fi" resolve="jetbrains.mps.lang.typesystem2.sampleplugin" />
+            <ref role="3bR37D" node="65DJywFj0Fi" resolve="jetbrains.mps.typechecking" />
           </node>
         </node>
       </node>
@@ -1430,7 +1427,7 @@
           <ref role="L2wRA" node="3u5wJtgk3a" resolve="jetbrains.mps.lang.typesystem2.helper" />
         </node>
         <node concept="L2wRC" id="7Ant4WkHLmq" role="39821P">
-          <ref role="L2wRA" node="65DJywFj0Fi" resolve="jetbrains.mps.lang.typesystem2.sampleplugin" />
+          <ref role="L2wRA" node="65DJywFj0Fi" resolve="jetbrains.mps.typechecking" />
         </node>
         <node concept="L2wRC" id="5pz4PwHqt4r" role="39821P">
           <ref role="L2wRA" node="5pz4PwHqqS4" resolve="jetbrains.mps.lang.typechecking.test" />
@@ -1503,11 +1500,11 @@
       <node concept="3981dG" id="65DJywFjdtY" role="39821P">
         <node concept="3_J27D" id="65DJywFjdtZ" role="Nbhlr">
           <node concept="3Mxwew" id="65DJywFjdwr" role="3MwsjC">
-            <property role="3MwjfP" value="samplechecker.zip" />
+            <property role="3MwjfP" value="typechecking-0.1.zip" />
           </node>
         </node>
         <node concept="m$_wl" id="65DJywFjdwt" role="39821P">
-          <ref role="m_rDy" node="7BVjoXzUx67" resolve="jetbrains.mps.lang.typesystem2.samplechecker" />
+          <ref role="m_rDy" node="7BVjoXzUx67" resolve="jetbrains.mps.typechecking" />
           <node concept="398223" id="65DJywFkEum" role="39821P">
             <node concept="3_J27D" id="65DJywFkEuo" role="Nbhlr">
               <node concept="3Mxwew" id="65DJywFkExe" role="3MwsjC">
@@ -1536,7 +1533,7 @@
               <ref role="L2wRA" node="3u5wJtgk3a" resolve="jetbrains.mps.lang.typesystem2.helper" />
             </node>
             <node concept="L2wRC" id="65DJywFj_1R" role="39821P">
-              <ref role="L2wRA" node="65DJywFj0Fi" resolve="jetbrains.mps.lang.typesystem2.sampleplugin" />
+              <ref role="L2wRA" node="65DJywFj0Fi" resolve="jetbrains.mps.typechecking" />
             </node>
             <node concept="L2wRC" id="3u5wJtgSbK" role="39821P">
               <ref role="L2wRA" node="3u5wJtgiSM" resolve="jetbrains.mps.lang.smodel.types" />
diff --git a/typechecking/solutions/jetbrains.mps.typechecking.sample.test/jetbrains.mps.typechecking.sample.test.msd b/typechecking/solutions/jetbrains.mps.typechecking.sample.test/jetbrains.mps.typechecking.sample.test.msd
index f0804041..c1127a7a 100644
--- a/typechecking/solutions/jetbrains.mps.typechecking.sample.test/jetbrains.mps.typechecking.sample.test.msd
+++ b/typechecking/solutions/jetbrains.mps.typechecking.sample.test/jetbrains.mps.typechecking.sample.test.msd
@@ -9,7 +9,7 @@
   <dependencies>
     <dependency reexport="false">3ddddf69-9ff0-426b-9365-51ae7356fb82(jetbrains.mps.typechecking.sample)</dependency>
     <dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
-    <dependency reexport="false">35e2a720-13d8-4eda-88d3-ff9d78d5a3ae(jetbrains.mps.lang.typesystem2.sampleplugin)</dependency>
+    <dependency reexport="false">35e2a720-13d8-4eda-88d3-ff9d78d5a3ae(jetbrains.mps.typechecking)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="5" />
diff --git a/typechecking/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.bounds.bad@tests.mps b/typechecking/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.bounds.bad@tests.mps
index d9c681c3..e67eb042 100644
--- a/typechecking/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.bounds.bad@tests.mps
+++ b/typechecking/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.bounds.bad@tests.mps
@@ -10,7 +10,7 @@
   <imports>
     <import index="7rut" ref="r:b1bec7fa-733c-4182-bbd4-b266e3d7e6db(jetbrains.mps.typechecking.sample.bounds.bad)" />
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
-    <import index="t5kh" ref="r:1514c681-0724-461e-a435-315a6af4b3b4(jetbrains.mps.lang.typesystem2.sampleplugin.plugin)" />
+    <import index="t5kh" ref="r:1514c681-0724-461e-a435-315a6af4b3b4(jetbrains.mps.typechecking.plugin)" />
   </imports>
   <registry>
     <language id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test">
diff --git a/typechecking/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.bounds@tests.mps b/typechecking/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.bounds@tests.mps
index 8814f70c..f9620556 100644
--- a/typechecking/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.bounds@tests.mps
+++ b/typechecking/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.bounds@tests.mps
@@ -13,7 +13,7 @@
   <imports>
     <import index="f6t6" ref="r:9993217f-5bfa-4281-bc47-527677747cb2(jetbrains.mps.typechecking.sample.bounds)" />
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
-    <import index="t5kh" ref="r:1514c681-0724-461e-a435-315a6af4b3b4(jetbrains.mps.lang.typesystem2.sampleplugin.plugin)" />
+    <import index="t5kh" ref="r:1514c681-0724-461e-a435-315a6af4b3b4(jetbrains.mps.typechecking.plugin)" />
   </imports>
   <registry>
     <language id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test">
diff --git a/typechecking/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.codeAnal@tests.mps b/typechecking/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.codeAnal@tests.mps
index 3c6f021b..3d82cc05 100644
--- a/typechecking/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.codeAnal@tests.mps
+++ b/typechecking/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.codeAnal@tests.mps
@@ -10,7 +10,7 @@
   </languages>
   <imports>
     <import index="hwt6" ref="r:1f3a7853-f20c-4f91-9912-5e82d9d1651a(jetbrains.mps.typechecking.sample.codeAnal)" />
-    <import index="t5kh" ref="r:1514c681-0724-461e-a435-315a6af4b3b4(jetbrains.mps.lang.typesystem2.sampleplugin.plugin)" />
+    <import index="t5kh" ref="r:1514c681-0724-461e-a435-315a6af4b3b4(jetbrains.mps.typechecking.plugin)" />
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
   </imports>
   <registry>
diff --git a/typechecking/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.helloWorld@tests.mps b/typechecking/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.helloWorld@tests.mps
index 9507f170..a6ea0b36 100644
--- a/typechecking/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.helloWorld@tests.mps
+++ b/typechecking/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.helloWorld@tests.mps
@@ -9,7 +9,7 @@
   <imports>
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
     <import index="bs09" ref="r:28026be8-9bf8-4f54-9319-0ca8a6d1299d(jetbrains.mps.typechecking.sample.helloWorld)" />
-    <import index="t5kh" ref="r:1514c681-0724-461e-a435-315a6af4b3b4(jetbrains.mps.lang.typesystem2.sampleplugin.plugin)" />
+    <import index="t5kh" ref="r:1514c681-0724-461e-a435-315a6af4b3b4(jetbrains.mps.typechecking.plugin)" />
   </imports>
   <registry>
     <language id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test">
diff --git a/typechecking/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.simpleGenerics@tests.mps b/typechecking/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.simpleGenerics@tests.mps
index eb901bac..d686d218 100644
--- a/typechecking/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.simpleGenerics@tests.mps
+++ b/typechecking/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.simpleGenerics@tests.mps
@@ -9,7 +9,7 @@
   <imports>
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
     <import index="waaz" ref="r:5669dd77-177e-474f-8fb2-c015a8eb4306(jetbrains.mps.typechecking.sample.simpleGenerics)" />
-    <import index="t5kh" ref="r:1514c681-0724-461e-a435-315a6af4b3b4(jetbrains.mps.lang.typesystem2.sampleplugin.plugin)" />
+    <import index="t5kh" ref="r:1514c681-0724-461e-a435-315a6af4b3b4(jetbrains.mps.typechecking.plugin)" />
   </imports>
   <registry>
     <language id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test">
diff --git a/typechecking/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.slice@tests.mps b/typechecking/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.slice@tests.mps
index bcc947a7..0a699308 100644
--- a/typechecking/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.slice@tests.mps
+++ b/typechecking/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.slice@tests.mps
@@ -9,7 +9,7 @@
   <imports>
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
     <import index="9oqm" ref="r:a8ff5933-0f6e-4d4a-af4a-5da865d78faf(jetbrains.mps.typechecking.sample.slice)" />
-    <import index="t5kh" ref="r:1514c681-0724-461e-a435-315a6af4b3b4(jetbrains.mps.lang.typesystem2.sampleplugin.plugin)" />
+    <import index="t5kh" ref="r:1514c681-0724-461e-a435-315a6af4b3b4(jetbrains.mps.typechecking.plugin)" />
   </imports>
   <registry>
     <language id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test">
diff --git a/typechecking/solutions/jetbrains.mps.typechecking.test/jetbrains.mps.lang.typechecking.test.msd b/typechecking/solutions/jetbrains.mps.typechecking.test/jetbrains.mps.lang.typechecking.test.msd
index a8f6192d..3fa1029e 100644
--- a/typechecking/solutions/jetbrains.mps.typechecking.test/jetbrains.mps.lang.typechecking.test.msd
+++ b/typechecking/solutions/jetbrains.mps.typechecking.test/jetbrains.mps.lang.typechecking.test.msd
@@ -17,7 +17,7 @@
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">0fda14cc-a416-4c81-869a-2175d8b3325d(jetbrains.mps.baseLanguageExt)</dependency>
     <dependency reexport="false">ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.typesystem2.template)</dependency>
-    <dependency reexport="false">35e2a720-13d8-4eda-88d3-ff9d78d5a3ae(jetbrains.mps.lang.typesystem2.sampleplugin)</dependency>
+    <dependency reexport="false">35e2a720-13d8-4eda-88d3-ff9d78d5a3ae(jetbrains.mps.typechecking)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="5" />
diff --git a/typechecking/solutions/jetbrains.mps.typechecking.test/models/jetbrains.mps.typechecking@tests.mps b/typechecking/solutions/jetbrains.mps.typechecking.test/models/jetbrains.mps.typechecking@tests.mps
index 33cec1d2..f3e0170d 100644
--- a/typechecking/solutions/jetbrains.mps.typechecking.test/models/jetbrains.mps.typechecking@tests.mps
+++ b/typechecking/solutions/jetbrains.mps.typechecking.test/models/jetbrains.mps.typechecking@tests.mps
@@ -31,7 +31,7 @@
     <import index="guwi" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.io(JDK/)" />
     <import index="av0y" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.program(jetbrains.mps.logic.reactor/)" />
     <import index="fqlx" ref="r:2cc226a9-8a78-4010-b962-823343fd28ff(jetbrains.mps.lang.typesystem2.aspect)" />
-    <import index="t5kh" ref="r:1514c681-0724-461e-a435-315a6af4b3b4(jetbrains.mps.lang.typesystem2.sampleplugin.plugin)" />
+    <import index="t5kh" ref="r:1514c681-0724-461e-a435-315a6af4b3b4(jetbrains.mps.typechecking.plugin)" />
     <import index="tqvn" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel.tempmodel(MPS.Core/)" />
     <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.treeform)" />
     <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" />
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/jetbrains.mps.lang.typesystem2.sampleplugin.msd b/typechecking/solutions/jetbrains.mps.typechecking/jetbrains.mps.typechecking.msd
similarity index 97%
rename from typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/jetbrains.mps.lang.typesystem2.sampleplugin.msd
rename to typechecking/solutions/jetbrains.mps.typechecking/jetbrains.mps.typechecking.msd
index 90f7b751..a068ba97 100644
--- a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/jetbrains.mps.lang.typesystem2.sampleplugin.msd
+++ b/typechecking/solutions/jetbrains.mps.typechecking/jetbrains.mps.typechecking.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="jetbrains.mps.lang.typesystem2.sampleplugin" uuid="35e2a720-13d8-4eda-88d3-ff9d78d5a3ae" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="jetbrains.mps.typechecking" uuid="35e2a720-13d8-4eda-88d3-ff9d78d5a3ae" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/models/jetbrains/mps/lang/typesystem2/sampleplugin/plugin.mps b/typechecking/solutions/jetbrains.mps.typechecking/models/jetbrains.mps.typechecking.plugin.mps
similarity index 99%
rename from typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/models/jetbrains/mps/lang/typesystem2/sampleplugin/plugin.mps
rename to typechecking/solutions/jetbrains.mps.typechecking/models/jetbrains.mps.typechecking.plugin.mps
index 2c8509dc..06eaea67 100644
--- a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/models/jetbrains/mps/lang/typesystem2/sampleplugin/plugin.mps
+++ b/typechecking/solutions/jetbrains.mps.typechecking/models/jetbrains.mps.typechecking.plugin.mps
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:1514c681-0724-461e-a435-315a6af4b3b4(jetbrains.mps.lang.typesystem2.sampleplugin.plugin)">
+<model ref="r:1514c681-0724-461e-a435-315a6af4b3b4(jetbrains.mps.typechecking.plugin)">
   <persistence version="9" />
   <languages>
     <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="-1" />