diff --git a/.mps/modules.xml b/.mps/modules.xml
index 3e7ebe31..92cef263 100644
--- a/.mps/modules.xml
+++ b/.mps/modules.xml
@@ -35,11 +35,10 @@
       <modulePath path="$PROJECT_DIR$/samples/lambdacalc/languages/samples.lambdacalc/samples.lambdacalc.mpl" folder="samples.lambdacalc" />
       <modulePath path="$PROJECT_DIR$/samples/lambdacalc/solutions/samples.lambdacalc.build/samples.lambdacalc.build.msd" folder="samples.lambdacalc" />
       <modulePath path="$PROJECT_DIR$/samples/lambdacalc/solutions/samples.lambdacalc.demo/samples.lambdacalc.demo.msd" folder="samples.lambdacalc" />
-      <modulePath path="$PROJECT_DIR$/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/jetbrains.mps.baseLanguageExt.mpl" folder="samples.mpscore" />
-      <modulePath path="$PROJECT_DIR$/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/jetbrains.mps.baseLanguageExt.test.msd" folder="samples.mpscore.tests" />
-      <modulePath path="$PROJECT_DIR$/samples/mpscore/solutions/jetbrains.mps.coderules.samples.mpscore.build/jetbrains.mps.coderules.samples.mpscore.build.msd" folder="samples.mpscore.build" />
-      <modulePath path="$PROJECT_DIR$/samples/mpscore/solutions/jetbrains.mps.typechecking.sample.test/jetbrains.mps.typechecking.sample.test.msd" folder="samples.mpscore.tests" />
-      <modulePath path="$PROJECT_DIR$/samples/mpscore/solutions/jetbrains.mps.typechecking.sample/jetbrains.mps.typechecking.sample.msd" folder="samples.mpscore.samples" />
+      <modulePath path="$PROJECT_DIR$/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/jetbrains.mps.baseLanguageExt.mpl" folder="samples.mpscore.baseLanguageExt" />
+      <modulePath path="$PROJECT_DIR$/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/jetbrains.mps.baseLanguageExt.test.msd" folder="samples.mpscore.baseLanguageExt" />
+      <modulePath path="$PROJECT_DIR$/samples/mpscore/solutions/samples.mpscore.build/samples.mpscore.build.msd" folder="samples.mpscore.build" />
+      <modulePath path="$PROJECT_DIR$/samples/mpscore/solutions/typechecking.samples.baseLanguage/typechecking.samples.baseLanguage.msd" folder="samples.mpscore" />
     </projectModules>
   </component>
 </project>
\ No newline at end of file
diff --git a/samples/mpscore/.mps/modules.xml b/samples/mpscore/.mps/modules.xml
index 39b1074d..e5a85265 100644
--- a/samples/mpscore/.mps/modules.xml
+++ b/samples/mpscore/.mps/modules.xml
@@ -3,10 +3,9 @@
   <component name="MPSProject">
     <projectModules>
       <modulePath path="$PROJECT_DIR$/languages/jetbrains.mps.baseLanguageExt/jetbrains.mps.baseLanguageExt.mpl" folder="" />
-      <modulePath path="$PROJECT_DIR$/solutions/jetbrains.mps.baseLanguageExt.test/jetbrains.mps.baseLanguageExt.test.msd" folder="tests" />
-      <modulePath path="$PROJECT_DIR$/solutions/jetbrains.mps.coderules.samples.mpscore.build/jetbrains.mps.coderules.samples.mpscore.build.msd" folder="build" />
-      <modulePath path="$PROJECT_DIR$/solutions/jetbrains.mps.typechecking.sample.test/jetbrains.mps.typechecking.sample.test.msd" folder="tests" />
-      <modulePath path="$PROJECT_DIR$/solutions/jetbrains.mps.typechecking.sample/jetbrains.mps.typechecking.sample.msd" folder="samples" />
+      <modulePath path="$PROJECT_DIR$/solutions/samples.mpscore.build/samples.mpscore.build.msd" folder="build" />
+      <modulePath path="$PROJECT_DIR$/solutions/jetbrains.mps.baseLanguageExt.test/jetbrains.mps.baseLanguageExt.test.msd" folder="" />
+      <modulePath path="$PROJECT_DIR$/solutions/typechecking.samples.baseLanguage/typechecking.samples.baseLanguage.msd" folder="" />
     </projectModules>
   </component>
