diff --git a/.mps/modules.xml b/.mps/modules.xml
index dd727848..5decce04 100644
--- a/.mps/modules.xml
+++ b/.mps/modules.xml
@@ -14,7 +14,6 @@
       <modulePath path="$PROJECT_DIR$/jchr/solutions/jetbrains.mps.logic.jchr/jetbrains.mps.logic.jchr.msd" folder="jchr" />
       <modulePath path="$PROJECT_DIR$/logic/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl" 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.reactor/jetbrains.mps.logic.reactor.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.lang.typesystem2.sampleLang/jetbrains.mps.lang.typesystem2.sampleLang.mpl" folder="typechecking.sample" />
diff --git a/build.xml b/build.xml
index cae3545a..cef46e0a 100644
--- a/build.xml
+++ b/build.xml
@@ -354,45 +354,6 @@
       <zipfileset file="${basedir}/logic/languages/jetbrains.mps.logic/runtime/jetbrains.mps.logic.runtime.msd" prefix="module" />
       <zipfileset dir="${build.tmp}/customProcessors/copyModels/logic-languages-jetbrains.mps.logic-runtime-models" prefix="module/models" />
     </jar>
-    <mkdir dir="${build.tmp}/default/jetbrains.mps.logic.atom.jar" />
-    <mkdir dir="${build.tmp}/default/jetbrains.mps.logic.atom.jar/META-INF" />
-    <echoxml file="${build.tmp}/default/jetbrains.mps.logic.atom.jar/META-INF/module.xml">
-      <module namespace="jetbrains.mps.logic.atom" type="solution" uuid="7526e0cf-1ce7-46f8-a555-9eca1e06c23b">
-        <dependencies>
-          <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" />
-          <module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" />
-          <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" />
-          <module ref="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" />
-          <module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" />
-          <module ref="a3e4657f-a76c-45bb-bbda-c764596ecc65(jetbrains.mps.baseLanguage.logging.runtime)" />
-          <module ref="d44dab97-aaac-44cb-9745-8a14db674c03(jetbrains.mps.baseLanguage.tuples.runtime)" />
-          <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" />
-          <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" />
-          <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
-        </dependencies>
-        <library jar="../lib/unification-lib-1.0.2.jar" />
-        <sources jar="jetbrains.mps.logic.atom-src.jar" descriptor="jetbrains.mps.logic.atom.msd" />
-      </module>
-    </echoxml>
-    <jar destfile="${build.tmp}/default/samplechecker.zip/samplechecker/languages/jetbrains.mps.logic.atom.jar" duplicate="preserve">
-      <fileset dir="${build.tmp}/java/out/jetbrains.mps.logic.atom" />
-      <fileset dir="${basedir}/logic/solutions/jetbrains.mps.logic.atom" includes="icons/**, resources/**" />
-      <fileset dir="${basedir}/logic/solutions/jetbrains.mps.logic.atom/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
-      <fileset dir="${build.tmp}/default/jetbrains.mps.logic.atom.jar" />
-    </jar>
-    <copyModels todir="${build.tmp}/customProcessors/copyModels/logic-solutions-jetbrains.mps.logic.atom-models">
-      <fileset dir="${basedir}/logic/solutions/jetbrains.mps.logic.atom/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
-    </copyModels>
-    <jar destfile="${build.tmp}/default/samplechecker.zip/samplechecker/languages/jetbrains.mps.logic.atom-src.jar" duplicate="preserve">
-      <fileset dir="${basedir}/logic/solutions/jetbrains.mps.logic.atom/source_gen">
-        <exclude name="**/trace.info" />
-        <exclude name="**/exports" />
-        <exclude name="**/checkpoints" />
-        <exclude name="**/*.mps" />
-      </fileset>
-      <zipfileset file="${basedir}/logic/solutions/jetbrains.mps.logic.atom/jetbrains.mps.logic.atom.msd" prefix="module" />
-      <zipfileset dir="${build.tmp}/customProcessors/copyModels/logic-solutions-jetbrains.mps.logic.atom-models" prefix="module/models" />
-    </jar>
     <mkdir dir="${build.tmp}/default/jetbrains.mps.logic.reactor.jar" />
     <mkdir dir="${build.tmp}/default/jetbrains.mps.logic.reactor.jar/META-INF" />
     <echoxml file="${build.tmp}/default/jetbrains.mps.logic.reactor.jar/META-INF/module.xml">
@@ -406,6 +367,7 @@
         <library jar="../lib/google-collections-1.0.jar" />
         <library jar="../lib/kotlin-runtime-1.0.0-rc-1050.jar" />
         <library jar="../lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
+        <library jar="../lib/unification-lib-1.0.2.jar" />
         <sources jar="jetbrains.mps.logic.reactor-src.jar" descriptor="jetbrains.mps.logic.reactor.msd" />
       </module>
     </echoxml>
@@ -429,7 +391,6 @@
       <zipfileset dir="${build.tmp}/customProcessors/copyModels/logic-solutions-jetbrains.mps.logic.reactor-models" prefix="module/models" />
     </jar>
     <zip destfile="${build.layout}/samplechecker.zip">
-      <zipfileset dir="${basedir}/logic/solutions/jetbrains.mps.logic.atom/lib" prefix="samplechecker/lib" />
       <zipfileset dir="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib" prefix="samplechecker/lib" />
       <fileset dir="${build.tmp}/default/samplechecker.zip" />
     </zip>
@@ -447,7 +408,7 @@
     <delete dir="${build.layout}" />
   </target>
   
-  <target name="compileJava" depends="java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic#6626732309150416985, java.compile.java.modules.cycle.1, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.atom, java.compile.jetbrains.mps.lang.typesystem2, java.compile.jetbrains.mps.lang.typesystem2#4578927328670739933, java.compile.java.modules.cycle.2, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.lang.typesystem2.sampleplugin, java.compile.jetbrains.mps.lang.typesystem2.samplechecker.handler.util" />
+  <target name="compileJava" depends="java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic#6626732309150416985, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.lang.typesystem2, java.compile.jetbrains.mps.lang.typesystem2#4578927328670739933, java.compile.java.modules.cycle.1, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.lang.typesystem2.sampleplugin, java.compile.jetbrains.mps.lang.typesystem2.samplechecker.handler.util" />
   
   <target name="processResources" />
   
@@ -539,7 +500,6 @@
       <library file="${artifacts.mps}/plugins/mps-core/languages/util/jetbrains.mps.core.properties.jar" />
       <chunk>
         <module file="${basedir}/logic/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl" />
-        <module file="${basedir}/logic/solutions/jetbrains.mps.logic.atom/jetbrains.mps.logic.atom.msd" />
         <module file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/jetbrains.mps.logic.reactor.msd" />
         <module file="${basedir}/logic/languages/jetbrains.mps.logic/runtime/jetbrains.mps.logic.runtime.msd" />
       </chunk>
@@ -563,7 +523,7 @@
   
   <target name="makeDependents" />
   
-  <target name="java.compile.jetbrains.mps.logic" depends="java.compile.jetbrains.mps.logic.atom, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
+  <target name="java.compile.jetbrains.mps.logic" depends="java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
     <mkdir dir="${basedir}/logic/languages/jetbrains.mps.logic/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.logic" />
     <javac destdir="${build.tmp}/java/out/jetbrains.mps.logic" fork="true" encoding="utf8" includeantruntime="false" debug="true">
@@ -572,18 +532,17 @@
         <path location="${basedir}/logic/languages/jetbrains.mps.logic/source_gen" />
       </src>
       <classpath>
-        <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-closures.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-collections.jar" />
         <fileset file="${artifacts.mps}/lib/mps-core.jar" />
         <fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
         <fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
         <fileset file="${artifacts.mps}/lib/mps-logging.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-closures.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-collections.jar" />
         <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.atom" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
         <fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
@@ -591,12 +550,12 @@
         <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
         <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
         <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
-        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.atom/lib/unification-lib-1.0.2.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-core-0.1.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/dexx-collections-0.2.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/google-collections-1.0.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.0-rc-1050.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
+        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/unification-lib-1.0.2.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
@@ -618,7 +577,7 @@
     </javac>
   </target>
   
-  <target name="java.compile.jetbrains.mps.logic#6626732309150416985" depends="java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic.atom, java.compile.jetbrains.mps.logic.reactor, fetchDependencies">
+  <target name="java.compile.jetbrains.mps.logic#6626732309150416985" depends="java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic.reactor, fetchDependencies">
     <mkdir dir="${basedir}/logic/languages/jetbrains.mps.logic/generator/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.logic#6626732309150416985" />
     <javac destdir="${build.tmp}/java/out/jetbrains.mps.logic#6626732309150416985" fork="true" encoding="utf8" includeantruntime="false" debug="true">
@@ -644,14 +603,13 @@
         <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
         <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.atom" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
-        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.atom/lib/unification-lib-1.0.2.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-core-0.1.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/dexx-collections-0.2.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/google-collections-1.0.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.0-rc-1050.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
+        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/unification-lib-1.0.2.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
@@ -672,46 +630,7 @@
     </javac>
   </target>
   
-  <target name="java.compile.java.modules.cycle.1" depends="java.compile.jetbrains.mps.logic.atom, fetchDependencies">
-    <mkdir dir="${build.tmp}/java.modules.cycle.1" />
-    <javac destdir="${build.tmp}/java.modules.cycle.1" fork="true" encoding="utf8" nowarn="true" includeantruntime="false">
-      <compilerarg value="-Xlint:none" />
-      <src>
-        <path location="${basedir}/logic/languages/jetbrains.mps.logic/runtime/source_gen" />
-        <path location="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/source_gen" />
-      </src>
-      <classpath>
-        <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-closures.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-collections.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-core.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-logging.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
-        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.atom/lib/unification-lib-1.0.2.jar" />
-        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-core-0.1.jar" />
-        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/dexx-collections-0.2.jar" />
-        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/google-collections-1.0.jar" />
-        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.0-rc-1050.jar" />
-        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
-        <fileset file="${artifacts.mps}/lib/log4j.jar" />
-        <fileset file="${artifacts.mps}/lib/annotations.jar" />
-        <fileset file="${artifacts.mps}/lib/jdom.jar" />
-        <fileset file="${artifacts.mps}/lib/trove4j.jar" />
-        <fileset file="${artifacts.mps}/lib/xstream-1.4.8.jar" />
-        <fileset file="${artifacts.mps}/lib/asm-all.jar" />
-        <fileset file="${artifacts.mps}/lib/diffutils-1.2.1.jar" />
-        <fileset file="${artifacts.mps}/lib/ecj-4.5.2.jar" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.atom" />
-      </classpath>
-    </javac>
-  </target>
-  
-  <target name="java.compile.jetbrains.mps.logic.runtime" depends="java.compile.jetbrains.mps.logic.atom, java.compile.java.modules.cycle.1, fetchDependencies">
+  <target name="java.compile.jetbrains.mps.logic.runtime" depends="java.compile.jetbrains.mps.logic.reactor, fetchDependencies">
     <mkdir dir="${basedir}/logic/languages/jetbrains.mps.logic/runtime/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
     <javac destdir="${build.tmp}/java/out/jetbrains.mps.logic.runtime" fork="true" encoding="utf8" includeantruntime="false" debug="true">
@@ -720,24 +639,24 @@
         <path location="${basedir}/logic/languages/jetbrains.mps.logic/runtime/source_gen" />
       </src>
       <classpath>
-        <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-closures.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-collections.jar" />
         <fileset file="${artifacts.mps}/lib/mps-core.jar" />
         <fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
         <fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
         <fileset file="${artifacts.mps}/lib/mps-logging.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-closures.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-collections.jar" />
         <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.atom" />
-        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.atom/lib/unification-lib-1.0.2.jar" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-core-0.1.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/dexx-collections-0.2.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/google-collections-1.0.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.0-rc-1050.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
+        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/unification-lib-1.0.2.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
@@ -746,12 +665,11 @@
         <fileset file="${artifacts.mps}/lib/asm-all.jar" />
         <fileset file="${artifacts.mps}/lib/diffutils-1.2.1.jar" />
         <fileset file="${artifacts.mps}/lib/ecj-4.5.2.jar" />
-        <pathelement path="${build.tmp}/java.modules.cycle.1" />
       </classpath>
     </javac>
   </target>
   
-  <target name="java.compile.jetbrains.mps.logic.reactor" depends="java.compile.jetbrains.mps.logic.atom, java.compile.java.modules.cycle.1, fetchDependencies">
+  <target name="java.compile.jetbrains.mps.logic.reactor" depends="fetchDependencies">
     <mkdir dir="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
     <javac destdir="${build.tmp}/java/out/jetbrains.mps.logic.reactor" fork="true" encoding="utf8" includeantruntime="false" debug="true">
@@ -760,58 +678,23 @@
         <path location="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/source_gen" />
       </src>
       <classpath>
-        <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-closures.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-collections.jar" />
         <fileset file="${artifacts.mps}/lib/mps-core.jar" />
         <fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
         <fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
         <fileset file="${artifacts.mps}/lib/mps-logging.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-closures.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-collections.jar" />
         <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.atom" />
-        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.atom/lib/unification-lib-1.0.2.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-core-0.1.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/dexx-collections-0.2.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/google-collections-1.0.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.0-rc-1050.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
-        <fileset file="${artifacts.mps}/lib/log4j.jar" />
-        <fileset file="${artifacts.mps}/lib/annotations.jar" />
-        <fileset file="${artifacts.mps}/lib/jdom.jar" />
-        <fileset file="${artifacts.mps}/lib/trove4j.jar" />
-        <fileset file="${artifacts.mps}/lib/xstream-1.4.8.jar" />
-        <fileset file="${artifacts.mps}/lib/asm-all.jar" />
-        <fileset file="${artifacts.mps}/lib/diffutils-1.2.1.jar" />
-        <fileset file="${artifacts.mps}/lib/ecj-4.5.2.jar" />
-        <pathelement path="${build.tmp}/java.modules.cycle.1" />
-      </classpath>
-    </javac>
-  </target>
-  
-  <target name="java.compile.jetbrains.mps.logic.atom" depends="fetchDependencies">
-    <mkdir dir="${basedir}/logic/solutions/jetbrains.mps.logic.atom/source_gen" />
-    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.logic.atom" />
-    <javac destdir="${build.tmp}/java/out/jetbrains.mps.logic.atom" fork="true" encoding="utf8" includeantruntime="false" debug="true">
-      <compilerarg value="-Xlint:none" />
-      <src>
-        <path location="${basedir}/logic/solutions/jetbrains.mps.logic.atom/source_gen" />
-      </src>
-      <classpath>
-        <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-closures.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-collections.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-core.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-logging.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
-        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.atom/lib/unification-lib-1.0.2.jar" />
+        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/unification-lib-1.0.2.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
@@ -824,7 +707,7 @@
     </javac>
   </target>
   
-  <target name="java.compile.jetbrains.mps.lang.typesystem2" depends="java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.lang.typesystem2.samplechecker.handler.util, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic.atom, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
+  <target name="java.compile.jetbrains.mps.lang.typesystem2" depends="java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.lang.typesystem2.samplechecker.handler.util, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
     <mkdir dir="${basedir}/typesystem2/languages/jetbrains.mps.lang.typesystem2/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2" />
     <javac destdir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2" fork="true" encoding="utf8" includeantruntime="false" debug="true">
@@ -853,15 +736,14 @@
         <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
         <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.atom" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
-        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.atom/lib/unification-lib-1.0.2.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-core-0.1.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/dexx-collections-0.2.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/google-collections-1.0.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.0-rc-1050.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
+        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/unification-lib-1.0.2.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
@@ -891,7 +773,7 @@
     </javac>
   </target>
   
-  <target name="java.compile.jetbrains.mps.lang.typesystem2#4578927328670739933" depends="java.compile.jetbrains.mps.lang.typesystem2, java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.lang.typesystem2.samplechecker.handler.util, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic.atom, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
+  <target name="java.compile.jetbrains.mps.lang.typesystem2#4578927328670739933" depends="java.compile.jetbrains.mps.lang.typesystem2, java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.lang.typesystem2.samplechecker.handler.util, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
     <mkdir dir="${basedir}/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2#4578927328670739933" />
     <javac destdir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2#4578927328670739933" fork="true" encoding="utf8" includeantruntime="false" debug="true">
@@ -921,15 +803,14 @@
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.samplechecker.handler.util" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.template" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.atom" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
-        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.atom/lib/unification-lib-1.0.2.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-core-0.1.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/dexx-collections-0.2.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/google-collections-1.0.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.0-rc-1050.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
+        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/unification-lib-1.0.2.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
@@ -958,9 +839,9 @@
     </javac>
   </target>
   
-  <target name="java.compile.java.modules.cycle.2" depends="java.compile.jetbrains.mps.lang.typesystem2.samplechecker.handler.util, java.compile.jetbrains.mps.logic.atom, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
-    <mkdir dir="${build.tmp}/java.modules.cycle.2" />
-    <javac destdir="${build.tmp}/java.modules.cycle.2" fork="true" encoding="utf8" nowarn="true" includeantruntime="false">
+  <target name="java.compile.java.modules.cycle.1" depends="java.compile.jetbrains.mps.lang.typesystem2.samplechecker.handler.util, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
+    <mkdir dir="${build.tmp}/java.modules.cycle.1" />
+    <javac destdir="${build.tmp}/java.modules.cycle.1" fork="true" encoding="utf8" nowarn="true" includeantruntime="false">
       <compilerarg value="-Xlint:none" />
       <src>
         <path location="${basedir}/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/source_gen" />
@@ -978,12 +859,12 @@
         <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
         <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
-        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.atom/lib/unification-lib-1.0.2.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-core-0.1.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/dexx-collections-0.2.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/google-collections-1.0.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.0-rc-1050.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
+        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/unification-lib-1.0.2.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
         <fileset file="${artifacts.mps}/lib/trove4j.jar" />
@@ -1001,14 +882,13 @@
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.samplechecker.handler.util" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.atom" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
       </classpath>
     </javac>
   </target>
   
-  <target name="java.compile.jetbrains.mps.lang.typesystem2.template" depends="java.compile.jetbrains.mps.lang.typesystem2.samplechecker.handler.util, java.compile.jetbrains.mps.logic.atom, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, java.compile.java.modules.cycle.2, fetchDependencies">
+  <target name="java.compile.jetbrains.mps.lang.typesystem2.template" depends="java.compile.jetbrains.mps.lang.typesystem2.samplechecker.handler.util, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, java.compile.java.modules.cycle.1, fetchDependencies">
     <mkdir dir="${basedir}/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.template" />
     <javac destdir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.template" fork="true" encoding="utf8" includeantruntime="false" debug="true">
@@ -1029,15 +909,14 @@
         <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.samplechecker.handler.util" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.atom" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
-        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.atom/lib/unification-lib-1.0.2.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-core-0.1.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/dexx-collections-0.2.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/google-collections-1.0.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.0-rc-1050.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
+        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/unification-lib-1.0.2.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
         <fileset file="${artifacts.mps}/lib/trove4j.jar" />
@@ -1054,12 +933,12 @@
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
-        <pathelement path="${build.tmp}/java.modules.cycle.2" />
+        <pathelement path="${build.tmp}/java.modules.cycle.1" />
       </classpath>
     </javac>
   </target>
   
-  <target name="java.compile.jetbrains.mps.lang.typesystem2.runtime" depends="java.compile.jetbrains.mps.lang.typesystem2.samplechecker.handler.util, java.compile.jetbrains.mps.logic.atom, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, java.compile.java.modules.cycle.2, fetchDependencies">
+  <target name="java.compile.jetbrains.mps.lang.typesystem2.runtime" depends="java.compile.jetbrains.mps.lang.typesystem2.samplechecker.handler.util, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, java.compile.java.modules.cycle.1, fetchDependencies">
     <mkdir dir="${basedir}/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.runtime" />
     <javac destdir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.runtime" fork="true" encoding="utf8" includeantruntime="false" debug="true">
@@ -1080,15 +959,14 @@
         <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.samplechecker.handler.util" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.atom" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
-        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.atom/lib/unification-lib-1.0.2.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-core-0.1.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/dexx-collections-0.2.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/google-collections-1.0.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.0-rc-1050.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
+        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/unification-lib-1.0.2.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
@@ -1104,12 +982,12 @@
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
-        <pathelement path="${build.tmp}/java.modules.cycle.2" />
+        <pathelement path="${build.tmp}/java.modules.cycle.1" />
       </classpath>
     </javac>
   </target>
   
-  <target name="java.compile.jetbrains.mps.lang.typesystem2.sampleplugin" depends="java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.lang.typesystem2.samplechecker.handler.util, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic.atom, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
+  <target name="java.compile.jetbrains.mps.lang.typesystem2.sampleplugin" depends="java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.lang.typesystem2.samplechecker.handler.util, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
     <mkdir dir="${basedir}/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.sampleplugin" />
     <javac destdir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.sampleplugin" fork="true" encoding="utf8" includeantruntime="false" debug="true">
@@ -1138,17 +1016,16 @@
         <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
         <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.atom" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
         <fileset file="${artifacts.mps}/lib/mps-icons.jar" />
         <fileset file="${artifacts.mps}/lib/mps-workbench.jar" />
-        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.atom/lib/unification-lib-1.0.2.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-core-0.1.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/dexx-collections-0.2.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/google-collections-1.0.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.0-rc-1050.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
+        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/unification-lib-1.0.2.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
@@ -1169,7 +1046,7 @@
     </javac>
   </target>
   
-  <target name="java.compile.jetbrains.mps.lang.typesystem2.samplechecker.handler.util" depends="java.compile.jetbrains.mps.logic.atom, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
+  <target name="java.compile.jetbrains.mps.lang.typesystem2.samplechecker.handler.util" depends="java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
     <mkdir dir="${basedir}/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.samplechecker.handler.util" />
     <javac destdir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.samplechecker.handler.util" fork="true" encoding="utf8" includeantruntime="false" debug="true">
@@ -1178,26 +1055,25 @@
         <path location="${basedir}/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/source_gen" />
       </src>
       <classpath>
-        <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-closures.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-collections.jar" />
         <fileset file="${artifacts.mps}/lib/mps-core.jar" />
         <fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
         <fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
         <fileset file="${artifacts.mps}/lib/mps-logging.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-closures.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-collections.jar" />
         <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.atom" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
-        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.atom/lib/unification-lib-1.0.2.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-core-0.1.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/dexx-collections-0.2.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/google-collections-1.0.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.0-rc-1050.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
+        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/unification-lib-1.0.2.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
@@ -1221,7 +1097,6 @@
   <target name="cleanSources">
     <delete dir="${basedir}/logic/languages/jetbrains.mps.logic/source_gen" />
     <delete dir="${basedir}/logic/languages/jetbrains.mps.logic/generator/source_gen" />
-    <delete dir="${basedir}/logic/solutions/jetbrains.mps.logic.atom/source_gen" />
     <delete dir="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/source_gen" />
     <delete dir="${basedir}/logic/languages/jetbrains.mps.logic/runtime/source_gen" />
     <delete dir="${basedir}/typesystem2/languages/jetbrains.mps.lang.typesystem2/source_gen" />
diff --git a/jchr/languages/jetbrains.mps.jchr/jetbrains.mps.jchr.mpl b/jchr/languages/jetbrains.mps.jchr/jetbrains.mps.jchr.mpl
index 396f6743..6b0ebb56 100644
--- a/jchr/languages/jetbrains.mps.jchr/jetbrains.mps.jchr.mpl
+++ b/jchr/languages/jetbrains.mps.jchr/jetbrains.mps.jchr.mpl
@@ -81,6 +81,7 @@
     <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
     <dependency reexport="false">83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)</dependency>
     <dependency reexport="false" scope="generate-into">df345b11-b8c7-4213-ac66-48d2a9b75d88(jetbrains.mps.baseLanguageInternal)</dependency>
+    <dependency reexport="false">a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)</dependency>
   </dependencies>
   <usedDevKits>
     <usedDevKit>fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)</usedDevKit>
@@ -149,6 +150,8 @@
     <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
     <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
+    <module reference="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" version="0" />
+    <module reference="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" version="0" />
     <module reference="f8e20673-3f65-44e9-84c0-c4a4b6ede37e(jetbrains.mps.make.facets)" version="0" />
     <module reference="a1250a4d-c090-42c3-ad7c-d298a3357dd4(jetbrains.mps.make.runtime)" version="0" />
     <module reference="df9d410f-2ebb-43f7-893a-483a4f085250(jetbrains.mps.smodel.resources)" version="0" />
diff --git a/jchr/languages/jetbrains.mps.jchr/languageModels/plugin.mps b/jchr/languages/jetbrains.mps.jchr/languageModels/plugin.mps
index e390f93b..457fcb25 100644
--- a/jchr/languages/jetbrains.mps.jchr/languageModels/plugin.mps
+++ b/jchr/languages/jetbrains.mps.jchr/languageModels/plugin.mps
@@ -1318,7 +1318,7 @@
                                     <node concept="2dOGH5" id="2ev$9JFzGsK" role="1r8FgC">
                                       <property role="Lv5iS" value="true" />
                                       <node concept="Xl_RD" id="2ev$9JFzGsL" role="2dOGIY">
-                                        <property role="Xl_RC" value="jetbrains.mps.logic.atom.TreeForm" />
+                                        <property role="Xl_RC" value="jetbrains.mps.logic.treeform.TreeForm" />
                                       </node>
                                       <node concept="Xl_RD" id="2ev$9JFzGsM" role="2dOGIT">
                                         <property role="Xl_RC" value="fixed" />
diff --git a/jchr/languages/jetbrains.mps.jchr/runtime/jetbrains.mps.jchr.runtime.msd b/jchr/languages/jetbrains.mps.jchr/runtime/jetbrains.mps.jchr.runtime.msd
index 639efc9c..fd5589bf 100644
--- a/jchr/languages/jetbrains.mps.jchr/runtime/jetbrains.mps.jchr.runtime.msd
+++ b/jchr/languages/jetbrains.mps.jchr/runtime/jetbrains.mps.jchr.runtime.msd
@@ -16,6 +16,7 @@
   <sourcePath />
   <dependencies>
     <dependency reexport="true">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
+    <dependency reexport="false">a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)</dependency>
   </dependencies>
   <usedDevKits>
     <usedDevKit>fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)</usedDevKit>
@@ -30,6 +31,8 @@
   <dependencyVersions>
     <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
     <module reference="b984ee52-f34d-4b6d-8812-866c1d3eae31(jetbrains.mps.jchr.runtime)" version="0" />
+    <module reference="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" version="0" />
+    <module reference="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" version="0" />
   </dependencyVersions>
 </solution>
 
diff --git a/jchr/languages/jetbrains.mps.jchr/sandbox/jetbrains.mps.jchr.sandbox.msd b/jchr/languages/jetbrains.mps.jchr/sandbox/jetbrains.mps.jchr.sandbox.msd
index 4e16766b..33e24297 100644
--- a/jchr/languages/jetbrains.mps.jchr/sandbox/jetbrains.mps.jchr.sandbox.msd
+++ b/jchr/languages/jetbrains.mps.jchr/sandbox/jetbrains.mps.jchr.sandbox.msd
@@ -11,21 +11,19 @@
   <sourcePath />
   <dependencies>
     <dependency reexport="false">b984ee52-f34d-4b6d-8812-866c1d3eae31(jetbrains.mps.jchr.runtime)</dependency>
-    <dependency reexport="false">7526e0cf-1ce7-46f8-a555-9eca1e06c23b(jetbrains.mps.logic.atom)</dependency>
   </dependencies>
   <languageVersions>
-    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="4" />
-    <language id="ed6d7656-532c-4bc2-81d1-af945aeb8280" fqName="jetbrains.mps.baseLanguage.blTypes" version="0" />
-    <language id="df345b11-b8c7-4213-ac66-48d2a9b75d88" fqName="jetbrains.mps.baseLanguageInternal" version="0" />
-    <language id="894463aa-8754-49c0-bf4b-6a32af66b376" fqName="jetbrains.mps.jchr" version="0" />
-    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" fqName="jetbrains.mps.lang.core" version="1" />
-    <language id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" fqName="jetbrains.mps.lang.traceable" version="0" />
+    <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="4" />
+    <language slang="l:ed6d7656-532c-4bc2-81d1-af945aeb8280:jetbrains.mps.baseLanguage.blTypes" version="0" />
+    <language slang="l:df345b11-b8c7-4213-ac66-48d2a9b75d88:jetbrains.mps.baseLanguageInternal" version="0" />
+    <language slang="l:894463aa-8754-49c0-bf4b-6a32af66b376:jetbrains.mps.jchr" version="0" />
+    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
+    <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
   <dependencyVersions>
     <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
     <module reference="b984ee52-f34d-4b6d-8812-866c1d3eae31(jetbrains.mps.jchr.runtime)" version="0" />
     <module reference="7ab0c079-df36-45eb-a614-81cf81174043(jetbrains.mps.jchr.sandbox)" version="0" />
-    <module reference="7526e0cf-1ce7-46f8-a555-9eca1e06c23b(jetbrains.mps.logic.atom)" version="0" />
   </dependencyVersions>
 </solution>
 
diff --git a/jchr/languages/jetbrains.mps.jchr/sandbox/models/jetbrains/mps/jchr/sandbox.mps b/jchr/languages/jetbrains.mps.jchr/sandbox/models/jetbrains/mps/jchr/sandbox.mps
index 2094abed..0c02d855 100644
--- a/jchr/languages/jetbrains.mps.jchr/sandbox/models/jetbrains/mps/jchr/sandbox.mps
+++ b/jchr/languages/jetbrains.mps.jchr/sandbox/models/jetbrains/mps/jchr/sandbox.mps
@@ -12,7 +12,6 @@
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
     <import index="guwi" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.io(JDK/)" />
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
-    <import index="ie8e" ref="r:ab2605ab-b4bc-4e80-a8ca-19a4a8465c01(jetbrains.mps.logic.atom)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
diff --git a/jchr/languages/jetbrains.mps.jchr/sandbox/runner/jetbrains.mps.jchr.sandbox.runner.msd b/jchr/languages/jetbrains.mps.jchr/sandbox/runner/jetbrains.mps.jchr.sandbox.runner.msd
index 57d8efa8..c9592fa8 100644
--- a/jchr/languages/jetbrains.mps.jchr/sandbox/runner/jetbrains.mps.jchr.sandbox.runner.msd
+++ b/jchr/languages/jetbrains.mps.jchr/sandbox/runner/jetbrains.mps.jchr.sandbox.runner.msd
@@ -10,6 +10,7 @@
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">b984ee52-f34d-4b6d-8812-866c1d3eae31(jetbrains.mps.jchr.runtime)</dependency>
     <dependency reexport="false">7ab0c079-df36-45eb-a614-81cf81174043(jetbrains.mps.jchr.sandbox)</dependency>
+    <dependency reexport="false">a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)</dependency>
   </dependencies>
   <usedDevKits>
     <usedDevKit>fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)</usedDevKit>
@@ -26,6 +27,8 @@
     <module reference="b984ee52-f34d-4b6d-8812-866c1d3eae31(jetbrains.mps.jchr.runtime)" version="0" />
     <module reference="7ab0c079-df36-45eb-a614-81cf81174043(jetbrains.mps.jchr.sandbox)" version="0" />
     <module reference="50973c3e-8bb5-477f-8528-33fe556ec688(jetbrains.mps.jchr.sandbox.runner)" version="0" />
+    <module reference="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" version="0" />
+    <module reference="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" version="0" />
   </dependencyVersions>
 </solution>
 
diff --git a/jchr/languages/jetbrains.mps.logic_jchr/generator/template/main@generator.mps b/jchr/languages/jetbrains.mps.logic_jchr/generator/template/main@generator.mps
index 27dba340..90dae224 100644
--- a/jchr/languages/jetbrains.mps.logic_jchr/generator/template/main@generator.mps
+++ b/jchr/languages/jetbrains.mps.logic_jchr/generator/template/main@generator.mps
@@ -19,12 +19,12 @@
     <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
     <import index="vgt0" ref="r:f36c95e5-e428-4945-91ae-1005e20c7971(jetbrains.mps.jchr.structure)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
-    <import index="ie8e" ref="r:ab2605ab-b4bc-4e80-a8ca-19a4a8465c01(jetbrains.mps.logic.atom)" />
     <import index="ouxx" ref="r:727775a3-16ae-4b9f-80a6-9ef3207ffa6a(jetbrains.mps.logic.generator.template.main@generator)" />
     <import index="5j4j" ref="r:c8fb1c5e-8204-4904-a38f-678899d447c1(jetbrains.mps.logic.structure)" />
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
     <import index="yg8f" ref="r:e213377a-f1a7-4ba7-9d08-96bcb97ed8ce(jetbrains.mps.logic.builtin)" />
     <import index="45ys" ref="r:7365f7fe-12e6-4229-8901-f6dc6d5df03f(jetbrains.mps.logic.reactor.logical)" />
+    <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.treeform)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -482,7 +482,7 @@
         </node>
       </node>
       <node concept="3uibUv" id="35Lj3TiSq77" role="3clF45">
-        <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+        <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
       </node>
       <node concept="3Tm1VV" id="35Lj3TiRjRe" role="1B3o_S" />
       <node concept="3clFbS" id="35Lj3TiRjRf" role="3clF47">
@@ -691,7 +691,7 @@
               <node concept="1pGfFk" id="2Dg5bSg3RdZ" role="2ShVmc">
                 <ref role="37wK5l" to="45ys:7nPD14NON$Y" resolve="MetaLogical" />
                 <node concept="3VsKOn" id="2Dg5bSg3Rjh" role="37wK5m">
-                  <ref role="3VsUkX" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                  <ref role="3VsUkX" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
             </node>
@@ -751,8 +751,8 @@
       <ref role="30HIoZ" to="5j4j:6$jH9oLmYC_" resolve="Compound" />
       <node concept="gft3U" id="29_L5zQWy8k" role="1lVwrX">
         <node concept="2YIFZM" id="29_L5zQWy8l" role="gfFT$">
-          <ref role="37wK5l" to="ie8e:5JQSuNsxhfn" resolve="create" />
-          <ref role="1Pybhc" to="ie8e:5JQSuNswOXL" resolve="CompositeNode" />
+          <ref role="37wK5l" to="6exd:5JQSuNsxhfn" resolve="create" />
+          <ref role="1Pybhc" to="6exd:5JQSuNswOXL" resolve="CompositeNode" />
           <node concept="Xl_RD" id="29_L5zQWy8m" role="37wK5m">
             <property role="Xl_RC" value="node" />
             <node concept="17Uvod" id="29_L5zQWJXC" role="lGtFl">
@@ -878,8 +878,8 @@
       <ref role="30HIoZ" to="5j4j:6$jH9oLmYI0" resolve="ValueRole" />
       <node concept="gft3U" id="6UqNvvALIUa" role="1lVwrX">
         <node concept="2YIFZM" id="6UqNvvALIUb" role="gfFT$">
-          <ref role="1Pybhc" to="ie8e:5JQSuNsx4Gq" resolve="Builder" />
-          <ref role="37wK5l" to="ie8e:5JQSuNsx4I5" resolve="value" />
+          <ref role="1Pybhc" to="6exd:5JQSuNsx4Gq" resolve="Builder" />
+          <ref role="37wK5l" to="6exd:5JQSuNsx4I5" resolve="value" />
           <node concept="Xl_RD" id="6UqNvvALIUc" role="37wK5m">
             <property role="Xl_RC" value="name" />
             <node concept="17Uvod" id="6UqNvvALIUd" role="lGtFl">
@@ -939,8 +939,8 @@
       <ref role="30HIoZ" to="5j4j:6$jH9oLmYEJ" resolve="ChildRole" />
       <node concept="gft3U" id="6UqNvvALIHq" role="1lVwrX">
         <node concept="2YIFZM" id="6UqNvvALIHr" role="gfFT$">
-          <ref role="1Pybhc" to="ie8e:5JQSuNswOXL" resolve="CompositeNode" />
-          <ref role="37wK5l" to="ie8e:5JQSuNsxhfn" resolve="create" />
+          <ref role="1Pybhc" to="6exd:5JQSuNswOXL" resolve="CompositeNode" />
+          <ref role="37wK5l" to="6exd:5JQSuNsxhfn" resolve="create" />
           <node concept="Xl_RD" id="6UqNvvALIHs" role="37wK5m">
             <property role="Xl_RC" value="name" />
             <node concept="17Uvod" id="6UqNvvALIHt" role="lGtFl">
@@ -1066,8 +1066,8 @@
           </node>
           <node concept="gft3U" id="6UqNvvALHUZ" role="150oIE">
             <node concept="2YIFZM" id="6UqNvvALHV0" role="gfFT$">
-              <ref role="37wK5l" to="ie8e:5JQSuNsxb_I" resolve="create" />
-              <ref role="1Pybhc" to="ie8e:2xQ7eRAD2dj" resolve="Value" />
+              <ref role="37wK5l" to="6exd:5JQSuNsxb_I" resolve="create" />
+              <ref role="1Pybhc" to="6exd:2xQ7eRAD2dj" resolve="Value" />
               <node concept="Xl_RD" id="6UqNvvALHV1" role="37wK5m">
                 <property role="Xl_RC" value="value" />
                 <node concept="17Uvod" id="6UqNvvALHV2" role="lGtFl">
@@ -1119,8 +1119,8 @@
       <ref role="30HIoZ" to="5j4j:1OShD0HAY6y" resolve="List" />
       <node concept="gft3U" id="6UqNvvALHva" role="1lVwrX">
         <node concept="2YIFZM" id="6UqNvvALHvb" role="gfFT$">
-          <ref role="1Pybhc" to="ie8e:3OPtF03lco4" resolve="ListNode" />
-          <ref role="37wK5l" to="ie8e:1OShD0HS45f" resolve="createList" />
+          <ref role="1Pybhc" to="6exd:3OPtF03lco4" resolve="ListNode" />
+          <ref role="37wK5l" to="6exd:1OShD0HS45f" resolve="createList" />
           <node concept="10Nm6u" id="7HUwyZb7cIG" role="37wK5m">
             <node concept="2b32R4" id="7HUwyZb7cIH" role="lGtFl">
               <node concept="3JmXsc" id="7HUwyZb7cII" role="2P8S$">
diff --git a/jchr/languages/jetbrains.mps.logic_jchr/jetbrains.mps.logic_jchr.mpl b/jchr/languages/jetbrains.mps.logic_jchr/jetbrains.mps.logic_jchr.mpl
index f9821b53..790337b7 100644
--- a/jchr/languages/jetbrains.mps.logic_jchr/jetbrains.mps.logic_jchr.mpl
+++ b/jchr/languages/jetbrains.mps.logic_jchr/jetbrains.mps.logic_jchr.mpl
@@ -7,7 +7,7 @@
   </models>
   <accessoryModels />
   <generators>
-    <generator generatorUID="jetbrains.mps.logic_jchr#7541925065276733821" uuid="cb3e3296-69e1-4dcd-88e8-1ece22a0de60">
+    <generator name="" generatorUID="jetbrains.mps.logic_jchr#7541925065276733821" uuid="cb3e3296-69e1-4dcd-88e8-1ece22a0de60">
       <models>
         <modelRoot contentPath="${module}" type="default">
           <sourceRoot location="generator/template" />
@@ -16,7 +16,6 @@
       <external-templates />
       <dependencies>
         <dependency reexport="false">894463aa-8754-49c0-bf4b-6a32af66b376(jetbrains.mps.jchr)</dependency>
-        <dependency reexport="false">7526e0cf-1ce7-46f8-a555-9eca1e06c23b(jetbrains.mps.logic.atom)</dependency>
         <dependency reexport="false">85f64970-3326-4ea7-966e-1ac904686424(jetbrains.mps.logic#6626732309150416985)</dependency>
         <dependency reexport="false">35320f26-77cb-4c55-be9f-a97a27770af1(jetbrains.mps.logic)</dependency>
         <dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
@@ -61,7 +60,6 @@
         <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
         <module reference="35320f26-77cb-4c55-be9f-a97a27770af1(jetbrains.mps.logic)" version="0" />
         <module reference="85f64970-3326-4ea7-966e-1ac904686424(jetbrains.mps.logic#6626732309150416985)" version="0" />
-        <module reference="7526e0cf-1ce7-46f8-a555-9eca1e06c23b(jetbrains.mps.logic.atom)" version="0" />
         <module reference="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" version="0" />
         <module reference="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" version="0" />
         <module reference="cd9dfc9b-6796-491f-83c8-b3448018e7f5(jetbrains.mps.logic_jchr)" version="0" />
diff --git a/jchr/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler/jetbrains.mps.lang.typesystem2.samplechecker.handler.msd b/jchr/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler/jetbrains.mps.lang.typesystem2.samplechecker.handler.msd
index 8b406dc2..87376069 100644
--- a/jchr/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler/jetbrains.mps.lang.typesystem2.samplechecker.handler.msd
+++ b/jchr/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler/jetbrains.mps.lang.typesystem2.samplechecker.handler.msd
@@ -12,20 +12,19 @@
   <dependencies>
     <dependency reexport="false">a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
-    <dependency reexport="false">7526e0cf-1ce7-46f8-a555-9eca1e06c23b(jetbrains.mps.logic.atom)</dependency>
     <dependency reexport="false">b984ee52-f34d-4b6d-8812-866c1d3eae31(jetbrains.mps.jchr.runtime)</dependency>
     <dependency reexport="false">9c4ae21e-62e0-4110-95b7-191b357a42d2(jetbrains.mps.lang.typesystem2.samplechecker.handler.util)</dependency>
     <dependency reexport="false">760652ad-c01a-495e-9510-ed51532f617b(jetbrains.mps.logic.jchr)</dependency>
     <dependency reexport="false">26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.typesystem2.runtime)</dependency>
   </dependencies>
   <languageVersions>
-    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="4" />
-    <language id="ed6d7656-532c-4bc2-81d1-af945aeb8280" fqName="jetbrains.mps.baseLanguage.blTypes" version="0" />
-    <language id="df345b11-b8c7-4213-ac66-48d2a9b75d88" fqName="jetbrains.mps.baseLanguageInternal" version="0" />
-    <language id="894463aa-8754-49c0-bf4b-6a32af66b376" fqName="jetbrains.mps.jchr" version="0" />
-    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" fqName="jetbrains.mps.lang.core" version="1" />
-    <language id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" fqName="jetbrains.mps.lang.traceable" version="0" />
-    <language id="35320f26-77cb-4c55-be9f-a97a27770af1" fqName="jetbrains.mps.logic" version="0" />
+    <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="4" />
+    <language slang="l:ed6d7656-532c-4bc2-81d1-af945aeb8280:jetbrains.mps.baseLanguage.blTypes" version="0" />
+    <language slang="l:df345b11-b8c7-4213-ac66-48d2a9b75d88:jetbrains.mps.baseLanguageInternal" version="0" />
+    <language slang="l:894463aa-8754-49c0-bf4b-6a32af66b376:jetbrains.mps.jchr" version="0" />
+    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
+    <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
+    <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="0" />
   </languageVersions>
   <dependencyVersions>
     <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
diff --git a/jchr/solutions/jetbrains.mps.lang.typesystem2.samplechecker.runner/jetbrains.mps.lang.typesystem2.samplechecker.runner.msd b/jchr/solutions/jetbrains.mps.lang.typesystem2.samplechecker.runner/jetbrains.mps.lang.typesystem2.samplechecker.runner.msd
index d413f213..1cc70097 100644
--- a/jchr/solutions/jetbrains.mps.lang.typesystem2.samplechecker.runner/jetbrains.mps.lang.typesystem2.samplechecker.runner.msd
+++ b/jchr/solutions/jetbrains.mps.lang.typesystem2.samplechecker.runner/jetbrains.mps.lang.typesystem2.samplechecker.runner.msd
@@ -10,7 +10,6 @@
   </sourcePath>
   <dependencies>
     <dependency reexport="false">a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)</dependency>
-    <dependency reexport="true">7526e0cf-1ce7-46f8-a555-9eca1e06c23b(jetbrains.mps.logic.atom)</dependency>
     <dependency reexport="false">26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.typesystem2.runtime)</dependency>
     <dependency reexport="false">f61473f9-130f-42f6-b98d-6c438812c2f6(jetbrains.mps.baseLanguage.unitTest)</dependency>
     <dependency reexport="true">bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)</dependency>
diff --git a/jchr/solutions/jetbrains.mps.lang.typesystem2.samplechecker.runner/models/jetbrains/mps/lang/typesystem2/samplechecker/runner.mps b/jchr/solutions/jetbrains.mps.lang.typesystem2.samplechecker.runner/models/jetbrains/mps/lang/typesystem2/samplechecker/runner.mps
index 8785df9a..70a230f3 100644
--- a/jchr/solutions/jetbrains.mps.lang.typesystem2.samplechecker.runner/models/jetbrains/mps/lang/typesystem2/samplechecker/runner.mps
+++ b/jchr/solutions/jetbrains.mps.lang.typesystem2.samplechecker.runner/models/jetbrains/mps/lang/typesystem2/samplechecker/runner.mps
@@ -8,7 +8,6 @@
   </languages>
   <imports>
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
-    <import index="ie8e" ref="r:ab2605ab-b4bc-4e80-a8ca-19a4a8465c01(jetbrains.mps.logic.atom)" />
     <import index="eifs" ref="b984ee52-f34d-4b6d-8812-866c1d3eae31/java:runtime(jetbrains.mps.jchr.runtime/)" />
     <import index="oy3s" ref="r:a6030cee-34eb-4503-b1bf-015fe5cd8c1a(jetbrains.mps.logic.builtin.unification)" />
     <import index="guwi" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.io(JDK/)" />
@@ -23,6 +22,7 @@
     <import index="stgg" ref="r:fcdb37a4-4602-4a05-8d91-e439430734b8(jetbrains.mps.logic.jchr.program)" />
     <import index="poio" ref="r:023e4571-f779-4131-9ae1-88b3dd330e93(jetbrains.mps.lang.typesystem2.samplechecker.util)" />
     <import index="cxk7" ref="r:daa544a7-0a5c-49c0-a54c-4c2a5b4868aa(jetbrains.mps.logic.builtin.predicate)" />
+    <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.treeform)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -381,13 +381,13 @@
         <node concept="3clFbH" id="4peSo3CNiVm" role="3cqZAp" />
         <node concept="3clFbF" id="6r6omRld8pH" role="3cqZAp">
           <node concept="2YIFZM" id="6r6omRld8Db" role="3clFbG">
-            <ref role="37wK5l" to="ie8e:4peSo3CM2Ms" resolve="pushDelegate" />
-            <ref role="1Pybhc" to="ie8e:4peSo3CLajR" resolve="PrintDelegate" />
+            <ref role="37wK5l" to="6exd:4peSo3CM2Ms" resolve="pushDelegate" />
+            <ref role="1Pybhc" to="6exd:4peSo3CLajR" resolve="PrintDelegate" />
             <node concept="2ShNRf" id="6r6omRld8Ll" role="37wK5m">
               <node concept="YeOm9" id="6r6omRld9Ah" role="2ShVmc">
                 <node concept="1Y3b0j" id="6r6omRld9Ak" role="YeSDq">
                   <property role="2bfB8j" value="true" />
-                  <ref role="1Y3XeK" to="ie8e:4peSo3CLajR" resolve="PrintDelegate" />
+                  <ref role="1Y3XeK" to="6exd:4peSo3CLajR" resolve="PrintDelegate" />
                   <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
                   <node concept="3Tm1VV" id="6r6omRld9Al" role="1B3o_S" />
                   <node concept="3clFb_" id="6r6omRld9Am" role="jymVt">
@@ -396,7 +396,7 @@
                     <node concept="37vLTG" id="6r6omRld9An" role="3clF46">
                       <property role="TrG5h" value="tf" />
                       <node concept="3uibUv" id="6r6omRld9Ao" role="1tU5fm">
-                        <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                        <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                       </node>
                     </node>
                     <node concept="17QB3L" id="6r6omRld9Ap" role="3clF45" />
@@ -956,14 +956,14 @@
                         <ref role="1Pybhc" to="poio:4peSo3CHy8D" resolve="NodePrinter" />
                         <ref role="37wK5l" to="poio:4peSo3D04j7" resolve="print" />
                         <node concept="2YIFZM" id="1jo82tq2Chm" role="37wK5m">
-                          <ref role="37wK5l" to="ie8e:6HT7BWBOXr$" resolve="ground" />
-                          <ref role="1Pybhc" to="ie8e:6HT7BWBOXme" resolve="TreeFormUtil" />
+                          <ref role="37wK5l" to="6exd:6HT7BWBOXr$" resolve="ground" />
+                          <ref role="1Pybhc" to="6exd:6HT7BWBOXme" resolve="TreeFormUtil" />
                           <node concept="10QFUN" id="1jo82tq2Chn" role="37wK5m">
                             <node concept="37vLTw" id="1jo82tq2Cho" role="10QFUP">
                               <ref role="3cqZAo" node="4ef1vBgB8od" resolve="value" />
                             </node>
                             <node concept="3uibUv" id="1jo82tq2Chp" role="10QFUM">
-                              <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                              <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                             </node>
                           </node>
                         </node>
@@ -1018,7 +1018,7 @@
                 </node>
                 <node concept="2ZW3vV" id="4ef1vBgB2pz" role="3uHU7B">
                   <node concept="3uibUv" id="4ef1vBgB2qV" role="2ZW6by">
-                    <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                    <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                   </node>
                   <node concept="37vLTw" id="4ef1vBgB8VE" role="2ZW6bz">
                     <ref role="3cqZAo" node="4ef1vBgB8od" resolve="value" />
@@ -1316,7 +1316,7 @@
         <node concept="37vLTG" id="3gJBs5s_6z0" role="3clF46">
           <property role="TrG5h" value="variable" />
           <node concept="3uibUv" id="3gJBs5s_6z1" role="1tU5fm">
-            <ref role="3uigEE" to="ie8e:uNmovXiEd4" resolve="Variable" />
+            <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
           </node>
         </node>
         <node concept="17QB3L" id="4peSo3D1hha" role="3clF45" />
@@ -1410,7 +1410,7 @@
                         <ref role="3cqZAo" node="3gJBs5s_6z0" resolve="variable" />
                       </node>
                       <node concept="liA8E" id="4peSo3D0AYC" role="2OqNvi">
-                        <ref role="37wK5l" to="ie8e:56MMu0Ark7d" resolve="symbol" />
+                        <ref role="37wK5l" to="6exd:56MMu0Ark7d" resolve="symbol" />
                       </node>
                     </node>
                   </node>
diff --git a/jchr/solutions/jetbrains.mps.lang.typesystem2.samplechecker.runner/models/jetbrains/mps/lang/typesystem2/samplechecker/util.mps b/jchr/solutions/jetbrains.mps.lang.typesystem2.samplechecker.runner/models/jetbrains/mps/lang/typesystem2/samplechecker/util.mps
index a7ed3631..25830aba 100644
--- a/jchr/solutions/jetbrains.mps.lang.typesystem2.samplechecker.runner/models/jetbrains/mps/lang/typesystem2/samplechecker/util.mps
+++ b/jchr/solutions/jetbrains.mps.lang.typesystem2.samplechecker.runner/models/jetbrains/mps/lang/typesystem2/samplechecker/util.mps
@@ -5,10 +5,10 @@
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="4" />
   </languages>
   <imports>
-    <import index="yt73" ref="7526e0cf-1ce7-46f8-a555-9eca1e06c23b/java:jetbrains.mps.unification(jetbrains.mps.logic.atom/)" />
+    <import index="yt73" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.unification(jetbrains.mps.logic.reactor/)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
-    <import index="ie8e" ref="r:ab2605ab-b4bc-4e80-a8ca-19a4a8465c01(jetbrains.mps.logic.atom)" />
+    <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.treeform)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -322,7 +322,7 @@
       <node concept="37vLTG" id="4peSo3CHB$z" role="3clF46">
         <property role="TrG5h" value="tf" />
         <node concept="3uibUv" id="4peSo3CHBGl" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="3clFbS" id="4peSo3CHB5z" role="3clF47">
@@ -378,7 +378,7 @@
       <node concept="37vLTG" id="4peSo3D04j8" role="3clF46">
         <property role="TrG5h" value="tf" />
         <node concept="3uibUv" id="4peSo3D04j9" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="37vLTG" id="4peSo3D075N" role="3clF46">
@@ -438,7 +438,7 @@
       <node concept="37vLTG" id="4peSo3CIJRP" role="3clF46">
         <property role="TrG5h" value="tf" />
         <node concept="3uibUv" id="4peSo3CIJRQ" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="37vLTG" id="4peSo3D1wUl" role="3clF46">
@@ -493,7 +493,7 @@
                 <node concept="2OqwBi" id="4peSo3CIJSb" role="3clFbG">
                   <node concept="2ShNRf" id="4peSo3CIJSc" role="2Oq$k0">
                     <node concept="1pGfFk" id="4peSo3CIJSd" role="2ShVmc">
-                      <ref role="37wK5l" to="ie8e:47nvOnTQN6Q" resolve="TreeFormWalk" />
+                      <ref role="37wK5l" to="6exd:47nvOnTQN6Q" resolve="TreeFormWalk" />
                       <node concept="2ShNRf" id="4peSo3CINyv" role="37wK5m">
                         <node concept="1pGfFk" id="4peSo3CINPP" role="2ShVmc">
                           <ref role="37wK5l" node="4peSo3CIw3p" resolve="NodePrinter" />
@@ -508,10 +508,10 @@
                     </node>
                   </node>
                   <node concept="liA8E" id="4peSo3CIJSf" role="2OqNvi">
-                    <ref role="37wK5l" to="ie8e:1hOy_Afq63K" resolve="walk" />
+                    <ref role="37wK5l" to="6exd:1hOy_Afq63K" resolve="walk" />
                     <node concept="2YIFZM" id="6HT7BWBRh6I" role="37wK5m">
-                      <ref role="37wK5l" to="ie8e:6HT7BWBOXr$" resolve="ground" />
-                      <ref role="1Pybhc" to="ie8e:6HT7BWBOXme" resolve="TreeFormUtil" />
+                      <ref role="37wK5l" to="6exd:6HT7BWBOXr$" resolve="ground" />
+                      <ref role="1Pybhc" to="6exd:6HT7BWBOXme" resolve="TreeFormUtil" />
                       <node concept="37vLTw" id="6HT7BWBRhg3" role="37wK5m">
                         <ref role="3cqZAo" node="4peSo3CIJRP" resolve="tf" />
                       </node>
@@ -592,19 +592,19 @@
     <node concept="2tJIrI" id="4peSo3CIBGi" role="jymVt" />
     <node concept="3Tm1VV" id="4peSo3CHy8E" role="1B3o_S" />
     <node concept="3uibUv" id="4peSo3CHzrM" role="EKbjA">
-      <ref role="3uigEE" to="ie8e:3JgCwkqiP3h" resolve="TreeFormWalk.Walker" />
+      <ref role="3uigEE" to="6exd:3JgCwkqiP3h" resolve="TreeFormWalk.Walker" />
     </node>
     <node concept="3clFb_" id="4peSo3CHzzR" role="jymVt">
       <property role="1EzhhJ" value="false" />
       <property role="TrG5h" value="walkTerms" />
       <node concept="3uibUv" id="4peSo3CHzzS" role="3clF45">
-        <ref role="3uigEE" to="ie8e:2q_78a95hAL" resolve="Action" />
+        <ref role="3uigEE" to="6exd:2q_78a95hAL" resolve="Action" />
       </node>
       <node concept="3Tm1VV" id="4peSo3CHzzT" role="1B3o_S" />
       <node concept="37vLTG" id="4peSo3CHzzV" role="3clF46">
         <property role="TrG5h" value="cb" />
         <node concept="3uibUv" id="4peSo3CHzzW" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:5JQSuNswOXL" resolve="CompositeNode" />
+          <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="CompositeNode" />
         </node>
       </node>
       <node concept="3clFbS" id="4peSo3CHz$5" role="3clF47">
@@ -680,7 +680,7 @@
                   <ref role="3cqZAo" node="4peSo3CHzzV" resolve="cb" />
                 </node>
                 <node concept="liA8E" id="29_L5zQVerC" role="2OqNvi">
-                  <ref role="37wK5l" to="ie8e:1R$Cm9qGRoH" resolve="symbol" />
+                  <ref role="37wK5l" to="6exd:1R$Cm9qGRoH" resolve="symbol" />
                 </node>
               </node>
             </node>
@@ -703,7 +703,7 @@
                     <ref role="3cqZAo" node="4peSo3CHzzV" resolve="cb" />
                   </node>
                   <node concept="liA8E" id="5_6ImQY3GdL" role="2OqNvi">
-                    <ref role="37wK5l" to="ie8e:1R$Cm9qGRoH" resolve="symbol" />
+                    <ref role="37wK5l" to="6exd:1R$Cm9qGRoH" resolve="symbol" />
                   </node>
                 </node>
               </node>
@@ -774,7 +774,7 @@
                     <ref role="3cqZAo" node="4peSo3CHzzV" resolve="cb" />
                   </node>
                   <node concept="liA8E" id="3t7_2FgUSox" role="2OqNvi">
-                    <ref role="37wK5l" to="ie8e:1R$Cm9qGRoH" resolve="symbol" />
+                    <ref role="37wK5l" to="6exd:1R$Cm9qGRoH" resolve="symbol" />
                   </node>
                 </node>
               </node>
@@ -835,8 +835,8 @@
         </node>
         <node concept="3clFbF" id="4peSo3CJxFt" role="3cqZAp">
           <node concept="Rm8GO" id="4peSo3CJxLa" role="3clFbG">
-            <ref role="Rm8GQ" to="ie8e:2q_78a95hAM" resolve="WALK" />
-            <ref role="1Px2BO" to="ie8e:2q_78a95hAL" resolve="Action" />
+            <ref role="Rm8GQ" to="6exd:2q_78a95hAM" resolve="WALK" />
+            <ref role="1Px2BO" to="6exd:2q_78a95hAL" resolve="Action" />
           </node>
         </node>
       </node>
@@ -846,7 +846,7 @@
       <property role="1EzhhJ" value="false" />
       <property role="TrG5h" value="walkList" />
       <node concept="3uibUv" id="4peSo3CHz$z" role="3clF45">
-        <ref role="3uigEE" to="ie8e:2q_78a95hAL" resolve="Action" />
+        <ref role="3uigEE" to="6exd:2q_78a95hAL" resolve="Action" />
       </node>
       <node concept="3Tm1VV" id="4peSo3CHz$$" role="1B3o_S" />
       <node concept="3clFbS" id="4peSo3CHz$L" role="3clF47">
@@ -881,15 +881,15 @@
         </node>
         <node concept="3clFbF" id="4peSo3CK1PR" role="3cqZAp">
           <node concept="Rm8GO" id="4peSo3CK1Y2" role="3clFbG">
-            <ref role="Rm8GQ" to="ie8e:2q_78a95hAM" resolve="WALK" />
-            <ref role="1Px2BO" to="ie8e:2q_78a95hAL" resolve="Action" />
+            <ref role="Rm8GQ" to="6exd:2q_78a95hAM" resolve="WALK" />
+            <ref role="1Px2BO" to="6exd:2q_78a95hAL" resolve="Action" />
           </node>
         </node>
       </node>
       <node concept="37vLTG" id="4peSo3CHz$A" role="3clF46">
         <property role="TrG5h" value="listb" />
         <node concept="3uibUv" id="5YIOneOU7$j" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:3OPtF03lco4" resolve="ListNode" />
+          <ref role="3uigEE" to="6exd:3OPtF03lco4" resolve="ListNode" />
         </node>
       </node>
     </node>
@@ -898,7 +898,7 @@
       <property role="1EzhhJ" value="false" />
       <property role="TrG5h" value="walkValues" />
       <node concept="3uibUv" id="4peSo3CHz$9" role="3clF45">
-        <ref role="3uigEE" to="ie8e:2q_78a95hAL" resolve="Action" />
+        <ref role="3uigEE" to="6exd:2q_78a95hAL" resolve="Action" />
       </node>
       <node concept="3Tm1VV" id="4peSo3CHz$a" role="1B3o_S" />
       <node concept="16euLQ" id="4peSo3CHz$i" role="16eVyc">
@@ -919,7 +919,7 @@
                       <ref role="3cqZAo" node="4peSo3CHz$c" resolve="valb" />
                     </node>
                     <node concept="liA8E" id="5YIOneON8ue" role="2OqNvi">
-                      <ref role="37wK5l" to="ie8e:5YIOneOMEJi" resolve="values" />
+                      <ref role="37wK5l" to="6exd:5YIOneOMEJi" resolve="values" />
                     </node>
                   </node>
                   <node concept="liA8E" id="5YIOneON95r" role="2OqNvi">
@@ -945,7 +945,7 @@
                   <ref role="3cqZAo" node="4peSo3CHz$c" resolve="valb" />
                 </node>
                 <node concept="liA8E" id="6infEALrTl3" role="2OqNvi">
-                  <ref role="37wK5l" to="ie8e:1R$Cm9qGRoH" resolve="symbol" />
+                  <ref role="37wK5l" to="6exd:1R$Cm9qGRoH" resolve="symbol" />
                 </node>
               </node>
             </node>
@@ -975,15 +975,15 @@
         </node>
         <node concept="3clFbF" id="4peSo3CK097" role="3cqZAp">
           <node concept="Rm8GO" id="4peSo3CK0nk" role="3clFbG">
-            <ref role="Rm8GQ" to="ie8e:2q_78a95hAN" resolve="CONTINUE" />
-            <ref role="1Px2BO" to="ie8e:2q_78a95hAL" resolve="Action" />
+            <ref role="Rm8GQ" to="6exd:2q_78a95hAN" resolve="CONTINUE" />
+            <ref role="1Px2BO" to="6exd:2q_78a95hAL" resolve="Action" />
           </node>
         </node>
       </node>
       <node concept="37vLTG" id="4peSo3CHz$c" role="3clF46">
         <property role="TrG5h" value="valb" />
         <node concept="3uibUv" id="5YIOneONkSZ" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:1msb0mq99GH" resolve="ValueNode" />
+          <ref role="3uigEE" to="6exd:1msb0mq99GH" resolve="ValueNode" />
           <node concept="16syzq" id="5YIOneONkT0" role="11_B2D">
             <ref role="16sUi3" node="4peSo3CHz$i" resolve="V" />
           </node>
@@ -995,13 +995,13 @@
       <property role="1EzhhJ" value="false" />
       <property role="TrG5h" value="walkValue" />
       <node concept="3uibUv" id="4peSo3CHz$P" role="3clF45">
-        <ref role="3uigEE" to="ie8e:2q_78a95hAL" resolve="Action" />
+        <ref role="3uigEE" to="6exd:2q_78a95hAL" resolve="Action" />
       </node>
       <node concept="3Tm1VV" id="4peSo3CHz$Q" role="1B3o_S" />
       <node concept="37vLTG" id="4peSo3CHz$S" role="3clF46">
         <property role="TrG5h" value="value" />
         <node concept="3uibUv" id="4peSo3CHz$T" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:2xQ7eRAD2dj" resolve="Value" />
+          <ref role="3uigEE" to="6exd:2xQ7eRAD2dj" resolve="Value" />
           <node concept="3qTvmN" id="4peSo3CHz$U" role="11_B2D" />
         </node>
       </node>
@@ -1026,7 +1026,7 @@
                     <ref role="3cqZAo" node="4peSo3CHz$S" resolve="value" />
                   </node>
                   <node concept="liA8E" id="3mz2_dYmlx$" role="2OqNvi">
-                    <ref role="37wK5l" to="ie8e:1msb0mq8QTt" resolve="symbol" />
+                    <ref role="37wK5l" to="6exd:1msb0mq8QTt" resolve="symbol" />
                   </node>
                 </node>
               </node>
@@ -1035,8 +1035,8 @@
         </node>
         <node concept="3clFbF" id="3mz2_dYmvJJ" role="3cqZAp">
           <node concept="Rm8GO" id="3mz2_dYmvJK" role="3clFbG">
-            <ref role="Rm8GQ" to="ie8e:2q_78a95hAN" resolve="CONTINUE" />
-            <ref role="1Px2BO" to="ie8e:2q_78a95hAL" resolve="Action" />
+            <ref role="Rm8GQ" to="6exd:2q_78a95hAN" resolve="CONTINUE" />
+            <ref role="1Px2BO" to="6exd:2q_78a95hAL" resolve="Action" />
           </node>
         </node>
       </node>
@@ -1046,7 +1046,7 @@
       <property role="1EzhhJ" value="false" />
       <property role="TrG5h" value="walkVariables" />
       <node concept="3uibUv" id="4peSo3CHz$n" role="3clF45">
-        <ref role="3uigEE" to="ie8e:2q_78a95hAL" resolve="Action" />
+        <ref role="3uigEE" to="6exd:2q_78a95hAL" resolve="Action" />
       </node>
       <node concept="3Tm1VV" id="4peSo3CHz$o" role="1B3o_S" />
       <node concept="3clFbS" id="4peSo3CHz$v" role="3clF47">
@@ -1066,7 +1066,7 @@
       <node concept="37vLTG" id="4peSo3CHz$q" role="3clF46">
         <property role="TrG5h" value="varb" />
         <node concept="3uibUv" id="5YIOneOSlWm" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:uNmovXiSQ6" resolve="VariableNode" />
+          <ref role="3uigEE" to="6exd:uNmovXiSQ6" resolve="VariableNode" />
         </node>
       </node>
     </node>
@@ -1075,13 +1075,13 @@
       <property role="1EzhhJ" value="false" />
       <property role="TrG5h" value="walkVariable" />
       <node concept="3uibUv" id="4peSo3CHz$Z" role="3clF45">
-        <ref role="3uigEE" to="ie8e:2q_78a95hAL" resolve="Action" />
+        <ref role="3uigEE" to="6exd:2q_78a95hAL" resolve="Action" />
       </node>
       <node concept="3Tm1VV" id="4peSo3CHz_0" role="1B3o_S" />
       <node concept="37vLTG" id="4peSo3CHz_2" role="3clF46">
         <property role="TrG5h" value="variable" />
         <node concept="3uibUv" id="4peSo3CHz_3" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:uNmovXiEd4" resolve="Variable" />
+          <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
         </node>
       </node>
       <node concept="3clFbS" id="4peSo3CHz_4" role="3clF47">
@@ -1123,8 +1123,8 @@
         </node>
         <node concept="3clFbF" id="4peSo3CNUWB" role="3cqZAp">
           <node concept="Rm8GO" id="4peSo3CNVh5" role="3clFbG">
-            <ref role="Rm8GQ" to="ie8e:2q_78a95hAN" resolve="CONTINUE" />
-            <ref role="1Px2BO" to="ie8e:2q_78a95hAL" resolve="Action" />
+            <ref role="Rm8GQ" to="6exd:2q_78a95hAN" resolve="CONTINUE" />
+            <ref role="1Px2BO" to="6exd:2q_78a95hAL" resolve="Action" />
           </node>
         </node>
       </node>
@@ -2276,7 +2276,7 @@
         <node concept="37vLTG" id="3gJBs5s$cVL" role="3clF46">
           <property role="TrG5h" value="variable" />
           <node concept="3uibUv" id="3gJBs5s$cVM" role="1tU5fm">
-            <ref role="3uigEE" to="ie8e:uNmovXiEd4" resolve="Variable" />
+            <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
           </node>
         </node>
         <node concept="17QB3L" id="4peSo3D15vm" role="3clF45" />
diff --git a/jchr/solutions/jetbrains.mps.lang.typesystem2.sampleplugin.jchr/jetbrains.mps.lang.typesystem2.sampleplugin.jchr.msd b/jchr/solutions/jetbrains.mps.lang.typesystem2.sampleplugin.jchr/jetbrains.mps.lang.typesystem2.sampleplugin.jchr.msd
index 66c62daa..188eeb20 100644
--- a/jchr/solutions/jetbrains.mps.lang.typesystem2.sampleplugin.jchr/jetbrains.mps.lang.typesystem2.sampleplugin.jchr.msd
+++ b/jchr/solutions/jetbrains.mps.lang.typesystem2.sampleplugin.jchr/jetbrains.mps.lang.typesystem2.sampleplugin.jchr.msd
@@ -7,7 +7,6 @@
   </models>
   <sourcePath />
   <dependencies>
-    <dependency reexport="false">7526e0cf-1ce7-46f8-a555-9eca1e06c23b(jetbrains.mps.logic.atom)</dependency>
     <dependency reexport="false">35320f26-77cb-4c55-be9f-a97a27770af1(jetbrains.mps.logic)</dependency>
     <dependency reexport="false">26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.typesystem2.runtime)</dependency>
     <dependency reexport="false">a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)</dependency>
diff --git a/jchr/solutions/jetbrains.mps.lang.typesystem2.sampleplugin.jchr/models/jetbrains/mps/lang/typesystem2/sampleplugin/jchr/plugin.mps b/jchr/solutions/jetbrains.mps.lang.typesystem2.sampleplugin.jchr/models/jetbrains/mps/lang/typesystem2/sampleplugin/jchr/plugin.mps
index 0eac170f..6ebcb839 100644
--- a/jchr/solutions/jetbrains.mps.lang.typesystem2.sampleplugin.jchr/models/jetbrains/mps/lang/typesystem2/sampleplugin/jchr/plugin.mps
+++ b/jchr/solutions/jetbrains.mps.lang.typesystem2.sampleplugin.jchr/models/jetbrains/mps/lang/typesystem2/sampleplugin/jchr/plugin.mps
@@ -16,7 +16,6 @@
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="0" />
   </languages>
   <imports>
-    <import index="ie8e" ref="r:ab2605ab-b4bc-4e80-a8ca-19a4a8465c01(jetbrains.mps.logic.atom)" />
     <import index="5j4j" ref="r:c8fb1c5e-8204-4904-a38f-678899d447c1(jetbrains.mps.logic.structure)" />
     <import index="nz6g" ref="r:ac00f724-30be-446e-805c-2345efc460d7(jetbrains.mps.lang.typesystem2.program)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
@@ -52,6 +51,7 @@
     <import index="k3nr" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.ide.editor(MPS.Editor/)" />
     <import index="exr9" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.nodeEditor(MPS.Editor/)" />
     <import index="hfuk" ref="r:b25dd364-bc3f-4a66-97d1-262009610c5e(jetbrains.mps.make)" />
+    <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.treeform)" />
   </imports>
   <registry>
     <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples">
@@ -541,7 +541,7 @@
           <node concept="2OqwBi" id="4sVJFklSnn$" role="3clFbG">
             <node concept="2ShNRf" id="4sVJFklMnGN" role="2Oq$k0">
               <node concept="1pGfFk" id="4sVJFklMonE" role="2ShVmc">
-                <ref role="37wK5l" to="ie8e:47nvOnTQN6Q" resolve="TreeFormWalk" />
+                <ref role="37wK5l" to="6exd:47nvOnTQN6Q" resolve="TreeFormWalk" />
                 <node concept="2ShNRf" id="4sVJFklMqNI" role="37wK5m">
                   <node concept="1pGfFk" id="4sVJFklSvMk" role="2ShVmc">
                     <ref role="37wK5l" node="4sVJFklSuPv" resolve="TreeFormProducer.Walker" />
@@ -556,7 +556,7 @@
               </node>
             </node>
             <node concept="liA8E" id="4sVJFklSs1w" role="2OqNvi">
-              <ref role="37wK5l" to="ie8e:1hOy_Afq63K" resolve="walk" />
+              <ref role="37wK5l" to="6exd:1hOy_Afq63K" resolve="walk" />
               <node concept="37vLTw" id="4sVJFklSs3T" role="37wK5m">
                 <ref role="3cqZAo" node="5s497VqXKRl" resolve="tf" />
               </node>
@@ -574,7 +574,7 @@
       <node concept="37vLTG" id="5s497VqXKRl" role="3clF46">
         <property role="TrG5h" value="tf" />
         <node concept="3uibUv" id="5s497VqXKRk" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="37vLTG" id="2$F5QputKOD" role="3clF46">
@@ -638,19 +638,19 @@
       <node concept="2tJIrI" id="4sVJFklStNu" role="jymVt" />
       <node concept="3Tm6S6" id="4sVJFklMoWf" role="1B3o_S" />
       <node concept="3uibUv" id="4sVJFklMp_t" role="EKbjA">
-        <ref role="3uigEE" to="ie8e:3JgCwkqiP3h" resolve="TreeFormWalk.Walker" />
+        <ref role="3uigEE" to="6exd:3JgCwkqiP3h" resolve="TreeFormWalk.Walker" />
       </node>
       <node concept="3clFb_" id="4sVJFklM5Pn" role="jymVt">
         <property role="1EzhhJ" value="false" />
         <property role="TrG5h" value="walkTerms" />
         <node concept="3uibUv" id="4sVJFklM5Po" role="3clF45">
-          <ref role="3uigEE" to="ie8e:2q_78a95hAL" resolve="Action" />
+          <ref role="3uigEE" to="6exd:2q_78a95hAL" resolve="Action" />
         </node>
         <node concept="3Tm1VV" id="4sVJFklM5Pp" role="1B3o_S" />
         <node concept="37vLTG" id="4sVJFklM5Pr" role="3clF46">
           <property role="TrG5h" value="cb" />
           <node concept="3uibUv" id="4sVJFklM5Ps" role="1tU5fm">
-            <ref role="3uigEE" to="ie8e:5JQSuNswOXL" resolve="CompositeNode" />
+            <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="CompositeNode" />
           </node>
         </node>
         <node concept="3clFbS" id="4sVJFklM5P_" role="3clF47">
@@ -843,7 +843,7 @@
                     <ref role="3cqZAo" node="4sVJFklM5Pr" resolve="cb" />
                   </node>
                   <node concept="liA8E" id="4sVJFklQpn_" role="2OqNvi">
-                    <ref role="37wK5l" to="ie8e:1R$Cm9qGRoH" resolve="symbol" />
+                    <ref role="37wK5l" to="6exd:1R$Cm9qGRoH" resolve="symbol" />
                   </node>
                 </node>
               </node>
@@ -1020,7 +1020,7 @@
                       <ref role="3cqZAo" node="4sVJFklM5Pr" resolve="cb" />
                     </node>
                     <node concept="liA8E" id="67ux3aj$6yi" role="2OqNvi">
-                      <ref role="37wK5l" to="ie8e:1R$Cm9qGRoH" resolve="symbol" />
+                      <ref role="37wK5l" to="6exd:1R$Cm9qGRoH" resolve="symbol" />
                     </node>
                   </node>
                 </node>
@@ -1085,7 +1085,7 @@
                           <ref role="3cqZAo" node="4sVJFklM5Pr" resolve="cb" />
                         </node>
                         <node concept="liA8E" id="3t7_2FgQA6m" role="2OqNvi">
-                          <ref role="37wK5l" to="ie8e:1R$Cm9qGRoH" resolve="symbol" />
+                          <ref role="37wK5l" to="6exd:1R$Cm9qGRoH" resolve="symbol" />
                         </node>
                       </node>
                     </node>
@@ -1178,7 +1178,7 @@
                           <ref role="3cqZAo" node="4sVJFklM5Pr" resolve="cb" />
                         </node>
                         <node concept="liA8E" id="3t7_2FgQGOO" role="2OqNvi">
-                          <ref role="37wK5l" to="ie8e:1R$Cm9qGRoH" resolve="symbol" />
+                          <ref role="37wK5l" to="6exd:1R$Cm9qGRoH" resolve="symbol" />
                         </node>
                       </node>
                     </node>
@@ -1216,8 +1216,8 @@
           <node concept="3clFbH" id="4sVJFklQkmo" role="3cqZAp" />
           <node concept="3clFbF" id="4sVJFklRFVk" role="3cqZAp">
             <node concept="Rm8GO" id="4sVJFklRGx9" role="3clFbG">
-              <ref role="Rm8GQ" to="ie8e:2q_78a95hAM" resolve="WALK" />
-              <ref role="1Px2BO" to="ie8e:2q_78a95hAL" resolve="Action" />
+              <ref role="Rm8GQ" to="6exd:2q_78a95hAM" resolve="WALK" />
+              <ref role="1Px2BO" to="6exd:2q_78a95hAL" resolve="Action" />
             </node>
           </node>
         </node>
@@ -1230,7 +1230,7 @@
         <property role="1EzhhJ" value="false" />
         <property role="TrG5h" value="walkList" />
         <node concept="3uibUv" id="4sVJFklM5Q3" role="3clF45">
-          <ref role="3uigEE" to="ie8e:2q_78a95hAL" resolve="Action" />
+          <ref role="3uigEE" to="6exd:2q_78a95hAL" resolve="Action" />
         </node>
         <node concept="3Tm1VV" id="4sVJFklM5Q4" role="1B3o_S" />
         <node concept="3clFbS" id="4sVJFklM5Qh" role="3clF47">
@@ -1343,8 +1343,8 @@
           <node concept="3clFbH" id="4sVJFklRZE_" role="3cqZAp" />
           <node concept="3clFbF" id="4sVJFklSjTT" role="3cqZAp">
             <node concept="Rm8GO" id="4sVJFklSku2" role="3clFbG">
-              <ref role="Rm8GQ" to="ie8e:2q_78a95hAM" resolve="WALK" />
-              <ref role="1Px2BO" to="ie8e:2q_78a95hAL" resolve="Action" />
+              <ref role="Rm8GQ" to="6exd:2q_78a95hAM" resolve="WALK" />
+              <ref role="1Px2BO" to="6exd:2q_78a95hAL" resolve="Action" />
             </node>
           </node>
         </node>
@@ -1354,7 +1354,7 @@
         <node concept="37vLTG" id="4sVJFklM5Q6" role="3clF46">
           <property role="TrG5h" value="listb" />
           <node concept="3uibUv" id="5YIOneOU7$i" role="1tU5fm">
-            <ref role="3uigEE" to="ie8e:3OPtF03lco4" resolve="ListNode" />
+            <ref role="3uigEE" to="6exd:3OPtF03lco4" resolve="ListNode" />
           </node>
         </node>
       </node>
@@ -1363,7 +1363,7 @@
         <property role="1EzhhJ" value="false" />
         <property role="TrG5h" value="walkValues" />
         <node concept="3uibUv" id="4sVJFklM5PD" role="3clF45">
-          <ref role="3uigEE" to="ie8e:2q_78a95hAL" resolve="Action" />
+          <ref role="3uigEE" to="6exd:2q_78a95hAL" resolve="Action" />
         </node>
         <node concept="3Tm1VV" id="4sVJFklM5PE" role="1B3o_S" />
         <node concept="16euLQ" id="4sVJFklM5PM" role="16eVyc">
@@ -1430,7 +1430,7 @@
                     <ref role="3cqZAo" node="4sVJFklM5PG" resolve="valf" />
                   </node>
                   <node concept="liA8E" id="4sVJFklO4tI" role="2OqNvi">
-                    <ref role="37wK5l" to="ie8e:1R$Cm9qGRoH" resolve="symbol" />
+                    <ref role="37wK5l" to="6exd:1R$Cm9qGRoH" resolve="symbol" />
                   </node>
                 </node>
               </node>
@@ -1514,7 +1514,7 @@
                       <node concept="1eOMI4" id="5zfvpQ78WGP" role="2Oq$k0">
                         <node concept="10QFUN" id="5zfvpQ78WGQ" role="1eOMHV">
                           <node concept="3uibUv" id="514BAS_WC$F" role="10QFUM">
-                            <ref role="3uigEE" to="ie8e:uNmovXiEd4" resolve="Variable" />
+                            <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
                           </node>
                           <node concept="37vLTw" id="5zfvpQ78WGS" role="10QFUP">
                             <ref role="3cqZAo" node="5YIOneOMTHp" resolve="val" />
@@ -1522,12 +1522,12 @@
                         </node>
                       </node>
                       <node concept="liA8E" id="5zfvpQ78WGU" role="2OqNvi">
-                        <ref role="37wK5l" to="ie8e:2DKqMqOiVjz" resolve="isWildcard" />
+                        <ref role="37wK5l" to="6exd:2DKqMqOiVjz" resolve="isWildcard" />
                       </node>
                     </node>
                     <node concept="2ZW3vV" id="5zfvpQ78WGW" role="3uHU7B">
                       <node concept="3uibUv" id="514BAS_WCv4" role="2ZW6by">
-                        <ref role="3uigEE" to="ie8e:uNmovXiEd4" resolve="Variable" />
+                        <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
                       </node>
                       <node concept="37vLTw" id="5zfvpQ78WGY" role="2ZW6bz">
                         <ref role="3cqZAo" node="5YIOneOMTHp" resolve="val" />
@@ -1541,7 +1541,7 @@
                       <node concept="1eOMI4" id="5zfvpQ7b1DL" role="2Oq$k0">
                         <node concept="10QFUN" id="5zfvpQ7b1DM" role="1eOMHV">
                           <node concept="3uibUv" id="514BAS_WCnW" role="10QFUM">
-                            <ref role="3uigEE" to="ie8e:uNmovXiEd4" resolve="Variable" />
+                            <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
                           </node>
                           <node concept="37vLTw" id="5zfvpQ7b1DO" role="10QFUP">
                             <ref role="3cqZAo" node="5YIOneOMTHp" resolve="val" />
@@ -1549,13 +1549,13 @@
                         </node>
                       </node>
                       <node concept="liA8E" id="5zfvpQ7b1DQ" role="2OqNvi">
-                        <ref role="37wK5l" to="ie8e:2DKqMqOiVjz" resolve="isWildcard" />
+                        <ref role="37wK5l" to="6exd:2DKqMqOiVjz" resolve="isWildcard" />
                       </node>
                     </node>
                   </node>
                   <node concept="2ZW3vV" id="2ev$9JFBdkI" role="3uHU7B">
                     <node concept="3uibUv" id="514BAS_WCif" role="2ZW6by">
-                      <ref role="3uigEE" to="ie8e:uNmovXiEd4" resolve="Variable" />
+                      <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
                     </node>
                     <node concept="37vLTw" id="2ev$9JFBdjh" role="2ZW6bz">
                       <ref role="3cqZAo" node="5YIOneOMTHp" resolve="val" />
@@ -1684,15 +1684,15 @@
                 <ref role="3cqZAo" node="4sVJFklM5PG" resolve="valf" />
               </node>
               <node concept="liA8E" id="5YIOneOMTHw" role="2OqNvi">
-                <ref role="37wK5l" to="ie8e:5YIOneOMEJi" resolve="values" />
+                <ref role="37wK5l" to="6exd:5YIOneOMEJi" resolve="values" />
               </node>
             </node>
           </node>
           <node concept="3clFbH" id="4sVJFklNB$0" role="3cqZAp" />
           <node concept="3clFbF" id="4sVJFklOdlv" role="3cqZAp">
             <node concept="Rm8GO" id="4sVJFklOo5G" role="3clFbG">
-              <ref role="Rm8GQ" to="ie8e:2q_78a95hAN" resolve="CONTINUE" />
-              <ref role="1Px2BO" to="ie8e:2q_78a95hAL" resolve="Action" />
+              <ref role="Rm8GQ" to="6exd:2q_78a95hAN" resolve="CONTINUE" />
+              <ref role="1Px2BO" to="6exd:2q_78a95hAL" resolve="Action" />
             </node>
           </node>
         </node>
@@ -1702,7 +1702,7 @@
         <node concept="37vLTG" id="4sVJFklM5PG" role="3clF46">
           <property role="TrG5h" value="valf" />
           <node concept="3uibUv" id="5YIOneONkSX" role="1tU5fm">
-            <ref role="3uigEE" to="ie8e:1msb0mq99GH" resolve="ValueNode" />
+            <ref role="3uigEE" to="6exd:1msb0mq99GH" resolve="ValueNode" />
             <node concept="16syzq" id="5YIOneONkSY" role="11_B2D">
               <ref role="16sUi3" node="4sVJFklM5PM" resolve="V" />
             </node>
@@ -1714,13 +1714,13 @@
         <property role="1EzhhJ" value="false" />
         <property role="TrG5h" value="walkValue" />
         <node concept="3uibUv" id="104EUzG1t_E" role="3clF45">
-          <ref role="3uigEE" to="ie8e:2q_78a95hAL" resolve="Action" />
+          <ref role="3uigEE" to="6exd:2q_78a95hAL" resolve="Action" />
         </node>
         <node concept="3Tm1VV" id="104EUzG1t_F" role="1B3o_S" />
         <node concept="37vLTG" id="104EUzG1t_H" role="3clF46">
           <property role="TrG5h" value="value" />
           <node concept="3uibUv" id="104EUzG1t_I" role="1tU5fm">
-            <ref role="3uigEE" to="ie8e:2xQ7eRAD2dj" resolve="Value" />
+            <ref role="3uigEE" to="6exd:2xQ7eRAD2dj" resolve="Value" />
             <node concept="3qTvmN" id="104EUzG1t_J" role="11_B2D" />
           </node>
         </node>
@@ -1783,7 +1783,7 @@
                           <ref role="3cqZAo" node="104EUzG1t_H" resolve="value" />
                         </node>
                         <node concept="liA8E" id="6MYr6JxsUte" role="2OqNvi">
-                          <ref role="37wK5l" to="ie8e:1msb0mq8QTt" resolve="symbol" />
+                          <ref role="37wK5l" to="6exd:1msb0mq8QTt" resolve="symbol" />
                         </node>
                       </node>
                     </node>
@@ -1822,8 +1822,8 @@
           <node concept="3clFbH" id="6MYr6JxsURf" role="3cqZAp" />
           <node concept="3clFbF" id="6MYr6JxsV8X" role="3cqZAp">
             <node concept="Rm8GO" id="6MYr6JxsVlt" role="3clFbG">
-              <ref role="Rm8GQ" to="ie8e:2q_78a95hAN" resolve="CONTINUE" />
-              <ref role="1Px2BO" to="ie8e:2q_78a95hAL" resolve="Action" />
+              <ref role="Rm8GQ" to="6exd:2q_78a95hAN" resolve="CONTINUE" />
+              <ref role="1Px2BO" to="6exd:2q_78a95hAL" resolve="Action" />
             </node>
           </node>
         </node>
@@ -1836,7 +1836,7 @@
         <property role="1EzhhJ" value="false" />
         <property role="TrG5h" value="walkVariables" />
         <node concept="3uibUv" id="4sVJFklM5PR" role="3clF45">
-          <ref role="3uigEE" to="ie8e:2q_78a95hAL" resolve="Action" />
+          <ref role="3uigEE" to="6exd:2q_78a95hAL" resolve="Action" />
         </node>
         <node concept="3Tm1VV" id="4sVJFklM5PS" role="1B3o_S" />
         <node concept="3clFbS" id="4sVJFklM5PZ" role="3clF47">
@@ -1892,7 +1892,7 @@
                     <ref role="3cqZAo" node="4sVJFklM5PU" resolve="varb" />
                   </node>
                   <node concept="liA8E" id="4sVJFklOD$o" role="2OqNvi">
-                    <ref role="37wK5l" to="ie8e:1R$Cm9qGRoH" resolve="symbol" />
+                    <ref role="37wK5l" to="6exd:1R$Cm9qGRoH" resolve="symbol" />
                   </node>
                 </node>
               </node>
@@ -1926,7 +1926,7 @@
                         <ref role="3cqZAo" node="5YIOneOS3Zl" resolve="var" />
                       </node>
                       <node concept="liA8E" id="5YIOneOS5q6" role="2OqNvi">
-                        <ref role="37wK5l" to="ie8e:56MMu0Ark7d" resolve="symbol" />
+                        <ref role="37wK5l" to="6exd:56MMu0Ark7d" resolve="symbol" />
                       </node>
                     </node>
                   </node>
@@ -2059,7 +2059,7 @@
             <node concept="3cpWsn" id="5YIOneOS3Zl" role="1Duv9x">
               <property role="TrG5h" value="var" />
               <node concept="3uibUv" id="5YIOneOS4go" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
               </node>
             </node>
             <node concept="2OqwBi" id="5YIOneOS3Zr" role="1DdaDG">
@@ -2067,15 +2067,15 @@
                 <ref role="3cqZAo" node="4sVJFklM5PU" resolve="varb" />
               </node>
               <node concept="liA8E" id="5YIOneOS3Zt" role="2OqNvi">
-                <ref role="37wK5l" to="ie8e:5YIOneORS0h" resolve="variables" />
+                <ref role="37wK5l" to="6exd:5YIOneORS0h" resolve="variables" />
               </node>
             </node>
           </node>
           <node concept="3clFbH" id="4sVJFklOEwR" role="3cqZAp" />
           <node concept="3clFbF" id="4sVJFklOF7e" role="3cqZAp">
             <node concept="Rm8GO" id="4sVJFklOFAj" role="3clFbG">
-              <ref role="Rm8GQ" to="ie8e:2q_78a95hAN" resolve="CONTINUE" />
-              <ref role="1Px2BO" to="ie8e:2q_78a95hAL" resolve="Action" />
+              <ref role="Rm8GQ" to="6exd:2q_78a95hAN" resolve="CONTINUE" />
+              <ref role="1Px2BO" to="6exd:2q_78a95hAL" resolve="Action" />
             </node>
           </node>
         </node>
@@ -2085,7 +2085,7 @@
         <node concept="37vLTG" id="4sVJFklM5PU" role="3clF46">
           <property role="TrG5h" value="varb" />
           <node concept="3uibUv" id="5YIOneOSlWl" role="1tU5fm">
-            <ref role="3uigEE" to="ie8e:uNmovXiSQ6" resolve="VariableNode" />
+            <ref role="3uigEE" to="6exd:uNmovXiSQ6" resolve="VariableNode" />
           </node>
         </node>
       </node>
@@ -2094,13 +2094,13 @@
         <property role="1EzhhJ" value="false" />
         <property role="TrG5h" value="walkVariable" />
         <node concept="3uibUv" id="104EUzG3OTt" role="3clF45">
-          <ref role="3uigEE" to="ie8e:2q_78a95hAL" resolve="Action" />
+          <ref role="3uigEE" to="6exd:2q_78a95hAL" resolve="Action" />
         </node>
         <node concept="3Tm1VV" id="104EUzG3OTu" role="1B3o_S" />
         <node concept="37vLTG" id="104EUzG3OTw" role="3clF46">
           <property role="TrG5h" value="var" />
           <node concept="3uibUv" id="104EUzG3OTx" role="1tU5fm">
-            <ref role="3uigEE" to="ie8e:uNmovXiEd4" resolve="Variable" />
+            <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
           </node>
         </node>
         <node concept="3clFbS" id="104EUzG3OTy" role="3clF47">
@@ -2151,7 +2151,7 @@
                     <ref role="3cqZAo" node="104EUzG3OTw" resolve="var" />
                   </node>
                   <node concept="liA8E" id="5zfvpQ7b2cC" role="2OqNvi">
-                    <ref role="37wK5l" to="ie8e:2DKqMqOiVjz" resolve="isWildcard" />
+                    <ref role="37wK5l" to="6exd:2DKqMqOiVjz" resolve="isWildcard" />
                   </node>
                 </node>
                 <node concept="9aQIb" id="2q_78a90oeF" role="9aQIa">
@@ -2240,7 +2240,7 @@
                               <ref role="3cqZAo" node="104EUzG3OTw" resolve="var" />
                             </node>
                             <node concept="liA8E" id="31Jz$8bZT96" role="2OqNvi">
-                              <ref role="37wK5l" to="ie8e:56MMu0Ark7d" resolve="symbol" />
+                              <ref role="37wK5l" to="6exd:56MMu0Ark7d" resolve="symbol" />
                             </node>
                           </node>
                         </node>
@@ -2382,7 +2382,7 @@
                                 <ref role="3cqZAo" node="104EUzG3OTw" resolve="var" />
                               </node>
                               <node concept="liA8E" id="4JRKVCvgY3Y" role="2OqNvi">
-                                <ref role="37wK5l" to="ie8e:56MMu0Ark7d" resolve="symbol" />
+                                <ref role="37wK5l" to="6exd:56MMu0Ark7d" resolve="symbol" />
                               </node>
                             </node>
                           </node>
@@ -2395,7 +2395,7 @@
                       <ref role="3cqZAo" node="104EUzG3OTw" resolve="var" />
                     </node>
                     <node concept="liA8E" id="2DKqMqOmVqN" role="2OqNvi">
-                      <ref role="37wK5l" to="ie8e:2DKqMqOiVjz" resolve="isWildcard" />
+                      <ref role="37wK5l" to="6exd:2DKqMqOiVjz" resolve="isWildcard" />
                     </node>
                   </node>
                 </node>
@@ -2449,8 +2449,8 @@
           <node concept="3clFbH" id="104EUzG92qN" role="3cqZAp" />
           <node concept="3clFbF" id="104EUzG92Zy" role="3cqZAp">
             <node concept="Rm8GO" id="104EUzG93tD" role="3clFbG">
-              <ref role="Rm8GQ" to="ie8e:2q_78a95hAN" resolve="CONTINUE" />
-              <ref role="1Px2BO" to="ie8e:2q_78a95hAL" resolve="Action" />
+              <ref role="Rm8GQ" to="6exd:2q_78a95hAN" resolve="CONTINUE" />
+              <ref role="1Px2BO" to="6exd:2q_78a95hAL" resolve="Action" />
             </node>
           </node>
         </node>
@@ -2901,7 +2901,7 @@
                   </node>
                   <node concept="2OqwBi" id="aFQeb4cur6" role="3clFbw">
                     <node concept="3VsKOn" id="aFQeb4iXWd" role="2Oq$k0">
-                      <ref role="3VsUkX" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                      <ref role="3VsUkX" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                     </node>
                     <node concept="liA8E" id="aFQeb4cv04" role="2OqNvi">
                       <ref role="37wK5l" to="wyt6:~Class.isAssignableFrom(java.lang.Class):boolean" resolve="isAssignableFrom" />
@@ -3430,7 +3430,7 @@
               </node>
               <node concept="2OqwBi" id="2ev$9JFISH2" role="3clFbw">
                 <node concept="3VsKOn" id="2ev$9JFISxf" role="2Oq$k0">
-                  <ref role="3VsUkX" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                  <ref role="3VsUkX" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
                 <node concept="liA8E" id="2ev$9JFITPN" role="2OqNvi">
                   <ref role="37wK5l" to="wyt6:~Class.isAssignableFrom(java.lang.Class):boolean" resolve="isAssignableFrom" />
@@ -5444,7 +5444,7 @@
                 <node concept="1eOMI4" id="4sVJFklUwdr" role="37wK5m">
                   <node concept="10QFUN" id="4sVJFklUwds" role="1eOMHV">
                     <node concept="3uibUv" id="4sVJFklUwdt" role="10QFUM">
-                      <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                      <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                     </node>
                     <node concept="37vLTw" id="4sVJFklUwe2" role="10QFUP">
                       <ref role="3cqZAo" node="4sVJFklUwdY" resolve="arg" />
@@ -5460,7 +5460,7 @@
           </node>
           <node concept="2ZW3vV" id="4sVJFklUwdx" role="3clFbw">
             <node concept="3uibUv" id="4sVJFklUwdy" role="2ZW6by">
-              <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+              <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
             </node>
             <node concept="37vLTw" id="4sVJFklUwdZ" role="2ZW6bz">
               <ref role="3cqZAo" node="4sVJFklUwdY" resolve="arg" />
diff --git a/jchr/solutions/jetbrains.mps.logic.jchr/jetbrains.mps.logic.jchr.msd b/jchr/solutions/jetbrains.mps.logic.jchr/jetbrains.mps.logic.jchr.msd
index 0c337525..c07823c2 100644
--- a/jchr/solutions/jetbrains.mps.logic.jchr/jetbrains.mps.logic.jchr.msd
+++ b/jchr/solutions/jetbrains.mps.logic.jchr/jetbrains.mps.logic.jchr.msd
@@ -10,7 +10,6 @@
     <dependency reexport="true">a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)</dependency>
     <dependency reexport="true">b984ee52-f34d-4b6d-8812-866c1d3eae31(jetbrains.mps.jchr.runtime)</dependency>
     <dependency reexport="true">bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)</dependency>
-    <dependency reexport="false">7526e0cf-1ce7-46f8-a555-9eca1e06c23b(jetbrains.mps.logic.atom)</dependency>
     <dependency reexport="false">c3941617-f429-4b63-b06e-42126b247dcb(jetbrains.mps.logic_jchr.runtime)</dependency>
   </dependencies>
   <languageVersions>
diff --git a/jchr/solutions/jetbrains.mps.logic.jchr/models/jetbrains/mps/logic/jchr/predicate.mps b/jchr/solutions/jetbrains.mps.logic.jchr/models/jetbrains/mps/logic/jchr/predicate.mps
index 4c6be324..75169ed3 100644
--- a/jchr/solutions/jetbrains.mps.logic.jchr/models/jetbrains/mps/logic/jchr/predicate.mps
+++ b/jchr/solutions/jetbrains.mps.logic.jchr/models/jetbrains/mps/logic/jchr/predicate.mps
@@ -11,15 +11,15 @@
     <import index="f8dg" ref="b984ee52-f34d-4b6d-8812-866c1d3eae31/java:annotations(jetbrains.mps.jchr.runtime/)" />
     <import index="eifs" ref="b984ee52-f34d-4b6d-8812-866c1d3eae31/java:runtime(jetbrains.mps.jchr.runtime/)" />
     <import index="qrld" ref="r:2a79c8aa-e372-4c00-8d71-5d7f3db517e4(jetbrains.mps.logic.reactor.evaluation)" />
-    <import index="ie8e" ref="r:ab2605ab-b4bc-4e80-a8ca-19a4a8465c01(jetbrains.mps.logic.atom)" />
     <import index="9js4" ref="b984ee52-f34d-4b6d-8812-866c1d3eae31/java:runtime.hash(jetbrains.mps.jchr.runtime/)" />
     <import index="45ys" ref="r:7365f7fe-12e6-4229-8901-f6dc6d5df03f(jetbrains.mps.logic.reactor.logical)" />
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
     <import index="rchb" ref="r:f43ee4a0-488a-425a-87a0-594ab3b0d15f(jetbrains.mps.logic.reactor.program)" />
-    <import index="yt73" ref="7526e0cf-1ce7-46f8-a555-9eca1e06c23b/java:jetbrains.mps.unification(jetbrains.mps.logic.atom/)" />
+    <import index="yt73" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.unification(jetbrains.mps.logic.reactor/)" />
     <import index="omn0" ref="r:4e44cb56-a834-45de-a0c4-c49a5c86e78e(jetbrains.mps.logic.builtin.solver)" />
     <import index="cxk7" ref="r:daa544a7-0a5c-49c0-a54c-4c2a5b4868aa(jetbrains.mps.logic.builtin.predicate)" />
     <import index="eift" ref="c3941617-f429-4b63-b06e-42126b247dcb/java:runtime(jetbrains.mps.logic_jchr.runtime/)" />
+    <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.treeform)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -417,13 +417,13 @@
       <node concept="37vLTG" id="4OsiK2BAm0x" role="3clF46">
         <property role="TrG5h" value="left" />
         <node concept="3uibUv" id="4OsiK2BAm4d" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="37vLTG" id="4OsiK2BAm7X" role="3clF46">
         <property role="TrG5h" value="right" />
         <node concept="3uibUv" id="4OsiK2BAm87" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="3cqZAl" id="4OsiK2BAlI8" role="3clF45" />
@@ -447,7 +447,7 @@
       <node concept="37vLTG" id="4U_yxogCcGJ" role="3clF46">
         <property role="TrG5h" value="left" />
         <node concept="3uibUv" id="4U_yxogCcGK" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="37vLTG" id="4U_yxogCcGL" role="3clF46">
@@ -483,7 +483,7 @@
       <node concept="37vLTG" id="4U_yxogCdjX" role="3clF46">
         <property role="TrG5h" value="right" />
         <node concept="3uibUv" id="4U_yxogCdjY" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="3cqZAl" id="4U_yxogCdk1" role="3clF45" />
@@ -537,13 +537,13 @@
       <node concept="37vLTG" id="4OsiK2BAohR" role="3clF46">
         <property role="TrG5h" value="left" />
         <node concept="3uibUv" id="4OsiK2BAohS" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="37vLTG" id="4OsiK2BAohT" role="3clF46">
         <property role="TrG5h" value="right" />
         <node concept="3uibUv" id="4OsiK2BAohU" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="10P_77" id="4U_yxogCa6w" role="3clF45" />
@@ -567,7 +567,7 @@
       <node concept="37vLTG" id="4U_yxogC9UI" role="3clF46">
         <property role="TrG5h" value="left" />
         <node concept="3uibUv" id="4U_yxogC9UJ" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="37vLTG" id="4U_yxogC9UK" role="3clF46">
@@ -603,7 +603,7 @@
       <node concept="37vLTG" id="4U_yxogCamY" role="3clF46">
         <property role="TrG5h" value="right" />
         <node concept="3uibUv" id="4U_yxogCamZ" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="10P_77" id="4U_yxogCch8" role="3clF45" />
@@ -4459,13 +4459,13 @@
       <node concept="37vLTG" id="6MYr6JwItZL" role="3clF46">
         <property role="TrG5h" value="left" />
         <node concept="3uibUv" id="6MYr6JwItZM" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="37vLTG" id="6MYr6JwItZN" role="3clF46">
         <property role="TrG5h" value="right" />
         <node concept="3uibUv" id="6MYr6JwItZO" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="3cqZAl" id="6MYr6JwItZP" role="3clF45" />
@@ -4504,7 +4504,7 @@
       <node concept="37vLTG" id="6MYr6JwItZX" role="3clF46">
         <property role="TrG5h" value="left" />
         <node concept="3uibUv" id="6MYr6JwItZY" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="37vLTG" id="6MYr6JwItZZ" role="3clF46">
@@ -4555,7 +4555,7 @@
       <node concept="37vLTG" id="6MYr6JwIu0b" role="3clF46">
         <property role="TrG5h" value="right" />
         <node concept="3uibUv" id="6MYr6JwIu0c" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="3cqZAl" id="6MYr6JwIu0d" role="3clF45" />
@@ -4639,13 +4639,13 @@
       <node concept="37vLTG" id="6MYr6JwUNOd" role="3clF46">
         <property role="TrG5h" value="left" />
         <node concept="3uibUv" id="6MYr6JwUNOe" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="37vLTG" id="6MYr6JwUNOf" role="3clF46">
         <property role="TrG5h" value="right" />
         <node concept="3uibUv" id="6MYr6JwUNOg" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="10P_77" id="6MYr6JwUNOh" role="3clF45" />
@@ -4684,7 +4684,7 @@
       <node concept="37vLTG" id="6MYr6JwUNOC" role="3clF46">
         <property role="TrG5h" value="left" />
         <node concept="3uibUv" id="6MYr6JwUNOD" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="37vLTG" id="6MYr6JwUNOE" role="3clF46">
@@ -4735,7 +4735,7 @@
       <node concept="37vLTG" id="6MYr6JwUNP5" role="3clF46">
         <property role="TrG5h" value="right" />
         <node concept="3uibUv" id="6MYr6JwUNP6" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="10P_77" id="6MYr6JwUNP7" role="3clF45" />
@@ -5127,12 +5127,12 @@
                     <ref role="3cqZAo" node="3FIATxbQg$y" resolve="term" />
                   </node>
                   <node concept="3uibUv" id="3FIATxbQg$J" role="10QFUM">
-                    <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                    <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                   </node>
                 </node>
               </node>
               <node concept="liA8E" id="3FIATxbQg$K" role="2OqNvi">
-                <ref role="37wK5l" to="ie8e:2QE4RCGndD7" resolve="asRoot" />
+                <ref role="37wK5l" to="6exd:2QE4RCGndD7" resolve="asRoot" />
               </node>
             </node>
             <node concept="16syzq" id="3FIATxbQg$L" role="10QFUM">
@@ -5325,7 +5325,7 @@
       <node concept="37vLTG" id="6SkxsM$2XXX" role="3clF46">
         <property role="TrG5h" value="tf" />
         <node concept="3uibUv" id="6SkxsM$2XXW" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
     </node>
@@ -5354,7 +5354,7 @@
       <node concept="37vLTG" id="1GDBwhEEL88" role="3clF46">
         <property role="TrG5h" value="tf" />
         <node concept="3uibUv" id="1GDBwhEEL89" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
     </node>
@@ -5427,7 +5427,7 @@
       <node concept="3uibUv" id="6yEjedmaeEx" role="3clF45">
         <ref role="3uigEE" to="45ys:7HUwyZauJhz" resolve="MetaLogical" />
         <node concept="3uibUv" id="20WMLipvJgu" role="11_B2D">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="3clFbS" id="6yEjedmaeEy" role="3clF47">
@@ -5473,7 +5473,7 @@
             <node concept="3uibUv" id="7HUwyZazx80" role="1tU5fm">
               <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
               <node concept="3uibUv" id="7HUwyZazx81" role="11_B2D">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
             </node>
             <node concept="1rXfSq" id="5NuEpF1xSw$" role="33vP2m">
@@ -5485,7 +5485,7 @@
           <node concept="3cpWsn" id="3v$7B1Kczo1" role="3cpWs9">
             <property role="TrG5h" value="value" />
             <node concept="3uibUv" id="3v$7B1KcznY" role="1tU5fm">
-              <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+              <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
             </node>
             <node concept="2OqwBi" id="3v$7B1Kczo2" role="33vP2m">
               <node concept="37vLTw" id="3v$7B1Kczo3" role="2Oq$k0">
@@ -5572,13 +5572,13 @@
     <node concept="3uibUv" id="4U_yxogB8or" role="1zkMxy">
       <ref role="3uigEE" node="3HJTsBmBSJa" resolve="JchrLogical" />
       <node concept="3uibUv" id="4U_yxogB8yy" role="11_B2D">
-        <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+        <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
       </node>
     </node>
     <node concept="3uibUv" id="7HUwyZazx8k" role="EKbjA">
       <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
       <node concept="3uibUv" id="7HUwyZazx8l" role="11_B2D">
-        <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+        <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
       </node>
     </node>
     <node concept="3UR2Jj" id="2ev$9JF$huc" role="lGtFl">
diff --git a/logic/languages/jetbrains.mps.logic/generator/template/main@generator.mps b/logic/languages/jetbrains.mps.logic/generator/template/main@generator.mps
index 7f9e87d6..939813a8 100644
--- a/logic/languages/jetbrains.mps.logic/generator/template/main@generator.mps
+++ b/logic/languages/jetbrains.mps.logic/generator/template/main@generator.mps
@@ -13,11 +13,11 @@
   </languages>
   <imports>
     <import index="5j4j" ref="r:c8fb1c5e-8204-4904-a38f-678899d447c1(jetbrains.mps.logic.structure)" />
-    <import index="ie8e" ref="r:ab2605ab-b4bc-4e80-a8ca-19a4a8465c01(jetbrains.mps.logic.atom)" />
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
     <import index="yg8f" ref="r:e213377a-f1a7-4ba7-9d08-96bcb97ed8ce(jetbrains.mps.logic.builtin)" />
     <import index="45ys" ref="r:7365f7fe-12e6-4229-8901-f6dc6d5df03f(jetbrains.mps.logic.reactor.logical)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
+    <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.treeform)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
   </imports>
   <registry>
@@ -324,7 +324,7 @@
           </node>
           <node concept="gft3U" id="4OKkcneWb1C" role="150oIE">
             <node concept="2YIFZM" id="7HUwyZbd5nK" role="gfFT$">
-              <ref role="37wK5l" to="yg8f:7HUwyZb7chj" resolve="asAtom" />
+              <ref role="37wK5l" to="yg8f:7HUwyZb7chj" resolve="asTreeForm" />
               <ref role="1Pybhc" to="yg8f:677NV565N1x" resolve="LogicalUtil" />
               <node concept="2ShNRf" id="7nPD14NOHH4" role="37wK5m">
                 <node concept="1pGfFk" id="7nPD14NOHH5" role="2ShVmc">
@@ -339,13 +339,13 @@
         </node>
         <node concept="gft3U" id="4OKkcneWczK" role="14YRTM">
           <node concept="2YIFZM" id="7HUwyZbd5Au" role="gfFT$">
-            <ref role="37wK5l" to="yg8f:7HUwyZb7chj" resolve="asAtom" />
+            <ref role="37wK5l" to="yg8f:7HUwyZb7chj" resolve="asTreeForm" />
             <ref role="1Pybhc" to="yg8f:677NV565N1x" resolve="LogicalUtil" />
             <node concept="2ShNRf" id="2Dg5bSg3RdY" role="37wK5m">
               <node concept="1pGfFk" id="2Dg5bSg3RdZ" role="2ShVmc">
                 <ref role="37wK5l" to="45ys:7nPD14NON$Y" resolve="MetaLogical" />
                 <node concept="3VsKOn" id="2Dg5bSg3Rjh" role="37wK5m">
-                  <ref role="3VsUkX" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                  <ref role="3VsUkX" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
             </node>
@@ -405,8 +405,8 @@
       <ref role="30HIoZ" to="5j4j:6$jH9oLmYC_" resolve="Compound" />
       <node concept="gft3U" id="29_L5zQWy8k" role="1lVwrX">
         <node concept="2YIFZM" id="29_L5zQWy8l" role="gfFT$">
-          <ref role="1Pybhc" to="ie8e:5JQSuNswOXL" resolve="CompositeNode" />
-          <ref role="37wK5l" to="ie8e:5JQSuNsxhfn" resolve="create" />
+          <ref role="1Pybhc" to="6exd:5JQSuNswOXL" resolve="CompositeNode" />
+          <ref role="37wK5l" to="6exd:5JQSuNsxhfn" resolve="create" />
           <node concept="Xl_RD" id="29_L5zQWy8m" role="37wK5m">
             <property role="Xl_RC" value="node" />
             <node concept="17Uvod" id="29_L5zQWJXC" role="lGtFl">
@@ -532,8 +532,8 @@
       <ref role="30HIoZ" to="5j4j:6$jH9oLmYI0" resolve="ValueRole" />
       <node concept="gft3U" id="6UqNvvALIUa" role="1lVwrX">
         <node concept="2YIFZM" id="6UqNvvALIUb" role="gfFT$">
-          <ref role="37wK5l" to="ie8e:5JQSuNsx4I5" resolve="value" />
-          <ref role="1Pybhc" to="ie8e:5JQSuNsx4Gq" resolve="Builder" />
+          <ref role="37wK5l" to="6exd:5JQSuNsx4I5" resolve="value" />
+          <ref role="1Pybhc" to="6exd:5JQSuNsx4Gq" resolve="Builder" />
           <node concept="Xl_RD" id="6UqNvvALIUc" role="37wK5m">
             <property role="Xl_RC" value="name" />
             <node concept="17Uvod" id="6UqNvvALIUd" role="lGtFl">
@@ -593,8 +593,8 @@
       <ref role="30HIoZ" to="5j4j:6$jH9oLmYEJ" resolve="ChildRole" />
       <node concept="gft3U" id="6UqNvvALIHq" role="1lVwrX">
         <node concept="2YIFZM" id="6UqNvvALIHr" role="gfFT$">
-          <ref role="1Pybhc" to="ie8e:5JQSuNswOXL" resolve="CompositeNode" />
-          <ref role="37wK5l" to="ie8e:5JQSuNsxhfn" resolve="create" />
+          <ref role="1Pybhc" to="6exd:5JQSuNswOXL" resolve="CompositeNode" />
+          <ref role="37wK5l" to="6exd:5JQSuNsxhfn" resolve="create" />
           <node concept="Xl_RD" id="6UqNvvALIHs" role="37wK5m">
             <property role="Xl_RC" value="name" />
             <node concept="17Uvod" id="6UqNvvALIHt" role="lGtFl">
@@ -720,8 +720,8 @@
           </node>
           <node concept="gft3U" id="6UqNvvALHUZ" role="150oIE">
             <node concept="2YIFZM" id="6UqNvvALHV0" role="gfFT$">
-              <ref role="37wK5l" to="ie8e:5JQSuNsxb_I" resolve="create" />
-              <ref role="1Pybhc" to="ie8e:2xQ7eRAD2dj" resolve="Value" />
+              <ref role="37wK5l" to="6exd:5JQSuNsxb_I" resolve="create" />
+              <ref role="1Pybhc" to="6exd:2xQ7eRAD2dj" resolve="Value" />
               <node concept="Xl_RD" id="6UqNvvALHV1" role="37wK5m">
                 <property role="Xl_RC" value="value" />
                 <node concept="17Uvod" id="6UqNvvALHV2" role="lGtFl">
@@ -773,8 +773,8 @@
       <ref role="30HIoZ" to="5j4j:1OShD0HAY6y" resolve="List" />
       <node concept="gft3U" id="6UqNvvALHva" role="1lVwrX">
         <node concept="2YIFZM" id="6UqNvvALHvb" role="gfFT$">
-          <ref role="1Pybhc" to="ie8e:3OPtF03lco4" resolve="ListNode" />
-          <ref role="37wK5l" to="ie8e:1OShD0HS45f" resolve="createList" />
+          <ref role="1Pybhc" to="6exd:3OPtF03lco4" resolve="ListNode" />
+          <ref role="37wK5l" to="6exd:1OShD0HS45f" resolve="createList" />
           <node concept="10Nm6u" id="7HUwyZb7cIG" role="37wK5m">
             <node concept="2b32R4" id="7HUwyZb7cIH" role="lGtFl">
               <node concept="3JmXsc" id="7HUwyZb7cII" role="2P8S$">
@@ -985,7 +985,7 @@
           </node>
           <node concept="3clFbF" id="677NV56tBWA" role="3cqZAp">
             <node concept="2YIFZM" id="7HUwyZb7btr" role="3clFbG">
-              <ref role="37wK5l" to="yg8f:7HUwyZb7b7C" resolve="asAtomArray" />
+              <ref role="37wK5l" to="yg8f:7HUwyZb7b7C" resolve="asTreeFormArray" />
               <ref role="1Pybhc" to="yg8f:677NV565N1x" resolve="LogicalUtil" />
               <node concept="37vLTw" id="7HUwyZb7bts" role="37wK5m">
                 <ref role="3cqZAo" node="677NV56tBWz" resolve="mlp" />
@@ -1057,7 +1057,7 @@
           </node>
           <node concept="3clFbF" id="7HUwyZb7cpf" role="3cqZAp">
             <node concept="2YIFZM" id="7HUwyZb7cuU" role="3clFbG">
-              <ref role="37wK5l" to="yg8f:7HUwyZb7chj" resolve="asAtom" />
+              <ref role="37wK5l" to="yg8f:7HUwyZb7chj" resolve="asTreeForm" />
               <ref role="1Pybhc" to="yg8f:677NV565N1x" resolve="LogicalUtil" />
               <node concept="37vLTw" id="7HUwyZb7cvj" role="37wK5m">
                 <ref role="3cqZAo" node="677NV56tAlm" resolve="logical" />
@@ -1159,7 +1159,7 @@
           <node concept="3clFbF" id="514BAS_YBDx" role="3cqZAp">
             <node concept="2YIFZM" id="514BAS_YBDy" role="3clFbG">
               <ref role="1Pybhc" to="yg8f:677NV565N1x" resolve="LogicalUtil" />
-              <ref role="37wK5l" to="yg8f:4TCblo5YI1H" resolve="asAtom" />
+              <ref role="37wK5l" to="yg8f:4TCblo5YI1H" resolve="asTreeForm" />
               <node concept="37vLTw" id="514BAS_YBDz" role="37wK5m">
                 <ref role="3cqZAo" node="514BAS_YBDv" resolve="logical" />
                 <node concept="29HgVG" id="514BAS_YBD$" role="lGtFl" />
@@ -1214,8 +1214,8 @@
       </node>
       <node concept="gft3U" id="6MYr6JxlB4t" role="1lVwrX">
         <node concept="2YIFZM" id="6MYr6JxlB4u" role="gfFT$">
-          <ref role="1Pybhc" to="ie8e:2xQ7eRAD2dj" resolve="Value" />
-          <ref role="37wK5l" to="ie8e:5JQSuNsxb_I" resolve="create" />
+          <ref role="1Pybhc" to="6exd:2xQ7eRAD2dj" resolve="Value" />
+          <ref role="37wK5l" to="6exd:5JQSuNsxb_I" resolve="create" />
           <node concept="Xl_RD" id="6MYr6JxlBmV" role="37wK5m">
             <property role="Xl_RC" value="" />
             <node concept="29HgVG" id="6MYr6JxlBoF" role="lGtFl">
diff --git a/logic/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl b/logic/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl
index ace59c80..dfd27141 100644
--- a/logic/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl
+++ b/logic/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl
@@ -15,7 +15,6 @@
       </models>
       <external-templates />
       <dependencies>
-        <dependency reexport="false">7526e0cf-1ce7-46f8-a555-9eca1e06c23b(jetbrains.mps.logic.atom)</dependency>
         <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
         <dependency reexport="false">bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)</dependency>
       </dependencies>
@@ -81,7 +80,6 @@
     <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
     <dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
     <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
-    <dependency reexport="false">7526e0cf-1ce7-46f8-a555-9eca1e06c23b(jetbrains.mps.logic.atom)</dependency>
     <dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
     <dependency reexport="false">2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)</dependency>
     <dependency reexport="false">e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)</dependency>
diff --git a/logic/languages/jetbrains.mps.logic/languageModels/behavior.mps b/logic/languages/jetbrains.mps.logic/languageModels/behavior.mps
index c4da5e23..5cb50252 100644
--- a/logic/languages/jetbrains.mps.logic/languageModels/behavior.mps
+++ b/logic/languages/jetbrains.mps.logic/languageModels/behavior.mps
@@ -7,8 +7,8 @@
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
-    <import index="ie8e" ref="r:ab2605ab-b4bc-4e80-a8ca-19a4a8465c01(jetbrains.mps.logic.atom)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
+    <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.treeform)" />
     <import index="5j4j" ref="r:c8fb1c5e-8204-4904-a38f-678899d447c1(jetbrains.mps.logic.structure)" implicit="true" />
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" implicit="true" />
   </imports>
@@ -196,7 +196,7 @@
             <node concept="3clFbS" id="6Sag3KsyiIx" role="3Kbo56">
               <node concept="3cpWs6" id="6Sag3KsyiJ4" role="3cqZAp">
                 <node concept="3B5_sB" id="6Sag3Ksyj85" role="3cqZAk">
-                  <ref role="3B5MYn" to="ie8e:3OPtF03lco4" resolve="ListNode" />
+                  <ref role="3B5MYn" to="6exd:3OPtF03lco4" resolve="ListNode" />
                 </node>
               </node>
             </node>
@@ -208,7 +208,7 @@
             <node concept="3clFbS" id="6Sag3KsyjtO" role="3Kbo56">
               <node concept="3cpWs6" id="6Sag3KsyjNN" role="3cqZAp">
                 <node concept="3B5_sB" id="6Sag3KsyjNO" role="3cqZAk">
-                  <ref role="3B5MYn" to="ie8e:2xQ7eRAD2dj" resolve="Value" />
+                  <ref role="3B5MYn" to="6exd:2xQ7eRAD2dj" resolve="Value" />
                 </node>
               </node>
             </node>
@@ -216,7 +216,7 @@
         </node>
         <node concept="3clFbF" id="6Sag3KsyjWy" role="3cqZAp">
           <node concept="3B5_sB" id="7MlQDeOyUrC" role="3clFbG">
-            <ref role="3B5MYn" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+            <ref role="3B5MYn" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
           </node>
         </node>
       </node>
@@ -264,7 +264,7 @@
       <node concept="3clFbS" id="7FFmDVAL6W0" role="3clF47">
         <node concept="3clFbF" id="7FFmDVALaOi" role="3cqZAp">
           <node concept="3B5_sB" id="7FFmDVALaOh" role="3clFbG">
-            <ref role="3B5MYn" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+            <ref role="3B5MYn" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
           </node>
         </node>
       </node>
@@ -291,7 +291,7 @@
       <node concept="3clFbS" id="7FFmDVAL6Yd" role="3clF47">
         <node concept="3clFbF" id="7FFmDVALaxd" role="3cqZAp">
           <node concept="3B5_sB" id="7FFmDVALaxc" role="3clFbG">
-            <ref role="3B5MYn" to="ie8e:2xQ7eRAD2dj" resolve="Value" />
+            <ref role="3B5MYn" to="6exd:2xQ7eRAD2dj" resolve="Value" />
           </node>
         </node>
       </node>
@@ -315,7 +315,7 @@
       <node concept="3clFbS" id="7FFmDVAL75b" role="3clF47">
         <node concept="3clFbF" id="7FFmDVALaK9" role="3cqZAp">
           <node concept="3B5_sB" id="7FFmDVALaK8" role="3clFbG">
-            <ref role="3B5MYn" to="ie8e:5JQSuNswOXL" resolve="CompositeNode" />
+            <ref role="3B5MYn" to="6exd:5JQSuNswOXL" resolve="CompositeNode" />
           </node>
         </node>
       </node>
@@ -339,7 +339,7 @@
       <node concept="3clFbS" id="7FFmDVAL79t" role="3clF47">
         <node concept="3clFbF" id="7FFmDVALaDE" role="3cqZAp">
           <node concept="3B5_sB" id="7FFmDVALaDD" role="3clFbG">
-            <ref role="3B5MYn" to="ie8e:3OPtF03lco4" resolve="ListNode" />
+            <ref role="3B5MYn" to="6exd:3OPtF03lco4" resolve="ListNode" />
           </node>
         </node>
       </node>
diff --git a/logic/languages/jetbrains.mps.logic/languageModels/typesystem.mps b/logic/languages/jetbrains.mps.logic/languageModels/typesystem.mps
index 94cceead..866cfc0e 100644
--- a/logic/languages/jetbrains.mps.logic/languageModels/typesystem.mps
+++ b/logic/languages/jetbrains.mps.logic/languageModels/typesystem.mps
@@ -6,11 +6,11 @@
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
-    <import index="ie8e" ref="r:ab2605ab-b4bc-4e80-a8ca-19a4a8465c01(jetbrains.mps.logic.atom)" />
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
     <import index="5j4j" ref="r:c8fb1c5e-8204-4904-a38f-678899d447c1(jetbrains.mps.logic.structure)" />
     <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
     <import index="45ys" ref="r:7365f7fe-12e6-4229-8901-f6dc6d5df03f(jetbrains.mps.logic.reactor.logical)" />
+    <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.treeform)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
   </imports>
   <registry>
@@ -188,7 +188,7 @@
         <node concept="mw_s8" id="1pt0VTMFgab" role="1ZfhKB">
           <node concept="2c44tf" id="1pt0VTMFga7" role="mwGJk">
             <node concept="3uibUv" id="6r6omRlboX3" role="2c44tc">
-              <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+              <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
             </node>
           </node>
         </node>
@@ -395,7 +395,7 @@
                   </node>
                   <node concept="2c44tf" id="5Ii$nZP2GwS" role="3JuZjQ">
                     <node concept="3uibUv" id="5Ii$nZP2GxX" role="2c44tc">
-                      <ref role="3uigEE" to="ie8e:uNmovXiEd4" resolve="Variable" />
+                      <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
                     </node>
                   </node>
                 </node>
@@ -414,7 +414,7 @@
                     </node>
                     <node concept="2c44tf" id="5Ii$nZP52Ws" role="3JuZjQ">
                       <node concept="3uibUv" id="6MYr6Jy880T" role="2c44tc">
-                        <ref role="3uigEE" to="ie8e:2xQ7eRAD2dj" resolve="Value" />
+                        <ref role="3uigEE" to="6exd:2xQ7eRAD2dj" resolve="Value" />
                         <node concept="3uibUv" id="6MYr6Jy8824" role="11_B2D">
                           <ref role="3uigEE" to="wyt6:~String" resolve="String" />
                         </node>
diff --git a/logic/languages/jetbrains.mps.logic/runtime/jetbrains.mps.logic.runtime.msd b/logic/languages/jetbrains.mps.logic/runtime/jetbrains.mps.logic.runtime.msd
index 61dba48e..2154d8d4 100644
--- a/logic/languages/jetbrains.mps.logic/runtime/jetbrains.mps.logic.runtime.msd
+++ b/logic/languages/jetbrains.mps.logic/runtime/jetbrains.mps.logic.runtime.msd
@@ -8,7 +8,6 @@
   <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
-    <dependency reexport="true">7526e0cf-1ce7-46f8-a555-9eca1e06c23b(jetbrains.mps.logic.atom)</dependency>
     <dependency reexport="true">bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)</dependency>
   </dependencies>
   <usedDevKits>
@@ -29,7 +28,6 @@
   </languageVersions>
   <dependencyVersions>
     <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
-    <module reference="7526e0cf-1ce7-46f8-a555-9eca1e06c23b(jetbrains.mps.logic.atom)" version="0" />
     <module reference="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" version="0" />
     <module reference="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" version="0" />
   </dependencyVersions>
diff --git a/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin.mps b/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin.mps
index ccf87cfc..92ed15e1 100644
--- a/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin.mps
+++ b/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin.mps
@@ -7,15 +7,15 @@
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
-    <import index="ie8e" ref="r:ab2605ab-b4bc-4e80-a8ca-19a4a8465c01(jetbrains.mps.logic.atom)" />
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
     <import index="oy3s" ref="r:a6030cee-34eb-4503-b1bf-015fe5cd8c1a(jetbrains.mps.logic.builtin.unification)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
     <import index="45ys" ref="r:7365f7fe-12e6-4229-8901-f6dc6d5df03f(jetbrains.mps.logic.reactor.logical)" />
     <import index="qrld" ref="r:2a79c8aa-e372-4c00-8d71-5d7f3db517e4(jetbrains.mps.logic.reactor.evaluation)" />
     <import index="rchb" ref="r:f43ee4a0-488a-425a-87a0-594ab3b0d15f(jetbrains.mps.logic.reactor.program)" />
-    <import index="yt73" ref="7526e0cf-1ce7-46f8-a555-9eca1e06c23b/java:jetbrains.mps.unification(jetbrains.mps.logic.atom/)" />
+    <import index="yt73" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.unification(jetbrains.mps.logic.reactor/)" />
     <import index="cxk7" ref="r:daa544a7-0a5c-49c0-a54c-4c2a5b4868aa(jetbrains.mps.logic.builtin.predicate)" />
+    <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.treeform)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -250,7 +250,7 @@
       </node>
       <node concept="10Q1$e" id="7HUwyZb7b7G" role="3clF45">
         <node concept="3uibUv" id="7HUwyZb7b7H" role="10Q1$1">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="3Tm1VV" id="7HUwyZb7b7I" role="1B3o_S" />
@@ -260,7 +260,7 @@
             <property role="TrG5h" value="array" />
             <node concept="10Q1$e" id="7HUwyZb7b7T" role="1tU5fm">
               <node concept="3uibUv" id="7HUwyZb7b7U" role="10Q1$1">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
             </node>
             <node concept="2ShNRf" id="7HUwyZb7b7V" role="33vP2m">
@@ -276,7 +276,7 @@
                   </node>
                 </node>
                 <node concept="3uibUv" id="7HUwyZb7b81" role="3$_nBY">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
             </node>
@@ -358,7 +358,7 @@
         </node>
       </node>
       <node concept="3uibUv" id="7HUwyZb7cho" role="3clF45">
-        <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+        <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
       </node>
       <node concept="3Tm1VV" id="7HUwyZb7chp" role="1B3o_S" />
       <node concept="3clFbS" id="7HUwyZb7chq" role="3clF47">
@@ -387,7 +387,7 @@
         </node>
       </node>
       <node concept="3uibUv" id="4TCblo5YI1K" role="3clF45">
-        <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+        <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
       </node>
       <node concept="3Tm1VV" id="4TCblo5YI1L" role="1B3o_S" />
       <node concept="3clFbS" id="4TCblo5YI1M" role="3clF47">
@@ -421,8 +421,8 @@
         <node concept="3clFbF" id="4TCblo5NkJr" role="3cqZAp">
           <node concept="2OqwBi" id="4TCblo5Nl4W" role="3clFbG">
             <node concept="2YIFZM" id="4TCblo5NkK4" role="2Oq$k0">
-              <ref role="37wK5l" to="ie8e:5s497VqteR6" resolve="mapper" />
-              <ref role="1Pybhc" to="ie8e:3OPtF02T8yx" resolve="Mappers" />
+              <ref role="37wK5l" to="6exd:5s497VqteR6" resolve="mapper" />
+              <ref role="1Pybhc" to="6exd:3OPtF02T8yx" resolve="Mappers" />
               <node concept="2ShNRf" id="4TCblo5NkKU" role="37wK5m">
                 <node concept="1pGfFk" id="4TCblo5Nl1t" role="2ShVmc">
                   <ref role="37wK5l" node="4TCblo5MHYk" resolve="LogicalUtil.InstantiateDelegate" />
@@ -433,7 +433,7 @@
               </node>
             </node>
             <node concept="liA8E" id="4TCblo5Nl7d" role="2OqNvi">
-              <ref role="37wK5l" to="ie8e:3OPtF02TgQt" resolve="map" />
+              <ref role="37wK5l" to="6exd:3OPtF02TgQt" resolve="map" />
               <node concept="37vLTw" id="4TCblo5Nl9o" role="37wK5m">
                 <ref role="3cqZAo" node="4TCblo5NkAJ" resolve="tf" />
               </node>
@@ -444,7 +444,7 @@
       <node concept="37vLTG" id="4TCblo5NkAJ" role="3clF46">
         <property role="TrG5h" value="tf" />
         <node concept="3uibUv" id="4TCblo5NkFx" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="37vLTG" id="4TCblo5NkwR" role="3clF46">
@@ -454,7 +454,7 @@
         </node>
       </node>
       <node concept="3uibUv" id="4TCblo5Nlai" role="3clF45">
-        <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+        <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
       </node>
       <node concept="3Tm1VV" id="4TCblo5NkoK" role="1B3o_S" />
     </node>
@@ -493,7 +493,7 @@
       <node concept="2tJIrI" id="4TCblo5MHTP" role="jymVt" />
       <node concept="3Tm6S6" id="4TCblo5MG2k" role="1B3o_S" />
       <node concept="3uibUv" id="4TCblo5MGIz" role="EKbjA">
-        <ref role="3uigEE" to="ie8e:3OPtF031GQe" resolve="Mappers.MapDelegate" />
+        <ref role="3uigEE" to="6exd:3OPtF031GQe" resolve="Mappers.MapDelegate" />
       </node>
       <node concept="3clFb_" id="6HT7BWBPa9I" role="jymVt">
         <property role="1EzhhJ" value="false" />
@@ -501,7 +501,7 @@
         <node concept="37vLTG" id="6HT7BWBPa9J" role="3clF46">
           <property role="TrG5h" value="tf" />
           <node concept="3uibUv" id="6HT7BWBPa9K" role="1tU5fm">
-            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+            <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
           </node>
         </node>
         <node concept="10P_77" id="6HT7BWBPa9L" role="3clF45" />
@@ -517,7 +517,7 @@
                   <ref role="3cqZAo" node="6HT7BWBPa9J" resolve="tf" />
                 </node>
                 <node concept="liA8E" id="5BGv8yzxmhs" role="2OqNvi">
-                  <ref role="37wK5l" to="ie8e:5BGv8yzvvIZ" resolve="variablesCount" />
+                  <ref role="37wK5l" to="6exd:5BGv8yzvvIZ" resolve="variablesCount" />
                 </node>
               </node>
             </node>
@@ -531,18 +531,18 @@
         <node concept="37vLTG" id="6HT7BWBPa9P" role="3clF46">
           <property role="TrG5h" value="tf" />
           <node concept="3uibUv" id="6HT7BWBPa9Q" role="1tU5fm">
-            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+            <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
           </node>
         </node>
         <node concept="37vLTG" id="6HT7BWBPa9R" role="3clF46">
           <property role="TrG5h" value="fallback" />
           <node concept="3uibUv" id="6HT7BWBPa9S" role="1tU5fm">
-            <ref role="3uigEE" to="ie8e:3OPtF02TdNT" resolve="TreeForm.Mapper" />
+            <ref role="3uigEE" to="6exd:3OPtF02TdNT" resolve="TreeForm.Mapper" />
           </node>
         </node>
         <node concept="3Tm1VV" id="6HT7BWBPa9T" role="1B3o_S" />
         <node concept="3uibUv" id="6HT7BWBPa9U" role="3clF45">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
         <node concept="3clFbS" id="6HT7BWBPa9V" role="3clF47">
           <node concept="3clFbJ" id="5BGv8yzxmXQ" role="3cqZAp">
@@ -595,7 +595,7 @@
                       <ref role="3cqZAo" node="6HT7BWBPa9P" resolve="tf" />
                     </node>
                     <node concept="liA8E" id="5BGv8yzxlnb" role="2OqNvi">
-                      <ref role="37wK5l" to="ie8e:3OPtF02Tjpr" resolve="mapRecursively" />
+                      <ref role="37wK5l" to="6exd:3OPtF02Tjpr" resolve="mapRecursively" />
                       <node concept="37vLTw" id="5BGv8yzxlyp" role="37wK5m">
                         <ref role="3cqZAo" node="6HT7BWBPa9R" resolve="fallback" />
                       </node>
@@ -1000,7 +1000,7 @@
                               <node concept="3uibUv" id="4TCblo5Z8NB" role="10QFUM">
                                 <ref role="3uigEE" to="45ys:7HUwyZauJhz" resolve="MetaLogical" />
                                 <node concept="3uibUv" id="4TCblo5Z9P0" role="11_B2D">
-                                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                                 </node>
                               </node>
                             </node>
@@ -1025,7 +1025,7 @@
                         <ref role="1Pybhc" node="677NV565N1x" resolve="LogicalUtil" />
                         <node concept="10QFUN" id="4TCblo5Nskr" role="37wK5m">
                           <node concept="3uibUv" id="4TCblo5Nskp" role="10QFUM">
-                            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                            <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                           </node>
                           <node concept="37vLTw" id="4TCblo5NsuL" role="10QFUP">
                             <ref role="3cqZAo" node="4TCblo5NoSd" resolve="a" />
@@ -1042,7 +1042,7 @@
               </node>
               <node concept="2ZW3vV" id="4TCblo5NptX" role="3clFbw">
                 <node concept="3uibUv" id="4TCblo5NpxS" role="2ZW6by">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
                 <node concept="37vLTw" id="4TCblo5Nppi" role="2ZW6bz">
                   <ref role="3cqZAo" node="4TCblo5NoSd" resolve="a" />
@@ -1320,7 +1320,7 @@
               <node concept="3eNFk2" id="4sSe4$prurd" role="3eNLev">
                 <node concept="2ZW3vV" id="4sSe4$prvtz" role="3eO9$A">
                   <node concept="3uibUv" id="4sSe4$ps1yr" role="2ZW6by">
-                    <ref role="3uigEE" to="ie8e:1msb0mq9ID4" resolve="Node" />
+                    <ref role="3uigEE" to="6exd:1msb0mq9ID4" resolve="Node" />
                   </node>
                   <node concept="37vLTw" id="4sSe4$prv0k" role="2ZW6bz">
                     <ref role="3cqZAo" node="78CwJJcO_55" resolve="arg" />
@@ -1340,7 +1340,7 @@
                       <node concept="liA8E" id="4sSe4$prIpP" role="2OqNvi">
                         <ref role="37wK5l" to="33ny:~ArrayList.add(java.lang.Object):boolean" resolve="add" />
                         <node concept="3VsKOn" id="4sSe4$prJvo" role="37wK5m">
-                          <ref role="3VsUkX" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                          <ref role="3VsUkX" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                         </node>
                       </node>
                     </node>
diff --git a/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/program.mps b/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/program.mps
index 2d7232a0..ead17087 100644
--- a/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/program.mps
+++ b/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/program.mps
@@ -11,10 +11,10 @@
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
     <import index="oy3s" ref="r:a6030cee-34eb-4503-b1bf-015fe5cd8c1a(jetbrains.mps.logic.builtin.unification)" />
-    <import index="ie8e" ref="r:ab2605ab-b4bc-4e80-a8ca-19a4a8465c01(jetbrains.mps.logic.atom)" />
     <import index="qrld" ref="r:2a79c8aa-e372-4c00-8d71-5d7f3db517e4(jetbrains.mps.logic.reactor.evaluation)" />
     <import index="45ys" ref="r:7365f7fe-12e6-4229-8901-f6dc6d5df03f(jetbrains.mps.logic.reactor.logical)" />
     <import index="yg8f" ref="r:e213377a-f1a7-4ba7-9d08-96bcb97ed8ce(jetbrains.mps.logic.builtin)" />
+    <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.treeform)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -1869,7 +1869,7 @@
                       <node concept="3eNFk2" id="5rhZO$TZT6F" role="3eNLev">
                         <node concept="2ZW3vV" id="5rhZO$TZT6G" role="3eO9$A">
                           <node concept="3uibUv" id="5rhZO$TZT6H" role="2ZW6by">
-                            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                            <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                           </node>
                           <node concept="37vLTw" id="5rhZO$TZT6I" role="2ZW6bz">
                             <ref role="3cqZAo" node="5rhZO$TZT8h" resolve="arg" />
@@ -1885,19 +1885,19 @@
                             <node concept="2OqwBi" id="5rhZO$TZT6N" role="3clFbG">
                               <node concept="2ShNRf" id="5rhZO$TZT6O" role="2Oq$k0">
                                 <node concept="1pGfFk" id="5rhZO$TZT6P" role="2ShVmc">
-                                  <ref role="37wK5l" to="ie8e:47nvOnTQN6Q" resolve="TreeFormWalk" />
+                                  <ref role="37wK5l" to="6exd:47nvOnTQN6Q" resolve="TreeFormWalk" />
                                   <node concept="2ShNRf" id="5rhZO$TZT6Q" role="37wK5m">
                                     <node concept="YeOm9" id="5rhZO$TZT6R" role="2ShVmc">
                                       <node concept="1Y3b0j" id="5rhZO$TZT6S" role="YeSDq">
                                         <property role="2bfB8j" value="true" />
                                         <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
-                                        <ref role="1Y3XeK" to="ie8e:2ev$9JFHDMZ" resolve="TreeFormWalk.IdleWalker" />
+                                        <ref role="1Y3XeK" to="6exd:2ev$9JFHDMZ" resolve="TreeFormWalk.IdleWalker" />
                                         <node concept="3Tm1VV" id="5rhZO$TZT6T" role="1B3o_S" />
                                         <node concept="3clFb_" id="5rhZO$TZT6U" role="jymVt">
                                           <property role="1EzhhJ" value="false" />
                                           <property role="TrG5h" value="walkValues" />
                                           <node concept="3uibUv" id="5rhZO$TZT6V" role="3clF45">
-                                            <ref role="3uigEE" to="ie8e:2q_78a95hAL" resolve="Action" />
+                                            <ref role="3uigEE" to="6exd:2q_78a95hAL" resolve="Action" />
                                           </node>
                                           <node concept="3Tm1VV" id="5rhZO$TZT6W" role="1B3o_S" />
                                           <node concept="16euLQ" id="5rhZO$TZT6X" role="16eVyc">
@@ -1977,14 +1977,14 @@
                                                   <ref role="3cqZAo" node="5rhZO$TZT7x" resolve="valb" />
                                                 </node>
                                                 <node concept="liA8E" id="5rhZO$TZT7t" role="2OqNvi">
-                                                  <ref role="37wK5l" to="ie8e:5YIOneOMEJi" resolve="values" />
+                                                  <ref role="37wK5l" to="6exd:5YIOneOMEJi" resolve="values" />
                                                 </node>
                                               </node>
                                             </node>
                                             <node concept="3clFbF" id="5rhZO$TZT7u" role="3cqZAp">
                                               <node concept="Rm8GO" id="5rhZO$TZT7v" role="3clFbG">
-                                                <ref role="Rm8GQ" to="ie8e:2q_78a95hAN" resolve="CONTINUE" />
-                                                <ref role="1Px2BO" to="ie8e:2q_78a95hAL" resolve="Action" />
+                                                <ref role="Rm8GQ" to="6exd:2q_78a95hAN" resolve="CONTINUE" />
+                                                <ref role="1Px2BO" to="6exd:2q_78a95hAL" resolve="Action" />
                                               </node>
                                             </node>
                                           </node>
@@ -1994,7 +1994,7 @@
                                           <node concept="37vLTG" id="5rhZO$TZT7x" role="3clF46">
                                             <property role="TrG5h" value="valb" />
                                             <node concept="3uibUv" id="5rhZO$TZT7y" role="1tU5fm">
-                                              <ref role="3uigEE" to="ie8e:1msb0mq99GH" resolve="ValueNode" />
+                                              <ref role="3uigEE" to="6exd:1msb0mq99GH" resolve="ValueNode" />
                                               <node concept="16syzq" id="5rhZO$TZT7z" role="11_B2D">
                                                 <ref role="16sUi3" node="5rhZO$TZT6X" resolve="V" />
                                               </node>
@@ -2005,7 +2005,7 @@
                                           <property role="1EzhhJ" value="false" />
                                           <property role="TrG5h" value="walkList" />
                                           <node concept="3uibUv" id="5rhZO$TZT7_" role="3clF45">
-                                            <ref role="3uigEE" to="ie8e:2q_78a95hAL" resolve="Action" />
+                                            <ref role="3uigEE" to="6exd:2q_78a95hAL" resolve="Action" />
                                           </node>
                                           <node concept="3Tm1VV" id="5rhZO$TZT7A" role="1B3o_S" />
                                           <node concept="3clFbS" id="5rhZO$TZT7B" role="3clF47">
@@ -2074,7 +2074,7 @@
                                               <node concept="3cpWsn" id="5rhZO$TZT82" role="1Duv9x">
                                                 <property role="TrG5h" value="a" />
                                                 <node concept="3uibUv" id="5rhZO$TZT83" role="1tU5fm">
-                                                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                                                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                                                 </node>
                                               </node>
                                               <node concept="2OqwBi" id="5rhZO$TZT84" role="1DdaDG">
@@ -2082,14 +2082,14 @@
                                                   <ref role="3cqZAo" node="5rhZO$TZT8a" resolve="listb" />
                                                 </node>
                                                 <node concept="liA8E" id="5rhZO$TZT86" role="2OqNvi">
-                                                  <ref role="37wK5l" to="ie8e:5YIOneOT0Zn" resolve="contents" />
+                                                  <ref role="37wK5l" to="6exd:5YIOneOT0Zn" resolve="contents" />
                                                 </node>
                                               </node>
                                             </node>
                                             <node concept="3clFbF" id="5rhZO$TZT87" role="3cqZAp">
                                               <node concept="Rm8GO" id="5rhZO$TZT88" role="3clFbG">
-                                                <ref role="Rm8GQ" to="ie8e:2q_78a95hAN" resolve="CONTINUE" />
-                                                <ref role="1Px2BO" to="ie8e:2q_78a95hAL" resolve="Action" />
+                                                <ref role="Rm8GQ" to="6exd:2q_78a95hAN" resolve="CONTINUE" />
+                                                <ref role="1Px2BO" to="6exd:2q_78a95hAL" resolve="Action" />
                                               </node>
                                             </node>
                                           </node>
@@ -2099,7 +2099,7 @@
                                           <node concept="37vLTG" id="5rhZO$TZT8a" role="3clF46">
                                             <property role="TrG5h" value="listb" />
                                             <node concept="3uibUv" id="5rhZO$TZT8b" role="1tU5fm">
-                                              <ref role="3uigEE" to="ie8e:3OPtF03lco4" resolve="ListNode" />
+                                              <ref role="3uigEE" to="6exd:3OPtF03lco4" resolve="ListNode" />
                                             </node>
                                           </node>
                                         </node>
@@ -2109,14 +2109,14 @@
                                 </node>
                               </node>
                               <node concept="liA8E" id="5rhZO$TZT8c" role="2OqNvi">
-                                <ref role="37wK5l" to="ie8e:1hOy_Afq63K" resolve="walk" />
+                                <ref role="37wK5l" to="6exd:1hOy_Afq63K" resolve="walk" />
                                 <node concept="1eOMI4" id="5rhZO$TZT8d" role="37wK5m">
                                   <node concept="10QFUN" id="5rhZO$TZT8e" role="1eOMHV">
                                     <node concept="37vLTw" id="5rhZO$TZT8f" role="10QFUP">
                                       <ref role="3cqZAo" node="5rhZO$TZT8h" resolve="arg" />
                                     </node>
                                     <node concept="3uibUv" id="5rhZO$TZT8g" role="10QFUM">
-                                      <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                                      <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                                     </node>
                                   </node>
                                 </node>
diff --git a/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/solver.mps b/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/solver.mps
index c92fba8f..6524fdc1 100644
--- a/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/solver.mps
+++ b/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/solver.mps
@@ -10,7 +10,7 @@
     <import index="qrld" ref="r:2a79c8aa-e372-4c00-8d71-5d7f3db517e4(jetbrains.mps.logic.reactor.evaluation)" />
     <import index="rchb" ref="r:f43ee4a0-488a-425a-87a0-594ab3b0d15f(jetbrains.mps.logic.reactor.program)" />
     <import index="45ys" ref="r:7365f7fe-12e6-4229-8901-f6dc6d5df03f(jetbrains.mps.logic.reactor.logical)" />
-    <import index="yt73" ref="7526e0cf-1ce7-46f8-a555-9eca1e06c23b/java:jetbrains.mps.unification(jetbrains.mps.logic.atom/)" />
+    <import index="yt73" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.unification(jetbrains.mps.logic.reactor/)" />
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
     <import index="cxk7" ref="r:daa544a7-0a5c-49c0-a54c-4c2a5b4868aa(jetbrains.mps.logic.builtin.predicate)" />
   </imports>
diff --git a/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/unification.mps b/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/unification.mps
index bdf38860..d4f979b2 100644
--- a/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/unification.mps
+++ b/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/unification.mps
@@ -7,10 +7,10 @@
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
-    <import index="ie8e" ref="r:ab2605ab-b4bc-4e80-a8ca-19a4a8465c01(jetbrains.mps.logic.atom)" />
-    <import index="yt73" ref="7526e0cf-1ce7-46f8-a555-9eca1e06c23b/java:jetbrains.mps.unification(jetbrains.mps.logic.atom/)" />
+    <import index="yt73" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.unification(jetbrains.mps.logic.reactor/)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
     <import index="45ys" ref="r:7365f7fe-12e6-4229-8901-f6dc6d5df03f(jetbrains.mps.logic.reactor.logical)" />
+    <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.treeform)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -173,7 +173,7 @@
       <node concept="3Tm1VV" id="7HUwyZbdNAg" role="1B3o_S" />
       <node concept="3clFbS" id="7HUwyZbdNAh" role="3clF47">
         <node concept="XkiVB" id="7HUwyZbdOUD" role="3cqZAp">
-          <ref role="37wK5l" to="ie8e:uNmovXiEVu" resolve="Variable" />
+          <ref role="37wK5l" to="6exd:uNmovXiEVu" resolve="Variable" />
           <node concept="37vLTw" id="7HUwyZbdOWP" role="37wK5m">
             <ref role="3cqZAo" node="7HUwyZbdNBn" resolve="metaLogical" />
           </node>
@@ -256,7 +256,7 @@
           <ref role="3uigEE" to="wyt6:~Class" resolve="Class" />
           <node concept="3qUE_q" id="7HUwyZbdPnr" role="11_B2D">
             <node concept="3uibUv" id="7HUwyZbdPns" role="3qUE_r">
-              <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+              <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
             </node>
           </node>
         </node>
@@ -314,7 +314,7 @@
     <node concept="2tJIrI" id="4sSe4$psb5H" role="jymVt" />
     <node concept="3Tm1VV" id="7HUwyZbdMWI" role="1B3o_S" />
     <node concept="3uibUv" id="7HUwyZbdN_j" role="1zkMxy">
-      <ref role="3uigEE" to="ie8e:uNmovXiEd4" resolve="Variable" />
+      <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
     </node>
     <node concept="312cEg" id="7HUwyZbdNB$" role="jymVt">
       <property role="TrG5h" value="metaLogical" />
@@ -352,7 +352,7 @@
       <node concept="3Tm1VV" id="4TCblo5ML4L" role="1B3o_S" />
       <node concept="3clFbS" id="4TCblo5ML4M" role="3clF47">
         <node concept="XkiVB" id="4TCblo5MOl_" role="3cqZAp">
-          <ref role="37wK5l" to="ie8e:uNmovXiEVu" resolve="Variable" />
+          <ref role="37wK5l" to="6exd:uNmovXiEVu" resolve="Variable" />
           <node concept="37vLTw" id="4TCblo5MOwN" role="37wK5m">
             <ref role="3cqZAo" node="4TCblo5MNMf" resolve="logical" />
           </node>
@@ -538,7 +538,7 @@
           <ref role="3uigEE" to="wyt6:~Class" resolve="Class" />
           <node concept="3qUE_q" id="4TCblo5MWaF" role="11_B2D">
             <node concept="3uibUv" id="4TCblo5MWaG" role="3qUE_r">
-              <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+              <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
             </node>
           </node>
         </node>
@@ -722,7 +722,7 @@
     </node>
     <node concept="3Tm1VV" id="4TCblo5MJ1n" role="1B3o_S" />
     <node concept="3uibUv" id="4TCblo5MK_c" role="1zkMxy">
-      <ref role="3uigEE" to="ie8e:uNmovXiEd4" resolve="Variable" />
+      <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
     </node>
     <node concept="3uibUv" id="4TCblo5MKQV" role="EKbjA">
       <ref role="3uigEE" to="45ys:46l0wJhtOD_" resolve="LogicalOwner" />
@@ -766,12 +766,12 @@
                     <ref role="3cqZAo" node="3FIATxbQg$y" resolve="term" />
                   </node>
                   <node concept="3uibUv" id="3FIATxbQg$J" role="10QFUM">
-                    <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                    <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                   </node>
                 </node>
               </node>
               <node concept="liA8E" id="3FIATxbQg$K" role="2OqNvi">
-                <ref role="37wK5l" to="ie8e:2QE4RCGndD7" resolve="asRoot" />
+                <ref role="37wK5l" to="6exd:2QE4RCGndD7" resolve="asRoot" />
               </node>
             </node>
             <node concept="16syzq" id="3FIATxbQg$L" role="10QFUM">
diff --git a/logic/solutions/jetbrains.mps.logic.atom/models/jetbrains/mps/logic/atom.mps b/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/treeform.mps
similarity index 99%
rename from logic/solutions/jetbrains.mps.logic.atom/models/jetbrains/mps/logic/atom.mps
rename to logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/treeform.mps
index 56ad0b5c..a66571b8 100644
--- a/logic/solutions/jetbrains.mps.logic.atom/models/jetbrains/mps/logic/atom.mps
+++ b/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/treeform.mps
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:ab2605ab-b4bc-4e80-a8ca-19a4a8465c01(jetbrains.mps.logic.atom)">
+<model ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.treeform)">
   <persistence version="9" />
   <languages>
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="4" />
   </languages>
   <imports>
-    <import index="yt73" ref="7526e0cf-1ce7-46f8-a555-9eca1e06c23b/java:jetbrains.mps.unification(jetbrains.mps.logic.atom/)" />
+    <import index="yt73" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.unification(jetbrains.mps.logic.reactor/)" />
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
     <import index="ni5j" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.regex(JDK/)" />
diff --git a/logic/solutions/jetbrains.mps.logic.atom/jetbrains.mps.logic.atom.msd b/logic/solutions/jetbrains.mps.logic.atom/jetbrains.mps.logic.atom.msd
deleted file mode 100644
index 07fc6e72..00000000
--- a/logic/solutions/jetbrains.mps.logic.atom/jetbrains.mps.logic.atom.msd
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<solution name="jetbrains.mps.logic.atom" uuid="7526e0cf-1ce7-46f8-a555-9eca1e06c23b" moduleVersion="0" compileInMPS="true">
-  <models>
-    <modelRoot contentPath="${module}" type="default">
-      <sourceRoot location="models" />
-    </modelRoot>
-    <modelRoot contentPath="${module}" type="java_classes">
-      <sourceRoot location="lib/unification-lib-1.0.2.jar" />
-    </modelRoot>
-  </models>
-  <stubModelEntries>
-    <stubModelEntry path="${module}/lib/unification-lib-1.0.2.jar" />
-  </stubModelEntries>
-  <sourcePath />
-  <dependencies>
-    <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
-  </dependencies>
-  <usedDevKits>
-    <usedDevKit>fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)</usedDevKit>
-  </usedDevKits>
-  <languageVersions>
-    <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="4" />
-    <language slang="l:ed6d7656-532c-4bc2-81d1-af945aeb8280:jetbrains.mps.baseLanguage.blTypes" version="0" />
-    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
-    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
-    <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
-  </languageVersions>
-  <dependencyVersions>
-    <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
-    <module reference="7526e0cf-1ce7-46f8-a555-9eca1e06c23b(jetbrains.mps.logic.atom)" version="0" />
-  </dependencyVersions>
-</solution>
-
diff --git a/logic/solutions/jetbrains.mps.logic.reactor/jetbrains.mps.logic.reactor.msd b/logic/solutions/jetbrains.mps.logic.reactor/jetbrains.mps.logic.reactor.msd
index 1b222f6a..fa34b763 100644
--- a/logic/solutions/jetbrains.mps.logic.reactor/jetbrains.mps.logic.reactor.msd
+++ b/logic/solutions/jetbrains.mps.logic.reactor/jetbrains.mps.logic.reactor.msd
@@ -6,6 +6,7 @@
     </modelRoot>
     <modelRoot contentPath="${module}" type="java_classes">
       <sourceRoot location="lib/memreactor-core-0.1.jar" />
+      <sourceRoot location="lib/unification-lib-1.0.2.jar" />
     </modelRoot>
   </models>
   <stubModelEntries>
@@ -14,12 +15,12 @@
     <stubModelEntry path="${module}/lib/google-collections-1.0.jar" />
     <stubModelEntry path="${module}/lib/kotlin-runtime-1.0.0-rc-1050.jar" />
     <stubModelEntry path="${module}/lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
+    <stubModelEntry path="${module}/lib/unification-lib-1.0.2.jar" />
   </stubModelEntries>
   <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
-    <dependency reexport="false">7526e0cf-1ce7-46f8-a555-9eca1e06c23b(jetbrains.mps.logic.atom)</dependency>
     <dependency reexport="false">498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)</dependency>
   </dependencies>
   <languageVersions>
@@ -36,7 +37,6 @@
     <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
     <module reference="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" version="0" />
     <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
-    <module reference="7526e0cf-1ce7-46f8-a555-9eca1e06c23b(jetbrains.mps.logic.atom)" version="0" />
     <module reference="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" version="0" />
   </dependencyVersions>
 </solution>
diff --git a/logic/solutions/jetbrains.mps.logic.reactor/models/jetbrains/mps/logic/reactor/logical.mps b/logic/solutions/jetbrains.mps.logic.reactor/models/jetbrains/mps/logic/reactor/logical.mps
index a65b704e..18fdd347 100644
--- a/logic/solutions/jetbrains.mps.logic.reactor/models/jetbrains/mps/logic/reactor/logical.mps
+++ b/logic/solutions/jetbrains.mps.logic.reactor/models/jetbrains/mps/logic/reactor/logical.mps
@@ -7,7 +7,7 @@
   </languages>
   <imports>
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
-    <import index="yt73" ref="7526e0cf-1ce7-46f8-a555-9eca1e06c23b/java:jetbrains.mps.unification(jetbrains.mps.logic.atom/)" />
+    <import index="yt73" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.unification(jetbrains.mps.logic.reactor/)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
   </imports>
   <registry>
@@ -1071,7 +1071,7 @@
       <node concept="3clFbS" id="6MYr6JwAOE0" role="3clF47" />
       <node concept="16euLQ" id="6MYr6JwB0_J" role="16eVyc">
         <property role="TrG5h" value="TERM" />
-        <node concept="3uibUv" id="6MYr6JwB0G$" role="3ztrMU">
+        <node concept="3uibUv" id="7IX7qCc9wOJ" role="3ztrMU">
           <ref role="3uigEE" to="yt73:~Term" resolve="Term" />
         </node>
       </node>
@@ -1096,7 +1096,7 @@
       <node concept="3clFbS" id="6MYr6JwAPxK" role="3clF47" />
       <node concept="16euLQ" id="6MYr6JwAQYt" role="16eVyc">
         <property role="TrG5h" value="TERM" />
-        <node concept="3uibUv" id="6MYr6JwAQYZ" role="3ztrMU">
+        <node concept="3uibUv" id="7IX7qCc9wRy" role="3ztrMU">
           <ref role="3uigEE" to="yt73:~Term" resolve="Term" />
         </node>
       </node>
@@ -1107,7 +1107,7 @@
       <property role="TrG5h" value="isLogical" />
       <node concept="37vLTG" id="6MYr6JwRKNo" role="3clF46">
         <property role="TrG5h" value="term" />
-        <node concept="3uibUv" id="6MYr6JwRKRJ" role="1tU5fm">
+        <node concept="3uibUv" id="7IX7qCc9wSf" role="1tU5fm">
           <ref role="3uigEE" to="yt73:~Term" resolve="Term" />
         </node>
       </node>
diff --git a/logic/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/logical@tests.mps b/logic/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/logical@tests.mps
index 0c2cdc11..04d77ae1 100644
--- a/logic/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/logical@tests.mps
+++ b/logic/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/logical@tests.mps
@@ -10,13 +10,13 @@
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
-    <import index="ie8e" ref="r:ab2605ab-b4bc-4e80-a8ca-19a4a8465c01(jetbrains.mps.logic.atom)" />
     <import index="n4y8" ref="b189d6c6-9397-4d64-88af-1ac73760a4f5/java:org.mockito(jetbrains.mps.logic.test/)" />
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
     <import index="45ys" ref="r:7365f7fe-12e6-4229-8901-f6dc6d5df03f(jetbrains.mps.logic.reactor.logical)" />
     <import index="zx3l" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.core(jetbrains.mps.logic.reactor/)" />
     <import index="98" ref="b189d6c6-9397-4d64-88af-1ac73760a4f5/java:org.mockito.stubbing(jetbrains.mps.logic.test/)" />
+    <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.treeform)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -203,7 +203,7 @@
     <node concept="3clFb_" id="2ev$9JFEJ94" role="jymVt">
       <property role="TrG5h" value="anyValues" />
       <node concept="3uibUv" id="2ev$9JFEJ95" role="3clF45">
-        <ref role="3uigEE" to="ie8e:1msb0mq99GH" resolve="ValueNode" />
+        <ref role="3uigEE" to="6exd:1msb0mq99GH" resolve="ValueNode" />
         <node concept="16syzq" id="2ev$9JFEJ96" role="11_B2D">
           <ref role="16sUi3" node="2ev$9JFEJ9e" resolve="T" />
         </node>
@@ -213,7 +213,7 @@
         <node concept="3clFbF" id="2ev$9JFEJ99" role="3cqZAp">
           <node concept="10QFUN" id="2ev$9JFEJ9a" role="3clFbG">
             <node concept="3uibUv" id="2ev$9JFEJ9b" role="10QFUM">
-              <ref role="3uigEE" to="ie8e:1msb0mq99GH" resolve="ValueNode" />
+              <ref role="3uigEE" to="6exd:1msb0mq99GH" resolve="ValueNode" />
               <node concept="16syzq" id="2ev$9JFEJ9c" role="11_B2D">
                 <ref role="16sUi3" node="2ev$9JFEJ9e" resolve="T" />
               </node>
@@ -233,7 +233,7 @@
     <node concept="3clFb_" id="6MYr6JxszW1" role="jymVt">
       <property role="TrG5h" value="anyValue" />
       <node concept="3uibUv" id="6MYr6JxszW2" role="3clF45">
-        <ref role="3uigEE" to="ie8e:2xQ7eRAD2dj" resolve="Value" />
+        <ref role="3uigEE" to="6exd:2xQ7eRAD2dj" resolve="Value" />
         <node concept="16syzq" id="6MYr6JxszW3" role="11_B2D">
           <ref role="16sUi3" node="6MYr6JxszWb" resolve="T" />
         </node>
@@ -243,7 +243,7 @@
         <node concept="3clFbF" id="6MYr6JxszW6" role="3cqZAp">
           <node concept="10QFUN" id="6MYr6JxszW7" role="3clFbG">
             <node concept="3uibUv" id="6MYr6JxszW8" role="10QFUM">
-              <ref role="3uigEE" to="ie8e:2xQ7eRAD2dj" resolve="Value" />
+              <ref role="3uigEE" to="6exd:2xQ7eRAD2dj" resolve="Value" />
               <node concept="16syzq" id="6MYr6JxszW9" role="11_B2D">
                 <ref role="16sUi3" node="6MYr6JxszWb" resolve="T" />
               </node>
@@ -263,14 +263,14 @@
     <node concept="3clFb_" id="2ev$9JFEEfC" role="jymVt">
       <property role="TrG5h" value="anyTerms" />
       <node concept="3uibUv" id="2ev$9JFEFFy" role="3clF45">
-        <ref role="3uigEE" to="ie8e:5JQSuNswOXL" resolve="CompositeNode" />
+        <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="CompositeNode" />
       </node>
       <node concept="3Tm1VV" id="2ev$9JFEEfF" role="1B3o_S" />
       <node concept="3clFbS" id="2ev$9JFEEfG" role="3clF47">
         <node concept="3clFbF" id="2ev$9JFEGHn" role="3cqZAp">
           <node concept="10QFUN" id="2ev$9JFEGHp" role="3clFbG">
             <node concept="3uibUv" id="2ev$9JFEGHq" role="10QFUM">
-              <ref role="3uigEE" to="ie8e:5JQSuNswOXL" resolve="CompositeNode" />
+              <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="CompositeNode" />
             </node>
             <node concept="2YIFZM" id="2ev$9JFEGHr" role="10QFUP">
               <ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
@@ -284,14 +284,14 @@
     <node concept="3clFb_" id="2ev$9JFEHV1" role="jymVt">
       <property role="TrG5h" value="anyList" />
       <node concept="3uibUv" id="2ev$9JFEHV2" role="3clF45">
-        <ref role="3uigEE" to="ie8e:3OPtF03lco4" resolve="ListNode" />
+        <ref role="3uigEE" to="6exd:3OPtF03lco4" resolve="ListNode" />
       </node>
       <node concept="3Tm1VV" id="2ev$9JFEHV4" role="1B3o_S" />
       <node concept="3clFbS" id="2ev$9JFEHV5" role="3clF47">
         <node concept="3clFbF" id="2ev$9JFEHV6" role="3cqZAp">
           <node concept="10QFUN" id="2ev$9JFEHV7" role="3clFbG">
             <node concept="3uibUv" id="2ev$9JFEHV8" role="10QFUM">
-              <ref role="3uigEE" to="ie8e:3OPtF03lco4" resolve="ListNode" />
+              <ref role="3uigEE" to="6exd:3OPtF03lco4" resolve="ListNode" />
             </node>
             <node concept="2YIFZM" id="2ev$9JFEHVa" role="10QFUP">
               <ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
@@ -306,7 +306,7 @@
       <property role="TrG5h" value="anyTreeFormArray" />
       <node concept="10Q1$e" id="2ev$9JFF0S3" role="3clF45">
         <node concept="3uibUv" id="2ev$9JFF0R$" role="10Q1$1">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="3Tm1VV" id="2ev$9JFF0nR" role="1B3o_S" />
@@ -315,7 +315,7 @@
           <node concept="10QFUN" id="2ev$9JFF1GW" role="3clFbG">
             <node concept="10Q1$e" id="2ev$9JFF1GX" role="10QFUM">
               <node concept="3uibUv" id="2ev$9JFF1GY" role="10Q1$1">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
             </node>
             <node concept="2YIFZM" id="2ev$9JFF1GZ" role="10QFUP">
@@ -333,7 +333,7 @@
         <ref role="3uigEE" to="33ny:~List" resolve="List" />
         <node concept="3qUE_q" id="5YVX0wIlh5r" role="11_B2D">
           <node concept="3uibUv" id="5YVX0wIlh7_" role="3qUE_r">
-            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+            <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
           </node>
         </node>
       </node>
@@ -349,7 +349,7 @@
               <ref role="3uigEE" to="33ny:~List" resolve="List" />
               <node concept="3qUE_q" id="5YVX0wIlhe6" role="11_B2D">
                 <node concept="3uibUv" id="5YVX0wIlhe7" role="3qUE_r">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
             </node>
@@ -414,7 +414,7 @@
       <node concept="16euLQ" id="6MYr6Jxs5Fh" role="16eVyc">
         <property role="TrG5h" value="T" />
         <node concept="3uibUv" id="6MYr6Jxs631" role="3ztrMU">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
     </node>
@@ -424,18 +424,18 @@
       <node concept="37vLTG" id="5YVX0wIlmGv" role="3clF46">
         <property role="TrG5h" value="root" />
         <node concept="3uibUv" id="5YVX0wIlmGw" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="3uibUv" id="5YVX0wIlo0b" role="3clF45">
-        <ref role="3uigEE" to="ie8e:3OPtF03lco4" resolve="ListNode" />
+        <ref role="3uigEE" to="6exd:3OPtF03lco4" resolve="ListNode" />
       </node>
       <node concept="3Tm1VV" id="5YVX0wIlmGy" role="1B3o_S" />
       <node concept="3clFbS" id="5YVX0wIlmGz" role="3clF47">
         <node concept="3clFbF" id="5YVX0wIlmG$" role="3cqZAp">
           <node concept="10QFUN" id="5YVX0wIlmG_" role="3clFbG">
             <node concept="3uibUv" id="5YVX0wIlo0W" role="10QFUM">
-              <ref role="3uigEE" to="ie8e:3OPtF03lco4" resolve="ListNode" />
+              <ref role="3uigEE" to="6exd:3OPtF03lco4" resolve="ListNode" />
             </node>
             <node concept="2YIFZM" id="5YVX0wIlmGB" role="10QFUP">
               <ref role="37wK5l" to="n4y8:~Matchers.eq(java.lang.Object):java.lang.Object" resolve="eq" />
@@ -454,11 +454,11 @@
       <node concept="37vLTG" id="2ev$9JFFaOy" role="3clF46">
         <property role="TrG5h" value="root" />
         <node concept="3uibUv" id="2ev$9JFFaOz" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="3uibUv" id="2ev$9JFFaO_" role="3clF45">
-        <ref role="3uigEE" to="ie8e:1msb0mq99GH" resolve="ValueNode" />
+        <ref role="3uigEE" to="6exd:1msb0mq99GH" resolve="ValueNode" />
         <node concept="16syzq" id="2ev$9JFFaOA" role="11_B2D">
           <ref role="16sUi3" node="2ev$9JFFaOJ" resolve="T" />
         </node>
@@ -468,7 +468,7 @@
         <node concept="3clFbF" id="2ev$9JFFaOD" role="3cqZAp">
           <node concept="10QFUN" id="2ev$9JFFaOE" role="3clFbG">
             <node concept="3uibUv" id="2ev$9JFFaOF" role="10QFUM">
-              <ref role="3uigEE" to="ie8e:1msb0mq99GH" resolve="ValueNode" />
+              <ref role="3uigEE" to="6exd:1msb0mq99GH" resolve="ValueNode" />
               <node concept="16syzq" id="2ev$9JFFaOG" role="11_B2D">
                 <ref role="16sUi3" node="2ev$9JFFaOJ" resolve="T" />
               </node>
@@ -498,7 +498,7 @@
             <node concept="3cpWsn" id="2ev$9JFBKEx" role="3cpWs9">
               <property role="TrG5h" value="tf" />
               <node concept="3uibUv" id="2ev$9JFBKEy" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="2ev$9JFBKEz" role="33vP2m">
                 <node concept="1oi5UN" id="2ev$9JFBKE$" role="1oi0x0" />
@@ -510,13 +510,13 @@
             <node concept="3cpWsn" id="2ev$9JFBNlS" role="3cpWs9">
               <property role="TrG5h" value="mock" />
               <node concept="3uibUv" id="2ev$9JFBNlQ" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:3JgCwkqiP3h" resolve="TreeFormWalk.Walker" />
+                <ref role="3uigEE" to="6exd:3JgCwkqiP3h" resolve="TreeFormWalk.Walker" />
               </node>
               <node concept="2YIFZM" id="2ev$9JFBNlT" role="33vP2m">
                 <ref role="37wK5l" to="n4y8:~Mockito.mock(java.lang.Class):java.lang.Object" resolve="mock" />
                 <ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
                 <node concept="3VsKOn" id="2ev$9JFBNlU" role="37wK5m">
-                  <ref role="3VsUkX" to="ie8e:3JgCwkqiP3h" resolve="TreeFormWalk.Walker" />
+                  <ref role="3VsUkX" to="6exd:3JgCwkqiP3h" resolve="TreeFormWalk.Walker" />
                 </node>
               </node>
             </node>
@@ -531,7 +531,7 @@
                     <ref role="3cqZAo" node="2ev$9JFBNlS" resolve="mock" />
                   </node>
                   <node concept="liA8E" id="2ev$9JFD_nP" role="2OqNvi">
-                    <ref role="37wK5l" to="ie8e:3JgCwkqiP3p" resolve="walkTerms" />
+                    <ref role="37wK5l" to="6exd:3JgCwkqiP3p" resolve="walkTerms" />
                     <node concept="1rXfSq" id="2ev$9JFEITF" role="37wK5m">
                       <ref role="37wK5l" node="2ev$9JFEEfC" resolve="anyTerms" />
                     </node>
@@ -541,8 +541,8 @@
               <node concept="liA8E" id="2ev$9JFDA_w" role="2OqNvi">
                 <ref role="37wK5l" to="98:~OngoingStubbing.thenReturn(java.lang.Object):org.mockito.stubbing.OngoingStubbing" resolve="thenReturn" />
                 <node concept="Rm8GO" id="2ev$9JFDAMR" role="37wK5m">
-                  <ref role="Rm8GQ" to="ie8e:2q_78a95hAO" resolve="STOP" />
-                  <ref role="1Px2BO" to="ie8e:2q_78a95hAL" resolve="Action" />
+                  <ref role="Rm8GQ" to="6exd:2q_78a95hAO" resolve="STOP" />
+                  <ref role="1Px2BO" to="6exd:2q_78a95hAL" resolve="Action" />
                 </node>
               </node>
             </node>
@@ -552,14 +552,14 @@
             <node concept="2OqwBi" id="2ev$9JFBL8Z" role="3clFbG">
               <node concept="2ShNRf" id="2ev$9JFCM5m" role="2Oq$k0">
                 <node concept="1pGfFk" id="2ev$9JFCM5n" role="2ShVmc">
-                  <ref role="37wK5l" to="ie8e:47nvOnTQN6Q" resolve="TreeFormWalk" />
+                  <ref role="37wK5l" to="6exd:47nvOnTQN6Q" resolve="TreeFormWalk" />
                   <node concept="37vLTw" id="2ev$9JFCM5o" role="37wK5m">
                     <ref role="3cqZAo" node="2ev$9JFBNlS" resolve="mock" />
                   </node>
                 </node>
               </node>
               <node concept="liA8E" id="2ev$9JFBLg6" role="2OqNvi">
-                <ref role="37wK5l" to="ie8e:1hOy_Afq63K" resolve="walk" />
+                <ref role="37wK5l" to="6exd:1hOy_Afq63K" resolve="walk" />
                 <node concept="37vLTw" id="2ev$9JFBLgX" role="37wK5m">
                   <ref role="3cqZAo" node="2ev$9JFBKEx" resolve="tf" />
                 </node>
@@ -577,10 +577,10 @@
                 </node>
               </node>
               <node concept="liA8E" id="2ev$9JFD93F" role="2OqNvi">
-                <ref role="37wK5l" to="ie8e:3JgCwkqiP3p" resolve="walkTerms" />
+                <ref role="37wK5l" to="6exd:3JgCwkqiP3p" resolve="walkTerms" />
                 <node concept="10QFUN" id="2ev$9JFDJDT" role="37wK5m">
                   <node concept="3uibUv" id="5cGCTtqzhLw" role="10QFUM">
-                    <ref role="3uigEE" to="ie8e:5JQSuNswOXL" resolve="CompositeNode" />
+                    <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="CompositeNode" />
                   </node>
                   <node concept="2YIFZM" id="2ev$9JFDJDP" role="10QFUP">
                     <ref role="37wK5l" to="n4y8:~Matchers.eq(java.lang.Object):java.lang.Object" resolve="eq" />
@@ -611,7 +611,7 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="2ev$9JFCNyC" role="2OqNvi">
-                  <ref role="37wK5l" to="ie8e:5s497Vr3IZm" resolve="endWalk" />
+                  <ref role="37wK5l" to="6exd:5s497Vr3IZm" resolve="endWalk" />
                 </node>
               </node>
             </node>
@@ -628,7 +628,7 @@
             <node concept="3cpWsn" id="2ev$9JFE0Mu" role="3cpWs9">
               <property role="TrG5h" value="val" />
               <node concept="3uibUv" id="2ev$9JFE0Mv" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="2ev$9JFE10R" role="33vP2m">
                 <node concept="1oi5Wm" id="2ev$9JFE11a" role="1oi0x0">
@@ -644,11 +644,11 @@
             <node concept="3cpWsn" id="2ev$9JFDTTZ" role="3cpWs9">
               <property role="TrG5h" value="cn" />
               <node concept="3uibUv" id="6MYr6JxshWa" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:5JQSuNswOXL" resolve="CompositeNode" />
+                <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="CompositeNode" />
               </node>
               <node concept="10QFUN" id="6MYr6JxshYq" role="33vP2m">
                 <node concept="3uibUv" id="6MYr6JxshYj" role="10QFUM">
-                  <ref role="3uigEE" to="ie8e:5JQSuNswOXL" resolve="CompositeNode" />
+                  <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="CompositeNode" />
                 </node>
                 <node concept="1oi1Uc" id="6MYr6JxshYk" role="10QFUP">
                   <node concept="1oi5UN" id="6MYr6JxshYl" role="1oi0x0">
@@ -673,13 +673,13 @@
             <node concept="3cpWsn" id="2ev$9JFDVC6" role="3cpWs9">
               <property role="TrG5h" value="mock" />
               <node concept="3uibUv" id="2ev$9JFDVC7" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:3JgCwkqiP3h" resolve="TreeFormWalk.Walker" />
+                <ref role="3uigEE" to="6exd:3JgCwkqiP3h" resolve="TreeFormWalk.Walker" />
               </node>
               <node concept="2YIFZM" id="2ev$9JFDVC8" role="33vP2m">
                 <ref role="37wK5l" to="n4y8:~Mockito.mock(java.lang.Class):java.lang.Object" resolve="mock" />
                 <ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
                 <node concept="3VsKOn" id="2ev$9JFDVC9" role="37wK5m">
-                  <ref role="3VsUkX" to="ie8e:3JgCwkqiP3h" resolve="TreeFormWalk.Walker" />
+                  <ref role="3VsUkX" to="6exd:3JgCwkqiP3h" resolve="TreeFormWalk.Walker" />
                 </node>
               </node>
             </node>
@@ -694,7 +694,7 @@
                     <ref role="3cqZAo" node="2ev$9JFDVC6" resolve="mock" />
                   </node>
                   <node concept="liA8E" id="2ev$9JFE1bP" role="2OqNvi">
-                    <ref role="37wK5l" to="ie8e:3JgCwkqiP3p" resolve="walkTerms" />
+                    <ref role="37wK5l" to="6exd:3JgCwkqiP3p" resolve="walkTerms" />
                     <node concept="1rXfSq" id="2ev$9JFEHGh" role="37wK5m">
                       <ref role="37wK5l" node="2ev$9JFEEfC" resolve="anyTerms" />
                     </node>
@@ -704,8 +704,8 @@
               <node concept="liA8E" id="2ev$9JFE1bW" role="2OqNvi">
                 <ref role="37wK5l" to="98:~OngoingStubbing.thenReturn(java.lang.Object):org.mockito.stubbing.OngoingStubbing" resolve="thenReturn" />
                 <node concept="Rm8GO" id="2ev$9JFE9Ih" role="37wK5m">
-                  <ref role="Rm8GQ" to="ie8e:2q_78a95hAM" resolve="WALK" />
-                  <ref role="1Px2BO" to="ie8e:2q_78a95hAL" resolve="Action" />
+                  <ref role="Rm8GQ" to="6exd:2q_78a95hAM" resolve="WALK" />
+                  <ref role="1Px2BO" to="6exd:2q_78a95hAL" resolve="Action" />
                 </node>
               </node>
             </node>
@@ -720,7 +720,7 @@
                     <ref role="3cqZAo" node="2ev$9JFDVC6" resolve="mock" />
                   </node>
                   <node concept="liA8E" id="2ev$9JFDVCf" role="2OqNvi">
-                    <ref role="37wK5l" to="ie8e:3JgCwkqiP3$" resolve="walkValues" />
+                    <ref role="37wK5l" to="6exd:3JgCwkqiP3$" resolve="walkValues" />
                     <node concept="1rXfSq" id="2ev$9JFELEF" role="37wK5m">
                       <ref role="37wK5l" node="2ev$9JFEJ94" resolve="anyValues" />
                     </node>
@@ -730,8 +730,8 @@
               <node concept="liA8E" id="2ev$9JFDVCm" role="2OqNvi">
                 <ref role="37wK5l" to="98:~OngoingStubbing.thenReturn(java.lang.Object):org.mockito.stubbing.OngoingStubbing" resolve="thenReturn" />
                 <node concept="Rm8GO" id="2ev$9JFDVCn" role="37wK5m">
-                  <ref role="Rm8GQ" to="ie8e:2q_78a95hAO" resolve="STOP" />
-                  <ref role="1Px2BO" to="ie8e:2q_78a95hAL" resolve="Action" />
+                  <ref role="Rm8GQ" to="6exd:2q_78a95hAO" resolve="STOP" />
+                  <ref role="1Px2BO" to="6exd:2q_78a95hAL" resolve="Action" />
                 </node>
               </node>
             </node>
@@ -741,14 +741,14 @@
             <node concept="2OqwBi" id="2ev$9JFDVCq" role="3clFbG">
               <node concept="2ShNRf" id="2ev$9JFDVCr" role="2Oq$k0">
                 <node concept="1pGfFk" id="2ev$9JFDVCs" role="2ShVmc">
-                  <ref role="37wK5l" to="ie8e:47nvOnTQN6Q" resolve="TreeFormWalk" />
+                  <ref role="37wK5l" to="6exd:47nvOnTQN6Q" resolve="TreeFormWalk" />
                   <node concept="37vLTw" id="2ev$9JFDVCt" role="37wK5m">
                     <ref role="3cqZAo" node="2ev$9JFDVC6" resolve="mock" />
                   </node>
                 </node>
               </node>
               <node concept="liA8E" id="2ev$9JFDVCu" role="2OqNvi">
-                <ref role="37wK5l" to="ie8e:1hOy_Afq63K" resolve="walk" />
+                <ref role="37wK5l" to="6exd:1hOy_Afq63K" resolve="walk" />
                 <node concept="37vLTw" id="2ev$9JFDVCw" role="37wK5m">
                   <ref role="3cqZAo" node="2ev$9JFDTTZ" resolve="cn" />
                 </node>
@@ -766,7 +766,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="2ev$9JFDVCB" role="2OqNvi">
-                <ref role="37wK5l" to="ie8e:3JgCwkqiP3p" resolve="walkTerms" />
+                <ref role="37wK5l" to="6exd:3JgCwkqiP3p" resolve="walkTerms" />
                 <node concept="1rXfSq" id="2ev$9JFFcqm" role="37wK5m">
                   <ref role="37wK5l" node="2ev$9JFF8Wr" resolve="eqTerms" />
                   <node concept="37vLTw" id="2ev$9JFFcx8" role="37wK5m">
@@ -786,7 +786,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="2ev$9JFEwbF" role="2OqNvi">
-                <ref role="37wK5l" to="ie8e:3JgCwkqiP3$" resolve="walkValues" />
+                <ref role="37wK5l" to="6exd:3JgCwkqiP3$" resolve="walkValues" />
                 <node concept="1rXfSq" id="2ev$9JFFcWR" role="37wK5m">
                   <ref role="37wK5l" node="2ev$9JFFaOx" resolve="eqValues" />
                   <node concept="37vLTw" id="2ev$9JFFd2u" role="37wK5m">
@@ -830,7 +830,7 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="2ev$9JFDVCT" role="2OqNvi">
-                  <ref role="37wK5l" to="ie8e:5s497Vr3IZm" resolve="endWalk" />
+                  <ref role="37wK5l" to="6exd:5s497Vr3IZm" resolve="endWalk" />
                 </node>
               </node>
             </node>
@@ -847,7 +847,7 @@
             <node concept="3cpWsn" id="2ev$9JFFvPD" role="3cpWs9">
               <property role="TrG5h" value="val" />
               <node concept="3uibUv" id="2ev$9JFFvPE" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="2ev$9JFFwjN" role="33vP2m">
                 <node concept="1oi5Wm" id="2ev$9JFFwk6" role="1oi0x0">
@@ -863,11 +863,11 @@
             <node concept="3cpWsn" id="2ev$9JFFqmp" role="3cpWs9">
               <property role="TrG5h" value="child" />
               <node concept="3uibUv" id="6MYr6JxshSY" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:5JQSuNswOXL" resolve="CompositeNode" />
+                <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="CompositeNode" />
               </node>
               <node concept="10QFUN" id="6MYr6JxshUH" role="33vP2m">
                 <node concept="3uibUv" id="6MYr6JxshUA" role="10QFUM">
-                  <ref role="3uigEE" to="ie8e:5JQSuNswOXL" resolve="CompositeNode" />
+                  <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="CompositeNode" />
                 </node>
                 <node concept="1oi1Uc" id="6MYr6JxshUB" role="10QFUP">
                   <node concept="1oi5UN" id="6MYr6JxshUC" role="1oi0x0">
@@ -891,11 +891,11 @@
             <node concept="3cpWsn" id="2ev$9JFG2bt" role="3cpWs9">
               <property role="TrG5h" value="role" />
               <node concept="3uibUv" id="6MYr6JxshPC" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:5JQSuNswOXL" resolve="CompositeNode" />
+                <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="CompositeNode" />
               </node>
               <node concept="10QFUN" id="6MYr6JxshL0" role="33vP2m">
                 <node concept="3uibUv" id="6MYr6JxshRj" role="10QFUM">
-                  <ref role="3uigEE" to="ie8e:5JQSuNswOXL" resolve="CompositeNode" />
+                  <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="CompositeNode" />
                 </node>
                 <node concept="1oi1Uc" id="6MYr6JxshKV" role="10QFUP">
                   <node concept="1oi5ST" id="6MYr6JxshKW" role="1oi0x0">
@@ -916,11 +916,11 @@
             <node concept="3cpWsn" id="2ev$9JFFqmv" role="3cpWs9">
               <property role="TrG5h" value="cn" />
               <node concept="3uibUv" id="6MYr6JxshwM" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:5JQSuNswOXL" resolve="CompositeNode" />
+                <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="CompositeNode" />
               </node>
               <node concept="10QFUN" id="6MYr6JxshIN" role="33vP2m">
                 <node concept="3uibUv" id="6MYr6JxshIG" role="10QFUM">
-                  <ref role="3uigEE" to="ie8e:5JQSuNswOXL" resolve="CompositeNode" />
+                  <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="CompositeNode" />
                 </node>
                 <node concept="1oi1Uc" id="6MYr6JxshIH" role="10QFUP">
                   <node concept="1oi5UN" id="6MYr6JxshII" role="1oi0x0">
@@ -944,13 +944,13 @@
             <node concept="3cpWsn" id="2ev$9JFFqmF" role="3cpWs9">
               <property role="TrG5h" value="mock" />
               <node concept="3uibUv" id="2ev$9JFFqmG" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:3JgCwkqiP3h" resolve="TreeFormWalk.Walker" />
+                <ref role="3uigEE" to="6exd:3JgCwkqiP3h" resolve="TreeFormWalk.Walker" />
               </node>
               <node concept="2YIFZM" id="2ev$9JFFqmH" role="33vP2m">
                 <ref role="37wK5l" to="n4y8:~Mockito.mock(java.lang.Class):java.lang.Object" resolve="mock" />
                 <ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
                 <node concept="3VsKOn" id="2ev$9JFFqmI" role="37wK5m">
-                  <ref role="3VsUkX" to="ie8e:3JgCwkqiP3h" resolve="TreeFormWalk.Walker" />
+                  <ref role="3VsUkX" to="6exd:3JgCwkqiP3h" resolve="TreeFormWalk.Walker" />
                 </node>
               </node>
             </node>
@@ -965,7 +965,7 @@
                     <ref role="3cqZAo" node="2ev$9JFFqmF" resolve="mock" />
                   </node>
                   <node concept="liA8E" id="2ev$9JFFqmO" role="2OqNvi">
-                    <ref role="37wK5l" to="ie8e:3JgCwkqiP3p" resolve="walkTerms" />
+                    <ref role="37wK5l" to="6exd:3JgCwkqiP3p" resolve="walkTerms" />
                     <node concept="1rXfSq" id="2ev$9JFFqmP" role="37wK5m">
                       <ref role="37wK5l" node="2ev$9JFEEfC" resolve="anyTerms" />
                     </node>
@@ -975,8 +975,8 @@
               <node concept="liA8E" id="2ev$9JFFqmR" role="2OqNvi">
                 <ref role="37wK5l" to="98:~OngoingStubbing.thenReturn(java.lang.Object):org.mockito.stubbing.OngoingStubbing" resolve="thenReturn" />
                 <node concept="Rm8GO" id="2ev$9JFFqmS" role="37wK5m">
-                  <ref role="Rm8GQ" to="ie8e:2q_78a95hAM" resolve="WALK" />
-                  <ref role="1Px2BO" to="ie8e:2q_78a95hAL" resolve="Action" />
+                  <ref role="Rm8GQ" to="6exd:2q_78a95hAM" resolve="WALK" />
+                  <ref role="1Px2BO" to="6exd:2q_78a95hAL" resolve="Action" />
                 </node>
               </node>
             </node>
@@ -991,7 +991,7 @@
                     <ref role="3cqZAo" node="2ev$9JFFqmF" resolve="mock" />
                   </node>
                   <node concept="liA8E" id="2ev$9JFFqmY" role="2OqNvi">
-                    <ref role="37wK5l" to="ie8e:3JgCwkqiP3$" resolve="walkValues" />
+                    <ref role="37wK5l" to="6exd:3JgCwkqiP3$" resolve="walkValues" />
                     <node concept="1rXfSq" id="2ev$9JFFqmZ" role="37wK5m">
                       <ref role="37wK5l" node="2ev$9JFEJ94" resolve="anyValues" />
                     </node>
@@ -1001,8 +1001,8 @@
               <node concept="liA8E" id="2ev$9JFFqn1" role="2OqNvi">
                 <ref role="37wK5l" to="98:~OngoingStubbing.thenReturn(java.lang.Object):org.mockito.stubbing.OngoingStubbing" resolve="thenReturn" />
                 <node concept="Rm8GO" id="2ev$9JFFqn2" role="37wK5m">
-                  <ref role="Rm8GQ" to="ie8e:2q_78a95hAO" resolve="STOP" />
-                  <ref role="1Px2BO" to="ie8e:2q_78a95hAL" resolve="Action" />
+                  <ref role="Rm8GQ" to="6exd:2q_78a95hAO" resolve="STOP" />
+                  <ref role="1Px2BO" to="6exd:2q_78a95hAL" resolve="Action" />
                 </node>
               </node>
             </node>
@@ -1012,14 +1012,14 @@
             <node concept="2OqwBi" id="2ev$9JFFqn5" role="3clFbG">
               <node concept="2ShNRf" id="2ev$9JFFqn6" role="2Oq$k0">
                 <node concept="1pGfFk" id="2ev$9JFFqn7" role="2ShVmc">
-                  <ref role="37wK5l" to="ie8e:47nvOnTQN6Q" resolve="TreeFormWalk" />
+                  <ref role="37wK5l" to="6exd:47nvOnTQN6Q" resolve="TreeFormWalk" />
                   <node concept="37vLTw" id="2ev$9JFFqn8" role="37wK5m">
                     <ref role="3cqZAo" node="2ev$9JFFqmF" resolve="mock" />
                   </node>
                 </node>
               </node>
               <node concept="liA8E" id="2ev$9JFFqn9" role="2OqNvi">
-                <ref role="37wK5l" to="ie8e:1hOy_Afq63K" resolve="walk" />
+                <ref role="37wK5l" to="6exd:1hOy_Afq63K" resolve="walk" />
                 <node concept="37vLTw" id="2ev$9JFFqnb" role="37wK5m">
                   <ref role="3cqZAo" node="2ev$9JFFqmv" resolve="cn" />
                 </node>
@@ -1037,7 +1037,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="2ev$9JFFqni" role="2OqNvi">
-                <ref role="37wK5l" to="ie8e:3JgCwkqiP3p" resolve="walkTerms" />
+                <ref role="37wK5l" to="6exd:3JgCwkqiP3p" resolve="walkTerms" />
                 <node concept="1rXfSq" id="2ev$9JFFqnj" role="37wK5m">
                   <ref role="37wK5l" node="2ev$9JFF8Wr" resolve="eqTerms" />
                   <node concept="37vLTw" id="2ev$9JFFqnl" role="37wK5m">
@@ -1057,7 +1057,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="2ev$9JFFBtY" role="2OqNvi">
-                <ref role="37wK5l" to="ie8e:3JgCwkqiP3p" resolve="walkTerms" />
+                <ref role="37wK5l" to="6exd:3JgCwkqiP3p" resolve="walkTerms" />
                 <node concept="1rXfSq" id="2ev$9JFFBtZ" role="37wK5m">
                   <ref role="37wK5l" node="2ev$9JFF8Wr" resolve="eqTerms" />
                   <node concept="37vLTw" id="2ev$9JFG3wU" role="37wK5m">
@@ -1077,7 +1077,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="2ev$9JFG0cy" role="2OqNvi">
-                <ref role="37wK5l" to="ie8e:3JgCwkqiP3p" resolve="walkTerms" />
+                <ref role="37wK5l" to="6exd:3JgCwkqiP3p" resolve="walkTerms" />
                 <node concept="1rXfSq" id="2ev$9JFG0cz" role="37wK5m">
                   <ref role="37wK5l" node="2ev$9JFF8Wr" resolve="eqTerms" />
                   <node concept="37vLTw" id="2ev$9JFG0c_" role="37wK5m">
@@ -1097,7 +1097,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="2ev$9JFFqns" role="2OqNvi">
-                <ref role="37wK5l" to="ie8e:3JgCwkqiP3$" resolve="walkValues" />
+                <ref role="37wK5l" to="6exd:3JgCwkqiP3$" resolve="walkValues" />
                 <node concept="1rXfSq" id="2ev$9JFFqnt" role="37wK5m">
                   <ref role="37wK5l" node="2ev$9JFFaOx" resolve="eqValues" />
                   <node concept="37vLTw" id="2ev$9JFFwOg" role="37wK5m">
@@ -1141,7 +1141,7 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="2ev$9JFFqnL" role="2OqNvi">
-                  <ref role="37wK5l" to="ie8e:5s497Vr3IZm" resolve="endWalk" />
+                  <ref role="37wK5l" to="6exd:5s497Vr3IZm" resolve="endWalk" />
                 </node>
               </node>
             </node>
@@ -1157,14 +1157,14 @@
             <node concept="3cpWsn" id="6MYr6Jxs3nk" role="3cpWs9">
               <property role="TrG5h" value="val" />
               <node concept="3uibUv" id="6MYr6Jxsf3D" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:2xQ7eRAD2dj" resolve="Value" />
+                <ref role="3uigEE" to="6exd:2xQ7eRAD2dj" resolve="Value" />
                 <node concept="3uibUv" id="6MYr6Jxsf5R" role="11_B2D">
                   <ref role="3uigEE" to="wyt6:~String" resolve="String" />
                 </node>
               </node>
               <node concept="10QFUN" id="6MYr6Jxsf9K" role="33vP2m">
                 <node concept="3uibUv" id="6MYr6Jxsf9F" role="10QFUM">
-                  <ref role="3uigEE" to="ie8e:2xQ7eRAD2dj" resolve="Value" />
+                  <ref role="3uigEE" to="6exd:2xQ7eRAD2dj" resolve="Value" />
                   <node concept="3uibUv" id="6MYr6Jxsf9G" role="11_B2D">
                     <ref role="3uigEE" to="wyt6:~String" resolve="String" />
                   </node>
@@ -1182,13 +1182,13 @@
             <node concept="3cpWsn" id="6MYr6Jxs3nP" role="3cpWs9">
               <property role="TrG5h" value="mock" />
               <node concept="3uibUv" id="6MYr6Jxs3nQ" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:3JgCwkqiP3h" resolve="TreeFormWalk.Walker" />
+                <ref role="3uigEE" to="6exd:3JgCwkqiP3h" resolve="TreeFormWalk.Walker" />
               </node>
               <node concept="2YIFZM" id="6MYr6Jxs3nR" role="33vP2m">
                 <ref role="37wK5l" to="n4y8:~Mockito.mock(java.lang.Class):java.lang.Object" resolve="mock" />
                 <ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
                 <node concept="3VsKOn" id="6MYr6Jxs3nS" role="37wK5m">
-                  <ref role="3VsUkX" to="ie8e:3JgCwkqiP3h" resolve="TreeFormWalk.Walker" />
+                  <ref role="3VsUkX" to="6exd:3JgCwkqiP3h" resolve="TreeFormWalk.Walker" />
                 </node>
               </node>
             </node>
@@ -1203,7 +1203,7 @@
                     <ref role="3cqZAo" node="6MYr6Jxs3nP" resolve="mock" />
                   </node>
                   <node concept="liA8E" id="6MYr6Jxs3nY" role="2OqNvi">
-                    <ref role="37wK5l" to="ie8e:104EUzFszCc" resolve="walkValue" />
+                    <ref role="37wK5l" to="6exd:104EUzFszCc" resolve="walkValue" />
                     <node concept="1rXfSq" id="6MYr6Jxs3nZ" role="37wK5m">
                       <ref role="37wK5l" node="6MYr6JxszW1" resolve="anyValue" />
                     </node>
@@ -1213,8 +1213,8 @@
               <node concept="liA8E" id="6MYr6Jxs3o0" role="2OqNvi">
                 <ref role="37wK5l" to="98:~OngoingStubbing.thenReturn(java.lang.Object):org.mockito.stubbing.OngoingStubbing" resolve="thenReturn" />
                 <node concept="Rm8GO" id="6MYr6Jxs3o1" role="37wK5m">
-                  <ref role="Rm8GQ" to="ie8e:2q_78a95hAM" resolve="WALK" />
-                  <ref role="1Px2BO" to="ie8e:2q_78a95hAL" resolve="Action" />
+                  <ref role="Rm8GQ" to="6exd:2q_78a95hAM" resolve="WALK" />
+                  <ref role="1Px2BO" to="6exd:2q_78a95hAL" resolve="Action" />
                 </node>
               </node>
             </node>
@@ -1224,14 +1224,14 @@
             <node concept="2OqwBi" id="6MYr6Jxs3od" role="3clFbG">
               <node concept="2ShNRf" id="6MYr6Jxs3oe" role="2Oq$k0">
                 <node concept="1pGfFk" id="6MYr6Jxs3of" role="2ShVmc">
-                  <ref role="37wK5l" to="ie8e:47nvOnTQN6Q" resolve="TreeFormWalk" />
+                  <ref role="37wK5l" to="6exd:47nvOnTQN6Q" resolve="TreeFormWalk" />
                   <node concept="37vLTw" id="6MYr6Jxs3og" role="37wK5m">
                     <ref role="3cqZAo" node="6MYr6Jxs3nP" resolve="mock" />
                   </node>
                 </node>
               </node>
               <node concept="liA8E" id="6MYr6Jxs3oh" role="2OqNvi">
-                <ref role="37wK5l" to="ie8e:1hOy_Afq63K" resolve="walk" />
+                <ref role="37wK5l" to="6exd:1hOy_Afq63K" resolve="walk" />
                 <node concept="37vLTw" id="6MYr6Jxs4zm" role="37wK5m">
                   <ref role="3cqZAo" node="6MYr6Jxs3nk" resolve="val" />
                 </node>
@@ -1249,7 +1249,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="6MYr6Jxs3oo" role="2OqNvi">
-                <ref role="37wK5l" to="ie8e:104EUzFszCc" resolve="walkValue" />
+                <ref role="37wK5l" to="6exd:104EUzFszCc" resolve="walkValue" />
                 <node concept="1rXfSq" id="6MYr6Jxs3op" role="37wK5m">
                   <ref role="37wK5l" node="2ev$9JFF8Wr" resolve="eqTerms" />
                   <node concept="37vLTw" id="6MYr6Jxs4$q" role="37wK5m">
@@ -1293,7 +1293,7 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="6MYr6Jxs3oY" role="2OqNvi">
-                  <ref role="37wK5l" to="ie8e:5s497Vr3IZm" resolve="endWalk" />
+                  <ref role="37wK5l" to="6exd:5s497Vr3IZm" resolve="endWalk" />
                 </node>
               </node>
             </node>
@@ -1310,11 +1310,11 @@
             <node concept="3cpWsn" id="5YVX0wIjZEX" role="3cpWs9">
               <property role="TrG5h" value="first" />
               <node concept="3uibUv" id="6MYr6Jxsln8" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:5JQSuNswOXL" resolve="CompositeNode" />
+                <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="CompositeNode" />
               </node>
               <node concept="10QFUN" id="6MYr6JxsloV" role="33vP2m">
                 <node concept="3uibUv" id="6MYr6JxsloO" role="10QFUM">
-                  <ref role="3uigEE" to="ie8e:5JQSuNswOXL" resolve="CompositeNode" />
+                  <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="CompositeNode" />
                 </node>
                 <node concept="1oi1Uc" id="6MYr6JxsloP" role="10QFUP">
                   <node concept="1oi5UN" id="6MYr6JxsloQ" role="1oi0x0">
@@ -1339,11 +1339,11 @@
             <node concept="3cpWsn" id="5YVX0wIk0aR" role="3cpWs9">
               <property role="TrG5h" value="second" />
               <node concept="3uibUv" id="6MYr6Jxslqr" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:5JQSuNswOXL" resolve="CompositeNode" />
+                <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="CompositeNode" />
               </node>
               <node concept="10QFUN" id="6MYr6JxsluC" role="33vP2m">
                 <node concept="3uibUv" id="6MYr6Jxslux" role="10QFUM">
-                  <ref role="3uigEE" to="ie8e:5JQSuNswOXL" resolve="CompositeNode" />
+                  <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="CompositeNode" />
                 </node>
                 <node concept="1oi1Uc" id="6MYr6Jxsluy" role="10QFUP">
                   <node concept="1oi5UN" id="6MYr6Jxsluz" role="1oi0x0">
@@ -1368,11 +1368,11 @@
             <node concept="3cpWsn" id="5YVX0wIk0rD" role="3cpWs9">
               <property role="TrG5h" value="third" />
               <node concept="3uibUv" id="6MYr6Jxslwq" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:5JQSuNswOXL" resolve="CompositeNode" />
+                <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="CompositeNode" />
               </node>
               <node concept="10QFUN" id="6MYr6Jxslyd" role="33vP2m">
                 <node concept="3uibUv" id="6MYr6Jxsly6" role="10QFUM">
-                  <ref role="3uigEE" to="ie8e:5JQSuNswOXL" resolve="CompositeNode" />
+                  <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="CompositeNode" />
                 </node>
                 <node concept="1oi1Uc" id="6MYr6Jxsly7" role="10QFUP">
                   <node concept="1oi5UN" id="6MYr6Jxsly8" role="1oi0x0">
@@ -1398,7 +1398,7 @@
             <node concept="3cpWsn" id="3t7_2FgLswv" role="3cpWs9">
               <property role="TrG5h" value="list" />
               <node concept="3uibUv" id="3t7_2FgLsww" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="3t7_2FgLsIG" role="33vP2m">
                 <node concept="KCUsM" id="5YVX0wIlrxs" role="1oi0x0">
@@ -1472,7 +1472,7 @@
             <node concept="3cpWsn" id="7t5VLKGALW_" role="3cpWs9">
               <property role="TrG5h" value="toWalk" />
               <node concept="3uibUv" id="7t5VLKGALWA" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="7t5VLKGALWB" role="33vP2m">
                 <node concept="1oi5ST" id="7t5VLKGALWC" role="1oi0x0">
@@ -1494,13 +1494,13 @@
             <node concept="3cpWsn" id="5YVX0wIjRT4" role="3cpWs9">
               <property role="TrG5h" value="mock" />
               <node concept="3uibUv" id="5YVX0wIjRT5" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:3JgCwkqiP3h" resolve="TreeFormWalk.Walker" />
+                <ref role="3uigEE" to="6exd:3JgCwkqiP3h" resolve="TreeFormWalk.Walker" />
               </node>
               <node concept="2YIFZM" id="5YVX0wIjRT6" role="33vP2m">
                 <ref role="37wK5l" to="n4y8:~Mockito.mock(java.lang.Class):java.lang.Object" resolve="mock" />
                 <ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
                 <node concept="3VsKOn" id="5YVX0wIjRT7" role="37wK5m">
-                  <ref role="3VsUkX" to="ie8e:3JgCwkqiP3h" resolve="TreeFormWalk.Walker" />
+                  <ref role="3VsUkX" to="6exd:3JgCwkqiP3h" resolve="TreeFormWalk.Walker" />
                 </node>
               </node>
             </node>
@@ -1515,7 +1515,7 @@
                     <ref role="3cqZAo" node="5YVX0wIjRT4" resolve="mock" />
                   </node>
                   <node concept="liA8E" id="5YVX0wIjRTd" role="2OqNvi">
-                    <ref role="37wK5l" to="ie8e:3JgCwkqiP3p" resolve="walkTerms" />
+                    <ref role="37wK5l" to="6exd:3JgCwkqiP3p" resolve="walkTerms" />
                     <node concept="1rXfSq" id="5YVX0wIjRTe" role="37wK5m">
                       <ref role="37wK5l" node="2ev$9JFEEfC" resolve="anyTerms" />
                     </node>
@@ -1525,8 +1525,8 @@
               <node concept="liA8E" id="5YVX0wIjRTg" role="2OqNvi">
                 <ref role="37wK5l" to="98:~OngoingStubbing.thenReturn(java.lang.Object):org.mockito.stubbing.OngoingStubbing" resolve="thenReturn" />
                 <node concept="Rm8GO" id="5YVX0wIjRTh" role="37wK5m">
-                  <ref role="Rm8GQ" to="ie8e:2q_78a95hAM" resolve="WALK" />
-                  <ref role="1Px2BO" to="ie8e:2q_78a95hAL" resolve="Action" />
+                  <ref role="Rm8GQ" to="6exd:2q_78a95hAM" resolve="WALK" />
+                  <ref role="1Px2BO" to="6exd:2q_78a95hAL" resolve="Action" />
                 </node>
               </node>
             </node>
@@ -1541,7 +1541,7 @@
                     <ref role="3cqZAo" node="5YVX0wIjRT4" resolve="mock" />
                   </node>
                   <node concept="liA8E" id="5YVX0wIleMS" role="2OqNvi">
-                    <ref role="37wK5l" to="ie8e:3JgCwkqmHc0" resolve="walkList" />
+                    <ref role="37wK5l" to="6exd:3JgCwkqmHc0" resolve="walkList" />
                     <node concept="1rXfSq" id="5YVX0wIleMT" role="37wK5m">
                       <ref role="37wK5l" node="2ev$9JFEHV1" resolve="anyList" />
                     </node>
@@ -1551,8 +1551,8 @@
               <node concept="liA8E" id="5YVX0wIleMV" role="2OqNvi">
                 <ref role="37wK5l" to="98:~OngoingStubbing.thenReturn(java.lang.Object):org.mockito.stubbing.OngoingStubbing" resolve="thenReturn" />
                 <node concept="Rm8GO" id="5YVX0wIleMW" role="37wK5m">
-                  <ref role="Rm8GQ" to="ie8e:2q_78a95hAM" resolve="WALK" />
-                  <ref role="1Px2BO" to="ie8e:2q_78a95hAL" resolve="Action" />
+                  <ref role="Rm8GQ" to="6exd:2q_78a95hAM" resolve="WALK" />
+                  <ref role="1Px2BO" to="6exd:2q_78a95hAL" resolve="Action" />
                 </node>
               </node>
             </node>
@@ -1567,7 +1567,7 @@
                     <ref role="3cqZAo" node="5YVX0wIjRT4" resolve="mock" />
                   </node>
                   <node concept="liA8E" id="5YVX0wIlkDZ" role="2OqNvi">
-                    <ref role="37wK5l" to="ie8e:3JgCwkqiP3$" resolve="walkValues" />
+                    <ref role="37wK5l" to="6exd:3JgCwkqiP3$" resolve="walkValues" />
                     <node concept="1rXfSq" id="5YVX0wIlkE0" role="37wK5m">
                       <ref role="37wK5l" node="2ev$9JFEJ94" resolve="anyValues" />
                     </node>
@@ -1577,8 +1577,8 @@
               <node concept="liA8E" id="5YVX0wIlkE2" role="2OqNvi">
                 <ref role="37wK5l" to="98:~OngoingStubbing.thenReturn(java.lang.Object):org.mockito.stubbing.OngoingStubbing" resolve="thenReturn" />
                 <node concept="Rm8GO" id="5YVX0wIlkVS" role="37wK5m">
-                  <ref role="Rm8GQ" to="ie8e:2q_78a95hAN" resolve="CONTINUE" />
-                  <ref role="1Px2BO" to="ie8e:2q_78a95hAL" resolve="Action" />
+                  <ref role="Rm8GQ" to="6exd:2q_78a95hAN" resolve="CONTINUE" />
+                  <ref role="1Px2BO" to="6exd:2q_78a95hAL" resolve="Action" />
                 </node>
               </node>
             </node>
@@ -1588,14 +1588,14 @@
             <node concept="2OqwBi" id="5YVX0wIjRTu" role="3clFbG">
               <node concept="2ShNRf" id="5YVX0wIjRTv" role="2Oq$k0">
                 <node concept="1pGfFk" id="5YVX0wIjRTw" role="2ShVmc">
-                  <ref role="37wK5l" to="ie8e:47nvOnTQN6Q" resolve="TreeFormWalk" />
+                  <ref role="37wK5l" to="6exd:47nvOnTQN6Q" resolve="TreeFormWalk" />
                   <node concept="37vLTw" id="5YVX0wIjRTx" role="37wK5m">
                     <ref role="3cqZAo" node="5YVX0wIjRT4" resolve="mock" />
                   </node>
                 </node>
               </node>
               <node concept="liA8E" id="5YVX0wIjRTy" role="2OqNvi">
-                <ref role="37wK5l" to="ie8e:1hOy_Afq63K" resolve="walk" />
+                <ref role="37wK5l" to="6exd:1hOy_Afq63K" resolve="walk" />
                 <node concept="37vLTw" id="5YVX0wIk2jv" role="37wK5m">
                   <ref role="3cqZAo" node="7t5VLKGALW_" resolve="toWalk" />
                 </node>
@@ -1613,7 +1613,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="5YVX0wIjRTD" role="2OqNvi">
-                <ref role="37wK5l" to="ie8e:3JgCwkqiP3p" resolve="walkTerms" />
+                <ref role="37wK5l" to="6exd:3JgCwkqiP3p" resolve="walkTerms" />
                 <node concept="1rXfSq" id="5YVX0wIjRTE" role="37wK5m">
                   <ref role="37wK5l" node="2ev$9JFF8Wr" resolve="eqTerms" />
                   <node concept="37vLTw" id="5YVX0wIk2kr" role="37wK5m">
@@ -1633,7 +1633,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="5YVX0wIjRTL" role="2OqNvi">
-                <ref role="37wK5l" to="ie8e:3JgCwkqiP3p" resolve="walkTerms" />
+                <ref role="37wK5l" to="6exd:3JgCwkqiP3p" resolve="walkTerms" />
                 <node concept="1rXfSq" id="5YVX0wIjRTM" role="37wK5m">
                   <ref role="37wK5l" node="2ev$9JFF8Wr" resolve="eqTerms" />
                   <node concept="37vLTw" id="5YVX0wIk2l_" role="37wK5m">
@@ -1653,7 +1653,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="5YVX0wIjRTT" role="2OqNvi">
-                <ref role="37wK5l" to="ie8e:3JgCwkqiP3p" resolve="walkTerms" />
+                <ref role="37wK5l" to="6exd:3JgCwkqiP3p" resolve="walkTerms" />
                 <node concept="1rXfSq" id="5YVX0wIjRTU" role="37wK5m">
                   <ref role="37wK5l" node="2ev$9JFF8Wr" resolve="eqTerms" />
                   <node concept="37vLTw" id="5YVX0wIk2mI" role="37wK5m">
@@ -1673,7 +1673,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="5YVX0wIlmm_" role="2OqNvi">
-                <ref role="37wK5l" to="ie8e:3JgCwkqmHc0" resolve="walkList" />
+                <ref role="37wK5l" to="6exd:3JgCwkqmHc0" resolve="walkList" />
                 <node concept="1rXfSq" id="5YVX0wIlmmA" role="37wK5m">
                   <ref role="37wK5l" node="5YVX0wIlmGu" resolve="eqList" />
                   <node concept="37vLTw" id="3t7_2FgLt6D" role="37wK5m">
@@ -1721,7 +1721,7 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="5YVX0wIjRUj" role="2OqNvi">
-                  <ref role="37wK5l" to="ie8e:5s497Vr3IZm" resolve="endWalk" />
+                  <ref role="37wK5l" to="6exd:5s497Vr3IZm" resolve="endWalk" />
                 </node>
               </node>
             </node>
@@ -1737,11 +1737,11 @@
             <node concept="3cpWsn" id="3t7_2Fg_0sP" role="3cpWs9">
               <property role="TrG5h" value="first" />
               <node concept="3uibUv" id="6MYr6JxsnM$" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:5JQSuNswOXL" resolve="CompositeNode" />
+                <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="CompositeNode" />
               </node>
               <node concept="10QFUN" id="6MYr6JxsnOq" role="33vP2m">
                 <node concept="3uibUv" id="6MYr6JxsnOj" role="10QFUM">
-                  <ref role="3uigEE" to="ie8e:5JQSuNswOXL" resolve="CompositeNode" />
+                  <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="CompositeNode" />
                 </node>
                 <node concept="1oi1Uc" id="6MYr6JxsnOk" role="10QFUP">
                   <node concept="1oi5UN" id="6MYr6JxsnOl" role="1oi0x0">
@@ -1766,11 +1766,11 @@
             <node concept="3cpWsn" id="3t7_2Fg_0sY" role="3cpWs9">
               <property role="TrG5h" value="second" />
               <node concept="3uibUv" id="6MYr6JxsnQ0" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:5JQSuNswOXL" resolve="CompositeNode" />
+                <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="CompositeNode" />
               </node>
               <node concept="10QFUN" id="6MYr6JxsnRQ" role="33vP2m">
                 <node concept="3uibUv" id="6MYr6JxsnRJ" role="10QFUM">
-                  <ref role="3uigEE" to="ie8e:5JQSuNswOXL" resolve="CompositeNode" />
+                  <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="CompositeNode" />
                 </node>
                 <node concept="1oi1Uc" id="6MYr6JxsnRK" role="10QFUP">
                   <node concept="1oi5UN" id="6MYr6JxsnRL" role="1oi0x0">
@@ -1795,11 +1795,11 @@
             <node concept="3cpWsn" id="3t7_2Fg_0t7" role="3cpWs9">
               <property role="TrG5h" value="third" />
               <node concept="3uibUv" id="6MYr6JxsnTt" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:5JQSuNswOXL" resolve="CompositeNode" />
+                <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="CompositeNode" />
               </node>
               <node concept="10QFUN" id="6MYr6JxsnVj" role="33vP2m">
                 <node concept="3uibUv" id="6MYr6JxsnVc" role="10QFUM">
-                  <ref role="3uigEE" to="ie8e:5JQSuNswOXL" resolve="CompositeNode" />
+                  <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="CompositeNode" />
                 </node>
                 <node concept="1oi1Uc" id="6MYr6JxsnVd" role="10QFUP">
                   <node concept="1oi5UN" id="6MYr6JxsnVe" role="1oi0x0">
@@ -1825,7 +1825,7 @@
             <node concept="3cpWsn" id="3t7_2Fg_0vn" role="3cpWs9">
               <property role="TrG5h" value="list" />
               <node concept="3uibUv" id="3t7_2Fg_0vo" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="3t7_2Fg_2r8" role="33vP2m">
                 <node concept="KCUsM" id="3t7_2Fg_2s4" role="1oi0x0">
@@ -1858,7 +1858,7 @@
             <node concept="3cpWsn" id="3t7_2Fg_0xQ" role="3cpWs9">
               <property role="TrG5h" value="toWalk" />
               <node concept="3uibUv" id="3t7_2Fg_0xR" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="3t7_2Fg_0xS" role="33vP2m">
                 <node concept="1oi5ST" id="3t7_2Fg_0xT" role="1oi0x0">
@@ -1879,13 +1879,13 @@
             <node concept="3cpWsn" id="3t7_2Fg_0Jn" role="3cpWs9">
               <property role="TrG5h" value="mock" />
               <node concept="3uibUv" id="3t7_2Fg_0Jo" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:3JgCwkqiP3h" resolve="TreeFormWalk.Walker" />
+                <ref role="3uigEE" to="6exd:3JgCwkqiP3h" resolve="TreeFormWalk.Walker" />
               </node>
               <node concept="2YIFZM" id="3t7_2Fg_0Jp" role="33vP2m">
                 <ref role="37wK5l" to="n4y8:~Mockito.mock(java.lang.Class):java.lang.Object" resolve="mock" />
                 <ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
                 <node concept="3VsKOn" id="3t7_2Fg_0Jq" role="37wK5m">
-                  <ref role="3VsUkX" to="ie8e:3JgCwkqiP3h" resolve="TreeFormWalk.Walker" />
+                  <ref role="3VsUkX" to="6exd:3JgCwkqiP3h" resolve="TreeFormWalk.Walker" />
                 </node>
               </node>
             </node>
@@ -1900,7 +1900,7 @@
                     <ref role="3cqZAo" node="3t7_2Fg_0Jn" resolve="mock" />
                   </node>
                   <node concept="liA8E" id="3t7_2Fg_0Jw" role="2OqNvi">
-                    <ref role="37wK5l" to="ie8e:3JgCwkqiP3p" resolve="walkTerms" />
+                    <ref role="37wK5l" to="6exd:3JgCwkqiP3p" resolve="walkTerms" />
                     <node concept="1rXfSq" id="3t7_2Fg_0Jx" role="37wK5m">
                       <ref role="37wK5l" node="2ev$9JFEEfC" resolve="anyTerms" />
                     </node>
@@ -1910,8 +1910,8 @@
               <node concept="liA8E" id="3t7_2Fg_0Jy" role="2OqNvi">
                 <ref role="37wK5l" to="98:~OngoingStubbing.thenReturn(java.lang.Object):org.mockito.stubbing.OngoingStubbing" resolve="thenReturn" />
                 <node concept="Rm8GO" id="3t7_2Fg_0Jz" role="37wK5m">
-                  <ref role="Rm8GQ" to="ie8e:2q_78a95hAM" resolve="WALK" />
-                  <ref role="1Px2BO" to="ie8e:2q_78a95hAL" resolve="Action" />
+                  <ref role="Rm8GQ" to="6exd:2q_78a95hAM" resolve="WALK" />
+                  <ref role="1Px2BO" to="6exd:2q_78a95hAL" resolve="Action" />
                 </node>
               </node>
             </node>
@@ -1926,7 +1926,7 @@
                     <ref role="3cqZAo" node="3t7_2Fg_0Jn" resolve="mock" />
                   </node>
                   <node concept="liA8E" id="3t7_2Fg_0JD" role="2OqNvi">
-                    <ref role="37wK5l" to="ie8e:3JgCwkqmHc0" resolve="walkList" />
+                    <ref role="37wK5l" to="6exd:3JgCwkqmHc0" resolve="walkList" />
                     <node concept="1rXfSq" id="3t7_2Fg_0JE" role="37wK5m">
                       <ref role="37wK5l" node="2ev$9JFEHV1" resolve="anyList" />
                     </node>
@@ -1936,8 +1936,8 @@
               <node concept="liA8E" id="3t7_2Fg_0JF" role="2OqNvi">
                 <ref role="37wK5l" to="98:~OngoingStubbing.thenReturn(java.lang.Object):org.mockito.stubbing.OngoingStubbing" resolve="thenReturn" />
                 <node concept="Rm8GO" id="3t7_2Fg_0JG" role="37wK5m">
-                  <ref role="Rm8GQ" to="ie8e:2q_78a95hAM" resolve="WALK" />
-                  <ref role="1Px2BO" to="ie8e:2q_78a95hAL" resolve="Action" />
+                  <ref role="Rm8GQ" to="6exd:2q_78a95hAM" resolve="WALK" />
+                  <ref role="1Px2BO" to="6exd:2q_78a95hAL" resolve="Action" />
                 </node>
               </node>
             </node>
@@ -1952,7 +1952,7 @@
                     <ref role="3cqZAo" node="3t7_2Fg_0Jn" resolve="mock" />
                   </node>
                   <node concept="liA8E" id="3t7_2Fg_0JM" role="2OqNvi">
-                    <ref role="37wK5l" to="ie8e:3JgCwkqiP3$" resolve="walkValues" />
+                    <ref role="37wK5l" to="6exd:3JgCwkqiP3$" resolve="walkValues" />
                     <node concept="1rXfSq" id="3t7_2Fg_0JN" role="37wK5m">
                       <ref role="37wK5l" node="2ev$9JFEJ94" resolve="anyValues" />
                     </node>
@@ -1962,8 +1962,8 @@
               <node concept="liA8E" id="3t7_2Fg_0JO" role="2OqNvi">
                 <ref role="37wK5l" to="98:~OngoingStubbing.thenReturn(java.lang.Object):org.mockito.stubbing.OngoingStubbing" resolve="thenReturn" />
                 <node concept="Rm8GO" id="3t7_2Fg_0JP" role="37wK5m">
-                  <ref role="1Px2BO" to="ie8e:2q_78a95hAL" resolve="Action" />
-                  <ref role="Rm8GQ" to="ie8e:2q_78a95hAN" resolve="CONTINUE" />
+                  <ref role="1Px2BO" to="6exd:2q_78a95hAL" resolve="Action" />
+                  <ref role="Rm8GQ" to="6exd:2q_78a95hAN" resolve="CONTINUE" />
                 </node>
               </node>
             </node>
@@ -1973,14 +1973,14 @@
             <node concept="2OqwBi" id="3t7_2Fg_0Ui" role="3clFbG">
               <node concept="2ShNRf" id="3t7_2Fg_0Uj" role="2Oq$k0">
                 <node concept="1pGfFk" id="3t7_2Fg_0Uk" role="2ShVmc">
-                  <ref role="37wK5l" to="ie8e:47nvOnTQN6Q" resolve="TreeFormWalk" />
+                  <ref role="37wK5l" to="6exd:47nvOnTQN6Q" resolve="TreeFormWalk" />
                   <node concept="37vLTw" id="3t7_2Fg_0Ul" role="37wK5m">
                     <ref role="3cqZAo" node="3t7_2Fg_0Jn" resolve="mock" />
                   </node>
                 </node>
               </node>
               <node concept="liA8E" id="3t7_2Fg_0Um" role="2OqNvi">
-                <ref role="37wK5l" to="ie8e:1hOy_Afq63K" resolve="walk" />
+                <ref role="37wK5l" to="6exd:1hOy_Afq63K" resolve="walk" />
                 <node concept="37vLTw" id="3t7_2Fg_0Un" role="37wK5m">
                   <ref role="3cqZAo" node="3t7_2Fg_0xQ" resolve="toWalk" />
                 </node>
@@ -1998,7 +1998,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="3t7_2Fg_0Ut" role="2OqNvi">
-                <ref role="37wK5l" to="ie8e:3JgCwkqiP3p" resolve="walkTerms" />
+                <ref role="37wK5l" to="6exd:3JgCwkqiP3p" resolve="walkTerms" />
                 <node concept="1rXfSq" id="3t7_2Fg_0Uu" role="37wK5m">
                   <ref role="37wK5l" node="2ev$9JFF8Wr" resolve="eqTerms" />
                   <node concept="37vLTw" id="3t7_2Fg_0Uv" role="37wK5m">
@@ -2018,7 +2018,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="3t7_2Fg_0U$" role="2OqNvi">
-                <ref role="37wK5l" to="ie8e:3JgCwkqiP3p" resolve="walkTerms" />
+                <ref role="37wK5l" to="6exd:3JgCwkqiP3p" resolve="walkTerms" />
                 <node concept="1rXfSq" id="3t7_2Fg_0U_" role="37wK5m">
                   <ref role="37wK5l" node="2ev$9JFF8Wr" resolve="eqTerms" />
                   <node concept="37vLTw" id="3t7_2Fg_0UA" role="37wK5m">
@@ -2038,7 +2038,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="3t7_2Fg_0UF" role="2OqNvi">
-                <ref role="37wK5l" to="ie8e:3JgCwkqiP3p" resolve="walkTerms" />
+                <ref role="37wK5l" to="6exd:3JgCwkqiP3p" resolve="walkTerms" />
                 <node concept="1rXfSq" id="3t7_2Fg_0UG" role="37wK5m">
                   <ref role="37wK5l" node="2ev$9JFF8Wr" resolve="eqTerms" />
                   <node concept="37vLTw" id="3t7_2Fg_0UH" role="37wK5m">
@@ -2058,7 +2058,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="3t7_2Fg_0UM" role="2OqNvi">
-                <ref role="37wK5l" to="ie8e:3JgCwkqmHc0" resolve="walkList" />
+                <ref role="37wK5l" to="6exd:3JgCwkqmHc0" resolve="walkList" />
                 <node concept="1rXfSq" id="3t7_2Fg_0UN" role="37wK5m">
                   <ref role="37wK5l" node="5YVX0wIlmGu" resolve="eqList" />
                   <node concept="37vLTw" id="3t7_2Fg_1lE" role="37wK5m">
@@ -2087,7 +2087,7 @@
             <node concept="3cpWsn" id="3t7_2Fg_PE9" role="3cpWs9">
               <property role="TrG5h" value="first" />
               <node concept="3uibUv" id="3t7_2Fg_PEa" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="3t7_2Fg_PFn" role="33vP2m">
                 <node concept="1oi5UN" id="3t7_2Fg_PFB" role="1oi0x0">
@@ -2111,7 +2111,7 @@
             <node concept="3cpWsn" id="3t7_2Fg_PFW" role="3cpWs9">
               <property role="TrG5h" value="second" />
               <node concept="3uibUv" id="3t7_2Fg_PFX" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="3t7_2Fg_PFY" role="33vP2m">
                 <node concept="1oi5UN" id="3t7_2Fg_PHa" role="1oi0x0">
@@ -2135,7 +2135,7 @@
             <node concept="3cpWsn" id="3t7_2Fg_PIx" role="3cpWs9">
               <property role="TrG5h" value="third" />
               <node concept="3uibUv" id="3t7_2Fg_PIy" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="3t7_2Fg_PIz" role="33vP2m">
                 <node concept="1oi5UN" id="3t7_2Fg_PK2" role="1oi0x0">
@@ -2160,7 +2160,7 @@
             <node concept="3cpWsn" id="7t5VLKGALTU" role="3cpWs9">
               <property role="TrG5h" value="list" />
               <node concept="3uibUv" id="7t5VLKGALTV" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="7t5VLKGALTW" role="33vP2m">
                 <node concept="1oi5ST" id="7t5VLKGALU0" role="1oi0x0">
@@ -2201,8 +2201,8 @@
               <property role="TrG5h" value="tfs" />
               <node concept="2OqwBi" id="5H6hZahmJ49" role="33vP2m">
                 <node concept="2YIFZM" id="5H6hZahmJ4a" role="2Oq$k0">
-                  <ref role="37wK5l" to="ie8e:3OPtF03pX11" resolve="findList" />
-                  <ref role="1Pybhc" to="ie8e:3JgCwkqd3K7" resolve="Finders" />
+                  <ref role="37wK5l" to="6exd:3OPtF03pX11" resolve="findList" />
+                  <ref role="1Pybhc" to="6exd:3JgCwkqd3K7" resolve="Finders" />
                   <node concept="37vLTw" id="3t7_2Fg_RXO" role="37wK5m">
                     <ref role="3cqZAo" node="7t5VLKGALTU" resolve="list" />
                   </node>
@@ -2214,14 +2214,14 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="5H6hZahmJ4g" role="2OqNvi">
-                  <ref role="37wK5l" to="ie8e:3OPtF03nYWm" resolve="result" />
+                  <ref role="37wK5l" to="6exd:3OPtF03nYWm" resolve="result" />
                 </node>
               </node>
               <node concept="3uibUv" id="3t7_2FgAfif" role="1tU5fm">
                 <ref role="3uigEE" to="33ny:~List" resolve="List" />
                 <node concept="3qUE_q" id="3t7_2FgAfOL" role="11_B2D">
                   <node concept="3uibUv" id="3t7_2FgAfXo" role="3qUE_r">
-                    <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                    <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                   </node>
                 </node>
               </node>
@@ -2232,7 +2232,7 @@
             <node concept="2ShNRf" id="3t7_2Fg_SdW" role="3tpDZB">
               <node concept="Tc6Ow" id="3t7_2Fg_StU" role="2ShVmc">
                 <node concept="3uibUv" id="3t7_2Fg_S_c" role="HW$YZ">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
                 <node concept="37vLTw" id="3t7_2Fg_SBC" role="HW$Y0">
                   <ref role="3cqZAo" node="3t7_2Fg_PE9" resolve="first" />
@@ -2248,7 +2248,7 @@
             <node concept="2ShNRf" id="3t7_2FgA9lt" role="3tpDZA">
               <node concept="Tc6Ow" id="3t7_2FgA9GV" role="2ShVmc">
                 <node concept="3uibUv" id="3t7_2FgAhk3" role="HW$YZ">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
                 <node concept="10QFUN" id="3t7_2FgAhpW" role="I$8f6">
                   <node concept="37vLTw" id="3t7_2FgAhpV" role="10QFUP">
@@ -2257,7 +2257,7 @@
                   <node concept="3uibUv" id="3t7_2FgAhwj" role="10QFUM">
                     <ref role="3uigEE" to="33ny:~List" resolve="List" />
                     <node concept="3uibUv" id="3t7_2FgAh_P" role="11_B2D">
-                      <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                      <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                     </node>
                   </node>
                 </node>
@@ -2275,7 +2275,7 @@
             <node concept="3cpWsn" id="3t7_2FgAk8E" role="3cpWs9">
               <property role="TrG5h" value="first" />
               <node concept="3uibUv" id="3t7_2FgAk8F" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="3t7_2FgAk8G" role="33vP2m">
                 <node concept="1oi5UN" id="3t7_2FgAk8H" role="1oi0x0">
@@ -2299,7 +2299,7 @@
             <node concept="3cpWsn" id="3t7_2FgAk8N" role="3cpWs9">
               <property role="TrG5h" value="second" />
               <node concept="3uibUv" id="3t7_2FgAk8O" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="3t7_2FgAk8P" role="33vP2m">
                 <node concept="1oi5UN" id="3t7_2FgAk8Q" role="1oi0x0">
@@ -2323,7 +2323,7 @@
             <node concept="3cpWsn" id="3t7_2FgAk8W" role="3cpWs9">
               <property role="TrG5h" value="third" />
               <node concept="3uibUv" id="3t7_2FgAk8X" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="3t7_2FgAk8Y" role="33vP2m">
                 <node concept="1oi5UN" id="3t7_2FgAk8Z" role="1oi0x0">
@@ -2347,7 +2347,7 @@
             <node concept="3cpWsn" id="3t7_2FgAP_2" role="3cpWs9">
               <property role="TrG5h" value="fourth" />
               <node concept="3uibUv" id="3t7_2FgAP_3" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="3t7_2FgAP_4" role="33vP2m">
                 <node concept="1oi5UN" id="3t7_2FgAP_5" role="1oi0x0">
@@ -2372,7 +2372,7 @@
             <node concept="3cpWsn" id="3t7_2FgAk96" role="3cpWs9">
               <property role="TrG5h" value="list1" />
               <node concept="3uibUv" id="3t7_2FgAk97" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="3t7_2FgAk98" role="33vP2m">
                 <node concept="1oi5ST" id="3t7_2FgAk99" role="1oi0x0">
@@ -2402,17 +2402,17 @@
             <node concept="3cpWsn" id="3t7_2FgALMM" role="3cpWs9">
               <property role="TrG5h" value="list2" />
               <node concept="3uibUv" id="3t7_2FgALWp" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="2YIFZM" id="3t7_2FgALMN" role="33vP2m">
-                <ref role="37wK5l" to="ie8e:5JQSuNsxhfn" resolve="create" />
-                <ref role="1Pybhc" to="ie8e:5JQSuNswOXL" resolve="CompositeNode" />
+                <ref role="37wK5l" to="6exd:5JQSuNsxhfn" resolve="create" />
+                <ref role="1Pybhc" to="6exd:5JQSuNswOXL" resolve="CompositeNode" />
                 <node concept="Xl_RD" id="3t7_2FgALMO" role="37wK5m">
                   <property role="Xl_RC" value="list" />
                 </node>
                 <node concept="2YIFZM" id="3t7_2FgALMP" role="37wK5m">
-                  <ref role="37wK5l" to="ie8e:1OShD0HS45f" resolve="createList" />
-                  <ref role="1Pybhc" to="ie8e:3OPtF03lco4" resolve="ListNode" />
+                  <ref role="37wK5l" to="6exd:1OShD0HS45f" resolve="createList" />
+                  <ref role="1Pybhc" to="6exd:3OPtF03lco4" resolve="ListNode" />
                   <node concept="37vLTw" id="3t7_2FgALMS" role="37wK5m">
                     <ref role="3cqZAo" node="3t7_2FgAk8W" resolve="third" />
                   </node>
@@ -2429,8 +2429,8 @@
               <property role="TrG5h" value="tfs1" />
               <node concept="2OqwBi" id="3t7_2FgAk9o" role="33vP2m">
                 <node concept="2YIFZM" id="3t7_2FgAk9p" role="2Oq$k0">
-                  <ref role="37wK5l" to="ie8e:3OPtF03pX11" resolve="findList" />
-                  <ref role="1Pybhc" to="ie8e:3JgCwkqd3K7" resolve="Finders" />
+                  <ref role="37wK5l" to="6exd:3OPtF03pX11" resolve="findList" />
+                  <ref role="1Pybhc" to="6exd:3JgCwkqd3K7" resolve="Finders" />
                   <node concept="37vLTw" id="3t7_2FgAk9q" role="37wK5m">
                     <ref role="3cqZAo" node="3t7_2FgAk96" resolve="list1" />
                   </node>
@@ -2439,14 +2439,14 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="3t7_2FgAk9t" role="2OqNvi">
-                  <ref role="37wK5l" to="ie8e:3OPtF03nYWm" resolve="result" />
+                  <ref role="37wK5l" to="6exd:3OPtF03nYWm" resolve="result" />
                 </node>
               </node>
               <node concept="3uibUv" id="3t7_2FgAk9u" role="1tU5fm">
                 <ref role="3uigEE" to="33ny:~List" resolve="List" />
                 <node concept="3qUE_q" id="3t7_2FgAk9v" role="11_B2D">
                   <node concept="3uibUv" id="3t7_2FgAk9w" role="3qUE_r">
-                    <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                    <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                   </node>
                 </node>
               </node>
@@ -2457,8 +2457,8 @@
               <property role="TrG5h" value="tfs2" />
               <node concept="2OqwBi" id="3t7_2FgAMo_" role="33vP2m">
                 <node concept="2YIFZM" id="3t7_2FgAMoA" role="2Oq$k0">
-                  <ref role="37wK5l" to="ie8e:3OPtF03pX11" resolve="findList" />
-                  <ref role="1Pybhc" to="ie8e:3JgCwkqd3K7" resolve="Finders" />
+                  <ref role="37wK5l" to="6exd:3OPtF03pX11" resolve="findList" />
+                  <ref role="1Pybhc" to="6exd:3JgCwkqd3K7" resolve="Finders" />
                   <node concept="37vLTw" id="3t7_2FgAMCx" role="37wK5m">
                     <ref role="3cqZAo" node="3t7_2FgALMM" resolve="list2" />
                   </node>
@@ -2467,14 +2467,14 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="3t7_2FgAMoD" role="2OqNvi">
-                  <ref role="37wK5l" to="ie8e:3OPtF03nYWm" resolve="result" />
+                  <ref role="37wK5l" to="6exd:3OPtF03nYWm" resolve="result" />
                 </node>
               </node>
               <node concept="3uibUv" id="3t7_2FgAMoE" role="1tU5fm">
                 <ref role="3uigEE" to="33ny:~List" resolve="List" />
                 <node concept="3qUE_q" id="3t7_2FgAMoF" role="11_B2D">
                   <node concept="3uibUv" id="3t7_2FgAMoG" role="3qUE_r">
-                    <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                    <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                   </node>
                 </node>
               </node>
@@ -2485,7 +2485,7 @@
             <node concept="2ShNRf" id="3t7_2FgAk9z" role="3tpDZB">
               <node concept="Tc6Ow" id="3t7_2FgAk9$" role="2ShVmc">
                 <node concept="3uibUv" id="3t7_2FgAk9_" role="HW$YZ">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
                 <node concept="37vLTw" id="3t7_2FgAk9A" role="HW$Y0">
                   <ref role="3cqZAo" node="3t7_2FgAk8E" resolve="first" />
@@ -2498,7 +2498,7 @@
             <node concept="2ShNRf" id="3t7_2FgAk9D" role="3tpDZA">
               <node concept="Tc6Ow" id="3t7_2FgAk9E" role="2ShVmc">
                 <node concept="3uibUv" id="3t7_2FgAk9F" role="HW$YZ">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
                 <node concept="10QFUN" id="3t7_2FgAk9G" role="I$8f6">
                   <node concept="37vLTw" id="3t7_2FgAk9H" role="10QFUP">
@@ -2507,7 +2507,7 @@
                   <node concept="3uibUv" id="3t7_2FgAk9I" role="10QFUM">
                     <ref role="3uigEE" to="33ny:~List" resolve="List" />
                     <node concept="3uibUv" id="3t7_2FgAk9J" role="11_B2D">
-                      <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                      <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                     </node>
                   </node>
                 </node>
@@ -2518,7 +2518,7 @@
             <node concept="2ShNRf" id="3t7_2FgAMFp" role="3tpDZB">
               <node concept="Tc6Ow" id="3t7_2FgAMFq" role="2ShVmc">
                 <node concept="3uibUv" id="3t7_2FgAMFr" role="HW$YZ">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
                 <node concept="37vLTw" id="3t7_2FgAMFu" role="HW$Y0">
                   <ref role="3cqZAo" node="3t7_2FgAk8W" resolve="third" />
@@ -2531,7 +2531,7 @@
             <node concept="2ShNRf" id="3t7_2FgAMFv" role="3tpDZA">
               <node concept="Tc6Ow" id="3t7_2FgAMFw" role="2ShVmc">
                 <node concept="3uibUv" id="3t7_2FgAMFx" role="HW$YZ">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
                 <node concept="10QFUN" id="3t7_2FgAMFy" role="I$8f6">
                   <node concept="37vLTw" id="3t7_2FgAMUw" role="10QFUP">
@@ -2540,7 +2540,7 @@
                   <node concept="3uibUv" id="3t7_2FgAMF$" role="10QFUM">
                     <ref role="3uigEE" to="33ny:~List" resolve="List" />
                     <node concept="3uibUv" id="3t7_2FgAMF_" role="11_B2D">
-                      <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                      <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                     </node>
                   </node>
                 </node>
@@ -2558,7 +2558,7 @@
             <node concept="3cpWsn" id="3t7_2FgAvG9" role="3cpWs9">
               <property role="TrG5h" value="first" />
               <node concept="3uibUv" id="3t7_2FgAvGa" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="3t7_2FgAvGb" role="33vP2m">
                 <node concept="1oi5UN" id="3t7_2FgAvGc" role="1oi0x0">
@@ -2582,7 +2582,7 @@
             <node concept="3cpWsn" id="3t7_2FgAvGi" role="3cpWs9">
               <property role="TrG5h" value="second" />
               <node concept="3uibUv" id="3t7_2FgAvGj" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="3t7_2FgAvGk" role="33vP2m">
                 <node concept="1oi5UN" id="3t7_2FgAvGl" role="1oi0x0">
@@ -2606,7 +2606,7 @@
             <node concept="3cpWsn" id="3t7_2FgAvGr" role="3cpWs9">
               <property role="TrG5h" value="third" />
               <node concept="3uibUv" id="3t7_2FgAvGs" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="3t7_2FgAvGt" role="33vP2m">
                 <node concept="1oi5UN" id="3t7_2FgAvGu" role="1oi0x0">
@@ -2630,7 +2630,7 @@
             <node concept="3cpWsn" id="3t7_2FgACZ0" role="3cpWs9">
               <property role="TrG5h" value="fourth" />
               <node concept="3uibUv" id="3t7_2FgACZ1" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="3t7_2FgACZ2" role="33vP2m">
                 <node concept="1oi5UN" id="3t7_2FgACZ3" role="1oi0x0">
@@ -2655,7 +2655,7 @@
             <node concept="3cpWsn" id="3t7_2FgAvG_" role="3cpWs9">
               <property role="TrG5h" value="list" />
               <node concept="3uibUv" id="3t7_2FgAvGA" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="3t7_2FgAvGB" role="33vP2m">
                 <node concept="1oi5ST" id="3t7_2FgAvGC" role="1oi0x0">
@@ -2710,8 +2710,8 @@
               <property role="TrG5h" value="lists" />
               <node concept="2OqwBi" id="3t7_2FgAvGQ" role="33vP2m">
                 <node concept="2YIFZM" id="3t7_2FgAvGR" role="2Oq$k0">
-                  <ref role="37wK5l" to="ie8e:3OPtF03pX11" resolve="findList" />
-                  <ref role="1Pybhc" to="ie8e:3JgCwkqd3K7" resolve="Finders" />
+                  <ref role="37wK5l" to="6exd:3OPtF03pX11" resolve="findList" />
+                  <ref role="1Pybhc" to="6exd:3JgCwkqd3K7" resolve="Finders" />
                   <node concept="37vLTw" id="3t7_2FgAvGS" role="37wK5m">
                     <ref role="3cqZAo" node="3t7_2FgAvG_" resolve="list" />
                   </node>
@@ -2720,14 +2720,14 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="3t7_2FgAvGU" role="2OqNvi">
-                  <ref role="37wK5l" to="ie8e:3OPtF03nYWm" resolve="result" />
+                  <ref role="37wK5l" to="6exd:3OPtF03nYWm" resolve="result" />
                 </node>
               </node>
               <node concept="3uibUv" id="3t7_2FgAvGV" role="1tU5fm">
                 <ref role="3uigEE" to="33ny:~List" resolve="List" />
                 <node concept="3qUE_q" id="3t7_2FgAvGW" role="11_B2D">
                   <node concept="3uibUv" id="3t7_2FgAvGX" role="3qUE_r">
-                    <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                    <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                   </node>
                 </node>
               </node>
@@ -2738,8 +2738,8 @@
               <property role="TrG5h" value="tfs1" />
               <node concept="2OqwBi" id="3t7_2FgAwUM" role="33vP2m">
                 <node concept="2YIFZM" id="3t7_2FgAwUN" role="2Oq$k0">
-                  <ref role="37wK5l" to="ie8e:3OPtF03pX11" resolve="findList" />
-                  <ref role="1Pybhc" to="ie8e:3JgCwkqd3K7" resolve="Finders" />
+                  <ref role="37wK5l" to="6exd:3OPtF03pX11" resolve="findList" />
+                  <ref role="1Pybhc" to="6exd:3JgCwkqd3K7" resolve="Finders" />
                   <node concept="2OqwBi" id="3t7_2FgAzON" role="37wK5m">
                     <node concept="37vLTw" id="3t7_2FgAzE2" role="2Oq$k0">
                       <ref role="3cqZAo" node="3t7_2FgAvGP" resolve="lists" />
@@ -2756,14 +2756,14 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="3t7_2FgAwUR" role="2OqNvi">
-                  <ref role="37wK5l" to="ie8e:3OPtF03nYWm" resolve="result" />
+                  <ref role="37wK5l" to="6exd:3OPtF03nYWm" resolve="result" />
                 </node>
               </node>
               <node concept="3uibUv" id="3t7_2FgAwUS" role="1tU5fm">
                 <ref role="3uigEE" to="33ny:~List" resolve="List" />
                 <node concept="3qUE_q" id="3t7_2FgAwUT" role="11_B2D">
                   <node concept="3uibUv" id="3t7_2FgAwUU" role="3qUE_r">
-                    <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                    <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                   </node>
                 </node>
               </node>
@@ -2774,8 +2774,8 @@
               <property role="TrG5h" value="tfs2" />
               <node concept="2OqwBi" id="3t7_2FgA$lK" role="33vP2m">
                 <node concept="2YIFZM" id="3t7_2FgA$lL" role="2Oq$k0">
-                  <ref role="37wK5l" to="ie8e:3OPtF03pX11" resolve="findList" />
-                  <ref role="1Pybhc" to="ie8e:3JgCwkqd3K7" resolve="Finders" />
+                  <ref role="37wK5l" to="6exd:3OPtF03pX11" resolve="findList" />
+                  <ref role="1Pybhc" to="6exd:3JgCwkqd3K7" resolve="Finders" />
                   <node concept="2OqwBi" id="3t7_2FgA$lM" role="37wK5m">
                     <node concept="37vLTw" id="3t7_2FgA$lN" role="2Oq$k0">
                       <ref role="3cqZAo" node="3t7_2FgAvGP" resolve="lists" />
@@ -2792,14 +2792,14 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="3t7_2FgA$lR" role="2OqNvi">
-                  <ref role="37wK5l" to="ie8e:3OPtF03nYWm" resolve="result" />
+                  <ref role="37wK5l" to="6exd:3OPtF03nYWm" resolve="result" />
                 </node>
               </node>
               <node concept="3uibUv" id="3t7_2FgA$lS" role="1tU5fm">
                 <ref role="3uigEE" to="33ny:~List" resolve="List" />
                 <node concept="3qUE_q" id="3t7_2FgA$lT" role="11_B2D">
                   <node concept="3uibUv" id="3t7_2FgA$lU" role="3qUE_r">
-                    <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                    <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                   </node>
                 </node>
               </node>
@@ -2810,7 +2810,7 @@
             <node concept="2ShNRf" id="3t7_2FgAvH0" role="3tpDZB">
               <node concept="Tc6Ow" id="3t7_2FgAvH1" role="2ShVmc">
                 <node concept="3uibUv" id="3t7_2FgAvH2" role="HW$YZ">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
                 <node concept="37vLTw" id="3t7_2FgAvH3" role="HW$Y0">
                   <ref role="3cqZAo" node="3t7_2FgAvG9" resolve="first" />
@@ -2823,7 +2823,7 @@
             <node concept="2ShNRf" id="3t7_2FgAvH6" role="3tpDZA">
               <node concept="Tc6Ow" id="3t7_2FgAvH7" role="2ShVmc">
                 <node concept="3uibUv" id="3t7_2FgAvH8" role="HW$YZ">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
                 <node concept="10QFUN" id="3t7_2FgAvH9" role="I$8f6">
                   <node concept="37vLTw" id="3t7_2FgA_c2" role="10QFUP">
@@ -2832,7 +2832,7 @@
                   <node concept="3uibUv" id="3t7_2FgAvHb" role="10QFUM">
                     <ref role="3uigEE" to="33ny:~List" resolve="List" />
                     <node concept="3uibUv" id="3t7_2FgAvHc" role="11_B2D">
-                      <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                      <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                     </node>
                   </node>
                 </node>
@@ -2843,7 +2843,7 @@
             <node concept="2ShNRf" id="3t7_2FgA$R8" role="3tpDZB">
               <node concept="Tc6Ow" id="3t7_2FgA$R9" role="2ShVmc">
                 <node concept="3uibUv" id="3t7_2FgA$Ra" role="HW$YZ">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
                 <node concept="37vLTw" id="3t7_2FgADjE" role="HW$Y0">
                   <ref role="3cqZAo" node="3t7_2FgAvGr" resolve="third" />
@@ -2856,7 +2856,7 @@
             <node concept="2ShNRf" id="3t7_2FgA$Re" role="3tpDZA">
               <node concept="Tc6Ow" id="3t7_2FgA$Rf" role="2ShVmc">
                 <node concept="3uibUv" id="3t7_2FgA$Rg" role="HW$YZ">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
                 <node concept="10QFUN" id="3t7_2FgA$Rh" role="I$8f6">
                   <node concept="37vLTw" id="3t7_2FgA_gU" role="10QFUP">
@@ -2865,7 +2865,7 @@
                   <node concept="3uibUv" id="3t7_2FgA$Rj" role="10QFUM">
                     <ref role="3uigEE" to="33ny:~List" resolve="List" />
                     <node concept="3uibUv" id="3t7_2FgA$Rk" role="11_B2D">
-                      <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                      <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                     </node>
                   </node>
                 </node>
@@ -2888,7 +2888,7 @@
       <node concept="3uibUv" id="2DKqMqOqkb3" role="3clF45">
         <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
         <node concept="3uibUv" id="2DKqMqOquKp" role="11_B2D">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="3Tm1VV" id="2DKqMqOqk7n" role="1B3o_S" />
@@ -2899,12 +2899,12 @@
               <ref role="37wK5l" to="zx3l:~MemLogical.&lt;init&gt;(java.lang.Object)" resolve="MemLogical" />
               <node concept="10QFUN" id="6yEjedm5h65" role="37wK5m">
                 <node concept="3uibUv" id="6yEjedm5hgr" role="10QFUM">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
                 <node concept="10Nm6u" id="6yEjedm5h64" role="10QFUP" />
               </node>
               <node concept="3uibUv" id="6yEjedm5cAk" role="1pMfVU">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
             </node>
           </node>
@@ -2921,13 +2921,13 @@
       <node concept="37vLTG" id="2DKqMqOq_PA" role="3clF46">
         <property role="TrG5h" value="tf" />
         <node concept="3uibUv" id="2DKqMqOq_PB" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="3uibUv" id="2DKqMqOq_PE" role="3clF45">
         <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
         <node concept="3uibUv" id="2DKqMqOq_PF" role="11_B2D">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="3Tm1VV" id="2DKqMqOq_PG" role="1B3o_S" />
@@ -2943,7 +2943,7 @@
                 <ref role="3cqZAo" node="2DKqMqOq_PA" resolve="tf" />
               </node>
               <node concept="3uibUv" id="6yEjedm5dei" role="1pMfVU">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
             </node>
           </node>
@@ -2964,7 +2964,7 @@
               <node concept="3uibUv" id="2DKqMqOqvLI" role="1tU5fm">
                 <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
                 <node concept="3uibUv" id="2DKqMqOqvLL" role="11_B2D">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
               <node concept="1rXfSq" id="2DKqMqOqvLR" role="33vP2m">
@@ -2981,7 +2981,7 @@
               <node concept="3uibUv" id="2DKqMqOqw8y" role="1tU5fm">
                 <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
                 <node concept="3uibUv" id="2DKqMqOqw8_" role="11_B2D">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
               <node concept="1rXfSq" id="2DKqMqOqw8N" role="33vP2m">
@@ -2998,7 +2998,7 @@
               <node concept="3uibUv" id="2DKqMqOqzLb" role="1tU5fm">
                 <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
                 <node concept="3uibUv" id="2DKqMqOqzLc" role="11_B2D">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
               <node concept="1rXfSq" id="2DKqMqOqzLd" role="33vP2m">
@@ -3069,7 +3069,7 @@
               <node concept="3uibUv" id="2DKqMqOqEKD" role="1tU5fm">
                 <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
                 <node concept="3uibUv" id="2DKqMqOqEKG" role="11_B2D">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
               <node concept="1rXfSq" id="2DKqMqOqEKL" role="33vP2m">
@@ -3093,7 +3093,7 @@
               <node concept="3uibUv" id="2DKqMqOqEOa" role="1tU5fm">
                 <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
                 <node concept="3uibUv" id="2DKqMqOqEOb" role="11_B2D">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
               <node concept="1rXfSq" id="2DKqMqOqEOc" role="33vP2m">
@@ -3117,7 +3117,7 @@
               <node concept="3uibUv" id="2DKqMqOqFhf" role="1tU5fm">
                 <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
                 <node concept="3uibUv" id="2DKqMqOqFhg" role="11_B2D">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
               <node concept="1rXfSq" id="2DKqMqOqFhh" role="33vP2m">
@@ -3144,7 +3144,7 @@
               <node concept="3uibUv" id="5kEUewdxWdZ" role="1tU5fm">
                 <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
                 <node concept="3uibUv" id="5kEUewdxWe2" role="11_B2D">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
               <node concept="1rXfSq" id="5kEUewdxWe6" role="33vP2m">
@@ -3161,7 +3161,7 @@
               <node concept="3uibUv" id="5kEUewdy0lV" role="1tU5fm">
                 <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
                 <node concept="3uibUv" id="5kEUewdy0lW" role="11_B2D">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
               <node concept="1rXfSq" id="5kEUewdy0lX" role="33vP2m">
@@ -3338,13 +3338,13 @@
       <node concept="37vLTG" id="6yEjedm6GJE" role="3clF46">
         <property role="TrG5h" value="tf" />
         <node concept="3uibUv" id="6yEjedm6GNi" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="3uibUv" id="6yEjedm6GEk" role="3clF45">
         <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
         <node concept="3uibUv" id="6yEjedm6GEG" role="11_B2D">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="3Tm6S6" id="6yEjedm6GE4" role="1B3o_S" />
@@ -3375,7 +3375,7 @@
               <node concept="3uibUv" id="6yEjedm6PY7" role="1tU5fm">
                 <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
                 <node concept="3uibUv" id="6yEjedm6PYa" role="11_B2D">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
               <node concept="1rXfSq" id="6yEjedm6PYd" role="33vP2m">
@@ -3398,7 +3398,7 @@
             <node concept="3cpWsn" id="dfChU1g_c$" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="dfChU1g_cy" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="dfChU1g_c_" role="33vP2m">
                 <node concept="1oi5UN" id="dfChU1g_d$" role="1oi0x0">
@@ -3422,7 +3422,7 @@
             <node concept="3cpWsn" id="dfChU1g_fG" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="dfChU1g_fH" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="dfChU1g_fI" role="33vP2m">
                 <node concept="1oi5UN" id="dfChU1g_fJ" role="1oi0x0">
@@ -3443,8 +3443,8 @@
           <node concept="3clFbH" id="dfChU1g_bE" role="3cqZAp" />
           <node concept="3vlDli" id="dfChU1g_hx" role="3cqZAp">
             <node concept="2YIFZM" id="6HT7BWBPqFA" role="3tpDZA">
-              <ref role="37wK5l" to="ie8e:6HT7BWBOXr$" resolve="ground" />
-              <ref role="1Pybhc" to="ie8e:6HT7BWBOXme" resolve="TreeFormUtil" />
+              <ref role="37wK5l" to="6exd:6HT7BWBOXr$" resolve="ground" />
+              <ref role="1Pybhc" to="6exd:6HT7BWBOXme" resolve="TreeFormUtil" />
               <node concept="37vLTw" id="6HT7BWBPqG2" role="37wK5m">
                 <ref role="3cqZAo" node="dfChU1g_fG" resolve="b" />
               </node>
@@ -3467,7 +3467,7 @@
               <node concept="3uibUv" id="6yEjedm6Hob" role="1tU5fm">
                 <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
                 <node concept="3uibUv" id="6yEjedm6Hoe" role="11_B2D">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
               <node concept="1rXfSq" id="6yEjedm6Hoh" role="33vP2m">
@@ -3492,7 +3492,7 @@
               <node concept="3uibUv" id="6yEjedm6QBT" role="1tU5fm">
                 <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
                 <node concept="3uibUv" id="6yEjedm6QBW" role="11_B2D">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
               <node concept="1rXfSq" id="6yEjedm6QC4" role="33vP2m">
@@ -3525,7 +3525,7 @@
             <node concept="3cpWsn" id="1jo82tq3J3P" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="1jo82tq3J3Q" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1jo82tq3J3R" role="33vP2m">
                 <node concept="1oi5UN" id="1jo82tq3J3S" role="1oi0x0">
@@ -3566,7 +3566,7 @@
             <node concept="3cpWsn" id="1jo82tq3J3Z" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="1jo82tq3J40" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1jo82tq3J41" role="33vP2m">
                 <node concept="1oi5UN" id="1jo82tq3J42" role="1oi0x0">
@@ -3593,8 +3593,8 @@
           <node concept="3clFbH" id="1jo82tq3J47" role="3cqZAp" />
           <node concept="3vlDli" id="1jo82tq3J48" role="3cqZAp">
             <node concept="2YIFZM" id="1jo82tq3J49" role="3tpDZA">
-              <ref role="37wK5l" to="ie8e:6HT7BWBOXr$" resolve="ground" />
-              <ref role="1Pybhc" to="ie8e:6HT7BWBOXme" resolve="TreeFormUtil" />
+              <ref role="37wK5l" to="6exd:6HT7BWBOXr$" resolve="ground" />
+              <ref role="1Pybhc" to="6exd:6HT7BWBOXme" resolve="TreeFormUtil" />
               <node concept="37vLTw" id="1jo82tq3J4a" role="37wK5m">
                 <ref role="3cqZAo" node="1jo82tq3J3Z" resolve="b" />
               </node>
@@ -3617,7 +3617,7 @@
               <node concept="3uibUv" id="6yEjedm6IgL" role="1tU5fm">
                 <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
                 <node concept="3uibUv" id="6yEjedm6IgO" role="11_B2D">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
               <node concept="1rXfSq" id="6yEjedm6IgS" role="33vP2m">
@@ -3640,7 +3640,7 @@
             <node concept="3cpWsn" id="1OShD0HAz3X" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="1OShD0HAz3Y" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0HAz3Z" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0HAz40" role="1oi0x0">
@@ -3674,7 +3674,7 @@
             <node concept="3cpWsn" id="1OShD0HAz47" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="1OShD0HAz48" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0HAz49" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0HAz4a" role="1oi0x0">
@@ -3708,8 +3708,8 @@
               <ref role="3cqZAo" node="1OShD0HAz3X" resolve="a" />
             </node>
             <node concept="2YIFZM" id="6HT7BWBPrIq" role="3tpDZA">
-              <ref role="37wK5l" to="ie8e:6HT7BWBOXr$" resolve="ground" />
-              <ref role="1Pybhc" to="ie8e:6HT7BWBOXme" resolve="TreeFormUtil" />
+              <ref role="37wK5l" to="6exd:6HT7BWBOXr$" resolve="ground" />
+              <ref role="1Pybhc" to="6exd:6HT7BWBOXme" resolve="TreeFormUtil" />
               <node concept="37vLTw" id="6HT7BWBPrIr" role="37wK5m">
                 <ref role="3cqZAo" node="1OShD0HAz47" resolve="b" />
               </node>
@@ -3729,7 +3729,7 @@
               <node concept="3uibUv" id="6yEjedm6JaG" role="1tU5fm">
                 <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
                 <node concept="3uibUv" id="6yEjedm6JaJ" role="11_B2D">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
               <node concept="1rXfSq" id="6yEjedm6JaN" role="33vP2m">
@@ -3762,7 +3762,7 @@
             <node concept="3cpWsn" id="1OShD0HRNoP" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="1OShD0HRNoQ" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0HRNoR" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0HRNoS" role="1oi0x0">
@@ -3796,7 +3796,7 @@
             <node concept="3cpWsn" id="1OShD0HRNp2" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="1OShD0HRNp3" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0HRNp4" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0HRNp5" role="1oi0x0">
@@ -3820,8 +3820,8 @@
               <ref role="3cqZAo" node="1OShD0HRNoP" resolve="a" />
             </node>
             <node concept="2YIFZM" id="6HT7BWBSfTf" role="3tpDZA">
-              <ref role="37wK5l" to="ie8e:6HT7BWBOXr$" resolve="ground" />
-              <ref role="1Pybhc" to="ie8e:6HT7BWBOXme" resolve="TreeFormUtil" />
+              <ref role="37wK5l" to="6exd:6HT7BWBOXr$" resolve="ground" />
+              <ref role="1Pybhc" to="6exd:6HT7BWBOXme" resolve="TreeFormUtil" />
               <node concept="37vLTw" id="6HT7BWBSfTg" role="37wK5m">
                 <ref role="3cqZAo" node="1OShD0HRNp2" resolve="b" />
               </node>
@@ -3841,7 +3841,7 @@
               <node concept="3uibUv" id="6yEjedm6JUY" role="1tU5fm">
                 <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
                 <node concept="3uibUv" id="6yEjedm6JV1" role="11_B2D">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
               <node concept="1rXfSq" id="6yEjedm6JV4" role="33vP2m">
@@ -3857,7 +3857,7 @@
             <node concept="3cpWsn" id="1OShD0Ifj4$" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="1OShD0Ifj4_" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0Ifj4A" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0Ifj4B" role="1oi0x0">
@@ -3874,7 +3874,7 @@
             <node concept="3cpWsn" id="1OShD0Ifj4M" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="1OShD0Ifj4N" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0Ifj4O" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0Ifj4P" role="1oi0x0">
@@ -3898,8 +3898,8 @@
               <ref role="3cqZAo" node="1OShD0Ifj4$" resolve="a" />
             </node>
             <node concept="2YIFZM" id="6HT7BWBPrJ8" role="3tpDZA">
-              <ref role="37wK5l" to="ie8e:6HT7BWBOXr$" resolve="ground" />
-              <ref role="1Pybhc" to="ie8e:6HT7BWBOXme" resolve="TreeFormUtil" />
+              <ref role="37wK5l" to="6exd:6HT7BWBOXr$" resolve="ground" />
+              <ref role="1Pybhc" to="6exd:6HT7BWBOXme" resolve="TreeFormUtil" />
               <node concept="37vLTw" id="6HT7BWBPrJ9" role="37wK5m">
                 <ref role="3cqZAo" node="1OShD0Ifj4M" resolve="b" />
               </node>
@@ -3919,7 +3919,7 @@
               <node concept="3uibUv" id="6yEjedm6Ktu" role="1tU5fm">
                 <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
                 <node concept="3uibUv" id="6yEjedm6Ktx" role="11_B2D">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
               <node concept="1rXfSq" id="6yEjedm6Kt_" role="33vP2m">
@@ -3939,7 +3939,7 @@
             <node concept="3cpWsn" id="dfChU1yMlk" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="dfChU1yMll" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="dfChU1yMlm" role="33vP2m">
                 <node concept="1oi5UN" id="dfChU1yMln" role="1oi0x0">
@@ -3964,7 +3964,7 @@
             <node concept="3cpWsn" id="dfChU1yMlu" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="dfChU1yMlv" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="dfChU1yMlw" role="33vP2m">
                 <node concept="1oi5UN" id="dfChU1yMlx" role="1oi0x0">
@@ -3992,8 +3992,8 @@
               <ref role="3cqZAo" node="dfChU1yMlk" resolve="a" />
             </node>
             <node concept="2YIFZM" id="6HT7BWBPrJv" role="3tpDZA">
-              <ref role="37wK5l" to="ie8e:6HT7BWBOXr$" resolve="ground" />
-              <ref role="1Pybhc" to="ie8e:6HT7BWBOXme" resolve="TreeFormUtil" />
+              <ref role="37wK5l" to="6exd:6HT7BWBOXr$" resolve="ground" />
+              <ref role="1Pybhc" to="6exd:6HT7BWBOXme" resolve="TreeFormUtil" />
               <node concept="37vLTw" id="6HT7BWBPrJw" role="37wK5m">
                 <ref role="3cqZAo" node="dfChU1yMlu" resolve="b" />
               </node>
@@ -4013,7 +4013,7 @@
               <node concept="3uibUv" id="6yEjedm6L2s" role="1tU5fm">
                 <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
                 <node concept="3uibUv" id="6yEjedm6L2v" role="11_B2D">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
               <node concept="1rXfSq" id="6yEjedm6L2y" role="33vP2m">
@@ -4031,7 +4031,7 @@
             <node concept="3cpWsn" id="dfChU1DQLv" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="dfChU1DQLw" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="dfChU1DQLx" role="33vP2m">
                 <node concept="1oi5UN" id="dfChU1DQLy" role="1oi0x0">
@@ -4048,7 +4048,7 @@
             <node concept="3cpWsn" id="dfChU1DQLB" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="dfChU1DQLC" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="dfChU1DQLD" role="33vP2m">
                 <node concept="1oi5UN" id="dfChU1DQLE" role="1oi0x0">
@@ -4070,8 +4070,8 @@
               <ref role="3cqZAo" node="dfChU1DQLv" resolve="a" />
             </node>
             <node concept="2YIFZM" id="6HT7BWBPrJQ" role="3tpDZA">
-              <ref role="37wK5l" to="ie8e:6HT7BWBOXr$" resolve="ground" />
-              <ref role="1Pybhc" to="ie8e:6HT7BWBOXme" resolve="TreeFormUtil" />
+              <ref role="37wK5l" to="6exd:6HT7BWBOXr$" resolve="ground" />
+              <ref role="1Pybhc" to="6exd:6HT7BWBOXme" resolve="TreeFormUtil" />
               <node concept="37vLTw" id="6HT7BWBPrJR" role="37wK5m">
                 <ref role="3cqZAo" node="dfChU1DQLB" resolve="b" />
               </node>
@@ -4089,14 +4089,14 @@
             <node concept="3cpWsn" id="6MYr6Jy87gQ" role="3cpWs9">
               <property role="TrG5h" value="val" />
               <node concept="3uibUv" id="6MYr6Jy87k_" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:2xQ7eRAD2dj" resolve="Value" />
+                <ref role="3uigEE" to="6exd:2xQ7eRAD2dj" resolve="Value" />
                 <node concept="3uibUv" id="6MYr6Jy87mB" role="11_B2D">
                   <ref role="3uigEE" to="wyt6:~String" resolve="String" />
                 </node>
               </node>
               <node concept="10QFUN" id="6MYr6Jy87lF" role="33vP2m">
                 <node concept="3uibUv" id="6MYr6Jy87lC" role="10QFUM">
-                  <ref role="3uigEE" to="ie8e:2xQ7eRAD2dj" resolve="Value" />
+                  <ref role="3uigEE" to="6exd:2xQ7eRAD2dj" resolve="Value" />
                   <node concept="3uibUv" id="6MYr6Jy87oW" role="11_B2D">
                     <ref role="3uigEE" to="wyt6:~String" resolve="String" />
                   </node>
@@ -4114,11 +4114,11 @@
             <node concept="3cpWsn" id="2S_ORi38Qgq" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="6MYr6Jy86h5" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:5JQSuNswOXL" resolve="CompositeNode" />
+                <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="CompositeNode" />
               </node>
               <node concept="10QFUN" id="6MYr6Jy86gm" role="33vP2m">
                 <node concept="3uibUv" id="6MYr6Jy86hI" role="10QFUM">
-                  <ref role="3uigEE" to="ie8e:5JQSuNswOXL" resolve="CompositeNode" />
+                  <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="CompositeNode" />
                 </node>
                 <node concept="1oi1Uc" id="6MYr6Jy86gg" role="10QFUP">
                   <node concept="1oi5UN" id="6MYr6Jy86gh" role="1oi0x0">
@@ -4144,11 +4144,11 @@
             <node concept="3cpWsn" id="2S_ORi38Qg$" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="6MYr6Jy86in" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:5JQSuNswOXL" resolve="CompositeNode" />
+                <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="CompositeNode" />
               </node>
               <node concept="10QFUN" id="6MYr6Jy86js" role="33vP2m">
                 <node concept="3uibUv" id="6MYr6Jy86jj" role="10QFUM">
-                  <ref role="3uigEE" to="ie8e:5JQSuNswOXL" resolve="CompositeNode" />
+                  <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="CompositeNode" />
                 </node>
                 <node concept="1oi1Uc" id="6MYr6Jy86jk" role="10QFUP">
                   <node concept="1oi5UN" id="6MYr6Jy86jl" role="1oi0x0">
@@ -4179,8 +4179,8 @@
               <ref role="3cqZAo" node="2S_ORi38Qgq" resolve="a" />
             </node>
             <node concept="2YIFZM" id="6HT7BWBPrKd" role="3tpDZA">
-              <ref role="37wK5l" to="ie8e:6HT7BWBOXr$" resolve="ground" />
-              <ref role="1Pybhc" to="ie8e:6HT7BWBOXme" resolve="TreeFormUtil" />
+              <ref role="37wK5l" to="6exd:6HT7BWBOXr$" resolve="ground" />
+              <ref role="1Pybhc" to="6exd:6HT7BWBOXme" resolve="TreeFormUtil" />
               <node concept="37vLTw" id="6HT7BWBPrKe" role="37wK5m">
                 <ref role="3cqZAo" node="2S_ORi38Qg$" resolve="b" />
               </node>
@@ -4204,7 +4204,7 @@
             <node concept="3cpWsn" id="1mP5b6jPriH" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="1mP5b6jPriF" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1mP5b6jPriI" role="33vP2m">
                 <node concept="1oi5UN" id="1mP5b6jPriJ" role="1oi0x0" />
@@ -4216,7 +4216,7 @@
             <node concept="3cpWsn" id="1mP5b6jPrpZ" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="1mP5b6jPrq0" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1mP5b6jPrq1" role="33vP2m">
                 <node concept="1oi5UN" id="1mP5b6jPrq2" role="1oi0x0" />
@@ -4244,7 +4244,7 @@
             <node concept="3cpWsn" id="1mP5b6jQ$dL" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="1mP5b6jQ$dM" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1mP5b6jQ$dN" role="33vP2m">
                 <node concept="1oi5UN" id="1mP5b6jQ$dO" role="1oi0x0">
@@ -4263,7 +4263,7 @@
             <node concept="3cpWsn" id="1mP5b6jQ$dS" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="1mP5b6jQ$dT" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1mP5b6jQ$dU" role="33vP2m">
                 <node concept="1oi5UN" id="1mP5b6jQ$dV" role="1oi0x0">
@@ -4298,7 +4298,7 @@
             <node concept="3cpWsn" id="1mP5b6jQNlb" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="1mP5b6jQNlc" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1mP5b6jQNld" role="33vP2m">
                 <node concept="1oi5UN" id="1mP5b6jQNle" role="1oi0x0">
@@ -4322,7 +4322,7 @@
             <node concept="3cpWsn" id="1mP5b6jQNli" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="1mP5b6jQNlj" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1mP5b6jQNlk" role="33vP2m">
                 <node concept="1oi5UN" id="1mP5b6jQNll" role="1oi0x0">
@@ -4362,7 +4362,7 @@
             <node concept="3cpWsn" id="1mP5b6jQND6" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="1mP5b6jQND7" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1mP5b6jQND8" role="33vP2m">
                 <node concept="1oi5UN" id="1mP5b6jQND9" role="1oi0x0">
@@ -4396,7 +4396,7 @@
             <node concept="3cpWsn" id="1mP5b6jQNDj" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="1mP5b6jQNDk" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1mP5b6jQNDl" role="33vP2m">
                 <node concept="1oi5UN" id="1mP5b6jQNDm" role="1oi0x0">
@@ -4446,7 +4446,7 @@
             <node concept="3cpWsn" id="1OShD0HUxWm" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="1OShD0HUxWn" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0HUxWo" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0HUxWp" role="1oi0x0">
@@ -4480,7 +4480,7 @@
             <node concept="3cpWsn" id="1OShD0HUxWz" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="1OShD0HUxW$" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0HUxW_" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0HUxWA" role="1oi0x0">
@@ -4530,7 +4530,7 @@
             <node concept="3cpWsn" id="1mP5b6jQOBl" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="1mP5b6jQOBm" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1mP5b6jQOBn" role="33vP2m">
                 <node concept="1oi5UN" id="1mP5b6jQOBo" role="1oi0x0">
@@ -4547,7 +4547,7 @@
             <node concept="3cpWsn" id="1mP5b6jQOBB" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="1mP5b6jQOBC" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1mP5b6jQOBD" role="33vP2m">
                 <node concept="1oi5UN" id="1mP5b6jQOBE" role="1oi0x0">
@@ -4580,7 +4580,7 @@
             <node concept="3cpWsn" id="1OShD0HUzFH" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="1OShD0HUzFI" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0HUzFJ" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0HUzFK" role="1oi0x0">
@@ -4597,7 +4597,7 @@
             <node concept="3cpWsn" id="1OShD0HUzFO" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="1OShD0HUzFP" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0HUzFQ" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0HUzFR" role="1oi0x0">
diff --git a/logic/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification.mps b/logic/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification.mps
index fb0c5b3b..b30c576c 100644
--- a/logic/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification.mps
+++ b/logic/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification.mps
@@ -8,8 +8,7 @@
     <use id="5dc5fc0d-37ef-4782-8192-8b5ce1f69f80" name="jetbrains.mps.baseLanguage.extensionMethods" version="0" />
   </languages>
   <imports>
-    <import index="ie8e" ref="r:ab2605ab-b4bc-4e80-a8ca-19a4a8465c01(jetbrains.mps.logic.atom)" />
-    <import index="yt73" ref="7526e0cf-1ce7-46f8-a555-9eca1e06c23b/java:jetbrains.mps.unification(jetbrains.mps.logic.atom/)" />
+    <import index="yt73" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.unification(jetbrains.mps.logic.reactor/)" />
     <import index="yg8f" ref="r:e213377a-f1a7-4ba7-9d08-96bcb97ed8ce(jetbrains.mps.logic.builtin)" />
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
     <import index="45ys" ref="r:7365f7fe-12e6-4229-8901-f6dc6d5df03f(jetbrains.mps.logic.reactor.logical)" />
@@ -19,6 +18,7 @@
     <import index="cxk7" ref="r:daa544a7-0a5c-49c0-a54c-4c2a5b4868aa(jetbrains.mps.logic.builtin.predicate)" />
     <import index="omn0" ref="r:4e44cb56-a834-45de-a0c4-c49a5c86e78e(jetbrains.mps.logic.builtin.solver)" />
     <import index="zx3l" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.core(jetbrains.mps.logic.reactor/)" />
+    <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.treeform)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
diff --git a/logic/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification@tests.mps b/logic/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification@tests.mps
index e8f655ba..2fe59a71 100644
--- a/logic/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification@tests.mps
+++ b/logic/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification@tests.mps
@@ -9,8 +9,7 @@
   </languages>
   <imports>
     <import index="mqqo" ref="r:82cec6f7-ddec-440c-961c-1c598267be42(jetbrains.mps.logic.test.unification)" />
-    <import index="ie8e" ref="r:ab2605ab-b4bc-4e80-a8ca-19a4a8465c01(jetbrains.mps.logic.atom)" />
-    <import index="yt73" ref="7526e0cf-1ce7-46f8-a555-9eca1e06c23b/java:jetbrains.mps.unification(jetbrains.mps.logic.atom/)" />
+    <import index="yt73" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.unification(jetbrains.mps.logic.reactor/)" />
     <import index="yg8f" ref="r:e213377a-f1a7-4ba7-9d08-96bcb97ed8ce(jetbrains.mps.logic.builtin)" />
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
     <import index="45ys" ref="r:7365f7fe-12e6-4229-8901-f6dc6d5df03f(jetbrains.mps.logic.reactor.logical)" />
@@ -21,6 +20,7 @@
     <import index="omn0" ref="r:4e44cb56-a834-45de-a0c4-c49a5c86e78e(jetbrains.mps.logic.builtin.solver)" />
     <import index="zx3l" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.core(jetbrains.mps.logic.reactor/)" />
     <import index="oy3s" ref="r:a6030cee-34eb-4503-b1bf-015fe5cd8c1a(jetbrains.mps.logic.builtin.unification)" />
+    <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.treeform)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -218,14 +218,14 @@
         <node concept="17QB3L" id="21Zu7ABuutu" role="1tU5fm" />
       </node>
       <node concept="3uibUv" id="1OShD0I14oi" role="3clF45">
-        <ref role="3uigEE" to="ie8e:uNmovXiEd4" resolve="Variable" />
+        <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
       </node>
       <node concept="3Tm6S6" id="1OShD0IfwAc" role="1B3o_S" />
       <node concept="3clFbS" id="21Zu7ABuubZ" role="3clF47">
         <node concept="3clFbF" id="21Zu7ABuuuo" role="3cqZAp">
           <node concept="10QFUN" id="1OShD0I14HQ" role="3clFbG">
             <node concept="2YIFZM" id="3mz2_dYuDAz" role="10QFUP">
-              <ref role="37wK5l" to="yg8f:4TCblo5YI1H" resolve="asAtom" />
+              <ref role="37wK5l" to="yg8f:4TCblo5YI1H" resolve="asTreeForm" />
               <ref role="1Pybhc" to="yg8f:677NV565N1x" resolve="LogicalUtil" />
               <node concept="2ShNRf" id="6yEjedm5rGN" role="37wK5m">
                 <node concept="1pGfFk" id="6yEjedm5sqz" role="2ShVmc">
@@ -237,7 +237,7 @@
                         <ref role="3cqZAo" node="21Zu7ABuute" resolve="name" />
                       </node>
                       <node concept="3VsKOn" id="6yEjedm5tU_" role="37wK5m">
-                        <ref role="3VsUkX" to="ie8e:5JQSuNswOXL" resolve="CompositeNode" />
+                        <ref role="3VsUkX" to="6exd:5JQSuNswOXL" resolve="CompositeNode" />
                       </node>
                     </node>
                   </node>
@@ -245,7 +245,7 @@
               </node>
             </node>
             <node concept="3uibUv" id="1OShD0I14Nx" role="10QFUM">
-              <ref role="3uigEE" to="ie8e:uNmovXiEd4" resolve="Variable" />
+              <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
             </node>
           </node>
         </node>
@@ -259,14 +259,14 @@
         <node concept="17QB3L" id="3mz2_dYxTYF" role="1tU5fm" />
       </node>
       <node concept="3uibUv" id="3mz2_dYxTYG" role="3clF45">
-        <ref role="3uigEE" to="ie8e:uNmovXiEd4" resolve="Variable" />
+        <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
       </node>
       <node concept="3Tm6S6" id="3mz2_dYxTYH" role="1B3o_S" />
       <node concept="3clFbS" id="3mz2_dYxTYI" role="3clF47">
         <node concept="3clFbF" id="3mz2_dYxTYJ" role="3cqZAp">
           <node concept="10QFUN" id="3mz2_dYxTYK" role="3clFbG">
             <node concept="2YIFZM" id="3mz2_dYxTYL" role="10QFUP">
-              <ref role="37wK5l" to="yg8f:4TCblo5YI1H" resolve="asAtom" />
+              <ref role="37wK5l" to="yg8f:4TCblo5YI1H" resolve="asTreeForm" />
               <ref role="1Pybhc" to="yg8f:677NV565N1x" resolve="LogicalUtil" />
               <node concept="2ShNRf" id="6yEjedm5vBK" role="37wK5m">
                 <node concept="1pGfFk" id="6yEjedm5vBL" role="2ShVmc">
@@ -278,7 +278,7 @@
                         <ref role="3cqZAo" node="3mz2_dYxTYE" resolve="name" />
                       </node>
                       <node concept="3VsKOn" id="6yEjedm5vBP" role="37wK5m">
-                        <ref role="3VsUkX" to="ie8e:3OPtF03lco4" resolve="ListNode" />
+                        <ref role="3VsUkX" to="6exd:3OPtF03lco4" resolve="ListNode" />
                       </node>
                     </node>
                   </node>
@@ -286,7 +286,7 @@
               </node>
             </node>
             <node concept="3uibUv" id="3mz2_dYxTYV" role="10QFUM">
-              <ref role="3uigEE" to="ie8e:uNmovXiEd4" resolve="Variable" />
+              <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
             </node>
           </node>
         </node>
@@ -296,17 +296,17 @@
     <node concept="3clFb_" id="5cGCTtqzoJK" role="jymVt">
       <property role="TrG5h" value="wildcard" />
       <node concept="3uibUv" id="5cGCTtqzoJN" role="3clF45">
-        <ref role="3uigEE" to="ie8e:uNmovXiEd4" resolve="Variable" />
+        <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
       </node>
       <node concept="3Tm6S6" id="5cGCTtqzoJO" role="1B3o_S" />
       <node concept="3clFbS" id="5cGCTtqzoJP" role="3clF47">
         <node concept="3clFbF" id="5cGCTtqzoJQ" role="3cqZAp">
           <node concept="10QFUN" id="5cGCTtqzoJR" role="3clFbG">
             <node concept="3uibUv" id="5cGCTtqzoJY" role="10QFUM">
-              <ref role="3uigEE" to="ie8e:uNmovXiEd4" resolve="Variable" />
+              <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
             </node>
             <node concept="2YIFZM" id="3mz2_dYuDM0" role="10QFUP">
-              <ref role="37wK5l" to="yg8f:4TCblo5YI1H" resolve="asAtom" />
+              <ref role="37wK5l" to="yg8f:4TCblo5YI1H" resolve="asTreeForm" />
               <ref role="1Pybhc" to="yg8f:677NV565N1x" resolve="LogicalUtil" />
               <node concept="2ShNRf" id="5cGCTtqzoJT" role="37wK5m">
                 <node concept="1pGfFk" id="6yEjedm5xLL" role="2ShVmc">
@@ -315,12 +315,12 @@
                     <node concept="1pGfFk" id="6yEjedm6$Su" role="2ShVmc">
                       <ref role="37wK5l" to="45ys:7nPD14NON$Y" resolve="MetaLogical" />
                       <node concept="3VsKOn" id="6yEjedm6_je" role="37wK5m">
-                        <ref role="3VsUkX" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                        <ref role="3VsUkX" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                       </node>
                     </node>
                   </node>
                   <node concept="3uibUv" id="6yEjedm5xWn" role="1pMfVU">
-                    <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                    <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                   </node>
                 </node>
               </node>
@@ -341,7 +341,7 @@
             <node concept="3cpWsn" id="fHk0tWu_Mt" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="fHk0tWu_Mu" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="fHk0tWuK3B" role="33vP2m">
                 <node concept="1oi5UN" id="fHk0tWuK7X" role="1oi0x0" />
@@ -352,7 +352,7 @@
             <node concept="3cpWsn" id="fHk0tWuKa4" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="fHk0tWuKa5" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="fHk0tWuKa6" role="33vP2m">
                 <node concept="1oi5UN" id="fHk0tWuKa7" role="1oi0x0" />
@@ -388,7 +388,7 @@
             <node concept="3cpWsn" id="21Zu7ABuiLB" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="21Zu7ABuiLC" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="21Zu7ABuiLD" role="33vP2m">
                 <node concept="1oi5UN" id="21Zu7ABuiLE" role="1oi0x0">
@@ -406,7 +406,7 @@
             <node concept="3cpWsn" id="21Zu7ABuiLH" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="21Zu7ABuiLI" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="21Zu7ABuiLJ" role="33vP2m">
                 <node concept="1oi5UN" id="21Zu7ABun6y" role="1oi0x0">
@@ -449,7 +449,7 @@
             <node concept="3cpWsn" id="53iOybEHDaF" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="53iOybEHDaG" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="53iOybEHDaH" role="33vP2m">
                 <node concept="1oi5UN" id="53iOybEHDaI" role="1oi0x0">
@@ -467,7 +467,7 @@
             <node concept="3cpWsn" id="53iOybEHDaM" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="53iOybEHDaN" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="53iOybEHDaO" role="33vP2m">
                 <node concept="1oi5UN" id="53iOybEHDaP" role="1oi0x0">
@@ -518,7 +518,7 @@
             <node concept="3cpWsn" id="21Zu7ABunhN" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="21Zu7ABunhO" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="21Zu7ABunhP" role="33vP2m">
                 <node concept="1oi5UN" id="21Zu7ABunhQ" role="1oi0x0">
@@ -551,7 +551,7 @@
             <node concept="3cpWsn" id="21Zu7ABunhW" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="21Zu7ABunhX" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="21Zu7ABunhY" role="33vP2m">
                 <node concept="1oi5UN" id="21Zu7ABunhZ" role="1oi0x0">
@@ -609,7 +609,7 @@
             <node concept="3cpWsn" id="21Zu7ABupTt" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="21Zu7ABupTu" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="21Zu7ABupTv" role="33vP2m">
                 <node concept="1oi5UN" id="21Zu7ABupTw" role="1oi0x0">
@@ -640,7 +640,7 @@
             <node concept="3cpWsn" id="21Zu7ABupTD" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="21Zu7ABupTE" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="21Zu7ABupTF" role="33vP2m">
                 <node concept="1oi5UN" id="21Zu7ABupTG" role="1oi0x0">
@@ -698,7 +698,7 @@
             <node concept="3cpWsn" id="1OShD0I0umo" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="1OShD0I0ump" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0I0umq" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0I0umr" role="1oi0x0">
@@ -737,7 +737,7 @@
             <node concept="3cpWsn" id="1OShD0I0umz" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="1OShD0I0um$" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0I0um_" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0I0umA" role="1oi0x0">
@@ -793,7 +793,7 @@
             <node concept="3cpWsn" id="1OShD0I168P" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="1OShD0I168Q" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0I168R" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0I168S" role="1oi0x0">
@@ -832,7 +832,7 @@
             <node concept="3cpWsn" id="1OShD0I16sw" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="1OShD0I16sx" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0I16sy" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0I16sz" role="1oi0x0">
@@ -898,7 +898,7 @@
             <node concept="3cpWsn" id="1OShD0I1vD7" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="1OShD0I1vD8" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0I1vD9" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0I1vDa" role="1oi0x0">
@@ -937,7 +937,7 @@
             <node concept="3cpWsn" id="1OShD0I1vDm" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="1OShD0I1vDn" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0I1vDo" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0I1vDp" role="1oi0x0">
@@ -1008,7 +1008,7 @@
             <node concept="3cpWsn" id="1OShD0If5uE" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="1OShD0If5uF" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0If5uG" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0If5uH" role="1oi0x0">
@@ -1030,7 +1030,7 @@
             <node concept="3cpWsn" id="1OShD0If5uT" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="1OShD0If5uU" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0If5uV" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0If5uW" role="1oi0x0">
@@ -1084,7 +1084,7 @@
             <node concept="3cpWsn" id="5_6ImQYXLIP" role="3cpWs9">
               <property role="TrG5h" value="foo" />
               <node concept="3uibUv" id="5_6ImQYXLIN" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="5_6ImQYXLIQ" role="33vP2m">
                 <node concept="1oi5UN" id="5_6ImQYXLIR" role="1oi0x0">
@@ -1102,7 +1102,7 @@
             <node concept="3cpWsn" id="5_6ImQYXLKw" role="3cpWs9">
               <property role="TrG5h" value="bar" />
               <node concept="3uibUv" id="5_6ImQYXLKx" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="5_6ImQYXLKy" role="33vP2m">
                 <node concept="1oi5UN" id="5_6ImQYXLKz" role="1oi0x0">
@@ -1120,7 +1120,7 @@
             <node concept="3cpWsn" id="5_6ImQYXLLI" role="3cpWs9">
               <property role="TrG5h" value="bazz" />
               <node concept="3uibUv" id="5_6ImQYXLLJ" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="5_6ImQYXLLK" role="33vP2m">
                 <node concept="1oi5UN" id="5_6ImQYXLLL" role="1oi0x0">
@@ -1138,7 +1138,7 @@
             <node concept="3cpWsn" id="5_6ImQYXLG2" role="3cpWs9">
               <property role="TrG5h" value="list1" />
               <node concept="3uibUv" id="5_6ImQYXLG0" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="5_6ImQYXLG3" role="33vP2m">
                 <node concept="1oi5ST" id="5_6ImQYXLG4" role="1oi0x0">
@@ -1175,7 +1175,7 @@
             <node concept="3cpWsn" id="5_6ImQYXM2W" role="3cpWs9">
               <property role="TrG5h" value="head" />
               <node concept="3uibUv" id="5_6ImQYXM2U" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="5_6ImQYXM2X" role="33vP2m">
                 <ref role="37wK5l" node="21Zu7ABuubV" resolve="var" />
@@ -1189,7 +1189,7 @@
             <node concept="3cpWsn" id="5_6ImQYXM86" role="3cpWs9">
               <property role="TrG5h" value="tail" />
               <node concept="3uibUv" id="5_6ImQYXM87" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="5_6ImQYXM88" role="33vP2m">
                 <ref role="37wK5l" node="3mz2_dYxTYD" resolve="listVar" />
@@ -1203,7 +1203,7 @@
             <node concept="3cpWsn" id="5_6ImQYXR4P" role="3cpWs9">
               <property role="TrG5h" value="list2" />
               <node concept="3uibUv" id="5_6ImQYXR4Q" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="5_6ImQYXRaB" role="33vP2m">
                 <node concept="1oi5ST" id="5_6ImQYXRaS" role="1oi0x0">
@@ -1266,7 +1266,7 @@
             <node concept="3cpWsn" id="5_6ImQYY0qW" role="3cpWs9">
               <property role="TrG5h" value="expectedTail" />
               <node concept="3uibUv" id="5_6ImQYY0qN" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="5_6ImQYY0qX" role="33vP2m">
                 <node concept="KCUsM" id="5_6ImQYY0qY" role="1oi0x0">
@@ -1277,7 +1277,7 @@
                           <ref role="3cqZAo" node="5_6ImQYXLKw" resolve="bar" />
                         </node>
                         <node concept="liA8E" id="5_6ImQYY0r3" role="2OqNvi">
-                          <ref role="37wK5l" to="ie8e:2QE4RCGndD7" resolve="asRoot" />
+                          <ref role="37wK5l" to="6exd:2QE4RCGndD7" resolve="asRoot" />
                         </node>
                       </node>
                     </node>
@@ -1289,7 +1289,7 @@
                           <ref role="3cqZAo" node="5_6ImQYXLLI" resolve="bazz" />
                         </node>
                         <node concept="liA8E" id="5_6ImQYY0r8" role="2OqNvi">
-                          <ref role="37wK5l" to="ie8e:2QE4RCGndD7" resolve="asRoot" />
+                          <ref role="37wK5l" to="6exd:2QE4RCGndD7" resolve="asRoot" />
                         </node>
                       </node>
                     </node>
@@ -1325,7 +1325,7 @@
             <node concept="3cpWsn" id="5_6ImQYY3rf" role="3cpWs9">
               <property role="TrG5h" value="foo" />
               <node concept="3uibUv" id="5_6ImQYY3rg" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="5_6ImQYY3rh" role="33vP2m">
                 <node concept="1oi5UN" id="5_6ImQYY3ri" role="1oi0x0">
@@ -1343,7 +1343,7 @@
             <node concept="3cpWsn" id="5_6ImQYY3r$" role="3cpWs9">
               <property role="TrG5h" value="list1" />
               <node concept="3uibUv" id="5_6ImQYY3r_" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="5_6ImQYY3rA" role="33vP2m">
                 <node concept="1oi5ST" id="5_6ImQYY3rB" role="1oi0x0">
@@ -1366,7 +1366,7 @@
             <node concept="3cpWsn" id="5_6ImQYY3rO" role="3cpWs9">
               <property role="TrG5h" value="head" />
               <node concept="3uibUv" id="5_6ImQYY3rP" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="5_6ImQYY3rQ" role="33vP2m">
                 <ref role="37wK5l" node="21Zu7ABuubV" resolve="var" />
@@ -1380,7 +1380,7 @@
             <node concept="3cpWsn" id="5_6ImQYY3rT" role="3cpWs9">
               <property role="TrG5h" value="tail" />
               <node concept="3uibUv" id="5_6ImQYY3rU" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="5_6ImQYY3rV" role="33vP2m">
                 <ref role="37wK5l" node="3mz2_dYxTYD" resolve="listVar" />
@@ -1394,7 +1394,7 @@
             <node concept="3cpWsn" id="5_6ImQYY3rY" role="3cpWs9">
               <property role="TrG5h" value="list2" />
               <node concept="3uibUv" id="5_6ImQYY3rZ" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="5_6ImQYY3s0" role="33vP2m">
                 <node concept="1oi5ST" id="5_6ImQYY3s1" role="1oi0x0">
@@ -1457,7 +1457,7 @@
             <node concept="3cpWsn" id="5_6ImQYY3so" role="3cpWs9">
               <property role="TrG5h" value="expectedTail" />
               <node concept="3uibUv" id="5_6ImQYY3sp" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="5_6ImQYY3sq" role="33vP2m">
                 <node concept="KCUsM" id="5_6ImQYY3sr" role="1oi0x0" />
@@ -1491,7 +1491,7 @@
             <node concept="3cpWsn" id="5_6ImQYY68i" role="3cpWs9">
               <property role="TrG5h" value="list1" />
               <node concept="3uibUv" id="5_6ImQYY68j" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="5_6ImQYY68k" role="33vP2m">
                 <node concept="1oi5ST" id="5_6ImQYY68l" role="1oi0x0">
@@ -1506,7 +1506,7 @@
             <node concept="3cpWsn" id="5_6ImQYY68s" role="3cpWs9">
               <property role="TrG5h" value="head" />
               <node concept="3uibUv" id="5_6ImQYY68t" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="5_6ImQYY68u" role="33vP2m">
                 <ref role="37wK5l" node="21Zu7ABuubV" resolve="var" />
@@ -1520,7 +1520,7 @@
             <node concept="3cpWsn" id="5_6ImQYY68x" role="3cpWs9">
               <property role="TrG5h" value="tail" />
               <node concept="3uibUv" id="5_6ImQYY68y" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="5_6ImQYY68z" role="33vP2m">
                 <ref role="37wK5l" node="21Zu7ABuubV" resolve="var" />
@@ -1534,7 +1534,7 @@
             <node concept="3cpWsn" id="5_6ImQYY68A" role="3cpWs9">
               <property role="TrG5h" value="list2" />
               <node concept="3uibUv" id="5_6ImQYY68B" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="5_6ImQYY68C" role="33vP2m">
                 <node concept="1oi5ST" id="5_6ImQYY68D" role="1oi0x0">
@@ -1664,7 +1664,7 @@
         <node concept="17QB3L" id="6yEjedm71gS" role="1tU5fm" />
       </node>
       <node concept="3uibUv" id="6yEjedm71gT" role="3clF45">
-        <ref role="3uigEE" to="ie8e:uNmovXiEd4" resolve="Variable" />
+        <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
       </node>
       <node concept="3Tm6S6" id="6yEjedm71gU" role="1B3o_S" />
       <node concept="3clFbS" id="6yEjedm71gV" role="3clF47">
@@ -1672,7 +1672,7 @@
           <node concept="10QFUN" id="6yEjedm71gX" role="3clFbG">
             <node concept="2YIFZM" id="6yEjedm71gY" role="10QFUP">
               <ref role="1Pybhc" to="yg8f:677NV565N1x" resolve="LogicalUtil" />
-              <ref role="37wK5l" to="yg8f:4TCblo5YI1H" resolve="asAtom" />
+              <ref role="37wK5l" to="yg8f:4TCblo5YI1H" resolve="asTreeForm" />
               <node concept="2ShNRf" id="6yEjedm71gZ" role="37wK5m">
                 <node concept="1pGfFk" id="6yEjedm71h0" role="2ShVmc">
                   <ref role="37wK5l" to="zx3l:~MemLogical.&lt;init&gt;(jetbrains.mps.logic.reactor.logical.MetaLogical)" resolve="MemLogical" />
@@ -1683,7 +1683,7 @@
                         <ref role="3cqZAo" node="6yEjedm71gR" resolve="name" />
                       </node>
                       <node concept="3VsKOn" id="6yEjedm71h4" role="37wK5m">
-                        <ref role="3VsUkX" to="ie8e:5JQSuNswOXL" resolve="CompositeNode" />
+                        <ref role="3VsUkX" to="6exd:5JQSuNswOXL" resolve="CompositeNode" />
                       </node>
                     </node>
                   </node>
@@ -1691,7 +1691,7 @@
               </node>
             </node>
             <node concept="3uibUv" id="6yEjedm71h5" role="10QFUM">
-              <ref role="3uigEE" to="ie8e:uNmovXiEd4" resolve="Variable" />
+              <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
             </node>
           </node>
         </node>
@@ -1705,14 +1705,14 @@
         <node concept="17QB3L" id="6yEjedm71h9" role="1tU5fm" />
       </node>
       <node concept="3uibUv" id="6yEjedm71ha" role="3clF45">
-        <ref role="3uigEE" to="ie8e:uNmovXiEd4" resolve="Variable" />
+        <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
       </node>
       <node concept="3Tm6S6" id="6yEjedm71hb" role="1B3o_S" />
       <node concept="3clFbS" id="6yEjedm71hc" role="3clF47">
         <node concept="3clFbF" id="6yEjedm71hd" role="3cqZAp">
           <node concept="10QFUN" id="6yEjedm71he" role="3clFbG">
             <node concept="2YIFZM" id="6yEjedm71hf" role="10QFUP">
-              <ref role="37wK5l" to="yg8f:4TCblo5YI1H" resolve="asAtom" />
+              <ref role="37wK5l" to="yg8f:4TCblo5YI1H" resolve="asTreeForm" />
               <ref role="1Pybhc" to="yg8f:677NV565N1x" resolve="LogicalUtil" />
               <node concept="2ShNRf" id="6yEjedm71hg" role="37wK5m">
                 <node concept="1pGfFk" id="6yEjedm71hh" role="2ShVmc">
@@ -1724,7 +1724,7 @@
                         <ref role="3cqZAo" node="6yEjedm71h8" resolve="name" />
                       </node>
                       <node concept="3VsKOn" id="6yEjedm71hl" role="37wK5m">
-                        <ref role="3VsUkX" to="ie8e:3OPtF03lco4" resolve="ListNode" />
+                        <ref role="3VsUkX" to="6exd:3OPtF03lco4" resolve="ListNode" />
                       </node>
                     </node>
                   </node>
@@ -1732,7 +1732,7 @@
               </node>
             </node>
             <node concept="3uibUv" id="6yEjedm71hm" role="10QFUM">
-              <ref role="3uigEE" to="ie8e:uNmovXiEd4" resolve="Variable" />
+              <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
             </node>
           </node>
         </node>
@@ -1742,18 +1742,18 @@
     <node concept="3clFb_" id="6yEjedm71ho" role="jymVt">
       <property role="TrG5h" value="wildcard" />
       <node concept="3uibUv" id="6yEjedm71hp" role="3clF45">
-        <ref role="3uigEE" to="ie8e:uNmovXiEd4" resolve="Variable" />
+        <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
       </node>
       <node concept="3Tm6S6" id="6yEjedm71hq" role="1B3o_S" />
       <node concept="3clFbS" id="6yEjedm71hr" role="3clF47">
         <node concept="3clFbF" id="6yEjedm71hs" role="3cqZAp">
           <node concept="10QFUN" id="6yEjedm71ht" role="3clFbG">
             <node concept="3uibUv" id="6yEjedm71hu" role="10QFUM">
-              <ref role="3uigEE" to="ie8e:uNmovXiEd4" resolve="Variable" />
+              <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
             </node>
             <node concept="2YIFZM" id="6yEjedm71hv" role="10QFUP">
               <ref role="1Pybhc" to="yg8f:677NV565N1x" resolve="LogicalUtil" />
-              <ref role="37wK5l" to="yg8f:4TCblo5YI1H" resolve="asAtom" />
+              <ref role="37wK5l" to="yg8f:4TCblo5YI1H" resolve="asTreeForm" />
               <node concept="2ShNRf" id="6yEjedm71hw" role="37wK5m">
                 <node concept="1pGfFk" id="6yEjedm71hx" role="2ShVmc">
                   <ref role="37wK5l" to="zx3l:~MemLogical.&lt;init&gt;(java.lang.Object)" resolve="MemLogical" />
@@ -1761,12 +1761,12 @@
                     <node concept="1pGfFk" id="6yEjedm71hz" role="2ShVmc">
                       <ref role="37wK5l" to="45ys:7nPD14NON$Y" resolve="MetaLogical" />
                       <node concept="3VsKOn" id="6yEjedm71h$" role="37wK5m">
-                        <ref role="3VsUkX" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                        <ref role="3VsUkX" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                       </node>
                     </node>
                   </node>
                   <node concept="3uibUv" id="6yEjedm71h_" role="1pMfVU">
-                    <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                    <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                   </node>
                 </node>
               </node>
@@ -1779,17 +1779,17 @@
     <node concept="3clFb_" id="7nuzzkr25as" role="jymVt">
       <property role="TrG5h" value="wildcard" />
       <node concept="3uibUv" id="7nuzzkr25at" role="3clF45">
-        <ref role="3uigEE" to="ie8e:uNmovXiEd4" resolve="Variable" />
+        <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
       </node>
       <node concept="3Tm6S6" id="7nuzzkr25au" role="1B3o_S" />
       <node concept="3clFbS" id="7nuzzkr25av" role="3clF47">
         <node concept="3clFbF" id="7nuzzkr25aw" role="3cqZAp">
           <node concept="10QFUN" id="7nuzzkr25ax" role="3clFbG">
             <node concept="3uibUv" id="7nuzzkr25aB" role="10QFUM">
-              <ref role="3uigEE" to="ie8e:uNmovXiEd4" resolve="Variable" />
+              <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
             </node>
             <node concept="2YIFZM" id="3mz2_dYuEZO" role="10QFUP">
-              <ref role="37wK5l" to="yg8f:4TCblo5YI1H" resolve="asAtom" />
+              <ref role="37wK5l" to="yg8f:4TCblo5YI1H" resolve="asTreeForm" />
               <ref role="1Pybhc" to="yg8f:677NV565N1x" resolve="LogicalUtil" />
               <node concept="2ShNRf" id="7nuzzkr25az" role="37wK5m">
                 <node concept="1pGfFk" id="7nuzzkr25a$" role="2ShVmc">
@@ -1798,7 +1798,7 @@
                     <node concept="1pGfFk" id="6yEjedm9KbK" role="2ShVmc">
                       <ref role="37wK5l" to="45ys:7nPD14NON$Y" resolve="MetaLogical" />
                       <node concept="3VsKOn" id="6yEjedm9KAr" role="37wK5m">
-                        <ref role="3VsUkX" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                        <ref role="3VsUkX" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                       </node>
                     </node>
                   </node>
@@ -1819,7 +1819,7 @@
       <node concept="37vLTG" id="1OShD0IfFeh" role="3clF46">
         <property role="TrG5h" value="var" />
         <node concept="3uibUv" id="1OShD0IfFfg" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:uNmovXiEd4" resolve="Variable" />
+          <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
         </node>
       </node>
       <node concept="3uibUv" id="5p8T3QHH7gN" role="3clF45">
@@ -1859,7 +1859,7 @@
             <node concept="3cpWsn" id="1OShD0IfHOE" role="3cpWs9">
               <property role="TrG5h" value="x" />
               <node concept="3uibUv" id="1OShD0IfHOC" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="1OShD0IfHOF" role="33vP2m">
                 <ref role="37wK5l" node="6yEjedm71gQ" resolve="var" />
@@ -1873,7 +1873,7 @@
             <node concept="3cpWsn" id="1OShD0IfuGw" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="1OShD0IfuGx" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0IfuGy" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0IfuGz" role="1oi0x0">
@@ -1901,7 +1901,7 @@
             <node concept="3cpWsn" id="1OShD0IfHTY" role="3cpWs9">
               <property role="TrG5h" value="y" />
               <node concept="3uibUv" id="1OShD0IfHTV" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="1OShD0IfHTZ" role="33vP2m">
                 <ref role="37wK5l" node="6yEjedm71gQ" resolve="var" />
@@ -1915,7 +1915,7 @@
             <node concept="3cpWsn" id="1OShD0IfuGF" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="1OShD0IfuGG" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0IfuGH" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0IfuGI" role="1oi0x0">
@@ -2003,7 +2003,7 @@
             <node concept="3cpWsn" id="3HJTsBn443b" role="3cpWs9">
               <property role="TrG5h" value="x" />
               <node concept="3uibUv" id="3HJTsBn443c" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="3HJTsBn443d" role="33vP2m">
                 <ref role="37wK5l" node="6yEjedm71gQ" resolve="var" />
@@ -2017,7 +2017,7 @@
             <node concept="3cpWsn" id="3HJTsBn443g" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="3HJTsBn443h" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="3HJTsBn443i" role="33vP2m">
                 <node concept="1oi5UN" id="3HJTsBn443j" role="1oi0x0">
@@ -2051,7 +2051,7 @@
             <node concept="3cpWsn" id="3HJTsBn443w" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="3HJTsBn443x" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="3HJTsBn443y" role="33vP2m">
                 <node concept="1oi5UN" id="3HJTsBn443z" role="1oi0x0">
@@ -2139,7 +2139,7 @@
             <node concept="3cpWsn" id="4XqG8ivynhL" role="3cpWs9">
               <property role="TrG5h" value="x" />
               <node concept="3uibUv" id="4XqG8ivynhM" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="4XqG8ivynhN" role="33vP2m">
                 <ref role="37wK5l" node="6yEjedm71gQ" resolve="var" />
@@ -2153,7 +2153,7 @@
             <node concept="3cpWsn" id="4XqG8ivynhQ" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="4XqG8ivynhR" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="4XqG8ivynhS" role="33vP2m">
                 <node concept="1oi5UN" id="4XqG8ivynhT" role="1oi0x0">
@@ -2187,7 +2187,7 @@
             <node concept="3cpWsn" id="4XqG8ivy$Me" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="4XqG8ivy$Mf" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="4XqG8ivy$Mg" role="33vP2m">
                 <node concept="1oi5UN" id="4XqG8ivy$Mh" role="1oi0x0">
@@ -2217,7 +2217,7 @@
             <node concept="3cpWsn" id="4XqG8ivyni3" role="3cpWs9">
               <property role="TrG5h" value="c" />
               <node concept="3uibUv" id="4XqG8ivyni4" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="4XqG8ivyni5" role="33vP2m">
                 <node concept="1oi5UN" id="4XqG8ivyni6" role="1oi0x0">
@@ -2240,7 +2240,7 @@
             <node concept="3cpWsn" id="4XqG8ivy_$I" role="3cpWs9">
               <property role="TrG5h" value="d" />
               <node concept="3uibUv" id="4XqG8ivy_$J" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="4XqG8ivy_$K" role="33vP2m">
                 <node concept="1oi5UN" id="4XqG8ivy_$L" role="1oi0x0">
@@ -2380,7 +2380,7 @@
             <node concept="3cpWsn" id="1OShD0IfNC5" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="1OShD0IfNC6" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0IfNC7" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0IfNC8" role="1oi0x0">
@@ -2409,7 +2409,7 @@
             <node concept="3cpWsn" id="1OShD0IfO6H" role="3cpWs9">
               <property role="TrG5h" value="x" />
               <node concept="3uibUv" id="1OShD0IfO6F" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="1OShD0IfO6I" role="33vP2m">
                 <ref role="37wK5l" node="6yEjedm71gQ" resolve="var" />
@@ -2423,7 +2423,7 @@
             <node concept="3cpWsn" id="1OShD0IfNCg" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="1OShD0IfNCh" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0IfNCi" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0IfNCj" role="1oi0x0">
@@ -2451,7 +2451,7 @@
             <node concept="3cpWsn" id="1OShD0IfP49" role="3cpWs9">
               <property role="TrG5h" value="y" />
               <node concept="3uibUv" id="1OShD0IfP4a" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="1OShD0IfP4b" role="33vP2m">
                 <ref role="37wK5l" node="6yEjedm71gQ" resolve="var" />
@@ -2465,7 +2465,7 @@
             <node concept="3cpWsn" id="1OShD0IfOZy" role="3cpWs9">
               <property role="TrG5h" value="c" />
               <node concept="3uibUv" id="1OShD0IfOZz" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0IfOZ$" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0IfOZ_" role="1oi0x0">
@@ -2496,7 +2496,7 @@
                 <ref role="3cqZAo" node="1OShD0IfO6H" resolve="x" />
               </node>
               <node concept="liA8E" id="3mz2_dYyyKt" role="2OqNvi">
-                <ref role="37wK5l" to="ie8e:56MMu0Ark7v" resolve="get" />
+                <ref role="37wK5l" to="6exd:56MMu0Ark7v" resolve="get" />
               </node>
             </node>
           </node>
@@ -2506,7 +2506,7 @@
                 <ref role="3cqZAo" node="1OShD0IfP49" resolve="y" />
               </node>
               <node concept="liA8E" id="3mz2_dYyyKx" role="2OqNvi">
-                <ref role="37wK5l" to="ie8e:56MMu0Ark7v" resolve="get" />
+                <ref role="37wK5l" to="6exd:56MMu0Ark7v" resolve="get" />
               </node>
             </node>
           </node>
@@ -2517,7 +2517,7 @@
                   <ref role="3cqZAo" node="1OShD0IfP49" resolve="y" />
                 </node>
                 <node concept="liA8E" id="3mz2_dYyyKA" role="2OqNvi">
-                  <ref role="37wK5l" to="ie8e:56MMu0Ark7v" resolve="get" />
+                  <ref role="37wK5l" to="6exd:56MMu0Ark7v" resolve="get" />
                 </node>
               </node>
               <node concept="2OqwBi" id="3mz2_dYyyKB" role="3uHU7B">
@@ -2525,7 +2525,7 @@
                   <ref role="3cqZAo" node="1OShD0IfO6H" resolve="x" />
                 </node>
                 <node concept="liA8E" id="3mz2_dYyyKD" role="2OqNvi">
-                  <ref role="37wK5l" to="ie8e:56MMu0Ark7v" resolve="get" />
+                  <ref role="37wK5l" to="6exd:56MMu0Ark7v" resolve="get" />
                 </node>
               </node>
             </node>
@@ -2595,7 +2595,7 @@
                 <ref role="3cqZAo" node="1OShD0IfO6H" resolve="x" />
               </node>
               <node concept="liA8E" id="3mz2_dYyzcE" role="2OqNvi">
-                <ref role="37wK5l" to="ie8e:56MMu0Ark7v" resolve="get" />
+                <ref role="37wK5l" to="6exd:56MMu0Ark7v" resolve="get" />
               </node>
             </node>
             <node concept="2OqwBi" id="3mz2_dYyzcF" role="3tpDZA">
@@ -2603,7 +2603,7 @@
                 <ref role="3cqZAo" node="1OShD0IfP49" resolve="y" />
               </node>
               <node concept="liA8E" id="3mz2_dYyzcH" role="2OqNvi">
-                <ref role="37wK5l" to="ie8e:56MMu0Ark7v" resolve="get" />
+                <ref role="37wK5l" to="6exd:56MMu0Ark7v" resolve="get" />
               </node>
             </node>
           </node>
@@ -2612,7 +2612,7 @@
             <node concept="3cpWsn" id="1OShD0IfO_f" role="3cpWs9">
               <property role="TrG5h" value="s" />
               <node concept="3uibUv" id="1OShD0IfO_g" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0IfO_h" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0IfO_k" role="1oi0x0">
@@ -2630,7 +2630,7 @@
             <node concept="3cpWsn" id="1OShD0IfOGV" role="3cpWs9">
               <property role="TrG5h" value="t" />
               <node concept="3uibUv" id="1OShD0IfOGW" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0IfOGX" role="33vP2m">
                 <node concept="1oi5UN" id="677NV56wbOC" role="1oi0x0">
@@ -2682,7 +2682,7 @@
             <node concept="3cpWsn" id="4XqG8ivylQZ" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="4XqG8ivylR0" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="4XqG8ivylR1" role="33vP2m">
                 <node concept="1oi5UN" id="4XqG8ivylR2" role="1oi0x0">
@@ -2711,7 +2711,7 @@
             <node concept="3cpWsn" id="4XqG8ivylRa" role="3cpWs9">
               <property role="TrG5h" value="x" />
               <node concept="3uibUv" id="4XqG8ivylRb" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="4XqG8ivylRc" role="33vP2m">
                 <ref role="37wK5l" node="6yEjedm71gQ" resolve="var" />
@@ -2725,7 +2725,7 @@
             <node concept="3cpWsn" id="4XqG8ivylRf" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="4XqG8ivylRg" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="4XqG8ivylRh" role="33vP2m">
                 <node concept="1oi5UN" id="4XqG8ivylRi" role="1oi0x0">
@@ -2754,7 +2754,7 @@
             <node concept="3cpWsn" id="4XqG8ivylRq" role="3cpWs9">
               <property role="TrG5h" value="y" />
               <node concept="3uibUv" id="4XqG8ivylRr" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="4XqG8ivylRs" role="33vP2m">
                 <ref role="37wK5l" node="6yEjedm71gQ" resolve="var" />
@@ -2768,7 +2768,7 @@
             <node concept="3cpWsn" id="4XqG8ivylRv" role="3cpWs9">
               <property role="TrG5h" value="c" />
               <node concept="3uibUv" id="4XqG8ivylRw" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="4XqG8ivylRx" role="33vP2m">
                 <node concept="1oi5UN" id="4XqG8ivylRy" role="1oi0x0">
@@ -2799,7 +2799,7 @@
                 <ref role="3cqZAo" node="4XqG8ivylRa" resolve="x" />
               </node>
               <node concept="liA8E" id="3mz2_dYylmd" role="2OqNvi">
-                <ref role="37wK5l" to="ie8e:56MMu0Ark7v" resolve="get" />
+                <ref role="37wK5l" to="6exd:56MMu0Ark7v" resolve="get" />
               </node>
             </node>
           </node>
@@ -2809,7 +2809,7 @@
                 <ref role="3cqZAo" node="4XqG8ivylRq" resolve="y" />
               </node>
               <node concept="liA8E" id="3mz2_dYylm_" role="2OqNvi">
-                <ref role="37wK5l" to="ie8e:56MMu0Ark7v" resolve="get" />
+                <ref role="37wK5l" to="6exd:56MMu0Ark7v" resolve="get" />
               </node>
             </node>
           </node>
@@ -2820,7 +2820,7 @@
                   <ref role="3cqZAo" node="4XqG8ivylRq" resolve="y" />
                 </node>
                 <node concept="liA8E" id="3mz2_dYyuoZ" role="2OqNvi">
-                  <ref role="37wK5l" to="ie8e:56MMu0Ark7v" resolve="get" />
+                  <ref role="37wK5l" to="6exd:56MMu0Ark7v" resolve="get" />
                 </node>
               </node>
               <node concept="2OqwBi" id="3mz2_dYyu5J" role="3uHU7B">
@@ -2828,7 +2828,7 @@
                   <ref role="3cqZAo" node="4XqG8ivylRa" resolve="x" />
                 </node>
                 <node concept="liA8E" id="3mz2_dYyudo" role="2OqNvi">
-                  <ref role="37wK5l" to="ie8e:56MMu0Ark7v" resolve="get" />
+                  <ref role="37wK5l" to="6exd:56MMu0Ark7v" resolve="get" />
                 </node>
               </node>
             </node>
@@ -2898,7 +2898,7 @@
                 <ref role="3cqZAo" node="4XqG8ivylRa" resolve="x" />
               </node>
               <node concept="liA8E" id="3mz2_dYym2e" role="2OqNvi">
-                <ref role="37wK5l" to="ie8e:56MMu0Ark7v" resolve="get" />
+                <ref role="37wK5l" to="6exd:56MMu0Ark7v" resolve="get" />
               </node>
             </node>
             <node concept="2OqwBi" id="3mz2_dYymac" role="3tpDZA">
@@ -2906,7 +2906,7 @@
                 <ref role="3cqZAo" node="4XqG8ivylRq" resolve="y" />
               </node>
               <node concept="liA8E" id="3mz2_dYymhu" role="2OqNvi">
-                <ref role="37wK5l" to="ie8e:56MMu0Ark7v" resolve="get" />
+                <ref role="37wK5l" to="6exd:56MMu0Ark7v" resolve="get" />
               </node>
             </node>
           </node>
@@ -2915,7 +2915,7 @@
             <node concept="3cpWsn" id="4XqG8ivylS2" role="3cpWs9">
               <property role="TrG5h" value="s" />
               <node concept="3uibUv" id="4XqG8ivylS3" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="4XqG8ivylS4" role="33vP2m">
                 <node concept="1oi5UN" id="4XqG8ivylS5" role="1oi0x0">
@@ -2933,7 +2933,7 @@
             <node concept="3cpWsn" id="4XqG8ivylS9" role="3cpWs9">
               <property role="TrG5h" value="t" />
               <node concept="3uibUv" id="4XqG8ivylSa" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="4XqG8ivylSb" role="33vP2m">
                 <node concept="1oi5UN" id="4XqG8ivylSc" role="1oi0x0">
@@ -2985,7 +2985,7 @@
             <node concept="3cpWsn" id="1OShD0IfW$y" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="1OShD0IfW$z" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0IfW$$" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0IfW$_" role="1oi0x0">
@@ -3024,7 +3024,7 @@
             <node concept="3cpWsn" id="1OShD0IfXUS" role="3cpWs9">
               <property role="TrG5h" value="x" />
               <node concept="3uibUv" id="1OShD0IfXUQ" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="1OShD0IfXUT" role="33vP2m">
                 <ref role="37wK5l" node="6yEjedm71gQ" resolve="var" />
@@ -3038,7 +3038,7 @@
             <node concept="3cpWsn" id="1OShD0IfW$L" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="1OShD0IfW$M" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0IfW$N" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0IfW$O" role="1oi0x0">
@@ -3122,7 +3122,7 @@
             <node concept="3cpWsn" id="1OShD0IfYmM" role="3cpWs9">
               <property role="TrG5h" value="s" />
               <node concept="3uibUv" id="1OShD0IfYmN" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0IfYmO" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0IfYt5" role="1oi0x0">
@@ -3140,7 +3140,7 @@
             <node concept="3cpWsn" id="1OShD0IfYmT" role="3cpWs9">
               <property role="TrG5h" value="t" />
               <node concept="3uibUv" id="1OShD0IfYmU" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0IfYmV" role="33vP2m">
                 <node concept="1oi5UN" id="677NV56wbOu" role="1oi0x0">
@@ -3192,7 +3192,7 @@
             <node concept="3cpWsn" id="1OShD0IgkRu" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="1OShD0IgkRv" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0IgkRw" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0IgkRx" role="1oi0x0">
@@ -3239,7 +3239,7 @@
             <node concept="3cpWsn" id="1OShD0IgkRH" role="3cpWs9">
               <property role="TrG5h" value="x" />
               <node concept="3uibUv" id="1OShD0IgkRI" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="1OShD0IgkRJ" role="33vP2m">
                 <ref role="37wK5l" node="6yEjedm71gQ" resolve="var" />
@@ -3253,7 +3253,7 @@
             <node concept="3cpWsn" id="1OShD0IglCA" role="3cpWs9">
               <property role="TrG5h" value="y" />
               <node concept="3uibUv" id="1OShD0IglCB" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="1OShD0IglCC" role="33vP2m">
                 <ref role="37wK5l" node="6yEjedm71gQ" resolve="var" />
@@ -3267,7 +3267,7 @@
             <node concept="3cpWsn" id="1OShD0IgkRM" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="1OShD0IgkRN" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0IgkRO" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0IgkRP" role="1oi0x0">
@@ -3458,7 +3458,7 @@
             <node concept="3cpWsn" id="1OShD0Ig2i$" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="1OShD0Ig2i_" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0Ig2iA" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0Ig2iB" role="1oi0x0">
@@ -3513,7 +3513,7 @@
             <node concept="3cpWsn" id="1OShD0Ig2iN" role="3cpWs9">
               <property role="TrG5h" value="x" />
               <node concept="3uibUv" id="1OShD0Ig2iO" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="1OShD0Ig2iP" role="33vP2m">
                 <ref role="37wK5l" node="7nuzzkr25as" resolve="wildcard" />
@@ -3527,7 +3527,7 @@
             <node concept="3cpWsn" id="1OShD0Ig2iS" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="1OShD0Ig2iT" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0Ig2iU" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0Ig2iV" role="1oi0x0">
@@ -3676,7 +3676,7 @@
             <node concept="3cpWsn" id="1OShD0Ig9w4" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="1OShD0Ig9w5" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0Ig9w6" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0Ig9w7" role="1oi0x0">
@@ -3715,7 +3715,7 @@
             <node concept="3cpWsn" id="1OShD0IgaBV" role="3cpWs9">
               <property role="TrG5h" value="x" />
               <node concept="3uibUv" id="1OShD0IgaBT" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="1OShD0IgaBW" role="33vP2m">
                 <ref role="37wK5l" node="6yEjedm71ho" resolve="wildcard" />
@@ -3726,7 +3726,7 @@
             <node concept="3cpWsn" id="1OShD0Ig9wj" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="1OShD0Ig9wk" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0Ig9wl" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0Ig9wm" role="1oi0x0">
@@ -3858,7 +3858,7 @@
             <node concept="3cpWsn" id="1OShD0Igi9l" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="1OShD0Igi9m" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0Igi9n" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0Igi9o" role="1oi0x0">
@@ -3880,7 +3880,7 @@
             <node concept="3cpWsn" id="1OShD0IgiMd" role="3cpWs9">
               <property role="TrG5h" value="x" />
               <node concept="3uibUv" id="1OShD0IgiMa" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="1OShD0IgiMe" role="33vP2m">
                 <ref role="37wK5l" node="6yEjedm71ho" resolve="wildcard" />
@@ -3891,7 +3891,7 @@
             <node concept="3cpWsn" id="1OShD0Igi9u" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="1OShD0Igi9v" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0Igi9w" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0Igi9x" role="1oi0x0">
@@ -4007,7 +4007,7 @@
             <node concept="3cpWsn" id="4$OyT8ISnwf" role="3cpWs9">
               <property role="TrG5h" value="list" />
               <node concept="3uibUv" id="4$OyT8ISnwg" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="4$OyT8ISnwh" role="33vP2m">
                 <node concept="KCUsM" id="4$OyT8ISw5n" role="1oi0x0">
@@ -4039,7 +4039,7 @@
             <node concept="3cpWsn" id="4$OyT8ISnwx" role="3cpWs9">
               <property role="TrG5h" value="head" />
               <node concept="3uibUv" id="4$OyT8ISnwy" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="4$OyT8ISnwz" role="33vP2m">
                 <ref role="37wK5l" node="6yEjedm71gQ" resolve="var" />
@@ -4053,7 +4053,7 @@
             <node concept="3cpWsn" id="4$OyT8ISnwA" role="3cpWs9">
               <property role="TrG5h" value="tail" />
               <node concept="3uibUv" id="4$OyT8ISnwB" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="4$OyT8ISnwC" role="33vP2m">
                 <ref role="37wK5l" node="6yEjedm71h7" resolve="listVar" />
@@ -4067,7 +4067,7 @@
             <node concept="3cpWsn" id="4$OyT8ISEPa" role="3cpWs9">
               <property role="TrG5h" value="pattern" />
               <node concept="3uibUv" id="4$OyT8ISEPb" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="4$OyT8ISEPc" role="33vP2m">
                 <node concept="KCUsM" id="4$OyT8ISEPd" role="1oi0x0">
@@ -4226,7 +4226,7 @@
             <node concept="3cpWsn" id="4$OyT8ITVL6" role="3cpWs9">
               <property role="TrG5h" value="list1" />
               <node concept="3uibUv" id="4$OyT8ITVL7" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="4$OyT8ITVL8" role="33vP2m">
                 <node concept="KCUsM" id="4$OyT8ITVL9" role="1oi0x0">
@@ -4258,7 +4258,7 @@
             <node concept="3cpWsn" id="4$OyT8ITVLo" role="3cpWs9">
               <property role="TrG5h" value="tail1" />
               <node concept="3uibUv" id="4$OyT8ITVLp" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="4$OyT8ITVLq" role="33vP2m">
                 <ref role="37wK5l" node="6yEjedm71h7" resolve="listVar" />
@@ -4272,7 +4272,7 @@
             <node concept="3cpWsn" id="4$OyT8IUcuk" role="3cpWs9">
               <property role="TrG5h" value="tail2" />
               <node concept="3uibUv" id="4$OyT8IUcul" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="4$OyT8IUcum" role="33vP2m">
                 <ref role="37wK5l" node="6yEjedm71h7" resolve="listVar" />
@@ -4286,7 +4286,7 @@
             <node concept="3cpWsn" id="4$OyT8ITVLt" role="3cpWs9">
               <property role="TrG5h" value="pattern1" />
               <node concept="3uibUv" id="4$OyT8ITVLu" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="4$OyT8ITVLv" role="33vP2m">
                 <node concept="KCUsM" id="4$OyT8ITVLw" role="1oi0x0">
@@ -4312,7 +4312,7 @@
             <node concept="3cpWsn" id="4$OyT8IUeDt" role="3cpWs9">
               <property role="TrG5h" value="pattern2" />
               <node concept="3uibUv" id="4$OyT8IUeDu" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="4$OyT8IUeDv" role="33vP2m">
                 <node concept="KCUsM" id="4$OyT8IUeDw" role="1oi0x0">
@@ -4533,17 +4533,17 @@
         <node concept="17QB3L" id="3K_0akS$LQm" role="1tU5fm" />
       </node>
       <node concept="3uibUv" id="3K_0akS$LQn" role="3clF45">
-        <ref role="3uigEE" to="ie8e:uNmovXiEd4" resolve="Variable" />
+        <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
       </node>
       <node concept="3Tm6S6" id="3K_0akS$LQo" role="1B3o_S" />
       <node concept="3clFbS" id="3K_0akS$LQp" role="3clF47">
         <node concept="3clFbF" id="3K_0akS$LQq" role="3cqZAp">
           <node concept="10QFUN" id="3K_0akS$LQr" role="3clFbG">
             <node concept="3uibUv" id="3K_0akS$LQx" role="10QFUM">
-              <ref role="3uigEE" to="ie8e:uNmovXiEd4" resolve="Variable" />
+              <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
             </node>
             <node concept="2YIFZM" id="3mz2_dYuFY1" role="10QFUP">
-              <ref role="37wK5l" to="yg8f:4TCblo5YI1H" resolve="asAtom" />
+              <ref role="37wK5l" to="yg8f:4TCblo5YI1H" resolve="asTreeForm" />
               <ref role="1Pybhc" to="yg8f:677NV565N1x" resolve="LogicalUtil" />
               <node concept="2ShNRf" id="3K_0akS$LQt" role="37wK5m">
                 <node concept="1pGfFk" id="3K_0akS$LQu" role="2ShVmc">
@@ -4564,7 +4564,7 @@
       <node concept="3uibUv" id="6yEjedm86Fb" role="3clF45">
         <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
         <node concept="3uibUv" id="6yEjedm887F" role="11_B2D">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="3Tm1VV" id="3K_0akS$NEd" role="1B3o_S" />
@@ -4577,7 +4577,7 @@
                 <ref role="3cqZAo" node="3K_0akS$NJK" resolve="name" />
               </node>
               <node concept="3uibUv" id="6yEjedm895I" role="1pMfVU">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
             </node>
           </node>
@@ -4594,7 +4594,7 @@
       <node concept="3uibUv" id="6yEjedm8Fwr" role="3clF45">
         <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
         <node concept="3uibUv" id="6yEjedm8Fws" role="11_B2D">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="3Tm1VV" id="6yEjedm8Fwt" role="1B3o_S" />
@@ -4612,7 +4612,7 @@
                 </node>
               </node>
               <node concept="3uibUv" id="6yEjedm8Fwz" role="1pMfVU">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
             </node>
           </node>
@@ -4623,7 +4623,7 @@
         <node concept="3uibUv" id="6yEjedm8H9p" role="1tU5fm">
           <ref role="3uigEE" to="45ys:7HUwyZauJhz" resolve="MetaLogical" />
           <node concept="3uibUv" id="6yEjedm8Hc_" role="11_B2D">
-            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+            <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
           </node>
         </node>
       </node>
@@ -4642,7 +4642,7 @@
               <node concept="3uibUv" id="6yEjedm8aLn" role="1tU5fm">
                 <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
                 <node concept="3uibUv" id="6yEjedm8bg7" role="11_B2D">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
               <node concept="1rXfSq" id="3K_0akS$NRs" role="33vP2m">
@@ -4665,7 +4665,7 @@
               <node concept="3uibUv" id="6yEjedm8btC" role="1tU5fm">
                 <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
                 <node concept="3uibUv" id="6yEjedm8btD" role="11_B2D">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
             </node>
@@ -4675,7 +4675,7 @@
             <node concept="3cpWsn" id="3K_0akS_eyb" role="3cpWs9">
               <property role="TrG5h" value="bar" />
               <node concept="3uibUv" id="3K_0akS_ey9" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="3K_0akS_eyc" role="33vP2m">
                 <node concept="1oi5UN" id="3K_0akS_eyd" role="1oi0x0">
@@ -4729,7 +4729,7 @@
               <node concept="3uibUv" id="6yEjedm8iQc" role="1tU5fm">
                 <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
                 <node concept="3uibUv" id="6yEjedm8jdG" role="11_B2D">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
               <node concept="1rXfSq" id="3K_0akS$OxM" role="33vP2m">
@@ -4741,7 +4741,7 @@
                       <property role="Xl_RC" value="w1" />
                     </node>
                     <node concept="3VsKOn" id="6yEjedm8P1G" role="37wK5m">
-                      <ref role="3VsUkX" to="ie8e:5JQSuNswOXL" resolve="CompositeNode" />
+                      <ref role="3VsUkX" to="6exd:5JQSuNswOXL" resolve="CompositeNode" />
                     </node>
                   </node>
                 </node>
@@ -4778,7 +4778,7 @@
               <node concept="3uibUv" id="6yEjedm8lL4" role="1tU5fm">
                 <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
                 <node concept="3uibUv" id="6yEjedm8lL5" role="11_B2D">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
             </node>
@@ -4788,7 +4788,7 @@
             <node concept="3cpWsn" id="3K_0akS_6Q7" role="3cpWs9">
               <property role="TrG5h" value="foo" />
               <node concept="3uibUv" id="3K_0akS_6Q5" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="3K_0akS_6Q8" role="33vP2m">
                 <node concept="1oi5UN" id="3K_0akS_6Q9" role="1oi0x0">
@@ -4835,7 +4835,7 @@
             <node concept="3cpWsn" id="6HT7BWBPd0T" role="3cpWs9">
               <property role="TrG5h" value="value" />
               <node concept="3uibUv" id="6HT7BWBPd0L" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="2OqwBi" id="6HT7BWBPd0U" role="33vP2m">
                 <node concept="2OqwBi" id="6HT7BWBPd0V" role="2Oq$k0">
@@ -4855,8 +4855,8 @@
           <node concept="3clFbF" id="6HT7BWBPed7" role="3cqZAp">
             <node concept="37vLTI" id="6HT7BWBPeDD" role="3clFbG">
               <node concept="2YIFZM" id="6HT7BWBPf0v" role="37vLTx">
-                <ref role="37wK5l" to="ie8e:6HT7BWBOXr$" resolve="ground" />
-                <ref role="1Pybhc" to="ie8e:6HT7BWBOXme" resolve="TreeFormUtil" />
+                <ref role="37wK5l" to="6exd:6HT7BWBOXr$" resolve="ground" />
+                <ref role="1Pybhc" to="6exd:6HT7BWBOXme" resolve="TreeFormUtil" />
                 <node concept="37vLTw" id="6HT7BWBPf1b" role="37wK5m">
                   <ref role="3cqZAo" node="6HT7BWBPd0T" resolve="value" />
                 </node>
@@ -4922,7 +4922,7 @@
             <node concept="3cpWsn" id="3t7_2FgLmhr" role="3cpWs9">
               <property role="TrG5h" value="list" />
               <node concept="3uibUv" id="3t7_2FgLmhs" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="2OqwBi" id="3t7_2FgLmht" role="33vP2m">
                 <node concept="2OqwBi" id="3t7_2FgLmhu" role="2Oq$k0">
@@ -4930,7 +4930,7 @@
                     <node concept="1eOMI4" id="3t7_2FgLmhw" role="2Oq$k0">
                       <node concept="10QFUN" id="3t7_2FgLmhx" role="1eOMHV">
                         <node concept="3uibUv" id="3t7_2FgLmhy" role="10QFUM">
-                          <ref role="3uigEE" to="ie8e:1msb0mq9ID4" resolve="Node" />
+                          <ref role="3uigEE" to="6exd:1msb0mq9ID4" resolve="Node" />
                         </node>
                         <node concept="37vLTw" id="3t7_2FgLmhz" role="10QFUP">
                           <ref role="3cqZAo" node="5YIOneOTrto" resolve="next" />
@@ -4938,7 +4938,7 @@
                       </node>
                     </node>
                     <node concept="liA8E" id="3t7_2FgLmh$" role="2OqNvi">
-                      <ref role="37wK5l" to="ie8e:5JQSuNswjSg" resolve="arguments" />
+                      <ref role="37wK5l" to="6exd:5JQSuNswjSg" resolve="arguments" />
                     </node>
                   </node>
                   <node concept="liA8E" id="3t7_2FgLmh_" role="2OqNvi">
@@ -4954,14 +4954,14 @@
           <node concept="3vlDli" id="3t7_2FgLjnc" role="3cqZAp">
             <node concept="2OqwBi" id="3t7_2FgLjnd" role="3tpDZB">
               <node concept="liA8E" id="3t7_2FgLjne" role="2OqNvi">
-                <ref role="37wK5l" to="ie8e:2QE4RCGndD7" resolve="asRoot" />
+                <ref role="37wK5l" to="6exd:2QE4RCGndD7" resolve="asRoot" />
               </node>
               <node concept="2OqwBi" id="3t7_2FgLjnf" role="2Oq$k0">
                 <node concept="2OqwBi" id="3t7_2FgLjng" role="2Oq$k0">
                   <node concept="1eOMI4" id="3t7_2FgLnID" role="2Oq$k0">
                     <node concept="10QFUN" id="3t7_2FgLnIE" role="1eOMHV">
                       <node concept="3uibUv" id="3t7_2FgLnIF" role="10QFUM">
-                        <ref role="3uigEE" to="ie8e:3OPtF03lco4" resolve="ListNode" />
+                        <ref role="3uigEE" to="6exd:3OPtF03lco4" resolve="ListNode" />
                       </node>
                       <node concept="37vLTw" id="3t7_2FgLnIG" role="10QFUP">
                         <ref role="3cqZAo" node="3t7_2FgLmhr" resolve="list" />
@@ -4969,7 +4969,7 @@
                     </node>
                   </node>
                   <node concept="liA8E" id="3t7_2FgLjni" role="2OqNvi">
-                    <ref role="37wK5l" to="ie8e:5YIOneOT0Zn" resolve="contents" />
+                    <ref role="37wK5l" to="6exd:5YIOneOT0Zn" resolve="contents" />
                   </node>
                 </node>
                 <node concept="liA8E" id="3t7_2FgLjnj" role="2OqNvi">
@@ -5004,7 +5004,7 @@
               <node concept="3uibUv" id="6yEjedm8o1P" role="1tU5fm">
                 <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
                 <node concept="3uibUv" id="6yEjedm8o1Q" role="11_B2D">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
             </node>
@@ -5021,7 +5021,7 @@
               <node concept="3uibUv" id="6yEjedm8oFj" role="1tU5fm">
                 <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
                 <node concept="3uibUv" id="6yEjedm8oFk" role="11_B2D">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
             </node>
@@ -5031,7 +5031,7 @@
             <node concept="3cpWsn" id="3K_0akS_pCK" role="3cpWs9">
               <property role="TrG5h" value="bar" />
               <node concept="3uibUv" id="3K_0akS_pCL" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="3K_0akS_pCM" role="33vP2m">
                 <node concept="1oi5UN" id="3K_0akS_pCN" role="1oi0x0">
@@ -5073,7 +5073,7 @@
                       <property role="Xl_RC" value="w1" />
                     </node>
                     <node concept="3VsKOn" id="6yEjedm8Oi0" role="37wK5m">
-                      <ref role="3VsUkX" to="ie8e:5JQSuNswOXL" resolve="CompositeNode" />
+                      <ref role="3VsUkX" to="6exd:5JQSuNswOXL" resolve="CompositeNode" />
                     </node>
                   </node>
                 </node>
@@ -5081,7 +5081,7 @@
               <node concept="3uibUv" id="6yEjedm8$6V" role="1tU5fm">
                 <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
                 <node concept="3uibUv" id="6yEjedm8$6W" role="11_B2D">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
             </node>
@@ -5116,7 +5116,7 @@
               <node concept="3uibUv" id="6yEjedm8pey" role="1tU5fm">
                 <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
                 <node concept="3uibUv" id="6yEjedm8pez" role="11_B2D">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
             </node>
@@ -5126,7 +5126,7 @@
             <node concept="3cpWsn" id="3K_0akS_pDo" role="3cpWs9">
               <property role="TrG5h" value="foo" />
               <node concept="3uibUv" id="3K_0akS_pDp" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="3K_0akS_pDq" role="33vP2m">
                 <node concept="1oi5UN" id="3K_0akS_pDr" role="1oi0x0">
@@ -5191,7 +5191,7 @@
             <node concept="3cpWsn" id="6HT7BWBPhwM" role="3cpWs9">
               <property role="TrG5h" value="value" />
               <node concept="3uibUv" id="6HT7BWBPhwJ" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="2OqwBi" id="6HT7BWBPhwN" role="33vP2m">
                 <node concept="2OqwBi" id="6HT7BWBPhwO" role="2Oq$k0">
@@ -5211,8 +5211,8 @@
           <node concept="3clFbF" id="6HT7BWBPidq" role="3cqZAp">
             <node concept="37vLTI" id="6HT7BWBPiGd" role="3clFbG">
               <node concept="2YIFZM" id="6HT7BWBPj3B" role="37vLTx">
-                <ref role="37wK5l" to="ie8e:6HT7BWBOXr$" resolve="ground" />
-                <ref role="1Pybhc" to="ie8e:6HT7BWBOXme" resolve="TreeFormUtil" />
+                <ref role="37wK5l" to="6exd:6HT7BWBOXr$" resolve="ground" />
+                <ref role="1Pybhc" to="6exd:6HT7BWBOXme" resolve="TreeFormUtil" />
                 <node concept="37vLTw" id="6HT7BWBPj4j" role="37wK5m">
                   <ref role="3cqZAo" node="6HT7BWBPhwM" resolve="value" />
                 </node>
@@ -5278,7 +5278,7 @@
             <node concept="3cpWsn" id="3t7_2FgLnZ$" role="3cpWs9">
               <property role="TrG5h" value="list" />
               <node concept="3uibUv" id="3t7_2FgLnZ_" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="2OqwBi" id="3t7_2FgLnZA" role="33vP2m">
                 <node concept="2OqwBi" id="3t7_2FgLnZB" role="2Oq$k0">
@@ -5286,7 +5286,7 @@
                     <node concept="1eOMI4" id="3t7_2FgLnZD" role="2Oq$k0">
                       <node concept="10QFUN" id="3t7_2FgLnZE" role="1eOMHV">
                         <node concept="3uibUv" id="3t7_2FgLnZF" role="10QFUM">
-                          <ref role="3uigEE" to="ie8e:1msb0mq9ID4" resolve="Node" />
+                          <ref role="3uigEE" to="6exd:1msb0mq9ID4" resolve="Node" />
                         </node>
                         <node concept="37vLTw" id="3t7_2FgLnZG" role="10QFUP">
                           <ref role="3cqZAo" node="5YIOneOTmzN" resolve="next" />
@@ -5294,7 +5294,7 @@
                       </node>
                     </node>
                     <node concept="liA8E" id="3t7_2FgLnZH" role="2OqNvi">
-                      <ref role="37wK5l" to="ie8e:5JQSuNswjSg" resolve="arguments" />
+                      <ref role="37wK5l" to="6exd:5JQSuNswjSg" resolve="arguments" />
                     </node>
                   </node>
                   <node concept="liA8E" id="3t7_2FgLnZI" role="2OqNvi">
@@ -5310,14 +5310,14 @@
           <node concept="3vlDli" id="3t7_2FgLav2" role="3cqZAp">
             <node concept="2OqwBi" id="3t7_2FgLav3" role="3tpDZB">
               <node concept="liA8E" id="3t7_2FgLav4" role="2OqNvi">
-                <ref role="37wK5l" to="ie8e:2QE4RCGndD7" resolve="asRoot" />
+                <ref role="37wK5l" to="6exd:2QE4RCGndD7" resolve="asRoot" />
               </node>
               <node concept="2OqwBi" id="3t7_2FgLgpZ" role="2Oq$k0">
                 <node concept="2OqwBi" id="3t7_2FgLgiw" role="2Oq$k0">
                   <node concept="1eOMI4" id="3t7_2FgLoIi" role="2Oq$k0">
                     <node concept="10QFUN" id="3t7_2FgLoIj" role="1eOMHV">
                       <node concept="3uibUv" id="3t7_2FgLoIk" role="10QFUM">
-                        <ref role="3uigEE" to="ie8e:3OPtF03lco4" resolve="ListNode" />
+                        <ref role="3uigEE" to="6exd:3OPtF03lco4" resolve="ListNode" />
                       </node>
                       <node concept="37vLTw" id="3t7_2FgLoIl" role="10QFUP">
                         <ref role="3cqZAo" node="3t7_2FgLnZ$" resolve="list" />
@@ -5325,7 +5325,7 @@
                     </node>
                   </node>
                   <node concept="liA8E" id="3t7_2FgLgmc" role="2OqNvi">
-                    <ref role="37wK5l" to="ie8e:5YIOneOT0Zn" resolve="contents" />
+                    <ref role="37wK5l" to="6exd:5YIOneOT0Zn" resolve="contents" />
                   </node>
                 </node>
                 <node concept="liA8E" id="3t7_2FgLgwS" role="2OqNvi">
diff --git a/test.xml b/test.xml
index e3cf2a4e..66cca5e1 100644
--- a/test.xml
+++ b/test.xml
@@ -339,45 +339,6 @@
       <zipfileset file="${basedir}/logic/languages/jetbrains.mps.logic/runtime/jetbrains.mps.logic.runtime.msd" prefix="module" />
       <zipfileset dir="${build.tmp}/customProcessors/copyModels/logic-languages-jetbrains.mps.logic-runtime-models" prefix="module/models" />
     </jar>
-    <mkdir dir="${build.tmp}/default/jetbrains.mps.logic.atom.jar" />
-    <mkdir dir="${build.tmp}/default/jetbrains.mps.logic.atom.jar/META-INF" />
-    <echoxml file="${build.tmp}/default/jetbrains.mps.logic.atom.jar/META-INF/module.xml">
-      <module namespace="jetbrains.mps.logic.atom" type="solution" uuid="7526e0cf-1ce7-46f8-a555-9eca1e06c23b">
-        <dependencies>
-          <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" />
-          <module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" />
-          <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" />
-          <module ref="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" />
-          <module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" />
-          <module ref="a3e4657f-a76c-45bb-bbda-c764596ecc65(jetbrains.mps.baseLanguage.logging.runtime)" />
-          <module ref="d44dab97-aaac-44cb-9745-8a14db674c03(jetbrains.mps.baseLanguage.tuples.runtime)" />
-          <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" />
-          <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" />
-          <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
-        </dependencies>
-        <library jar="lib/unification-lib-1.0.2.jar" />
-        <sources jar="jetbrains.mps.logic.atom-src.jar" descriptor="jetbrains.mps.logic.atom.msd" />
-      </module>
-    </echoxml>
-    <jar destfile="${build.layout}/tests/jetbrains.mps.logic.atom.jar" duplicate="preserve">
-      <fileset dir="${build.tmp}/java/out/jetbrains.mps.logic.atom" />
-      <fileset dir="${basedir}/logic/solutions/jetbrains.mps.logic.atom" includes="icons/**, resources/**" />
-      <fileset dir="${basedir}/logic/solutions/jetbrains.mps.logic.atom/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
-      <fileset dir="${build.tmp}/default/jetbrains.mps.logic.atom.jar" />
-    </jar>
-    <copyModels todir="${build.tmp}/customProcessors/copyModels/logic-solutions-jetbrains.mps.logic.atom-models">
-      <fileset dir="${basedir}/logic/solutions/jetbrains.mps.logic.atom/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
-    </copyModels>
-    <jar destfile="${build.layout}/tests/jetbrains.mps.logic.atom-src.jar" duplicate="preserve">
-      <fileset dir="${basedir}/logic/solutions/jetbrains.mps.logic.atom/source_gen">
-        <exclude name="**/trace.info" />
-        <exclude name="**/exports" />
-        <exclude name="**/checkpoints" />
-        <exclude name="**/*.mps" />
-      </fileset>
-      <zipfileset file="${basedir}/logic/solutions/jetbrains.mps.logic.atom/jetbrains.mps.logic.atom.msd" prefix="module" />
-      <zipfileset dir="${build.tmp}/customProcessors/copyModels/logic-solutions-jetbrains.mps.logic.atom-models" prefix="module/models" />
-    </jar>
     <mkdir dir="${build.tmp}/default/jetbrains.mps.logic.reactor.jar" />
     <mkdir dir="${build.tmp}/default/jetbrains.mps.logic.reactor.jar/META-INF" />
     <echoxml file="${build.tmp}/default/jetbrains.mps.logic.reactor.jar/META-INF/module.xml">
@@ -391,6 +352,7 @@
         <library jar="lib/google-collections-1.0.jar" />
         <library jar="lib/kotlin-runtime-1.0.0-rc-1050.jar" />
         <library jar="lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
+        <library jar="lib/unification-lib-1.0.2.jar" />
         <sources jar="jetbrains.mps.logic.reactor-src.jar" descriptor="jetbrains.mps.logic.reactor.msd" />
       </module>
     </echoxml>
@@ -590,9 +552,6 @@
       <zipfileset dir="${build.tmp}/customProcessors/copyModels/typechecking-languages-jetbrains.mps.lang.typesystem2.sampleLang-models" prefix="module/models" />
     </jar>
     <mkdir dir="${build.layout}/tests/lib" />
-    <copy todir="${build.layout}/tests/lib">
-      <fileset dir="${basedir}/logic/solutions/jetbrains.mps.logic.atom/lib" />
-    </copy>
     <copy todir="${build.layout}/tests/lib">
       <fileset dir="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib" />
     </copy>
@@ -613,7 +572,7 @@
     <delete dir="${build.layout}" />
   </target>
   
-  <target name="compileJava" depends="java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic#6626732309150416985, java.compile.java.modules.cycle.1, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.atom, java.compile.java.modules.cycle.2, java.compile.jetbrains.mps.logic.test, java.compile.jetbrains.mps.lang.typesystem2, java.compile.jetbrains.mps.lang.typesystem2#4578927328670739933, java.compile.java.modules.cycle.3, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.lang.typesystem2.samplechecker.handler.test, java.compile.jetbrains.mps.lang.typesystem2.sampleplugin, java.compile.jetbrains.mps.lang.typesystem2.samplechecker.handler.util, java.compile.jetbrains.mps.lang.typesystem2.sampleLang, java.compile.jetbrains.mps.lang.typesystem2.sampleLang#8436953480441303409, java.compile.jetbrains.mps.lang.typesystem2.samplechecker.test" />
+  <target name="compileJava" depends="java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic#6626732309150416985, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.logic.reactor, java.compile.java.modules.cycle.1, java.compile.jetbrains.mps.logic.test, java.compile.jetbrains.mps.lang.typesystem2, java.compile.jetbrains.mps.lang.typesystem2#4578927328670739933, java.compile.java.modules.cycle.2, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.lang.typesystem2.samplechecker.handler.test, java.compile.jetbrains.mps.lang.typesystem2.sampleplugin, java.compile.jetbrains.mps.lang.typesystem2.samplechecker.handler.util, java.compile.jetbrains.mps.lang.typesystem2.sampleLang, java.compile.jetbrains.mps.lang.typesystem2.sampleLang#8436953480441303409, java.compile.jetbrains.mps.lang.typesystem2.samplechecker.test" />
   
   <target name="processResources" />
   
@@ -710,7 +669,6 @@
       <library file="${artifacts.mps}/plugins/mps-testing/lib/jetbrains.mps.lang.test.util.jar" />
       <chunk>
         <module file="${basedir}/logic/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl" />
-        <module file="${basedir}/logic/solutions/jetbrains.mps.logic.atom/jetbrains.mps.logic.atom.msd" />
         <module file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/jetbrains.mps.logic.reactor.msd" />
         <module file="${basedir}/logic/languages/jetbrains.mps.logic/runtime/jetbrains.mps.logic.runtime.msd" />
       </chunk>
@@ -743,7 +701,7 @@
   
   <target name="module-tests" depends="assemble, test.testconfig" />
   
-  <target name="java.compile.jetbrains.mps.logic" depends="java.compile.jetbrains.mps.logic.atom, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
+  <target name="java.compile.jetbrains.mps.logic" depends="java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
     <mkdir dir="${basedir}/logic/languages/jetbrains.mps.logic/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.logic" />
     <javac destdir="${build.tmp}/java/out/jetbrains.mps.logic" fork="true" encoding="utf8" includeantruntime="false" debug="true">
@@ -752,18 +710,17 @@
         <path location="${basedir}/logic/languages/jetbrains.mps.logic/source_gen" />
       </src>
       <classpath>
-        <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-closures.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-collections.jar" />
         <fileset file="${artifacts.mps}/lib/mps-core.jar" />
         <fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
         <fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
         <fileset file="${artifacts.mps}/lib/mps-logging.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-closures.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-collections.jar" />
         <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.atom" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
         <fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
@@ -771,12 +728,12 @@
         <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
         <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
         <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
-        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.atom/lib/unification-lib-1.0.2.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-core-0.1.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/dexx-collections-0.2.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/google-collections-1.0.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.0-rc-1050.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
+        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/unification-lib-1.0.2.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
@@ -798,7 +755,7 @@
     </javac>
   </target>
   
-  <target name="java.compile.jetbrains.mps.logic#6626732309150416985" depends="java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic.atom, java.compile.jetbrains.mps.logic.reactor, fetchDependencies">
+  <target name="java.compile.jetbrains.mps.logic#6626732309150416985" depends="java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic.reactor, fetchDependencies">
     <mkdir dir="${basedir}/logic/languages/jetbrains.mps.logic/generator/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.logic#6626732309150416985" />
     <javac destdir="${build.tmp}/java/out/jetbrains.mps.logic#6626732309150416985" fork="true" encoding="utf8" includeantruntime="false" debug="true">
@@ -824,14 +781,13 @@
         <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
         <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.atom" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
-        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.atom/lib/unification-lib-1.0.2.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-core-0.1.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/dexx-collections-0.2.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/google-collections-1.0.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.0-rc-1050.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
+        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/unification-lib-1.0.2.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
@@ -852,46 +808,7 @@
     </javac>
   </target>
   
-  <target name="java.compile.java.modules.cycle.1" depends="java.compile.jetbrains.mps.logic.atom, fetchDependencies">
-    <mkdir dir="${build.tmp}/java.modules.cycle.1" />
-    <javac destdir="${build.tmp}/java.modules.cycle.1" fork="true" encoding="utf8" nowarn="true" includeantruntime="false">
-      <compilerarg value="-Xlint:none" />
-      <src>
-        <path location="${basedir}/logic/languages/jetbrains.mps.logic/runtime/source_gen" />
-        <path location="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/source_gen" />
-      </src>
-      <classpath>
-        <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-closures.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-collections.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-core.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-logging.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
-        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.atom/lib/unification-lib-1.0.2.jar" />
-        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-core-0.1.jar" />
-        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/dexx-collections-0.2.jar" />
-        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/google-collections-1.0.jar" />
-        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.0-rc-1050.jar" />
-        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
-        <fileset file="${artifacts.mps}/lib/log4j.jar" />
-        <fileset file="${artifacts.mps}/lib/annotations.jar" />
-        <fileset file="${artifacts.mps}/lib/jdom.jar" />
-        <fileset file="${artifacts.mps}/lib/trove4j.jar" />
-        <fileset file="${artifacts.mps}/lib/xstream-1.4.8.jar" />
-        <fileset file="${artifacts.mps}/lib/asm-all.jar" />
-        <fileset file="${artifacts.mps}/lib/diffutils-1.2.1.jar" />
-        <fileset file="${artifacts.mps}/lib/ecj-4.5.2.jar" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.atom" />
-      </classpath>
-    </javac>
-  </target>
-  
-  <target name="java.compile.jetbrains.mps.logic.runtime" depends="java.compile.jetbrains.mps.logic.atom, java.compile.java.modules.cycle.1, fetchDependencies">
+  <target name="java.compile.jetbrains.mps.logic.runtime" depends="java.compile.jetbrains.mps.logic.reactor, fetchDependencies">
     <mkdir dir="${basedir}/logic/languages/jetbrains.mps.logic/runtime/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
     <javac destdir="${build.tmp}/java/out/jetbrains.mps.logic.runtime" fork="true" encoding="utf8" includeantruntime="false" debug="true">
@@ -900,24 +817,24 @@
         <path location="${basedir}/logic/languages/jetbrains.mps.logic/runtime/source_gen" />
       </src>
       <classpath>
-        <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-closures.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-collections.jar" />
         <fileset file="${artifacts.mps}/lib/mps-core.jar" />
         <fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
         <fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
         <fileset file="${artifacts.mps}/lib/mps-logging.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-closures.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-collections.jar" />
         <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.atom" />
-        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.atom/lib/unification-lib-1.0.2.jar" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-core-0.1.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/dexx-collections-0.2.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/google-collections-1.0.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.0-rc-1050.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
+        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/unification-lib-1.0.2.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
@@ -926,12 +843,11 @@
         <fileset file="${artifacts.mps}/lib/asm-all.jar" />
         <fileset file="${artifacts.mps}/lib/diffutils-1.2.1.jar" />
         <fileset file="${artifacts.mps}/lib/ecj-4.5.2.jar" />
-        <pathelement path="${build.tmp}/java.modules.cycle.1" />
       </classpath>
     </javac>
   </target>
   
-  <target name="java.compile.jetbrains.mps.logic.reactor" depends="java.compile.jetbrains.mps.logic.atom, java.compile.java.modules.cycle.1, fetchDependencies">
+  <target name="java.compile.jetbrains.mps.logic.reactor" depends="fetchDependencies">
     <mkdir dir="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
     <javac destdir="${build.tmp}/java/out/jetbrains.mps.logic.reactor" fork="true" encoding="utf8" includeantruntime="false" debug="true">
@@ -940,58 +856,23 @@
         <path location="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/source_gen" />
       </src>
       <classpath>
-        <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-closures.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-collections.jar" />
         <fileset file="${artifacts.mps}/lib/mps-core.jar" />
         <fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
         <fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
         <fileset file="${artifacts.mps}/lib/mps-logging.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-closures.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-collections.jar" />
         <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.atom" />
-        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.atom/lib/unification-lib-1.0.2.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-core-0.1.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/dexx-collections-0.2.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/google-collections-1.0.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.0-rc-1050.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
-        <fileset file="${artifacts.mps}/lib/log4j.jar" />
-        <fileset file="${artifacts.mps}/lib/annotations.jar" />
-        <fileset file="${artifacts.mps}/lib/jdom.jar" />
-        <fileset file="${artifacts.mps}/lib/trove4j.jar" />
-        <fileset file="${artifacts.mps}/lib/xstream-1.4.8.jar" />
-        <fileset file="${artifacts.mps}/lib/asm-all.jar" />
-        <fileset file="${artifacts.mps}/lib/diffutils-1.2.1.jar" />
-        <fileset file="${artifacts.mps}/lib/ecj-4.5.2.jar" />
-        <pathelement path="${build.tmp}/java.modules.cycle.1" />
-      </classpath>
-    </javac>
-  </target>
-  
-  <target name="java.compile.jetbrains.mps.logic.atom" depends="fetchDependencies">
-    <mkdir dir="${basedir}/logic/solutions/jetbrains.mps.logic.atom/source_gen" />
-    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.logic.atom" />
-    <javac destdir="${build.tmp}/java/out/jetbrains.mps.logic.atom" fork="true" encoding="utf8" includeantruntime="false" debug="true">
-      <compilerarg value="-Xlint:none" />
-      <src>
-        <path location="${basedir}/logic/solutions/jetbrains.mps.logic.atom/source_gen" />
-      </src>
-      <classpath>
-        <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-closures.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-collections.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-core.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-logging.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
-        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.atom/lib/unification-lib-1.0.2.jar" />
+        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/unification-lib-1.0.2.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
@@ -1004,9 +885,9 @@
     </javac>
   </target>
   
-  <target name="java.compile.java.modules.cycle.2" depends="java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic.atom, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.lang.typesystem2.samplechecker.handler.util, fetchDependencies">
-    <mkdir dir="${build.tmp}/java.modules.cycle.2" />
-    <javac destdir="${build.tmp}/java.modules.cycle.2" fork="true" encoding="utf8" nowarn="true" includeantruntime="false">
+  <target name="java.compile.java.modules.cycle.1" depends="java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.lang.typesystem2.samplechecker.handler.util, fetchDependencies">
+    <mkdir dir="${build.tmp}/java.modules.cycle.1" />
+    <javac destdir="${build.tmp}/java.modules.cycle.1" fork="true" encoding="utf8" nowarn="true" includeantruntime="false">
       <compilerarg value="-Xlint:none" />
       <src>
         <path location="${basedir}/logic/solutions/jetbrains.mps.logic.test/source_gen" />
@@ -1031,12 +912,12 @@
         <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
         <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
         <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
-        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.atom/lib/unification-lib-1.0.2.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-core-0.1.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/dexx-collections-0.2.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/google-collections-1.0.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.0-rc-1050.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
+        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/unification-lib-1.0.2.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.test/lib/mockito-core-2.0.3-beta.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.test/lib/objenesis-2.1.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/junit-4.12.jar" />
@@ -1064,7 +945,6 @@
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.atom" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.samplechecker.handler.util" />
@@ -1072,7 +952,7 @@
     </javac>
   </target>
   
-  <target name="java.compile.jetbrains.mps.logic.test" depends="java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic.atom, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, java.compile.java.modules.cycle.2, fetchDependencies">
+  <target name="java.compile.jetbrains.mps.logic.test" depends="java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, java.compile.java.modules.cycle.1, fetchDependencies">
     <mkdir dir="${basedir}/logic/solutions/jetbrains.mps.logic.test/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.logic.test" />
     <javac destdir="${build.tmp}/java/out/jetbrains.mps.logic.test" fork="true" encoding="utf8" includeantruntime="false" debug="true">
@@ -1099,15 +979,14 @@
         <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
         <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.atom" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
-        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.atom/lib/unification-lib-1.0.2.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-core-0.1.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/dexx-collections-0.2.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/google-collections-1.0.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.0-rc-1050.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
+        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/unification-lib-1.0.2.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.test/lib/mockito-core-2.0.3-beta.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.test/lib/objenesis-2.1.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/junit-4.12.jar" />
@@ -1134,12 +1013,12 @@
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
-        <pathelement path="${build.tmp}/java.modules.cycle.2" />
+        <pathelement path="${build.tmp}/java.modules.cycle.1" />
       </classpath>
     </javac>
   </target>
   
-  <target name="java.compile.jetbrains.mps.lang.typesystem2" depends="java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.lang.typesystem2.samplechecker.handler.util, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic.atom, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
+  <target name="java.compile.jetbrains.mps.lang.typesystem2" depends="java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.lang.typesystem2.samplechecker.handler.util, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
     <mkdir dir="${basedir}/typesystem2/languages/jetbrains.mps.lang.typesystem2/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2" />
     <javac destdir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2" fork="true" encoding="utf8" includeantruntime="false" debug="true">
@@ -1168,15 +1047,14 @@
         <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
         <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.atom" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
-        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.atom/lib/unification-lib-1.0.2.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-core-0.1.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/dexx-collections-0.2.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/google-collections-1.0.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.0-rc-1050.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
+        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/unification-lib-1.0.2.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
@@ -1206,7 +1084,7 @@
     </javac>
   </target>
   
-  <target name="java.compile.jetbrains.mps.lang.typesystem2#4578927328670739933" depends="java.compile.jetbrains.mps.lang.typesystem2, java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.lang.typesystem2.samplechecker.handler.util, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic.atom, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
+  <target name="java.compile.jetbrains.mps.lang.typesystem2#4578927328670739933" depends="java.compile.jetbrains.mps.lang.typesystem2, java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.lang.typesystem2.samplechecker.handler.util, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
     <mkdir dir="${basedir}/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2#4578927328670739933" />
     <javac destdir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2#4578927328670739933" fork="true" encoding="utf8" includeantruntime="false" debug="true">
@@ -1236,15 +1114,14 @@
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.samplechecker.handler.util" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.template" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.atom" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
-        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.atom/lib/unification-lib-1.0.2.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-core-0.1.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/dexx-collections-0.2.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/google-collections-1.0.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.0-rc-1050.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
+        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/unification-lib-1.0.2.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
@@ -1273,9 +1150,9 @@
     </javac>
   </target>
   
-  <target name="java.compile.java.modules.cycle.3" depends="java.compile.jetbrains.mps.lang.typesystem2.samplechecker.handler.util, java.compile.jetbrains.mps.logic.atom, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
-    <mkdir dir="${build.tmp}/java.modules.cycle.3" />
-    <javac destdir="${build.tmp}/java.modules.cycle.3" fork="true" encoding="utf8" nowarn="true" includeantruntime="false">
+  <target name="java.compile.java.modules.cycle.2" depends="java.compile.jetbrains.mps.lang.typesystem2.samplechecker.handler.util, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
+    <mkdir dir="${build.tmp}/java.modules.cycle.2" />
+    <javac destdir="${build.tmp}/java.modules.cycle.2" fork="true" encoding="utf8" nowarn="true" includeantruntime="false">
       <compilerarg value="-Xlint:none" />
       <src>
         <path location="${basedir}/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/source_gen" />
@@ -1293,12 +1170,12 @@
         <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
         <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
-        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.atom/lib/unification-lib-1.0.2.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-core-0.1.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/dexx-collections-0.2.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/google-collections-1.0.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.0-rc-1050.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
+        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/unification-lib-1.0.2.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
         <fileset file="${artifacts.mps}/lib/trove4j.jar" />
@@ -1316,14 +1193,13 @@
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.samplechecker.handler.util" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.atom" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
       </classpath>
     </javac>
   </target>
   
-  <target name="java.compile.jetbrains.mps.lang.typesystem2.template" depends="java.compile.jetbrains.mps.lang.typesystem2.samplechecker.handler.util, java.compile.jetbrains.mps.logic.atom, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, java.compile.java.modules.cycle.3, fetchDependencies">
+  <target name="java.compile.jetbrains.mps.lang.typesystem2.template" depends="java.compile.jetbrains.mps.lang.typesystem2.samplechecker.handler.util, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, java.compile.java.modules.cycle.2, fetchDependencies">
     <mkdir dir="${basedir}/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.template" />
     <javac destdir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.template" fork="true" encoding="utf8" includeantruntime="false" debug="true">
@@ -1344,15 +1220,14 @@
         <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.samplechecker.handler.util" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.atom" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
-        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.atom/lib/unification-lib-1.0.2.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-core-0.1.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/dexx-collections-0.2.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/google-collections-1.0.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.0-rc-1050.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
+        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/unification-lib-1.0.2.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
         <fileset file="${artifacts.mps}/lib/trove4j.jar" />
@@ -1369,12 +1244,12 @@
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
-        <pathelement path="${build.tmp}/java.modules.cycle.3" />
+        <pathelement path="${build.tmp}/java.modules.cycle.2" />
       </classpath>
     </javac>
   </target>
   
-  <target name="java.compile.jetbrains.mps.lang.typesystem2.runtime" depends="java.compile.jetbrains.mps.lang.typesystem2.samplechecker.handler.util, java.compile.jetbrains.mps.logic.atom, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, java.compile.java.modules.cycle.3, fetchDependencies">
+  <target name="java.compile.jetbrains.mps.lang.typesystem2.runtime" depends="java.compile.jetbrains.mps.lang.typesystem2.samplechecker.handler.util, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, java.compile.java.modules.cycle.2, fetchDependencies">
     <mkdir dir="${basedir}/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.runtime" />
     <javac destdir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.runtime" fork="true" encoding="utf8" includeantruntime="false" debug="true">
@@ -1395,15 +1270,14 @@
         <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.samplechecker.handler.util" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.atom" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
-        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.atom/lib/unification-lib-1.0.2.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-core-0.1.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/dexx-collections-0.2.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/google-collections-1.0.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.0-rc-1050.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
+        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/unification-lib-1.0.2.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
@@ -1419,12 +1293,12 @@
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
-        <pathelement path="${build.tmp}/java.modules.cycle.3" />
+        <pathelement path="${build.tmp}/java.modules.cycle.2" />
       </classpath>
     </javac>
   </target>
   
-  <target name="java.compile.jetbrains.mps.lang.typesystem2.samplechecker.handler.test" depends="java.compile.jetbrains.mps.lang.typesystem2.samplechecker.handler.util, java.compile.jetbrains.mps.logic.atom, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, java.compile.java.modules.cycle.2, fetchDependencies">
+  <target name="java.compile.jetbrains.mps.lang.typesystem2.samplechecker.handler.test" depends="java.compile.jetbrains.mps.lang.typesystem2.samplechecker.handler.util, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, java.compile.java.modules.cycle.1, fetchDependencies">
     <mkdir dir="${basedir}/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.test/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.samplechecker.handler.test" />
     <javac destdir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.samplechecker.handler.test" fork="true" encoding="utf8" includeantruntime="false" debug="true">
@@ -1446,15 +1320,14 @@
         <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.samplechecker.handler.util" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.atom" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
-        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.atom/lib/unification-lib-1.0.2.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-core-0.1.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/dexx-collections-0.2.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/google-collections-1.0.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.0-rc-1050.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
+        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/unification-lib-1.0.2.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.test/lib/mockito-core-2.0.3-beta.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.test/lib/objenesis-2.1.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/junit-4.12.jar" />
@@ -1473,12 +1346,12 @@
         <fileset file="${artifacts.mps}/lib/diffutils-1.2.1.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/ecj-4.5.2.jar" />
-        <pathelement path="${build.tmp}/java.modules.cycle.2" />
+        <pathelement path="${build.tmp}/java.modules.cycle.1" />
       </classpath>
     </javac>
   </target>
   
-  <target name="java.compile.jetbrains.mps.lang.typesystem2.sampleplugin" depends="java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.lang.typesystem2.samplechecker.handler.util, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic.atom, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
+  <target name="java.compile.jetbrains.mps.lang.typesystem2.sampleplugin" depends="java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.lang.typesystem2.samplechecker.handler.util, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
     <mkdir dir="${basedir}/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.sampleplugin" />
     <javac destdir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.sampleplugin" fork="true" encoding="utf8" includeantruntime="false" debug="true">
@@ -1507,17 +1380,16 @@
         <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
         <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.atom" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
         <fileset file="${artifacts.mps}/lib/mps-icons.jar" />
         <fileset file="${artifacts.mps}/lib/mps-workbench.jar" />
-        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.atom/lib/unification-lib-1.0.2.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-core-0.1.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/dexx-collections-0.2.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/google-collections-1.0.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.0-rc-1050.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
+        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/unification-lib-1.0.2.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
@@ -1538,7 +1410,7 @@
     </javac>
   </target>
   
-  <target name="java.compile.jetbrains.mps.lang.typesystem2.samplechecker.handler.util" depends="java.compile.jetbrains.mps.logic.atom, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
+  <target name="java.compile.jetbrains.mps.lang.typesystem2.samplechecker.handler.util" depends="java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
     <mkdir dir="${basedir}/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.samplechecker.handler.util" />
     <javac destdir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.samplechecker.handler.util" fork="true" encoding="utf8" includeantruntime="false" debug="true">
@@ -1547,26 +1419,25 @@
         <path location="${basedir}/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/source_gen" />
       </src>
       <classpath>
-        <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-closures.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-collections.jar" />
         <fileset file="${artifacts.mps}/lib/mps-core.jar" />
         <fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
         <fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
         <fileset file="${artifacts.mps}/lib/mps-logging.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-closures.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-collections.jar" />
         <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.atom" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
-        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.atom/lib/unification-lib-1.0.2.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-core-0.1.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/dexx-collections-0.2.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/google-collections-1.0.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.0-rc-1050.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
+        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/unification-lib-1.0.2.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
@@ -1587,7 +1458,7 @@
     </javac>
   </target>
   
-  <target name="java.compile.jetbrains.mps.lang.typesystem2.sampleLang" depends="java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.lang.typesystem2.samplechecker.handler.util, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.logic.atom, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
+  <target name="java.compile.jetbrains.mps.lang.typesystem2.sampleLang" depends="java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.lang.typesystem2.samplechecker.handler.util, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
     <mkdir dir="${basedir}/typechecking/languages/jetbrains.mps.lang.typesystem2.sampleLang/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.sampleLang" />
     <javac destdir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.sampleLang" fork="true" encoding="utf8" includeantruntime="false" debug="true">
@@ -1610,7 +1481,6 @@
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.runtime" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.samplechecker.handler.util" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.template" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.atom" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
         <fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
@@ -1618,12 +1488,12 @@
         <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
         <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
         <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
-        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.atom/lib/unification-lib-1.0.2.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-core-0.1.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/dexx-collections-0.2.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/google-collections-1.0.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.0-rc-1050.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
+        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/unification-lib-1.0.2.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
@@ -1690,7 +1560,7 @@
     </javac>
   </target>
   
-  <target name="java.compile.jetbrains.mps.lang.typesystem2.samplechecker.test" depends="java.compile.jetbrains.mps.lang.typesystem2.sampleLang, java.compile.jetbrains.mps.lang.typesystem2.samplechecker.handler.util, java.compile.jetbrains.mps.logic.atom, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
+  <target name="java.compile.jetbrains.mps.lang.typesystem2.samplechecker.test" depends="java.compile.jetbrains.mps.lang.typesystem2.sampleLang, java.compile.jetbrains.mps.lang.typesystem2.samplechecker.handler.util, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
     <mkdir dir="${basedir}/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.test/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.samplechecker.test" />
     <javac destdir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.samplechecker.test" fork="true" encoding="utf8" includeantruntime="false" debug="true">
@@ -1718,17 +1588,16 @@
         <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.sampleLang" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.samplechecker.handler.util" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.atom" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
         <fileset file="${artifacts.mps}/lib/mps-test.jar" />
         <fileset file="${artifacts.mps}/plugins/mps-testing/lib/jetbrains.mps.lang.test.util.jar" />
-        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.atom/lib/unification-lib-1.0.2.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-core-0.1.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/dexx-collections-0.2.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/google-collections-1.0.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.0-rc-1050.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
+        <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/unification-lib-1.0.2.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/junit-4.12.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/hamcrest-core-1.3.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/hamcrest-library-1.3.jar" />
@@ -1841,7 +1710,6 @@
       <pathelement location="${build.layout}/tests/jetbrains.mps.lang.typesystem2.sampleLang.jar" />
       <pathelement location="${build.layout}/tests/jetbrains.mps.lang.typesystem2.samplechecker.handler.util.jar" />
       <pathelement location="${build.layout}/tests/jetbrains.mps.lang.typesystem2.template.jar" />
-      <pathelement location="${build.layout}/tests/jetbrains.mps.logic.atom.jar" />
       <pathelement location="${build.layout}/tests/jetbrains.mps.logic.reactor.jar" />
       <pathelement location="${build.layout}/tests/jetbrains.mps.logic.runtime.jar" />
     </path>
@@ -1906,7 +1774,6 @@
   <target name="cleanSources">
     <delete dir="${basedir}/logic/languages/jetbrains.mps.logic/source_gen" />
     <delete dir="${basedir}/logic/languages/jetbrains.mps.logic/generator/source_gen" />
-    <delete dir="${basedir}/logic/solutions/jetbrains.mps.logic.atom/source_gen" />
     <delete dir="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/source_gen" />
     <delete dir="${basedir}/logic/languages/jetbrains.mps.logic/runtime/source_gen" />
     <delete dir="${basedir}/typesystem2/languages/jetbrains.mps.lang.typesystem2/source_gen" />
diff --git a/typechecking/languages/jetbrains.mps.lang.typesystem2.sampleLang/jetbrains.mps.lang.typesystem2.sampleLang.mpl b/typechecking/languages/jetbrains.mps.lang.typesystem2.sampleLang/jetbrains.mps.lang.typesystem2.sampleLang.mpl
index d056cf61..31e67681 100644
--- a/typechecking/languages/jetbrains.mps.lang.typesystem2.sampleLang/jetbrains.mps.lang.typesystem2.sampleLang.mpl
+++ b/typechecking/languages/jetbrains.mps.lang.typesystem2.sampleLang/jetbrains.mps.lang.typesystem2.sampleLang.mpl
@@ -57,7 +57,6 @@
     <dependency reexport="false">26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.typesystem2.runtime)</dependency>
     <dependency reexport="false">ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.typesystem2.template)</dependency>
     <dependency reexport="false">9c4ae21e-62e0-4110-95b7-191b357a42d2(jetbrains.mps.lang.typesystem2.samplechecker.handler.util)</dependency>
-    <dependency reexport="false">7526e0cf-1ce7-46f8-a555-9eca1e06c23b(jetbrains.mps.logic.atom)</dependency>
   </dependencies>
   <usedDevKits>
     <usedDevKit>2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)</usedDevKit>
diff --git a/typechecking/languages/jetbrains.mps.lang.typesystem2.sampleLang/models/types.mps b/typechecking/languages/jetbrains.mps.lang.typesystem2.sampleLang/models/types.mps
index 7867214e..89eceb71 100644
--- a/typechecking/languages/jetbrains.mps.lang.typesystem2.sampleLang/models/types.mps
+++ b/typechecking/languages/jetbrains.mps.lang.typesystem2.sampleLang/models/types.mps
@@ -21,9 +21,9 @@
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
     <import index="4r4j" ref="r:94702bd0-f623-44e8-af0a-f2730f7d2518(jetbrains.mps.lang.typesystem2.samplechecker.handle.util)" />
     <import index="45ys" ref="r:7365f7fe-12e6-4229-8901-f6dc6d5df03f(jetbrains.mps.logic.reactor.logical)" />
-    <import index="ie8e" ref="r:ab2605ab-b4bc-4e80-a8ca-19a4a8465c01(jetbrains.mps.logic.atom)" />
     <import index="nz6g" ref="r:ac00f724-30be-446e-805c-2345efc460d7(jetbrains.mps.lang.typesystem2.program)" />
     <import index="7ub6" ref="r:b533b427-da69-49d8-9c93-4ea32433b66e(jetbrains.mps.lang.typesystem2.generation)" />
+    <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.treeform)" />
     <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" implicit="true" />
   </imports>
   <registry>
@@ -1909,7 +1909,7 @@
             <node concept="3A8Hvi" id="2q0gzCFJ8ut" role="3Aqpz8">
               <node concept="aYllk" id="2q0gzCFJ8uD" role="3A8w4Q">
                 <node concept="2YIFZM" id="2p$DpYKVPA6" role="aYrYs">
-                  <ref role="37wK5l" to="4r4j:1e3DfAArnOl" resolve="listOfListsAtom" />
+                  <ref role="37wK5l" to="4r4j:1e3DfAArnOl" resolve="listOfLists" />
                   <ref role="1Pybhc" to="4r4j:2zBk6uIjXRS" resolve="Lists" />
                   <node concept="39rIew" id="2p$DpYKVPA7" role="37wK5m">
                     <ref role="39rHqR" node="2q0gzCFIXgU" resolve="subtypePaths" />
@@ -2092,7 +2092,7 @@
             <node concept="3A8Hvi" id="7nkyKX6XUm2" role="3Aqpz8">
               <node concept="aYllk" id="7nkyKX6XUm3" role="3A8w4Q">
                 <node concept="2YIFZM" id="7nkyKX6XUm4" role="aYrYs">
-                  <ref role="37wK5l" to="4r4j:1e3DfAArnOl" resolve="listOfListsAtom" />
+                  <ref role="37wK5l" to="4r4j:1e3DfAArnOl" resolve="listOfLists" />
                   <ref role="1Pybhc" to="4r4j:2zBk6uIjXRS" resolve="Lists" />
                   <node concept="2ShNRf" id="7nkyKX6Yp1J" role="37wK5m">
                     <node concept="Tc6Ow" id="7nkyKX6Yr5n" role="2ShVmc">
@@ -2266,7 +2266,7 @@
             <node concept="3A8Hvi" id="2jjvHNv9yAj" role="3Aqpz8">
               <node concept="aYllk" id="2jjvHNv9yAk" role="3A8w4Q">
                 <node concept="2YIFZM" id="2jjvHNv9yAl" role="aYrYs">
-                  <ref role="37wK5l" to="4r4j:1e3DfAArnOl" resolve="listOfListsAtom" />
+                  <ref role="37wK5l" to="4r4j:1e3DfAArnOl" resolve="listOfLists" />
                   <ref role="1Pybhc" to="4r4j:2zBk6uIjXRS" resolve="Lists" />
                   <node concept="37vLTw" id="2jjvHNvcjbs" role="37wK5m">
                     <ref role="3cqZAo" node="2jjvHNvaKEe" resolve="paths" />
@@ -8182,7 +8182,7 @@
               <property role="TrG5h" value="Tn" />
             </node>
             <node concept="3uibUv" id="7km57Pk837W" role="3vLBG7">
-              <ref role="3uigEE" to="ie8e:2xQ7eRAD2dj" resolve="Value" />
+              <ref role="3uigEE" to="6exd:2xQ7eRAD2dj" resolve="Value" />
             </node>
           </node>
           <node concept="3Aqczg" id="5NuEpF1vdPk" role="3cqZAp">
@@ -9351,7 +9351,7 @@
               <property role="TrG5h" value="Name" />
             </node>
             <node concept="3uibUv" id="4gW0vesN6Yg" role="3vLBG7">
-              <ref role="3uigEE" to="ie8e:2xQ7eRAD2dj" resolve="Value" />
+              <ref role="3uigEE" to="6exd:2xQ7eRAD2dj" resolve="Value" />
             </node>
           </node>
           <node concept="3Aqczg" id="4gW0vesJrTr" role="3cqZAp">
@@ -9993,7 +9993,7 @@
               <property role="TrG5h" value="TailStub" />
             </node>
             <node concept="3uibUv" id="6OUp3PsRZ9G" role="3vLBG7">
-              <ref role="3uigEE" to="ie8e:3OPtF03lco4" resolve="ListNode" />
+              <ref role="3uigEE" to="6exd:3OPtF03lco4" resolve="ListNode" />
             </node>
           </node>
           <node concept="3Aqczg" id="7LZcKzBwTPI" role="3cqZAp">
@@ -10205,7 +10205,7 @@
             <property role="TrG5h" value="Name" />
           </node>
           <node concept="3uibUv" id="6MYr6Jxmmuf" role="3vLBG7">
-            <ref role="3uigEE" to="ie8e:2xQ7eRAD2dj" resolve="Value" />
+            <ref role="3uigEE" to="6exd:2xQ7eRAD2dj" resolve="Value" />
           </node>
         </node>
         <node concept="3clFbS" id="5_6ImQYgAiD" role="3Aqf5P">
@@ -10229,7 +10229,7 @@
             <property role="TrG5h" value="Name2" />
           </node>
           <node concept="3uibUv" id="6MYr6JxmmXN" role="3vLBG7">
-            <ref role="3uigEE" to="ie8e:2xQ7eRAD2dj" resolve="Value" />
+            <ref role="3uigEE" to="6exd:2xQ7eRAD2dj" resolve="Value" />
           </node>
         </node>
         <node concept="3clFbS" id="5_6ImQYgAiH" role="3Aqf5P">
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.build/models/jetbrains/mps/lang/typesystem2/samplechecker/build.mps b/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.build/models/jetbrains/mps/lang/typesystem2/samplechecker/build.mps
index 3863ef73..2c276902 100644
--- a/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.build/models/jetbrains/mps/lang/typesystem2/samplechecker/build.mps
+++ b/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.build/models/jetbrains/mps/lang/typesystem2/samplechecker/build.mps
@@ -177,30 +177,11 @@
             <node concept="L2wRC" id="65DJywFk8NI" role="39821P">
               <ref role="L2wRA" node="7BVjoXzUx$V" resolve="jetbrains.mps.logic.runtime" />
             </node>
-            <node concept="L2wRC" id="65DJywFk8SE" role="39821P">
-              <ref role="L2wRA" node="7BVjoXzUxt4" resolve="jetbrains.mps.logic.atom" />
-            </node>
             <node concept="L2wRC" id="65DJywFk9cZ" role="39821P">
               <ref role="L2wRA" node="7BVjoXzUxoR" resolve="jetbrains.mps.logic.reactor" />
             </node>
           </node>
           <node concept="398223" id="65DJywFkElN" role="39821P">
-            <node concept="2HvfSZ" id="65DJywFkciZ" role="39821P">
-              <node concept="55IIr" id="65DJywFkcj1" role="2HvfZ0">
-                <node concept="2Ry0Ak" id="65DJywFkclL" role="iGT6I">
-                  <property role="2Ry0Am" value="logic" />
-                  <node concept="2Ry0Ak" id="65DJywFkcqE" role="2Ry0An">
-                    <property role="2Ry0Am" value="solutions" />
-                    <node concept="2Ry0Ak" id="65DJywFkcqJ" role="2Ry0An">
-                      <property role="2Ry0Am" value="jetbrains.mps.logic.atom" />
-                      <node concept="2Ry0Ak" id="65DJywFkcqM" role="2Ry0An">
-                        <property role="2Ry0Am" value="lib" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
             <node concept="2HvfSZ" id="65DJywFkaRZ" role="39821P">
               <node concept="55IIr" id="65DJywFkaS1" role="2HvfZ0">
                 <node concept="2Ry0Ak" id="65DJywFkaUD" role="iGT6I">
@@ -344,12 +325,6 @@
             <ref role="3bR37D" to="ffeo:1TaHNgiIbIQ" resolve="MPS.Core" />
           </node>
         </node>
-        <node concept="1SiIV0" id="4pNU3yqbxek" role="3bR37C">
-          <node concept="3bR9La" id="4pNU3yqbxel" role="1SiIV1">
-            <property role="3bR36h" value="false" />
-            <ref role="3bR37D" node="7BVjoXzUxt4" resolve="jetbrains.mps.logic.atom" />
-          </node>
-        </node>
         <node concept="1E0d5M" id="4pNU3yqbxem" role="1E1XAP">
           <ref role="1E0d5P" node="7BVjoXzUx$V" resolve="jetbrains.mps.logic.runtime" />
         </node>
@@ -374,12 +349,6 @@
               <ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
             </node>
           </node>
-          <node concept="1SiIV0" id="4pNU3yqbxey" role="3bR37C">
-            <node concept="3bR9La" id="4pNU3yqbxez" role="1SiIV1">
-              <property role="3bR36h" value="false" />
-              <ref role="3bR37D" node="7BVjoXzUxt4" resolve="jetbrains.mps.logic.atom" />
-            </node>
-          </node>
         </node>
       </node>
       <node concept="1E1JtA" id="7BVjoXzUx$V" role="2G$12L">
@@ -410,12 +379,6 @@
             <ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
           </node>
         </node>
-        <node concept="1SiIV0" id="4pNU3yqbyNl" role="3bR37C">
-          <node concept="3bR9La" id="4pNU3yqbyNm" role="1SiIV1">
-            <property role="3bR36h" value="true" />
-            <ref role="3bR37D" node="7BVjoXzUxt4" resolve="jetbrains.mps.logic.atom" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="4pNU3yqbyNn" role="3bR37C">
           <node concept="3bR9La" id="4pNU3yqbyNo" role="1SiIV1">
             <property role="3bR36h" value="true" />
@@ -448,12 +411,6 @@
             <ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
           </node>
         </node>
-        <node concept="1SiIV0" id="7BVjoXzUxVj" role="3bR37C">
-          <node concept="3bR9La" id="7BVjoXzUxVk" role="1SiIV1">
-            <property role="3bR36h" value="false" />
-            <ref role="3bR37D" node="7BVjoXzUx$V" resolve="jetbrains.mps.logic.runtime" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="7BVjoXzUxVl" role="3bR37C">
           <node concept="3bR9La" id="7BVjoXzUxVm" role="1SiIV1">
             <property role="3bR36h" value="false" />
@@ -466,12 +423,6 @@
             <ref role="3bR37D" to="ffeo:1TaHNgiIbIQ" resolve="MPS.Core" />
           </node>
         </node>
-        <node concept="1SiIV0" id="7BVjoXzUxVp" role="3bR37C">
-          <node concept="3bR9La" id="7BVjoXzUxVq" role="1SiIV1">
-            <property role="3bR36h" value="false" />
-            <ref role="3bR37D" node="7BVjoXzUxt4" resolve="jetbrains.mps.logic.atom" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="7BVjoXzUxVx" role="3bR37C">
           <node concept="1BurEX" id="7BVjoXzUxVy" role="1SiIV1">
             <node concept="55IIr" id="7BVjoXzUxVr" role="1BurEY">
@@ -577,44 +528,18 @@
             </node>
           </node>
         </node>
-      </node>
-      <node concept="1E1JtA" id="7BVjoXzUxt4" role="2G$12L">
-        <property role="BnDLt" value="true" />
-        <property role="TrG5h" value="jetbrains.mps.logic.atom" />
-        <property role="3LESm3" value="7526e0cf-1ce7-46f8-a555-9eca1e06c23b" />
-        <property role="2GAjPV" value="false" />
-        <node concept="55IIr" id="7BVjoXzUxt5" role="3LF7KH">
-          <node concept="2Ry0Ak" id="7BVjoXzUxt6" role="iGT6I">
-            <property role="2Ry0Am" value="logic" />
-            <node concept="2Ry0Ak" id="7BVjoXzUxt7" role="2Ry0An">
-              <property role="2Ry0Am" value="solutions" />
-              <node concept="2Ry0Ak" id="7BVjoXzUxuH" role="2Ry0An">
-                <property role="2Ry0Am" value="jetbrains.mps.logic.atom" />
-                <node concept="2Ry0Ak" id="7BVjoXzUxvs" role="2Ry0An">
-                  <property role="2Ry0Am" value="jetbrains.mps.logic.atom.msd" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="7BVjoXzUxw8" role="3bR37C">
-          <node concept="3bR9La" id="7BVjoXzUxw9" role="1SiIV1">
-            <property role="3bR36h" value="false" />
-            <ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="7BVjoXzUxwg" role="3bR37C">
-          <node concept="1BurEX" id="7BVjoXzUxwh" role="1SiIV1">
-            <node concept="55IIr" id="7BVjoXzUxwa" role="1BurEY">
-              <node concept="2Ry0Ak" id="7BVjoXzUxwb" role="iGT6I">
+        <node concept="1SiIV0" id="1xxR4J9fX3K" role="3bR37C">
+          <node concept="1BurEX" id="1xxR4J9fX3L" role="1SiIV1">
+            <node concept="55IIr" id="1xxR4J9fX3E" role="1BurEY">
+              <node concept="2Ry0Ak" id="1xxR4J9fX3F" role="iGT6I">
                 <property role="2Ry0Am" value="logic" />
-                <node concept="2Ry0Ak" id="7BVjoXzUxwc" role="2Ry0An">
+                <node concept="2Ry0Ak" id="1xxR4J9fX3G" role="2Ry0An">
                   <property role="2Ry0Am" value="solutions" />
-                  <node concept="2Ry0Ak" id="7BVjoXzUxwd" role="2Ry0An">
-                    <property role="2Ry0Am" value="jetbrains.mps.logic.atom" />
-                    <node concept="2Ry0Ak" id="7BVjoXzUxwe" role="2Ry0An">
+                  <node concept="2Ry0Ak" id="1xxR4J9fX3H" role="2Ry0An">
+                    <property role="2Ry0Am" value="jetbrains.mps.logic.reactor" />
+                    <node concept="2Ry0Ak" id="1xxR4J9fX3I" role="2Ry0An">
                       <property role="2Ry0Am" value="lib" />
-                      <node concept="2Ry0Ak" id="7BVjoXzUxwf" role="2Ry0An">
+                      <node concept="2Ry0Ak" id="1xxR4J9fX3J" role="2Ry0An">
                         <property role="2Ry0Am" value="unification-lib-1.0.2.jar" />
                       </node>
                     </node>
@@ -895,12 +820,6 @@
             <ref role="3bR37D" to="ffeo:1TaHNgiIbIQ" resolve="MPS.Core" />
           </node>
         </node>
-        <node concept="1SiIV0" id="7BVjoXzUxXm" role="3bR37C">
-          <node concept="3bR9La" id="7BVjoXzUxXn" role="1SiIV1">
-            <property role="3bR36h" value="false" />
-            <ref role="3bR37D" node="7BVjoXzUxt4" resolve="jetbrains.mps.logic.atom" />
-          </node>
-        </node>
       </node>
       <node concept="1E1JtA" id="7BVjoXzUxee" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -936,12 +855,6 @@
             <ref role="3bR37D" node="7BVjoXzUx$V" resolve="jetbrains.mps.logic.runtime" />
           </node>
         </node>
-        <node concept="1SiIV0" id="7BVjoXzUxXv" role="3bR37C">
-          <node concept="3bR9La" id="7BVjoXzUxXw" role="1SiIV1">
-            <property role="3bR36h" value="true" />
-            <ref role="3bR37D" node="7BVjoXzUxt4" resolve="jetbrains.mps.logic.atom" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="7BVjoXzUxXx" role="3bR37C">
           <node concept="3bR9La" id="7BVjoXzUxXy" role="1SiIV1">
             <property role="3bR36h" value="true" />
@@ -1079,12 +992,6 @@
             <ref role="3bR37D" to="ffeo:1TaHNgiIbIQ" resolve="MPS.Core" />
           </node>
         </node>
-        <node concept="1SiIV0" id="65DJywFj29$" role="3bR37C">
-          <node concept="3bR9La" id="65DJywFj29_" role="1SiIV1">
-            <property role="3bR36h" value="false" />
-            <ref role="3bR37D" node="7BVjoXzUxt4" resolve="jetbrains.mps.logic.atom" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="7Ant4Wk$kAj" role="3bR37C">
           <node concept="3bR9La" id="7Ant4Wk$kAk" role="1SiIV1">
             <property role="3bR36h" value="false" />
@@ -1135,12 +1042,6 @@
             <ref role="3bR37D" to="ffeo:7Kfy9QB6KYb" resolve="jetbrains.mps.baseLanguage" />
           </node>
         </node>
-        <node concept="1SiIV0" id="7Ant4Wk$4p$" role="3bR37C">
-          <node concept="3bR9La" id="7Ant4Wk$4p_" role="1SiIV1">
-            <property role="3bR36h" value="false" />
-            <ref role="3bR37D" node="7BVjoXzUxt4" resolve="jetbrains.mps.logic.atom" />
-          </node>
-        </node>
       </node>
     </node>
   </node>
@@ -1178,9 +1079,6 @@
         <node concept="L2wRC" id="7Ant4WkHLmu" role="39821P">
           <ref role="L2wRA" node="7Ant4WkHLnR" resolve="jetbrains.mps.logic.runtime" />
         </node>
-        <node concept="L2wRC" id="7Ant4WkHLmv" role="39821P">
-          <ref role="L2wRA" node="7Ant4WkHLoW" resolve="jetbrains.mps.logic.atom" />
-        </node>
         <node concept="L2wRC" id="7Ant4WkHLmw" role="39821P">
           <ref role="L2wRA" node="7Ant4WkHLo4" resolve="jetbrains.mps.logic.reactor" />
         </node>
@@ -1202,22 +1100,6 @@
           <ref role="L2wRA" node="7Ant4WkHLsF" resolve="jetbrains.mps.lang.typesystem2.sampleLang" />
         </node>
         <node concept="398223" id="7Ant4WkHLmR" role="39821P">
-          <node concept="2HvfSZ" id="7Ant4WkHLmx" role="39821P">
-            <node concept="55IIr" id="7Ant4WkHLmy" role="2HvfZ0">
-              <node concept="2Ry0Ak" id="7Ant4WkHLmz" role="iGT6I">
-                <property role="2Ry0Am" value="logic" />
-                <node concept="2Ry0Ak" id="7Ant4WkHLm$" role="2Ry0An">
-                  <property role="2Ry0Am" value="solutions" />
-                  <node concept="2Ry0Ak" id="7Ant4WkHLm_" role="2Ry0An">
-                    <property role="2Ry0Am" value="jetbrains.mps.logic.atom" />
-                    <node concept="2Ry0Ak" id="7Ant4WkHLmA" role="2Ry0An">
-                      <property role="2Ry0Am" value="lib" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
           <node concept="2HvfSZ" id="7Ant4WkHLmB" role="39821P">
             <node concept="55IIr" id="7Ant4WkHLmC" role="2HvfZ0">
               <node concept="2Ry0Ak" id="7Ant4WkHLmD" role="iGT6I">
@@ -1359,12 +1241,6 @@
             <ref role="3bR37D" to="ffeo:1TaHNgiIbIQ" resolve="MPS.Core" />
           </node>
         </node>
-        <node concept="1SiIV0" id="7Ant4WkHLnF" role="3bR37C">
-          <node concept="3bR9La" id="7Ant4WkHLnG" role="1SiIV1">
-            <property role="3bR36h" value="false" />
-            <ref role="3bR37D" node="7Ant4WkHLoW" resolve="jetbrains.mps.logic.atom" />
-          </node>
-        </node>
         <node concept="1E0d5M" id="7Ant4WkHLnH" role="1E1XAP">
           <ref role="1E0d5P" node="7Ant4WkHLnR" resolve="jetbrains.mps.logic.runtime" />
         </node>
@@ -1389,12 +1265,6 @@
               <ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
             </node>
           </node>
-          <node concept="1SiIV0" id="7Ant4WkHLnP" role="3bR37C">
-            <node concept="3bR9La" id="7Ant4WkHLnQ" role="1SiIV1">
-              <property role="3bR36h" value="false" />
-              <ref role="3bR37D" node="7Ant4WkHLoW" resolve="jetbrains.mps.logic.atom" />
-            </node>
-          </node>
         </node>
       </node>
       <node concept="1E1JtA" id="7Ant4WkHLnR" role="2G$12L">
@@ -1425,12 +1295,6 @@
             <ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
           </node>
         </node>
-        <node concept="1SiIV0" id="7Ant4WkHLo0" role="3bR37C">
-          <node concept="3bR9La" id="7Ant4WkHLo1" role="1SiIV1">
-            <property role="3bR36h" value="true" />
-            <ref role="3bR37D" node="7Ant4WkHLoW" resolve="jetbrains.mps.logic.atom" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="7Ant4WkHLo2" role="3bR37C">
           <node concept="3bR9La" id="7Ant4WkHLo3" role="1SiIV1">
             <property role="3bR36h" value="true" />
@@ -1463,12 +1327,6 @@
             <ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
           </node>
         </node>
-        <node concept="1SiIV0" id="7Ant4WkHLoc" role="3bR37C">
-          <node concept="3bR9La" id="7Ant4WkHLod" role="1SiIV1">
-            <property role="3bR36h" value="false" />
-            <ref role="3bR37D" node="7Ant4WkHLnR" resolve="jetbrains.mps.logic.runtime" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="7Ant4WkHLoe" role="3bR37C">
           <node concept="3bR9La" id="7Ant4WkHLof" role="1SiIV1">
             <property role="3bR36h" value="false" />
@@ -1481,12 +1339,6 @@
             <ref role="3bR37D" to="ffeo:1TaHNgiIbIQ" resolve="MPS.Core" />
           </node>
         </node>
-        <node concept="1SiIV0" id="7Ant4WkHLoi" role="3bR37C">
-          <node concept="3bR9La" id="7Ant4WkHLoj" role="1SiIV1">
-            <property role="3bR36h" value="false" />
-            <ref role="3bR37D" node="7Ant4WkHLoW" resolve="jetbrains.mps.logic.atom" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="7Ant4WkHLok" role="3bR37C">
           <node concept="1BurEX" id="7Ant4WkHLol" role="1SiIV1">
             <node concept="55IIr" id="7Ant4WkHLom" role="1BurEY">
@@ -1592,44 +1444,18 @@
             </node>
           </node>
         </node>
-      </node>
-      <node concept="1E1JtA" id="7Ant4WkHLoW" role="2G$12L">
-        <property role="BnDLt" value="true" />
-        <property role="TrG5h" value="jetbrains.mps.logic.atom" />
-        <property role="3LESm3" value="7526e0cf-1ce7-46f8-a555-9eca1e06c23b" />
-        <property role="2GAjPV" value="false" />
-        <node concept="55IIr" id="7Ant4WkHLoX" role="3LF7KH">
-          <node concept="2Ry0Ak" id="7Ant4WkHLoY" role="iGT6I">
-            <property role="2Ry0Am" value="logic" />
-            <node concept="2Ry0Ak" id="7Ant4WkHLoZ" role="2Ry0An">
-              <property role="2Ry0Am" value="solutions" />
-              <node concept="2Ry0Ak" id="7Ant4WkHLp0" role="2Ry0An">
-                <property role="2Ry0Am" value="jetbrains.mps.logic.atom" />
-                <node concept="2Ry0Ak" id="7Ant4WkHLp1" role="2Ry0An">
-                  <property role="2Ry0Am" value="jetbrains.mps.logic.atom.msd" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="7Ant4WkHLp2" role="3bR37C">
-          <node concept="3bR9La" id="7Ant4WkHLp3" role="1SiIV1">
-            <property role="3bR36h" value="false" />
-            <ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="7Ant4WkHLp4" role="3bR37C">
-          <node concept="1BurEX" id="7Ant4WkHLp5" role="1SiIV1">
-            <node concept="55IIr" id="7Ant4WkHLp6" role="1BurEY">
-              <node concept="2Ry0Ak" id="7Ant4WkHLp7" role="iGT6I">
+        <node concept="1SiIV0" id="1xxR4J9fX9L" role="3bR37C">
+          <node concept="1BurEX" id="1xxR4J9fX9M" role="1SiIV1">
+            <node concept="55IIr" id="1xxR4J9fX9F" role="1BurEY">
+              <node concept="2Ry0Ak" id="1xxR4J9fX9G" role="iGT6I">
                 <property role="2Ry0Am" value="logic" />
-                <node concept="2Ry0Ak" id="7Ant4WkHLp8" role="2Ry0An">
+                <node concept="2Ry0Ak" id="1xxR4J9fX9H" role="2Ry0An">
                   <property role="2Ry0Am" value="solutions" />
-                  <node concept="2Ry0Ak" id="7Ant4WkHLp9" role="2Ry0An">
-                    <property role="2Ry0Am" value="jetbrains.mps.logic.atom" />
-                    <node concept="2Ry0Ak" id="7Ant4WkHLpa" role="2Ry0An">
+                  <node concept="2Ry0Ak" id="1xxR4J9fX9I" role="2Ry0An">
+                    <property role="2Ry0Am" value="jetbrains.mps.logic.reactor" />
+                    <node concept="2Ry0Ak" id="1xxR4J9fX9J" role="2Ry0An">
                       <property role="2Ry0Am" value="lib" />
-                      <node concept="2Ry0Ak" id="7Ant4WkHLpb" role="2Ry0An">
+                      <node concept="2Ry0Ak" id="1xxR4J9fX9K" role="2Ry0An">
                         <property role="2Ry0Am" value="unification-lib-1.0.2.jar" />
                       </node>
                     </node>
@@ -2006,12 +1832,6 @@
             <ref role="3bR37D" to="ffeo:1TaHNgiIbIQ" resolve="MPS.Core" />
           </node>
         </node>
-        <node concept="1SiIV0" id="7Ant4WkHLr7" role="3bR37C">
-          <node concept="3bR9La" id="7Ant4WkHLr8" role="1SiIV1">
-            <property role="3bR36h" value="false" />
-            <ref role="3bR37D" node="7Ant4WkHLoW" resolve="jetbrains.mps.logic.atom" />
-          </node>
-        </node>
       </node>
       <node concept="1E1JtA" id="7Ant4WkHLr9" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -2047,12 +1867,6 @@
             <ref role="3bR37D" node="7Ant4WkHLnR" resolve="jetbrains.mps.logic.runtime" />
           </node>
         </node>
-        <node concept="1SiIV0" id="7Ant4WkHLrk" role="3bR37C">
-          <node concept="3bR9La" id="7Ant4WkHLrl" role="1SiIV1">
-            <property role="3bR36h" value="true" />
-            <ref role="3bR37D" node="7Ant4WkHLoW" resolve="jetbrains.mps.logic.atom" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="7Ant4WkHLrm" role="3bR37C">
           <node concept="3bR9La" id="7Ant4WkHLrn" role="1SiIV1">
             <property role="3bR36h" value="true" />
@@ -2107,12 +1921,6 @@
             <ref role="3bR37D" node="7Ant4WkHLnR" resolve="jetbrains.mps.logic.runtime" />
           </node>
         </node>
-        <node concept="1SiIV0" id="7Ant4WkHLr_" role="3bR37C">
-          <node concept="3bR9La" id="7Ant4WkHLrA" role="1SiIV1">
-            <property role="3bR36h" value="false" />
-            <ref role="3bR37D" node="7Ant4WkHLoW" resolve="jetbrains.mps.logic.atom" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="7Ant4WkHLrB" role="3bR37C">
           <node concept="3bR9La" id="7Ant4WkHLrC" role="1SiIV1">
             <property role="3bR36h" value="true" />
@@ -2244,12 +2052,6 @@
             <ref role="3bR37D" to="ffeo:1TaHNgiIbIQ" resolve="MPS.Core" />
           </node>
         </node>
-        <node concept="1SiIV0" id="7Ant4WkHLsi" role="3bR37C">
-          <node concept="3bR9La" id="7Ant4WkHLsj" role="1SiIV1">
-            <property role="3bR36h" value="false" />
-            <ref role="3bR37D" node="7Ant4WkHLoW" resolve="jetbrains.mps.logic.atom" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="7Ant4WkHLsk" role="3bR37C">
           <node concept="3bR9La" id="7Ant4WkHLsl" role="1SiIV1">
             <property role="3bR36h" value="false" />
@@ -2300,12 +2102,6 @@
             <ref role="3bR37D" to="ffeo:7Kfy9QB6KYb" resolve="jetbrains.mps.baseLanguage" />
           </node>
         </node>
-        <node concept="1SiIV0" id="7Ant4WkHLsC" role="3bR37C">
-          <node concept="3bR9La" id="7Ant4WkHLsD" role="1SiIV1">
-            <property role="3bR36h" value="false" />
-            <ref role="3bR37D" node="7Ant4WkHLoW" resolve="jetbrains.mps.logic.atom" />
-          </node>
-        </node>
       </node>
     </node>
     <node concept="2G$12M" id="7Ant4WkHLsE" role="3989C9">
@@ -2353,12 +2149,6 @@
             <ref role="3bR37D" node="7Ant4WkHLsm" resolve="jetbrains.mps.lang.typesystem2.samplechecker.handler.util" />
           </node>
         </node>
-        <node concept="1SiIV0" id="7Ant4WkHLsT" role="3bR37C">
-          <node concept="3bR9La" id="7Ant4WkHLsU" role="1SiIV1">
-            <property role="3bR36h" value="false" />
-            <ref role="3bR37D" node="7Ant4WkHLoW" resolve="jetbrains.mps.logic.atom" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="7Ant4WkHLsV" role="3bR37C">
           <node concept="1Busua" id="7Ant4WkHLsW" role="1SiIV1">
             <ref role="1Busuk" to="ffeo:7Kfy9QB6KYb" resolve="jetbrains.mps.baseLanguage" />
@@ -2408,12 +2198,6 @@
             <ref role="3bR37D" to="ffeo:7Kfy9QB6KYb" resolve="jetbrains.mps.baseLanguage" />
           </node>
         </node>
-        <node concept="1SiIV0" id="7Ant4WkHLta" role="3bR37C">
-          <node concept="3bR9La" id="7Ant4WkHLtb" role="1SiIV1">
-            <property role="3bR36h" value="false" />
-            <ref role="3bR37D" node="7Ant4WkHLoW" resolve="jetbrains.mps.logic.atom" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="7Ant4WkHLtc" role="3bR37C">
           <node concept="3bR9La" id="7Ant4WkHLtd" role="1SiIV1">
             <property role="3bR36h" value="false" />
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.test/jetbrains.mps.lang.typesystem2.samplechecker.handler.test.msd b/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.test/jetbrains.mps.lang.typesystem2.samplechecker.handler.test.msd
index ead2c35d..09c1a9ff 100644
--- a/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.test/jetbrains.mps.lang.typesystem2.samplechecker.handler.test.msd
+++ b/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.test/jetbrains.mps.lang.typesystem2.samplechecker.handler.test.msd
@@ -9,7 +9,6 @@
   <dependencies>
     <dependency reexport="false">9c4ae21e-62e0-4110-95b7-191b357a42d2(jetbrains.mps.lang.typesystem2.samplechecker.handler.util)</dependency>
     <dependency reexport="false">a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)</dependency>
-    <dependency reexport="false">7526e0cf-1ce7-46f8-a555-9eca1e06c23b(jetbrains.mps.logic.atom)</dependency>
     <dependency reexport="true">bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)</dependency>
     <dependency reexport="false">b189d6c6-9397-4d64-88af-1ac73760a4f5(jetbrains.mps.logic.test)</dependency>
   </dependencies>
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.test/models/jetbrains/mps/lang/typesystem2/samplechecker/handle/test/util@tests.mps b/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.test/models/jetbrains/mps/lang/typesystem2/samplechecker/handle/test/util@tests.mps
index 37627c9c..77e735c5 100644
--- a/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.test/models/jetbrains/mps/lang/typesystem2/samplechecker/handle/test/util@tests.mps
+++ b/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.test/models/jetbrains/mps/lang/typesystem2/samplechecker/handle/test/util@tests.mps
@@ -7,12 +7,12 @@
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="4" />
   </languages>
   <imports>
-    <import index="ie8e" ref="r:ab2605ab-b4bc-4e80-a8ca-19a4a8465c01(jetbrains.mps.logic.atom)" />
     <import index="4r4j" ref="r:94702bd0-f623-44e8-af0a-f2730f7d2518(jetbrains.mps.lang.typesystem2.samplechecker.handle.util)" />
     <import index="qrld" ref="r:2a79c8aa-e372-4c00-8d71-5d7f3db517e4(jetbrains.mps.logic.reactor.evaluation)" />
     <import index="mqqo" ref="r:82cec6f7-ddec-440c-961c-1c598267be42(jetbrains.mps.logic.test.unification)" />
     <import index="cxk7" ref="r:daa544a7-0a5c-49c0-a54c-4c2a5b4868aa(jetbrains.mps.logic.builtin.predicate)" />
     <import index="zx3l" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.core(jetbrains.mps.logic.reactor/)" />
+    <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.treeform)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -143,7 +143,7 @@
             <node concept="3cpWsn" id="7t5VLKGALSU" role="3cpWs9">
               <property role="TrG5h" value="left" />
               <node concept="3uibUv" id="7t5VLKGALSV" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="7t5VLKGALSW" role="33vP2m">
                 <node concept="1oi5ST" id="7t5VLKGALSX" role="1oi0x0">
@@ -205,7 +205,7 @@
             <node concept="3cpWsn" id="7t5VLKGALTe" role="3cpWs9">
               <property role="TrG5h" value="right" />
               <node concept="3uibUv" id="7t5VLKGALTf" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="7t5VLKGALTg" role="33vP2m">
                 <node concept="1oi5ST" id="7t5VLKGALTh" role="1oi0x0">
@@ -256,7 +256,7 @@
               <node concept="3uibUv" id="6yEjedm7dtr" role="1tU5fm">
                 <ref role="3uigEE" to="zx3l:~MemLogical" resolve="MemLogical" />
                 <node concept="3uibUv" id="6yEjedm7jXZ" role="11_B2D">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
               <node concept="2ShNRf" id="7t5VLKGALTw" role="33vP2m">
@@ -266,7 +266,7 @@
                     <property role="Xl_RC" value="var" />
                   </node>
                   <node concept="3uibUv" id="6yEjedm7hYU" role="1pMfVU">
-                    <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                    <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                   </node>
                 </node>
               </node>
@@ -322,7 +322,7 @@
             <node concept="3cpWsn" id="4JRKVCv8a6f" role="3cpWs9">
               <property role="TrG5h" value="expect" />
               <node concept="3uibUv" id="4JRKVCv8a6g" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="4JRKVCv8a6h" role="33vP2m">
                 <node concept="1oi5ST" id="4JRKVCv8a6i" role="1oi0x0">
@@ -384,7 +384,7 @@
             <node concept="3cpWsn" id="7t5VLKGALTU" role="3cpWs9">
               <property role="TrG5h" value="left" />
               <node concept="3uibUv" id="7t5VLKGALTV" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="7t5VLKGALTW" role="33vP2m">
                 <node concept="1oi5ST" id="3t7_2FgGZ_3" role="1oi0x0">
@@ -446,7 +446,7 @@
             <node concept="3cpWsn" id="7t5VLKGALUe" role="3cpWs9">
               <property role="TrG5h" value="right" />
               <node concept="3uibUv" id="7t5VLKGALUf" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="7t5VLKGALUg" role="33vP2m">
                 <node concept="1oi5ST" id="3t7_2FgGZG8" role="1oi0x0">
@@ -511,7 +511,7 @@
               <node concept="3uibUv" id="6yEjedm7RDV" role="1tU5fm">
                 <ref role="3uigEE" to="zx3l:~MemLogical" resolve="MemLogical" />
                 <node concept="3uibUv" id="6yEjedm7RDW" role="11_B2D">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
               <node concept="2ShNRf" id="6yEjedm7RDX" role="33vP2m">
@@ -521,7 +521,7 @@
                     <property role="Xl_RC" value="var" />
                   </node>
                   <node concept="3uibUv" id="6yEjedm7RE0" role="1pMfVU">
-                    <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                    <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                   </node>
                 </node>
               </node>
@@ -577,7 +577,7 @@
             <node concept="3cpWsn" id="7t5VLKGALUW" role="3cpWs9">
               <property role="TrG5h" value="expect" />
               <node concept="3uibUv" id="7t5VLKGALUX" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="7t5VLKGALUY" role="33vP2m">
                 <node concept="1oi5ST" id="7t5VLKGALUZ" role="1oi0x0">
@@ -639,7 +639,7 @@
             <node concept="3cpWsn" id="7t5VLKGALVi" role="3cpWs9">
               <property role="TrG5h" value="left" />
               <node concept="3uibUv" id="7t5VLKGALVj" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="7t5VLKGALVk" role="33vP2m">
                 <node concept="1oi5ST" id="3t7_2FgH1Hz" role="1oi0x0">
@@ -701,7 +701,7 @@
             <node concept="3cpWsn" id="7t5VLKGALVA" role="3cpWs9">
               <property role="TrG5h" value="right" />
               <node concept="3uibUv" id="7t5VLKGALVB" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="7t5VLKGALVC" role="33vP2m">
                 <node concept="1oi5ST" id="3t7_2FgH1Jc" role="1oi0x0">
@@ -752,7 +752,7 @@
               <node concept="3uibUv" id="6yEjedm7ovG" role="1tU5fm">
                 <ref role="3uigEE" to="zx3l:~MemLogical" resolve="MemLogical" />
                 <node concept="3uibUv" id="6yEjedm7ovH" role="11_B2D">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
               <node concept="2ShNRf" id="6yEjedm7ovI" role="33vP2m">
@@ -762,7 +762,7 @@
                     <property role="Xl_RC" value="var" />
                   </node>
                   <node concept="3uibUv" id="6yEjedm7ovL" role="1pMfVU">
-                    <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                    <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                   </node>
                 </node>
               </node>
@@ -818,7 +818,7 @@
             <node concept="3cpWsn" id="7t5VLKGALWf" role="3cpWs9">
               <property role="TrG5h" value="expect" />
               <node concept="3uibUv" id="7t5VLKGALWg" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="7t5VLKGALWh" role="33vP2m">
                 <node concept="1oi5ST" id="7t5VLKGALWi" role="1oi0x0">
@@ -880,7 +880,7 @@
             <node concept="3cpWsn" id="7t5VLKGALW_" role="3cpWs9">
               <property role="TrG5h" value="left" />
               <node concept="3uibUv" id="7t5VLKGALWA" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="7t5VLKGALWB" role="33vP2m">
                 <node concept="1oi5ST" id="3t7_2FgH3LN" role="1oi0x0">
@@ -942,7 +942,7 @@
             <node concept="3cpWsn" id="7t5VLKGALWT" role="3cpWs9">
               <property role="TrG5h" value="right" />
               <node concept="3uibUv" id="7t5VLKGALWU" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="7t5VLKGALWV" role="33vP2m">
                 <node concept="1oi5ST" id="3t7_2FgH3SN" role="1oi0x0">
@@ -1021,7 +1021,7 @@
               <node concept="3uibUv" id="6yEjedm7saG" role="1tU5fm">
                 <ref role="3uigEE" to="zx3l:~MemLogical" resolve="MemLogical" />
                 <node concept="3uibUv" id="6yEjedm7saH" role="11_B2D">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
               <node concept="2ShNRf" id="6yEjedm7saI" role="33vP2m">
@@ -1031,7 +1031,7 @@
                     <property role="Xl_RC" value="var" />
                   </node>
                   <node concept="3uibUv" id="6yEjedm7saL" role="1pMfVU">
-                    <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                    <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                   </node>
                 </node>
               </node>
@@ -1087,7 +1087,7 @@
             <node concept="3cpWsn" id="7t5VLKGALXG" role="3cpWs9">
               <property role="TrG5h" value="expect" />
               <node concept="3uibUv" id="7t5VLKGALXH" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="7t5VLKGALXI" role="33vP2m">
                 <node concept="1oi5ST" id="7t5VLKGALXJ" role="1oi0x0">
@@ -1149,7 +1149,7 @@
             <node concept="3cpWsn" id="7t5VLKGALY2" role="3cpWs9">
               <property role="TrG5h" value="left" />
               <node concept="3uibUv" id="7t5VLKGALY3" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="7t5VLKGALY4" role="33vP2m">
                 <node concept="1oi5ST" id="7t5VLKGALY5" role="1oi0x0">
@@ -1258,7 +1258,7 @@
             <node concept="3cpWsn" id="7t5VLKGALYz" role="3cpWs9">
               <property role="TrG5h" value="right" />
               <node concept="3uibUv" id="7t5VLKGALY$" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="7t5VLKGALY_" role="33vP2m">
                 <node concept="1oi5ST" id="7t5VLKGALYA" role="1oi0x0">
@@ -1431,7 +1431,7 @@
               <node concept="3uibUv" id="6yEjedm7vK5" role="1tU5fm">
                 <ref role="3uigEE" to="zx3l:~MemLogical" resolve="MemLogical" />
                 <node concept="3uibUv" id="6yEjedm7vK6" role="11_B2D">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
               <node concept="2ShNRf" id="6yEjedm7vK7" role="33vP2m">
@@ -1441,7 +1441,7 @@
                     <property role="Xl_RC" value="var" />
                   </node>
                   <node concept="3uibUv" id="6yEjedm7vKa" role="1pMfVU">
-                    <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                    <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                   </node>
                 </node>
               </node>
@@ -1497,7 +1497,7 @@
             <node concept="3cpWsn" id="7t5VLKGALZK" role="3cpWs9">
               <property role="TrG5h" value="expect" />
               <node concept="3uibUv" id="7t5VLKGALZL" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="7t5VLKGALZM" role="33vP2m">
                 <node concept="1oi5ST" id="7t5VLKGALZN" role="1oi0x0">
@@ -1589,7 +1589,7 @@
             <node concept="3cpWsn" id="3hfdu5cNgqA" role="3cpWs9">
               <property role="TrG5h" value="left" />
               <node concept="3uibUv" id="3hfdu5cNgqB" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="3hfdu5cNgqC" role="33vP2m">
                 <node concept="1oi5ST" id="3hfdu5cNgqD" role="1oi0x0">
@@ -1757,7 +1757,7 @@
             <node concept="3cpWsn" id="3hfdu5cNgre" role="3cpWs9">
               <property role="TrG5h" value="right" />
               <node concept="3uibUv" id="3hfdu5cNgrf" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="3hfdu5cNgrg" role="33vP2m">
                 <node concept="1oi5ST" id="3hfdu5cNgrh" role="1oi0x0">
@@ -1934,7 +1934,7 @@
               <node concept="3uibUv" id="6yEjedm7zhb" role="1tU5fm">
                 <ref role="3uigEE" to="zx3l:~MemLogical" resolve="MemLogical" />
                 <node concept="3uibUv" id="6yEjedm7zhc" role="11_B2D">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
               <node concept="2ShNRf" id="6yEjedm7zhd" role="33vP2m">
@@ -1944,7 +1944,7 @@
                     <property role="Xl_RC" value="var" />
                   </node>
                   <node concept="3uibUv" id="6yEjedm7zhg" role="1pMfVU">
-                    <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                    <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                   </node>
                 </node>
               </node>
@@ -2000,7 +2000,7 @@
             <node concept="3cpWsn" id="3hfdu5cNgsA" role="3cpWs9">
               <property role="TrG5h" value="expect" />
               <node concept="3uibUv" id="3hfdu5cNgsB" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="3hfdu5cNgsC" role="33vP2m">
                 <node concept="1oi5ST" id="3hfdu5cNgsD" role="1oi0x0">
@@ -2072,7 +2072,7 @@
             <node concept="3cpWsn" id="3KV3FXk2oHN" role="3cpWs9">
               <property role="TrG5h" value="left" />
               <node concept="3uibUv" id="3KV3FXk2oHO" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="3KV3FXk2oHP" role="33vP2m">
                 <node concept="1oi5ST" id="3KV3FXk2oHQ" role="1oi0x0">
@@ -2295,7 +2295,7 @@
             <node concept="3cpWsn" id="3KV3FXk2oJ1" role="3cpWs9">
               <property role="TrG5h" value="right" />
               <node concept="3uibUv" id="3KV3FXk2oJ2" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="3KV3FXk2oJ3" role="33vP2m">
                 <node concept="1oi5ST" id="3KV3FXk2oJ4" role="1oi0x0">
@@ -2474,7 +2474,7 @@
               <node concept="3uibUv" id="6yEjedm7AXY" role="1tU5fm">
                 <ref role="3uigEE" to="zx3l:~MemLogical" resolve="MemLogical" />
                 <node concept="3uibUv" id="6yEjedm7AXZ" role="11_B2D">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
               <node concept="2ShNRf" id="6yEjedm7AY0" role="33vP2m">
@@ -2484,7 +2484,7 @@
                     <property role="Xl_RC" value="var" />
                   </node>
                   <node concept="3uibUv" id="6yEjedm7AY3" role="1pMfVU">
-                    <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                    <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                   </node>
                 </node>
               </node>
@@ -2540,7 +2540,7 @@
             <node concept="3cpWsn" id="3KV3FXk2oKs" role="3cpWs9">
               <property role="TrG5h" value="expect" />
               <node concept="3uibUv" id="3KV3FXk2oKt" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="3KV3FXk2oKu" role="33vP2m">
                 <node concept="1oi5ST" id="3KV3FXk2oKv" role="1oi0x0">
@@ -2612,7 +2612,7 @@
             <node concept="3cpWsn" id="3hfdu5cN_JW" role="3cpWs9">
               <property role="TrG5h" value="left" />
               <node concept="3uibUv" id="3hfdu5cN_JX" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="3hfdu5cN_JY" role="33vP2m">
                 <node concept="1oi5ST" id="3hfdu5cN_JZ" role="1oi0x0">
@@ -2780,7 +2780,7 @@
             <node concept="3cpWsn" id="3hfdu5cN_KU" role="3cpWs9">
               <property role="TrG5h" value="right" />
               <node concept="3uibUv" id="3hfdu5cN_KV" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="3hfdu5cN_KW" role="33vP2m">
                 <node concept="1oi5ST" id="3hfdu5cN_KX" role="1oi0x0">
@@ -2935,7 +2935,7 @@
               <node concept="3uibUv" id="6yEjedm7Ejw" role="1tU5fm">
                 <ref role="3uigEE" to="zx3l:~MemLogical" resolve="MemLogical" />
                 <node concept="3uibUv" id="6yEjedm7Ejx" role="11_B2D">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
               <node concept="2ShNRf" id="6yEjedm7Ejy" role="33vP2m">
@@ -2945,7 +2945,7 @@
                     <property role="Xl_RC" value="var" />
                   </node>
                   <node concept="3uibUv" id="6yEjedm7Ej_" role="1pMfVU">
-                    <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                    <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                   </node>
                 </node>
               </node>
@@ -3001,7 +3001,7 @@
             <node concept="3cpWsn" id="3hfdu5cN_MP" role="3cpWs9">
               <property role="TrG5h" value="expect" />
               <node concept="3uibUv" id="3hfdu5cN_MQ" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="3hfdu5cN_MR" role="33vP2m">
                 <node concept="1oi5ST" id="3hfdu5cN_MS" role="1oi0x0">
@@ -3057,7 +3057,7 @@
             <node concept="3cpWsn" id="3KV3FXjXcpc" role="3cpWs9">
               <property role="TrG5h" value="left" />
               <node concept="3uibUv" id="3KV3FXjXcpd" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="3KV3FXjXcpe" role="33vP2m">
                 <node concept="1oi5ST" id="3KV3FXjXcpf" role="1oi0x0">
@@ -3225,7 +3225,7 @@
             <node concept="3cpWsn" id="3KV3FXjXcq7" role="3cpWs9">
               <property role="TrG5h" value="right" />
               <node concept="3uibUv" id="3KV3FXjXcq8" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="3KV3FXjXcq9" role="33vP2m">
                 <node concept="1oi5ST" id="3KV3FXjXcqa" role="1oi0x0">
@@ -3400,7 +3400,7 @@
               <node concept="3uibUv" id="6yEjedm7HxO" role="1tU5fm">
                 <ref role="3uigEE" to="zx3l:~MemLogical" resolve="MemLogical" />
                 <node concept="3uibUv" id="6yEjedm7HxP" role="11_B2D">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
               <node concept="2ShNRf" id="6yEjedm7HxQ" role="33vP2m">
@@ -3410,7 +3410,7 @@
                     <property role="Xl_RC" value="var" />
                   </node>
                   <node concept="3uibUv" id="6yEjedm7HxT" role="1pMfVU">
-                    <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                    <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                   </node>
                 </node>
               </node>
@@ -3466,7 +3466,7 @@
             <node concept="3cpWsn" id="3KV3FXjXcrs" role="3cpWs9">
               <property role="TrG5h" value="expect" />
               <node concept="3uibUv" id="3KV3FXjXcrt" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="3KV3FXjXcru" role="33vP2m">
                 <node concept="1oi5ST" id="3KV3FXjXcrv" role="1oi0x0">
@@ -3542,7 +3542,7 @@
             <node concept="3cpWsn" id="3KV3FXk18Nd" role="3cpWs9">
               <property role="TrG5h" value="left" />
               <node concept="3uibUv" id="3KV3FXk18Ne" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="3KV3FXk18Nf" role="33vP2m">
                 <node concept="1oi5ST" id="3KV3FXk18Ng" role="1oi0x0">
@@ -3710,7 +3710,7 @@
             <node concept="3cpWsn" id="3KV3FXk18O5" role="3cpWs9">
               <property role="TrG5h" value="right" />
               <node concept="3uibUv" id="3KV3FXk18O6" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="3KV3FXk18O7" role="33vP2m">
                 <node concept="1oi5ST" id="3KV3FXk18O8" role="1oi0x0">
@@ -3761,7 +3761,7 @@
               <node concept="3uibUv" id="6yEjedm7KDD" role="1tU5fm">
                 <ref role="3uigEE" to="zx3l:~MemLogical" resolve="MemLogical" />
                 <node concept="3uibUv" id="6yEjedm7KDE" role="11_B2D">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
               <node concept="2ShNRf" id="6yEjedm7KDF" role="33vP2m">
@@ -3771,7 +3771,7 @@
                     <property role="Xl_RC" value="var" />
                   </node>
                   <node concept="3uibUv" id="6yEjedm7KDI" role="1pMfVU">
-                    <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                    <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                   </node>
                 </node>
               </node>
@@ -3827,7 +3827,7 @@
             <node concept="3cpWsn" id="3KV3FXk18Pu" role="3cpWs9">
               <property role="TrG5h" value="expect" />
               <node concept="3uibUv" id="3KV3FXk18Pv" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="3KV3FXk18Pw" role="33vP2m">
                 <node concept="1oi5ST" id="3KV3FXk18Px" role="1oi0x0">
@@ -3942,7 +3942,7 @@
             <node concept="3cpWsn" id="3KV3FXk2boN" role="3cpWs9">
               <property role="TrG5h" value="fullPaths" />
               <node concept="3uibUv" id="3KV3FXk2boO" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="3KV3FXk2boP" role="33vP2m">
                 <node concept="1oi5ST" id="3KV3FXk2boQ" role="1oi0x0">
@@ -4110,7 +4110,7 @@
             <node concept="3cpWsn" id="3KV3FXk2bpF" role="3cpWs9">
               <property role="TrG5h" value="startFrom" />
               <node concept="3uibUv" id="3KV3FXk2bpG" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="3KV3FXk2bpH" role="33vP2m">
                 <node concept="1oi5UN" id="3KV3FXk2bpR" role="1oi0x0">
@@ -4137,7 +4137,7 @@
               <node concept="3uibUv" id="6yEjedm7VYx" role="1tU5fm">
                 <ref role="3uigEE" to="zx3l:~MemLogical" resolve="MemLogical" />
                 <node concept="3uibUv" id="6yEjedm7VYy" role="11_B2D">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
               <node concept="2ShNRf" id="6yEjedm7VYz" role="33vP2m">
@@ -4147,7 +4147,7 @@
                     <property role="Xl_RC" value="var" />
                   </node>
                   <node concept="3uibUv" id="6yEjedm7VYA" role="1pMfVU">
-                    <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                    <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                   </node>
                 </node>
               </node>
@@ -4203,7 +4203,7 @@
             <node concept="3cpWsn" id="3KV3FXk2bqn" role="3cpWs9">
               <property role="TrG5h" value="expect" />
               <node concept="3uibUv" id="3KV3FXk2bqo" role="1tU5fm">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="1oi1Uc" id="3KV3FXk2bqp" role="33vP2m">
                 <node concept="1oi5ST" id="3KV3FXk2bqq" role="1oi0x0">
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/jetbrains.mps.lang.typesystem2.samplechecker.handler.util.msd b/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/jetbrains.mps.lang.typesystem2.samplechecker.handler.util.msd
index 92ea21ac..5cf4def7 100644
--- a/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/jetbrains.mps.lang.typesystem2.samplechecker.handler.util.msd
+++ b/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/jetbrains.mps.lang.typesystem2.samplechecker.handler.util.msd
@@ -8,7 +8,6 @@
   <sourcePath />
   <dependencies>
     <dependency reexport="false">a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)</dependency>
-    <dependency reexport="false">7526e0cf-1ce7-46f8-a555-9eca1e06c23b(jetbrains.mps.logic.atom)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
     <dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/models/jetbrains/mps/lang/typesystem2/samplechecker/handle/util.mps b/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/models/jetbrains/mps/lang/typesystem2/samplechecker/handle/util.mps
index b2cf293d..30aef736 100644
--- a/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/models/jetbrains/mps/lang/typesystem2/samplechecker/handle/util.mps
+++ b/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/models/jetbrains/mps/lang/typesystem2/samplechecker/handle/util.mps
@@ -12,7 +12,6 @@
   </languages>
   <imports>
     <import index="yg8f" ref="r:e213377a-f1a7-4ba7-9d08-96bcb97ed8ce(jetbrains.mps.logic.builtin)" />
-    <import index="ie8e" ref="r:ab2605ab-b4bc-4e80-a8ca-19a4a8465c01(jetbrains.mps.logic.atom)" />
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
     <import index="qrld" ref="r:2a79c8aa-e372-4c00-8d71-5d7f3db517e4(jetbrains.mps.logic.reactor.evaluation)" />
@@ -23,6 +22,7 @@
     <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
     <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" />
     <import index="w1kc" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel(MPS.Core/)" />
+    <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.treeform)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -350,7 +350,7 @@
         <node concept="3uibUv" id="7HUwyZazx7G" role="1tU5fm">
           <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
           <node concept="3uibUv" id="7HUwyZazx7H" role="11_B2D">
-            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+            <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
           </node>
         </node>
       </node>
@@ -359,7 +359,7 @@
         <node concept="3uibUv" id="7HUwyZazx84" role="1tU5fm">
           <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
           <node concept="3uibUv" id="7HUwyZazx85" role="11_B2D">
-            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+            <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
           </node>
         </node>
       </node>
@@ -368,7 +368,7 @@
         <node concept="3uibUv" id="7HUwyZazx7U" role="1tU5fm">
           <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
           <node concept="3uibUv" id="7HUwyZazx7V" role="11_B2D">
-            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+            <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
           </node>
         </node>
       </node>
@@ -379,7 +379,7 @@
           <node concept="3cpWsn" id="3KV3FXjZHhG" role="3cpWs9">
             <property role="TrG5h" value="leftVal" />
             <node concept="3uibUv" id="3KV3FXjZHhH" role="1tU5fm">
-              <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+              <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
             </node>
             <node concept="2OqwBi" id="3KV3FXjZHhI" role="33vP2m">
               <node concept="2OqwBi" id="3KV3FXjZHhJ" role="2Oq$k0">
@@ -400,7 +400,7 @@
           <node concept="3cpWsn" id="3KV3FXjZHhO" role="3cpWs9">
             <property role="TrG5h" value="rightVal" />
             <node concept="3uibUv" id="3KV3FXjZHhP" role="1tU5fm">
-              <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+              <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
             </node>
             <node concept="2OqwBi" id="3KV3FXjZHhQ" role="33vP2m">
               <node concept="2OqwBi" id="3KV3FXjZHhR" role="2Oq$k0">
@@ -464,7 +464,7 @@
             <node concept="3uibUv" id="3KV3FXk0pl4" role="1tU5fm">
               <ref role="3uigEE" to="33ny:~List" resolve="List" />
               <node concept="3uibUv" id="3KV3FXk0pl7" role="11_B2D">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
             </node>
             <node concept="2OqwBi" id="3KV3FXk0ple" role="33vP2m">
@@ -698,7 +698,7 @@
       <node concept="3uibUv" id="3KV3FXk0o6d" role="3clF45">
         <ref role="3uigEE" to="33ny:~List" resolve="List" />
         <node concept="3uibUv" id="3KV3FXk0oGr" role="11_B2D">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="3Tm6S6" id="3KV3FXjZPWJ" role="1B3o_S" />
@@ -710,7 +710,7 @@
               <ref role="3uigEE" to="33ny:~List" resolve="List" />
               <node concept="3qUE_q" id="3KV3FXjZHic" role="11_B2D">
                 <node concept="3uibUv" id="3KV3FXjZHid" role="3qUE_r">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
             </node>
@@ -730,7 +730,7 @@
               <ref role="3uigEE" to="33ny:~List" resolve="List" />
               <node concept="3qUE_q" id="3KV3FXjZHim" role="11_B2D">
                 <node concept="3uibUv" id="3KV3FXjZHin" role="3qUE_r">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
             </node>
@@ -820,14 +820,14 @@
             <node concept="3uibUv" id="3KV3FXjZMUe" role="1tU5fm">
               <ref role="3uigEE" to="33ny:~List" resolve="List" />
               <node concept="3uibUv" id="3KV3FXjZMUf" role="11_B2D">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
             </node>
             <node concept="2ShNRf" id="3KV3FXjZMUg" role="33vP2m">
               <node concept="1pGfFk" id="3KV3FXjZMUh" role="2ShVmc">
                 <ref role="37wK5l" to="33ny:~ArrayList.&lt;init&gt;()" resolve="ArrayList" />
                 <node concept="3uibUv" id="3KV3FXjZMUi" role="1pMfVU">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
             </node>
@@ -867,7 +867,7 @@
           <node concept="3cpWsn" id="3KV3FXjZMUx" role="1Duv9x">
             <property role="TrG5h" value="c" />
             <node concept="3uibUv" id="3KV3FXjZMUy" role="1tU5fm">
-              <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+              <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
             </node>
           </node>
           <node concept="37vLTw" id="3KV3FXjZMUz" role="1DdaDG">
@@ -883,13 +883,13 @@
       <node concept="37vLTG" id="3KV3FXjZHfU" role="3clF46">
         <property role="TrG5h" value="leftVal" />
         <node concept="3uibUv" id="3KV3FXk0viY" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="37vLTG" id="3KV3FXjZHfW" role="3clF46">
         <property role="TrG5h" value="rightVal" />
         <node concept="3uibUv" id="3KV3FXk0viZ" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
     </node>
@@ -910,7 +910,7 @@
                       <ref role="3uigEE" to="33ny:~List" resolve="List" />
                       <node concept="3qUE_q" id="3KV3FXjZDGN" role="11_B2D">
                         <node concept="3uibUv" id="3KV3FXjZDGO" role="3qUE_r">
-                          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                         </node>
                       </node>
                     </node>
@@ -930,7 +930,7 @@
                       <ref role="3uigEE" to="33ny:~List" resolve="List" />
                       <node concept="3qUE_q" id="3KV3FXjZDGX" role="11_B2D">
                         <node concept="3uibUv" id="3KV3FXjZDGY" role="3qUE_r">
-                          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                         </node>
                       </node>
                     </node>
@@ -951,7 +951,7 @@
                       <ref role="3uigEE" to="33ny:~Iterator" resolve="Iterator" />
                       <node concept="3qUE_q" id="3KV3FXjZDH8" role="11_B2D">
                         <node concept="3uibUv" id="3KV3FXjZDH9" role="3qUE_r">
-                          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                         </node>
                       </node>
                     </node>
@@ -972,7 +972,7 @@
                       <ref role="3uigEE" to="33ny:~Iterator" resolve="Iterator" />
                       <node concept="3qUE_q" id="3KV3FXjZDHg" role="11_B2D">
                         <node concept="3uibUv" id="3KV3FXjZDHh" role="3qUE_r">
-                          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                         </node>
                       </node>
                     </node>
@@ -990,7 +990,7 @@
                   <node concept="3cpWsn" id="3KV3FXjZDHn" role="3cpWs9">
                     <property role="TrG5h" value="lastMatch" />
                     <node concept="3uibUv" id="3KV3FXjZDHo" role="1tU5fm">
-                      <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                      <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                     </node>
                     <node concept="10Nm6u" id="3KV3FXjZDHp" role="33vP2m" />
                   </node>
@@ -1001,7 +1001,7 @@
                       <node concept="3cpWsn" id="3KV3FXjZDHt" role="3cpWs9">
                         <property role="TrG5h" value="nextLeft" />
                         <node concept="3uibUv" id="3KV3FXjZDHu" role="1tU5fm">
-                          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                         </node>
                         <node concept="2OqwBi" id="3KV3FXjZDHv" role="33vP2m">
                           <node concept="37vLTw" id="3KV3FXjZDHw" role="2Oq$k0">
@@ -1017,7 +1017,7 @@
                       <node concept="3cpWsn" id="3KV3FXjZDHz" role="3cpWs9">
                         <property role="TrG5h" value="nextRight" />
                         <node concept="3uibUv" id="3KV3FXjZDH$" role="1tU5fm">
-                          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                         </node>
                         <node concept="2OqwBi" id="3KV3FXjZDH_" role="33vP2m">
                           <node concept="37vLTw" id="3KV3FXjZDHA" role="2Oq$k0">
@@ -1090,7 +1090,7 @@
                                 <ref role="3cqZAo" node="3KV3FXjZDHt" resolve="nextLeft" />
                               </node>
                               <node concept="liA8E" id="3KV3FXjZDI6" role="2OqNvi">
-                                <ref role="37wK5l" to="ie8e:2QE4RCGndD7" resolve="asRoot" />
+                                <ref role="37wK5l" to="6exd:2QE4RCGndD7" resolve="asRoot" />
                               </node>
                             </node>
                             <node concept="37vLTw" id="3KV3FXjZDI7" role="37vLTJ">
@@ -1172,7 +1172,7 @@
               <node concept="3cpWsn" id="3KV3FXjZDIB" role="1Duv9x">
                 <property role="TrG5h" value="nextPathRight" />
                 <node concept="3uibUv" id="3KV3FXjZDIC" role="1tU5fm">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
               <node concept="37vLTw" id="3KV3FXjZDJ0" role="1DdaDG">
@@ -1183,7 +1183,7 @@
           <node concept="3cpWsn" id="3KV3FXjZDIE" role="1Duv9x">
             <property role="TrG5h" value="nextPathLeft" />
             <node concept="3uibUv" id="3KV3FXjZDIF" role="1tU5fm">
-              <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+              <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
             </node>
           </node>
           <node concept="37vLTw" id="3KV3FXjZDJ4" role="1DdaDG">
@@ -1197,7 +1197,7 @@
           <ref role="3uigEE" to="33ny:~List" resolve="List" />
           <node concept="3qUE_q" id="3KV3FXjZDIJ" role="11_B2D">
             <node concept="3uibUv" id="3KV3FXjZDIK" role="3qUE_r">
-              <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+              <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
             </node>
           </node>
         </node>
@@ -1208,7 +1208,7 @@
           <ref role="3uigEE" to="33ny:~List" resolve="List" />
           <node concept="3qUE_q" id="3KV3FXjZDIN" role="11_B2D">
             <node concept="3uibUv" id="3KV3FXjZDIO" role="3qUE_r">
-              <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+              <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
             </node>
           </node>
         </node>
@@ -1269,7 +1269,7 @@
           <ref role="3uigEE" to="33ny:~List" resolve="List" />
           <node concept="3qUE_q" id="3KV3FXk0DmY" role="11_B2D">
             <node concept="3uibUv" id="3KV3FXk0DmZ" role="3qUE_r">
-              <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+              <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
             </node>
           </node>
         </node>
@@ -1283,14 +1283,14 @@
                 <node concept="3uibUv" id="3KV3FXk0Dlj" role="1tU5fm">
                   <ref role="3uigEE" to="33ny:~List" resolve="List" />
                   <node concept="3uibUv" id="3KV3FXk0Dlk" role="11_B2D">
-                    <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                    <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                   </node>
                 </node>
                 <node concept="2ShNRf" id="3KV3FXk0Dll" role="33vP2m">
                   <node concept="1pGfFk" id="3KV3FXk0Dlm" role="2ShVmc">
                     <ref role="37wK5l" to="33ny:~ArrayList.&lt;init&gt;()" resolve="ArrayList" />
                     <node concept="3uibUv" id="3KV3FXk0Dln" role="1pMfVU">
-                      <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                      <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                     </node>
                   </node>
                 </node>
@@ -1303,7 +1303,7 @@
                   <ref role="3uigEE" to="33ny:~List" resolve="List" />
                   <node concept="3qUE_q" id="3KV3FXk0Dlr" role="11_B2D">
                     <node concept="3uibUv" id="3KV3FXk0Dls" role="3qUE_r">
-                      <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                      <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                     </node>
                   </node>
                 </node>
@@ -1320,7 +1320,7 @@
               <node concept="3cpWsn" id="3KV3FXk0Dlw" role="3cpWs9">
                 <property role="TrG5h" value="next" />
                 <node concept="3uibUv" id="3KV3FXk0Dlx" role="1tU5fm">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
             </node>
@@ -1506,7 +1506,7 @@
                   <ref role="3uigEE" to="33ny:~Iterator" resolve="Iterator" />
                   <node concept="3qUE_q" id="3KV3FXk0DmL" role="11_B2D">
                     <node concept="3uibUv" id="3KV3FXk0DmM" role="3qUE_r">
-                      <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                      <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                     </node>
                   </node>
                 </node>
@@ -1532,7 +1532,7 @@
           <node concept="3cpWsn" id="3KV3FXk0DmT" role="1Duv9x">
             <property role="TrG5h" value="nextPath" />
             <node concept="3uibUv" id="3KV3FXk0DmU" role="1tU5fm">
-              <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+              <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
             </node>
           </node>
           <node concept="37vLTw" id="3KV3FXk0Dn0" role="1DdaDG">
@@ -1597,14 +1597,14 @@
       <node concept="3uibUv" id="3KV3FXjZG67" role="1tU5fm">
         <ref role="3uigEE" to="33ny:~List" resolve="List" />
         <node concept="3uibUv" id="3KV3FXjZG68" role="11_B2D">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="2ShNRf" id="3KV3FXjZGkF" role="33vP2m">
         <node concept="1pGfFk" id="3KV3FXjZGrO" role="2ShVmc">
           <ref role="37wK5l" to="33ny:~ArrayList.&lt;init&gt;()" resolve="ArrayList" />
           <node concept="3uibUv" id="3KV3FXjZGwh" role="1pMfVU">
-            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+            <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
           </node>
         </node>
       </node>
@@ -1616,14 +1616,14 @@
       <node concept="3uibUv" id="3KV3FXjZG6c" role="1tU5fm">
         <ref role="3uigEE" to="33ny:~List" resolve="List" />
         <node concept="3uibUv" id="3KV3FXjZG6d" role="11_B2D">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="2ShNRf" id="3KV3FXjZGzO" role="33vP2m">
         <node concept="1pGfFk" id="3KV3FXjZGzP" role="2ShVmc">
           <ref role="37wK5l" to="33ny:~ArrayList.&lt;init&gt;()" resolve="ArrayList" />
           <node concept="3uibUv" id="3KV3FXjZGzQ" role="1pMfVU">
-            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+            <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
           </node>
         </node>
       </node>
@@ -1641,7 +1641,7 @@
         <property role="TrG5h" value="component" />
         <node concept="8X2XB" id="2DKqMqOstvZ" role="1tU5fm">
           <node concept="3uibUv" id="2DKqMqOssKq" role="8Xvag">
-            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+            <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
           </node>
         </node>
       </node>
@@ -1673,7 +1673,7 @@
         <node concept="3uibUv" id="2DKqMqOsrn4" role="1tU5fm">
           <ref role="3uigEE" to="33ny:~List" resolve="List" />
           <node concept="3uibUv" id="2DKqMqOsrob" role="11_B2D">
-            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+            <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
           </node>
         </node>
       </node>
@@ -1695,7 +1695,7 @@
                   <ref role="3cqZAo" node="2DKqMqOsrmz" resolve="component" />
                 </node>
                 <node concept="3uibUv" id="2DKqMqOsv7K" role="1pMfVU">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
             </node>
@@ -1709,7 +1709,7 @@
       <node concept="3uibUv" id="2DKqMqOsrU$" role="3clF45">
         <ref role="3uigEE" to="33ny:~List" resolve="List" />
         <node concept="3uibUv" id="2DKqMqOsrX5" role="11_B2D">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="3Tm1VV" id="2DKqMqOsrRy" role="1B3o_S" />
@@ -1732,7 +1732,7 @@
       <node concept="3uibUv" id="2DKqMqOsrkN" role="1tU5fm">
         <ref role="3uigEE" to="33ny:~List" resolve="List" />
         <node concept="3uibUv" id="2DKqMqOsrla" role="11_B2D">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
     </node>
@@ -1748,7 +1748,7 @@
         <node concept="3uibUv" id="7HUwyZazx7W" role="1tU5fm">
           <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
           <node concept="3uibUv" id="7HUwyZazx7X" role="11_B2D">
-            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+            <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
           </node>
         </node>
       </node>
@@ -1757,7 +1757,7 @@
         <node concept="3uibUv" id="7HUwyZazx7O" role="1tU5fm">
           <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
           <node concept="3uibUv" id="7HUwyZazx7P" role="11_B2D">
-            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+            <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
           </node>
         </node>
       </node>
@@ -1766,7 +1766,7 @@
         <node concept="3uibUv" id="7HUwyZazx8m" role="1tU5fm">
           <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
           <node concept="3uibUv" id="7HUwyZazx8n" role="11_B2D">
-            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+            <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
           </node>
         </node>
       </node>
@@ -1777,7 +1777,7 @@
           <node concept="3cpWsn" id="3KV3FXk1h3U" role="3cpWs9">
             <property role="TrG5h" value="fullPathVal" />
             <node concept="3uibUv" id="3KV3FXk1h3N" role="1tU5fm">
-              <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+              <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
             </node>
             <node concept="2OqwBi" id="3KV3FXk1h3V" role="33vP2m">
               <node concept="2OqwBi" id="3KV3FXk1h3W" role="2Oq$k0">
@@ -1798,7 +1798,7 @@
           <node concept="3cpWsn" id="3KV3FXk1iAk" role="3cpWs9">
             <property role="TrG5h" value="startFromVal" />
             <node concept="3uibUv" id="3KV3FXk1iAd" role="1tU5fm">
-              <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+              <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
             </node>
             <node concept="2OqwBi" id="3KV3FXk1iAl" role="33vP2m">
               <node concept="2OqwBi" id="3KV3FXk1iAm" role="2Oq$k0">
@@ -1862,7 +1862,7 @@
             <node concept="3uibUv" id="3KV3FXk1ku3" role="1tU5fm">
               <ref role="3uigEE" to="33ny:~List" resolve="List" />
               <node concept="3uibUv" id="3KV3FXk1ku6" role="11_B2D">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
             </node>
             <node concept="2OqwBi" id="3KV3FXk1kua" role="33vP2m">
@@ -2101,19 +2101,19 @@
       <node concept="37vLTG" id="3KV3FXk1k9N" role="3clF46">
         <property role="TrG5h" value="fullPathsVal" />
         <node concept="3uibUv" id="3KV3FXk1kby" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="37vLTG" id="3KV3FXk1kjq" role="3clF46">
         <property role="TrG5h" value="startFromVal" />
         <node concept="3uibUv" id="3KV3FXk1kll" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="3uibUv" id="3KV3FXk1jRS" role="3clF45">
         <ref role="3uigEE" to="33ny:~List" resolve="List" />
         <node concept="3uibUv" id="3KV3FXk1jTp" role="11_B2D">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="3Tm6S6" id="WauyOOvMr0" role="1B3o_S" />
@@ -2125,7 +2125,7 @@
               <ref role="3uigEE" to="33ny:~List" resolve="List" />
               <node concept="3qUE_q" id="3KV3FXk1J2J" role="11_B2D">
                 <node concept="3uibUv" id="3KV3FXk1J2K" role="3qUE_r">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
             </node>
@@ -2170,7 +2170,7 @@
             <node concept="3uibUv" id="3KV3FXk1KVp" role="1tU5fm">
               <ref role="3uigEE" to="33ny:~List" resolve="List" />
               <node concept="3uibUv" id="3KV3FXk1L7M" role="11_B2D">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
             </node>
             <node concept="10Nm6u" id="3KV3FXk2g7X" role="33vP2m" />
@@ -2184,14 +2184,14 @@
                 <node concept="3uibUv" id="3KV3FXk1Lsr" role="1tU5fm">
                   <ref role="3uigEE" to="33ny:~List" resolve="List" />
                   <node concept="3uibUv" id="3KV3FXk1Lss" role="11_B2D">
-                    <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                    <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                   </node>
                 </node>
                 <node concept="2ShNRf" id="3KV3FXk1Lst" role="33vP2m">
                   <node concept="1pGfFk" id="3KV3FXk1Lsu" role="2ShVmc">
                     <ref role="37wK5l" to="33ny:~ArrayList.&lt;init&gt;()" resolve="ArrayList" />
                     <node concept="3uibUv" id="3KV3FXk1Lsv" role="1pMfVU">
-                      <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                      <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                     </node>
                   </node>
                 </node>
@@ -2205,7 +2205,7 @@
                   <ref role="3uigEE" to="33ny:~List" resolve="List" />
                   <node concept="3qUE_q" id="3KV3FXk1Nac" role="11_B2D">
                     <node concept="3uibUv" id="3KV3FXk1Nad" role="3qUE_r">
-                      <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                      <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                     </node>
                   </node>
                 </node>
@@ -2224,7 +2224,7 @@
                   <node concept="3cpWsn" id="3KV3FXk1OU$" role="3cpWs9">
                     <property role="TrG5h" value="next" />
                     <node concept="3uibUv" id="3KV3FXk1OU_" role="1tU5fm">
-                      <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                      <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                     </node>
                     <node concept="2OqwBi" id="3KV3FXk1OUA" role="33vP2m">
                       <node concept="37vLTw" id="3KV3FXk1OUB" role="2Oq$k0">
@@ -2303,7 +2303,7 @@
                   <ref role="3uigEE" to="33ny:~Iterator" resolve="Iterator" />
                   <node concept="3qUE_q" id="3KV3FXk1OyM" role="11_B2D">
                     <node concept="3uibUv" id="3KV3FXk1OBU" role="3qUE_r">
-                      <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                      <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                     </node>
                   </node>
                 </node>
@@ -2393,7 +2393,7 @@
           <node concept="3cpWsn" id="3KV3FXk1KbY" role="1Duv9x">
             <property role="TrG5h" value="path" />
             <node concept="3uibUv" id="3KV3FXk1KuS" role="1tU5fm">
-              <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+              <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
             </node>
           </node>
           <node concept="37vLTw" id="3KV3FXk1Kc4" role="1DdaDG">
@@ -2476,12 +2476,12 @@
         <node concept="3uibUv" id="5H6hZahoMS7" role="1tU5fm">
           <ref role="3uigEE" to="33ny:~List" resolve="List" />
           <node concept="3uibUv" id="5H6hZahoMSO" role="11_B2D">
-            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+            <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
           </node>
         </node>
       </node>
       <node concept="3uibUv" id="5H6hZahs_Lp" role="3clF45">
-        <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+        <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
       </node>
       <node concept="3Tmbuc" id="3KV3FXk1p2j" role="1B3o_S" />
       <node concept="3clFbS" id="5H6hZahoMlA" role="3clF47">
@@ -2490,7 +2490,7 @@
             <property role="TrG5h" value="array" />
             <node concept="10Q1$e" id="5H6hZahszJ9" role="1tU5fm">
               <node concept="3uibUv" id="5H6hZahszJa" role="10Q1$1">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
             </node>
             <node concept="2ShNRf" id="5H6hZahszJb" role="33vP2m">
@@ -2506,7 +2506,7 @@
                   </node>
                 </node>
                 <node concept="3uibUv" id="5H6hZahszJh" role="3$_nBY">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
             </node>
@@ -2534,7 +2534,7 @@
                     </node>
                   </node>
                   <node concept="liA8E" id="5H6hZahszJt" role="2OqNvi">
-                    <ref role="37wK5l" to="ie8e:2QE4RCGndD7" resolve="asRoot" />
+                    <ref role="37wK5l" to="6exd:2QE4RCGndD7" resolve="asRoot" />
                   </node>
                 </node>
                 <node concept="AH0OO" id="5H6hZahszJu" role="37vLTJ">
@@ -2606,8 +2606,8 @@
         <node concept="3cpWs6" id="3KV3FXjZT2R" role="3cqZAp">
           <node concept="2OqwBi" id="3KV3FXjZT2S" role="3cqZAk">
             <node concept="2YIFZM" id="3KV3FXjZT2T" role="2Oq$k0">
-              <ref role="1Pybhc" to="ie8e:3JgCwkqd3K7" resolve="Finders" />
-              <ref role="37wK5l" to="ie8e:3OPtF03pX11" resolve="findList" />
+              <ref role="1Pybhc" to="6exd:3JgCwkqd3K7" resolve="Finders" />
+              <ref role="37wK5l" to="6exd:3OPtF03pX11" resolve="findList" />
               <node concept="37vLTw" id="3KV3FXjZT5T" role="37wK5m">
                 <ref role="3cqZAo" node="3KV3FXjZT2X" resolve="leftVal" />
               </node>
@@ -2616,7 +2616,7 @@
               </node>
             </node>
             <node concept="liA8E" id="3KV3FXjZT2W" role="2OqNvi">
-              <ref role="37wK5l" to="ie8e:3OPtF03nYWm" resolve="result" />
+              <ref role="37wK5l" to="6exd:3OPtF03nYWm" resolve="result" />
             </node>
           </node>
         </node>
@@ -2624,14 +2624,14 @@
       <node concept="37vLTG" id="3KV3FXjZT2X" role="3clF46">
         <property role="TrG5h" value="leftVal" />
         <node concept="3uibUv" id="3KV3FXjZT2Y" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="3uibUv" id="3KV3FXjZT99" role="3clF45">
         <ref role="3uigEE" to="33ny:~List" resolve="List" />
         <node concept="3qUE_q" id="3KV3FXjZT9a" role="11_B2D">
           <node concept="3uibUv" id="3KV3FXjZT9b" role="3qUE_r">
-            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+            <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
           </node>
         </node>
       </node>
@@ -2667,13 +2667,13 @@
       <node concept="37vLTG" id="3KV3FXjZkR1" role="3clF46">
         <property role="TrG5h" value="nextLeft" />
         <node concept="3uibUv" id="3KV3FXjZkR2" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="37vLTG" id="3KV3FXjZkR3" role="3clF46">
         <property role="TrG5h" value="nextRight" />
         <node concept="3uibUv" id="3KV3FXjZkR4" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="10P_77" id="3KV3FXjZlf3" role="3clF45" />
@@ -2709,7 +2709,7 @@
           <node concept="3cpWsn" id="3KV3FXjXlPb" role="1Duv9x">
             <property role="TrG5h" value="c" />
             <node concept="3uibUv" id="3KV3FXjXlPf" role="1tU5fm">
-              <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+              <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
             </node>
           </node>
           <node concept="37vLTw" id="3KV3FXjXlPg" role="1DdaDG">
@@ -2725,7 +2725,7 @@
       <node concept="37vLTG" id="3KV3FXjXlBn" role="3clF46">
         <property role="TrG5h" value="tf" />
         <node concept="3uibUv" id="3KV3FXjXlCO" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="37vLTG" id="3KV3FXjXlEK" role="3clF46">
@@ -2733,7 +2733,7 @@
         <node concept="3uibUv" id="3KV3FXjXlGf" role="1tU5fm">
           <ref role="3uigEE" to="33ny:~List" resolve="List" />
           <node concept="3uibUv" id="3KV3FXjXlHm" role="11_B2D">
-            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+            <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
           </node>
         </node>
       </node>
@@ -2791,7 +2791,7 @@
         </node>
       </node>
       <node concept="3uibUv" id="1e3DfAArnOp" role="3clF45">
-        <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+        <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
       </node>
       <node concept="3Tm1VV" id="1e3DfAArnOq" role="1B3o_S" />
       <node concept="3clFbS" id="1e3DfAArnOr" role="3clF47">
@@ -2801,7 +2801,7 @@
             <property role="TrG5h" value="array" />
             <node concept="10Q1$e" id="1e3DfAArnOv" role="1tU5fm">
               <node concept="3uibUv" id="1e3DfAArnOw" role="10Q1$1">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
             </node>
             <node concept="2ShNRf" id="1e3DfAArnOy" role="33vP2m">
@@ -2815,7 +2815,7 @@
                   </node>
                 </node>
                 <node concept="3uibUv" id="1e3DfAArnOC" role="3$_nBY">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
             </node>
@@ -2867,14 +2867,14 @@
         <node concept="3clFbH" id="1e3DfAArnOU" role="3cqZAp" />
         <node concept="3clFbF" id="1e3DfAArnOV" role="3cqZAp">
           <node concept="2YIFZM" id="1e3DfAArnOX" role="3clFbG">
-            <ref role="37wK5l" to="ie8e:5JQSuNsxhfn" resolve="create" />
-            <ref role="1Pybhc" to="ie8e:5JQSuNswOXL" resolve="CompositeNode" />
+            <ref role="37wK5l" to="6exd:5JQSuNsxhfn" resolve="create" />
+            <ref role="1Pybhc" to="6exd:5JQSuNswOXL" resolve="CompositeNode" />
             <node concept="Xl_RD" id="1e3DfAArnOY" role="37wK5m">
               <property role="Xl_RC" value="list" />
             </node>
             <node concept="2YIFZM" id="3t7_2FgCwcJ" role="37wK5m">
-              <ref role="37wK5l" to="ie8e:1OShD0HS45f" resolve="createList" />
-              <ref role="1Pybhc" to="ie8e:3OPtF03lco4" resolve="ListNode" />
+              <ref role="37wK5l" to="6exd:1OShD0HS45f" resolve="createList" />
+              <ref role="1Pybhc" to="6exd:3OPtF03lco4" resolve="ListNode" />
               <node concept="37vLTw" id="3t7_2FgCwcL" role="37wK5m">
                 <ref role="3cqZAo" node="1e3DfAArnOu" resolve="array" />
               </node>
@@ -2894,7 +2894,7 @@
         </node>
       </node>
       <node concept="3uibUv" id="1e3DfAArnP6" role="3clF45">
-        <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+        <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
       </node>
       <node concept="3Tmbuc" id="1e3DfAArqls" role="1B3o_S" />
       <node concept="3clFbS" id="1e3DfAArnP9" role="3clF47">
@@ -2904,7 +2904,7 @@
             <property role="TrG5h" value="array" />
             <node concept="10Q1$e" id="1e3DfAArnPd" role="1tU5fm">
               <node concept="3uibUv" id="1e3DfAArnPe" role="10Q1$1">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
             </node>
             <node concept="2ShNRf" id="1e3DfAArnPg" role="33vP2m">
@@ -2918,7 +2918,7 @@
                   </node>
                 </node>
                 <node concept="3uibUv" id="1e3DfAArnPm" role="3$_nBY">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
             </node>
@@ -2968,14 +2968,14 @@
         <node concept="3clFbH" id="1e3DfAArnPC" role="3cqZAp" />
         <node concept="3clFbF" id="1e3DfAArnPD" role="3cqZAp">
           <node concept="2YIFZM" id="1e3DfAArnPE" role="3clFbG">
-            <ref role="37wK5l" to="ie8e:5JQSuNsxhfn" resolve="create" />
-            <ref role="1Pybhc" to="ie8e:5JQSuNswOXL" resolve="CompositeNode" />
+            <ref role="37wK5l" to="6exd:5JQSuNsxhfn" resolve="create" />
+            <ref role="1Pybhc" to="6exd:5JQSuNswOXL" resolve="CompositeNode" />
             <node concept="Xl_RD" id="1e3DfAArnPF" role="37wK5m">
               <property role="Xl_RC" value="list" />
             </node>
             <node concept="2YIFZM" id="3t7_2FgCsiN" role="37wK5m">
-              <ref role="37wK5l" to="ie8e:1OShD0HS45f" resolve="createList" />
-              <ref role="1Pybhc" to="ie8e:3OPtF03lco4" resolve="ListNode" />
+              <ref role="37wK5l" to="6exd:1OShD0HS45f" resolve="createList" />
+              <ref role="1Pybhc" to="6exd:3OPtF03lco4" resolve="ListNode" />
               <node concept="37vLTw" id="3t7_2FgCsiP" role="37wK5m">
                 <ref role="3cqZAo" node="1e3DfAArnPc" resolve="array" />
               </node>
@@ -2996,7 +2996,7 @@
         <node concept="3bZ5Sz" id="YGS68N6TkG" role="1tU5fm" />
       </node>
       <node concept="3uibUv" id="4OKkcnfu_xt" role="3clF45">
-        <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+        <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
       </node>
       <node concept="3Tm1VV" id="4OKkcnfu_xu" role="1B3o_S" />
       <node concept="3clFbS" id="4OKkcnfu_xv" role="3clF47">
@@ -3024,7 +3024,7 @@
         <node concept="3Tqbb2" id="YGS68N6Tbn" role="1tU5fm" />
       </node>
       <node concept="3uibUv" id="YGS68N6Tbo" role="3clF45">
-        <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+        <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
       </node>
       <node concept="3Tm1VV" id="YGS68N6Tbp" role="1B3o_S" />
       <node concept="3clFbS" id="YGS68N6Tbq" role="3clF47">
@@ -3045,7 +3045,7 @@
       <node concept="37vLTG" id="6_UQWSXaW4f" role="3clF46">
         <property role="TrG5h" value="maybeAnchor" />
         <node concept="3uibUv" id="6_UQWSXaW63" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="3uibUv" id="6_UQWSXb37t" role="3clF45">
@@ -3057,14 +3057,14 @@
           <node concept="3cpWsn" id="6_UQWSXaWAX" role="3cpWs9">
             <property role="TrG5h" value="finder" />
             <node concept="3uibUv" id="6_UQWSXaWAS" role="1tU5fm">
-              <ref role="3uigEE" to="ie8e:3JgCwkqkUKX" resolve="Finders.IValueFinder" />
+              <ref role="3uigEE" to="6exd:3JgCwkqkUKX" resolve="Finders.IValueFinder" />
               <node concept="3uibUv" id="6_UQWSXjAm2" role="11_B2D">
                 <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
               </node>
             </node>
             <node concept="2YIFZM" id="6_UQWSXaWAY" role="33vP2m">
-              <ref role="37wK5l" to="ie8e:3JgCwkqd8va" resolve="findValue" />
-              <ref role="1Pybhc" to="ie8e:3JgCwkqd3K7" resolve="Finders" />
+              <ref role="37wK5l" to="6exd:3JgCwkqd8va" resolve="findValue" />
+              <ref role="1Pybhc" to="6exd:3JgCwkqd3K7" resolve="Finders" />
               <node concept="37vLTw" id="6_UQWSXaWAZ" role="37wK5m">
                 <ref role="3cqZAo" node="6_UQWSXaW4f" resolve="maybeAnchor" />
               </node>
@@ -3105,7 +3105,7 @@
                         <ref role="3cqZAo" node="6_UQWSXaWAX" resolve="finder" />
                       </node>
                       <node concept="liA8E" id="6_UQWSXjAxe" role="2OqNvi">
-                        <ref role="37wK5l" to="ie8e:3JgCwkqkUL2" resolve="result" />
+                        <ref role="37wK5l" to="6exd:3JgCwkqkUL2" resolve="result" />
                       </node>
                     </node>
                   </node>
@@ -3124,7 +3124,7 @@
                 <ref role="3cqZAo" node="6_UQWSXaWAX" resolve="finder" />
               </node>
               <node concept="liA8E" id="6_UQWSXaXn2" role="2OqNvi">
-                <ref role="37wK5l" to="ie8e:3JgCwkqkUKY" resolve="found" />
+                <ref role="37wK5l" to="6exd:3JgCwkqkUKY" resolve="found" />
               </node>
             </node>
             <node concept="2ZW3vV" id="6_UQWSXjAtE" role="3uHU7w">
@@ -3136,7 +3136,7 @@
                   <ref role="3cqZAo" node="6_UQWSXaWAX" resolve="finder" />
                 </node>
                 <node concept="liA8E" id="6_UQWSXjAav" role="2OqNvi">
-                  <ref role="37wK5l" to="ie8e:3JgCwkqkUL2" resolve="result" />
+                  <ref role="37wK5l" to="6exd:3JgCwkqkUL2" resolve="result" />
                 </node>
               </node>
             </node>
@@ -3152,7 +3152,7 @@
       <property role="TrG5h" value="anchor" />
       <node concept="3Tmbuc" id="1e3DfAAraC0" role="1B3o_S" />
       <node concept="3uibUv" id="4OKkcnfu_xB" role="3clF45">
-        <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+        <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
       </node>
       <node concept="37vLTG" id="4OKkcnfu_xD" role="3clF46">
         <property role="TrG5h" value="node" />
@@ -3163,14 +3163,14 @@
           <node concept="3clFbS" id="4OKkcnfu_xH" role="3clFbx">
             <node concept="3cpWs6" id="4OKkcnfu_xI" role="3cqZAp">
               <node concept="2YIFZM" id="4OKkcnfu_xJ" role="3cqZAk">
-                <ref role="37wK5l" to="ie8e:5JQSuNsxhfn" resolve="create" />
-                <ref role="1Pybhc" to="ie8e:5JQSuNswOXL" resolve="CompositeNode" />
+                <ref role="37wK5l" to="6exd:5JQSuNsxhfn" resolve="create" />
+                <ref role="1Pybhc" to="6exd:5JQSuNswOXL" resolve="CompositeNode" />
                 <node concept="Xl_RD" id="4OKkcnfu_xK" role="37wK5m">
                   <property role="Xl_RC" value="node_1" />
                 </node>
                 <node concept="2YIFZM" id="4OKkcnfu_xL" role="37wK5m">
-                  <ref role="37wK5l" to="ie8e:5JQSuNsx4I5" resolve="value" />
-                  <ref role="1Pybhc" to="ie8e:5JQSuNsx4Gq" resolve="Builder" />
+                  <ref role="37wK5l" to="6exd:5JQSuNsx4I5" resolve="value" />
+                  <ref role="1Pybhc" to="6exd:5JQSuNsx4Gq" resolve="Builder" />
                   <node concept="Xl_RD" id="4OKkcnfu_xM" role="37wK5m">
                     <property role="Xl_RC" value="node" />
                   </node>
@@ -3310,7 +3310,7 @@
                 <property role="TrG5h" value="paramsArr" />
                 <node concept="10Q1$e" id="5_6ImQZju9S" role="1tU5fm">
                   <node concept="3uibUv" id="5_6ImQZju9T" role="10Q1$1">
-                    <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                    <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                   </node>
                 </node>
                 <node concept="2ShNRf" id="5_6ImQZju9U" role="33vP2m">
@@ -3324,7 +3324,7 @@
                       </node>
                     </node>
                     <node concept="3uibUv" id="5_6ImQZjua0" role="3$_nBY">
-                      <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                      <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                     </node>
                   </node>
                 </node>
@@ -3374,14 +3374,14 @@
             <node concept="3clFbH" id="5_6ImQZjoR_" role="3cqZAp" />
             <node concept="3cpWs6" id="6infEALwTvt" role="3cqZAp">
               <node concept="2YIFZM" id="6infEALwTvu" role="3cqZAk">
-                <ref role="37wK5l" to="ie8e:5JQSuNsxhfn" resolve="create" />
-                <ref role="1Pybhc" to="ie8e:5JQSuNswOXL" resolve="CompositeNode" />
+                <ref role="37wK5l" to="6exd:5JQSuNsxhfn" resolve="create" />
+                <ref role="1Pybhc" to="6exd:5JQSuNswOXL" resolve="CompositeNode" />
                 <node concept="Xl_RD" id="6infEALwTvv" role="37wK5m">
                   <property role="Xl_RC" value="node_4" />
                 </node>
                 <node concept="2YIFZM" id="6infEALwTvw" role="37wK5m">
-                  <ref role="1Pybhc" to="ie8e:5JQSuNsx4Gq" resolve="Builder" />
-                  <ref role="37wK5l" to="ie8e:5JQSuNsx4I5" resolve="value" />
+                  <ref role="1Pybhc" to="6exd:5JQSuNsx4Gq" resolve="Builder" />
+                  <ref role="37wK5l" to="6exd:5JQSuNsx4I5" resolve="value" />
                   <node concept="Xl_RD" id="6infEALwTvx" role="37wK5m">
                     <property role="Xl_RC" value="concept" />
                   </node>
@@ -3390,8 +3390,8 @@
                   </node>
                 </node>
                 <node concept="2YIFZM" id="6infEALwTvz" role="37wK5m">
-                  <ref role="37wK5l" to="ie8e:5JQSuNsx4I5" resolve="value" />
-                  <ref role="1Pybhc" to="ie8e:5JQSuNsx4Gq" resolve="Builder" />
+                  <ref role="37wK5l" to="6exd:5JQSuNsx4I5" resolve="value" />
+                  <ref role="1Pybhc" to="6exd:5JQSuNsx4Gq" resolve="Builder" />
                   <node concept="Xl_RD" id="6infEALwTv$" role="37wK5m">
                     <property role="Xl_RC" value="classifier" />
                   </node>
@@ -3400,8 +3400,8 @@
                   </node>
                 </node>
                 <node concept="2YIFZM" id="6infEALwTvA" role="37wK5m">
-                  <ref role="1Pybhc" to="ie8e:5JQSuNsx4Gq" resolve="Builder" />
-                  <ref role="37wK5l" to="ie8e:5JQSuNsx4I5" resolve="value" />
+                  <ref role="1Pybhc" to="6exd:5JQSuNsx4Gq" resolve="Builder" />
+                  <ref role="37wK5l" to="6exd:5JQSuNsx4I5" resolve="value" />
                   <node concept="Xl_RD" id="6infEALwTvB" role="37wK5m">
                     <property role="Xl_RC" value="cid" />
                   </node>
@@ -3410,14 +3410,14 @@
                   </node>
                 </node>
                 <node concept="2YIFZM" id="3t7_2FgCsY0" role="37wK5m">
-                  <ref role="37wK5l" to="ie8e:5JQSuNsxhfn" resolve="create" />
-                  <ref role="1Pybhc" to="ie8e:5JQSuNswOXL" resolve="CompositeNode" />
+                  <ref role="37wK5l" to="6exd:5JQSuNsxhfn" resolve="create" />
+                  <ref role="1Pybhc" to="6exd:5JQSuNswOXL" resolve="CompositeNode" />
                   <node concept="Xl_RD" id="3t7_2FgCsY1" role="37wK5m">
                     <property role="Xl_RC" value="parameter" />
                   </node>
                   <node concept="2YIFZM" id="3t7_2FgCvB0" role="37wK5m">
-                    <ref role="37wK5l" to="ie8e:1OShD0HS45f" resolve="createList" />
-                    <ref role="1Pybhc" to="ie8e:3OPtF03lco4" resolve="ListNode" />
+                    <ref role="37wK5l" to="6exd:1OShD0HS45f" resolve="createList" />
+                    <ref role="1Pybhc" to="6exd:3OPtF03lco4" resolve="ListNode" />
                     <node concept="37vLTw" id="5_6ImQZjxi9" role="37wK5m">
                       <ref role="3cqZAo" node="5_6ImQZju9R" resolve="paramsArr" />
                     </node>
@@ -3459,14 +3459,14 @@
             </node>
             <node concept="3cpWs6" id="4OKkcnfu_yj" role="3cqZAp">
               <node concept="2YIFZM" id="4OKkcnfu_yk" role="3cqZAk">
-                <ref role="37wK5l" to="ie8e:5JQSuNsxhfn" resolve="create" />
-                <ref role="1Pybhc" to="ie8e:5JQSuNswOXL" resolve="CompositeNode" />
+                <ref role="37wK5l" to="6exd:5JQSuNsxhfn" resolve="create" />
+                <ref role="1Pybhc" to="6exd:5JQSuNswOXL" resolve="CompositeNode" />
                 <node concept="Xl_RD" id="4OKkcnfu_yl" role="37wK5m">
                   <property role="Xl_RC" value="node_3" />
                 </node>
                 <node concept="2YIFZM" id="4OKkcnfu_ym" role="37wK5m">
-                  <ref role="1Pybhc" to="ie8e:5JQSuNsx4Gq" resolve="Builder" />
-                  <ref role="37wK5l" to="ie8e:5JQSuNsx4I5" resolve="value" />
+                  <ref role="1Pybhc" to="6exd:5JQSuNsx4Gq" resolve="Builder" />
+                  <ref role="37wK5l" to="6exd:5JQSuNsx4I5" resolve="value" />
                   <node concept="Xl_RD" id="4OKkcnfu_yn" role="37wK5m">
                     <property role="Xl_RC" value="concept" />
                   </node>
@@ -3475,8 +3475,8 @@
                   </node>
                 </node>
                 <node concept="2YIFZM" id="4OKkcnfu_yp" role="37wK5m">
-                  <ref role="1Pybhc" to="ie8e:5JQSuNsx4Gq" resolve="Builder" />
-                  <ref role="37wK5l" to="ie8e:5JQSuNsx4I5" resolve="value" />
+                  <ref role="1Pybhc" to="6exd:5JQSuNsx4Gq" resolve="Builder" />
+                  <ref role="37wK5l" to="6exd:5JQSuNsx4I5" resolve="value" />
                   <node concept="Xl_RD" id="4OKkcnfu_yq" role="37wK5m">
                     <property role="Xl_RC" value="name" />
                   </node>
@@ -3485,8 +3485,8 @@
                   </node>
                 </node>
                 <node concept="2YIFZM" id="4OKkcnfu_ys" role="37wK5m">
-                  <ref role="1Pybhc" to="ie8e:5JQSuNsx4Gq" resolve="Builder" />
-                  <ref role="37wK5l" to="ie8e:5JQSuNsx4I5" resolve="value" />
+                  <ref role="1Pybhc" to="6exd:5JQSuNsx4Gq" resolve="Builder" />
+                  <ref role="37wK5l" to="6exd:5JQSuNsx4I5" resolve="value" />
                   <node concept="Xl_RD" id="4OKkcnfu_yt" role="37wK5m">
                     <property role="Xl_RC" value="id" />
                   </node>
@@ -3550,14 +3550,14 @@
           <node concept="3clFbS" id="4OKkcnfu_yQ" role="2tyzPh">
             <node concept="3cpWs6" id="4OKkcnfu_yR" role="3cqZAp">
               <node concept="2YIFZM" id="4OKkcnfu_yS" role="3cqZAk">
-                <ref role="37wK5l" to="ie8e:5JQSuNsxhfn" resolve="create" />
-                <ref role="1Pybhc" to="ie8e:5JQSuNswOXL" resolve="CompositeNode" />
+                <ref role="37wK5l" to="6exd:5JQSuNsxhfn" resolve="create" />
+                <ref role="1Pybhc" to="6exd:5JQSuNswOXL" resolve="CompositeNode" />
                 <node concept="Xl_RD" id="4OKkcnfu_yT" role="37wK5m">
                   <property role="Xl_RC" value="node_3" />
                 </node>
                 <node concept="2YIFZM" id="4OKkcnfu_yU" role="37wK5m">
-                  <ref role="1Pybhc" to="ie8e:5JQSuNsx4Gq" resolve="Builder" />
-                  <ref role="37wK5l" to="ie8e:5JQSuNsx4I5" resolve="value" />
+                  <ref role="1Pybhc" to="6exd:5JQSuNsx4Gq" resolve="Builder" />
+                  <ref role="37wK5l" to="6exd:5JQSuNsx4I5" resolve="value" />
                   <node concept="Xl_RD" id="4OKkcnfu_yV" role="37wK5m">
                     <property role="Xl_RC" value="concept" />
                   </node>
@@ -3566,8 +3566,8 @@
                   </node>
                 </node>
                 <node concept="2YIFZM" id="4OKkcnfu_yX" role="37wK5m">
-                  <ref role="1Pybhc" to="ie8e:5JQSuNsx4Gq" resolve="Builder" />
-                  <ref role="37wK5l" to="ie8e:5JQSuNsx4I5" resolve="value" />
+                  <ref role="1Pybhc" to="6exd:5JQSuNsx4Gq" resolve="Builder" />
+                  <ref role="37wK5l" to="6exd:5JQSuNsx4I5" resolve="value" />
                   <node concept="Xl_RD" id="4OKkcnfu_yY" role="37wK5m">
                     <property role="Xl_RC" value="text" />
                   </node>
@@ -3576,8 +3576,8 @@
                   </node>
                 </node>
                 <node concept="2YIFZM" id="4OKkcnfu_z0" role="37wK5m">
-                  <ref role="1Pybhc" to="ie8e:5JQSuNsx4Gq" resolve="Builder" />
-                  <ref role="37wK5l" to="ie8e:5JQSuNsx4I5" resolve="value" />
+                  <ref role="1Pybhc" to="6exd:5JQSuNsx4Gq" resolve="Builder" />
+                  <ref role="37wK5l" to="6exd:5JQSuNsx4I5" resolve="value" />
                   <node concept="Xl_RD" id="4OKkcnfu_z1" role="37wK5m">
                     <property role="Xl_RC" value="id" />
                   </node>
@@ -3592,14 +3592,14 @@
         <node concept="3clFbH" id="4OKkcnfu_z3" role="3cqZAp" />
         <node concept="3cpWs6" id="4OKkcnfu_z4" role="3cqZAp">
           <node concept="2YIFZM" id="4OKkcnfu_z5" role="3cqZAk">
-            <ref role="37wK5l" to="ie8e:5JQSuNsxhfn" resolve="create" />
-            <ref role="1Pybhc" to="ie8e:5JQSuNswOXL" resolve="CompositeNode" />
+            <ref role="37wK5l" to="6exd:5JQSuNsxhfn" resolve="create" />
+            <ref role="1Pybhc" to="6exd:5JQSuNswOXL" resolve="CompositeNode" />
             <node concept="Xl_RD" id="4OKkcnfu_z6" role="37wK5m">
               <property role="Xl_RC" value="node_2" />
             </node>
             <node concept="2YIFZM" id="4OKkcnfu_z7" role="37wK5m">
-              <ref role="37wK5l" to="ie8e:5JQSuNsx4I5" resolve="value" />
-              <ref role="1Pybhc" to="ie8e:5JQSuNsx4Gq" resolve="Builder" />
+              <ref role="37wK5l" to="6exd:5JQSuNsx4I5" resolve="value" />
+              <ref role="1Pybhc" to="6exd:5JQSuNsx4Gq" resolve="Builder" />
               <node concept="Xl_RD" id="4OKkcnfu_z8" role="37wK5m">
                 <property role="Xl_RC" value="concept" />
               </node>
@@ -3608,8 +3608,8 @@
               </node>
             </node>
             <node concept="2YIFZM" id="4OKkcnfu_za" role="37wK5m">
-              <ref role="1Pybhc" to="ie8e:5JQSuNsx4Gq" resolve="Builder" />
-              <ref role="37wK5l" to="ie8e:5JQSuNsx4I5" resolve="value" />
+              <ref role="1Pybhc" to="6exd:5JQSuNsx4Gq" resolve="Builder" />
+              <ref role="37wK5l" to="6exd:5JQSuNsx4I5" resolve="value" />
               <node concept="Xl_RD" id="4OKkcnfu_zb" role="37wK5m">
                 <property role="Xl_RC" value="id" />
               </node>
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.test/jetbrains.mps.lang.typesystem2.samplechecker.test.msd b/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.test/jetbrains.mps.lang.typesystem2.samplechecker.test.msd
index b53f22bb..1fa8f502 100644
--- a/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.test/jetbrains.mps.lang.typesystem2.samplechecker.test.msd
+++ b/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.test/jetbrains.mps.lang.typesystem2.samplechecker.test.msd
@@ -7,7 +7,6 @@
   </models>
   <sourcePath />
   <dependencies>
-    <dependency reexport="false">7526e0cf-1ce7-46f8-a555-9eca1e06c23b(jetbrains.mps.logic.atom)</dependency>
     <dependency reexport="false">a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">9c4ae21e-62e0-4110-95b7-191b357a42d2(jetbrains.mps.lang.typesystem2.samplechecker.handler.util)</dependency>
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/jetbrains.mps.lang.typesystem2.sampleplugin.msd b/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/jetbrains.mps.lang.typesystem2.sampleplugin.msd
index e62f16e8..6e22caf4 100644
--- a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/jetbrains.mps.lang.typesystem2.sampleplugin.msd
+++ b/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/jetbrains.mps.lang.typesystem2.sampleplugin.msd
@@ -17,7 +17,6 @@
     <dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
     <dependency reexport="false">a1250a4d-c090-42c3-ad7c-d298a3357dd4(jetbrains.mps.make.runtime)</dependency>
     <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
-    <dependency reexport="false">7526e0cf-1ce7-46f8-a555-9eca1e06c23b(jetbrains.mps.logic.atom)</dependency>
     <dependency reexport="false">5b1f863d-65a0-41a6-a801-33896be24202(jetbrains.mps.ide.editor)</dependency>
     <dependency reexport="false">ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.typesystem2.template)</dependency>
     <dependency reexport="true">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/models/jetbrains/mps/lang/typesystem2/sampleplugin/plugin.mps b/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/models/jetbrains/mps/lang/typesystem2/sampleplugin/plugin.mps
index aba7a5ac..b7fedb83 100644
--- a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/models/jetbrains/mps/lang/typesystem2/sampleplugin/plugin.mps
+++ b/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/models/jetbrains/mps/lang/typesystem2/sampleplugin/plugin.mps
@@ -34,7 +34,6 @@
     <import index="i9so" ref="r:9e5578e0-37f0-4c9b-a301-771bcb453678(jetbrains.mps.make.script)" />
     <import index="dxuu" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:javax.swing(JDK/)" />
     <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
-    <import index="ie8e" ref="r:ab2605ab-b4bc-4e80-a8ca-19a4a8465c01(jetbrains.mps.logic.atom)" />
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
     <import index="exr9" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.nodeEditor(MPS.Editor/)" />
     <import index="ekwn" ref="r:9832fb5f-2578-4b58-8014-a5de79da988e(jetbrains.mps.ide.editor.actions)" />
@@ -80,11 +79,12 @@
     <import index="b8lf" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.nodeEditor.selection(MPS.Editor/)" />
     <import index="eh3q" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.nodeEditor.text(MPS.Editor/)" />
     <import index="cj4x" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor(MPS.Editor/)" />
-    <import index="yt73" ref="7526e0cf-1ce7-46f8-a555-9eca1e06c23b/java:jetbrains.mps.unification(jetbrains.mps.logic.atom/)" />
+    <import index="yt73" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.unification(jetbrains.mps.logic.reactor/)" />
     <import index="e2ly" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.util.ui.tree(MPS.IDEA/)" />
     <import index="ni5j" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.regex(JDK/)" />
     <import index="psr6" ref="r:ce187d46-c94b-47d6-8d77-26aa6af239e8(jetbrains.mps.lang.typesystem2.type)" />
     <import index="fqlx" ref="r:2cc226a9-8a78-4010-b962-823343fd28ff(jetbrains.mps.lang.typesystem2.aspect)" />
+    <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.treeform)" />
     <import index="tprs" ref="r:00000000-0000-4000-0000-011c895904a4(jetbrains.mps.ide.actions)" implicit="true" />
     <import index="zn9m" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.util(MPS.IDEA/)" implicit="true" />
   </imports>
@@ -2734,14 +2734,14 @@
                       <node concept="3uibUv" id="HV6urVCET4" role="1tU5fm">
                         <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
                         <node concept="3uibUv" id="HV6urVCET5" role="11_B2D">
-                          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                         </node>
                       </node>
                       <node concept="10QFUN" id="HV6urVCET6" role="33vP2m">
                         <node concept="3uibUv" id="HV6urVCET7" role="10QFUM">
                           <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
                           <node concept="3uibUv" id="HV6urVCET8" role="11_B2D">
-                            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                            <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                           </node>
                         </node>
                         <node concept="2OqwBi" id="HV6urVCET9" role="10QFUP">
@@ -2763,7 +2763,7 @@
                     <node concept="3cpWsn" id="HV6urVCETf" role="3cpWs9">
                       <property role="TrG5h" value="anchor" />
                       <node concept="3uibUv" id="HV6urVCETg" role="1tU5fm">
-                        <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                        <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                       </node>
                     </node>
                   </node>
@@ -2792,7 +2792,7 @@
                         <node concept="37vLTI" id="HV6urVCETr" role="3clFbG">
                           <node concept="10QFUN" id="HV6urVCETs" role="37vLTx">
                             <node concept="3uibUv" id="HV6urVCETt" role="10QFUM">
-                              <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                              <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                             </node>
                             <node concept="37vLTw" id="HV6urVCETu" role="10QFUP">
                               <ref role="3cqZAo" node="HV6urVCETi" resolve="arg1" />
@@ -2807,7 +2807,7 @@
                     </node>
                     <node concept="2ZW3vV" id="HV6urVCETx" role="3clFbw">
                       <node concept="3uibUv" id="HV6urVCETy" role="2ZW6by">
-                        <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                        <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                       </node>
                       <node concept="37vLTw" id="HV6urVCETz" role="2ZW6bz">
                         <ref role="3cqZAo" node="HV6urVCETi" resolve="arg1" />
@@ -2832,7 +2832,7 @@
                                     <node concept="3uibUv" id="HV6urVCETJ" role="10QFUM">
                                       <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
                                       <node concept="3uibUv" id="HV6urVCETK" role="11_B2D">
-                                        <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                                        <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                                       </node>
                                     </node>
                                     <node concept="37vLTw" id="HV6urVCETL" role="10QFUP">
@@ -3029,14 +3029,14 @@
                       <node concept="3uibUv" id="HV6urVCEUJ" role="1tU5fm">
                         <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
                         <node concept="3uibUv" id="HV6urVCLNb" role="11_B2D">
-                          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                         </node>
                       </node>
                       <node concept="10QFUN" id="HV6urVCEUK" role="33vP2m">
                         <node concept="3uibUv" id="HV6urVCEUL" role="10QFUM">
                           <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
                           <node concept="3uibUv" id="HV6urVCMgy" role="11_B2D">
-                            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                            <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                           </node>
                         </node>
                         <node concept="2OqwBi" id="HV6urVCEUM" role="10QFUP">
@@ -3134,14 +3134,14 @@
                       <node concept="3uibUv" id="HV6urVCEVk" role="1tU5fm">
                         <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
                         <node concept="3uibUv" id="HV6urVCPsS" role="11_B2D">
-                          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                         </node>
                       </node>
                       <node concept="10QFUN" id="HV6urVCEVl" role="33vP2m">
                         <node concept="3uibUv" id="HV6urVCEVm" role="10QFUM">
                           <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
                           <node concept="3uibUv" id="HV6urVCPVa" role="11_B2D">
-                            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                            <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                           </node>
                         </node>
                         <node concept="2OqwBi" id="HV6urVCEVn" role="10QFUP">
@@ -3164,14 +3164,14 @@
                       <node concept="3uibUv" id="HV6urVCEVt" role="1tU5fm">
                         <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
                         <node concept="3uibUv" id="HV6urVCEVu" role="11_B2D">
-                          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                         </node>
                       </node>
                       <node concept="10QFUN" id="HV6urVCEVv" role="33vP2m">
                         <node concept="3uibUv" id="HV6urVCEVw" role="10QFUM">
                           <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
                           <node concept="3uibUv" id="HV6urVCEVx" role="11_B2D">
-                            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                            <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                           </node>
                         </node>
                         <node concept="2OqwBi" id="HV6urVCEVy" role="10QFUP">
@@ -7595,13 +7595,13 @@
                   <node concept="3clFbS" id="1pPth$l_Zkj" role="2GV8ay">
                     <node concept="3clFbF" id="1pPth$l_Zkk" role="3cqZAp">
                       <node concept="2YIFZM" id="1pPth$l_Zkl" role="3clFbG">
-                        <ref role="1Pybhc" to="ie8e:4peSo3CLajR" resolve="PrintDelegate" />
-                        <ref role="37wK5l" to="ie8e:4peSo3CM2Ms" resolve="pushDelegate" />
+                        <ref role="1Pybhc" to="6exd:4peSo3CLajR" resolve="PrintDelegate" />
+                        <ref role="37wK5l" to="6exd:4peSo3CM2Ms" resolve="pushDelegate" />
                         <node concept="2ShNRf" id="1pPth$l_Zkm" role="37wK5m">
                           <node concept="YeOm9" id="1pPth$l_Zkn" role="2ShVmc">
                             <node concept="1Y3b0j" id="1pPth$l_Zko" role="YeSDq">
                               <property role="2bfB8j" value="true" />
-                              <ref role="1Y3XeK" to="ie8e:4peSo3CLajR" resolve="PrintDelegate" />
+                              <ref role="1Y3XeK" to="6exd:4peSo3CLajR" resolve="PrintDelegate" />
                               <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
                               <node concept="3Tm1VV" id="1pPth$l_Zkp" role="1B3o_S" />
                               <node concept="3clFb_" id="1pPth$l_Zkq" role="jymVt">
@@ -7610,7 +7610,7 @@
                                 <node concept="37vLTG" id="1pPth$l_Zkr" role="3clF46">
                                   <property role="TrG5h" value="tf" />
                                   <node concept="3uibUv" id="1pPth$l_Zks" role="1tU5fm">
-                                    <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                                    <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                                   </node>
                                 </node>
                                 <node concept="17QB3L" id="1pPth$l_Zkt" role="3clF45" />
@@ -8011,8 +8011,8 @@
                   <node concept="3clFbS" id="1pPth$lRVbc" role="2GVbov">
                     <node concept="3clFbF" id="1pPth$lRWOP" role="3cqZAp">
                       <node concept="2YIFZM" id="1pPth$lRXpX" role="3clFbG">
-                        <ref role="37wK5l" to="ie8e:4peSo3CMbfh" resolve="popDelegate" />
-                        <ref role="1Pybhc" to="ie8e:4peSo3CLajR" resolve="PrintDelegate" />
+                        <ref role="37wK5l" to="6exd:4peSo3CMbfh" resolve="popDelegate" />
+                        <ref role="1Pybhc" to="6exd:4peSo3CLajR" resolve="PrintDelegate" />
                       </node>
                     </node>
                   </node>
@@ -9135,14 +9135,14 @@
         <node concept="3clFbH" id="6bBjpI8jH7b" role="3cqZAp" />
         <node concept="3clFbF" id="7nPD14Nhk6D" role="3cqZAp">
           <node concept="2YIFZM" id="7nPD14Nhk6E" role="3clFbG">
-            <ref role="37wK5l" to="ie8e:4peSo3CM2Ms" resolve="pushDelegate" />
-            <ref role="1Pybhc" to="ie8e:4peSo3CLajR" resolve="PrintDelegate" />
+            <ref role="37wK5l" to="6exd:4peSo3CM2Ms" resolve="pushDelegate" />
+            <ref role="1Pybhc" to="6exd:4peSo3CLajR" resolve="PrintDelegate" />
             <node concept="2ShNRf" id="7nPD14Nhk6F" role="37wK5m">
               <node concept="YeOm9" id="7nPD14Nhk6G" role="2ShVmc">
                 <node concept="1Y3b0j" id="7nPD14Nhk6H" role="YeSDq">
                   <property role="2bfB8j" value="true" />
                   <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
-                  <ref role="1Y3XeK" to="ie8e:4peSo3CLajR" resolve="PrintDelegate" />
+                  <ref role="1Y3XeK" to="6exd:4peSo3CLajR" resolve="PrintDelegate" />
                   <node concept="3Tm1VV" id="7nPD14Nhk6I" role="1B3o_S" />
                   <node concept="3clFb_" id="7nPD14Nhk6J" role="jymVt">
                     <property role="TrG5h" value="doPrint" />
@@ -9150,7 +9150,7 @@
                     <node concept="37vLTG" id="7nPD14Nhk6K" role="3clF46">
                       <property role="TrG5h" value="tf" />
                       <node concept="3uibUv" id="7nPD14Nhk6L" role="1tU5fm">
-                        <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                        <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                       </node>
                     </node>
                     <node concept="17QB3L" id="7nPD14Nhk6M" role="3clF45" />
@@ -9214,8 +9214,8 @@
                   <node concept="3clFbS" id="7nPD14NhlXS" role="1bW5cS">
                     <node concept="3clFbF" id="7nPD14NhmlP" role="3cqZAp">
                       <node concept="2YIFZM" id="7nPD14NhmlQ" role="3clFbG">
-                        <ref role="37wK5l" to="ie8e:4peSo3CMbfh" resolve="popDelegate" />
-                        <ref role="1Pybhc" to="ie8e:4peSo3CLajR" resolve="PrintDelegate" />
+                        <ref role="37wK5l" to="6exd:4peSo3CMbfh" resolve="popDelegate" />
+                        <ref role="1Pybhc" to="6exd:4peSo3CLajR" resolve="PrintDelegate" />
                       </node>
                     </node>
                   </node>
@@ -17480,7 +17480,7 @@
                   <node concept="3uibUv" id="6QkkSolK_jp" role="1tU5fm">
                     <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
                     <node concept="3uibUv" id="6QkkSolK_jq" role="11_B2D">
-                      <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                      <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                     </node>
                   </node>
                   <node concept="1eOMI4" id="6QkkSolK_jr" role="33vP2m">
@@ -17488,7 +17488,7 @@
                       <node concept="3uibUv" id="6QkkSolK_jt" role="10QFUM">
                         <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
                         <node concept="3uibUv" id="6QkkSolK_ju" role="11_B2D">
-                          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                         </node>
                       </node>
                       <node concept="37vLTw" id="6QkkSolK_jv" role="10QFUP">
@@ -17538,7 +17538,7 @@
             <node concept="3eNFk2" id="6QkkSolK_jJ" role="3eNLev">
               <node concept="2ZW3vV" id="6QkkSolK_jK" role="3eO9$A">
                 <node concept="3uibUv" id="6QkkSolK_jL" role="2ZW6by">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
                 <node concept="37vLTw" id="6QkkSolK_jM" role="2ZW6bz">
                   <ref role="3cqZAo" node="6QkkSolK_jg" resolve="arg" />
@@ -17565,12 +17565,12 @@
                       <ref role="37wK5l" to="4r4j:6_UQWSXaVTr" resolve="findReference" />
                       <ref role="1Pybhc" to="4r4j:4OKkcnfu_xo" resolve="AnchorUtil" />
                       <node concept="2YIFZM" id="6QkkSolK_jX" role="37wK5m">
-                        <ref role="1Pybhc" to="ie8e:6HT7BWBOXme" resolve="TreeFormUtil" />
-                        <ref role="37wK5l" to="ie8e:6HT7BWBOXr$" resolve="ground" />
+                        <ref role="1Pybhc" to="6exd:6HT7BWBOXme" resolve="TreeFormUtil" />
+                        <ref role="37wK5l" to="6exd:6HT7BWBOXr$" resolve="ground" />
                         <node concept="1eOMI4" id="6QkkSolK_jY" role="37wK5m">
                           <node concept="10QFUN" id="6QkkSolK_jZ" role="1eOMHV">
                             <node concept="3uibUv" id="6QkkSolK_k0" role="10QFUM">
-                              <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                              <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                             </node>
                             <node concept="37vLTw" id="6QkkSolK_k1" role="10QFUP">
                               <ref role="3cqZAo" node="6QkkSolK_jg" resolve="arg" />
@@ -18382,8 +18382,8 @@
               <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
               <node concept="2OqwBi" id="HV6urVDdLH" role="37wK5m">
                 <node concept="2YIFZM" id="HV6urVDdLI" role="2Oq$k0">
-                  <ref role="1Pybhc" to="ie8e:3JgCwkqd3K7" resolve="Finders" />
-                  <ref role="37wK5l" to="ie8e:3JgCwkqd8va" resolve="findValue" />
+                  <ref role="1Pybhc" to="6exd:3JgCwkqd3K7" resolve="Finders" />
+                  <ref role="37wK5l" to="6exd:3JgCwkqd8va" resolve="findValue" />
                   <node concept="37vLTw" id="HV6urVDdLJ" role="37wK5m">
                     <ref role="3cqZAo" node="4pWvZ2njjOw" resolve="anchor" />
                   </node>
@@ -18395,7 +18395,7 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="HV6urVDdLM" role="2OqNvi">
-                  <ref role="37wK5l" to="ie8e:3JgCwkqkUL2" resolve="result" />
+                  <ref role="37wK5l" to="6exd:3JgCwkqkUL2" resolve="result" />
                 </node>
               </node>
             </node>
@@ -18405,7 +18405,7 @@
       <node concept="37vLTG" id="4pWvZ2njjOw" role="3clF46">
         <property role="TrG5h" value="anchor" />
         <node concept="3uibUv" id="4pWvZ2njjOx" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="3uibUv" id="HV6urVDcLx" role="3clF45">
@@ -18437,7 +18437,7 @@
           <node concept="3cpWsn" id="4pWvZ2njipz" role="3cpWs9">
             <property role="TrG5h" value="value" />
             <node concept="3uibUv" id="4pWvZ2njip$" role="1tU5fm">
-              <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+              <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
             </node>
             <node concept="2OqwBi" id="4pWvZ2njip_" role="33vP2m">
               <node concept="2OqwBi" id="4pWvZ2njipA" role="2Oq$k0">
@@ -18468,8 +18468,8 @@
                     <ref role="1Pybhc" node="4peSo3CHy8D" resolve="NodePrinter" />
                     <ref role="37wK5l" node="4peSo3D04j7" resolve="print" />
                     <node concept="2YIFZM" id="4pWvZ2njipM" role="37wK5m">
-                      <ref role="37wK5l" to="ie8e:6HT7BWBOXr$" resolve="ground" />
-                      <ref role="1Pybhc" to="ie8e:6HT7BWBOXme" resolve="TreeFormUtil" />
+                      <ref role="37wK5l" to="6exd:6HT7BWBOXr$" resolve="ground" />
+                      <ref role="1Pybhc" to="6exd:6HT7BWBOXme" resolve="TreeFormUtil" />
                       <node concept="37vLTw" id="4pWvZ2njipN" role="37wK5m">
                         <ref role="3cqZAo" node="4pWvZ2njipz" resolve="value" />
                       </node>
@@ -18624,7 +18624,7 @@
         <node concept="3uibUv" id="63ioh_TVF7K" role="1tU5fm">
           <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
           <node concept="3uibUv" id="63ioh_TVF7L" role="11_B2D">
-            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+            <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
           </node>
         </node>
       </node>
@@ -18640,7 +18640,7 @@
         <node concept="3uibUv" id="HV6urVCQ80" role="1tU5fm">
           <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
           <node concept="3uibUv" id="HV6urVCQ81" role="11_B2D">
-            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+            <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
           </node>
         </node>
       </node>
@@ -18649,7 +18649,7 @@
         <node concept="3uibUv" id="HV6urVCQ83" role="1tU5fm">
           <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
           <node concept="3uibUv" id="HV6urVCQ84" role="11_B2D">
-            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+            <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
           </node>
         </node>
       </node>
@@ -18682,7 +18682,7 @@
         <node concept="3uibUv" id="HV6urVCNox" role="1tU5fm">
           <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
           <node concept="3uibUv" id="HV6urVCNoy" role="11_B2D">
-            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+            <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
           </node>
         </node>
       </node>
@@ -18723,7 +18723,7 @@
         <node concept="3uibUv" id="63ioh_TVMaj" role="1tU5fm">
           <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
           <node concept="3uibUv" id="63ioh_TVMak" role="11_B2D">
-            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+            <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
           </node>
         </node>
       </node>
@@ -18756,7 +18756,7 @@
                 <node concept="3uibUv" id="63ioh_TVmoK" role="1tU5fm">
                   <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
                   <node concept="3uibUv" id="63ioh_TVmYn" role="11_B2D">
-                    <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                    <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                   </node>
                 </node>
                 <node concept="2OqwBi" id="6HT7BWBSOYS" role="33vP2m">
@@ -18825,7 +18825,7 @@
         <node concept="37vLTG" id="3gJBs5s_6z0" role="3clF46">
           <property role="TrG5h" value="variable" />
           <node concept="3uibUv" id="3gJBs5s_6z1" role="1tU5fm">
-            <ref role="3uigEE" to="ie8e:uNmovXiEd4" resolve="Variable" />
+            <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
           </node>
         </node>
         <node concept="17QB3L" id="4peSo3D1hha" role="3clF45" />
@@ -18839,14 +18839,14 @@
                   <node concept="3uibUv" id="3gJBs5s_7I4" role="1tU5fm">
                     <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
                     <node concept="3uibUv" id="4TCblo6gC1j" role="11_B2D">
-                      <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                      <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                     </node>
                   </node>
                   <node concept="10QFUN" id="4TCblo6gCrJ" role="33vP2m">
                     <node concept="3uibUv" id="4TCblo6gCr_" role="10QFUM">
                       <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
                       <node concept="3uibUv" id="4TCblo6gCrA" role="11_B2D">
-                        <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                        <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                       </node>
                     </node>
                     <node concept="2OqwBi" id="4TCblo6gCrB" role="10QFUP">
@@ -18928,7 +18928,7 @@
                         <ref role="3cqZAo" node="3gJBs5s_6z0" resolve="variable" />
                       </node>
                       <node concept="liA8E" id="4peSo3D0AYC" role="2OqNvi">
-                        <ref role="37wK5l" to="ie8e:56MMu0Ark7d" resolve="symbol" />
+                        <ref role="37wK5l" to="6exd:56MMu0Ark7d" resolve="symbol" />
                       </node>
                     </node>
                   </node>
@@ -18956,7 +18956,7 @@
         <node concept="3uibUv" id="4TCblo6gv5I" role="1tU5fm">
           <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
           <node concept="3uibUv" id="4TCblo6gv5J" role="11_B2D">
-            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+            <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
           </node>
         </node>
       </node>
@@ -18990,7 +18990,7 @@
           <node concept="3cpWsn" id="4TCblo6gv4O" role="3cpWs9">
             <property role="TrG5h" value="boundValue" />
             <node concept="3uibUv" id="4TCblo6gv4P" role="1tU5fm">
-              <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+              <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
             </node>
             <node concept="2OqwBi" id="4TCblo6gv4Q" role="33vP2m">
               <node concept="2OqwBi" id="4TCblo6gv4R" role="2Oq$k0">
@@ -19021,8 +19021,8 @@
                     <ref role="1Pybhc" node="4peSo3CHy8D" resolve="NodePrinter" />
                     <ref role="37wK5l" node="4peSo3D04j7" resolve="print" />
                     <node concept="2YIFZM" id="4TCblo6gv53" role="37wK5m">
-                      <ref role="1Pybhc" to="ie8e:6HT7BWBOXme" resolve="TreeFormUtil" />
-                      <ref role="37wK5l" to="ie8e:6HT7BWBOXr$" resolve="ground" />
+                      <ref role="1Pybhc" to="6exd:6HT7BWBOXme" resolve="TreeFormUtil" />
+                      <ref role="37wK5l" to="6exd:6HT7BWBOXr$" resolve="ground" />
                       <node concept="37vLTw" id="4TCblo6gv54" role="37wK5m">
                         <ref role="3cqZAo" node="4TCblo6gv4O" resolve="boundValue" />
                       </node>
@@ -19165,7 +19165,7 @@
         <node concept="3uibUv" id="63ioh_TUSSq" role="11_B2D">
           <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
           <node concept="3uibUv" id="63ioh_TUTD_" role="11_B2D">
-            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+            <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
           </node>
         </node>
       </node>
@@ -19178,7 +19178,7 @@
           <node concept="3uibUv" id="63ioh_TUUM4" role="1pMfVU">
             <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
             <node concept="3uibUv" id="63ioh_TUVz6" role="11_B2D">
-              <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+              <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
             </node>
           </node>
         </node>
@@ -19470,11 +19470,11 @@
       <node concept="37vLTG" id="3mz2_dYbXuJ" role="3clF46">
         <property role="TrG5h" value="original" />
         <node concept="3uibUv" id="3mz2_dYbXYO" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="3uibUv" id="3mz2_dYbYkL" role="3clF45">
-        <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+        <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
       </node>
       <node concept="3Tm6S6" id="3mz2_dYbXuM" role="1B3o_S" />
       <node concept="3clFbS" id="3mz2_dYbXuN" role="3clF47">
@@ -19484,7 +19484,7 @@
               <ref role="3cqZAo" node="1jo82tq2G6N" resolve="SNAPSHOT_MAPPER" />
             </node>
             <node concept="liA8E" id="3mz2_dYep4H" role="2OqNvi">
-              <ref role="37wK5l" to="ie8e:3OPtF02TgQt" resolve="map" />
+              <ref role="37wK5l" to="6exd:3OPtF02TgQt" resolve="map" />
               <node concept="37vLTw" id="3mz2_dYepqm" role="37wK5m">
                 <ref role="3cqZAo" node="3mz2_dYbXuJ" resolve="original" />
               </node>
@@ -19644,7 +19644,7 @@
           <node concept="3eNFk2" id="3mz2_dYaDvF" role="3eNLev">
             <node concept="2ZW3vV" id="3mz2_dYaDDW" role="3eO9$A">
               <node concept="3uibUv" id="3mz2_dYaDLn" role="2ZW6by">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="37vLTw" id="3mz2_dYaDDm" role="2ZW6bz">
                 <ref role="3cqZAo" node="3mz2_dYaCcM" resolve="arg" />
@@ -19661,7 +19661,7 @@
                     <node concept="1eOMI4" id="3mz2_dYbZMJ" role="37wK5m">
                       <node concept="10QFUN" id="3mz2_dYbZMG" role="1eOMHV">
                         <node concept="3uibUv" id="3mz2_dYbZML" role="10QFUM">
-                          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                         </node>
                         <node concept="37vLTw" id="3mz2_dYbZMM" role="10QFUP">
                           <ref role="3cqZAo" node="3mz2_dYaCcM" resolve="arg" />
@@ -20252,7 +20252,7 @@
         <property role="1EzhhJ" value="false" />
         <property role="TrG5h" value="asTreeForm" />
         <node concept="3uibUv" id="3mz2_dYaWnj" role="3clF45">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
         <node concept="3Tm1VV" id="3mz2_dYaWnk" role="1B3o_S" />
         <node concept="3clFbS" id="3mz2_dYaWnm" role="3clF47">
@@ -20270,7 +20270,7 @@
         <property role="1EzhhJ" value="false" />
         <property role="TrG5h" value="asTreeForm" />
         <node concept="3uibUv" id="3mz2_dYaWnq" role="3clF45">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
         <node concept="3Tm1VV" id="3mz2_dYaWnr" role="1B3o_S" />
         <node concept="37vLTG" id="3mz2_dYaWnt" role="3clF46">
@@ -20279,7 +20279,7 @@
             <ref role="3uigEE" to="wyt6:~Class" resolve="Class" />
             <node concept="3qUE_q" id="3mz2_dYaWnv" role="11_B2D">
               <node concept="3uibUv" id="3mz2_dYaWnw" role="3qUE_r">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
             </node>
           </node>
@@ -20304,7 +20304,7 @@
             <ref role="3uigEE" to="wyt6:~Class" resolve="Class" />
             <node concept="3qUE_q" id="3mz2_dYaWnB" role="11_B2D">
               <node concept="3uibUv" id="3mz2_dYaWnC" role="3qUE_r">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
             </node>
           </node>
@@ -20494,14 +20494,14 @@
       <property role="TrG5h" value="SNAPSHOT_DELEGATE" />
       <property role="3TUv4t" value="true" />
       <node concept="3uibUv" id="6HT7BWBPa9D" role="1tU5fm">
-        <ref role="3uigEE" to="ie8e:3OPtF031GQe" resolve="Mappers.MapDelegate" />
+        <ref role="3uigEE" to="6exd:3OPtF031GQe" resolve="Mappers.MapDelegate" />
       </node>
       <node concept="3Tm6S6" id="6HT7BWBPa9C" role="1B3o_S" />
       <node concept="2ShNRf" id="6HT7BWBPa9E" role="33vP2m">
         <node concept="YeOm9" id="6HT7BWBPa9F" role="2ShVmc">
           <node concept="1Y3b0j" id="6HT7BWBPa9G" role="YeSDq">
             <property role="2bfB8j" value="true" />
-            <ref role="1Y3XeK" to="ie8e:3OPtF031GQe" resolve="Mappers.MapDelegate" />
+            <ref role="1Y3XeK" to="6exd:3OPtF031GQe" resolve="Mappers.MapDelegate" />
             <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
             <node concept="2tJIrI" id="3mz2_dYcqaE" role="jymVt" />
             <node concept="3Tm1VV" id="6HT7BWBPa9H" role="1B3o_S" />
@@ -20511,7 +20511,7 @@
               <node concept="37vLTG" id="6HT7BWBPa9J" role="3clF46">
                 <property role="TrG5h" value="tf" />
                 <node concept="3uibUv" id="6HT7BWBPa9K" role="1tU5fm">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
               <node concept="10P_77" id="6HT7BWBPa9L" role="3clF45" />
@@ -20528,12 +20528,12 @@
                         <ref role="3cqZAo" node="6HT7BWBPa9J" resolve="tf" />
                       </node>
                       <node concept="liA8E" id="6HT7BWBQdDR" role="2OqNvi">
-                        <ref role="37wK5l" to="ie8e:104EUzFOBnD" resolve="acceptVisitor" />
+                        <ref role="37wK5l" to="6exd:104EUzFOBnD" resolve="acceptVisitor" />
                         <node concept="2ShNRf" id="6HT7BWBQdEF" role="37wK5m">
                           <node concept="YeOm9" id="6HT7BWBQdQT" role="2ShVmc">
                             <node concept="1Y3b0j" id="6HT7BWBQdQW" role="YeSDq">
                               <property role="2bfB8j" value="true" />
-                              <ref role="1Y3XeK" to="ie8e:6HT7BWBQcxv" resolve="TreeForm.Visitor.Stub" />
+                              <ref role="1Y3XeK" to="6exd:6HT7BWBQcxv" resolve="TreeForm.Visitor.Stub" />
                               <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
                               <node concept="3Tm1VV" id="6HT7BWBQdQX" role="1B3o_S" />
                               <node concept="3clFb_" id="6HT7BWBQdTD" role="jymVt">
@@ -20542,7 +20542,7 @@
                                 <node concept="37vLTG" id="6HT7BWBQdTE" role="3clF46">
                                   <property role="TrG5h" value="variable" />
                                   <node concept="3uibUv" id="6HT7BWBQdTF" role="1tU5fm">
-                                    <ref role="3uigEE" to="ie8e:uNmovXiEd4" resolve="Variable" />
+                                    <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
                                   </node>
                                 </node>
                                 <node concept="3uibUv" id="6HT7BWBQdTG" role="3clF45">
@@ -20586,18 +20586,18 @@
               <node concept="37vLTG" id="6HT7BWBPa9P" role="3clF46">
                 <property role="TrG5h" value="tf" />
                 <node concept="3uibUv" id="6HT7BWBPa9Q" role="1tU5fm">
-                  <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                 </node>
               </node>
               <node concept="37vLTG" id="6HT7BWBPa9R" role="3clF46">
                 <property role="TrG5h" value="fallback" />
                 <node concept="3uibUv" id="6HT7BWBPa9S" role="1tU5fm">
-                  <ref role="3uigEE" to="ie8e:3OPtF02TdNT" resolve="TreeForm.Mapper" />
+                  <ref role="3uigEE" to="6exd:3OPtF02TdNT" resolve="TreeForm.Mapper" />
                 </node>
               </node>
               <node concept="3Tm1VV" id="6HT7BWBPa9T" role="1B3o_S" />
               <node concept="3uibUv" id="6HT7BWBPa9U" role="3clF45">
-                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="3clFbS" id="6HT7BWBPa9V" role="3clF47">
                 <node concept="3cpWs8" id="3mz2_dYcBbl" role="3cqZAp">
@@ -20606,14 +20606,14 @@
                     <node concept="3uibUv" id="3mz2_dYcBbf" role="1tU5fm">
                       <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
                       <node concept="3uibUv" id="3mz2_dYcHfy" role="11_B2D">
-                        <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                        <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                       </node>
                     </node>
                     <node concept="10QFUN" id="3mz2_dYcHQR" role="33vP2m">
                       <node concept="3uibUv" id="3mz2_dYcHQJ" role="10QFUM">
                         <ref role="3uigEE" to="45ys:1mP5b6jQP$C" resolve="Logical" />
                         <node concept="3uibUv" id="3mz2_dYcHQK" role="11_B2D">
-                          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                         </node>
                       </node>
                       <node concept="2OqwBi" id="3mz2_dYcHQL" role="10QFUP">
@@ -20642,7 +20642,7 @@
                           <ref role="3cqZAo" node="1jo82tq2G6N" resolve="SNAPSHOT_MAPPER" />
                         </node>
                         <node concept="liA8E" id="3mz2_dYcDhY" role="2OqNvi">
-                          <ref role="37wK5l" to="ie8e:3OPtF02TgQt" resolve="map" />
+                          <ref role="37wK5l" to="6exd:3OPtF02TgQt" resolve="map" />
                           <node concept="2OqwBi" id="3mz2_dYcG9s" role="37wK5m">
                             <node concept="2OqwBi" id="3mz2_dYcGtf" role="2Oq$k0">
                               <node concept="37vLTw" id="3mz2_dYcISs" role="2Oq$k0">
@@ -20700,11 +20700,11 @@
       <property role="TrG5h" value="SNAPSHOT_MAPPER" />
       <node concept="3Tm6S6" id="1jo82tq2G6J" role="1B3o_S" />
       <node concept="3uibUv" id="1jo82tq2G6K" role="1tU5fm">
-        <ref role="3uigEE" to="ie8e:3OPtF02TdNT" resolve="TreeForm.Mapper" />
+        <ref role="3uigEE" to="6exd:3OPtF02TdNT" resolve="TreeForm.Mapper" />
       </node>
       <node concept="2YIFZM" id="1jo82tq2G6L" role="33vP2m">
-        <ref role="1Pybhc" to="ie8e:3OPtF02T8yx" resolve="Mappers" />
-        <ref role="37wK5l" to="ie8e:5s497VqteR6" resolve="mapper" />
+        <ref role="1Pybhc" to="6exd:3OPtF02T8yx" resolve="Mappers" />
+        <ref role="37wK5l" to="6exd:5s497VqteR6" resolve="mapper" />
         <node concept="37vLTw" id="3mz2_dYcoXT" role="37wK5m">
           <ref role="3cqZAo" node="6HT7BWBPbsi" resolve="SNAPSHOT_DELEGATE" />
         </node>
@@ -31064,7 +31064,7 @@
       <node concept="37vLTG" id="4peSo3CHB$z" role="3clF46">
         <property role="TrG5h" value="tf" />
         <node concept="3uibUv" id="4peSo3CHBGl" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="3clFbS" id="4peSo3CHB5z" role="3clF47">
@@ -31120,7 +31120,7 @@
       <node concept="37vLTG" id="4peSo3D04j8" role="3clF46">
         <property role="TrG5h" value="tf" />
         <node concept="3uibUv" id="4peSo3D04j9" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="37vLTG" id="4peSo3D075N" role="3clF46">
@@ -31180,7 +31180,7 @@
       <node concept="37vLTG" id="4peSo3CIJRP" role="3clF46">
         <property role="TrG5h" value="tf" />
         <node concept="3uibUv" id="4peSo3CIJRQ" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
       </node>
       <node concept="37vLTG" id="4peSo3D1wUl" role="3clF46">
@@ -31235,7 +31235,7 @@
                 <node concept="2OqwBi" id="4peSo3CIJSb" role="3clFbG">
                   <node concept="2ShNRf" id="4peSo3CIJSc" role="2Oq$k0">
                     <node concept="1pGfFk" id="4peSo3CIJSd" role="2ShVmc">
-                      <ref role="37wK5l" to="ie8e:47nvOnTQN6Q" resolve="TreeFormWalk" />
+                      <ref role="37wK5l" to="6exd:47nvOnTQN6Q" resolve="TreeFormWalk" />
                       <node concept="2ShNRf" id="4peSo3CINyv" role="37wK5m">
                         <node concept="1pGfFk" id="4peSo3CINPP" role="2ShVmc">
                           <ref role="37wK5l" node="4peSo3CIw3p" resolve="NodePrinter" />
@@ -31250,10 +31250,10 @@
                     </node>
                   </node>
                   <node concept="liA8E" id="4peSo3CIJSf" role="2OqNvi">
-                    <ref role="37wK5l" to="ie8e:1hOy_Afq63K" resolve="walk" />
+                    <ref role="37wK5l" to="6exd:1hOy_Afq63K" resolve="walk" />
                     <node concept="2YIFZM" id="6HT7BWBRh6I" role="37wK5m">
-                      <ref role="37wK5l" to="ie8e:6HT7BWBOXr$" resolve="ground" />
-                      <ref role="1Pybhc" to="ie8e:6HT7BWBOXme" resolve="TreeFormUtil" />
+                      <ref role="37wK5l" to="6exd:6HT7BWBOXr$" resolve="ground" />
+                      <ref role="1Pybhc" to="6exd:6HT7BWBOXme" resolve="TreeFormUtil" />
                       <node concept="37vLTw" id="6HT7BWBRhg3" role="37wK5m">
                         <ref role="3cqZAo" node="4peSo3CIJRP" resolve="tf" />
                       </node>
@@ -31334,19 +31334,19 @@
     <node concept="2tJIrI" id="4peSo3CIBGi" role="jymVt" />
     <node concept="3Tm1VV" id="4peSo3CHy8E" role="1B3o_S" />
     <node concept="3uibUv" id="4peSo3CHzrM" role="EKbjA">
-      <ref role="3uigEE" to="ie8e:3JgCwkqiP3h" resolve="TreeFormWalk.Walker" />
+      <ref role="3uigEE" to="6exd:3JgCwkqiP3h" resolve="TreeFormWalk.Walker" />
     </node>
     <node concept="3clFb_" id="4peSo3CHzzR" role="jymVt">
       <property role="1EzhhJ" value="false" />
       <property role="TrG5h" value="walkTerms" />
       <node concept="3uibUv" id="4peSo3CHzzS" role="3clF45">
-        <ref role="3uigEE" to="ie8e:2q_78a95hAL" resolve="Action" />
+        <ref role="3uigEE" to="6exd:2q_78a95hAL" resolve="Action" />
       </node>
       <node concept="3Tm1VV" id="4peSo3CHzzT" role="1B3o_S" />
       <node concept="37vLTG" id="4peSo3CHzzV" role="3clF46">
         <property role="TrG5h" value="cb" />
         <node concept="3uibUv" id="4peSo3CHzzW" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:5JQSuNswOXL" resolve="CompositeNode" />
+          <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="CompositeNode" />
         </node>
       </node>
       <node concept="3clFbS" id="4peSo3CHz$5" role="3clF47">
@@ -31422,7 +31422,7 @@
                   <ref role="3cqZAo" node="4peSo3CHzzV" resolve="cb" />
                 </node>
                 <node concept="liA8E" id="29_L5zQVerC" role="2OqNvi">
-                  <ref role="37wK5l" to="ie8e:1R$Cm9qGRoH" resolve="symbol" />
+                  <ref role="37wK5l" to="6exd:1R$Cm9qGRoH" resolve="symbol" />
                 </node>
               </node>
             </node>
@@ -31445,7 +31445,7 @@
                     <ref role="3cqZAo" node="4peSo3CHzzV" resolve="cb" />
                   </node>
                   <node concept="liA8E" id="5_6ImQY3GdL" role="2OqNvi">
-                    <ref role="37wK5l" to="ie8e:1R$Cm9qGRoH" resolve="symbol" />
+                    <ref role="37wK5l" to="6exd:1R$Cm9qGRoH" resolve="symbol" />
                   </node>
                 </node>
               </node>
@@ -31516,7 +31516,7 @@
                     <ref role="3cqZAo" node="4peSo3CHzzV" resolve="cb" />
                   </node>
                   <node concept="liA8E" id="3t7_2FgUSox" role="2OqNvi">
-                    <ref role="37wK5l" to="ie8e:1R$Cm9qGRoH" resolve="symbol" />
+                    <ref role="37wK5l" to="6exd:1R$Cm9qGRoH" resolve="symbol" />
                   </node>
                 </node>
               </node>
@@ -31577,8 +31577,8 @@
         </node>
         <node concept="3clFbF" id="4peSo3CJxFt" role="3cqZAp">
           <node concept="Rm8GO" id="4peSo3CJxLa" role="3clFbG">
-            <ref role="1Px2BO" to="ie8e:2q_78a95hAL" resolve="Action" />
-            <ref role="Rm8GQ" to="ie8e:2q_78a95hAM" resolve="WALK" />
+            <ref role="1Px2BO" to="6exd:2q_78a95hAL" resolve="Action" />
+            <ref role="Rm8GQ" to="6exd:2q_78a95hAM" resolve="WALK" />
           </node>
         </node>
       </node>
@@ -31588,7 +31588,7 @@
       <property role="1EzhhJ" value="false" />
       <property role="TrG5h" value="walkList" />
       <node concept="3uibUv" id="4peSo3CHz$z" role="3clF45">
-        <ref role="3uigEE" to="ie8e:2q_78a95hAL" resolve="Action" />
+        <ref role="3uigEE" to="6exd:2q_78a95hAL" resolve="Action" />
       </node>
       <node concept="3Tm1VV" id="4peSo3CHz$$" role="1B3o_S" />
       <node concept="3clFbS" id="4peSo3CHz$L" role="3clF47">
@@ -31623,15 +31623,15 @@
         </node>
         <node concept="3clFbF" id="4peSo3CK1PR" role="3cqZAp">
           <node concept="Rm8GO" id="4peSo3CK1Y2" role="3clFbG">
-            <ref role="1Px2BO" to="ie8e:2q_78a95hAL" resolve="Action" />
-            <ref role="Rm8GQ" to="ie8e:2q_78a95hAM" resolve="WALK" />
+            <ref role="1Px2BO" to="6exd:2q_78a95hAL" resolve="Action" />
+            <ref role="Rm8GQ" to="6exd:2q_78a95hAM" resolve="WALK" />
           </node>
         </node>
       </node>
       <node concept="37vLTG" id="4peSo3CHz$A" role="3clF46">
         <property role="TrG5h" value="listb" />
         <node concept="3uibUv" id="5YIOneOU7$j" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:3OPtF03lco4" resolve="ListNode" />
+          <ref role="3uigEE" to="6exd:3OPtF03lco4" resolve="ListNode" />
         </node>
       </node>
     </node>
@@ -31640,7 +31640,7 @@
       <property role="1EzhhJ" value="false" />
       <property role="TrG5h" value="walkValues" />
       <node concept="3uibUv" id="4peSo3CHz$9" role="3clF45">
-        <ref role="3uigEE" to="ie8e:2q_78a95hAL" resolve="Action" />
+        <ref role="3uigEE" to="6exd:2q_78a95hAL" resolve="Action" />
       </node>
       <node concept="3Tm1VV" id="4peSo3CHz$a" role="1B3o_S" />
       <node concept="16euLQ" id="4peSo3CHz$i" role="16eVyc">
@@ -31661,7 +31661,7 @@
                       <ref role="3cqZAo" node="4peSo3CHz$c" resolve="valb" />
                     </node>
                     <node concept="liA8E" id="5YIOneON8ue" role="2OqNvi">
-                      <ref role="37wK5l" to="ie8e:5YIOneOMEJi" resolve="values" />
+                      <ref role="37wK5l" to="6exd:5YIOneOMEJi" resolve="values" />
                     </node>
                   </node>
                   <node concept="liA8E" id="5YIOneON95r" role="2OqNvi">
@@ -31687,7 +31687,7 @@
                   <ref role="3cqZAo" node="4peSo3CHz$c" resolve="valb" />
                 </node>
                 <node concept="liA8E" id="6infEALrTl3" role="2OqNvi">
-                  <ref role="37wK5l" to="ie8e:1R$Cm9qGRoH" resolve="symbol" />
+                  <ref role="37wK5l" to="6exd:1R$Cm9qGRoH" resolve="symbol" />
                 </node>
               </node>
             </node>
@@ -31717,15 +31717,15 @@
         </node>
         <node concept="3clFbF" id="4peSo3CK097" role="3cqZAp">
           <node concept="Rm8GO" id="4peSo3CK0nk" role="3clFbG">
-            <ref role="1Px2BO" to="ie8e:2q_78a95hAL" resolve="Action" />
-            <ref role="Rm8GQ" to="ie8e:2q_78a95hAN" resolve="CONTINUE" />
+            <ref role="1Px2BO" to="6exd:2q_78a95hAL" resolve="Action" />
+            <ref role="Rm8GQ" to="6exd:2q_78a95hAN" resolve="CONTINUE" />
           </node>
         </node>
       </node>
       <node concept="37vLTG" id="4peSo3CHz$c" role="3clF46">
         <property role="TrG5h" value="valb" />
         <node concept="3uibUv" id="5YIOneONkSZ" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:1msb0mq99GH" resolve="ValueNode" />
+          <ref role="3uigEE" to="6exd:1msb0mq99GH" resolve="ValueNode" />
           <node concept="16syzq" id="5YIOneONkT0" role="11_B2D">
             <ref role="16sUi3" node="4peSo3CHz$i" resolve="V" />
           </node>
@@ -31737,13 +31737,13 @@
       <property role="1EzhhJ" value="false" />
       <property role="TrG5h" value="walkValue" />
       <node concept="3uibUv" id="4peSo3CHz$P" role="3clF45">
-        <ref role="3uigEE" to="ie8e:2q_78a95hAL" resolve="Action" />
+        <ref role="3uigEE" to="6exd:2q_78a95hAL" resolve="Action" />
       </node>
       <node concept="3Tm1VV" id="4peSo3CHz$Q" role="1B3o_S" />
       <node concept="37vLTG" id="4peSo3CHz$S" role="3clF46">
         <property role="TrG5h" value="value" />
         <node concept="3uibUv" id="4peSo3CHz$T" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:2xQ7eRAD2dj" resolve="Value" />
+          <ref role="3uigEE" to="6exd:2xQ7eRAD2dj" resolve="Value" />
           <node concept="3qTvmN" id="4peSo3CHz$U" role="11_B2D" />
         </node>
       </node>
@@ -31768,7 +31768,7 @@
                     <ref role="3cqZAo" node="4peSo3CHz$S" resolve="value" />
                   </node>
                   <node concept="liA8E" id="3mz2_dYmlx$" role="2OqNvi">
-                    <ref role="37wK5l" to="ie8e:1msb0mq8QTt" resolve="symbol" />
+                    <ref role="37wK5l" to="6exd:1msb0mq8QTt" resolve="symbol" />
                   </node>
                 </node>
               </node>
@@ -31777,8 +31777,8 @@
         </node>
         <node concept="3clFbF" id="3mz2_dYmvJJ" role="3cqZAp">
           <node concept="Rm8GO" id="3mz2_dYmvJK" role="3clFbG">
-            <ref role="1Px2BO" to="ie8e:2q_78a95hAL" resolve="Action" />
-            <ref role="Rm8GQ" to="ie8e:2q_78a95hAN" resolve="CONTINUE" />
+            <ref role="1Px2BO" to="6exd:2q_78a95hAL" resolve="Action" />
+            <ref role="Rm8GQ" to="6exd:2q_78a95hAN" resolve="CONTINUE" />
           </node>
         </node>
       </node>
@@ -31788,7 +31788,7 @@
       <property role="1EzhhJ" value="false" />
       <property role="TrG5h" value="walkVariables" />
       <node concept="3uibUv" id="4peSo3CHz$n" role="3clF45">
-        <ref role="3uigEE" to="ie8e:2q_78a95hAL" resolve="Action" />
+        <ref role="3uigEE" to="6exd:2q_78a95hAL" resolve="Action" />
       </node>
       <node concept="3Tm1VV" id="4peSo3CHz$o" role="1B3o_S" />
       <node concept="3clFbS" id="4peSo3CHz$v" role="3clF47">
@@ -31808,7 +31808,7 @@
       <node concept="37vLTG" id="4peSo3CHz$q" role="3clF46">
         <property role="TrG5h" value="varb" />
         <node concept="3uibUv" id="5YIOneOSlWm" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:uNmovXiSQ6" resolve="VariableNode" />
+          <ref role="3uigEE" to="6exd:uNmovXiSQ6" resolve="VariableNode" />
         </node>
       </node>
     </node>
@@ -31817,13 +31817,13 @@
       <property role="1EzhhJ" value="false" />
       <property role="TrG5h" value="walkVariable" />
       <node concept="3uibUv" id="4peSo3CHz$Z" role="3clF45">
-        <ref role="3uigEE" to="ie8e:2q_78a95hAL" resolve="Action" />
+        <ref role="3uigEE" to="6exd:2q_78a95hAL" resolve="Action" />
       </node>
       <node concept="3Tm1VV" id="4peSo3CHz_0" role="1B3o_S" />
       <node concept="37vLTG" id="4peSo3CHz_2" role="3clF46">
         <property role="TrG5h" value="variable" />
         <node concept="3uibUv" id="4peSo3CHz_3" role="1tU5fm">
-          <ref role="3uigEE" to="ie8e:uNmovXiEd4" resolve="Variable" />
+          <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
         </node>
       </node>
       <node concept="3clFbS" id="4peSo3CHz_4" role="3clF47">
@@ -31865,8 +31865,8 @@
         </node>
         <node concept="3clFbF" id="4peSo3CNUWB" role="3cqZAp">
           <node concept="Rm8GO" id="4peSo3CNVh5" role="3clFbG">
-            <ref role="1Px2BO" to="ie8e:2q_78a95hAL" resolve="Action" />
-            <ref role="Rm8GQ" to="ie8e:2q_78a95hAN" resolve="CONTINUE" />
+            <ref role="1Px2BO" to="6exd:2q_78a95hAL" resolve="Action" />
+            <ref role="Rm8GQ" to="6exd:2q_78a95hAN" resolve="CONTINUE" />
           </node>
         </node>
       </node>
@@ -33018,7 +33018,7 @@
         <node concept="37vLTG" id="3gJBs5s$cVL" role="3clF46">
           <property role="TrG5h" value="variable" />
           <node concept="3uibUv" id="3gJBs5s$cVM" role="1tU5fm">
-            <ref role="3uigEE" to="ie8e:uNmovXiEd4" resolve="Variable" />
+            <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
           </node>
         </node>
         <node concept="17QB3L" id="4peSo3D15vm" role="3clF45" />
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps
index c6b7730c..91aef8c0 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps
@@ -28,7 +28,6 @@
     <import index="5j4j" ref="r:c8fb1c5e-8204-4904-a38f-678899d447c1(jetbrains.mps.logic.structure)" />
     <import index="i348" ref="r:42a15dec-83a9-4fe1-80d6-3bf898c512bd(jetbrains.mps.lang.typesystem2.template)" />
     <import index="x5bw" ref="r:15ea4f4e-2f41-4ce3-b7e4-a4e0737f0171(jetbrains.mps.lang.typesystem2.behavior)" />
-    <import index="ie8e" ref="r:ab2605ab-b4bc-4e80-a8ca-19a4a8465c01(jetbrains.mps.logic.atom)" />
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
     <import index="psr6" ref="r:ce187d46-c94b-47d6-8d77-26aa6af239e8(jetbrains.mps.lang.typesystem2.type)" />
     <import index="cx9y" ref="r:309aeee7-bee8-445c-b31d-35928d1da75f(jetbrains.mps.baseLanguage.tuples.structure)" />
@@ -49,6 +48,7 @@
     <import index="ucur" ref="r:1dfaf07d-c77a-451e-91d3-b6f80f0f8508(jetbrains.mps.lang.descriptor.generator.template.main@generator)" />
     <import index="ba7m" ref="r:4c5ac278-3ad7-4902-ab86-6c60b350f168(jetbrains.mps.lang.aspect.generator.template.main@generator)" />
     <import index="fqlx" ref="r:2cc226a9-8a78-4010-b962-823343fd28ff(jetbrains.mps.lang.typesystem2.aspect)" />
+    <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.treeform)" />
     <import index="tpek" ref="r:00000000-0000-4000-0000-011c895902c0(jetbrains.mps.baseLanguage.behavior)" implicit="true" />
     <import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" implicit="true" />
     <import index="hypd" ref="r:aa31e43e-9240-4f4d-b6db-5c1c9a86c59e(jetbrains.mps.lang.project.structure)" implicit="true" />
@@ -6852,7 +6852,7 @@
         </node>
         <node concept="gft3U" id="7jC45KccKR9" role="14YRTM">
           <node concept="2YIFZM" id="7jC45KccKZV" role="gfFT$">
-            <ref role="37wK5l" to="4r4j:4OKkcnfu_xq" resolve="anchorAtom" />
+            <ref role="37wK5l" to="4r4j:4OKkcnfu_xq" resolve="anchorTreeForm" />
             <ref role="1Pybhc" to="4r4j:4OKkcnfu_xo" resolve="AnchorUtil" />
             <node concept="10Nm6u" id="7jC45KccL0o" role="37wK5m">
               <node concept="29HgVG" id="7jC45KccL0G" role="lGtFl">
@@ -6878,7 +6878,7 @@
       <ref role="30HIoZ" to="5j4j:7E86$tKskWj" resolve="LogicalValue" />
       <node concept="gft3U" id="YGS68NawGs" role="1lVwrX">
         <node concept="2YIFZM" id="YGS68NawZA" role="gfFT$">
-          <ref role="37wK5l" to="4r4j:4OKkcnfu_xq" resolve="anchorAtom" />
+          <ref role="37wK5l" to="4r4j:4OKkcnfu_xq" resolve="anchorTreeForm" />
           <ref role="1Pybhc" to="4r4j:4OKkcnfu_xo" resolve="AnchorUtil" />
           <node concept="10Nm6u" id="YGS68NawZB" role="37wK5m">
             <node concept="29HgVG" id="YGS68NawZC" role="lGtFl">
@@ -9724,7 +9724,7 @@
                                 </node>
                               </node>
                               <node concept="3uibUv" id="1L74NXGlUxQ" role="3clF45">
-                                <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                               </node>
                               <node concept="3Tmbuc" id="1L74NXGlU7F" role="1B3o_S" />
                               <node concept="3clFbS" id="1L74NXGlGt6" role="3clF47">
@@ -10465,7 +10465,7 @@
             </node>
           </node>
           <node concept="3uibUv" id="1L74NXG5Fnm" role="3clF45">
-            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+            <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
           </node>
           <node concept="3Tmbuc" id="1L74NXG5G7o" role="1B3o_S" />
           <node concept="3clFbS" id="1L74NXG5FfZ" role="3clF47">
@@ -11225,7 +11225,7 @@
         <node concept="3clFb_" id="1L74NXEvZZv" role="jymVt">
           <property role="TrG5h" value="typeTerm" />
           <node concept="3uibUv" id="4gW0vesTxMA" role="3clF45">
-            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+            <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
           </node>
           <node concept="3Tm1VV" id="1L74NXEUsh1" role="1B3o_S" />
           <node concept="3clFbS" id="1L74NXEvZZz" role="3clF47">
@@ -11300,7 +11300,7 @@
             </node>
           </node>
           <node concept="3uibUv" id="4gW0vesTAtz" role="3clF45">
-            <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+            <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
           </node>
           <node concept="3Tm1VV" id="1L74NXFPMn6" role="1B3o_S" />
           <node concept="3clFbS" id="1L74NXFPMn9" role="3clF47">
@@ -11742,7 +11742,7 @@
           <node concept="3clFb_" id="1L74NXFZxBo" role="jymVt">
             <property role="TrG5h" value="feature" />
             <node concept="3uibUv" id="1L74NXFZxOu" role="3clF45">
-              <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+              <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
             </node>
             <node concept="3Tm1VV" id="1L74NXFZxBr" role="1B3o_S" />
             <node concept="3clFbS" id="1L74NXFZxBs" role="3clF47">
@@ -16756,7 +16756,7 @@
           </node>
           <node concept="1Koe21" id="1sCZQVfjxug" role="150oIE">
             <node concept="3VsKOn" id="1sCZQVfjxuh" role="1Koe22">
-              <ref role="3VsUkX" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+              <ref role="3VsUkX" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               <node concept="raruj" id="1sCZQVfjxui" role="lGtFl" />
             </node>
           </node>
@@ -16784,7 +16784,7 @@
                   </node>
                   <node concept="2c44tf" id="6MYr6JxnB0K" role="3JuZjQ">
                     <node concept="3uibUv" id="6MYr6JxnB0L" role="2c44tc">
-                      <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                      <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                     </node>
                   </node>
                 </node>
@@ -16793,7 +16793,7 @@
           </node>
           <node concept="1Koe21" id="6MYr6JxnB0M" role="150oIE">
             <node concept="3VsKOn" id="6MYr6JxnB0N" role="1Koe22">
-              <ref role="3VsUkX" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+              <ref role="3VsUkX" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               <node concept="raruj" id="6MYr6JxnB0O" role="lGtFl" />
               <node concept="1ZhdrF" id="6MYr6JxnBgh" role="lGtFl">
                 <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1116615150612/1116615189566" />
@@ -16963,7 +16963,7 @@
           </node>
           <node concept="1Koe21" id="49L2l3F7Wp7" role="150oIE">
             <node concept="3uibUv" id="49L2l3F7WC9" role="1Koe22">
-              <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+              <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               <node concept="raruj" id="49L2l3F7WCe" role="lGtFl" />
             </node>
           </node>
@@ -16991,7 +16991,7 @@
                   </node>
                   <node concept="2c44tf" id="6MYr6Jxp5Pc" role="3JuZjQ">
                     <node concept="3uibUv" id="6MYr6Jxp5Pd" role="2c44tc">
-                      <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                      <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
                     </node>
                   </node>
                 </node>
@@ -17000,7 +17000,7 @@
           </node>
           <node concept="1Koe21" id="6MYr6Jxp5Pe" role="150oIE">
             <node concept="3uibUv" id="6MYr6Jxp5Pf" role="1Koe22">
-              <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+              <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               <node concept="raruj" id="6MYr6Jxp5Pg" role="lGtFl" />
               <node concept="29HgVG" id="6MYr6Jxp6cC" role="lGtFl">
                 <node concept="3NFfHV" id="6MYr6Jxp6cD" role="3NFExx">
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/actions.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/actions.mps
index 40eeb131..56a3b73e 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/actions.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/actions.mps
@@ -16,10 +16,10 @@
     <import index="inbo" ref="r:22db907b-8239-4180-8797-e91cea0b9573(jetbrains.mps.smodel.search)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
     <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
-    <import index="ie8e" ref="r:ab2605ab-b4bc-4e80-a8ca-19a4a8465c01(jetbrains.mps.logic.atom)" />
     <import index="hy7p" ref="r:01ee26d6-df00-4ffb-931c-1ddec5984886(jetbrains.mps.lang.typesystem2.util)" />
     <import index="i348" ref="r:42a15dec-83a9-4fe1-80d6-3bf898c512bd(jetbrains.mps.lang.typesystem2.template)" />
     <import index="vxmb" ref="r:3345f3eb-f61a-42bd-88eb-d9032a80e9a6(jetbrains.mps.lang.typesystem2.editor)" />
+    <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.treeform)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
   </imports>
   <registry>
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/jetbrains.mps.lang.typesystem2.runtime.msd b/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/jetbrains.mps.lang.typesystem2.runtime.msd
index e4a66193..8929fd29 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/jetbrains.mps.lang.typesystem2.runtime.msd
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/jetbrains.mps.lang.typesystem2.runtime.msd
@@ -9,7 +9,6 @@
   <dependencies>
     <dependency reexport="true">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)</dependency>
-    <dependency reexport="true">7526e0cf-1ce7-46f8-a555-9eca1e06c23b(jetbrains.mps.logic.atom)</dependency>
     <dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
     <dependency reexport="true">bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)</dependency>
     <dependency reexport="false">ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.typesystem2.template)</dependency>
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains/mps/lang/typesystem2/program.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains/mps/lang/typesystem2/program.mps
index 295bc087..64d40197 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains/mps/lang/typesystem2/program.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains/mps/lang/typesystem2/program.mps
@@ -18,8 +18,8 @@
     <import index="yg8f" ref="r:e213377a-f1a7-4ba7-9d08-96bcb97ed8ce(jetbrains.mps.logic.builtin)" />
     <import index="7n8k" ref="r:475a2e92-d7d4-41c3-98e3-172d70b6f018(jetbrains.mps.logic.builtin.program)" />
     <import index="cxk7" ref="r:daa544a7-0a5c-49c0-a54c-4c2a5b4868aa(jetbrains.mps.logic.builtin.predicate)" />
-    <import index="ie8e" ref="r:ab2605ab-b4bc-4e80-a8ca-19a4a8465c01(jetbrains.mps.logic.atom)" />
     <import index="psr6" ref="r:ce187d46-c94b-47d6-8d77-26aa6af239e8(jetbrains.mps.lang.typesystem2.type)" />
+    <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.treeform)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -3148,7 +3148,7 @@
         </node>
       </node>
       <node concept="3uibUv" id="4gW0vesTseu" role="3clF45">
-        <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+        <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
       </node>
       <node concept="3Tm1VV" id="1L74NXEx75C" role="1B3o_S" />
       <node concept="3clFbS" id="1L74NXEx75D" role="3clF47">
@@ -3223,7 +3223,7 @@
         </node>
       </node>
       <node concept="3uibUv" id="4gW0vesTEXg" role="3clF45">
-        <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+        <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
       </node>
       <node concept="3Tm1VV" id="1L74NXGis3F" role="1B3o_S" />
       <node concept="3clFbS" id="1L74NXGis3G" role="3clF47">
@@ -3287,7 +3287,7 @@
         <node concept="3bZ5Sz" id="1L74NXF7OB2" role="1tU5fm" />
       </node>
       <node concept="3uibUv" id="4gW0vesTFpY" role="3clF45">
-        <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+        <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
       </node>
       <node concept="3Tm1VV" id="1L74NXF7OB7" role="1B3o_S" />
       <node concept="3clFbS" id="1L74NXF7OB8" role="3clF47">
@@ -3525,7 +3525,7 @@
                 <property role="Xl_RC" value="Pattern" />
               </node>
               <node concept="3VsKOn" id="18kNIl0Glkd" role="37wK5m">
-                <ref role="3VsUkX" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+                <ref role="3VsUkX" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
               </node>
               <node concept="2OqwBi" id="18kNIl0Glke" role="37wK5m">
                 <node concept="37vLTw" id="18kNIl0Glkf" role="2Oq$k0">
@@ -3716,7 +3716,7 @@
         <property role="1EzhhJ" value="true" />
         <property role="TrG5h" value="typeTerm" />
         <node concept="3uibUv" id="4gW0vesT_Kt" role="3clF45">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
         <node concept="3Tm1VV" id="1L74NXETJCf" role="1B3o_S" />
         <node concept="3clFbS" id="1L74NXETJCg" role="3clF47" />
@@ -3732,7 +3732,7 @@
           </node>
         </node>
         <node concept="3uibUv" id="4gW0vesTEqs" role="3clF45">
-          <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="TreeForm" />
+          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
         </node>
         <node concept="3Tm1VV" id="1L74NXFPEk7" role="1B3o_S" />
         <node concept="3clFbS" id="1L74NXFPEk8" role="3clF47" />
diff --git a/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/jetbrains.mps.lang.typesystem2.template.msd b/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/jetbrains.mps.lang.typesystem2.template.msd
index 16e8982c..c35d27c0 100644
--- a/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/jetbrains.mps.lang.typesystem2.template.msd
+++ b/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/jetbrains.mps.lang.typesystem2.template.msd
@@ -13,7 +13,6 @@
     <dependency reexport="false">a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)</dependency>
     <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
-    <dependency reexport="false">7526e0cf-1ce7-46f8-a555-9eca1e06c23b(jetbrains.mps.logic.atom)</dependency>
     <dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
   </dependencies>
   <languageVersions>
diff --git a/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/models/jetbrains/mps/lang/typesystem2/template.mps b/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/models/jetbrains/mps/lang/typesystem2/template.mps
index 4afc9f75..cdb5cb86 100644
--- a/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/models/jetbrains/mps/lang/typesystem2/template.mps
+++ b/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/models/jetbrains/mps/lang/typesystem2/template.mps
@@ -14,7 +14,6 @@
     <import index="yg8f" ref="r:e213377a-f1a7-4ba7-9d08-96bcb97ed8ce(jetbrains.mps.logic.builtin)" />
     <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
-    <import index="ie8e" ref="r:ab2605ab-b4bc-4e80-a8ca-19a4a8465c01(jetbrains.mps.logic.atom)" />
     <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
     <import index="ouhv" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang.annotation(JDK/)" />
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
@@ -23,6 +22,7 @@
     <import index="rchb" ref="r:f43ee4a0-488a-425a-87a0-594ab3b0d15f(jetbrains.mps.logic.reactor.program)" />
     <import index="omn0" ref="r:4e44cb56-a834-45de-a0c4-c49a5c86e78e(jetbrains.mps.logic.builtin.solver)" />
     <import index="nz6g" ref="r:ac00f724-30be-446e-805c-2345efc460d7(jetbrains.mps.lang.typesystem2.program)" />
+    <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.treeform)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">