diff --git a/.gitmodules b/.gitmodules
index 6ebb8ed2..14cafaa0 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "mps--unification"]
-	path = languages/jetbrains.mps.logic/solutions/jetbrains.mps.logic.atom/imports/mps-unification
+	path = logic/solutions/jetbrains.mps.logic.atom/imports/mps-unification
 	url = git@github.com:fisakov/mps-unification.git
diff --git a/.idea/libraries/jchr.xml b/.idea/libraries/jchr.xml
index 31cfbfe5..8dcf1a6e 100644
--- a/.idea/libraries/jchr.xml
+++ b/.idea/libraries/jchr.xml
@@ -1,14 +1,14 @@
 <component name="libraryTable">
   <library name="jchr">
     <CLASSES>
-      <root url="file://$PROJECT_DIR$/languages/jetbrains.mps.jchr/runtime/lib" />
+        <root url="file://$PROJECT_DIR$/jchr/languages/jetbrains.mps.jchr/runtime/lib" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="file://$PROJECT_DIR$/languages/jetbrains.mps.jchr/runtime/lib" />
-      <root url="jar://$PROJECT_DIR$/languages/jetbrains.mps.jchr/runtime/lib/KULeuven_JCHR.zip!/JCHR v1.6.0" />
+        <root url="file://$PROJECT_DIR$/jchr/languages/jetbrains.mps.jchr/runtime/lib" />
+        <root url="jar://$PROJECT_DIR$/jchr/languages/jetbrains.mps.jchr/runtime/lib/KULeuven_JCHR.zip!/JCHR v1.6.0" />
     </SOURCES>
-    <jarDirectory url="file://$PROJECT_DIR$/languages/jetbrains.mps.jchr/runtime/lib" recursive="false" />
-    <jarDirectory url="file://$PROJECT_DIR$/languages/jetbrains.mps.jchr/runtime/lib" recursive="false" type="SOURCES" />
+    <jarDirectory url="file://$PROJECT_DIR$/jchr/languages/jetbrains.mps.jchr/runtime/lib" recursive="false" />
+    <jarDirectory url="file://$PROJECT_DIR$/jchr/languages/jetbrains.mps.jchr/runtime/lib" recursive="false" type="SOURCES" />
   </library>
-</component>
\ No newline at end of file
+</component>
diff --git a/.idea/libraries/mockito_core_2_0_3_beta.xml b/.idea/libraries/mockito_core_2_0_3_beta.xml
index 8f0156a2..525516b0 100644
--- a/.idea/libraries/mockito_core_2_0_3_beta.xml
+++ b/.idea/libraries/mockito_core_2_0_3_beta.xml
@@ -1,12 +1,12 @@
 <component name="libraryTable">
   <library name="mockito-core-2.0.3-beta">
     <CLASSES>
-      <root url="jar://$PROJECT_DIR$/languages/jetbrains.mps.logic/test/lib/mockito-core-2.0.3-beta.jar!/" />
-      <root url="jar://$PROJECT_DIR$/languages/jetbrains.mps.logic/test/lib/objenesis-2.1.jar!/" />
+        <root url="jar://$PROJECT_DIR$/logic/solutions/jetbrains.mps.logic.test/lib/mockito-core-2.0.3-beta.jar!/" />
+        <root url="jar://$PROJECT_DIR$/logic/solutions/jetbrains.mps.logic.test/lib/objenesis-2.1.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$PROJECT_DIR$/languages/jetbrains.mps.logic/test/lib/mockito-core-2.0.3-beta.jar!/" />
+        <root url="jar://$PROJECT_DIR$/logic/solutions/jetbrains.mps.logic.test/lib/mockito-core-2.0.3-beta.jar!/" />
     </SOURCES>
   </library>
-</component>
\ No newline at end of file
+</component>
diff --git a/.idea/libraries/mps_unification.xml b/.idea/libraries/mps_unification.xml
index 4c08cf2f..4b22377e 100644
--- a/.idea/libraries/mps_unification.xml
+++ b/.idea/libraries/mps_unification.xml
@@ -1,10 +1,10 @@
 <component name="libraryTable">
   <library name="mps-unification">
     <CLASSES>
-      <root url="file://$PROJECT_DIR$/languages/jetbrains.mps.logic/solutions/jetbrains.mps.logic.atom/imports/mps-unification/lib" />
+      <root url="file://$PROJECT_DIR$/logic/solutions/jetbrains.mps.logic.atom/imports/mps-unification/lib" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
-    <jarDirectory url="file://$PROJECT_DIR$/languages/jetbrains.mps.logic/solutions/jetbrains.mps.logic.atom/imports/mps-unification/lib" recursive="false" />
+    <jarDirectory url="file://$PROJECT_DIR$/logic/solutions/jetbrains.mps.logic.atom/imports/mps-unification/lib" recursive="false" />
   </library>
-</component>
\ No newline at end of file
+</component>
diff --git a/.idea/modules.xml b/.idea/modules.xml
index ed0edbf4..2e9aa6aa 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,17 +2,17 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/languages/jetbrains.mps.logic/solutions/jetbrains.mps.logic.atom/Atom.iml" filepath="$PROJECT_DIR$/languages/jetbrains.mps.logic/solutions/jetbrains.mps.logic.atom/Atom.iml" />
-      <module fileurl="file://$PROJECT_DIR$/languages/jetbrains.mps.jchr/JCHR.iml" filepath="$PROJECT_DIR$/languages/jetbrains.mps.jchr/JCHR.iml" />
-      <module fileurl="file://$PROJECT_DIR$/languages/jetbrains.mps.logic/Logic.iml" filepath="$PROJECT_DIR$/languages/jetbrains.mps.logic/Logic.iml" />
-      <module fileurl="file://$PROJECT_DIR$/languages/jetbrains.mps.logic/jchr/Logic.jchr.iml" filepath="$PROJECT_DIR$/languages/jetbrains.mps.logic/jchr/Logic.jchr.iml" />
-      <module fileurl="file://$PROJECT_DIR$/languages/jetbrains.mps.logic/reactor/Logic.reactor.iml" filepath="$PROJECT_DIR$/languages/jetbrains.mps.logic/reactor/Logic.reactor.iml" />
-      <module fileurl="file://$PROJECT_DIR$/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker/jetbrains.mps.lang.typesystem2.samplechecker.iml" filepath="$PROJECT_DIR$/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker/jetbrains.mps.lang.typesystem2.samplechecker.iml" />
-      <module fileurl="file://$PROJECT_DIR$/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.handler/samplechecker.handler.iml" filepath="$PROJECT_DIR$/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.handler/samplechecker.handler.iml" />
-      <module fileurl="file://$PROJECT_DIR$/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/samplechecker.handler.util.iml" filepath="$PROJECT_DIR$/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/samplechecker.handler.util.iml" />
-      <module fileurl="file://$PROJECT_DIR$/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.runner/samplechecker.runner.iml" filepath="$PROJECT_DIR$/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.runner/samplechecker.runner.iml" />
-      <module fileurl="file://$PROJECT_DIR$/languages/jetbrains.mps.lang.typesystem2/runtime/typesystem2.runtime.iml" filepath="$PROJECT_DIR$/languages/jetbrains.mps.lang.typesystem2/runtime/typesystem2.runtime.iml" />
-      <module fileurl="file://$PROJECT_DIR$/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem.sample/typesystem2.sandbox.sample.iml" filepath="$PROJECT_DIR$/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem.sample/typesystem2.sandbox.sample.iml" />
+      <module fileurl="file://$PROJECT_DIR$/logic/solutions/jetbrains.mps.logic.atom/Atom.iml" filepath="$PROJECT_DIR$/logic/solutions/jetbrains.mps.logic.atom/Atom.iml" />
+      <module fileurl="file://$PROJECT_DIR$/jchr/languages/jetbrains.mps.jchr/JCHR.iml" filepath="$PROJECT_DIR$/jchr/languages/jetbrains.mps.jchr/JCHR.iml" />
+      <module fileurl="file://$PROJECT_DIR$/logic/languages/jetbrains.mps.logic/Logic.iml" filepath="$PROJECT_DIR$/logic/languages/jetbrains.mps.logic/Logic.iml" />
+      <module fileurl="file://$PROJECT_DIR$/logic/solutions/jetbrains.mps.logic.jchr/Logic.jchr.iml" filepath="$PROJECT_DIR$/logic/solutions/jetbrains.mps.logic.jchr/Logic.jchr.iml" />
+      <module fileurl="file://$PROJECT_DIR$/logic/solutions/jetbrains.mps.logic.reactor/Logic.reactor.iml" filepath="$PROJECT_DIR$/logic/solutions/jetbrains.mps.logic.reactor/Logic.reactor.iml" />
+      <module fileurl="file://$PROJECT_DIR$/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker/jetbrains.mps.lang.typesystem2.samplechecker.iml" filepath="$PROJECT_DIR$/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker/jetbrains.mps.lang.typesystem2.samplechecker.iml" />
+      <module fileurl="file://$PROJECT_DIR$/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler/samplechecker.handler.iml" filepath="$PROJECT_DIR$/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler/samplechecker.handler.iml" />
+      <module fileurl="file://$PROJECT_DIR$/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/samplechecker.handler.util.iml" filepath="$PROJECT_DIR$/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/samplechecker.handler.util.iml" />
+      <module fileurl="file://$PROJECT_DIR$/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.runner/samplechecker.runner.iml" filepath="$PROJECT_DIR$/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.runner/samplechecker.runner.iml" />
+      <module fileurl="file://$PROJECT_DIR$/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/typesystem2.runtime.iml" filepath="$PROJECT_DIR$/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/typesystem2.runtime.iml" />
+      <module fileurl="file://$PROJECT_DIR$/typechecking/solutions/jetbrains.mps.lang.typesystem.sample/typesystem2.sandbox.sample.iml" filepath="$PROJECT_DIR$/typechecking/solutions/jetbrains.mps.lang.typesystem.sample/typesystem2.sandbox.sample.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/.mps/modules.xml b/.mps/modules.xml
index 3586d650..f6d55e17 100644
--- a/.mps/modules.xml
+++ b/.mps/modules.xml
@@ -2,34 +2,32 @@
 <project version="4">
   <component name="MPSProject">
     <projectModules>