-</project>
\ No newline at end of file
+</project>
diff --git a/samples/mpscore/build.xml b/samples/mpscore/build.xml
index cb50a7a9..72140ce2 100644
--- a/samples/mpscore/build.xml
+++ b/samples/mpscore/build.xml
@@ -119,39 +119,10 @@
       <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">
+    <mkdir dir="${build.tmp}/default/typechecking.samples.baseLanguage.jar" />
+    <mkdir dir="${build.tmp}/default/typechecking.samples.baseLanguage.jar/META-INF" />
+    <echoxml file="${build.tmp}/default/typechecking.samples.baseLanguage.jar/META-INF/module.xml">
+      <module namespace="typechecking.samples.baseLanguage" type="solution" uuid="3ddddf69-9ff0-426b-9365-51ae7356fb82">
         <dependencies>
           <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" />
           <module ref="49808fad-9d41-4b96-83fa-9231640f6b2b(JUnit)" />
@@ -170,26 +141,26 @@
         <classpath>
           <entry path="." />
         </classpath>
-        <sources jar="jetbrains.mps.typechecking.sample.test-src.jar" descriptor="jetbrains.mps.typechecking.sample.test.msd" />
+        <sources jar="typechecking.samples.baseLanguage-src.jar" descriptor="typechecking.samples.baseLanguage.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 destfile="${build.layout}/deploy/typechecking.samples.baseLanguage.jar" duplicate="preserve">
+      <fileset dir="${build.tmp}/java/out/typechecking.samples.baseLanguage" />
+      <fileset dir="${mps.macro.mpscore_home}/solutions/typechecking.samples.baseLanguage/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
+      <fileset dir="${build.tmp}/default/typechecking.samples.baseLanguage.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 todir="${build.tmp}/customProcessors/copyModels/solutions-typechecking.samples.baseLanguage-models">
+      <fileset dir="${mps.macro.mpscore_home}/solutions/typechecking.samples.baseLanguage/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">
+    <jar destfile="${build.layout}/deploy/typechecking.samples.baseLanguage-src.jar" duplicate="preserve">
+      <fileset dir="${mps.macro.mpscore_home}/solutions/typechecking.samples.baseLanguage/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" />
+      <zipfileset file="${basedir}/solutions/typechecking.samples.baseLanguage/typechecking.samples.baseLanguage.msd" prefix="module" />
+      <zipfileset dir="${build.tmp}/customProcessors/copyModels/solutions-typechecking.samples.baseLanguage-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}coderules.ci.build.num=${coderules.ci.build.num}</echo>
   </target>
@@ -205,7 +176,7 @@
     <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="compileJava" depends="java.compile.jetbrains.mps.baseLanguageExt, java.compile.jetbrains.mps.baseLanguageExt.test, java.compile.typechecking.samples.baseLanguage" />
   
   <target name="processResources" />
   
@@ -315,10 +286,9 @@
       <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" />
+        <module file="${basedir}/solutions/typechecking.samples.baseLanguage/typechecking.samples.baseLanguage.msd" />
       </chunk>
       <jvmargs>
         <arg value="-Xmx512m" />
@@ -457,29 +427,16 @@
     </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">
+  <target name="java.compile.typechecking.samples.baseLanguage" depends="fetchDependencies">
+    <mkdir dir="${mps.macro.mpscore_home}/solutions/typechecking.samples.baseLanguage/source_gen" />
+    <mkdir dir="${build.tmp}/java/out/typechecking.samples.baseLanguage" />
+    <javac destdir="${build.tmp}/java/out/typechecking.samples.baseLanguage" 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/" />
+        <path location="${mps.macro.mpscore_home}/solutions/typechecking.samples.baseLanguage/source_gen" />
+        <pathelement path="${mps.macro.mpscore_home}/solutions/typechecking.samples.baseLanguage/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" />
@@ -638,8 +595,7 @@
     <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" />
+      <pathelement location="${build.layout}/deploy/typechecking.samples.baseLanguage.jar" />
     </path>
     <pathconvert pathsep="${path.separator}" property="mps.tests.path.string" refid="mps.tests.path" />
     <path id="long.class.path">
