diff --git a/.idea/libraries/lib.xml b/.idea/libraries/lib.xml
deleted file mode 100644
index a0a10d8d..00000000
--- a/.idea/libraries/lib.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="lib">
-    <CLASSES>
-      <root url="file://$PROJECT_DIR$/languages/jetbrains.mps.jchr/runtime/lib" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="file://$PROJECT_DIR$/languages/jetbrains.mps.jchr/runtime/lib" />
-    </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" />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/lib1.xml b/.idea/libraries/lib1.xml
deleted file mode 100644
index 4a9fe1dc..00000000
--- a/.idea/libraries/lib1.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="libraryTable">
-  <library name="lib1">
-    <CLASSES>
-      <root url="file://$PROJECT_DIR$/solutions/jetbrains.mps.unification.tree/imports/mps-unification/lib" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-    <jarDirectory url="file://$PROJECT_DIR$/solutions/jetbrains.mps.unification.tree/imports/mps-unification/lib" recursive="false" />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/log4j.xml b/.idea/libraries/log4j.xml
new file mode 100644
index 00000000..d9bbcf74
--- /dev/null
+++ b/.idea/libraries/log4j.xml
@@ -0,0 +1,9 @@
+<component name="libraryTable">
+  <library name="log4j">
+    <CLASSES>
+      <root url="jar://$APPLICATION_HOME_DIR$/lib/log4j.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index a438cb7e..11940fbf 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,7 +3,7 @@
   <component name="EntryPointsManager">
     <entry_points version="2.0" />
   </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">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" default="false" 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/.idea/modules.xml b/.idea/modules.xml
index 548f5f85..478edd05 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -6,8 +6,8 @@
       <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/samplechecker.iml" filepath="$PROJECT_DIR$/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker/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.runner/samplechecker.runner.iml" filepath="$PROJECT_DIR$/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.runner/samplechecker.runner.iml" />
     </modules>
   </component>
-</project>
+</project>
\ 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
new file mode 100644
index 00000000..37a8fb61
--- /dev/null
+++ b/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.handler/samplechecker.handler.iml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/classes_jchr" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/source_gen" isTestSource="false" />
+    </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" />
+  </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 66c29d1e..b5a12c25 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
@@ -8,8 +8,9 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="Logic" />
-    <orderEntry type="module" module-name="samplechecker" />
     <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" />
   </component>
 </module>
\ No newline at end of file