diff --git a/.mps/modules.xml b/.mps/modules.xml
index 9e1cf017..e1da4ab3 100644
--- a/.mps/modules.xml
+++ b/.mps/modules.xml
@@ -12,10 +12,10 @@
       <modulePath path="$PROJECT_DIR$/logic/solutions/jetbrains.mps.logic.jchr/jetbrains.mps.logic.jchr.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$/solutions/jetbrains.mps.lang.typesystem2.sample.test/jetbrains.mps.lang.typesystem2.sample.test.msd" folder="typechecking.sample" />
       <modulePath path="$PROJECT_DIR$/solutions/jetbrains.mps.typechecking.handling/jetbrains.mps.typechecking.handling.msd" folder="typechecking.template.handler.chr" />
       <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.lang.typesystem.sample/jetbrains.mps.lang.typesystem2.sample.msd" folder="typechecking.sample" />
+      <modulePath path="$PROJECT_DIR$/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/jetbrains.mps.lang.typesystem2.sample.test.msd" folder="typechecking.sample" />
+      <modulePath path="$PROJECT_DIR$/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/jetbrains.mps.lang.typesystem2.sample.msd" folder="typechecking.sample" />
       <modulePath path="$PROJECT_DIR$/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.test/jetbrains.mps.lang.typesystem2.samplechecker.handler.test.msd" folder="typechecking.template.handler" />
       <modulePath path="$PROJECT_DIR$/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/jetbrains.mps.lang.typesystem2.samplechecker.handler.util.msd" folder="typechecking.template.handler" />
       <modulePath path="$PROJECT_DIR$/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler/jetbrains.mps.lang.typesystem2.samplechecker.handler.msd" folder="typechecking.template.handler.chr" />
@@ -29,4 +29,4 @@
       <modulePath path="$PROJECT_DIR$/typesystem2/solutions/jetbrains.mps.lang.typesystem2.test/jetbrains.mps.lang.typesystem2.test/jetbrains.mps.lang.typesystem2.test.msd" folder="typesystem2" />
     </projectModules>
   </component>