@@ -698,9 +654,8 @@
   <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/typechecking.samples.baseLanguage/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" />
+    <delete dir="${mps.macro.mpscore_home}/solutions/typechecking.samples.baseLanguage/test_gen" />
   </target>
 </project>
\ No newline at end of file
diff --git a/samples/mpscore/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample@tests.mps b/samples/mpscore/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample@tests.mps
deleted file mode 100644
index a927b830..00000000
--- a/samples/mpscore/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample@tests.mps
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:dfdbef38-4e11-48e8-9622-22e284fc6feb(jetbrains.mps.typechecking.sample@tests)">
-  <persistence version="9" />
-  <languages>
-    <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="0" />
-    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="6" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="11" />
-  </languages>
-  <imports />
-  <registry />
-</model>
-
diff --git a/samples/mpscore/solutions/jetbrains.mps.typechecking.sample/jetbrains.mps.typechecking.sample.msd b/samples/mpscore/solutions/jetbrains.mps.typechecking.sample/jetbrains.mps.typechecking.sample.msd
deleted file mode 100644
index 3ae99dfb..00000000
--- a/samples/mpscore/solutions/jetbrains.mps.typechecking.sample/jetbrains.mps.typechecking.sample.msd
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<solution name="jetbrains.mps.typechecking.sample" uuid="3ddddf69-9ff0-426b-9365-51ae7356fb82" moduleVersion="0" compileInMPS="true">
-  <models>
-    <modelRoot contentPath="${module}" type="default">
-      <sourceRoot location="models" />
-    </modelRoot>
-  </models>
-  <sourcePath />
-  <dependencies>
-    <dependency reexport="true">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
-  </dependencies>
-  <languageVersions>
-    <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="6" />
-    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
-    <language slang="l:0fda14cc-a416-4c81-869a-2175d8b3325d:jetbrains.mps.baseLanguageExt" version="0" />
-    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
-    <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
-    <language slang="l:0b80a2e8-f9f1-47b3-823f-56eb115bca42:jetbrains.mps.typechecking.annotation" version="0" />
-  </languageVersions>
-  <dependencyVersions>
-    <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
-    <module reference="3ddddf69-9ff0-426b-9365-51ae7356fb82(jetbrains.mps.typechecking.sample)" 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/samples.mpscore.build/models/samples.mpscore.build.mps
similarity index 90%
rename from samples/mpscore/solutions/jetbrains.mps.coderules.samples.mpscore.build/models/jetbrains.mps.coderules.samples.mpscore.build.mps
rename to samples/mpscore/solutions/samples.mpscore.build/models/samples.mpscore.build.mps
index 7a901db8..485ed533 100644
--- a/samples/mpscore/solutions/jetbrains.mps.coderules.samples.mpscore.build/models/jetbrains.mps.coderules.samples.mpscore.build.mps
+++ b/samples/mpscore/solutions/samples.mpscore.build/models/samples.mpscore.build.mps
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:249acb2d-9b26-41a4-8655-23aafe76a717(jetbrains.mps.coderules.samples.mpscore.build)">
+<model ref="r:249acb2d-9b26-41a4-8655-23aafe76a717(samples.mpscore.build)">
   <persistence version="9" />
   <languages>
     <use id="427a473d-5177-432c-9905-bcbceb71b996" name="jetbrains.mps.build.mps.runner" version="0" />
@@ -167,10 +167,7 @@
           <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" />
+          <ref role="L2wRA" node="69UmpDmJW3w" resolve="typechecking.samples.baseLanguage" />
         </node>
       </node>
     </node>
@@ -314,16 +311,17 @@
       </node>
       <node concept="1E1JtA" id="69UmpDmJW3w" role="2G$12L">
         <property role="BnDLt" value="true" />
-        <property role="TrG5h" value="jetbrains.mps.typechecking.sample" />
+        <property role="TrG5h" value="typechecking.samples.baseLanguage" />
         <property role="3LESm3" value="3ddddf69-9ff0-426b-9365-51ae7356fb82" />
         <property role="2GAjPV" value="false" />
+        <property role="aoJFB" value="sources and tests" />
         <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" />
