Better project structure

.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

.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>

.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>

.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>

.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>

.mps/modules.xml

@@ -2,31 +2,29 @@
 <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" />