-      <modulePath path="$PROJECT_DIR$/languages/jetbrains.mps.jchr/jetbrains.mps.jchr.mpl" folder="jchr" />
-      <modulePath path="$PROJECT_DIR$/languages/jetbrains.mps.jchr/runtime/jetbrains.mps.jchr.runtime.msd" folder="jchr" />
-      <modulePath path="$PROJECT_DIR$/languages/jetbrains.mps.jchr/sandbox/jetbrains.mps.jchr.sandbox.msd" folder="jchr" />
-      <modulePath path="$PROJECT_DIR$/languages/jetbrains.mps.jchr/sandbox/runner/jetbrains.mps.jchr.sandbox.runner.msd" folder="jchr" />
-      <modulePath path="$PROJECT_DIR$/languages/jetbrains.mps.lang.typesystem2/jetbrains.mps.lang.typesystem2.mpl" folder="typesystem2" />
-      <modulePath path="$PROJECT_DIR$/languages/jetbrains.mps.lang.typesystem2/runtime/jetbrains.mps.lang.typesystem2.runtime.msd" folder="typesystem2.runtime" />
-      <modulePath path="$PROJECT_DIR$/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem.sample/jetbrains.mps.lang.typesystem2.sample.msd" folder="typechecking.sample" />
-      <modulePath path="$PROJECT_DIR$/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.handler.test/jetbrains.mps.lang.typesystem2.samplechecker.handler.test.msd" folder="typechecking.checker" />
-      <modulePath path="$PROJECT_DIR$/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/jetbrains.mps.lang.typesystem2.samplechecker.handler.util.msd" folder="typechecking.checker" />
-      <modulePath path="$PROJECT_DIR$/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.handler/jetbrains.mps.lang.typesystem2.samplechecker.handler.msd" folder="typechecking.checker" />
-      <modulePath path="$PROJECT_DIR$/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.runner/jetbrains.mps.lang.typesystem2.samplechecker.runner.msd" folder="typechecking.checker" />
-      <modulePath path="$PROJECT_DIR$/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.test/jetbrains.mps.lang.typesystem2.samplechecker.test.msd" folder="typechecking.checker" />
-      <modulePath path="$PROJECT_DIR$/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker/jetbrains.mps.lang.typesystem2.samplechecker.msd" folder="typechecking.checker" />
-      <modulePath path="$PROJECT_DIR$/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.sampleplugin/jetbrains.mps.lang.typesystem2.sampleplugin.msd" folder="typechecking.plugin" />
-      <modulePath path="$PROJECT_DIR$/languages/jetbrains.mps.lang.typesystem2/template/jetbrains.mps.lang.typesystem2.template.msd" folder="typesystem2.runtime" />
-      <modulePath path="$PROJECT_DIR$/languages/jetbrains.mps.lang.typesystem2/test/jetbrains.mps.lang.typesystem2.test/jetbrains.mps.lang.typesystem2.test.msd" folder="typesystem2" />
-      <modulePath path="$PROJECT_DIR$/languages/jetbrains.mps.logic/jchr/jetbrains.mps.logic.jchr.msd" folder="logic" />
-      <modulePath path="$PROJECT_DIR$/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl" folder="logic" />
-      <modulePath path="$PROJECT_DIR$/languages/jetbrains.mps.logic/reactor/jetbrains.mps.logic.reactor.msd" folder="logic" />
-      <modulePath path="$PROJECT_DIR$/languages/jetbrains.mps.logic/runtime/jetbrains.mps.logic.runtime.msd" folder="logic" />
-      <modulePath path="$PROJECT_DIR$/languages/jetbrains.mps.logic/sandbox/jetbrains.mps.logic.sandbox.msd" folder="logic" />
-      <modulePath path="$PROJECT_DIR$/languages/jetbrains.mps.logic/sandbox/runner/jetbrains.mps.logic.sandbox.runner.msd" folder="logic" />
-      <modulePath path="$PROJECT_DIR$/languages/jetbrains.mps.logic/solutions/jetbrains.mps.logic.atom/jetbrains.mps.logic.atom.msd" folder="logic" />
-      <modulePath path="$PROJECT_DIR$/languages/jetbrains.mps.logic/test/jetbrains.mps.logic.test.msd" folder="logic" />
-      <modulePath path="$PROJECT_DIR$/languages/jetbrains.mps.typechecking.annotation/jetbrains.mps.typechecking.annotation.mpl" folder="typechecking" />
+        <modulePath path="$PROJECT_DIR$/jchr/languages/jetbrains.mps.jchr/jetbrains.mps.jchr.mpl" folder="jchr" />
+        <modulePath path="$PROJECT_DIR$/jchr/languages/jetbrains.mps.jchr/runtime/jetbrains.mps.jchr.runtime.msd" folder="jchr" />
+        <modulePath path="$PROJECT_DIR$/jchr/languages/jetbrains.mps.jchr/sandbox/jetbrains.mps.jchr.sandbox.msd" folder="jchr" />
+        <modulePath path="$PROJECT_DIR$/jchr/languages/jetbrains.mps.jchr/sandbox/runner/jetbrains.mps.jchr.sandbox.runner.msd" folder="jchr" />
+        <modulePath path="$PROJECT_DIR$/typesystem2/languages/jetbrains.mps.lang.typesystem2/jetbrains.mps.lang.typesystem2.mpl" folder="typesystem2" />
+        <modulePath path="$PROJECT_DIR$/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/jetbrains.mps.lang.typesystem2.runtime.msd" folder="typesystem2.runtime" />
+      <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.samplechecker.handler.test/jetbrains.mps.lang.typesystem2.samplechecker.handler.test.msd" folder="typechecking.checker" />
+      <modulePath path="$PROJECT_DIR$/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/jetbrains.mps.lang.typesystem2.samplechecker.handler.util.msd" folder="typechecking.checker" />
+      <modulePath path="$PROJECT_DIR$/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler/jetbrains.mps.lang.typesystem2.samplechecker.handler.msd" folder="typechecking.checker" />
+      <modulePath path="$PROJECT_DIR$/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.runner/jetbrains.mps.lang.typesystem2.samplechecker.runner.msd" folder="typechecking.checker" />
+      <modulePath path="$PROJECT_DIR$/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.test/jetbrains.mps.lang.typesystem2.samplechecker.test.msd" folder="typechecking.checker" />
+      <modulePath path="$PROJECT_DIR$/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker/jetbrains.mps.lang.typesystem2.samplechecker.msd" folder="typechecking.checker" />
+      <modulePath path="$PROJECT_DIR$/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/jetbrains.mps.lang.typesystem2.sampleplugin.msd" folder="typechecking.plugin" />
+      <modulePath path="$PROJECT_DIR$/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/jetbrains.mps.lang.typesystem2.template.msd" folder="typesystem2.template" />
+      <modulePath path="$PROJECT_DIR$/typesystem2/solutions/jetbrains.mps.lang.typesystem2.test/jetbrains.mps.lang.typesystem2.test/jetbrains.mps.lang.typesystem2.test.msd" folder="typesystem2" />
+      <modulePath path="$PROJECT_DIR$/logic/solutions/jetbrains.mps.logic.jchr/jetbrains.mps.logic.jchr.msd" folder="logic" />
+      <modulePath path="$PROJECT_DIR$/logic/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl" folder="logic" />
+      <modulePath path="$PROJECT_DIR$/logic/solutions/jetbrains.mps.logic.reactor/jetbrains.mps.logic.reactor.msd" folder="logic" />
+      <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.atom/jetbrains.mps.logic.atom.msd" folder="logic" />
+      <modulePath path="$PROJECT_DIR$/logic/solutions/jetbrains.mps.logic.test/jetbrains.mps.logic.test.msd" folder="logic" />
+      <modulePath path="$PROJECT_DIR$/typechecking/languages/jetbrains.mps.typechecking.annotation/jetbrains.mps.typechecking.annotation.mpl" folder="typechecking.annotation" />
       <modulePath path="$PROJECT_DIR$/solutions/jetbrains.mps.typechecking.handling/jetbrains.mps.typechecking.handling.msd" folder="typechecking.rule" />
       <modulePath path="$PROJECT_DIR$/solutions/jetbrains.mps.typechecking.rules/jetbrains.mps.typechecking.rules.msd" folder="typechecking.rule" />
       <modulePath path="$PROJECT_DIR$/solutions/jetbrains.mps.typechecking.solving/jetbrains.mps.typechecking.solving.msd" folder="typechecking.rule" />
     </projectModules>
   </component>