+              <property role="2Ry0Am" value="typechecking.samples.baseLanguage" />
+              <node concept="2Ry0Ak" id="58VeaO3BgQU" role="2Ry0An">
+                <property role="2Ry0Am" value="typechecking.samples.baseLanguage.msd" />
               </node>
             </node>
           </node>
@@ -334,38 +332,14 @@
             <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">
+        <node concept="1SiIV0" id="58VeaO3BgR$" role="3bR37C">
+          <node concept="3bR9La" id="58VeaO3BgR_" 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">
+        <node concept="1SiIV0" id="58VeaO3BgRA" role="3bR37C">
+          <node concept="3bR9La" id="58VeaO3BgRB" role="1SiIV1">
             <property role="3bR36h" value="false" />
             <ref role="3bR37D" to="zqd8:65DJywFj0Fi" resolve="jetbrains.mps.typechecking" />
           </node>
diff --git a/samples/mpscore/solutions/jetbrains.mps.coderules.samples.mpscore.build/jetbrains.mps.coderules.samples.mpscore.build.msd b/samples/mpscore/solutions/samples.mpscore.build/samples.mpscore.build.msd
similarity index 87%
rename from samples/mpscore/solutions/jetbrains.mps.coderules.samples.mpscore.build/jetbrains.mps.coderules.samples.mpscore.build.msd
rename to samples/mpscore/solutions/samples.mpscore.build/samples.mpscore.build.msd
index e0eaa7af..f1ccc1ac 100644
--- a/samples/mpscore/solutions/jetbrains.mps.coderules.samples.mpscore.build/jetbrains.mps.coderules.samples.mpscore.build.msd
+++ b/samples/mpscore/solutions/samples.mpscore.build/samples.mpscore.build.msd
@@ -1,5 +1,5 @@
 <?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">
+<solution name="samples.mpscore.build" uuid="d1dbf8e7-cee5-45f7-8159-4c825af0fe7d" moduleVersion="0" compileInMPS="true">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -24,9 +24,9 @@
     <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" />
+    <module reference="d1dbf8e7-cee5-45f7-8159-4c825af0fe7d(samples.mpscore.build)" version="0" />
   </dependencyVersions>
 </solution>
 
diff --git a/samples/mpscore/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.bounds.bad@tests.mps b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/bounds.bad@tests.mps
similarity index 99%
rename from samples/mpscore/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.bounds.bad@tests.mps
rename to samples/mpscore/solutions/typechecking.samples.baseLanguage/models/bounds.bad@tests.mps
index 8c59164d..27bed5b5 100644
--- a/samples/mpscore/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.bounds.bad@tests.mps
+++ b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/bounds.bad@tests.mps
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:a202971f-09c7-4f25-ad39-9e8d7cea42b6(jetbrains.mps.typechecking.sample.bounds.bad@tests)">
+<model ref="r:824b7f7a-36f1-4ceb-b9c5-4f2330a84b68(typechecking.samples.baseLanguage.bounds.bad@tests)">
   <persistence version="9" />
   <languages>
+    <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="2" />
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="0" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="6" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="11" />
-    <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="2" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
   </languages>
   <imports>
-    <import index="7rut" ref="r:b1bec7fa-733c-4182-bbd4-b266e3d7e6db(jetbrains.mps.typechecking.sample.bounds.bad)" />
+    <import index="7rut" ref="r:b1bec7fa-733c-4182-bbd4-b266e3d7e6db(typechecking.samples.baseLanguage.bounds.bad)" />
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
     <import index="tj24" ref="r:0fbbb63a-fd15-46e1-8136-78049f6d6e63(jetbrains.mps.typechecking.service)" />
     <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" implicit="true" />
diff --git a/samples/mpscore/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.bounds@tests.mps b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/bounds@tests.mps
similarity index 99%
rename from samples/mpscore/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.bounds@tests.mps
rename to samples/mpscore/solutions/typechecking.samples.baseLanguage/models/bounds@tests.mps
index 0fa1dd9f..dc404bc4 100644
--- a/samples/mpscore/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.bounds@tests.mps
+++ b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/bounds@tests.mps
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:8ad218aa-30cf-43e1-943f-6aaa337bc0f1(jetbrains.mps.typechecking.sample.bounds@tests)">
+<model ref="r:3c98ca77-7294-4178-95ee-dc8a69bdf136(typechecking.samples.baseLanguage.bounds@tests)">
   <persistence version="9" />
   <languages>
