diff --git a/.idea/modules.xml b/.idea/modules.xml
index 7d784529..13e16b6b 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -7,7 +7,9 @@
       <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.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/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.test/samplechecker.test.iml" filepath="$PROJECT_DIR$/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.test/samplechecker.test.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" />
     </modules>
   </component>
diff --git a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker/samplechecker.iml b/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/samplechecker.handler.util.iml
similarity index 64%
rename from languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker/samplechecker.iml
rename to languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/samplechecker.handler.util.iml
index dc27d0b8..b8abb066 100644
--- a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker/samplechecker.iml
+++ b/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/samplechecker.handler.util.iml
@@ -3,15 +3,13 @@
   <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" />
-      <excludeFolder url="file://$MODULE_DIR$/source_gen/jetbrains/mps/lang/typesystem2/samplechecker/sample" />
-      <excludeFolder url="file://$MODULE_DIR$/source_gen/jetbrains/mps/lang/typesystem2/samplechecker/template" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="jchr" level="project" />
     <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" />
   </component>
 </module>
\ No newline at end of file
diff --git a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.test/samplechecker.test.iml b/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.test/samplechecker.test.iml
new file mode 100644
index 00000000..995f7eee
--- /dev/null
+++ b/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.test/samplechecker.test.iml
@@ -0,0 +1,24 @@
+<?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$/source_gen" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$APPLICATION_HOME_DIR$/lib/junit.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module" module-name="Term" />
+    <orderEntry type="module" module-name="Logic" />
+    <orderEntry type="module" module-name="samplechecker.handler.util" />
+    <orderEntry type="library" name="jchr" level="project" />
+  </component>
+</module>
\ No newline at end of file