diff --git a/.idea/libraries/mps_unification.xml b/.idea/libraries/mps_unification.xml
index 433a71d6..4c08cf2f 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$/solutions/jetbrains.mps.unification.tree/imports/mps-unification/lib" />
+      <root url="file://$PROJECT_DIR$/languages/jetbrains.mps.logic/solutions/jetbrains.mps.logic.atom/imports/mps-unification/lib" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
-    <jarDirectory url="file://$PROJECT_DIR$/solutions/jetbrains.mps.unification.tree/imports/mps-unification/lib" recursive="false" />
+    <jarDirectory url="file://$PROJECT_DIR$/languages/jetbrains.mps.logic/solutions/jetbrains.mps.logic.atom/imports/mps-unification/lib" recursive="false" />
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 8ab16e98..09934b40 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,10 +2,10 @@
 <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/test/Logic.test.iml" filepath="$PROJECT_DIR$/languages/jetbrains.mps.logic/test/Logic.test.iml" />
-      <module fileurl="file://$PROJECT_DIR$/solutions/jetbrains.mps.unification.tree/Term.iml" filepath="$PROJECT_DIR$/solutions/jetbrains.mps.unification.tree/Term.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.test/samplechecker.handler.test.iml" filepath="$PROJECT_DIR$/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.handler.test/samplechecker.handler.test.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" />
diff --git a/languages/jetbrains.mps.lang.typesystem2/runtime/typesystem2.runtime.iml b/languages/jetbrains.mps.lang.typesystem2/runtime/typesystem2.runtime.iml
index d8c128d1..47626aed 100644
--- a/languages/jetbrains.mps.lang.typesystem2/runtime/typesystem2.runtime.iml
+++ b/languages/jetbrains.mps.lang.typesystem2/runtime/typesystem2.runtime.iml
@@ -7,8 +7,8 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="Term" />
     <orderEntry type="module" module-name="Logic" />
     <orderEntry type="library" name="guava-17.0" level="project" />
+    <orderEntry type="module" module-name="Atom" />
   </component>
 </module>
\ No newline at end of file
diff --git a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.handler.test/samplechecker.handler.test.iml b/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.handler.test/samplechecker.handler.test.iml
index 8fab18dd..3ec89e17 100644
--- a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.handler.test/samplechecker.handler.test.iml
+++ b/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.handler.test/samplechecker.handler.test.iml
@@ -17,8 +17,8 @@
       </library>
     </orderEntry>
     <orderEntry type="module" module-name="Logic" scope="TEST" />
-    <orderEntry type="module" module-name="Term" scope="TEST" />
     <orderEntry type="module" module-name="samplechecker.handler.util" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="jchr" level="project" />
+    <orderEntry type="module" module-name="Atom" scope="TEST" />
   </component>
 </module>
\ No newline at end of file
diff --git a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/samplechecker.handler.util.iml b/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/samplechecker.handler.util.iml
index b8abb066..764f4ab8 100644
--- a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/samplechecker.handler.util.iml
+++ b/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/samplechecker.handler.util.iml
@@ -8,8 +8,8 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="Logic" />
-    <orderEntry type="module" module-name="Term" />
     <orderEntry type="module" module-name="typesystem2.runtime" />
     <orderEntry type="library" name="jchr" level="project" />
+    <orderEntry type="module" module-name="Atom" />
   </component>
 </module>
\ No newline at end of file
diff --git a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.handler/samplechecker.handler.iml b/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.handler/samplechecker.handler.iml
index 699bf1ea..797eddbc 100644
--- a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.handler/samplechecker.handler.iml
+++ b/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.handler/samplechecker.handler.iml
@@ -8,9 +8,9 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="Term" />
     <orderEntry type="module" module-name="Logic" />
     <orderEntry type="library" name="jchr" level="project" />
     <orderEntry type="module" module-name="samplechecker.handler.util" />
+    <orderEntry type="module" module-name="Atom" />
   </component>
 </module>
\ No newline at end of file
diff --git a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.runner/samplechecker.runner.iml b/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.runner/samplechecker.runner.iml
index 8ff3eeaf..8361e6be 100644
--- a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.runner/samplechecker.runner.iml
+++ b/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.runner/samplechecker.runner.iml
@@ -9,9 +9,9 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="Logic" />
     <orderEntry type="library" name="jchr" level="project" />
-    <orderEntry type="module" module-name="Term" />
     <orderEntry type="library" name="log4j" level="project" />
     <orderEntry type="module" module-name="samplechecker.handler" />
     <orderEntry type="module" module-name="typesystem2.runtime" />
+    <orderEntry type="module" module-name="Atom" />
   </component>
 </module>
\ No newline at end of file
diff --git a/languages/jetbrains.mps.logic/Logic.iml b/languages/jetbrains.mps.logic/Logic.iml
index cb91f85d..2b0340f7 100644
--- a/languages/jetbrains.mps.logic/Logic.iml
+++ b/languages/jetbrains.mps.logic/Logic.iml
@@ -8,7 +8,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="Term" />
     <orderEntry type="library" name="jchr" level="project" />
+    <orderEntry type="module" module-name="Atom" />
   </component>
 </module>
\ No newline at end of file
diff --git a/languages/jetbrains.mps.logic/solutions/jetbrains.mps.logic.atom/Term.iml b/languages/jetbrains.mps.logic/solutions/jetbrains.mps.logic.atom/Atom.iml
similarity index 100%
rename from languages/jetbrains.mps.logic/solutions/jetbrains.mps.logic.atom/Term.iml
rename to languages/jetbrains.mps.logic/solutions/jetbrains.mps.logic.atom/Atom.iml
diff --git a/languages/jetbrains.mps.logic/test/Logic.test.iml b/languages/jetbrains.mps.logic/test/Logic.test.iml
index b2d9a631..6146d947 100644
--- a/languages/jetbrains.mps.logic/test/Logic.test.iml
+++ b/languages/jetbrains.mps.logic/test/Logic.test.iml
@@ -20,6 +20,6 @@
     </orderEntry>
     <orderEntry type="library" name="jchr" level="project" />
     <orderEntry type="module" module-name="Logic" scope="TEST" />
-    <orderEntry type="module" module-name="Term" scope="TEST" />
+    <orderEntry type="module" module-name="Atom" scope="TEST" />
   </component>
 </module>
\ No newline at end of file