-    <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="0" />
     <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="2" />
+    <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="0" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="6" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="11" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="0" />
@@ -12,7 +12,7 @@
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
   </languages>
   <imports>
-    <import index="f6t6" ref="r:9993217f-5bfa-4281-bc47-527677747cb2(jetbrains.mps.typechecking.sample.bounds)" />
+    <import index="f6t6" ref="r:9993217f-5bfa-4281-bc47-527677747cb2(typechecking.samples.baseLanguage.bounds)" />
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
     <import index="tj24" ref="r:0fbbb63a-fd15-46e1-8136-78049f6d6e63(jetbrains.mps.typechecking.service)" />
     <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" implicit="true" />
diff --git a/samples/mpscore/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.codeAnal@tests.mps b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/codeAnal@tests.mps
similarity index 98%
rename from samples/mpscore/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.codeAnal@tests.mps
rename to samples/mpscore/solutions/typechecking.samples.baseLanguage/models/codeAnal@tests.mps
index 267e37c9..823dda31 100644
--- a/samples/mpscore/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.codeAnal@tests.mps
+++ b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/codeAnal@tests.mps
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:74d091dd-b4c4-4c22-9b9e-48f0c0d02732(jetbrains.mps.typechecking.sample.codeAnal@tests)">
+<model ref="r:89f58693-874d-4459-b352-b95efabcc527(typechecking.samples.baseLanguage.codeAnal@tests)">
   <persistence version="9" />
   <languages>
     <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="2" />
@@ -12,7 +12,7 @@
     <use id="446c26eb-2b7b-4bf0-9b35-f83fa582753e" name="jetbrains.mps.lang.modelapi" version="0" />
   </languages>
   <imports>
-    <import index="hwt6" ref="r:1f3a7853-f20c-4f91-9912-5e82d9d1651a(jetbrains.mps.typechecking.sample.codeAnal)" />
+    <import index="hwt6" ref="r:1f3a7853-f20c-4f91-9912-5e82d9d1651a(typechecking.samples.baseLanguage.codeAnal)" />
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
     <import index="tj24" ref="r:0fbbb63a-fd15-46e1-8136-78049f6d6e63(jetbrains.mps.typechecking.service)" />
     <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" implicit="true" />
diff --git a/samples/mpscore/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.helloWorld@tests.mps b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/helloWorld@tests.mps
similarity index 99%
rename from samples/mpscore/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.helloWorld@tests.mps
rename to samples/mpscore/solutions/typechecking.samples.baseLanguage/models/helloWorld@tests.mps
index 81ad51e0..1bbe129a 100644
--- a/samples/mpscore/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.helloWorld@tests.mps
+++ b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/helloWorld@tests.mps
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:4d0004a7-688b-46e2-9a51-6d4553087b2c(jetbrains.mps.typechecking.sample.helloWorld@tests)">
+<model ref="r:f8b60e06-37d4-4bdb-8c1d-f824bd01dff4(typechecking.samples.baseLanguage.helloWorld@tests)">
   <persistence version="9" />
   <languages>
-    <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="0" />
     <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="2" />
+    <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="0" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="11" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
   </languages>
   <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="bs09" ref="r:28026be8-9bf8-4f54-9319-0ca8a6d1299d(typechecking.samples.baseLanguage.helloWorld)" />
     <import index="tj24" ref="r:0fbbb63a-fd15-46e1-8136-78049f6d6e63(jetbrains.mps.typechecking.service)" />
     <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" implicit="true" />
     <import index="z1c3" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project(MPS.Core/)" implicit="true" />
