diff --git a/reactor/.gitignore b/reactor/.gitignore
index b7dca539..2b3eb745 100644
--- a/reactor/.gitignore
+++ b/reactor/.gitignore
@@ -1,5 +1,8 @@
 .idea/workspace.xml
 out
+unification/code/target/*
+unification/tests/target/*
+unification/out
 API/target/*
 Core/target/*
 Test/target/*
diff --git a/reactor/.idea/compiler.xml b/reactor/.idea/compiler.xml
index a5bc2ed1..e8367e6d 100644
--- a/reactor/.idea/compiler.xml
+++ b/reactor/.idea/compiler.xml
@@ -39,6 +39,20 @@
         <processorPath useClasspath="true" />
         <module name="Test" />
       </profile>
+      <profile default="false" name="Annotation profile for tests" enabled="true">
+        <sourceOutputDir name="target/generated-sources/annotations" />
+        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
+        <outputRelativeToContentRoot value="true" />
+        <processorPath useClasspath="true" />
+        <module name="tests" />
+      </profile>
+      <profile default="false" name="Annotation profile for unification-lib" enabled="true">
+        <sourceOutputDir name="target/generated-sources/annotations" />
+        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
+        <outputRelativeToContentRoot value="true" />
+        <processorPath useClasspath="true" />
+        <module name="unification-lib" />
+      </profile>
     </annotationProcessing>
     <bytecodeTargetLevel>
       <module name="API" target="1.6" />
@@ -46,6 +60,8 @@
       <module name="main" target="1.5" />
       <module name="Reactor" target="1.6" />
       <module name="Test" target="1.6" />
+      <module name="tests" target="1.6" />
+      <module name="unification-lib" target="1.6" />
     </bytecodeTargetLevel>
   </component>
 </project>
\ No newline at end of file
diff --git a/reactor/.idea/encodings.xml b/reactor/.idea/encodings.xml
index 7e296d3b..1db08596 100644
--- a/reactor/.idea/encodings.xml
+++ b/reactor/.idea/encodings.xml
@@ -5,6 +5,8 @@
     <file url="file://$PROJECT_DIR$/API" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/Core" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/Test" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/unification/code" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/unification/tests" charset="UTF-8" />
     <file url="PROJECT" charset="UTF-8" />
   </component>
 </project>
\ No newline at end of file
diff --git a/reactor/.idea/libraries/Maven__com_github_fisakov_mps_unification_unification_lib_1_0_2.xml b/reactor/.idea/libraries/Maven__com_github_fisakov_mps_unification_unification_lib_1_0_2.xml
deleted file mode 100644
index 65743615..00000000
--- a/reactor/.idea/libraries/Maven__com_github_fisakov_mps_unification_unification_lib_1_0_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.github.fisakov.mps-unification:unification-lib:1.0.2">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/github/fisakov/mps-unification/unification-lib/1.0.2/unification-lib-1.0.2.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/github/fisakov/mps-unification/unification-lib/1.0.2/unification-lib-1.0.2-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/github/fisakov/mps-unification/unification-lib/1.0.2/unification-lib-1.0.2-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/reactor/.idea/libraries/code_1_0.xml b/reactor/.idea/libraries/code_1_0.xml
deleted file mode 100644
index 9bab4b31..00000000
--- a/reactor/.idea/libraries/code_1_0.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="code-1.0">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/github/fisakov/mps-unification/code/1.0/code-1.0.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/reactor/.idea/modules.xml b/reactor/.idea/modules.xml
index 80bd7007..e1e37e5f 100644
--- a/reactor/.idea/modules.xml
+++ b/reactor/.idea/modules.xml
@@ -6,6 +6,8 @@
       <module fileurl="file://$PROJECT_DIR$/Core/Core.iml" filepath="$PROJECT_DIR$/Core/Core.iml" />
       <module fileurl="file://$PROJECT_DIR$/Reactor.iml" filepath="$PROJECT_DIR$/Reactor.iml" />
       <module fileurl="file://$PROJECT_DIR$/Test/Test.iml" filepath="$PROJECT_DIR$/Test/Test.iml" />
+      <module fileurl="file://$PROJECT_DIR$/unification/tests/tests.iml" filepath="$PROJECT_DIR$/unification/tests/tests.iml" />
+      <module fileurl="file://$PROJECT_DIR$/unification/code/unification-lib.iml" filepath="$PROJECT_DIR$/unification/code/unification-lib.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/reactor/API/API.iml b/reactor/API/API.iml
index 1e636929..eb0436b3 100644
--- a/reactor/API/API.iml
+++ b/reactor/API/API.iml
@@ -9,6 +9,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="unification-lib" />
     <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-runtime:1.0.0-rc-1050" level="project" />
     <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib:1.0.0-rc-1050" level="project" />
     <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-maven-plugin:1.0.0-rc-1050" level="project" />
@@ -40,6 +41,5 @@
     <orderEntry type="library" name="Maven: com.google.collections:google-collections:1.0" level="project" />
     <orderEntry type="library" name="Maven: com.github.andrewoma.dexx:dexx-collections:0.2" level="project" />
     <orderEntry type="library" name="Maven: com.intellij:annotations:12.0" level="project" />
-    <orderEntry type="library" name="Maven: com.github.fisakov.mps-unification:unification-lib:1.0.2" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/reactor/API/pom.xml b/reactor/API/pom.xml
index 3477ba0a..263d4842 100644
--- a/reactor/API/pom.xml
+++ b/reactor/API/pom.xml
@@ -14,6 +14,14 @@
     <artifactId>memreactor-api</artifactId>
     <packaging>jar</packaging>
 
+    <dependencies>
+        <dependency>
+            <groupId>jetbrains.mps.logic.memreactor</groupId>
+            <artifactId>unification-lib</artifactId>
+            <version>${unification.version}</version>
+        </dependency>
+    </dependencies>
+
     <build>
         <sourceDirectory>${basedir}/src/</sourceDirectory>
     </build>
diff --git a/reactor/Core/Core.iml b/reactor/Core/Core.iml
index fc249275..6ba8b2af 100644
--- a/reactor/Core/Core.iml
+++ b/reactor/Core/Core.iml
@@ -18,8 +18,8 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="code-1.0" level="project" />
     <orderEntry type="module" module-name="API" />
+    <orderEntry type="module" module-name="unification-lib" />
     <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-runtime:1.0.0-rc-1050" level="project" />
     <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib:1.0.0-rc-1050" level="project" />
     <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-maven-plugin:1.0.0-rc-1050" level="project" />
@@ -51,6 +51,5 @@
     <orderEntry type="library" name="Maven: com.google.collections:google-collections:1.0" level="project" />
     <orderEntry type="library" name="Maven: com.github.andrewoma.dexx:dexx-collections:0.2" level="project" />
     <orderEntry type="library" name="Maven: com.intellij:annotations:12.0" level="project" />
-    <orderEntry type="library" name="Maven: com.github.fisakov.mps-unification:unification-lib:1.0.2" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/reactor/Core/pom.xml b/reactor/Core/pom.xml
index f4a7ecdd..b2551ae4 100644
--- a/reactor/Core/pom.xml
+++ b/reactor/Core/pom.xml
@@ -20,6 +20,11 @@
             <artifactId>memreactor-api</artifactId>
             <version>${project.parent.version}</version>
         </dependency>
+        <dependency>
+            <groupId>jetbrains.mps.logic.memreactor</groupId>
+            <artifactId>unification-lib</artifactId>
+            <version>${unification.version}</version>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/reactor/Reactor.iml b/reactor/Reactor.iml
index 1e636929..1b391a3d 100644
--- a/reactor/Reactor.iml
+++ b/reactor/Reactor.iml
@@ -40,6 +40,5 @@
     <orderEntry type="library" name="Maven: com.google.collections:google-collections:1.0" level="project" />
     <orderEntry type="library" name="Maven: com.github.andrewoma.dexx:dexx-collections:0.2" level="project" />
     <orderEntry type="library" name="Maven: com.intellij:annotations:12.0" level="project" />
-    <orderEntry type="library" name="Maven: com.github.fisakov.mps-unification:unification-lib:1.0.2" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/reactor/Test/Test.iml b/reactor/Test/Test.iml
index 4414fa37..a0a31d55 100644
--- a/reactor/Test/Test.iml
+++ b/reactor/Test/Test.iml
@@ -18,8 +18,8 @@
     </content>
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="inheritedJdk" />
-    <orderEntry type="library" name="code-1.0" level="project" />
     <orderEntry type="module" module-name="API" />
+    <orderEntry type="module" module-name="unification-lib" />
     <orderEntry type="module" module-name="Core" />
     <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
@@ -54,6 +54,5 @@
     <orderEntry type="library" name="Maven: com.google.collections:google-collections:1.0" level="project" />
     <orderEntry type="library" name="Maven: com.github.andrewoma.dexx:dexx-collections:0.2" level="project" />
     <orderEntry type="library" name="Maven: com.intellij:annotations:12.0" level="project" />
-    <orderEntry type="library" name="Maven: com.github.fisakov.mps-unification:unification-lib:1.0.2" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/reactor/pom.xml b/reactor/pom.xml
index 08da13de..595ee8f1 100644
--- a/reactor/pom.xml
+++ b/reactor/pom.xml
@@ -9,6 +9,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <kotlin.version>1.0.0-rc-1050</kotlin.version>
+        <unification.version>1.0.2</unification.version>
     </properties>
 
     <groupId>jetbrains.mps.logic.memreactor</groupId>
@@ -24,10 +25,6 @@
     </pluginRepositories>
 
     <repositories>
-        <repository>
-            <id>jitpack.io</id>
-            <url>https://jitpack.io</url>
-        </repository>
         <repository>
             <id>kotlin-eap</id>
             <url>https://dl.bintray.com/kotlin/kotlin-eap</url>
@@ -65,11 +62,6 @@
             <artifactId>annotations</artifactId>
             <version>12.0</version>
         </dependency>
-        <dependency>
-            <groupId>com.github.fisakov.mps-unification</groupId>
-            <artifactId>unification-lib</artifactId>
-            <version>1.0.2</version>
-        </dependency>
     </dependencies>
 
     <build>
@@ -120,6 +112,8 @@
 
 
     <modules>
+        <module>unification/code</module>
+        <module>unification/tests</module>
         <module>API</module>
         <module>Core</module>
         <module>Test</module>
diff --git a/reactor/unification/.gitignore b/reactor/unification/.gitignore
deleted file mode 100644
index 477c26aa..00000000
--- a/reactor/unification/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-/.idea/workspace.xml
-/code/target/*
-/tests/target/*
-/out
diff --git a/reactor/unification/.idea/.name b/reactor/unification/.idea/.name
deleted file mode 100644
index 13400552..00000000
--- a/reactor/unification/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-unification
\ No newline at end of file
diff --git a/reactor/unification/.idea/compiler.xml b/reactor/unification/.idea/compiler.xml
deleted file mode 100644
index cbc987ef..00000000
--- a/reactor/unification/.idea/compiler.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-    <resourceExtensions />
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-      <entry name="!?*.form" />
-      <entry name="!?*.class" />
-      <entry name="!?*.groovy" />
-      <entry name="!?*.scala" />
-      <entry name="!?*.flex" />
-      <entry name="!?*.kt" />
-      <entry name="!?*.clj" />
-    </wildcardResourcePatterns>
-    <annotationProcessing>
-      <profile default="true" name="Default" enabled="false">
-        <processorPath useClasspath="true" />
-      </profile>
-      <profile default="false" name="Annotation profile for tests" enabled="true">
-        <sourceOutputDir name="target/generated-sources/annotations" />
-        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
-        <outputRelativeToContentRoot value="true" />
-        <processorPath useClasspath="true" />
-        <module name="tests" />
-      </profile>
-      <profile default="false" name="Annotation profile for code" enabled="true">
-        <sourceOutputDir name="target/generated-sources/annotations" />
-        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
-        <outputRelativeToContentRoot value="true" />
-        <processorPath useClasspath="true" />
-        <module name="code" />
-      </profile>
-    </annotationProcessing>
-    <bytecodeTargetLevel>
-      <module name="code" target="1.6" />
-      <module name="main" target="1.6" />
-      <module name="tests" target="1.6" />
-    </bytecodeTargetLevel>
-  </component>
-</project>
\ No newline at end of file
diff --git a/reactor/unification/.idea/copyright/JetBrains.xml b/reactor/unification/.idea/copyright/JetBrains.xml
deleted file mode 100644
index 361c3c6b..00000000
--- a/reactor/unification/.idea/copyright/JetBrains.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="CopyrightManager">
-  <copyright>
-    <option name="notice" value="Copyright &amp;#36;today.year JetBrains s.r.o.&#10;&#10;Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);&#10;you may not use this file except in compliance with the License.&#10;You may obtain a copy of the License at&#10;&#10;http://www.apache.org/licenses/LICENSE-2.0&#10;&#10;Unless required by applicable law or agreed to in writing, software&#10;distributed under the License is distributed on an &quot;AS IS&quot; BASIS,&#10;WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.&#10;See the License for the specific language governing permissions and&#10;limitations under the License." />
-    <option name="keyword" value="Copyright" />
-    <option name="allowReplaceKeyword" value="JetBrains" />
-    <option name="myName" value="JetBrains" />
-    <option name="myLocal" value="true" />
-  </copyright>
-</component>
\ No newline at end of file
diff --git a/reactor/unification/.idea/copyright/profiles_settings.xml b/reactor/unification/.idea/copyright/profiles_settings.xml
deleted file mode 100644
index 4c0f48ac..00000000
--- a/reactor/unification/.idea/copyright/profiles_settings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="JetBrains" />
-</component>
\ No newline at end of file
diff --git a/reactor/unification/.idea/encodings.xml b/reactor/unification/.idea/encodings.xml
deleted file mode 100644
index 281c0d13..00000000
--- a/reactor/unification/.idea/encodings.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false">
-    <file url="file://$PROJECT_DIR$" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/code" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/tests" charset="UTF-8" />
-    <file url="PROJECT" charset="UTF-8" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/reactor/unification/.idea/libraries/Maven__junit_junit_4_12.xml b/reactor/unification/.idea/libraries/Maven__junit_junit_4_12.xml
deleted file mode 100644
index d4110417..00000000
--- a/reactor/unification/.idea/libraries/Maven__junit_junit_4_12.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: junit:junit:4.12">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.12/junit-4.12.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.12/junit-4.12-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.12/junit-4.12-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/reactor/unification/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml b/reactor/unification/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml
deleted file mode 100644
index f58bbc11..00000000
--- a/reactor/unification/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.hamcrest:hamcrest-core:1.3">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/reactor/unification/.idea/libraries/junit_junit_4_11.xml b/reactor/unification/.idea/libraries/junit_junit_4_11.xml
deleted file mode 100644
index c4657f5f..00000000
--- a/reactor/unification/.idea/libraries/junit_junit_4_11.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="junit:junit:4.11" type="repository">
-    <properties maven-id="junit:junit:4.11" />
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/lib/junit-4.11.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/hamcrest-core-1.3.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/reactor/unification/.idea/misc.xml b/reactor/unification/.idea/misc.xml
deleted file mode 100644
index 743f551c..00000000
--- a/reactor/unification/.idea/misc.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="EntryPointsManager">
-    <entry_points version="2.0" />
-  </component>
-  <component name="JavadocGenerationManager">
-    <option name="OUTPUT_DIRECTORY" value="$PROJECT_DIR$/doc" />
-    <option name="OPTION_SCOPE" value="protected" />
-    <option name="OPTION_HIERARCHY" value="false" />
-    <option name="OPTION_NAVIGATOR" value="false" />
-    <option name="OPTION_INDEX" value="false" />
-    <option name="OPTION_SEPARATE_INDEX" value="true" />
-    <option name="OPTION_DOCUMENT_TAG_USE" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_AUTHOR" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_VERSION" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_DEPRECATED" value="true" />
-    <option name="OPTION_DEPRECATED_LIST" value="true" />
-    <option name="OTHER_OPTIONS" />
-    <option name="HEAP_SIZE" />
-    <option name="LOCALE" />
-    <option name="OPEN_IN_BROWSER" value="true" />
-    <option name="OPTION_INCLUDE_LIBS" value="false" />
-  </component>
-  <component name="MavenProjectsManager">
-    <option name="originalFiles">
-      <list>
-        <option value="$PROJECT_DIR$/pom.xml" />
-      </list>
-    </option>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="1.6" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/reactor/unification/.idea/modules.xml b/reactor/unification/.idea/modules.xml
deleted file mode 100644
index 34c27898..00000000
--- a/reactor/unification/.idea/modules.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/code/code.iml" filepath="$PROJECT_DIR$/code/code.iml" />
-      <module fileurl="file://$PROJECT_DIR$/main.iml" filepath="$PROJECT_DIR$/main.iml" />
-      <module fileurl="file://$PROJECT_DIR$/tests/tests.iml" filepath="$PROJECT_DIR$/tests/tests.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
diff --git a/reactor/unification/.idea/scopes/scope_settings.xml b/reactor/unification/.idea/scopes/scope_settings.xml
deleted file mode 100644
index 922003b8..00000000
--- a/reactor/unification/.idea/scopes/scope_settings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="DependencyValidationManager">
-  <state>
-    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/reactor/unification/.idea/vcs.xml b/reactor/unification/.idea/vcs.xml
deleted file mode 100644
index c80f2198..00000000
--- a/reactor/unification/.idea/vcs.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>
-
diff --git a/reactor/unification/code/pom.xml b/reactor/unification/code/pom.xml
index 10fc1724..8de210d5 100644
--- a/reactor/unification/code/pom.xml
+++ b/reactor/unification/code/pom.xml
@@ -5,14 +5,15 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>jetbrains.mps.unification</groupId>
-        <artifactId>main</artifactId>
-        <version>1.0.2</version>
-        <relativePath>..</relativePath>
+        <groupId>jetbrains.mps.logic.memreactor</groupId>
+        <artifactId>memreactor-main</artifactId>
+        <version>0.1</version>
+        <relativePath>../..</relativePath>
     </parent>
 
     <artifactId>unification-lib</artifactId>
     <packaging>jar</packaging>
+    <version>1.0.2</version>
 
     <build>
         <sourceDirectory>${basedir}/src/</sourceDirectory>
diff --git a/reactor/unification/code/unification-lib.iml b/reactor/unification/code/unification-lib.iml
new file mode 100644
index 00000000..1b391a3d
--- /dev/null
+++ b/reactor/unification/code/unification-lib.iml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-runtime:1.0.0-rc-1050" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib:1.0.0-rc-1050" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-maven-plugin:1.0.0-rc-1050" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.maven:maven-core:3.0.5" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.maven:maven-model:3.0.5" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.maven:maven-settings:3.0.5" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.maven:maven-settings-builder:3.0.5" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.maven:maven-repository-metadata:3.0.5" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.maven:maven-artifact:3.0.5" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.maven:maven-model-builder:3.0.5" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.maven:maven-aether-provider:3.0.5" level="project" />
+    <orderEntry type="library" name="Maven: org.sonatype.aether:aether-spi:1.13.1" level="project" />
+    <orderEntry type="library" name="Maven: org.sonatype.aether:aether-impl:1.13.1" level="project" />
+    <orderEntry type="library" name="Maven: org.sonatype.aether:aether-api:1.13.1" level="project" />
+    <orderEntry type="library" name="Maven: org.sonatype.aether:aether-util:1.13.1" level="project" />
+    <orderEntry type="library" name="Maven: org.sonatype.sisu:sisu-inject-plexus:2.3.0" level="project" />
+    <orderEntry type="library" name="Maven: org.sonatype.sisu:sisu-inject-bean:2.3.0" level="project" />
+    <orderEntry type="library" name="Maven: org.sonatype.sisu:sisu-guice:no_aop:3.1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.sonatype.sisu:sisu-guava:0.9.9" level="project" />
+    <orderEntry type="library" name="Maven: org.codehaus.plexus:plexus-interpolation:1.14" level="project" />
+    <orderEntry type="library" name="Maven: org.codehaus.plexus:plexus-utils:2.0.6" level="project" />
+    <orderEntry type="library" name="Maven: org.codehaus.plexus:plexus-classworlds:2.4" level="project" />
+    <orderEntry type="library" name="Maven: org.codehaus.plexus:plexus-component-annotations:1.5.5" level="project" />
+    <orderEntry type="library" name="Maven: org.sonatype.plexus:plexus-sec-dispatcher:1.3" level="project" />
+    <orderEntry type="library" name="Maven: org.sonatype.plexus:plexus-cipher:1.4" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.maven:maven-plugin-api:3.0.5" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.maven.plugin-tools:maven-plugin-annotations:3.4" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-compiler:1.0.0-rc-1050" level="project" />
+    <orderEntry type="library" name="Maven: com.google.collections:google-collections:1.0" level="project" />
+    <orderEntry type="library" name="Maven: com.github.andrewoma.dexx:dexx-collections:0.2" level="project" />
+    <orderEntry type="library" name="Maven: com.intellij:annotations:12.0" level="project" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/reactor/unification/lib/hamcrest-core-1.3.jar b/reactor/unification/lib/hamcrest-core-1.3.jar
deleted file mode 100644
index 9d5fe16e..00000000
Binary files a/reactor/unification/lib/hamcrest-core-1.3.jar and /dev/null differ
diff --git a/reactor/unification/lib/junit-4.11.jar b/reactor/unification/lib/junit-4.11.jar
deleted file mode 100644
index aaf74448..00000000
Binary files a/reactor/unification/lib/junit-4.11.jar and /dev/null differ
diff --git a/reactor/unification/main.iml b/reactor/unification/main.iml
deleted file mode 100644
index 987693c7..00000000
--- a/reactor/unification/main.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/reactor/unification/pom.xml b/reactor/unification/pom.xml
deleted file mode 100644
index 0fc91ea6..00000000
--- a/reactor/unification/pom.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-
-    <packaging>pom</packaging>
-    <groupId>jetbrains.mps.unification</groupId>
-    <artifactId>main</artifactId>
-    <version>1.0.2</version>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.2</version>
-                <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-    <modules>
-        <module>code</module>
-        <module>tests</module>
-    </modules>
-
-</project>
\ No newline at end of file
diff --git a/reactor/unification/tests/pom.xml b/reactor/unification/tests/pom.xml
index 3810558a..2f7b0cc1 100644
--- a/reactor/unification/tests/pom.xml
+++ b/reactor/unification/tests/pom.xml
@@ -5,13 +5,13 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>jetbrains.mps.unification</groupId>
-        <artifactId>main</artifactId>
-        <version>1.0.2</version>
-        <relativePath>..</relativePath>
+        <groupId>jetbrains.mps.logic.memreactor</groupId>
+        <artifactId>memreactor-main</artifactId>
+        <version>0.1</version>
+        <relativePath>../..</relativePath>
     </parent>
 
-    <artifactId>tests</artifactId>
+    <artifactId>unification-tests</artifactId>
     <packaging>jar</packaging>
 
     <dependencies>
@@ -22,9 +22,9 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>jetbrains.mps.unification</groupId>
+            <groupId>jetbrains.mps.logic.memreactor</groupId>
             <artifactId>unification-lib</artifactId>
-            <version>1.0.2</version>
+            <version>${unification.version}</version>
         </dependency>
     </dependencies>
 
diff --git a/reactor/unification/tests/tests.iml b/reactor/unification/tests/tests.iml
index c4c848ab..8c9f5637 100644
--- a/reactor/unification/tests/tests.iml
+++ b/reactor/unification/tests/tests.iml
@@ -5,15 +5,43 @@
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/${project.build.directory}/classes" />
-      <excludeFolder url="file://$MODULE_DIR$/${project.build.directory}/test-classes" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="junit:junit:4.11" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="module" module-name="code" />
+    <orderEntry type="module" module-name="unification-lib" />
+    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-runtime:1.0.0-rc-1050" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib:1.0.0-rc-1050" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-maven-plugin:1.0.0-rc-1050" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.maven:maven-core:3.0.5" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.maven:maven-model:3.0.5" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.maven:maven-settings:3.0.5" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.maven:maven-settings-builder:3.0.5" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.maven:maven-repository-metadata:3.0.5" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.maven:maven-artifact:3.0.5" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.maven:maven-model-builder:3.0.5" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.maven:maven-aether-provider:3.0.5" level="project" />
+    <orderEntry type="library" name="Maven: org.sonatype.aether:aether-spi:1.13.1" level="project" />
+    <orderEntry type="library" name="Maven: org.sonatype.aether:aether-impl:1.13.1" level="project" />
+    <orderEntry type="library" name="Maven: org.sonatype.aether:aether-api:1.13.1" level="project" />
+    <orderEntry type="library" name="Maven: org.sonatype.aether:aether-util:1.13.1" level="project" />
+    <orderEntry type="library" name="Maven: org.sonatype.sisu:sisu-inject-plexus:2.3.0" level="project" />
+    <orderEntry type="library" name="Maven: org.sonatype.sisu:sisu-inject-bean:2.3.0" level="project" />
+    <orderEntry type="library" name="Maven: org.sonatype.sisu:sisu-guice:no_aop:3.1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.sonatype.sisu:sisu-guava:0.9.9" level="project" />
+    <orderEntry type="library" name="Maven: org.codehaus.plexus:plexus-interpolation:1.14" level="project" />
+    <orderEntry type="library" name="Maven: org.codehaus.plexus:plexus-utils:2.0.6" level="project" />
+    <orderEntry type="library" name="Maven: org.codehaus.plexus:plexus-classworlds:2.4" level="project" />
+    <orderEntry type="library" name="Maven: org.codehaus.plexus:plexus-component-annotations:1.5.5" level="project" />
+    <orderEntry type="library" name="Maven: org.sonatype.plexus:plexus-sec-dispatcher:1.3" level="project" />
+    <orderEntry type="library" name="Maven: org.sonatype.plexus:plexus-cipher:1.4" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.maven:maven-plugin-api:3.0.5" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.maven.plugin-tools:maven-plugin-annotations:3.4" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-compiler:1.0.0-rc-1050" level="project" />
+    <orderEntry type="library" name="Maven: com.google.collections:google-collections:1.0" level="project" />
+    <orderEntry type="library" name="Maven: com.github.andrewoma.dexx:dexx-collections:0.2" level="project" />
+    <orderEntry type="library" name="Maven: com.intellij:annotations:12.0" level="project" />
   </component>
 </module>
\ No newline at end of file