-</project>
\ No newline at end of file
+</project>
diff --git a/languages/jetbrains.mps.jchr/JCHR.iml b/jchr/languages/jetbrains.mps.jchr/JCHR.iml
similarity index 100%
rename from languages/jetbrains.mps.jchr/JCHR.iml
rename to jchr/languages/jetbrains.mps.jchr/JCHR.iml
diff --git a/languages/jetbrains.mps.jchr/generator/template/main@generator.mps b/jchr/languages/jetbrains.mps.jchr/generator/template/main@generator.mps
similarity index 100%
rename from languages/jetbrains.mps.jchr/generator/template/main@generator.mps
rename to jchr/languages/jetbrains.mps.jchr/generator/template/main@generator.mps
diff --git a/languages/jetbrains.mps.jchr/jetbrains.mps.jchr.mpl b/jchr/languages/jetbrains.mps.jchr/jetbrains.mps.jchr.mpl
similarity index 100%
rename from languages/jetbrains.mps.jchr/jetbrains.mps.jchr.mpl
rename to jchr/languages/jetbrains.mps.jchr/jetbrains.mps.jchr.mpl
diff --git a/languages/jetbrains.mps.jchr/languageAccessories/jetbrains/mps/jchr/makehelper.mps b/jchr/languages/jetbrains.mps.jchr/languageAccessories/jetbrains/mps/jchr/makehelper.mps
similarity index 100%
rename from languages/jetbrains.mps.jchr/languageAccessories/jetbrains/mps/jchr/makehelper.mps
rename to jchr/languages/jetbrains.mps.jchr/languageAccessories/jetbrains/mps/jchr/makehelper.mps
diff --git a/languages/jetbrains.mps.jchr/languageModels/actions.mps b/jchr/languages/jetbrains.mps.jchr/languageModels/actions.mps
similarity index 100%
rename from languages/jetbrains.mps.jchr/languageModels/actions.mps
rename to jchr/languages/jetbrains.mps.jchr/languageModels/actions.mps
diff --git a/languages/jetbrains.mps.jchr/languageModels/behavior.mps b/jchr/languages/jetbrains.mps.jchr/languageModels/behavior.mps
similarity index 100%
rename from languages/jetbrains.mps.jchr/languageModels/behavior.mps
rename to jchr/languages/jetbrains.mps.jchr/languageModels/behavior.mps
diff --git a/languages/jetbrains.mps.jchr/languageModels/constraints.mps b/jchr/languages/jetbrains.mps.jchr/languageModels/constraints.mps
similarity index 100%
rename from languages/jetbrains.mps.jchr/languageModels/constraints.mps
rename to jchr/languages/jetbrains.mps.jchr/languageModels/constraints.mps
diff --git a/languages/jetbrains.mps.jchr/languageModels/editor.mps b/jchr/languages/jetbrains.mps.jchr/languageModels/editor.mps
similarity index 100%
rename from languages/jetbrains.mps.jchr/languageModels/editor.mps
rename to jchr/languages/jetbrains.mps.jchr/languageModels/editor.mps
diff --git a/languages/jetbrains.mps.jchr/languageModels/intentions.mps b/jchr/languages/jetbrains.mps.jchr/languageModels/intentions.mps
similarity index 100%
rename from languages/jetbrains.mps.jchr/languageModels/intentions.mps
rename to jchr/languages/jetbrains.mps.jchr/languageModels/intentions.mps
diff --git a/languages/jetbrains.mps.jchr/languageModels/plugin.mps b/jchr/languages/jetbrains.mps.jchr/languageModels/plugin.mps
similarity index 100%
rename from languages/jetbrains.mps.jchr/languageModels/plugin.mps
rename to jchr/languages/jetbrains.mps.jchr/languageModels/plugin.mps
diff --git a/languages/jetbrains.mps.jchr/languageModels/structure.mps b/jchr/languages/jetbrains.mps.jchr/languageModels/structure.mps
similarity index 100%
rename from languages/jetbrains.mps.jchr/languageModels/structure.mps
rename to jchr/languages/jetbrains.mps.jchr/languageModels/structure.mps
diff --git a/languages/jetbrains.mps.jchr/languageModels/textGen.mps b/jchr/languages/jetbrains.mps.jchr/languageModels/textGen.mps
similarity index 100%
rename from languages/jetbrains.mps.jchr/languageModels/textGen.mps
rename to jchr/languages/jetbrains.mps.jchr/languageModels/textGen.mps
diff --git a/languages/jetbrains.mps.jchr/languageModels/typesystem.mps b/jchr/languages/jetbrains.mps.jchr/languageModels/typesystem.mps
similarity index 100%
rename from languages/jetbrains.mps.jchr/languageModels/typesystem.mps
rename to jchr/languages/jetbrains.mps.jchr/languageModels/typesystem.mps
diff --git a/languages/jetbrains.mps.jchr/make/jetbrains.mps.jchr.make.msd b/jchr/languages/jetbrains.mps.jchr/make/jetbrains.mps.jchr.make.msd
similarity index 100%
rename from languages/jetbrains.mps.jchr/make/jetbrains.mps.jchr.make.msd
rename to jchr/languages/jetbrains.mps.jchr/make/jetbrains.mps.jchr.make.msd
diff --git a/languages/jetbrains.mps.jchr/runtime/jetbrains.mps.jchr.runtime.msd b/jchr/languages/jetbrains.mps.jchr/runtime/jetbrains.mps.jchr.runtime.msd
similarity index 100%
rename from languages/jetbrains.mps.jchr/runtime/jetbrains.mps.jchr.runtime.msd
rename to jchr/languages/jetbrains.mps.jchr/runtime/jetbrains.mps.jchr.runtime.msd
diff --git a/languages/jetbrains.mps.jchr/runtime/lib/KULeuven_JCHR.zip b/jchr/languages/jetbrains.mps.jchr/runtime/lib/KULeuven_JCHR.zip
similarity index 100%
rename from languages/jetbrains.mps.jchr/runtime/lib/KULeuven_JCHR.zip
rename to jchr/languages/jetbrains.mps.jchr/runtime/lib/KULeuven_JCHR.zip
diff --git a/languages/jetbrains.mps.jchr/runtime/models/compiler/codeGeneration.mps b/jchr/languages/jetbrains.mps.jchr/runtime/models/compiler/codeGeneration.mps
similarity index 100%
rename from languages/jetbrains.mps.jchr/runtime/models/compiler/codeGeneration.mps
rename to jchr/languages/jetbrains.mps.jchr/runtime/models/compiler/codeGeneration.mps
diff --git a/languages/jetbrains.mps.jchr/runtime/models/jetbrains/mps/jchr/patch.mps b/jchr/languages/jetbrains.mps.jchr/runtime/models/jetbrains/mps/jchr/patch.mps
similarity index 100%
rename from languages/jetbrains.mps.jchr/runtime/models/jetbrains/mps/jchr/patch.mps
rename to jchr/languages/jetbrains.mps.jchr/runtime/models/jetbrains/mps/jchr/patch.mps
diff --git a/languages/jetbrains.mps.jchr/runtime/models/runtime/history.mps b/jchr/languages/jetbrains.mps.jchr/runtime/models/runtime/history.mps
similarity index 100%
rename from languages/jetbrains.mps.jchr/runtime/models/runtime/history.mps
rename to jchr/languages/jetbrains.mps.jchr/runtime/models/runtime/history.mps
diff --git a/languages/jetbrains.mps.jchr/sandbox/classes_jchr/.keep b/jchr/languages/jetbrains.mps.jchr/sandbox/classes_jchr/.keep
similarity index 100%
rename from languages/jetbrains.mps.jchr/sandbox/classes_jchr/.keep
rename to jchr/languages/jetbrains.mps.jchr/sandbox/classes_jchr/.keep
diff --git a/languages/jetbrains.mps.jchr/sandbox/jetbrains.mps.jchr.sandbox.msd b/jchr/languages/jetbrains.mps.jchr/sandbox/jetbrains.mps.jchr.sandbox.msd
similarity index 100%
rename from languages/jetbrains.mps.jchr/sandbox/jetbrains.mps.jchr.sandbox.msd
rename to jchr/languages/jetbrains.mps.jchr/sandbox/jetbrains.mps.jchr.sandbox.msd
diff --git a/languages/jetbrains.mps.jchr/sandbox/models/jetbrains/mps/jchr/sandbox.mps b/jchr/languages/jetbrains.mps.jchr/sandbox/models/jetbrains/mps/jchr/sandbox.mps
similarity index 100%
rename from languages/jetbrains.mps.jchr/sandbox/models/jetbrains/mps/jchr/sandbox.mps
rename to jchr/languages/jetbrains.mps.jchr/sandbox/models/jetbrains/mps/jchr/sandbox.mps
diff --git a/languages/jetbrains.mps.jchr/sandbox/runner/jetbrains.mps.jchr.sandbox.runner.msd b/jchr/languages/jetbrains.mps.jchr/sandbox/runner/jetbrains.mps.jchr.sandbox.runner.msd
similarity index 100%
rename from languages/jetbrains.mps.jchr/sandbox/runner/jetbrains.mps.jchr.sandbox.runner.msd
rename to jchr/languages/jetbrains.mps.jchr/sandbox/runner/jetbrains.mps.jchr.sandbox.runner.msd
diff --git a/languages/jetbrains.mps.jchr/sandbox/runner/models/jetbrains/mps/jchr/sandbox/runner/gcd.mps b/jchr/languages/jetbrains.mps.jchr/sandbox/runner/models/jetbrains/mps/jchr/sandbox/runner/gcd.mps
similarity index 100%
rename from languages/jetbrains.mps.jchr/sandbox/runner/models/jetbrains/mps/jchr/sandbox/runner/gcd.mps
rename to jchr/languages/jetbrains.mps.jchr/sandbox/runner/models/jetbrains/mps/jchr/sandbox/runner/gcd.mps
diff --git a/languages/jetbrains.mps.logic/Logic.iml b/logic/languages/jetbrains.mps.logic/Logic.iml
similarity index 100%
rename from languages/jetbrains.mps.logic/Logic.iml
rename to logic/languages/jetbrains.mps.logic/Logic.iml
diff --git a/languages/jetbrains.mps.logic/generator/template/main@generator.mps b/logic/languages/jetbrains.mps.logic/generator/template/main@generator.mps
similarity index 100%
rename from languages/jetbrains.mps.logic/generator/template/main@generator.mps
rename to logic/languages/jetbrains.mps.logic/generator/template/main@generator.mps
diff --git a/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl b/logic/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl
similarity index 100%
rename from languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl
rename to logic/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl
diff --git a/languages/jetbrains.mps.logic/languageModels/actions.mps b/logic/languages/jetbrains.mps.logic/languageModels/actions.mps
similarity index 100%
rename from languages/jetbrains.mps.logic/languageModels/actions.mps
rename to logic/languages/jetbrains.mps.logic/languageModels/actions.mps
diff --git a/languages/jetbrains.mps.logic/languageModels/behavior.mps b/logic/languages/jetbrains.mps.logic/languageModels/behavior.mps
similarity index 100%
rename from languages/jetbrains.mps.logic/languageModels/behavior.mps
rename to logic/languages/jetbrains.mps.logic/languageModels/behavior.mps
diff --git a/languages/jetbrains.mps.logic/languageModels/constraints.mps b/logic/languages/jetbrains.mps.logic/languageModels/constraints.mps
similarity index 100%
rename from languages/jetbrains.mps.logic/languageModels/constraints.mps
rename to logic/languages/jetbrains.mps.logic/languageModels/constraints.mps
diff --git a/languages/jetbrains.mps.logic/languageModels/editor.mps b/logic/languages/jetbrains.mps.logic/languageModels/editor.mps
similarity index 100%
rename from languages/jetbrains.mps.logic/languageModels/editor.mps
rename to logic/languages/jetbrains.mps.logic/languageModels/editor.mps
diff --git a/languages/jetbrains.mps.logic/languageModels/intentions.mps b/logic/languages/jetbrains.mps.logic/languageModels/intentions.mps
similarity index 100%
rename from languages/jetbrains.mps.logic/languageModels/intentions.mps
rename to logic/languages/jetbrains.mps.logic/languageModels/intentions.mps
diff --git a/languages/jetbrains.mps.logic/languageModels/structure.mps b/logic/languages/jetbrains.mps.logic/languageModels/structure.mps
similarity index 100%
rename from languages/jetbrains.mps.logic/languageModels/structure.mps
rename to logic/languages/jetbrains.mps.logic/languageModels/structure.mps
diff --git a/languages/jetbrains.mps.logic/languageModels/typesystem.mps b/logic/languages/jetbrains.mps.logic/languageModels/typesystem.mps
similarity index 100%
rename from languages/jetbrains.mps.logic/languageModels/typesystem.mps
rename to logic/languages/jetbrains.mps.logic/languageModels/typesystem.mps
diff --git a/languages/jetbrains.mps.logic/runtime/jetbrains.mps.logic.runtime.msd b/logic/languages/jetbrains.mps.logic/runtime/jetbrains.mps.logic.runtime.msd
similarity index 100%
rename from languages/jetbrains.mps.logic/runtime/jetbrains.mps.logic.runtime.msd
rename to logic/languages/jetbrains.mps.logic/runtime/jetbrains.mps.logic.runtime.msd
diff --git a/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin.mps b/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin.mps
similarity index 100%
rename from languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin.mps
rename to logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin.mps
diff --git a/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/unification.mps b/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/unification.mps
similarity index 100%
rename from languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/unification.mps
rename to logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/unification.mps
diff --git a/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/var.mps b/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/var.mps
similarity index 100%
rename from languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/var.mps
rename to logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/var.mps
diff --git a/languages/jetbrains.mps.logic/runtime/source/runtime/ConstraintSystemUtil.java b/logic/languages/jetbrains.mps.logic/runtime/source/runtime/ConstraintSystemUtil.java
similarity index 100%
rename from languages/jetbrains.mps.logic/runtime/source/runtime/ConstraintSystemUtil.java
rename to logic/languages/jetbrains.mps.logic/runtime/source/runtime/ConstraintSystemUtil.java
diff --git a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.handler/classes_jchr/.keep b/logic/languages/jetbrains.mps.logic/sandbox/classes_jchr/.keep
similarity index 100%
rename from languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.handler/classes_jchr/.keep
rename to logic/languages/jetbrains.mps.logic/sandbox/classes_jchr/.keep
diff --git a/languages/jetbrains.mps.logic/solutions/jetbrains.mps.logic.atom/Atom.iml b/logic/solutions/jetbrains.mps.logic.atom/Atom.iml
similarity index 100%
rename from languages/jetbrains.mps.logic/solutions/jetbrains.mps.logic.atom/Atom.iml
rename to logic/solutions/jetbrains.mps.logic.atom/Atom.iml
diff --git a/languages/jetbrains.mps.logic/solutions/jetbrains.mps.logic.atom/imports/mps-unification b/logic/solutions/jetbrains.mps.logic.atom/imports/mps-unification
similarity index 100%
rename from languages/jetbrains.mps.logic/solutions/jetbrains.mps.logic.atom/imports/mps-unification
rename to logic/solutions/jetbrains.mps.logic.atom/imports/mps-unification
diff --git a/languages/jetbrains.mps.logic/solutions/jetbrains.mps.logic.atom/jetbrains.mps.logic.atom.msd b/logic/solutions/jetbrains.mps.logic.atom/jetbrains.mps.logic.atom.msd
similarity index 100%
rename from languages/jetbrains.mps.logic/solutions/jetbrains.mps.logic.atom/jetbrains.mps.logic.atom.msd
rename to logic/solutions/jetbrains.mps.logic.atom/jetbrains.mps.logic.atom.msd
diff --git a/languages/jetbrains.mps.logic/solutions/jetbrains.mps.logic.atom/models/jetbrains/mps/logic/atom.mps b/logic/solutions/jetbrains.mps.logic.atom/models/jetbrains/mps/logic/atom.mps
similarity index 100%
rename from languages/jetbrains.mps.logic/solutions/jetbrains.mps.logic.atom/models/jetbrains/mps/logic/atom.mps
rename to logic/solutions/jetbrains.mps.logic.atom/models/jetbrains/mps/logic/atom.mps
diff --git a/languages/jetbrains.mps.logic/jchr/Logic.jchr.iml b/logic/solutions/jetbrains.mps.logic.jchr/Logic.jchr.iml
similarity index 100%
rename from languages/jetbrains.mps.logic/jchr/Logic.jchr.iml
rename to logic/solutions/jetbrains.mps.logic.jchr/Logic.jchr.iml
diff --git a/languages/jetbrains.mps.logic/jchr/jetbrains.mps.logic.jchr.msd b/logic/solutions/jetbrains.mps.logic.jchr/jetbrains.mps.logic.jchr.msd
similarity index 100%
rename from languages/jetbrains.mps.logic/jchr/jetbrains.mps.logic.jchr.msd
rename to logic/solutions/jetbrains.mps.logic.jchr/jetbrains.mps.logic.jchr.msd
diff --git a/languages/jetbrains.mps.logic/jchr/models/jetbrains/mps/logic/jchr/predicate.mps b/logic/solutions/jetbrains.mps.logic.jchr/models/jetbrains/mps/logic/jchr/predicate.mps
similarity index 100%
rename from languages/jetbrains.mps.logic/jchr/models/jetbrains/mps/logic/jchr/predicate.mps
rename to logic/solutions/jetbrains.mps.logic.jchr/models/jetbrains/mps/logic/jchr/predicate.mps
diff --git a/languages/jetbrains.mps.logic/jchr/models/jetbrains/mps/logic/jchr/program.mps b/logic/solutions/jetbrains.mps.logic.jchr/models/jetbrains/mps/logic/jchr/program.mps
similarity index 100%
rename from languages/jetbrains.mps.logic/jchr/models/jetbrains/mps/logic/jchr/program.mps
rename to logic/solutions/jetbrains.mps.logic.jchr/models/jetbrains/mps/logic/jchr/program.mps
diff --git a/languages/jetbrains.mps.logic/reactor/Logic.reactor.iml b/logic/solutions/jetbrains.mps.logic.reactor/Logic.reactor.iml
similarity index 100%
rename from languages/jetbrains.mps.logic/reactor/Logic.reactor.iml
rename to logic/solutions/jetbrains.mps.logic.reactor/Logic.reactor.iml
diff --git a/languages/jetbrains.mps.logic/reactor/jetbrains.mps.logic.reactor.msd b/logic/solutions/jetbrains.mps.logic.reactor/jetbrains.mps.logic.reactor.msd
similarity index 100%
rename from languages/jetbrains.mps.logic/reactor/jetbrains.mps.logic.reactor.msd
rename to logic/solutions/jetbrains.mps.logic.reactor/jetbrains.mps.logic.reactor.msd
diff --git a/languages/jetbrains.mps.logic/reactor/models/jetbrains/mps/logic/reactor/constraint.mps b/logic/solutions/jetbrains.mps.logic.reactor/models/jetbrains/mps/logic/reactor/constraint.mps
similarity index 100%
rename from languages/jetbrains.mps.logic/reactor/models/jetbrains/mps/logic/reactor/constraint.mps
rename to logic/solutions/jetbrains.mps.logic.reactor/models/jetbrains/mps/logic/reactor/constraint.mps
diff --git a/languages/jetbrains.mps.logic/reactor/models/jetbrains/mps/logic/reactor/logical.mps b/logic/solutions/jetbrains.mps.logic.reactor/models/jetbrains/mps/logic/reactor/logical.mps
similarity index 100%
rename from languages/jetbrains.mps.logic/reactor/models/jetbrains/mps/logic/reactor/logical.mps
rename to logic/solutions/jetbrains.mps.logic.reactor/models/jetbrains/mps/logic/reactor/logical.mps
diff --git a/languages/jetbrains.mps.logic/reactor/models/jetbrains/mps/logic/reactor/program.mps b/logic/solutions/jetbrains.mps.logic.reactor/models/jetbrains/mps/logic/reactor/program.mps
similarity index 100%
rename from languages/jetbrains.mps.logic/reactor/models/jetbrains/mps/logic/reactor/program.mps
rename to logic/solutions/jetbrains.mps.logic.reactor/models/jetbrains/mps/logic/reactor/program.mps
diff --git a/languages/jetbrains.mps.logic/reactor/models/jetbrains/mps/logic/reactor/rule.mps b/logic/solutions/jetbrains.mps.logic.reactor/models/jetbrains/mps/logic/reactor/rule.mps
similarity index 100%
rename from languages/jetbrains.mps.logic/reactor/models/jetbrains/mps/logic/reactor/rule.mps
rename to logic/solutions/jetbrains.mps.logic.reactor/models/jetbrains/mps/logic/reactor/rule.mps
diff --git a/languages/jetbrains.mps.logic/test/Logic.test.iml b/logic/solutions/jetbrains.mps.logic.test/Logic.test.iml
similarity index 100%
rename from languages/jetbrains.mps.logic/test/Logic.test.iml
rename to logic/solutions/jetbrains.mps.logic.test/Logic.test.iml
diff --git a/languages/jetbrains.mps.logic/test/jetbrains.mps.logic.test.msd b/logic/solutions/jetbrains.mps.logic.test/jetbrains.mps.logic.test.msd
similarity index 100%
rename from languages/jetbrains.mps.logic/test/jetbrains.mps.logic.test.msd
rename to logic/solutions/jetbrains.mps.logic.test/jetbrains.mps.logic.test.msd
diff --git a/languages/jetbrains.mps.logic/test/models/jetbrains/mps/logic/test/logical.mps b/logic/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/logical.mps
similarity index 100%
rename from languages/jetbrains.mps.logic/test/models/jetbrains/mps/logic/test/logical.mps
rename to logic/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/logical.mps
diff --git a/languages/jetbrains.mps.logic/test/models/jetbrains/mps/logic/test/unification.mps b/logic/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification.mps
similarity index 100%
rename from languages/jetbrains.mps.logic/test/models/jetbrains/mps/logic/test/unification.mps
rename to logic/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification.mps
diff --git a/languages/jetbrains.mps.typechecking.annotation/generator/template/main@generator.mps b/typechecking/languages/jetbrains.mps.typechecking.annotation/generator/template/main@generator.mps
similarity index 100%
rename from languages/jetbrains.mps.typechecking.annotation/generator/template/main@generator.mps
rename to typechecking/languages/jetbrains.mps.typechecking.annotation/generator/template/main@generator.mps
diff --git a/languages/jetbrains.mps.typechecking.annotation/jetbrains.mps.typechecking.annotation.mpl b/typechecking/languages/jetbrains.mps.typechecking.annotation/jetbrains.mps.typechecking.annotation.mpl
similarity index 100%
rename from languages/jetbrains.mps.typechecking.annotation/jetbrains.mps.typechecking.annotation.mpl
rename to typechecking/languages/jetbrains.mps.typechecking.annotation/jetbrains.mps.typechecking.annotation.mpl
diff --git a/languages/jetbrains.mps.typechecking.annotation/languageModels/behavior.mps b/typechecking/languages/jetbrains.mps.typechecking.annotation/languageModels/behavior.mps
similarity index 100%
rename from languages/jetbrains.mps.typechecking.annotation/languageModels/behavior.mps
rename to typechecking/languages/jetbrains.mps.typechecking.annotation/languageModels/behavior.mps
diff --git a/languages/jetbrains.mps.typechecking.annotation/languageModels/constraints.mps b/typechecking/languages/jetbrains.mps.typechecking.annotation/languageModels/constraints.mps
similarity index 100%
rename from languages/jetbrains.mps.typechecking.annotation/languageModels/constraints.mps
rename to typechecking/languages/jetbrains.mps.typechecking.annotation/languageModels/constraints.mps
diff --git a/languages/jetbrains.mps.typechecking.annotation/languageModels/editor.mps b/typechecking/languages/jetbrains.mps.typechecking.annotation/languageModels/editor.mps
similarity index 100%
rename from languages/jetbrains.mps.typechecking.annotation/languageModels/editor.mps
rename to typechecking/languages/jetbrains.mps.typechecking.annotation/languageModels/editor.mps
diff --git a/languages/jetbrains.mps.typechecking.annotation/languageModels/intentions.mps b/typechecking/languages/jetbrains.mps.typechecking.annotation/languageModels/intentions.mps
similarity index 100%
rename from languages/jetbrains.mps.typechecking.annotation/languageModels/intentions.mps
rename to typechecking/languages/jetbrains.mps.typechecking.annotation/languageModels/intentions.mps
diff --git a/languages/jetbrains.mps.typechecking.annotation/languageModels/structure.mps b/typechecking/languages/jetbrains.mps.typechecking.annotation/languageModels/structure.mps
similarity index 100%
rename from languages/jetbrains.mps.typechecking.annotation/languageModels/structure.mps
rename to typechecking/languages/jetbrains.mps.typechecking.annotation/languageModels/structure.mps
diff --git a/languages/jetbrains.mps.typechecking.annotation/languageModels/typesystem.mps b/typechecking/languages/jetbrains.mps.typechecking.annotation/languageModels/typesystem.mps
similarity index 100%
rename from languages/jetbrains.mps.typechecking.annotation/languageModels/typesystem.mps
rename to typechecking/languages/jetbrains.mps.typechecking.annotation/languageModels/typesystem.mps
diff --git a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem.sample/jetbrains.mps.lang.typesystem2.sample.msd b/typechecking/solutions/jetbrains.mps.lang.typesystem.sample/jetbrains.mps.lang.typesystem2.sample.msd
similarity index 100%
rename from languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem.sample/jetbrains.mps.lang.typesystem2.sample.msd
rename to typechecking/solutions/jetbrains.mps.lang.typesystem.sample/jetbrains.mps.lang.typesystem2.sample.msd
diff --git a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem.sample/models/jetbrains/mps/lang/typesystem2/sample/bounds.mps b/typechecking/solutions/jetbrains.mps.lang.typesystem.sample/models/jetbrains/mps/lang/typesystem2/sample/bounds.mps
similarity index 100%
rename from languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem.sample/models/jetbrains/mps/lang/typesystem2/sample/bounds.mps
rename to typechecking/solutions/jetbrains.mps.lang.typesystem.sample/models/jetbrains/mps/lang/typesystem2/sample/bounds.mps
diff --git a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem.sample/models/jetbrains/mps/lang/typesystem2/sample/helloWorld.mps b/typechecking/solutions/jetbrains.mps.lang.typesystem.sample/models/jetbrains/mps/lang/typesystem2/sample/helloWorld.mps
similarity index 100%
rename from languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem.sample/models/jetbrains/mps/lang/typesystem2/sample/helloWorld.mps
rename to typechecking/solutions/jetbrains.mps.lang.typesystem.sample/models/jetbrains/mps/lang/typesystem2/sample/helloWorld.mps
diff --git a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem.sample/models/jetbrains/mps/lang/typesystem2/sample/simpleGenerics.mps b/typechecking/solutions/jetbrains.mps.lang.typesystem.sample/models/jetbrains/mps/lang/typesystem2/sample/simpleGenerics.mps
similarity index 100%
rename from languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem.sample/models/jetbrains/mps/lang/typesystem2/sample/simpleGenerics.mps
rename to typechecking/solutions/jetbrains.mps.lang.typesystem.sample/models/jetbrains/mps/lang/typesystem2/sample/simpleGenerics.mps
diff --git a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem.sample/models/jetbrains/mps/lang/typesystem2/sample/slice.mps b/typechecking/solutions/jetbrains.mps.lang.typesystem.sample/models/jetbrains/mps/lang/typesystem2/sample/slice.mps
similarity index 100%
rename from languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem.sample/models/jetbrains/mps/lang/typesystem2/sample/slice.mps
rename to typechecking/solutions/jetbrains.mps.lang.typesystem.sample/models/jetbrains/mps/lang/typesystem2/sample/slice.mps
diff --git a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem.sample/typesystem2.sandbox.sample.iml b/typechecking/solutions/jetbrains.mps.lang.typesystem.sample/typesystem2.sandbox.sample.iml
similarity index 100%
rename from languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem.sample/typesystem2.sandbox.sample.iml
rename to typechecking/solutions/jetbrains.mps.lang.typesystem.sample/typesystem2.sandbox.sample.iml
diff --git a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.handler.test/jetbrains.mps.lang.typesystem2.samplechecker.handler.test.msd b/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.test/jetbrains.mps.lang.typesystem2.samplechecker.handler.test.msd
similarity index 100%
rename from languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.handler.test/jetbrains.mps.lang.typesystem2.samplechecker.handler.test.msd
rename to typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.test/jetbrains.mps.lang.typesystem2.samplechecker.handler.test.msd
diff --git a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.handler.test/models/jetbrains/mps/lang/typesystem2/samplechecker/handle/test/util.mps b/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.test/models/jetbrains/mps/lang/typesystem2/samplechecker/handle/test/util.mps
similarity index 100%
rename from languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.handler.test/models/jetbrains/mps/lang/typesystem2/samplechecker/handle/test/util.mps
rename to typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.test/models/jetbrains/mps/lang/typesystem2/samplechecker/handle/test/util.mps
diff --git a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/jetbrains.mps.lang.typesystem2.samplechecker.handler.util.msd b/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/jetbrains.mps.lang.typesystem2.samplechecker.handler.util.msd
similarity index 100%
rename from languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/jetbrains.mps.lang.typesystem2.samplechecker.handler.util.msd
rename to typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/jetbrains.mps.lang.typesystem2.samplechecker.handler.util.msd
diff --git a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/models/jetbrains/mps/lang/typesystem2/samplechecker/handle/util.mps b/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/models/jetbrains/mps/lang/typesystem2/samplechecker/handle/util.mps
similarity index 100%
rename from languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/models/jetbrains/mps/lang/typesystem2/samplechecker/handle/util.mps
rename to typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/models/jetbrains/mps/lang/typesystem2/samplechecker/handle/util.mps
diff --git a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/samplechecker.handler.util.iml b/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/samplechecker.handler.util.iml
similarity index 100%
rename from languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/samplechecker.handler.util.iml
rename to typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/samplechecker.handler.util.iml
diff --git a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker/classes_jchr/.keep b/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler/classes_jchr/.keep
similarity index 100%
rename from languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker/classes_jchr/.keep
rename to typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler/classes_jchr/.keep
diff --git a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.handler/jetbrains.mps.lang.typesystem2.samplechecker.handler.msd b/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler/jetbrains.mps.lang.typesystem2.samplechecker.handler.msd
similarity index 100%
rename from languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.handler/jetbrains.mps.lang.typesystem2.samplechecker.handler.msd
rename to typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler/jetbrains.mps.lang.typesystem2.samplechecker.handler.msd
diff --git a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.handler/models/jetbrains/mps/lang/typesystem2/samplechecker/chr.mps b/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler/models/jetbrains/mps/lang/typesystem2/samplechecker/chr.mps
similarity index 100%
rename from languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.handler/models/jetbrains/mps/lang/typesystem2/samplechecker/chr.mps
rename to typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler/models/jetbrains/mps/lang/typesystem2/samplechecker/chr.mps
diff --git a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.handler/samplechecker.handler.iml b/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler/samplechecker.handler.iml
similarity index 100%
rename from languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.handler/samplechecker.handler.iml
rename to typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler/samplechecker.handler.iml
diff --git a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.runner/jetbrains.mps.lang.typesystem2.samplechecker.runner.msd b/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.runner/jetbrains.mps.lang.typesystem2.samplechecker.runner.msd
similarity index 100%
rename from languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.runner/jetbrains.mps.lang.typesystem2.samplechecker.runner.msd
rename to typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.runner/jetbrains.mps.lang.typesystem2.samplechecker.runner.msd
diff --git a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.runner/models/jetbrains/mps/lang/typesystem2/samplechecker/runner.mps b/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.runner/models/jetbrains/mps/lang/typesystem2/samplechecker/runner.mps
similarity index 100%
rename from languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.runner/models/jetbrains/mps/lang/typesystem2/samplechecker/runner.mps
rename to typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.runner/models/jetbrains/mps/lang/typesystem2/samplechecker/runner.mps
diff --git a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.runner/samplechecker.runner.iml b/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.runner/samplechecker.runner.iml
similarity index 100%
rename from languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.runner/samplechecker.runner.iml
rename to typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.runner/samplechecker.runner.iml
diff --git a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.runner/source_copy/jetbrains/mps/lang/typesystem2/samplechecker/template/ExpressionSolver.java b/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.runner/source_copy/jetbrains/mps/lang/typesystem2/samplechecker/template/ExpressionSolver.java
similarity index 100%
rename from languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.runner/source_copy/jetbrains/mps/lang/typesystem2/samplechecker/template/ExpressionSolver.java
rename to typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.runner/source_copy/jetbrains/mps/lang/typesystem2/samplechecker/template/ExpressionSolver.java
diff --git a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.test/jetbrains.mps.lang.typesystem2.samplechecker.test.msd b/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.test/jetbrains.mps.lang.typesystem2.samplechecker.test.msd
similarity index 100%
rename from languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.test/jetbrains.mps.lang.typesystem2.samplechecker.test.msd
rename to typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.test/jetbrains.mps.lang.typesystem2.samplechecker.test.msd
diff --git a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.test/models/jetbrains/mps/lang/typesystem2/samplechecker/test/type.mps b/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.test/models/jetbrains/mps/lang/typesystem2/samplechecker/test/type.mps
similarity index 100%
rename from languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.test/models/jetbrains/mps/lang/typesystem2/samplechecker/test/type.mps
rename to typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.test/models/jetbrains/mps/lang/typesystem2/samplechecker/test/type.mps
diff --git a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.test/samplechecker.test.iml b/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.test/samplechecker.test.iml
similarity index 100%
rename from languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.test/samplechecker.test.iml
rename to typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.test/samplechecker.test.iml
diff --git a/languages/jetbrains.mps.logic/sandbox/classes_jchr/.keep b/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker/classes_jchr/.keep
similarity index 100%
rename from languages/jetbrains.mps.logic/sandbox/classes_jchr/.keep
rename to typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker/classes_jchr/.keep
diff --git a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker/jetbrains.mps.lang.typesystem2.samplechecker.iml b/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker/jetbrains.mps.lang.typesystem2.samplechecker.iml
similarity index 100%
rename from languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker/jetbrains.mps.lang.typesystem2.samplechecker.iml
rename to typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker/jetbrains.mps.lang.typesystem2.samplechecker.iml
diff --git a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker/jetbrains.mps.lang.typesystem2.samplechecker.msd b/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker/jetbrains.mps.lang.typesystem2.samplechecker.msd
similarity index 100%
rename from languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker/jetbrains.mps.lang.typesystem2.samplechecker.msd
rename to typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker/jetbrains.mps.lang.typesystem2.samplechecker.msd
diff --git a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker/models/jetbrains/mps/lang/typesystem2/samplechecker/template.mps b/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker/models/jetbrains/mps/lang/typesystem2/samplechecker/template.mps
similarity index 100%
rename from languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker/models/jetbrains/mps/lang/typesystem2/samplechecker/template.mps
rename to typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker/models/jetbrains/mps/lang/typesystem2/samplechecker/template.mps
diff --git a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.sampleplugin/jetbrains.mps.lang.typesystem2.sampleplugin.msd b/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/jetbrains.mps.lang.typesystem2.sampleplugin.msd
similarity index 100%
rename from languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.sampleplugin/jetbrains.mps.lang.typesystem2.sampleplugin.msd
rename to typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/jetbrains.mps.lang.typesystem2.sampleplugin.msd
diff --git a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.sampleplugin/models/jetbrains/mps/lang/typesystem2/sampleplugin/plugin.mps b/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/models/jetbrains/mps/lang/typesystem2/sampleplugin/plugin.mps
similarity index 100%
rename from languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.sampleplugin/models/jetbrains/mps/lang/typesystem2/sampleplugin/plugin.mps
rename to typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/models/jetbrains/mps/lang/typesystem2/sampleplugin/plugin.mps
diff --git a/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps
similarity index 100%
rename from languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps
rename to typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps
diff --git a/languages/jetbrains.mps.lang.typesystem2/jetbrains.mps.lang.typesystem2.mpl b/typesystem2/languages/jetbrains.mps.lang.typesystem2/jetbrains.mps.lang.typesystem2.mpl
similarity index 100%
rename from languages/jetbrains.mps.lang.typesystem2/jetbrains.mps.lang.typesystem2.mpl
rename to typesystem2/languages/jetbrains.mps.lang.typesystem2/jetbrains.mps.lang.typesystem2.mpl
diff --git a/languages/jetbrains.mps.lang.typesystem2/languageModels/actions.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/actions.mps
similarity index 100%
rename from languages/jetbrains.mps.lang.typesystem2/languageModels/actions.mps
rename to typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/actions.mps
diff --git a/languages/jetbrains.mps.lang.typesystem2/languageModels/behavior.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/behavior.mps
similarity index 100%
rename from languages/jetbrains.mps.lang.typesystem2/languageModels/behavior.mps
rename to typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/behavior.mps
diff --git a/languages/jetbrains.mps.lang.typesystem2/languageModels/constraints.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/constraints.mps
similarity index 100%
rename from languages/jetbrains.mps.lang.typesystem2/languageModels/constraints.mps
rename to typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/constraints.mps
diff --git a/languages/jetbrains.mps.lang.typesystem2/languageModels/editor.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/editor.mps
similarity index 100%
rename from languages/jetbrains.mps.lang.typesystem2/languageModels/editor.mps
rename to typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/editor.mps
diff --git a/languages/jetbrains.mps.lang.typesystem2/languageModels/intentions.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/intentions.mps
similarity index 100%
rename from languages/jetbrains.mps.lang.typesystem2/languageModels/intentions.mps
rename to typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/intentions.mps
diff --git a/languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps
similarity index 100%
rename from languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps
rename to typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps
diff --git a/languages/jetbrains.mps.lang.typesystem2/languageModels/typesystem.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/typesystem.mps
similarity index 100%
rename from languages/jetbrains.mps.lang.typesystem2/languageModels/typesystem.mps
rename to typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/typesystem.mps
diff --git a/languages/jetbrains.mps.lang.typesystem2/languageModels/util.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/util.mps
similarity index 100%
rename from languages/jetbrains.mps.lang.typesystem2/languageModels/util.mps
rename to typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/util.mps
diff --git a/languages/jetbrains.mps.lang.typesystem2/runtime/jetbrains.mps.lang.typesystem2.runtime.msd b/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/jetbrains.mps.lang.typesystem2.runtime.msd
similarity index 100%
rename from languages/jetbrains.mps.lang.typesystem2/runtime/jetbrains.mps.lang.typesystem2.runtime.msd
rename to typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/jetbrains.mps.lang.typesystem2.runtime.msd
diff --git a/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains/mps/lang/typesystem2/runtime.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains/mps/lang/typesystem2/runtime.mps
similarity index 100%
rename from languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains/mps/lang/typesystem2/runtime.mps
rename to typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains/mps/lang/typesystem2/runtime.mps
diff --git a/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains/mps/lang/typesystem2/runtime/util.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains/mps/lang/typesystem2/runtime/util.mps
similarity index 100%
rename from languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains/mps/lang/typesystem2/runtime/util.mps
rename to typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains/mps/lang/typesystem2/runtime/util.mps
diff --git a/languages/jetbrains.mps.lang.typesystem2/runtime/typesystem2.runtime.iml b/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/typesystem2.runtime.iml
similarity index 100%
rename from languages/jetbrains.mps.lang.typesystem2/runtime/typesystem2.runtime.iml
rename to typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/typesystem2.runtime.iml
diff --git a/languages/jetbrains.mps.lang.typesystem2/template/jetbrains.mps.lang.typesystem2.template.msd b/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/jetbrains.mps.lang.typesystem2.template.msd
similarity index 100%
rename from languages/jetbrains.mps.lang.typesystem2/template/jetbrains.mps.lang.typesystem2.template.msd
rename to typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/jetbrains.mps.lang.typesystem2.template.msd
diff --git a/languages/jetbrains.mps.lang.typesystem2/template/models/jetbrains/mps/lang/typesystem2/template.mps b/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/models/jetbrains/mps/lang/typesystem2/template.mps
similarity index 100%
rename from languages/jetbrains.mps.lang.typesystem2/template/models/jetbrains/mps/lang/typesystem2/template.mps
rename to typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/models/jetbrains/mps/lang/typesystem2/template.mps
diff --git a/languages/jetbrains.mps.lang.typesystem2/template/models/jetbrains/mps/lang/typesystem2/type.mps b/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/models/jetbrains/mps/lang/typesystem2/type.mps
similarity index 100%
rename from languages/jetbrains.mps.lang.typesystem2/template/models/jetbrains/mps/lang/typesystem2/type.mps
rename to typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/models/jetbrains/mps/lang/typesystem2/type.mps
diff --git a/languages/jetbrains.mps.lang.typesystem2/test/jetbrains.mps.lang.typesystem2.test/jetbrains.mps.lang.typesystem2.test.msd b/typesystem2/solutions/jetbrains.mps.lang.typesystem2.test/jetbrains.mps.lang.typesystem2.test.msd
similarity index 100%
rename from languages/jetbrains.mps.lang.typesystem2/test/jetbrains.mps.lang.typesystem2.test/jetbrains.mps.lang.typesystem2.test.msd
rename to typesystem2/solutions/jetbrains.mps.lang.typesystem2.test/jetbrains.mps.lang.typesystem2.test.msd
diff --git a/languages/jetbrains.mps.lang.typesystem2/test/jetbrains.mps.lang.typesystem2.test/models/jetbrains/mps/lang/typesystem2/test.mps b/typesystem2/solutions/jetbrains.mps.lang.typesystem2.test/models/jetbrains/mps/lang/typesystem2/test.mps
similarity index 100%
rename from languages/jetbrains.mps.lang.typesystem2/test/jetbrains.mps.lang.typesystem2.test/models/jetbrains/mps/lang/typesystem2/test.mps
rename to typesystem2/solutions/jetbrains.mps.lang.typesystem2.test/models/jetbrains/mps/lang/typesystem2/test.mps
diff --git a/languages/jetbrains.mps.lang.typesystem2/test/jetbrains.mps.lang.typesystem2.test/typesystem2.test.iml b/typesystem2/solutions/jetbrains.mps.lang.typesystem2.test/typesystem2.test.iml
similarity index 100%
rename from languages/jetbrains.mps.lang.typesystem2/test/jetbrains.mps.lang.typesystem2.test/typesystem2.test.iml
rename to typesystem2/solutions/jetbrains.mps.lang.typesystem2.test/typesystem2.test.iml