diff --git a/samples/mpscore/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.simpleGenerics@tests.mps b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/simpleGenerics@tests.mps
similarity index 99%
rename from samples/mpscore/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.simpleGenerics@tests.mps
rename to samples/mpscore/solutions/typechecking.samples.baseLanguage/models/simpleGenerics@tests.mps
index b954120a..7ea61133 100644
--- a/samples/mpscore/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.simpleGenerics@tests.mps
+++ b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/simpleGenerics@tests.mps
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:f0251dd8-330d-4d61-a7ea-bb5950a5a85a(jetbrains.mps.typechecking.sample.simpleGenerics@tests)">
+<model ref="r:eff88867-8c71-468f-947b-72ebaca06455(typechecking.samples.baseLanguage.simpleGenerics@tests)">
   <persistence version="9" />
   <languages>
-    <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="0" />
     <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="2" />
+    <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="0" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="11" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
   </languages>
   <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="waaz" ref="r:5669dd77-177e-474f-8fb2-c015a8eb4306(typechecking.samples.baseLanguage.simpleGenerics)" />
     <import index="tj24" ref="r:0fbbb63a-fd15-46e1-8136-78049f6d6e63(jetbrains.mps.typechecking.service)" />
     <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" implicit="true" />
     <import index="z1c3" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project(MPS.Core/)" implicit="true" />
diff --git a/samples/mpscore/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.slice@tests.mps b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/slice@tests.mps
similarity index 99%
rename from samples/mpscore/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.slice@tests.mps
rename to samples/mpscore/solutions/typechecking.samples.baseLanguage/models/slice@tests.mps
index de7e1a18..0693de37 100644
--- a/samples/mpscore/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.slice@tests.mps
+++ b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/slice@tests.mps
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:5a2264dd-763c-4885-aafc-b21e89958de8(jetbrains.mps.typechecking.sample.slice@tests)">
+<model ref="r:0972c651-627a-4ccd-a36d-473e448a2f07(typechecking.samples.baseLanguage.slice@tests)">
   <persistence version="9" />
   <languages>
-    <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="0" />
     <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="2" />
+    <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="0" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="11" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
   </languages>
   <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="9oqm" ref="r:a8ff5933-0f6e-4d4a-af4a-5da865d78faf(typechecking.samples.baseLanguage.slice)" />
     <import index="tj24" ref="r:0fbbb63a-fd15-46e1-8136-78049f6d6e63(jetbrains.mps.typechecking.service)" />
     <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" implicit="true" />
     <import index="z1c3" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project(MPS.Core/)" implicit="true" />