-</project>
\ No newline at end of file
+</project>
diff --git a/solutions/jetbrains.mps.lang.typesystem2.sample.test/jetbrains.mps.lang.typesystem2.sample.test.msd b/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/jetbrains.mps.lang.typesystem2.sample.test.msd
similarity index 100%
rename from solutions/jetbrains.mps.lang.typesystem2.sample.test/jetbrains.mps.lang.typesystem2.sample.test.msd
rename to typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/jetbrains.mps.lang.typesystem2.sample.test.msd
diff --git a/solutions/jetbrains.mps.lang.typesystem2.sample.test/models/jetbrains/mps/lang/typesystem2/sample/bounds@tests.mps b/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/models/jetbrains/mps/lang/typesystem2/sample/bounds@tests.mps
similarity index 100%
rename from solutions/jetbrains.mps.lang.typesystem2.sample.test/models/jetbrains/mps/lang/typesystem2/sample/bounds@tests.mps
rename to typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/models/jetbrains/mps/lang/typesystem2/sample/bounds@tests.mps
diff --git a/solutions/jetbrains.mps.lang.typesystem2.sample.test/models/jetbrains/mps/lang/typesystem2/sample/helloWorld@tests.mps b/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/models/jetbrains/mps/lang/typesystem2/sample/helloWorld@tests.mps
similarity index 100%
rename from solutions/jetbrains.mps.lang.typesystem2.sample.test/models/jetbrains/mps/lang/typesystem2/sample/helloWorld@tests.mps
rename to typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/models/jetbrains/mps/lang/typesystem2/sample/helloWorld@tests.mps
diff --git a/solutions/jetbrains.mps.lang.typesystem2.sample.test/models/jetbrains/mps/lang/typesystem2/sample/simpleGenerics@tests.mps b/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/models/jetbrains/mps/lang/typesystem2/sample/simpleGenerics@tests.mps
similarity index 100%
rename from solutions/jetbrains.mps.lang.typesystem2.sample.test/models/jetbrains/mps/lang/typesystem2/sample/simpleGenerics@tests.mps
rename to typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/models/jetbrains/mps/lang/typesystem2/sample/simpleGenerics@tests.mps
diff --git a/solutions/jetbrains.mps.lang.typesystem2.sample.test/models/jetbrains/mps/lang/typesystem2/sample/slice@tests.mps b/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/models/jetbrains/mps/lang/typesystem2/sample/slice@tests.mps
similarity index 100%
rename from solutions/jetbrains.mps.lang.typesystem2.sample.test/models/jetbrains/mps/lang/typesystem2/sample/slice@tests.mps
rename to typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/models/jetbrains/mps/lang/typesystem2/sample/slice@tests.mps
diff --git a/solutions/jetbrains.mps.lang.typesystem2.sample.test/models/jetbrains/mps/lang/typesystem2/sample@tests.mps b/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/models/jetbrains/mps/lang/typesystem2/sample@tests.mps
similarity index 100%
rename from solutions/jetbrains.mps.lang.typesystem2.sample.test/models/jetbrains/mps/lang/typesystem2/sample@tests.mps
rename to typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/models/jetbrains/mps/lang/typesystem2/sample@tests.mps
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem.sample/jetbrains.mps.lang.typesystem2.sample.msd b/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/jetbrains.mps.lang.typesystem2.sample.msd
similarity index 100%
rename from typechecking/solutions/jetbrains.mps.lang.typesystem.sample/jetbrains.mps.lang.typesystem2.sample.msd
rename to typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/jetbrains.mps.lang.typesystem2.sample.msd
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem.sample/models/jetbrains/mps/lang/typesystem2/sample/bounds.mps b/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/models/jetbrains/mps/lang/typesystem2/sample/bounds.mps
similarity index 100%
rename from typechecking/solutions/jetbrains.mps.lang.typesystem.sample/models/jetbrains/mps/lang/typesystem2/sample/bounds.mps
rename to typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/models/jetbrains/mps/lang/typesystem2/sample/bounds.mps
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem.sample/models/jetbrains/mps/lang/typesystem2/sample/helloWorld.mps b/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/models/jetbrains/mps/lang/typesystem2/sample/helloWorld.mps
similarity index 100%
rename from typechecking/solutions/jetbrains.mps.lang.typesystem.sample/models/jetbrains/mps/lang/typesystem2/sample/helloWorld.mps
rename to typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/models/jetbrains/mps/lang/typesystem2/sample/helloWorld.mps
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem.sample/models/jetbrains/mps/lang/typesystem2/sample/simpleGenerics.mps b/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/models/jetbrains/mps/lang/typesystem2/sample/simpleGenerics.mps
similarity index 100%
rename from typechecking/solutions/jetbrains.mps.lang.typesystem.sample/models/jetbrains/mps/lang/typesystem2/sample/simpleGenerics.mps
rename to typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/models/jetbrains/mps/lang/typesystem2/sample/simpleGenerics.mps
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem.sample/models/jetbrains/mps/lang/typesystem2/sample/slice.mps b/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/models/jetbrains/mps/lang/typesystem2/sample/slice.mps
similarity index 100%
rename from typechecking/solutions/jetbrains.mps.lang.typesystem.sample/models/jetbrains/mps/lang/typesystem2/sample/slice.mps
rename to typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/models/jetbrains/mps/lang/typesystem2/sample/slice.mps
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem.sample/typesystem2.sandbox.sample.iml b/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/typesystem2.sandbox.sample.iml
similarity index 100%
rename from typechecking/solutions/jetbrains.mps.lang.typesystem.sample/typesystem2.sandbox.sample.iml
rename to typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/typesystem2.sandbox.sample.iml