diff --git a/samples/mpscore/solutions/jetbrains.mps.typechecking.sample/models/jetbrains.mps.typechecking.sample.bounds.bad.mps b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/typechecking.samples.baseLanguage.bounds.bad.mps
similarity index 99%
rename from samples/mpscore/solutions/jetbrains.mps.typechecking.sample/models/jetbrains.mps.typechecking.sample.bounds.bad.mps
rename to samples/mpscore/solutions/typechecking.samples.baseLanguage/models/typechecking.samples.baseLanguage.bounds.bad.mps
index 5aaa7077..1da28c73 100644
--- a/samples/mpscore/solutions/jetbrains.mps.typechecking.sample/models/jetbrains.mps.typechecking.sample.bounds.bad.mps
+++ b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/typechecking.samples.baseLanguage.bounds.bad.mps
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:b1bec7fa-733c-4182-bbd4-b266e3d7e6db(jetbrains.mps.typechecking.sample.bounds.bad)" doNotGenerate="true">
+<model ref="r:b1bec7fa-733c-4182-bbd4-b266e3d7e6db(typechecking.samples.baseLanguage.bounds.bad)" doNotGenerate="true">
   <persistence version="9" />
   <languages>
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="6" />
diff --git a/samples/mpscore/solutions/jetbrains.mps.typechecking.sample/models/jetbrains.mps.typechecking.sample.bounds.mps b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/typechecking.samples.baseLanguage.bounds.mps
similarity index 99%
rename from samples/mpscore/solutions/jetbrains.mps.typechecking.sample/models/jetbrains.mps.typechecking.sample.bounds.mps
rename to samples/mpscore/solutions/typechecking.samples.baseLanguage/models/typechecking.samples.baseLanguage.bounds.mps
index 80c23bc2..a29fe761 100644
--- a/samples/mpscore/solutions/jetbrains.mps.typechecking.sample/models/jetbrains.mps.typechecking.sample.bounds.mps
+++ b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/typechecking.samples.baseLanguage.bounds.mps
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:9993217f-5bfa-4281-bc47-527677747cb2(jetbrains.mps.typechecking.sample.bounds)" doNotGenerate="true">
+<model ref="r:9993217f-5bfa-4281-bc47-527677747cb2(typechecking.samples.baseLanguage.bounds)" doNotGenerate="true">
   <persistence version="9" />
   <languages>
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="6" />
diff --git a/samples/mpscore/solutions/jetbrains.mps.typechecking.sample/models/jetbrains.mps.typechecking.sample.codeAnal.mps b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/typechecking.samples.baseLanguage.codeAnal.mps
similarity index 99%
rename from samples/mpscore/solutions/jetbrains.mps.typechecking.sample/models/jetbrains.mps.typechecking.sample.codeAnal.mps
rename to samples/mpscore/solutions/typechecking.samples.baseLanguage/models/typechecking.samples.baseLanguage.codeAnal.mps
index a7764fee..54448dde 100644
--- a/samples/mpscore/solutions/jetbrains.mps.typechecking.sample/models/jetbrains.mps.typechecking.sample.codeAnal.mps
+++ b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/typechecking.samples.baseLanguage.codeAnal.mps
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:1f3a7853-f20c-4f91-9912-5e82d9d1651a(jetbrains.mps.typechecking.sample.codeAnal)" doNotGenerate="true">
+<model ref="r:1f3a7853-f20c-4f91-9912-5e82d9d1651a(typechecking.samples.baseLanguage.codeAnal)" doNotGenerate="true">
   <persistence version="9" />
   <languages>
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="6" />
diff --git a/samples/mpscore/solutions/jetbrains.mps.typechecking.sample/models/jetbrains.mps.typechecking.sample.helloWorld.mps b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/typechecking.samples.baseLanguage.helloWorld.mps
similarity index 99%
rename from samples/mpscore/solutions/jetbrains.mps.typechecking.sample/models/jetbrains.mps.typechecking.sample.helloWorld.mps
rename to samples/mpscore/solutions/typechecking.samples.baseLanguage/models/typechecking.samples.baseLanguage.helloWorld.mps
index ee87d470..e36c62f7 100644
--- a/samples/mpscore/solutions/jetbrains.mps.typechecking.sample/models/jetbrains.mps.typechecking.sample.helloWorld.mps
+++ b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/typechecking.samples.baseLanguage.helloWorld.mps
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:28026be8-9bf8-4f54-9319-0ca8a6d1299d(jetbrains.mps.typechecking.sample.helloWorld)" doNotGenerate="true">
+<model ref="r:28026be8-9bf8-4f54-9319-0ca8a6d1299d(typechecking.samples.baseLanguage.helloWorld)" doNotGenerate="true">
   <persistence version="9" />
   <languages>
     <use id="0b80a2e8-f9f1-47b3-823f-56eb115bca42" name="jetbrains.mps.typechecking.annotation" version="0" />
diff --git a/samples/mpscore/solutions/jetbrains.mps.typechecking.sample/models/jetbrains.mps.typechecking.sample.simpleGenerics.mps b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/typechecking.samples.baseLanguage.simpleGenerics.mps
similarity index 99%
rename from samples/mpscore/solutions/jetbrains.mps.typechecking.sample/models/jetbrains.mps.typechecking.sample.simpleGenerics.mps
rename to samples/mpscore/solutions/typechecking.samples.baseLanguage/models/typechecking.samples.baseLanguage.simpleGenerics.mps
index cfe89655..04e9fc34 100644
--- a/samples/mpscore/solutions/jetbrains.mps.typechecking.sample/models/jetbrains.mps.typechecking.sample.simpleGenerics.mps
+++ b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/typechecking.samples.baseLanguage.simpleGenerics.mps
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:5669dd77-177e-474f-8fb2-c015a8eb4306(jetbrains.mps.typechecking.sample.simpleGenerics)" doNotGenerate="true">
+<model ref="r:5669dd77-177e-474f-8fb2-c015a8eb4306(typechecking.samples.baseLanguage.simpleGenerics)" doNotGenerate="true">
   <persistence version="9" />
   <languages>
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="6" />
diff --git a/samples/mpscore/solutions/jetbrains.mps.typechecking.sample/models/jetbrains.mps.typechecking.sample.slice.mps b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/typechecking.samples.baseLanguage.slice.mps
similarity index 99%
rename from samples/mpscore/solutions/jetbrains.mps.typechecking.sample/models/jetbrains.mps.typechecking.sample.slice.mps
rename to samples/mpscore/solutions/typechecking.samples.baseLanguage/models/typechecking.samples.baseLanguage.slice.mps
index 847d0df3..832b3bcc 100644
--- a/samples/mpscore/solutions/jetbrains.mps.typechecking.sample/models/jetbrains.mps.typechecking.sample.slice.mps
+++ b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/typechecking.samples.baseLanguage.slice.mps
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:a8ff5933-0f6e-4d4a-af4a-5da865d78faf(jetbrains.mps.typechecking.sample.slice)" doNotGenerate="true">
+<model ref="r:a8ff5933-0f6e-4d4a-af4a-5da865d78faf(typechecking.samples.baseLanguage.slice)" doNotGenerate="true">
   <persistence version="9" />
   <languages>
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="6" />
diff --git a/samples/mpscore/solutions/jetbrains.mps.typechecking.sample.test/jetbrains.mps.typechecking.sample.test.msd b/samples/mpscore/solutions/typechecking.samples.baseLanguage/typechecking.samples.baseLanguage.msd
similarity index 88%
rename from samples/mpscore/solutions/jetbrains.mps.typechecking.sample.test/jetbrains.mps.typechecking.sample.test.msd
rename to samples/mpscore/solutions/typechecking.samples.baseLanguage/typechecking.samples.baseLanguage.msd
index 865cf838..ee79eb10 100644
--- a/samples/mpscore/solutions/jetbrains.mps.typechecking.sample.test/jetbrains.mps.typechecking.sample.test.msd
+++ b/samples/mpscore/solutions/typechecking.samples.baseLanguage/typechecking.samples.baseLanguage.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="jetbrains.mps.typechecking.sample.test" uuid="1b65dfe8-24ff-41c3-9a3e-70f102942455" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="typechecking.samples.baseLanguage" uuid="3ddddf69-9ff0-426b-9365-51ae7356fb82" moduleVersion="0" compileInMPS="true">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -7,7 +7,7 @@
   </models>
   <sourcePath />
   <dependencies>
-    <dependency reexport="false">3ddddf69-9ff0-426b-9365-51ae7356fb82(jetbrains.mps.typechecking.sample)</dependency>
+    <dependency reexport="true">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
     <dependency reexport="false">6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.typechecking)</dependency>
   </dependencies>
@@ -27,6 +27,7 @@
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="11" />
     <language slang="l:8585453e-6bfb-4d80-98de-b16074f1d86c:jetbrains.mps.lang.test" version="2" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
+    <language slang="l:0b80a2e8-f9f1-47b3-823f-56eb115bca42:jetbrains.mps.typechecking.annotation" version="0" />
   </languageVersions>
   <dependencyVersions>
     <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
@@ -46,8 +47,7 @@
     <module reference="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" version="0" />
     <module reference="da80355b-a098-4248-9ec8-70d10dd7e9af(jetbrains.mps.reporting.runtime)" version="0" />
     <module reference="6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.typechecking)" version="0" />
-    <module reference="3ddddf69-9ff0-426b-9365-51ae7356fb82(jetbrains.mps.typechecking.sample)" version="0" />
-    <module reference="1b65dfe8-24ff-41c3-9a3e-70f102942455(jetbrains.mps.typechecking.sample.test)" version="0" />
+    <module reference="3ddddf69-9ff0-426b-9365-51ae7356fb82(typechecking.samples.baseLanguage)" version="0" />
   </dependencyVersions>
 </solution>
 
diff --git a/samples/mpscore/solutions/jetbrains.mps.typechecking.sample/typesystem2.sandbox.sample.iml b/samples/mpscore/solutions/typechecking.samples.baseLanguage/typesystem2.sandbox.sample.iml
similarity index 100%
rename from samples/mpscore/solutions/jetbrains.mps.typechecking.sample/typesystem2.sandbox.sample.iml
rename to samples/mpscore/solutions/typechecking.samples.baseLanguage/typesystem2.sandbox.sample.iml