From 4ce08f4b990f167cae6ad590d8f6e9b6c9ca082f Mon Sep 17 00:00:00 2001
From: Fedor Isakov <fisakov@gmail.com>
Date: Wed, 3 Jul 2024 14:20:15 +0200
Subject: [PATCH] Refactor project structure and reduce the number of modules

---
 .mps/modules.xml                              |   10 +-
 build.xml                                     |  992 +++++-----------
 .../jetbrains.mps.devkit.aspect.types.devkit  |    2 +
 .../generator/template/main@generator.mps     |  704 ++++++------
 .../jetbrains.mps.lang.coderules.mpl          |   15 +-
 .../languageModels/behavior.mps               |    6 -
 .../languageModels/constraints.mps            |   47 +-
 .../languageModels/editor.mps                 |    5 -
 .../languageModels/findUsages.mps             |    1 -
 .../languageModels/intentions.mps             |    2 -
 .../languageModels/migration.mps              |   99 +-
 .../languageModels/plugin.mps                 |    5 +-
 .../languageModels/typesystem.mps             |   36 +-
 .../languageModels/util.mps                   |   10 +-
 .../jetbrains.mps.lang.coderules.runtime.msd  |   10 +-
 .../jetbrains.mps.lang.coderules.aspect.mps   |   11 +-
 .../jetbrains.mps.lang.coderules.eval.mps     |  508 ++++-----
 ...jetbrains.mps.lang.coderules.memoizer.mps} |    2 +-
 ...etbrains.mps.lang.coderules.predicate.mps} |   95 +-
 .../jetbrains.mps.lang.coderules.program.mps  |  574 +++++-----
 .../jetbrains.mps.lang.coderules.result.mps}  |    3 +-
 .../jetbrains.mps.lang.coderules.template.mps |   60 +-
 .../jetbrains.mps.lang.coderules.terms.mps    |  119 +-
 .../models/behavior.mps                       |    4 +-
 ...ng.types.generator.templates@generator.mps |   10 +-
 .../jetbrains.mps.lang.types.mpl              |    6 +-
 .../generator/template/main@generator.mps     |   78 +-
 .../jetbrains.mps.logic.mpl                   |   11 +-
 .../languageModels/behavior.mps               |   16 +-
 .../languageModels/editor.mps                 |   55 -
 .../languageModels/migration.mps              |    2 +-
 .../languageModels/typesystem.mps             |   28 +-
 .../runtime/jetbrains.mps.logic.runtime.msd   |    5 +-
 .../models/jetbrains.mps.logic.dataform.mps   |   48 +-
 .../jetbrains.mps.logic.unification.mps       |   94 +-
 .../jetbrains.mps.typechecking.testlang.mpl   |   13 +-
 .../models/types.mps                          |    1 -
 .../models/jetbrains.mps.coderules.build.mps  | 1001 +++++++----------
 .../jetbrains.mps.coderules.test.msd          |    5 +-
 .../jetbrains.mps.coderules.aspect@tests.mps  |   74 +-
 .../jetbrains.mps.coderules.testhelper.msd    |    8 -
 ...ains.mps.coderules.testhelper.testutil.mps |  130 +--
 ...brains.mps.coderules.typechecking.test.msd |   30 +-
 ...tbrains.mps.coderules.scheduling@tests.mps |    1 -
 ...rains.mps.coderules.typechecking@tests.mps |  154 ++-
 .../jetbrains.mps.coderules.typechecking.msd  |    9 +-
 ...ains.mps.coderules.typechecking.plugin.mps |   94 +-
 ...ins.mps.coderules.typechecking.service.mps |  159 ++-
 .../jetbrains.mps.coderules.ui.msd            |    7 +-
 .../models/plugin.mps                         |   36 +-
 .../jetbrains.mps.coderules.msd               |    5 +-
 .../models/jetbrains.mps.coderules.mps        |   10 +-
 .../jetbrains.mps.coderules/models/plugin.mps |   50 +-
 .../models/service.mps                        |  162 +--
 .../jetbrains.mps.lang.coderules.template.msd |   32 +-
 ...etbrains.mps.lang.typechecking.runtime.msd |    5 +-
 ...jetbrains.mps.lang.typechecking.aspect.mps |   19 +-
 .../jetbrains.mps.logic.test.msd              |    5 +-
 .../mps/logic/test/logical@tests.mps          |  614 +++++-----
 .../jetbrains/mps/logic/test/unification.mps  |   16 +-
 .../mps/logic/test/unification@tests.mps      |  602 +++++-----
 samples/fitch/build.xml                       |   41 +-
 .../models/types.mps                          |    1 -
 .../samples.fitch.firstOrderLogic.mpl         |    4 -
 .../models/types.mps                          |    1 -
 .../samples.fitch.herbrandLogic.mpl           |    4 -
 .../models/types.mps                          |    1 -
 .../samples.fitch.propositionalLogic.mpl      |    4 -
 .../languages/samples.fitch/models/types.mps  |    1 -
 .../languages/samples.fitch/samples.fitch.mpl |   24 +-
 .../models/samples.fitch.build.mps            |   19 +-
 samples/lambdacalc/build.xml                  |   14 -
 .../samples.lambdacalc/models/types.mps       |    9 +-
 .../samples.lambdacalc/samples.lambdacalc.mpl |    7 +-
 .../models/samples.lamdacalc.build.mps        |   25 +-
 samples/mpscore/build.xml                     |  550 ++++-----
 .../jetbrains.mps.baseLanguage.javadocExt.mpl |   47 +-
 ...ains.mps.baseLanguage.javadocExt.types.mps |    1 +
 .../jetbrains.mps.baseLanguageExt.mpl         |   14 +-
 .../jetbrains.mps.baseLanguageExt.types.mps   |  104 +-
 .../jetbrains.mps.baseLanguageInternalExt.mpl |   13 +-
 .../jetbrains.mps.lang.coderulesExt.mpl       |    5 +-
 .../jetbrains.mps.lang.coderulesExt.types.mps |   10 +-
 .../jetbrains.mps.lang.smodelExt.mpl          |    7 +-
 .../jetbrains.mps.lang.smodelExt.types.mps    |    3 -
 .../jetbrains.mps.logicExt.mpl                |    5 +-
 .../models/jetbrains.mps.logicExt.types.mps   |   22 +-
 ....baseLanguage.methodReferencesExt.test.msd |    4 -
 .../jetbrains.mps.baseLanguageExt.test.msd    |   17 +-
 ...baseLanguageExt.test.incremental@tests.mps |   34 +-
 ...s.mps.baseLanguageExt.test.types@tests.mps |  162 +--
 .../jetbrains.mps.lang.smodelExt.test.msd     |    7 +-
 ...ins.mps.lang.smodelExt.test.code@tests.mps |    2 +-
 ...ns.mps.lang.smodelExt.test.types@tests.mps |   21 +-
 .../models/samples.mpscore.build.mps          |  166 +--
 95 files changed, 3476 insertions(+), 4788 deletions(-)
 rename coderules/{solutions/jetbrains.mps.lang.coderules.template => languages/jetbrains.mps.lang.coderules/runtime}/models/jetbrains.mps.lang.coderules.aspect.mps (99%)
 rename coderules/{solutions/jetbrains.mps.coderules.runtime/models/jetbrains.mps.coderules.runtime.memoizer.mps => languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.memoizer.mps} (99%)
 rename coderules/languages/{jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.predicate.mps => jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.predicate.mps} (99%)
 rename coderules/{solutions/jetbrains.mps.coderules.runtime/models/jetbrains.mps.coderules.runtime.result.mps => languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.result.mps} (99%)
 rename coderules/{solutions/jetbrains.mps.lang.coderules.template => languages/jetbrains.mps.lang.coderules/runtime}/models/jetbrains.mps.lang.coderules.template.mps (99%)

diff --git a/.mps/modules.xml b/.mps/modules.xml
index ca30989d..a732ceab 100644
--- a/.mps/modules.xml
+++ b/.mps/modules.xml
@@ -7,13 +7,12 @@
       <modulePath path="$PROJECT_DIR$/coderules/languages/jetbrains.mps.lang.coderules/runtime/jetbrains.mps.lang.coderules.runtime.msd" folder="coderules.lang" />
       <modulePath path="$PROJECT_DIR$/coderules/languages/jetbrains.mps.lang.typechecking/jetbrains.mps.lang.typechecking.mpl" folder="typechecking.lang" />
       <modulePath path="$PROJECT_DIR$/coderules/languages/jetbrains.mps.lang.types/jetbrains.mps.lang.types.mpl" folder="typechecking.lang" />
-      <modulePath path="$PROJECT_DIR$/coderules/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl" folder="coderules.lang" />
-      <modulePath path="$PROJECT_DIR$/coderules/languages/jetbrains.mps.logic/runtime/jetbrains.mps.logic.runtime.msd" folder="coderules.lang" />
+      <modulePath path="$PROJECT_DIR$/coderules/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl" folder="coderules.lang.logic" />
+      <modulePath path="$PROJECT_DIR$/coderules/languages/jetbrains.mps.logic/runtime/jetbrains.mps.logic.runtime.msd" folder="coderules.lang.logic" />
       <modulePath path="$PROJECT_DIR$/coderules/languages/jetbrains.mps.typechecking.annotation/jetbrains.mps.typechecking.annotation.mpl" folder="typechecking.annotation" />
       <modulePath path="$PROJECT_DIR$/coderules/languages/jetbrains.mps.typechecking.testlang/jetbrains.mps.typechecking.testlang.mpl" folder="typechecking.test" />
       <modulePath path="$PROJECT_DIR$/coderules/solutions/jetbrains.mps.coderules.build/jetbrains.mps.coderules.build.msd" folder="coderules.build" />
       <modulePath path="$PROJECT_DIR$/coderules/solutions/jetbrains.mps.coderules.ideaplugin/jetbrains.mps.coderules.ideaplugin.msd" folder="typechecking" />
-      <modulePath path="$PROJECT_DIR$/coderules/solutions/jetbrains.mps.coderules.runtime/jetbrains.mps.coderules.runtime.msd" folder="coderules" />
       <modulePath path="$PROJECT_DIR$/coderules/solutions/jetbrains.mps.coderules.test/jetbrains.mps.coderules.test.msd" folder="coderules.test" />
       <modulePath path="$PROJECT_DIR$/coderules/solutions/jetbrains.mps.coderules.testhelper/jetbrains.mps.coderules.testhelper.msd" folder="typechecking.test" />
       <modulePath path="$PROJECT_DIR$/coderules/solutions/jetbrains.mps.coderules.typechecking.test/jetbrains.mps.coderules.typechecking.test.msd" folder="typechecking.test" />
@@ -23,8 +22,8 @@
       <modulePath path="$PROJECT_DIR$/coderules/solutions/jetbrains.mps.coderules/jetbrains.mps.coderules.msd" folder="coderules" />
       <modulePath path="$PROJECT_DIR$/coderules/solutions/jetbrains.mps.lang.coderules.template/jetbrains.mps.lang.coderules.template.msd" folder="coderules.lang" />
       <modulePath path="$PROJECT_DIR$/coderules/solutions/jetbrains.mps.lang.typechecking.runtime/jetbrains.mps.lang.typechecking.runtime.msd" folder="typechecking.lang" />
-      <modulePath path="$PROJECT_DIR$/coderules/solutions/jetbrains.mps.logic.reactor/jetbrains.mps.logic.reactor.msd" folder="coderules.lang" />
-      <modulePath path="$PROJECT_DIR$/coderules/solutions/jetbrains.mps.logic.test/jetbrains.mps.logic.test.msd" folder="coderules.lang" />
+      <modulePath path="$PROJECT_DIR$/coderules/solutions/jetbrains.mps.logic.reactor/jetbrains.mps.logic.reactor.msd" folder="coderules.lang.logic" />
+      <modulePath path="$PROJECT_DIR$/coderules/solutions/jetbrains.mps.logic.test/jetbrains.mps.logic.test.msd" folder="coderules.lang.logic" />
       <modulePath path="$PROJECT_DIR$/samples/fitch/languages/samples.fitch.firstOrderLogic/samples.fitch.firstOrderLogic.mpl" folder="samples.fitch" />
       <modulePath path="$PROJECT_DIR$/samples/fitch/languages/samples.fitch.herbrandLogic/samples.fitch.herbrandLogic.mpl" folder="samples.fitch" />
       <modulePath path="$PROJECT_DIR$/samples/fitch/languages/samples.fitch.propositionalLogic/samples.fitch.propositionalLogic.mpl" folder="samples.fitch" />
@@ -62,6 +61,7 @@
       <modulePath path="$PROJECT_DIR$/samples/mpscore/languages/jetbrains.mps.logicExt/jetbrains.mps.logicExt.mpl" folder="samples.mpscore.ext.coderulesExt" />
       <modulePath path="$PROJECT_DIR$/samples/mpscore/solutions/jetbrains.mps.baseLanguage.closuresExt.test/jetbrains.mps.baseLanguage.closuresExt.test.msd" folder="samples.mpscore.ext.baseLanguage" />
       <modulePath path="$PROJECT_DIR$/samples/mpscore/solutions/jetbrains.mps.baseLanguage.collectionsExt.test/jetbrains.mps.baseLanguage.collectionsExt.test.msd" folder="samples.mpscore.ext.baseLanguage" />
+      <modulePath path="$PROJECT_DIR$/samples/mpscore/solutions/jetbrains.mps.baseLanguage.methodReferencesExt.test/jetbrains.mps.baseLanguage.methodReferencesExt.test.msd" folder="samples.mpscore.ext.baseLanguage" />
       <modulePath path="$PROJECT_DIR$/samples/mpscore/solutions/jetbrains.mps.baseLanguage.tuplesExt.test/jetbrains.mps.baseLanguage.tuplesExt.test.msd" folder="samples.mpscore.ext.baseLanguage" />
       <modulePath path="$PROJECT_DIR$/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/jetbrains.mps.baseLanguageExt.test.msd" folder="samples.mpscore.ext.baseLanguage" />
       <modulePath path="$PROJECT_DIR$/samples/mpscore/solutions/jetbrains.mps.lang.smodelExt/jetbrains.mps.lang.smodelExt.test.msd" folder="samples.mpscore.ext.smodel" />
diff --git a/build.xml b/build.xml
index 725d3709..ca4c2784 100644
--- a/build.xml
+++ b/build.xml
@@ -89,6 +89,7 @@
           <module ref="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" kind="cl" />
           <module ref="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" kind="cl" />
           <module ref="c4803b19-6d89-4a3b-bf82-390769514add(jetbrains.mps.lang.coderules)" kind="cl" />
+          <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="cl" />
           <module ref="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" kind="cl" />
           <module ref="528ff3b9-5fc4-40dd-931f-c6ce3650640e(jetbrains.mps.lang.migration.runtime)" kind="cl" />
           <module ref="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" kind="cl" />
@@ -181,8 +182,10 @@
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
           <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" kind="cl" />
           <module ref="5f9babc9-8d5d-4825-8e61-17b241ee6272(jetbrains.mps.baseLanguage.collections#1151699677197)" kind="cl" />
+          <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="cl" />
           <module ref="35320f26-77cb-4c55-be9f-a97a27770af1(jetbrains.mps.logic)" kind="cl" />
           <module ref="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" kind="cl" />
+          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="cl" />
         </dependencies>
         <uses>
           <language id="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" />
@@ -277,15 +280,14 @@
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" kind="rt" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
           <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" kind="cl" />
+          <module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" kind="cl" />
           <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" kind="cl" />
-          <module ref="f113d56b-63e3-4120-a89c-2f5dcb8c6290(jetbrains.mps.coderules.runtime)" kind="cl" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="cl" />
           <module ref="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" kind="cl" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="cl" />
         </dependencies>
         <uses>
           <language id="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" />
-          <language id="l:774bf8a0-62e5-41e1-af63-f4812e60e48b:jetbrains.mps.baseLanguage.checkedDots" />
           <language id="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" />
           <language id="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" />
           <language id="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" />
@@ -303,7 +305,7 @@
     </echoxml>
     <jar destfile="${build.layout}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.runtime.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
-      <fileset dir="${basedir}/coderules/languages/jetbrains.mps.logic/runtime" includes="icons/**, resources/**" />
+      <fileset dir="${basedir}/coderules/solutions/jetbrains.mps.logic.reactor" includes="icons/**, resources/**" />
       <fileset dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.logic/runtime/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.logic.runtime.jar" />
     </jar>
@@ -337,12 +339,13 @@
           <module ref="6ef0db41-d3b2-47fe-82ac-d55a42cb6b13(jetbrains.mps.baseLanguage.unitTest.runtime)" kind="rt" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" kind="rt" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" kind="rt" />
-          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="rt" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
           <module ref="63b449db-0918-4a4a-a891-2c430ab133e4(org.junit.junit5)" kind="rt" />
           <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" kind="cl" />
           <module ref="49808fad-9d41-4b96-83fa-9231640f6b2b(JUnit)" kind="cl" />
+          <module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" kind="cl" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="cl" />
+          <module ref="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" kind="cl" />
           <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="cl" />
         </dependencies>
         <uses>
@@ -418,7 +421,6 @@
           <module ref="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" kind="rt" />
           <module ref="3330376f-82a0-45ed-ae50-a320ee8b0b63(jetbrains.mps.lang.script.rt)" kind="rt" />
           <module ref="31f56055-9d30-42b3-a2b1-fb3f554d7075(jetbrains.mps.lang.smodel.query.runtime)" kind="rt" />
-          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="rt" />
           <module ref="a1250a4d-c090-42c3-ad7c-d298a3357dd4(jetbrains.mps.make.runtime)" kind="rt" />
           <module ref="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" kind="rt" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
@@ -431,10 +433,8 @@
           <module ref="34e84b8f-afa8-4364-abcd-a279fddddbe7(jetbrains.mps.editor.runtime)" kind="cl" />
           <module ref="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" kind="cl" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="cl" />
-          <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" kind="cl" />
           <module ref="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" kind="cl" />
           <module ref="f4ad079d-bc71-4ffb-9600-9328705cf998(jetbrains.mps.lang.descriptor)" kind="cl" />
-          <module ref="528ff3b9-5fc4-40dd-931f-c6ce3650640e(jetbrains.mps.lang.migration.runtime)" kind="cl" />
           <module ref="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" kind="cl" />
           <module ref="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" kind="cl" />
           <module ref="35320f26-77cb-4c55-be9f-a97a27770af1(jetbrains.mps.logic)" kind="cl" />
@@ -531,14 +531,12 @@
           <module ref="d44dab97-aaac-44cb-9745-8a14db674c03(jetbrains.mps.baseLanguage.tuples.runtime)" kind="rt" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" kind="rt" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" kind="rt" />
-          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="rt" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
           <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" kind="cl" />
           <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" kind="cl" />
           <module ref="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" kind="cl" />
           <module ref="c4803b19-6d89-4a3b-bf82-390769514add(jetbrains.mps.lang.coderules)" kind="cl" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="cl" />
-          <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" kind="cl" />
           <module ref="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" kind="cl" />
           <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="cl" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="cl" />
@@ -609,15 +607,14 @@
           <module ref="d44dab97-aaac-44cb-9745-8a14db674c03(jetbrains.mps.baseLanguage.tuples.runtime)" kind="rt" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" kind="rt" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" kind="rt" />
-          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="rt" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
           <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" kind="cl" />
           <module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" kind="cl" />
           <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" kind="cl" />
-          <module ref="f113d56b-63e3-4120-a89c-2f5dcb8c6290(jetbrains.mps.coderules.runtime)" kind="cl" />
-          <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" kind="cl" />
           <module ref="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" kind="cl" />
+          <module ref="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" kind="cl" />
           <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="cl" />
+          <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="cl" />
         </dependencies>
         <uses>
           <language id="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" />
@@ -657,111 +654,6 @@
       <zipfileset file="${basedir}/coderules/languages/jetbrains.mps.lang.coderules/runtime/jetbrains.mps.lang.coderules.runtime.msd" prefix="module" />
       <zipfileset dir="${build.tmp}/customProcessors/copyModels/coderules-languages-jetbrains.mps.lang.coderules-runtime-models" prefix="module/models" />
     </jar>
-    <mkdir dir="${build.tmp}/default/jetbrains.mps.lang.coderules.template.jar" />
-    <mkdir dir="${build.tmp}/default/jetbrains.mps.lang.coderules.template.jar/META-INF" />
-    <echoxml file="${build.tmp}/default/jetbrains.mps.lang.coderules.template.jar/META-INF/module.xml">
-      <module namespace="jetbrains.mps.lang.coderules.template" type="solution" uuid="ff6372a2-2f45-4ec3-952b-02581666015f">
-        <dependencies>
-          <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" kind="rt" />
-          <module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" kind="rt" />
-          <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" kind="rt" />
-          <module ref="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" kind="rt" />
-          <module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" kind="rt" />
-          <module ref="a3e4657f-a76c-45bb-bbda-c764596ecc65(jetbrains.mps.baseLanguage.logging.runtime)" kind="rt" />
-          <module ref="52b81ac7-93fd-4e9e-b972-4995882da6d4(jetbrains.mps.baseLanguage.references.runtime)" kind="rt" />
-          <module ref="23949432-aaff-4c03-b7da-26e4e956ccea(jetbrains.mps.baseLanguage.regexp.runtime)" kind="rt" />
-          <module ref="d44dab97-aaac-44cb-9745-8a14db674c03(jetbrains.mps.baseLanguage.tuples.runtime)" kind="rt" />
-          <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" kind="rt" />
-          <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" kind="rt" />
-          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="rt" />
-          <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
-          <module ref="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" kind="cl" />
-          <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" kind="cl" />
-          <module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" kind="cl" />
-          <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" kind="cl" />
-          <module ref="f113d56b-63e3-4120-a89c-2f5dcb8c6290(jetbrains.mps.coderules.runtime)" kind="cl" />
-          <module ref="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" kind="cl" />
-          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="cl" />
-        </dependencies>
-        <uses>
-          <language id="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" />
-          <language id="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" />
-          <language id="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" />
-          <language id="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" />
-          <language id="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" />
-          <language id="l:daafa647-f1f7-4b0b-b096-69cd7c8408c0:jetbrains.mps.baseLanguage.regexp" />
-          <language id="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" />
-          <language id="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" />
-          <language id="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" />
-          <language id="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" />
-        </uses>
-        <classpath>
-          <entry path="." />
-        </classpath>
-        <sources jar="jetbrains.mps.lang.coderules.template-src.jar" descriptor="jetbrains.mps.lang.coderules.template.msd" />
-      </module>
-    </echoxml>
-    <jar destfile="${build.layout}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.template.jar" duplicate="preserve">
-      <fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.coderules.template" />
-      <fileset dir="${basedir}/coderules/solutions/jetbrains.mps.lang.coderules.template" includes="icons/**, resources/**" />
-      <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.lang.coderules.template/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
-      <fileset dir="${build.tmp}/default/jetbrains.mps.lang.coderules.template.jar" />
-    </jar>
-    <copyModels todir="${build.tmp}/customProcessors/copyModels/coderules-solutions-jetbrains.mps.lang.coderules.template-models">
-      <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.lang.coderules.template/models" includes="**/*.mps, **/*.mpsr, **/.model" />
-    </copyModels>
-    <jar destfile="${build.layout}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.template-src.jar" duplicate="preserve">
-      <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.lang.coderules.template/source_gen">
-        <exclude name="**/trace.info" />
-        <exclude name="**/exports" />
-        <exclude name="**/checkpoints" />
-        <exclude name="**/*.mps" />
-      </fileset>
-      <zipfileset file="${basedir}/coderules/solutions/jetbrains.mps.lang.coderules.template/jetbrains.mps.lang.coderules.template.msd" prefix="module" />
-      <zipfileset dir="${build.tmp}/customProcessors/copyModels/coderules-solutions-jetbrains.mps.lang.coderules.template-models" prefix="module/models" />
-    </jar>
-    <mkdir dir="${build.tmp}/default/jetbrains.mps.coderules.runtime.jar" />
-    <mkdir dir="${build.tmp}/default/jetbrains.mps.coderules.runtime.jar/META-INF" />
-    <echoxml file="${build.tmp}/default/jetbrains.mps.coderules.runtime.jar/META-INF/module.xml">
-      <module namespace="jetbrains.mps.coderules.runtime" type="solution" uuid="f113d56b-63e3-4120-a89c-2f5dcb8c6290">
-        <dependencies>
-          <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" kind="rt" />
-          <module ref="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" kind="rt" />
-          <module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" kind="rt" />
-          <module ref="52b81ac7-93fd-4e9e-b972-4995882da6d4(jetbrains.mps.baseLanguage.references.runtime)" kind="rt" />
-          <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" kind="cl" />
-          <module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" kind="cl" />
-        </dependencies>
-        <uses>
-          <language id="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" />
-          <language id="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" />
-          <language id="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" />
-        </uses>
-        <classpath>
-          <entry path="." />
-        </classpath>
-        <sources jar="jetbrains.mps.coderules.runtime-src.jar" descriptor="jetbrains.mps.coderules.runtime.msd" />
-      </module>
-    </echoxml>
-    <jar destfile="${build.layout}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.runtime.jar" duplicate="preserve">
-      <fileset dir="${build.tmp}/java/out/jetbrains.mps.coderules.runtime" />
-      <fileset dir="${basedir}/coderules/solutions/jetbrains.mps.coderules.runtime" includes="icons/**, resources/**" />
-      <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.runtime/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
-      <fileset dir="${build.tmp}/default/jetbrains.mps.coderules.runtime.jar" />
-    </jar>
-    <copyModels todir="${build.tmp}/customProcessors/copyModels/coderules-solutions-jetbrains.mps.coderules.runtime-models">
-      <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.runtime/models" includes="**/*.mps, **/*.mpsr, **/.model" />
-    </copyModels>
-    <jar destfile="${build.layout}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.runtime-src.jar" duplicate="preserve">
-      <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.runtime/source_gen">
-        <exclude name="**/trace.info" />
-        <exclude name="**/exports" />
-        <exclude name="**/checkpoints" />
-        <exclude name="**/*.mps" />
-      </fileset>
-      <zipfileset file="${basedir}/coderules/solutions/jetbrains.mps.coderules.runtime/jetbrains.mps.coderules.runtime.msd" prefix="module" />
-      <zipfileset dir="${build.tmp}/customProcessors/copyModels/coderules-solutions-jetbrains.mps.coderules.runtime-models" prefix="module/models" />
-    </jar>
     <mkdir dir="${build.tmp}/default/jetbrains.mps.coderules.jar" />
     <mkdir dir="${build.tmp}/default/jetbrains.mps.coderules.jar/META-INF" />
     <echoxml file="${build.tmp}/default/jetbrains.mps.coderules.jar/META-INF/module.xml">
@@ -785,10 +677,11 @@
           <module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" kind="cl" />
           <module ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" kind="cl" />
           <module ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" kind="cl" />
-          <module ref="f113d56b-63e3-4120-a89c-2f5dcb8c6290(jetbrains.mps.coderules.runtime)" kind="cl" />
           <module ref="6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.coderules.typechecking)" kind="cl" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="cl" />
           <module ref="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" kind="cl" />
+          <module ref="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" kind="cl" />
+          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="cl" />
         </dependencies>
         <uses>
           <language id="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" />
@@ -860,6 +753,7 @@
           <module ref="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c(jetbrains.mps.coderules)" kind="cl" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="cl" />
           <module ref="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" kind="cl" />
+          <module ref="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" kind="cl" />
           <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="cl" />
         </dependencies>
         <uses>
@@ -924,17 +818,13 @@
           <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" kind="cl" />
           <module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" kind="cl" />
           <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" kind="cl" />
-          <module ref="f113d56b-63e3-4120-a89c-2f5dcb8c6290(jetbrains.mps.coderules.runtime)" kind="cl" />
           <module ref="6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.coderules.typechecking)" kind="cl" />
           <module ref="c4803b19-6d89-4a3b-bf82-390769514add(jetbrains.mps.lang.coderules)" kind="cl" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="cl" />
-          <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" kind="cl" />
           <module ref="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" kind="cl" />
-          <module ref="8585453e-6bfb-4d80-98de-b16074f1d86c(jetbrains.mps.lang.test)" kind="cl" />
           <module ref="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" kind="cl" />
           <module ref="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" kind="cl" />
           <module ref="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" kind="cl" />
-          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="cl" />
         </dependencies>
         <uses>
           <language id="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" />
@@ -998,8 +888,9 @@
           <module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" kind="cl" />
           <module ref="6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.coderules.typechecking)" kind="cl" />
           <module ref="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" kind="cl" />
-          <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" kind="cl" />
           <module ref="707c4fde-f79a-44b5-b3d7-b5cef8844ccf(jetbrains.mps.lang.test.runtime)" kind="cl" />
+          <module ref="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" kind="cl" />
+          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="cl" />
           <module ref="63b449db-0918-4a4a-a891-2c430ab133e4(org.junit.junit5)" kind="cl" />
         </dependencies>
         <uses>
@@ -1170,9 +1061,7 @@
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" kind="rt" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" kind="rt" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="rt" />
-          <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" kind="rt" />
           <module ref="31f56055-9d30-42b3-a2b1-fb3f554d7075(jetbrains.mps.lang.smodel.query.runtime)" kind="rt" />
-          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="rt" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
           <module ref="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" kind="cl" />
           <module ref="6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.coderules.typechecking)" kind="cl" />
@@ -1248,8 +1137,9 @@
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" kind="rt" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" kind="rt" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
+          <module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" kind="cl" />
           <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" kind="cl" />
-          <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" kind="cl" />
+          <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="cl" />
           <module ref="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" kind="cl" />
         </dependencies>
         <uses>
@@ -1325,7 +1215,7 @@
           <module ref="31f56055-9d30-42b3-a2b1-fb3f554d7075(jetbrains.mps.lang.smodel.query.runtime)" kind="rt" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
           <module ref="f159adf4-3c93-40f9-9c5a-1f245a8697af(jetbrains.mps.lang.aspect)" kind="cl" />
-          <module ref="c4803b19-6d89-4a3b-bf82-390769514add(jetbrains.mps.lang.coderules)" kind="cl" />
+          <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="cl" />
           <module ref="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" kind="cl" />
           <module ref="f4ad079d-bc71-4ffb-9600-9328705cf998(jetbrains.mps.lang.descriptor)" kind="cl" />
           <module ref="86ef8290-12bb-4ca7-947f-093788f263a9(jetbrains.mps.lang.project)" kind="cl" />
@@ -1407,7 +1297,7 @@
           <module ref="31f56055-9d30-42b3-a2b1-fb3f554d7075(jetbrains.mps.lang.smodel.query.runtime)" kind="rt" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
           <module ref="e45a8b22-94f2-427f-b849-77f254c4eef5(jetbrains.mps.lang.aspect#3274906159125927726)" kind="cl" />
-          <module ref="21d5540d-cd6b-44dd-b6ab-6835bf032803(jetbrains.mps.lang.coderules#4578927328670739933)" kind="cl" />
+          <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="cl" />
           <module ref="3ac18869-0828-4401-abad-822a47bf83f1(jetbrains.mps.lang.descriptor#9020561928507175817)" kind="cl" />
           <module ref="86ef8290-12bb-4ca7-947f-093788f263a9(jetbrains.mps.lang.project)" kind="cl" />
           <module ref="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462(jetbrains.mps.lang.typechecking)" kind="cl" />
@@ -1550,16 +1440,14 @@
           <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" kind="cl" />
           <module ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" kind="cl" />
           <module ref="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c(jetbrains.mps.coderules)" kind="cl" />
-          <module ref="f113d56b-63e3-4120-a89c-2f5dcb8c6290(jetbrains.mps.coderules.runtime)" kind="cl" />
           <module ref="4d5d9aa1-7b71-4888-9100-1b793e5328a6(jetbrains.mps.coderules.ui)" kind="cl" />
           <module ref="bfbdd672-7ff5-403f-af4f-16da5226f34c(jetbrains.mps.findUsages.runtime)" kind="cl" />
           <module ref="019b622b-0aef-4dd3-86d0-4eef01f3f6bb(jetbrains.mps.ide)" kind="cl" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="cl" />
-          <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" kind="cl" />
           <module ref="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" kind="cl" />
           <module ref="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" kind="cl" />
           <module ref="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" kind="cl" />
-          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="cl" />
+          <module ref="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" kind="cl" />
           <module ref="a1250a4d-c090-42c3-ad7c-d298a3357dd4(jetbrains.mps.make.runtime)" kind="cl" />
           <module ref="0b80a2e8-f9f1-47b3-823f-56eb115bca42(jetbrains.mps.typechecking.annotation)" kind="cl" />
         </dependencies>
@@ -1576,10 +1464,8 @@
           <language id="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" />
           <language id="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" />
           <language id="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" />
-          <language id="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" />
           <language id="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" />
           <language id="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" />
-          <language id="l:0b80a2e8-f9f1-47b3-823f-56eb115bca42:jetbrains.mps.typechecking.annotation" />
         </uses>
         <classpath>
           <entry path="." />
@@ -1629,7 +1515,6 @@
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" kind="rt" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" kind="rt" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="rt" />
-          <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" kind="rt" />
           <module ref="8e98f4e2-decf-4e97-bf80-9109e8b759ee(jetbrains.mps.lang.constraints.rules.runtime)" kind="rt" />
           <module ref="9e9ef4e2-decf-4e97-bf80-9109e8b759bb(jetbrains.mps.lang.feedback.api)" kind="rt" />
           <module ref="3f98f4e2-decf-4e97-bf80-9109e8b759ab(jetbrains.mps.lang.feedback.problem.rt)" kind="rt" />
@@ -1639,15 +1524,13 @@
           <module ref="3330376f-82a0-45ed-ae50-a320ee8b0b63(jetbrains.mps.lang.script.rt)" kind="rt" />
           <module ref="31f56055-9d30-42b3-a2b1-fb3f554d7075(jetbrains.mps.lang.smodel.query.runtime)" kind="rt" />
           <module ref="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" kind="rt" />
-          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="rt" />
           <module ref="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" kind="rt" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
           <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" kind="cl" />
           <module ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)" kind="cl" />
           <module ref="6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.coderules.typechecking)" kind="cl" />
           <module ref="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" kind="cl" />
-          <module ref="afc17aaf-3a3d-4d69-a38d-db90d5e858c6(jetbrains.mps.lang.types)" kind="cl" />
-          <module ref="3a1f0f04-b5e0-43be-884e-b856bfdeca21(jetbrains.mps.typechecking.testlang)" kind="cl" />
+          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="cl" />
         </dependencies>
         <uses>
           <language id="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" />
@@ -1839,24 +1722,16 @@
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" kind="rt" />
           <module ref="e55e6749-03cb-4ea7-9695-2322bab791c1(jetbrains.mps.lang.test.matcher)" kind="rt" />
           <module ref="707c4fde-f79a-44b5-b3d7-b5cef8844ccf(jetbrains.mps.lang.test.runtime)" kind="rt" />
-          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="rt" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
           <module ref="63b449db-0918-4a4a-a891-2c430ab133e4(org.junit.junit5)" kind="rt" />
           <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" kind="cl" />
           <module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" kind="cl" />
           <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" kind="cl" />
-          <module ref="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" kind="cl" />
           <module ref="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c(jetbrains.mps.coderules)" kind="cl" />
-          <module ref="f113d56b-63e3-4120-a89c-2f5dcb8c6290(jetbrains.mps.coderules.runtime)" kind="cl" />
-          <module ref="02473356-2f59-4de1-ba87-e88f9d606180(jetbrains.mps.coderules.testhelper)" kind="cl" />
           <module ref="6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.coderules.typechecking)" kind="cl" />
           <module ref="f9bad4b1-59da-4f20-8feb-9f4cc4ad872e(jetbrains.mps.coderules.typechecking.testlang.sandbox)" kind="cl" />
-          <module ref="c4803b19-6d89-4a3b-bf82-390769514add(jetbrains.mps.lang.coderules)" kind="cl" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="cl" />
-          <module ref="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" kind="cl" />
-          <module ref="8585453e-6bfb-4d80-98de-b16074f1d86c(jetbrains.mps.lang.test)" kind="cl" />
           <module ref="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" kind="cl" />
-          <module ref="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" kind="cl" />
           <module ref="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" kind="cl" />
           <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="cl" />
           <module ref="b189d6c6-9397-4d64-88af-1ac73760a4f5(jetbrains.mps.logic.test)" kind="cl" />
@@ -1926,7 +1801,6 @@
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" kind="rt" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" kind="rt" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="rt" />
-          <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" kind="rt" />
           <module ref="8e98f4e2-decf-4e97-bf80-9109e8b759ee(jetbrains.mps.lang.constraints.rules.runtime)" kind="rt" />
           <module ref="9e9ef4e2-decf-4e97-bf80-9109e8b759bb(jetbrains.mps.lang.feedback.api)" kind="rt" />
           <module ref="3f98f4e2-decf-4e97-bf80-9109e8b759ab(jetbrains.mps.lang.feedback.problem.rt)" kind="rt" />
@@ -1935,7 +1809,6 @@
           <module ref="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" kind="rt" />
           <module ref="31f56055-9d30-42b3-a2b1-fb3f554d7075(jetbrains.mps.lang.smodel.query.runtime)" kind="rt" />
           <module ref="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" kind="rt" />
-          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="rt" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
           <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" kind="cl" />
           <module ref="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" kind="cl" />
@@ -2132,15 +2005,14 @@
           <module ref="d44dab97-aaac-44cb-9745-8a14db674c03(jetbrains.mps.baseLanguage.tuples.runtime)" kind="rt" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" kind="rt" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" kind="rt" />
-          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="rt" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
           <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" kind="cl" />
           <module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" kind="cl" />
           <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" kind="cl" />
-          <module ref="f113d56b-63e3-4120-a89c-2f5dcb8c6290(jetbrains.mps.coderules.runtime)" kind="cl" />
-          <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" kind="cl" />
           <module ref="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" kind="cl" />
+          <module ref="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" kind="cl" />
           <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="cl" />
+          <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="cl" />
         </dependencies>
         <uses>
           <language id="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" />
@@ -2180,69 +2052,6 @@
       <zipfileset file="${basedir}/coderules/languages/jetbrains.mps.lang.coderules/runtime/jetbrains.mps.lang.coderules.runtime.msd" prefix="module" />
       <zipfileset dir="${build.tmp}/customProcessors/copyModels/coderules-languages-jetbrains.mps.lang.coderules-runtime-models1" prefix="module/models" />
     </jar>
-    <mkdir dir="${build.tmp}/default/jetbrains.mps.lang.coderules.template.jar1" />
-    <mkdir dir="${build.tmp}/default/jetbrains.mps.lang.coderules.template.jar1/META-INF" />
-    <echoxml file="${build.tmp}/default/jetbrains.mps.lang.coderules.template.jar1/META-INF/module.xml">
-      <module namespace="jetbrains.mps.lang.coderules.template" type="solution" uuid="ff6372a2-2f45-4ec3-952b-02581666015f">
-        <dependencies>
-          <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" kind="rt" />
-          <module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" kind="rt" />
-          <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" kind="rt" />
-          <module ref="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" kind="rt" />
-          <module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" kind="rt" />
-          <module ref="a3e4657f-a76c-45bb-bbda-c764596ecc65(jetbrains.mps.baseLanguage.logging.runtime)" kind="rt" />
-          <module ref="52b81ac7-93fd-4e9e-b972-4995882da6d4(jetbrains.mps.baseLanguage.references.runtime)" kind="rt" />
-          <module ref="23949432-aaff-4c03-b7da-26e4e956ccea(jetbrains.mps.baseLanguage.regexp.runtime)" kind="rt" />
-          <module ref="d44dab97-aaac-44cb-9745-8a14db674c03(jetbrains.mps.baseLanguage.tuples.runtime)" kind="rt" />
-          <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" kind="rt" />
-          <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" kind="rt" />
-          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="rt" />
-          <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
-          <module ref="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" kind="cl" />
-          <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" kind="cl" />
-          <module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" kind="cl" />
-          <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" kind="cl" />
-          <module ref="f113d56b-63e3-4120-a89c-2f5dcb8c6290(jetbrains.mps.coderules.runtime)" kind="cl" />
-          <module ref="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" kind="cl" />
-          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="cl" />
-        </dependencies>
-        <uses>
-          <language id="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" />
-          <language id="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" />
-          <language id="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" />
-          <language id="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" />
-          <language id="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" />
-          <language id="l:daafa647-f1f7-4b0b-b096-69cd7c8408c0:jetbrains.mps.baseLanguage.regexp" />
-          <language id="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" />
-          <language id="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" />
-          <language id="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" />
-          <language id="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" />
-        </uses>
-        <classpath>
-          <entry path="." />
-        </classpath>
-        <sources jar="jetbrains.mps.lang.coderules.template-src.jar" descriptor="jetbrains.mps.lang.coderules.template.msd" />
-      </module>
-    </echoxml>
-    <jar destfile="${build.tmp}/default/jetbrains.mps.coderules-_dl__lbrace_ci.mps.release_rbrace_-0.9-b_dl__lbrace_ci.build.tag_rbrace_.zip/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.template.jar" duplicate="preserve">
-      <fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.coderules.template" />
-      <fileset dir="${basedir}/coderules/solutions/jetbrains.mps.lang.coderules.template" includes="icons/**, resources/**" />
-      <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.lang.coderules.template/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
-      <fileset dir="${build.tmp}/default/jetbrains.mps.lang.coderules.template.jar1" />
-    </jar>
-    <copyModels todir="${build.tmp}/customProcessors/copyModels/coderules-solutions-jetbrains.mps.lang.coderules.template-models1">
-      <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.lang.coderules.template/models" includes="**/*.mps, **/*.mpsr, **/.model" />
-    </copyModels>
-    <jar destfile="${build.tmp}/default/jetbrains.mps.coderules-_dl__lbrace_ci.mps.release_rbrace_-0.9-b_dl__lbrace_ci.build.tag_rbrace_.zip/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.template-src.jar" duplicate="preserve">
-      <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.lang.coderules.template/source_gen">
-        <exclude name="**/trace.info" />
-        <exclude name="**/exports" />
-        <exclude name="**/checkpoints" />
-        <exclude name="**/*.mps" />
-      </fileset>
-      <zipfileset file="${basedir}/coderules/solutions/jetbrains.mps.lang.coderules.template/jetbrains.mps.lang.coderules.template.msd" prefix="module" />
-      <zipfileset dir="${build.tmp}/customProcessors/copyModels/coderules-solutions-jetbrains.mps.lang.coderules.template-models1" prefix="module/models" />
-    </jar>
     <mkdir dir="${build.tmp}/default/jetbrains.mps.logic.reactor.jar1" />
     <mkdir dir="${build.tmp}/default/jetbrains.mps.logic.reactor.jar1/META-INF" />
     <echoxml file="${build.tmp}/default/jetbrains.mps.logic.reactor.jar1/META-INF/module.xml">
@@ -2287,15 +2096,14 @@
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" kind="rt" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
           <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" kind="cl" />
+          <module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" kind="cl" />
           <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" kind="cl" />
-          <module ref="f113d56b-63e3-4120-a89c-2f5dcb8c6290(jetbrains.mps.coderules.runtime)" kind="cl" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="cl" />
           <module ref="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" kind="cl" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="cl" />
         </dependencies>
         <uses>
           <language id="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" />
-          <language id="l:774bf8a0-62e5-41e1-af63-f4812e60e48b:jetbrains.mps.baseLanguage.checkedDots" />
           <language id="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" />
           <language id="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" />
           <language id="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" />
@@ -2313,7 +2121,7 @@
     </echoxml>
     <jar destfile="${build.tmp}/default/jetbrains.mps.coderules-_dl__lbrace_ci.mps.release_rbrace_-0.9-b_dl__lbrace_ci.build.tag_rbrace_.zip/jetbrains.mps.coderules/languages/jetbrains.mps.logic.runtime.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
-      <fileset dir="${basedir}/coderules/languages/jetbrains.mps.logic/runtime" includes="icons/**, resources/**" />
+      <fileset dir="${basedir}/coderules/solutions/jetbrains.mps.logic.reactor" includes="icons/**, resources/**" />
       <fileset dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.logic/runtime/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.logic.runtime.jar1" />
     </jar>
@@ -2353,10 +2161,11 @@
           <module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" kind="cl" />
           <module ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" kind="cl" />
           <module ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" kind="cl" />
-          <module ref="f113d56b-63e3-4120-a89c-2f5dcb8c6290(jetbrains.mps.coderules.runtime)" kind="cl" />
           <module ref="6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.coderules.typechecking)" kind="cl" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="cl" />
           <module ref="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" kind="cl" />
+          <module ref="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" kind="cl" />
+          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="cl" />
         </dependencies>
         <uses>
           <language id="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" />
@@ -2401,48 +2210,6 @@
       <zipfileset file="${basedir}/coderules/solutions/jetbrains.mps.coderules/jetbrains.mps.coderules.msd" prefix="module" />
       <zipfileset dir="${build.tmp}/customProcessors/copyModels/coderules-solutions-jetbrains.mps.coderules-models1" prefix="module/models" />
     </jar>
-    <mkdir dir="${build.tmp}/default/jetbrains.mps.coderules.runtime.jar1" />
-    <mkdir dir="${build.tmp}/default/jetbrains.mps.coderules.runtime.jar1/META-INF" />
-    <echoxml file="${build.tmp}/default/jetbrains.mps.coderules.runtime.jar1/META-INF/module.xml">
-      <module namespace="jetbrains.mps.coderules.runtime" type="solution" uuid="f113d56b-63e3-4120-a89c-2f5dcb8c6290">
-        <dependencies>
-          <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" kind="rt" />
-          <module ref="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" kind="rt" />
-          <module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" kind="rt" />
-          <module ref="52b81ac7-93fd-4e9e-b972-4995882da6d4(jetbrains.mps.baseLanguage.references.runtime)" kind="rt" />
-          <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" kind="cl" />
-          <module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" kind="cl" />
-        </dependencies>
-        <uses>
-          <language id="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" />
-          <language id="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" />
-          <language id="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" />
-        </uses>
-        <classpath>
-          <entry path="." />
-        </classpath>
-        <sources jar="jetbrains.mps.coderules.runtime-src.jar" descriptor="jetbrains.mps.coderules.runtime.msd" />
-      </module>
-    </echoxml>
-    <jar destfile="${build.tmp}/default/jetbrains.mps.coderules-_dl__lbrace_ci.mps.release_rbrace_-0.9-b_dl__lbrace_ci.build.tag_rbrace_.zip/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.runtime.jar" duplicate="preserve">
-      <fileset dir="${build.tmp}/java/out/jetbrains.mps.coderules.runtime" />
-      <fileset dir="${basedir}/coderules/solutions/jetbrains.mps.coderules.runtime" includes="icons/**, resources/**" />
-      <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.runtime/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
-      <fileset dir="${build.tmp}/default/jetbrains.mps.coderules.runtime.jar1" />
-    </jar>
-    <copyModels todir="${build.tmp}/customProcessors/copyModels/coderules-solutions-jetbrains.mps.coderules.runtime-models1">
-      <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.runtime/models" includes="**/*.mps, **/*.mpsr, **/.model" />
-    </copyModels>
-    <jar destfile="${build.tmp}/default/jetbrains.mps.coderules-_dl__lbrace_ci.mps.release_rbrace_-0.9-b_dl__lbrace_ci.build.tag_rbrace_.zip/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.runtime-src.jar" duplicate="preserve">
-      <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.runtime/source_gen">
-        <exclude name="**/trace.info" />
-        <exclude name="**/exports" />
-        <exclude name="**/checkpoints" />
-        <exclude name="**/*.mps" />
-      </fileset>
-      <zipfileset file="${basedir}/coderules/solutions/jetbrains.mps.coderules.runtime/jetbrains.mps.coderules.runtime.msd" prefix="module" />
-      <zipfileset dir="${build.tmp}/customProcessors/copyModels/coderules-solutions-jetbrains.mps.coderules.runtime-models1" prefix="module/models" />
-    </jar>
     <mkdir dir="${build.tmp}/default/jetbrains.mps.coderules.ui.jar1" />
     <mkdir dir="${build.tmp}/default/jetbrains.mps.coderules.ui.jar1/META-INF" />
     <echoxml file="${build.tmp}/default/jetbrains.mps.coderules.ui.jar1/META-INF/module.xml">
@@ -2470,6 +2237,7 @@
           <module ref="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c(jetbrains.mps.coderules)" kind="cl" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="cl" />
           <module ref="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" kind="cl" />
+          <module ref="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" kind="cl" />
           <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="cl" />
         </dependencies>
         <uses>
@@ -2527,8 +2295,9 @@
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" kind="rt" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" kind="rt" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
+          <module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" kind="cl" />
           <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" kind="cl" />
-          <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" kind="cl" />
+          <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="cl" />
           <module ref="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" kind="cl" />
         </dependencies>
         <uses>
@@ -2591,7 +2360,7 @@
           <module ref="31f56055-9d30-42b3-a2b1-fb3f554d7075(jetbrains.mps.lang.smodel.query.runtime)" kind="rt" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
           <module ref="f159adf4-3c93-40f9-9c5a-1f245a8697af(jetbrains.mps.lang.aspect)" kind="cl" />
-          <module ref="c4803b19-6d89-4a3b-bf82-390769514add(jetbrains.mps.lang.coderules)" kind="cl" />
+          <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="cl" />
           <module ref="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" kind="cl" />
           <module ref="f4ad079d-bc71-4ffb-9600-9328705cf998(jetbrains.mps.lang.descriptor)" kind="cl" />
           <module ref="86ef8290-12bb-4ca7-947f-093788f263a9(jetbrains.mps.lang.project)" kind="cl" />
@@ -2673,7 +2442,7 @@
           <module ref="31f56055-9d30-42b3-a2b1-fb3f554d7075(jetbrains.mps.lang.smodel.query.runtime)" kind="rt" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
           <module ref="e45a8b22-94f2-427f-b849-77f254c4eef5(jetbrains.mps.lang.aspect#3274906159125927726)" kind="cl" />
-          <module ref="21d5540d-cd6b-44dd-b6ab-6835bf032803(jetbrains.mps.lang.coderules#4578927328670739933)" kind="cl" />
+          <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="cl" />
           <module ref="3ac18869-0828-4401-abad-822a47bf83f1(jetbrains.mps.lang.descriptor#9020561928507175817)" kind="cl" />
           <module ref="86ef8290-12bb-4ca7-947f-093788f263a9(jetbrains.mps.lang.project)" kind="cl" />
           <module ref="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462(jetbrains.mps.lang.typechecking)" kind="cl" />
@@ -2816,16 +2585,14 @@
           <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" kind="cl" />
           <module ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" kind="cl" />
           <module ref="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c(jetbrains.mps.coderules)" kind="cl" />
-          <module ref="f113d56b-63e3-4120-a89c-2f5dcb8c6290(jetbrains.mps.coderules.runtime)" kind="cl" />
           <module ref="4d5d9aa1-7b71-4888-9100-1b793e5328a6(jetbrains.mps.coderules.ui)" kind="cl" />
           <module ref="bfbdd672-7ff5-403f-af4f-16da5226f34c(jetbrains.mps.findUsages.runtime)" kind="cl" />
           <module ref="019b622b-0aef-4dd3-86d0-4eef01f3f6bb(jetbrains.mps.ide)" kind="cl" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="cl" />
-          <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" kind="cl" />
           <module ref="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" kind="cl" />
           <module ref="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" kind="cl" />
           <module ref="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" kind="cl" />
-          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="cl" />
+          <module ref="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" kind="cl" />
           <module ref="a1250a4d-c090-42c3-ad7c-d298a3357dd4(jetbrains.mps.make.runtime)" kind="cl" />
           <module ref="0b80a2e8-f9f1-47b3-823f-56eb115bca42(jetbrains.mps.typechecking.annotation)" kind="cl" />
         </dependencies>
@@ -2842,10 +2609,8 @@
           <language id="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" />
           <language id="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" />
           <language id="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" />
-          <language id="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" />
           <language id="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" />
           <language id="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" />
-          <language id="l:0b80a2e8-f9f1-47b3-823f-56eb115bca42:jetbrains.mps.typechecking.annotation" />
         </uses>
         <classpath>
           <entry path="." />
@@ -2915,6 +2680,7 @@
           <module ref="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" kind="cl" />
           <module ref="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" kind="cl" />
           <module ref="c4803b19-6d89-4a3b-bf82-390769514add(jetbrains.mps.lang.coderules)" kind="cl" />
+          <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="cl" />
           <module ref="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" kind="cl" />
           <module ref="528ff3b9-5fc4-40dd-931f-c6ce3650640e(jetbrains.mps.lang.migration.runtime)" kind="cl" />
           <module ref="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" kind="cl" />
@@ -3007,8 +2773,10 @@
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
           <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" kind="cl" />
           <module ref="5f9babc9-8d5d-4825-8e61-17b241ee6272(jetbrains.mps.baseLanguage.collections#1151699677197)" kind="cl" />
+          <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="cl" />
           <module ref="35320f26-77cb-4c55-be9f-a97a27770af1(jetbrains.mps.logic)" kind="cl" />
           <module ref="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" kind="cl" />
+          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="cl" />
         </dependencies>
         <uses>
           <language id="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" />
@@ -3080,17 +2848,13 @@
           <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" kind="cl" />
           <module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" kind="cl" />
           <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" kind="cl" />
-          <module ref="f113d56b-63e3-4120-a89c-2f5dcb8c6290(jetbrains.mps.coderules.runtime)" kind="cl" />
           <module ref="6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.coderules.typechecking)" kind="cl" />
           <module ref="c4803b19-6d89-4a3b-bf82-390769514add(jetbrains.mps.lang.coderules)" kind="cl" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="cl" />
-          <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" kind="cl" />
           <module ref="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" kind="cl" />
-          <module ref="8585453e-6bfb-4d80-98de-b16074f1d86c(jetbrains.mps.lang.test)" kind="cl" />
           <module ref="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" kind="cl" />
           <module ref="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" kind="cl" />
           <module ref="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" kind="cl" />
-          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="cl" />
         </dependencies>
         <uses>
           <language id="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" />
@@ -3160,7 +2924,6 @@
           <module ref="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" kind="rt" />
           <module ref="3330376f-82a0-45ed-ae50-a320ee8b0b63(jetbrains.mps.lang.script.rt)" kind="rt" />
           <module ref="31f56055-9d30-42b3-a2b1-fb3f554d7075(jetbrains.mps.lang.smodel.query.runtime)" kind="rt" />
-          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="rt" />
           <module ref="a1250a4d-c090-42c3-ad7c-d298a3357dd4(jetbrains.mps.make.runtime)" kind="rt" />
           <module ref="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" kind="rt" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
@@ -3173,10 +2936,8 @@
           <module ref="34e84b8f-afa8-4364-abcd-a279fddddbe7(jetbrains.mps.editor.runtime)" kind="cl" />
           <module ref="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" kind="cl" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="cl" />
-          <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" kind="cl" />
           <module ref="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" kind="cl" />
           <module ref="f4ad079d-bc71-4ffb-9600-9328705cf998(jetbrains.mps.lang.descriptor)" kind="cl" />
-          <module ref="528ff3b9-5fc4-40dd-931f-c6ce3650640e(jetbrains.mps.lang.migration.runtime)" kind="cl" />
           <module ref="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" kind="cl" />
           <module ref="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" kind="cl" />
           <module ref="35320f26-77cb-4c55-be9f-a97a27770af1(jetbrains.mps.logic)" kind="cl" />
@@ -3274,14 +3035,12 @@
           <module ref="d44dab97-aaac-44cb-9745-8a14db674c03(jetbrains.mps.baseLanguage.tuples.runtime)" kind="rt" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" kind="rt" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" kind="rt" />
-          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="rt" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
           <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" kind="cl" />
           <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" kind="cl" />
           <module ref="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" kind="cl" />
           <module ref="c4803b19-6d89-4a3b-bf82-390769514add(jetbrains.mps.lang.coderules)" kind="cl" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="cl" />
-          <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" kind="cl" />
           <module ref="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" kind="cl" />
           <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="cl" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="cl" />
@@ -3482,9 +3241,7 @@
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" kind="rt" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" kind="rt" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="rt" />
-          <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" kind="rt" />
           <module ref="31f56055-9d30-42b3-a2b1-fb3f554d7075(jetbrains.mps.lang.smodel.query.runtime)" kind="rt" />
-          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="rt" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
           <module ref="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" kind="cl" />
           <module ref="6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.coderules.typechecking)" kind="cl" />
@@ -3568,7 +3325,6 @@
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" kind="rt" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" kind="rt" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="rt" />
-          <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" kind="rt" />
           <module ref="8e98f4e2-decf-4e97-bf80-9109e8b759ee(jetbrains.mps.lang.constraints.rules.runtime)" kind="rt" />
           <module ref="9e9ef4e2-decf-4e97-bf80-9109e8b759bb(jetbrains.mps.lang.feedback.api)" kind="rt" />
           <module ref="3f98f4e2-decf-4e97-bf80-9109e8b759ab(jetbrains.mps.lang.feedback.problem.rt)" kind="rt" />
@@ -3577,7 +3333,6 @@
           <module ref="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" kind="rt" />
           <module ref="31f56055-9d30-42b3-a2b1-fb3f554d7075(jetbrains.mps.lang.smodel.query.runtime)" kind="rt" />
           <module ref="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" kind="rt" />
-          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="rt" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
           <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" kind="cl" />
           <module ref="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" kind="cl" />
@@ -3755,7 +3510,7 @@
     <delete dir="${build.layout}" />
   </target>
   
-  <target name="compileJava" depends="java.compile.coderules-ideaplugin, java.compile.jetbrains.mps.coderules.ideaplugin, java.compile.jetbrains.mps.coderules.build, java.compile.jetbrains.mps.logic.reactor, java.compile.java.modules.cycle.1, java.compile.jetbrains.mps.logic.runtime, java.compile.java.modules.cycle.2, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic#6626732309150416985, java.compile.jetbrains.mps.logic.test, java.compile.jetbrains.mps.lang.typechecking.runtime, java.compile.java.modules.cycle.3, java.compile.jetbrains.mps.lang.types, java.compile.jetbrains.mps.lang.types.generator, java.compile.jetbrains.mps.lang.typechecking, java.compile.jetbrains.mps.lang.typechecking#01, java.compile.java.modules.cycle.4, java.compile.jetbrains.mps.coderules.typechecking, java.compile.jetbrains.mps.typechecking.annotation, java.compile.jetbrains.mps.coderules.testhelper, java.compile.jetbrains.mps.typechecking.testlang, java.compile.jetbrains.mps.typechecking.testlang#3575255234175341581, java.compile.jetbrains.mps.coderules.typechecking.testlang.sandbox, java.compile.jetbrains.mps.coderules.typechecking.test, java.compile.jetbrains.mps.lang.coderules, java.compile.jetbrains.mps.lang.coderules#4578927328670739933, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.coderules.runtime, java.compile.jetbrains.mps.coderules, java.compile.jetbrains.mps.coderules.ui, java.compile.jetbrains.mps.coderules.test" />
+  <target name="compileJava" depends="java.compile.coderules-ideaplugin, java.compile.jetbrains.mps.coderules.ideaplugin, java.compile.jetbrains.mps.coderules.build, java.compile.jetbrains.mps.logic.reactor, java.compile.java.modules.cycle.1, java.compile.jetbrains.mps.logic.runtime, java.compile.java.modules.cycle.2, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic#6626732309150416985, java.compile.jetbrains.mps.logic.test, java.compile.jetbrains.mps.lang.typechecking.runtime, java.compile.java.modules.cycle.3, java.compile.jetbrains.mps.lang.types, java.compile.jetbrains.mps.lang.types.generator, java.compile.jetbrains.mps.lang.typechecking, java.compile.jetbrains.mps.lang.typechecking#01, java.compile.java.modules.cycle.4, java.compile.jetbrains.mps.coderules.typechecking, java.compile.jetbrains.mps.typechecking.annotation, java.compile.jetbrains.mps.coderules.testhelper, java.compile.jetbrains.mps.typechecking.testlang, java.compile.jetbrains.mps.typechecking.testlang#3575255234175341581, java.compile.jetbrains.mps.coderules.typechecking.testlang.sandbox, java.compile.jetbrains.mps.coderules.typechecking.test, java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.coderules, java.compile.jetbrains.mps.coderules.ui, java.compile.jetbrains.mps.lang.coderules, java.compile.jetbrains.mps.lang.coderules#4578927328670739933, java.compile.jetbrains.mps.coderules.test" />
   
   <target name="processResources" />
   
@@ -3779,13 +3534,11 @@
       <chunk>
         <module file="${basedir}/coderules/solutions/jetbrains.mps.coderules.build/jetbrains.mps.coderules.build.msd" />
         <module file="${basedir}/coderules/solutions/jetbrains.mps.coderules.ideaplugin/jetbrains.mps.coderules.ideaplugin.msd" />
-        <module file="${basedir}/coderules/solutions/jetbrains.mps.coderules.runtime/jetbrains.mps.coderules.runtime.msd" />
         <module file="${basedir}/coderules/solutions/jetbrains.mps.logic.reactor/jetbrains.mps.logic.reactor.msd" />
       </chunk>
       <chunk bootstrap="true">
         <module file="${basedir}/coderules/languages/jetbrains.mps.lang.coderules/jetbrains.mps.lang.coderules.mpl" bootstrap="true" />
         <module file="${basedir}/coderules/languages/jetbrains.mps.lang.coderules/runtime/jetbrains.mps.lang.coderules.runtime.msd" bootstrap="true" />
-        <module file="${basedir}/coderules/solutions/jetbrains.mps.lang.coderules.template/jetbrains.mps.lang.coderules.template.msd" bootstrap="true" />
         <module file="${basedir}/coderules/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl" />
         <module file="${basedir}/coderules/languages/jetbrains.mps.logic/runtime/jetbrains.mps.logic.runtime.msd" />
       </chunk>
@@ -3795,7 +3548,7 @@
       </chunk>
       <chunk bootstrap="true">
         <module file="${basedir}/coderules/solutions/jetbrains.mps.coderules/jetbrains.mps.coderules.msd" />
-        <module file="${basedir}/coderules/solutions/jetbrains.mps.coderules.typechecking/jetbrains.mps.coderules.typechecking.msd" bootstrap="true" />
+        <module file="${basedir}/coderules/solutions/jetbrains.mps.coderules.typechecking/jetbrains.mps.coderules.typechecking.msd" />
         <module file="${basedir}/coderules/solutions/jetbrains.mps.coderules.ui/jetbrains.mps.coderules.ui.msd" />
         <module file="${basedir}/coderules/languages/jetbrains.mps.lang.typechecking/jetbrains.mps.lang.typechecking.mpl" />
         <module file="${basedir}/coderules/languages/jetbrains.mps.lang.types/jetbrains.mps.lang.types.mpl" />
@@ -3938,25 +3691,24 @@
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
   </target>
   
-  <target name="java.compile.java.modules.cycle.1" depends="java.compile.jetbrains.mps.coderules.runtime, java.compile.jetbrains.mps.logic.reactor, fetchDependencies">
+  <target name="java.compile.java.modules.cycle.1" depends="java.compile.jetbrains.mps.logic.reactor, 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="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.logic/runtime/source_gen" />
-        <path location="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.lang.coderules.template/source_gen" />
         <path location="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.lang.coderules/runtime/source_gen" />
       </src>
       <classpath>
         <fileset file="${artifacts.mps}/lib/mps-core.jar" />
         <fileset file="${artifacts.mps}/lib/mps-annotations.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-closures.jar" />
         <fileset file="${artifacts.mps}/lib/mps-collections.jar" />
         <fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
         <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
         <fileset file="${artifacts.mps}/lib/mps-references.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-context.jar" />
         <fileset file="${artifacts.mps}/lib/mps-constraints-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-persistence.jar" />
@@ -3982,15 +3734,13 @@
         <fileset file="${artifacts.mps}/lib/stats.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.regexp.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.coderules.runtime" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
       </classpath>
     </javac>
   </target>
   
-  <target name="java.compile.jetbrains.mps.logic.runtime" depends="java.compile.jetbrains.mps.coderules.runtime, java.compile.jetbrains.mps.logic.reactor, java.compile.java.modules.cycle.1, fetchDependencies">
+  <target name="java.compile.jetbrains.mps.logic.runtime" depends="java.compile.jetbrains.mps.logic.reactor, java.compile.java.modules.cycle.1, fetchDependencies">
     <mkdir dir="${mps.macro.coderules_home}/coderules/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">
@@ -4001,18 +3751,17 @@
       <classpath>
         <fileset file="${artifacts.mps}/lib/mps-core.jar" />
         <fileset file="${artifacts.mps}/lib/mps-annotations.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-closures.jar" />
         <fileset file="${artifacts.mps}/lib/mps-collections.jar" />
         <fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
         <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
         <fileset file="${artifacts.mps}/lib/mps-references.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-context.jar" />
         <fileset file="${artifacts.mps}/lib/mps-constraints-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-persistence.jar" />
         <fileset file="${artifacts.mps}/lib/mps-project-check.jar" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.coderules.runtime" />
         <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
         <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/collection-0.7.jar" />
@@ -4043,7 +3792,7 @@
     </copy>
   </target>
   
-  <target name="java.compile.java.modules.cycle.2" depends="java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.lang.coderules.template, fetchDependencies">
+  <target name="java.compile.java.modules.cycle.2" depends="java.compile.jetbrains.mps.lang.coderules.runtime, 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" />
@@ -4113,15 +3862,14 @@
         <fileset file="${artifacts.mps}/languages/runtimes/jetbrains.mps.lang.smodel.query.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/out/jetbrains.mps.lang.coderules.runtime" />
         <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.coderules.runtime" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.template" />
       </classpath>
     </javac>
   </target>
   
-  <target name="java.compile.jetbrains.mps.logic" depends="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" depends="java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, java.compile.java.modules.cycle.2, fetchDependencies">
     <mkdir dir="${mps.macro.coderules_home}/coderules/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">
@@ -4155,6 +3903,7 @@
         <fileset file="${artifacts.mps}/lib/mps-project-check.jar" />
         <fileset file="${artifacts.mps}/lib/mps-textgen.jar" />
         <fileset file="${artifacts.mps}/lib/mps-scripts-rt.jar" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.runtime" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
         <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/collection-0.7.jar" />
@@ -4201,7 +3950,7 @@
     </copy>
   </target>
   
-  <target name="java.compile.jetbrains.mps.logic#6626732309150416985" depends="java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic.reactor, fetchDependencies">
+  <target name="java.compile.jetbrains.mps.logic#6626732309150416985" depends="java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
     <mkdir dir="${mps.macro.coderules_home}/coderules/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">
@@ -4210,44 +3959,47 @@
         <path location="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.logic/generator/source_gen" />
       </src>
       <classpath>
-        <fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-context.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-constraints-runtime.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-problem.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-feedback-api.jar" />
         <fileset file="${artifacts.mps}/lib/mps-core.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-messages-api.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-messages-for-rules.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-annotations.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-closures.jar" />
         <fileset file="${artifacts.mps}/lib/mps-collections.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
         <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
         <fileset file="${artifacts.mps}/lib/mps-references.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-context.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-constraints-runtime.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-persistence.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-project-check.jar" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.runtime" />
+        <fileset file="${artifacts.mps}/lib/mps-problem.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-feedback-api.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-messages-api.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-messages-for-rules.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-generator.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-persistence.jar" />
         <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-project-check.jar" />
         <fileset file="${artifacts.mps}/lib/mps-textgen.jar" />
         <fileset file="${artifacts.mps}/lib/mps-scripts-rt.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
         <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/collection-0.7.jar" />
         <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/trove4j-3.0.3.jar" />
         <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.18.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
+        <fileset file="${artifacts.mps}/lib/util-8.jar" />
+        <fileset file="${artifacts.mps}/lib/trove.jar" />
         <fileset file="${artifacts.mps}/lib/app.jar" />
         <fileset file="${artifacts.mps}/lib/app-client.jar" />
         <fileset file="${artifacts.mps}/lib/lib.jar" />
         <fileset file="${artifacts.mps}/lib/lib-client.jar" />
         <fileset file="${artifacts.mps}/lib/util.jar" />
         <fileset file="${artifacts.mps}/lib/util_rt.jar" />
-        <fileset file="${artifacts.mps}/lib/util-8.jar" />
         <fileset file="${artifacts.mps}/lib/forms_rt.jar" />
         <fileset file="${artifacts.mps}/lib/java-frontback.jar" />
         <fileset file="${artifacts.mps}/lib/java-impl.jar" />
@@ -4255,7 +4007,6 @@
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/trove.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections-generator.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
@@ -4269,7 +4020,7 @@
     </copy>
   </target>
   
-  <target name="java.compile.jetbrains.mps.logic.test" depends="java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
+  <target name="java.compile.jetbrains.mps.logic.test" depends="java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
     <mkdir dir="${mps.macro.coderules_home}/coderules/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">
@@ -4293,7 +4044,6 @@
         <fileset file="${artifacts.mps}/lib/mps-persistence.jar" />
         <fileset file="${artifacts.mps}/lib/mps-project-check.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.runtime" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.template" />
         <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
@@ -4338,7 +4088,7 @@
     </copy>
   </target>
   
-  <target name="java.compile.jetbrains.mps.lang.typechecking.runtime" depends="java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
+  <target name="java.compile.jetbrains.mps.lang.typechecking.runtime" depends="java.compile.jetbrains.mps.lang.coderules.runtime, fetchDependencies">
     <mkdir dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.lang.typechecking.runtime/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.typechecking.runtime" />
     <javac destdir="${build.tmp}/java/out/jetbrains.mps.lang.typechecking.runtime" fork="true" encoding="utf8" includeantruntime="false" debug="true">
@@ -4360,29 +4110,10 @@
         <fileset file="${artifacts.mps}/lib/mps-constraints-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-persistence.jar" />
         <fileset file="${artifacts.mps}/lib/mps-project-check.jar" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.template" />
-        <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/collection-0.7.jar" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/trove4j-3.0.3.jar" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.18.jar" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.runtime" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/util-8.jar" />
         <fileset file="${artifacts.mps}/lib/trove.jar" />
-        <fileset file="${artifacts.mps}/lib/app.jar" />
-        <fileset file="${artifacts.mps}/lib/app-client.jar" />
-        <fileset file="${artifacts.mps}/lib/lib.jar" />
-        <fileset file="${artifacts.mps}/lib/lib-client.jar" />
-        <fileset file="${artifacts.mps}/lib/util.jar" />
-        <fileset file="${artifacts.mps}/lib/util_rt.jar" />
-        <fileset file="${artifacts.mps}/lib/forms_rt.jar" />
-        <fileset file="${artifacts.mps}/lib/java-frontback.jar" />
-        <fileset file="${artifacts.mps}/lib/java-impl.jar" />
-        <fileset file="${artifacts.mps}/lib/jps-model.jar" />
-        <fileset file="${artifacts.mps}/lib/testFramework.jar" />
-        <fileset file="${artifacts.mps}/lib/stats.jar" />
-        <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.aspects.jar" />
       </classpath>
     </javac>
@@ -4391,7 +4122,7 @@
     </copy>
   </target>
   
-  <target name="java.compile.java.modules.cycle.3" depends="java.compile.jetbrains.mps.lang.coderules, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.lang.typechecking.runtime, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.coderules, java.compile.jetbrains.mps.coderules.runtime, java.compile.jetbrains.mps.coderules.typechecking, java.compile.jetbrains.mps.lang.coderules.runtime, fetchDependencies">
+  <target name="java.compile.java.modules.cycle.3" depends="java.compile.jetbrains.mps.lang.coderules, java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.lang.typechecking.runtime, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.coderules, java.compile.jetbrains.mps.coderules.typechecking, 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">
       <compilerarg value="-Xlint:none" />
@@ -4425,9 +4156,6 @@
         <fileset file="${artifacts.mps}/lib/mps-project-check.jar" />
         <fileset file="${artifacts.mps}/lib/mps-textgen.jar" />
         <fileset file="${artifacts.mps}/lib/mps-scripts-rt.jar" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/collection-0.7.jar" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/trove4j-3.0.3.jar" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.18.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/app.jar" />
         <fileset file="${artifacts.mps}/lib/app-client.jar" />
@@ -4473,20 +4201,16 @@
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.quotation.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.typesystem.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.template" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.runtime" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typechecking.runtime" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic" />
-        <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.coderules" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.coderules.runtime" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.coderules.typechecking" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.runtime" />
       </classpath>
     </javac>
   </target>
   
-  <target name="java.compile.jetbrains.mps.lang.types" depends="java.compile.jetbrains.mps.lang.coderules, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.lang.typechecking.runtime, java.compile.jetbrains.mps.logic, 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.types" depends="java.compile.jetbrains.mps.lang.coderules, java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.lang.typechecking.runtime, java.compile.jetbrains.mps.logic, java.compile.java.modules.cycle.3, fetchDependencies">
     <mkdir dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.lang.types/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.types" />
     <javac destdir="${build.tmp}/java/out/jetbrains.mps.lang.types" fork="true" encoding="utf8" includeantruntime="false" debug="true">
@@ -4521,14 +4245,9 @@
         <fileset file="${artifacts.mps}/lib/mps-textgen.jar" />
         <fileset file="${artifacts.mps}/lib/mps-scripts-rt.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.template" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.runtime" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typechecking.runtime" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/collection-0.7.jar" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/trove4j-3.0.3.jar" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.18.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/app.jar" />
         <fileset file="${artifacts.mps}/lib/app-client.jar" />
@@ -4572,7 +4291,7 @@
     </copy>
   </target>
   
-  <target name="java.compile.jetbrains.mps.lang.types.generator" depends="java.compile.jetbrains.mps.lang.coderules, java.compile.jetbrains.mps.lang.coderules#4578927328670739933, java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.lang.typechecking, java.compile.jetbrains.mps.lang.typechecking.runtime, java.compile.jetbrains.mps.lang.types, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
+  <target name="java.compile.jetbrains.mps.lang.types.generator" depends="java.compile.jetbrains.mps.lang.coderules, java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.lang.typechecking, java.compile.jetbrains.mps.lang.typechecking.runtime, java.compile.jetbrains.mps.lang.types, java.compile.jetbrains.mps.logic, fetchDependencies">
     <mkdir dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.lang.types/generator/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.types.generator" />
     <javac destdir="${build.tmp}/java/out/jetbrains.mps.lang.types.generator" fork="true" encoding="utf8" includeantruntime="false" debug="true">
@@ -4607,18 +4326,11 @@
         <fileset file="${artifacts.mps}/lib/mps-textgen.jar" />
         <fileset file="${artifacts.mps}/lib/mps-scripts-rt.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules#4578927328670739933" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.runtime" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.template" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typechecking" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typechecking.runtime" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.types" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/collection-0.7.jar" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/trove4j-3.0.3.jar" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.18.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/app.jar" />
         <fileset file="${artifacts.mps}/lib/app-client.jar" />
@@ -4660,7 +4372,7 @@
     </copy>
   </target>
   
-  <target name="java.compile.jetbrains.mps.lang.typechecking" depends="java.compile.jetbrains.mps.coderules, java.compile.jetbrains.mps.coderules.runtime, java.compile.jetbrains.mps.coderules.typechecking, java.compile.jetbrains.mps.lang.coderules, java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.lang.typechecking.runtime, java.compile.jetbrains.mps.logic, 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.typechecking" depends="java.compile.jetbrains.mps.coderules, java.compile.jetbrains.mps.coderules.typechecking, java.compile.jetbrains.mps.lang.coderules, java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.lang.typechecking.runtime, java.compile.jetbrains.mps.logic, java.compile.java.modules.cycle.3, fetchDependencies">
     <mkdir dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.lang.typechecking/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.typechecking" />
     <javac destdir="${build.tmp}/java/out/jetbrains.mps.lang.typechecking" fork="true" encoding="utf8" includeantruntime="false" debug="true">
@@ -4691,7 +4403,6 @@
         <fileset file="${artifacts.mps}/lib/mps-icons.jar" />
         <fileset file="${artifacts.mps}/lib/mps-workbench.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.coderules" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.coderules.runtime" />
         <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.coderules.typechecking" />
         <fileset file="${artifacts.mps}/lib/mps-problem.jar" />
@@ -4702,17 +4413,11 @@
         <fileset file="${artifacts.mps}/lib/mps-scripts-rt.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.runtime" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.template" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typechecking.runtime" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
         <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules/lib/reactive-streams-1.0.0.final.jar" />
         <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules/lib/rxjava-2.2.18.jar" />
         <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules/lib/rxjava2-swing-0.3.7.jar" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/collection-0.7.jar" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/trove4j-3.0.3.jar" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.18.jar" />
         <fileset file="${artifacts.mps}/lib/app.jar" />
         <fileset file="${artifacts.mps}/lib/app-client.jar" />
         <fileset file="${artifacts.mps}/lib/lib.jar" />
@@ -4758,7 +4463,7 @@
     </copy>
   </target>
   
-  <target name="java.compile.jetbrains.mps.lang.typechecking#01" depends="java.compile.jetbrains.mps.coderules, java.compile.jetbrains.mps.coderules.runtime, java.compile.jetbrains.mps.coderules.typechecking, java.compile.jetbrains.mps.lang.coderules, java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.lang.typechecking, java.compile.jetbrains.mps.lang.typechecking.runtime, java.compile.jetbrains.mps.lang.types, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
+  <target name="java.compile.jetbrains.mps.lang.typechecking#01" depends="java.compile.jetbrains.mps.coderules, java.compile.jetbrains.mps.coderules.typechecking, java.compile.jetbrains.mps.lang.coderules, java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.lang.typechecking, java.compile.jetbrains.mps.lang.typechecking.runtime, java.compile.jetbrains.mps.lang.types, java.compile.jetbrains.mps.logic, fetchDependencies">
     <mkdir dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.lang.typechecking/generator/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.typechecking#01" />
     <javac destdir="${build.tmp}/java/out/jetbrains.mps.lang.typechecking#01" fork="true" encoding="utf8" includeantruntime="false" debug="true">
@@ -4789,7 +4494,6 @@
         <fileset file="${artifacts.mps}/lib/mps-icons.jar" />
         <fileset file="${artifacts.mps}/lib/mps-workbench.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.coderules" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.coderules.runtime" />
         <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.coderules.typechecking" />
         <fileset file="${artifacts.mps}/lib/mps-problem.jar" />
@@ -4800,19 +4504,13 @@
         <fileset file="${artifacts.mps}/lib/mps-scripts-rt.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.runtime" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.template" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typechecking" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typechecking.runtime" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.types" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
         <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules/lib/reactive-streams-1.0.0.final.jar" />
         <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules/lib/rxjava-2.2.18.jar" />
         <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules/lib/rxjava2-swing-0.3.7.jar" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/collection-0.7.jar" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/trove4j-3.0.3.jar" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.18.jar" />
         <fileset file="${artifacts.mps}/lib/app.jar" />
         <fileset file="${artifacts.mps}/lib/app-client.jar" />
         <fileset file="${artifacts.mps}/lib/lib.jar" />
@@ -4853,7 +4551,7 @@
     </copy>
   </target>
   
-  <target name="java.compile.java.modules.cycle.4" depends="java.compile.jetbrains.mps.coderules.runtime, java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.lang.typechecking.runtime, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking.annotation, fetchDependencies">
+  <target name="java.compile.java.modules.cycle.4" depends="java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.lang.typechecking.runtime, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.typechecking.annotation, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
     <mkdir dir="${build.tmp}/java.modules.cycle.4" />
     <javac destdir="${build.tmp}/java.modules.cycle.4" fork="true" encoding="utf8" nowarn="true" includeantruntime="false">
       <compilerarg value="-Xlint:none" />
@@ -4925,18 +4623,16 @@
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.typesystem.jar" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.coderules.runtime" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.runtime" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.template" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typechecking.runtime" />
         <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.typechecking.annotation" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
       </classpath>
     </javac>
   </target>
   
-  <target name="java.compile.jetbrains.mps.coderules.typechecking" depends="java.compile.jetbrains.mps.coderules.runtime, java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.lang.typechecking.runtime, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking.annotation, java.compile.java.modules.cycle.4, fetchDependencies">
+  <target name="java.compile.jetbrains.mps.coderules.typechecking" depends="java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.lang.typechecking.runtime, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.typechecking.annotation, java.compile.java.modules.cycle.4, fetchDependencies">
     <mkdir dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.typechecking/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.coderules.typechecking" />
     <javac destdir="${build.tmp}/java/out/jetbrains.mps.coderules.typechecking" fork="true" encoding="utf8" includeantruntime="false" debug="true">
@@ -4966,12 +4662,9 @@
         <fileset file="${artifacts.mps}/lib/mps-project-check.jar" />
         <fileset file="${artifacts.mps}/lib/mps-icons.jar" />
         <fileset file="${artifacts.mps}/lib/mps-workbench.jar" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.coderules.runtime" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.runtime" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.template" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typechecking.runtime" />
         <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-problem.jar" />
         <fileset file="${artifacts.mps}/lib/mps-feedback-api.jar" />
         <fileset file="${artifacts.mps}/lib/mps-messages-api.jar" />
@@ -5022,7 +4715,7 @@
     </copy>
   </target>
   
-  <target name="java.compile.jetbrains.mps.typechecking.annotation" depends="java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.lang.typechecking.runtime, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
+  <target name="java.compile.jetbrains.mps.typechecking.annotation" depends="java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.lang.typechecking.runtime, fetchDependencies">
     <mkdir dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.typechecking.annotation/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.typechecking.annotation" />
     <javac destdir="${build.tmp}/java/out/jetbrains.mps.typechecking.annotation" fork="true" encoding="utf8" includeantruntime="false" debug="true">
@@ -5045,13 +4738,10 @@
         <fileset file="${artifacts.mps}/lib/mps-persistence.jar" />
         <fileset file="${artifacts.mps}/lib/mps-project-check.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.runtime" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.template" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typechecking.runtime" />
-        <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
-        <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-problem.jar" />
         <fileset file="${artifacts.mps}/lib/mps-feedback-api.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
         <fileset file="${artifacts.mps}/lib/mps-messages-api.jar" />
         <fileset file="${artifacts.mps}/lib/mps-messages-for-rules.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
@@ -5059,9 +4749,6 @@
         <fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-generator.jar" />
         <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/collection-0.7.jar" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/trove4j-3.0.3.jar" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.18.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/util-8.jar" />
         <fileset file="${artifacts.mps}/lib/trove.jar" />
@@ -5103,7 +4790,7 @@
     </copy>
   </target>
   
-  <target name="java.compile.jetbrains.mps.coderules.testhelper" depends="java.compile.jetbrains.mps.coderules, java.compile.jetbrains.mps.coderules.runtime, java.compile.jetbrains.mps.coderules.typechecking, java.compile.jetbrains.mps.lang.coderules, java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.lang.typechecking.runtime, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
+  <target name="java.compile.jetbrains.mps.coderules.testhelper" depends="java.compile.jetbrains.mps.coderules, java.compile.jetbrains.mps.coderules.typechecking, java.compile.jetbrains.mps.lang.coderules, java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.lang.typechecking.runtime, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic.reactor, fetchDependencies">
     <mkdir dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.testhelper/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.coderules.testhelper" />
     <javac destdir="${build.tmp}/java/out/jetbrains.mps.coderules.testhelper" fork="true" encoding="utf8" includeantruntime="false" debug="true">
@@ -5134,7 +4821,6 @@
         <fileset file="${artifacts.mps}/lib/mps-icons.jar" />
         <fileset file="${artifacts.mps}/lib/mps-workbench.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.coderules" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.coderules.runtime" />
         <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.coderules.typechecking" />
         <fileset file="${artifacts.mps}/lib/mps-problem.jar" />
@@ -5145,11 +4831,9 @@
         <fileset file="${artifacts.mps}/lib/mps-scripts-rt.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.runtime" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.template" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typechecking.runtime" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
         <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules/lib/reactive-streams-1.0.0.final.jar" />
         <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules/lib/rxjava-2.2.18.jar" />
         <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules/lib/rxjava2-swing-0.3.7.jar" />
@@ -5178,7 +4862,6 @@
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
-        <fileset file="${artifacts.mps}/plugins/mps-testing/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.jar" />
         <fileset file="${artifacts.mps}/plugins/mps-testing/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.jar" />
@@ -5186,7 +4869,6 @@
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
-        <fileset file="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.typesystem.jar" />
         <fileset dir="${artifacts.mps}/plugins/mps-junit5/lib" includes="apiguardian-api-1.1.2.jar" />
@@ -5207,7 +4889,7 @@
     </copy>
   </target>
   
-  <target name="java.compile.jetbrains.mps.typechecking.testlang" depends="java.compile.jetbrains.mps.coderules, java.compile.jetbrains.mps.coderules.runtime, java.compile.jetbrains.mps.coderules.typechecking, java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.lang.typechecking.runtime, java.compile.jetbrains.mps.lang.types, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
+  <target name="java.compile.jetbrains.mps.typechecking.testlang" depends="java.compile.jetbrains.mps.coderules, java.compile.jetbrains.mps.coderules.typechecking, java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.lang.typechecking.runtime, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
     <mkdir dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.typechecking.testlang/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.typechecking.testlang" />
     <javac destdir="${build.tmp}/java/out/jetbrains.mps.typechecking.testlang" fork="true" encoding="utf8" includeantruntime="false" debug="true">
@@ -5238,19 +4920,16 @@
         <fileset file="${artifacts.mps}/lib/mps-icons.jar" />
         <fileset file="${artifacts.mps}/lib/mps-workbench.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.coderules" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.coderules.runtime" />
         <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.coderules.typechecking" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.runtime" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.template" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typechecking.runtime" />
+        <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-problem.jar" />
         <fileset file="${artifacts.mps}/lib/mps-feedback-api.jar" />
         <fileset file="${artifacts.mps}/lib/mps-messages-api.jar" />
         <fileset file="${artifacts.mps}/lib/mps-messages-for-rules.jar" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.types" />
-        <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-textgen.jar" />
         <fileset file="${artifacts.mps}/lib/mps-scripts-rt.jar" />
         <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules/lib/reactive-streams-1.0.0.final.jar" />
@@ -5276,19 +4955,13 @@
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/trove.jar" />
         <fileset file="${artifacts.mps}/languages/runtimes/jetbrains.mps.analyzers.runtime.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.regexp.runtime.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
         <fileset file="${artifacts.mps}/languages/runtimes/jetbrains.mps.dataFlow.runtime.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.aspect.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.aspects.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/runtimes/jetbrains.mps.lang.smodel.query.runtime.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.util.order.jar" />
       </classpath>
     </javac>
     <copy todir="${build.tmp}/java/out/jetbrains.mps.typechecking.testlang">
@@ -5371,7 +5044,7 @@
     </copy>
   </target>
   
-  <target name="java.compile.jetbrains.mps.coderules.typechecking.test" depends="java.compile.jetbrains.mps.coderules, java.compile.jetbrains.mps.coderules.runtime, java.compile.jetbrains.mps.coderules.testhelper, java.compile.jetbrains.mps.coderules.typechecking, java.compile.jetbrains.mps.coderules.typechecking.testlang.sandbox, java.compile.jetbrains.mps.lang.coderules, java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.lang.typechecking.runtime, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.logic.test, java.compile.jetbrains.mps.typechecking.testlang, fetchDependencies">
+  <target name="java.compile.jetbrains.mps.coderules.typechecking.test" depends="java.compile.jetbrains.mps.coderules, java.compile.jetbrains.mps.coderules.typechecking, java.compile.jetbrains.mps.coderules.typechecking.testlang.sandbox, java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.lang.typechecking.runtime, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.logic.test, java.compile.jetbrains.mps.typechecking.testlang, fetchDependencies">
     <mkdir dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.typechecking.test/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.coderules.typechecking.test" />
     <javac destdir="${build.tmp}/java/out/jetbrains.mps.coderules.typechecking.test" fork="true" encoding="utf8" includeantruntime="false" debug="true">
@@ -5403,25 +5076,20 @@
         <fileset file="${artifacts.mps}/lib/mps-icons.jar" />
         <fileset file="${artifacts.mps}/lib/mps-workbench.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.coderules" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.coderules.runtime" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.coderules.testhelper" />
         <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.coderules.typechecking" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.coderules.typechecking.testlang.sandbox" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.runtime" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typechecking.runtime" />
+        <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.logic.test" />
         <fileset file="${artifacts.mps}/lib/mps-problem.jar" />
         <fileset file="${artifacts.mps}/lib/mps-feedback-api.jar" />
         <fileset file="${artifacts.mps}/lib/mps-messages-api.jar" />
         <fileset file="${artifacts.mps}/lib/mps-messages-for-rules.jar" />
         <fileset file="${artifacts.mps}/lib/mps-textgen.jar" />
         <fileset file="${artifacts.mps}/lib/mps-scripts-rt.jar" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.runtime" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.template" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typechecking.runtime" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic" />
-        <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.logic.test" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking.testlang" />
         <fileset file="${artifacts.mps}/lib/mps-test.jar" />
         <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules/lib/reactive-streams-1.0.0.final.jar" />
@@ -5450,23 +5118,15 @@
         <fileset file="${artifacts.mps}/lib/trove.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.classifiers.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
         <fileset file="${artifacts.mps}/plugins/mps-testing/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.jar" />
         <fileset file="${artifacts.mps}/plugins/mps-testing/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.modelapi.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
         <fileset file="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.jar" />
         <fileset file="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.matcher.jar" />
         <fileset file="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.typesystem.jar" />
         <fileset dir="${artifacts.mps}/plugins/mps-junit5/lib" includes="apiguardian-api-1.1.2.jar" />
         <fileset dir="${artifacts.mps}/plugins/mps-junit5/lib" includes="junit-jupiter-api-5.9.3.jar" />
         <fileset dir="${artifacts.mps}/plugins/mps-junit5/lib" includes="junit-jupiter-engine-5.9.3.jar" />
@@ -5486,7 +5146,194 @@
     </copy>
   </target>
   
-  <target name="java.compile.jetbrains.mps.lang.coderules" depends="java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.lang.coderules.template, 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.coderules.runtime" depends="java.compile.jetbrains.mps.logic.reactor, java.compile.java.modules.cycle.1, fetchDependencies">
+    <mkdir dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.lang.coderules/runtime/source_gen" />
+    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.coderules.runtime" />
+    <javac destdir="${build.tmp}/java/out/jetbrains.mps.lang.coderules.runtime" fork="true" encoding="utf8" includeantruntime="false" debug="true">
+      <compilerarg value="-Xlint:none" />
+      <src>
+        <path location="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.lang.coderules/runtime/source_gen" />
+      </src>
+      <classpath>
+        <fileset file="${artifacts.mps}/lib/mps-core.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-openapi.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-references.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-context.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-constraints-runtime.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-persistence.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-project-check.jar" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
+        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/collection-0.7.jar" />
+        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/trove4j-3.0.3.jar" />
+        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.18.jar" />
+        <fileset file="${artifacts.mps}/lib/app.jar" />
+        <fileset file="${artifacts.mps}/lib/app-client.jar" />
+        <fileset file="${artifacts.mps}/lib/lib.jar" />
+        <fileset file="${artifacts.mps}/lib/lib-client.jar" />
+        <fileset file="${artifacts.mps}/lib/util.jar" />
+        <fileset file="${artifacts.mps}/lib/util_rt.jar" />
+        <fileset file="${artifacts.mps}/lib/util-8.jar" />
+        <fileset file="${artifacts.mps}/lib/forms_rt.jar" />
+        <fileset file="${artifacts.mps}/lib/java-frontback.jar" />
+        <fileset file="${artifacts.mps}/lib/java-impl.jar" />
+        <fileset file="${artifacts.mps}/lib/jps-model.jar" />
+        <fileset file="${artifacts.mps}/lib/testFramework.jar" />
+        <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
+        <fileset file="${artifacts.mps}/lib/annotations.jar" />
+        <fileset file="${artifacts.mps}/lib/trove.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
+        <pathelement path="${build.tmp}/java.modules.cycle.1" />
+      </classpath>
+    </javac>
+    <copy todir="${build.tmp}/java/out/jetbrains.mps.lang.coderules.runtime">
+      <fileset dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.lang.coderules/runtime/source_gen" excludes="**/*.java" />
+    </copy>
+  </target>
+  
+  <target name="java.compile.jetbrains.mps.coderules" depends="java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.lang.typechecking.runtime, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, java.compile.java.modules.cycle.4, fetchDependencies">
+    <mkdir dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules/source_gen" />
+    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.coderules" />
+    <javac destdir="${build.tmp}/java/out/jetbrains.mps.coderules" fork="true" encoding="utf8" includeantruntime="false" debug="true">
+      <compilerarg value="-Xlint:none" />
+      <src>
+        <path location="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules/source_gen" />
+      </src>
+      <classpath>
+        <fileset file="${artifacts.mps}/lib/mps-core.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-annotations.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-boot-util.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-closures.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-collections.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-references.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-context.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-constraints-runtime.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-persistence.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-generator.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-project-check.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-icons.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-workbench.jar" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.runtime" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typechecking.runtime" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
+        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules/lib/reactive-streams-1.0.0.final.jar" />
+        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules/lib/rxjava-2.2.18.jar" />
+        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules/lib/rxjava2-swing-0.3.7.jar" />
+        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/collection-0.7.jar" />
+        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/trove4j-3.0.3.jar" />
+        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.18.jar" />
+        <fileset file="${artifacts.mps}/lib/app.jar" />
+        <fileset file="${artifacts.mps}/lib/app-client.jar" />
+        <fileset file="${artifacts.mps}/lib/lib.jar" />
+        <fileset file="${artifacts.mps}/lib/lib-client.jar" />
+        <fileset file="${artifacts.mps}/lib/util.jar" />
+        <fileset file="${artifacts.mps}/lib/util_rt.jar" />
+        <fileset file="${artifacts.mps}/lib/util-8.jar" />
+        <fileset file="${artifacts.mps}/lib/forms_rt.jar" />
+        <fileset file="${artifacts.mps}/lib/java-frontback.jar" />
+        <fileset file="${artifacts.mps}/lib/java-impl.jar" />
+        <fileset file="${artifacts.mps}/lib/jps-model.jar" />
+        <fileset file="${artifacts.mps}/lib/testFramework.jar" />
+        <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
+        <fileset file="${artifacts.mps}/lib/annotations.jar" />
+        <fileset file="${artifacts.mps}/lib/trove.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
+        <pathelement path="${build.tmp}/java.modules.cycle.4" />
+      </classpath>
+    </javac>
+    <copy todir="${build.tmp}/java/out/jetbrains.mps.coderules">
+      <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules/source_gen" excludes="**/*.java" />
+    </copy>
+  </target>
+  
+  <target name="java.compile.jetbrains.mps.coderules.ui" depends="java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, java.compile.java.modules.cycle.4, fetchDependencies">
+    <mkdir dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.ui/source_gen" />
+    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.coderules.ui" />
+    <javac destdir="${build.tmp}/java/out/jetbrains.mps.coderules.ui" fork="true" encoding="utf8" includeantruntime="false" debug="true">
+      <compilerarg value="-Xlint:none" />
+      <src>
+        <path location="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.ui/source_gen" />
+      </src>
+      <classpath>
+        <fileset file="${artifacts.mps}/lib/mps-core.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-annotations.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-closures.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-collections.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-references.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-context.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-constraints-runtime.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-persistence.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-generator.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-project-check.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-icons.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-workbench.jar" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.runtime" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
+        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules/lib/reactive-streams-1.0.0.final.jar" />
+        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules/lib/rxjava-2.2.18.jar" />
+        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules/lib/rxjava2-swing-0.3.7.jar" />
+        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/collection-0.7.jar" />
+        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/trove4j-3.0.3.jar" />
+        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.18.jar" />
+        <fileset file="${artifacts.mps}/lib/app.jar" />
+        <fileset file="${artifacts.mps}/lib/app-client.jar" />
+        <fileset file="${artifacts.mps}/lib/lib.jar" />
+        <fileset file="${artifacts.mps}/lib/lib-client.jar" />
+        <fileset file="${artifacts.mps}/lib/util.jar" />
+        <fileset file="${artifacts.mps}/lib/util_rt.jar" />
+        <fileset file="${artifacts.mps}/lib/util-8.jar" />
+        <fileset file="${artifacts.mps}/lib/forms_rt.jar" />
+        <fileset file="${artifacts.mps}/lib/java-frontback.jar" />
+        <fileset file="${artifacts.mps}/lib/java-impl.jar" />
+        <fileset file="${artifacts.mps}/lib/jps-model.jar" />
+        <fileset file="${artifacts.mps}/lib/testFramework.jar" />
+        <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
+        <fileset file="${artifacts.mps}/lib/annotations.jar" />
+        <fileset file="${artifacts.mps}/lib/trove.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
+        <pathelement path="${build.tmp}/java.modules.cycle.4" />
+      </classpath>
+    </javac>
+    <copy todir="${build.tmp}/java/out/jetbrains.mps.coderules.ui">
+      <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.ui/source_gen" excludes="**/*.java" />
+    </copy>
+  </target>
+  
+  <target name="java.compile.jetbrains.mps.lang.coderules" depends="java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, java.compile.java.modules.cycle.2, fetchDependencies">
     <mkdir dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.lang.coderules/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.coderules" />
     <javac destdir="${build.tmp}/java/out/jetbrains.mps.lang.coderules" fork="true" encoding="utf8" includeantruntime="false" debug="true">
@@ -5509,7 +5356,6 @@
         <fileset file="${artifacts.mps}/lib/mps-persistence.jar" />
         <fileset file="${artifacts.mps}/lib/mps-project-check.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.runtime" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.template" />
         <fileset file="${artifacts.mps}/lib/mps-problem.jar" />
         <fileset file="${artifacts.mps}/lib/mps-feedback-api.jar" />
         <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
@@ -5568,7 +5414,7 @@
     </copy>
   </target>
   
-  <target name="java.compile.jetbrains.mps.lang.coderules#4578927328670739933" depends="java.compile.jetbrains.mps.lang.coderules, java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
+  <target name="java.compile.jetbrains.mps.lang.coderules#4578927328670739933" depends="java.compile.jetbrains.mps.lang.coderules, java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
     <mkdir dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.lang.coderules/generator/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.coderules#4578927328670739933" />
     <javac destdir="${build.tmp}/java/out/jetbrains.mps.lang.coderules#4578927328670739933" fork="true" encoding="utf8" includeantruntime="false" debug="true">
@@ -5604,7 +5450,6 @@
         <fileset file="${artifacts.mps}/lib/mps-scripts-rt.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.runtime" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.template" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
@@ -5646,285 +5491,7 @@
     </copy>
   </target>
   
-  <target name="java.compile.jetbrains.mps.lang.coderules.template" depends="java.compile.jetbrains.mps.coderules.runtime, java.compile.jetbrains.mps.logic.reactor, java.compile.java.modules.cycle.1, fetchDependencies">
-    <mkdir dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.lang.coderules.template/source_gen" />
-    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.coderules.template" />
-    <javac destdir="${build.tmp}/java/out/jetbrains.mps.lang.coderules.template" fork="true" encoding="utf8" includeantruntime="false" debug="true">
-      <compilerarg value="-Xlint:none" />
-      <src>
-        <path location="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.lang.coderules.template/source_gen" />
-      </src>
-      <classpath>
-        <fileset file="${artifacts.mps}/lib/mps-core.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-closures.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-collections.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-references.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-context.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-constraints-runtime.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-persistence.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-project-check.jar" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.coderules.runtime" />
-        <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/collection-0.7.jar" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/trove4j-3.0.3.jar" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.18.jar" />
-        <fileset file="${artifacts.mps}/lib/annotations.jar" />
-        <fileset file="${artifacts.mps}/lib/util-8.jar" />
-        <fileset file="${artifacts.mps}/lib/trove.jar" />
-        <fileset file="${artifacts.mps}/lib/app.jar" />
-        <fileset file="${artifacts.mps}/lib/app-client.jar" />
-        <fileset file="${artifacts.mps}/lib/lib.jar" />
-        <fileset file="${artifacts.mps}/lib/lib-client.jar" />
-        <fileset file="${artifacts.mps}/lib/util.jar" />
-        <fileset file="${artifacts.mps}/lib/util_rt.jar" />
-        <fileset file="${artifacts.mps}/lib/forms_rt.jar" />
-        <fileset file="${artifacts.mps}/lib/java-frontback.jar" />
-        <fileset file="${artifacts.mps}/lib/java-impl.jar" />
-        <fileset file="${artifacts.mps}/lib/jps-model.jar" />
-        <fileset file="${artifacts.mps}/lib/testFramework.jar" />
-        <fileset file="${artifacts.mps}/lib/stats.jar" />
-        <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.regexp.runtime.jar" />
-        <pathelement path="${build.tmp}/java.modules.cycle.1" />
-      </classpath>
-    </javac>
-    <copy todir="${build.tmp}/java/out/jetbrains.mps.lang.coderules.template">
-      <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.lang.coderules.template/source_gen" excludes="**/*.java" />
-    </copy>
-  </target>
-  
-  <target name="java.compile.jetbrains.mps.lang.coderules.runtime" depends="java.compile.jetbrains.mps.coderules.runtime, java.compile.jetbrains.mps.logic.reactor, java.compile.java.modules.cycle.1, fetchDependencies">
-    <mkdir dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.lang.coderules/runtime/source_gen" />
-    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.coderules.runtime" />
-    <javac destdir="${build.tmp}/java/out/jetbrains.mps.lang.coderules.runtime" fork="true" encoding="utf8" includeantruntime="false" debug="true">
-      <compilerarg value="-Xlint:none" />
-      <src>
-        <path location="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.lang.coderules/runtime/source_gen" />
-      </src>
-      <classpath>
-        <fileset file="${artifacts.mps}/lib/mps-core.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-closures.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-collections.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-references.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-context.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-constraints-runtime.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-persistence.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-project-check.jar" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.coderules.runtime" />
-        <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/collection-0.7.jar" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/trove4j-3.0.3.jar" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.18.jar" />
-        <fileset file="${artifacts.mps}/lib/annotations.jar" />
-        <fileset file="${artifacts.mps}/lib/util-8.jar" />
-        <fileset file="${artifacts.mps}/lib/trove.jar" />
-        <fileset file="${artifacts.mps}/lib/app.jar" />
-        <fileset file="${artifacts.mps}/lib/app-client.jar" />
-        <fileset file="${artifacts.mps}/lib/lib.jar" />
-        <fileset file="${artifacts.mps}/lib/lib-client.jar" />
-        <fileset file="${artifacts.mps}/lib/util.jar" />
-        <fileset file="${artifacts.mps}/lib/util_rt.jar" />
-        <fileset file="${artifacts.mps}/lib/forms_rt.jar" />
-        <fileset file="${artifacts.mps}/lib/java-frontback.jar" />
-        <fileset file="${artifacts.mps}/lib/java-impl.jar" />
-        <fileset file="${artifacts.mps}/lib/jps-model.jar" />
-        <fileset file="${artifacts.mps}/lib/testFramework.jar" />
-        <fileset file="${artifacts.mps}/lib/stats.jar" />
-        <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
-        <pathelement path="${build.tmp}/java.modules.cycle.1" />
-      </classpath>
-    </javac>
-    <copy todir="${build.tmp}/java/out/jetbrains.mps.lang.coderules.runtime">
-      <fileset dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.lang.coderules/runtime/source_gen" excludes="**/*.java" />
-    </copy>
-  </target>
-  
-  <target name="java.compile.jetbrains.mps.coderules.runtime" depends="fetchDependencies">
-    <mkdir dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.runtime/source_gen" />
-    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.coderules.runtime" />
-    <javac destdir="${build.tmp}/java/out/jetbrains.mps.coderules.runtime" fork="true" encoding="utf8" includeantruntime="false" debug="true">
-      <compilerarg value="-Xlint:none" />
-      <src>
-        <path location="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.runtime/source_gen" />
-      </src>
-      <classpath>
-        <fileset file="${artifacts.mps}/lib/mps-core.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-closures.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-collections.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-references.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-context.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-constraints-runtime.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-persistence.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-project-check.jar" />
-        <fileset file="${artifacts.mps}/lib/annotations.jar" />
-        <fileset file="${artifacts.mps}/lib/util-8.jar" />
-        <fileset file="${artifacts.mps}/lib/trove.jar" />
-      </classpath>
-    </javac>
-    <copy todir="${build.tmp}/java/out/jetbrains.mps.coderules.runtime">
-      <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.runtime/source_gen" excludes="**/*.java" />
-    </copy>
-  </target>
-  
-  <target name="java.compile.jetbrains.mps.coderules" depends="java.compile.jetbrains.mps.coderules.runtime, java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.lang.typechecking.runtime, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, java.compile.java.modules.cycle.4, fetchDependencies">
-    <mkdir dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules/source_gen" />
-    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.coderules" />
-    <javac destdir="${build.tmp}/java/out/jetbrains.mps.coderules" fork="true" encoding="utf8" includeantruntime="false" debug="true">
-      <compilerarg value="-Xlint:none" />
-      <src>
-        <path location="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules/source_gen" />
-      </src>
-      <classpath>
-        <fileset file="${artifacts.mps}/lib/mps-core.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-closures.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-collections.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-references.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-context.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-constraints-runtime.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-persistence.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-project-check.jar" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.coderules.runtime" />
-        <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-generator.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-icons.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-workbench.jar" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.runtime" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.template" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typechecking.runtime" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules/lib/reactive-streams-1.0.0.final.jar" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules/lib/rxjava-2.2.18.jar" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules/lib/rxjava2-swing-0.3.7.jar" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/collection-0.7.jar" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/trove4j-3.0.3.jar" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.18.jar" />
-        <fileset file="${artifacts.mps}/lib/annotations.jar" />
-        <fileset file="${artifacts.mps}/lib/util-8.jar" />
-        <fileset file="${artifacts.mps}/lib/trove.jar" />
-        <fileset file="${artifacts.mps}/lib/app.jar" />
-        <fileset file="${artifacts.mps}/lib/app-client.jar" />
-        <fileset file="${artifacts.mps}/lib/lib.jar" />
-        <fileset file="${artifacts.mps}/lib/lib-client.jar" />
-        <fileset file="${artifacts.mps}/lib/util.jar" />
-        <fileset file="${artifacts.mps}/lib/util_rt.jar" />
-        <fileset file="${artifacts.mps}/lib/forms_rt.jar" />
-        <fileset file="${artifacts.mps}/lib/java-frontback.jar" />
-        <fileset file="${artifacts.mps}/lib/java-impl.jar" />
-        <fileset file="${artifacts.mps}/lib/jps-model.jar" />
-        <fileset file="${artifacts.mps}/lib/testFramework.jar" />
-        <fileset file="${artifacts.mps}/lib/stats.jar" />
-        <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
-        <pathelement path="${build.tmp}/java.modules.cycle.4" />
-      </classpath>
-    </javac>
-    <copy todir="${build.tmp}/java/out/jetbrains.mps.coderules">
-      <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules/source_gen" excludes="**/*.java" />
-    </copy>
-  </target>
-  
-  <target name="java.compile.jetbrains.mps.coderules.ui" depends="java.compile.jetbrains.mps.coderules.runtime, java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, java.compile.java.modules.cycle.4, fetchDependencies">
-    <mkdir dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.ui/source_gen" />
-    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.coderules.ui" />
-    <javac destdir="${build.tmp}/java/out/jetbrains.mps.coderules.ui" fork="true" encoding="utf8" includeantruntime="false" debug="true">
-      <compilerarg value="-Xlint:none" />
-      <src>
-        <path location="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.ui/source_gen" />
-      </src>
-      <classpath>
-        <fileset file="${artifacts.mps}/lib/mps-core.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-annotations.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-closures.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-collections.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-references.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-context.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-constraints-runtime.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-persistence.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-generator.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-project-check.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-icons.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-workbench.jar" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.coderules.runtime" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.runtime" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.template" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules/lib/reactive-streams-1.0.0.final.jar" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules/lib/rxjava-2.2.18.jar" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules/lib/rxjava2-swing-0.3.7.jar" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/collection-0.7.jar" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/trove4j-3.0.3.jar" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.18.jar" />
-        <fileset file="${artifacts.mps}/lib/app.jar" />
-        <fileset file="${artifacts.mps}/lib/app-client.jar" />
-        <fileset file="${artifacts.mps}/lib/lib.jar" />
-        <fileset file="${artifacts.mps}/lib/lib-client.jar" />
-        <fileset file="${artifacts.mps}/lib/util.jar" />
-        <fileset file="${artifacts.mps}/lib/util_rt.jar" />
-        <fileset file="${artifacts.mps}/lib/util-8.jar" />
-        <fileset file="${artifacts.mps}/lib/forms_rt.jar" />
-        <fileset file="${artifacts.mps}/lib/java-frontback.jar" />
-        <fileset file="${artifacts.mps}/lib/java-impl.jar" />
-        <fileset file="${artifacts.mps}/lib/jps-model.jar" />
-        <fileset file="${artifacts.mps}/lib/testFramework.jar" />
-        <fileset file="${artifacts.mps}/lib/stats.jar" />
-        <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/annotations.jar" />
-        <fileset file="${artifacts.mps}/lib/trove.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
-        <pathelement path="${build.tmp}/java.modules.cycle.4" />
-      </classpath>
-    </javac>
-    <copy todir="${build.tmp}/java/out/jetbrains.mps.coderules.ui">
-      <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.ui/source_gen" excludes="**/*.java" />
-    </copy>
-  </target>
-  
-  <target name="java.compile.jetbrains.mps.coderules.test" depends="java.compile.jetbrains.mps.coderules, java.compile.jetbrains.mps.coderules.runtime, java.compile.jetbrains.mps.coderules.typechecking, java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.lang.typechecking.runtime, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
+  <target name="java.compile.jetbrains.mps.coderules.test" depends="java.compile.jetbrains.mps.coderules, java.compile.jetbrains.mps.coderules.typechecking, java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.lang.typechecking.runtime, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
     <mkdir dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.test/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.coderules.test" />
     <javac destdir="${build.tmp}/java/out/jetbrains.mps.coderules.test" fork="true" encoding="utf8" includeantruntime="false" debug="true">
@@ -5956,11 +5523,9 @@
         <fileset file="${artifacts.mps}/lib/mps-icons.jar" />
         <fileset file="${artifacts.mps}/lib/mps-workbench.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.coderules" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.coderules.runtime" />
         <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.coderules.typechecking" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.runtime" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.template" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typechecking.runtime" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
@@ -6082,7 +5647,6 @@
   <target name="cleanSources">
     <delete dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.build/source_gen" />
     <delete dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.ideaplugin/source_gen" />
-    <delete dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.runtime/source_gen" />
     <delete dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.lang.coderules/generator/source_gen" />
     <delete dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.lang.typechecking.runtime/source_gen" />
     <delete dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.logic/generator/source_gen" />
diff --git a/coderules/devkits/jetbrains.mps.devkit.aspect.types/jetbrains.mps.devkit.aspect.types.devkit b/coderules/devkits/jetbrains.mps.devkit.aspect.types/jetbrains.mps.devkit.aspect.types.devkit
index d5aeed34..7c92b222 100644
--- a/coderules/devkits/jetbrains.mps.devkit.aspect.types/jetbrains.mps.devkit.aspect.types.devkit
+++ b/coderules/devkits/jetbrains.mps.devkit.aspect.types/jetbrains.mps.devkit.aspect.types.devkit
@@ -9,6 +9,8 @@
   </extendedDevKits>
   <exported-solutions>
     <exported-solution>f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)</exported-solution>
+    <exported-solution>a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)</exported-solution>
+    <exported-solution>6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.coderules.typechecking)</exported-solution>
   </exported-solutions>
   <generation-plan model="r:32ed3462-7683-4dc2-8b0b-8bb7ef0f8860(jetbrains.mps.lang.descriptor.aspects.types@genplan)" />
 </dev-kit>
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps b/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps
index 3df0371d..5a81c940 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps
@@ -24,22 +24,22 @@
     <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
     <import index="18ew" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.util(MPS.Core/)" />
     <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.coderules.template)" />
     <import index="x5bw" ref="r:15ea4f4e-2f41-4ce3-b7e4-a4e0737f0171(jetbrains.mps.lang.coderules.behavior)" />
     <import index="ha02" ref="r:09e53496-6477-45e7-abd5-eaf3fac3b360(jetbrains.mps.logic.behavior)" />
     <import index="bj13" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.logical(jetbrains.mps.logic.reactor/)" />
     <import index="w7la" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.evaluation(jetbrains.mps.logic.reactor/)" />
     <import index="av0y" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.program(jetbrains.mps.logic.reactor/)" />
-    <import index="cxk7" ref="r:daa544a7-0a5c-49c0-a54c-4c2a5b4868aa(jetbrains.mps.logic.predicate)" />
     <import index="w1kc" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel(MPS.Core/)" />
     <import index="hy7p" ref="r:01ee26d6-df00-4ffb-931c-1ddec5984886(jetbrains.mps.lang.coderules.util)" />
-    <import index="fqlx" ref="r:2cc226a9-8a78-4010-b962-823343fd28ff(jetbrains.mps.lang.coderules.aspect)" />
-    <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.dataform)" />
     <import index="hano" ref="r:2b43b673-12f9-49ea-8e43-d0c7a401586a(jetbrains.mps.lang.coderules.eval)" />
-    <import index="oy3s" ref="r:a6030cee-34eb-4503-b1bf-015fe5cd8c1a(jetbrains.mps.logic.unification)" />
     <import index="i8bi" ref="r:c3548bac-30eb-4a2a-937c-0111d5697309(jetbrains.mps.lang.smodel.generator.smodelAdapter)" />
-    <import index="jpi6" ref="r:4c913df4-f2d5-43f7-af56-6bccd35aeb11(jetbrains.mps.lang.coderules.terms)" />
     <import index="tpek" ref="r:00000000-0000-4000-0000-011c895902c0(jetbrains.mps.baseLanguage.behavior)" />
+    <import index="pxw9" ref="r:e3417884-ba0a-4330-9cea-64f01ace2e9d(jetbrains.mps.lang.coderules.aspect)" />
+    <import index="ugy2" ref="r:57b2449f-b7c7-4941-bd75-9c594835f5cd(jetbrains.mps.lang.coderules.template)" />
+    <import index="tpfl" ref="r:97d6f79f-4a27-4a9b-9122-9bccfb5317c9(jetbrains.mps.lang.coderules.predicate)" />
+    <import index="hh42" ref="r:75494708-a5bf-40c3-8a06-1176e662985f(jetbrains.mps.lang.coderules.terms)" />
+    <import index="cof4" ref="r:0a9d1d47-250c-4f98-8962-b65edf8b0721(jetbrains.mps.logic.dataform)" />
+    <import index="uwx2" ref="r:76101703-3fc5-4e76-aa48-9728dde91f7b(jetbrains.mps.logic.unification)" />
     <import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" implicit="true" />
   </imports>
   <registry>
@@ -1355,7 +1355,7 @@
           <node concept="37vLTG" id="36tQV5AIPgp" role="3clF46">
             <property role="TrG5h" value="session" />
             <node concept="3uibUv" id="36tQV5AIPgq" role="1tU5fm">
-              <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
+              <ref role="3uigEE" to="ugy2:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
             </node>
           </node>
           <node concept="3Tm6S6" id="36tQV5AIMHt" role="1B3o_S" />
@@ -1368,7 +1368,7 @@
                   <node concept="YeOm9" id="36tQV5AIQSJ" role="2ShVmc">
                     <node concept="1Y3b0j" id="36tQV5AIQSM" role="YeSDq">
                       <property role="2bfB8j" value="true" />
-                      <ref role="1Y3XeK" to="i348:36tQV5AurZW" resolve="ConstraintRuleTemplate" />
+                      <ref role="1Y3XeK" to="ugy2:36tQV5AurZW" resolve="ConstraintRuleTemplate" />
                       <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
                       <node concept="3Tm1VV" id="36tQV5AIQSN" role="1B3o_S" />
                       <node concept="3clFb_" id="36tQV5AIQSO" role="jymVt">
@@ -1377,7 +1377,7 @@
                         <node concept="37vLTG" id="36tQV5AIQSP" role="3clF46">
                           <property role="TrG5h" value="session" />
                           <node concept="3uibUv" id="36tQV5AIQSQ" role="1tU5fm">
-                            <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
+                            <ref role="3uigEE" to="ugy2:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
                           </node>
                         </node>
                         <node concept="3Tm1VV" id="36tQV5AIQSR" role="1B3o_S" />
@@ -1475,7 +1475,7 @@
               <node concept="37vLTG" id="36tQV5BDvmb" role="3clF46">
                 <property role="TrG5h" value="session" />
                 <node concept="3uibUv" id="36tQV5BDvmc" role="1tU5fm">
-                  <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
+                  <ref role="3uigEE" to="ugy2:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
                 </node>
               </node>
               <node concept="3Tm6S6" id="36tQV5BDvmd" role="1B3o_S" />
@@ -1485,7 +1485,7 @@
                 <node concept="3clFbF" id="36tQV5BDwQu" role="3cqZAp">
                   <node concept="2OqwBi" id="36tQV5BDxd7" role="3clFbG">
                     <node concept="liA8E" id="36tQV5BI$tI" role="2OqNvi">
-                      <ref role="37wK5l" to="i348:2LxIQemVPgW" resolve="require" />
+                      <ref role="37wK5l" to="ugy2:2LxIQemVPgW" resolve="require" />
                       <node concept="10Nm6u" id="2LxIQemW2oU" role="37wK5m">
                         <node concept="1sPUBX" id="2LxIQemW2oV" role="lGtFl">
                           <ref role="v9R2y" node="2LxIQen0ctm" resolve="implicit_rule_input_reference" />
@@ -1551,7 +1551,7 @@
             <node concept="37vLTG" id="2LxIQemW7oq" role="3clF46">
               <property role="TrG5h" value="session" />
               <node concept="3uibUv" id="2LxIQemW7or" role="1tU5fm">
-                <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
+                <ref role="3uigEE" to="ugy2:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
               </node>
             </node>
             <node concept="3Tm6S6" id="2LxIQemW7os" role="1B3o_S" />
@@ -1561,7 +1561,7 @@
               <node concept="3clFbF" id="2LxIQemW7ow" role="3cqZAp">
                 <node concept="2OqwBi" id="2LxIQemW7ox" role="3clFbG">
                   <node concept="liA8E" id="2LxIQemW7oy" role="2OqNvi">
-                    <ref role="37wK5l" to="i348:36tQV5BDE0Q" resolve="require" />
+                    <ref role="37wK5l" to="ugy2:36tQV5BDE0Q" resolve="require" />
                     <node concept="10Nm6u" id="2LxIQemW7o_" role="37wK5m">
                       <node concept="29HgVG" id="2LxIQemW7oA" role="lGtFl">
                         <node concept="3NFfHV" id="2LxIQemW7oB" role="3NFExx">
@@ -1647,7 +1647,7 @@
               <node concept="37vLTG" id="12QmIo$yT8b" role="3clF46">
                 <property role="TrG5h" value="session" />
                 <node concept="3uibUv" id="12QmIo$yT8c" role="1tU5fm">
-                  <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
+                  <ref role="3uigEE" to="ugy2:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
                 </node>
               </node>
               <node concept="3Tm6S6" id="12QmIo$yT8d" role="1B3o_S" />
@@ -1657,7 +1657,7 @@
                 <node concept="3clFbF" id="12QmIo$yT8h" role="3cqZAp">
                   <node concept="2OqwBi" id="12QmIo$yT8i" role="3clFbG">
                     <node concept="liA8E" id="12QmIo$yT8j" role="2OqNvi">
-                      <ref role="37wK5l" to="i348:2LxIQemVXlq" resolve="requireAll" />
+                      <ref role="37wK5l" to="ugy2:2LxIQemVXlq" resolve="requireAll" />
                       <node concept="10Nm6u" id="2LxIQemW2EU" role="37wK5m">
                         <node concept="1sPUBX" id="2LxIQemW2EV" role="lGtFl">
                           <ref role="v9R2y" node="2LxIQen0ctm" resolve="implicit_rule_input_reference" />
@@ -1723,7 +1723,7 @@
             <node concept="37vLTG" id="2LxIQemW9M7" role="3clF46">
               <property role="TrG5h" value="session" />
               <node concept="3uibUv" id="2LxIQemW9M8" role="1tU5fm">
-                <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
+                <ref role="3uigEE" to="ugy2:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
               </node>
             </node>
             <node concept="3Tm6S6" id="2LxIQemW9M9" role="1B3o_S" />
@@ -1733,7 +1733,7 @@
               <node concept="3clFbF" id="2LxIQemW9Md" role="3cqZAp">
                 <node concept="2OqwBi" id="2LxIQemW9Me" role="3clFbG">
                   <node concept="liA8E" id="2LxIQemW9Mf" role="2OqNvi">
-                    <ref role="37wK5l" to="i348:12QmIo$ylEC" resolve="requireAll" />
+                    <ref role="37wK5l" to="ugy2:12QmIo$ylEC" resolve="requireAll" />
                     <node concept="10Nm6u" id="2LxIQemW9Mi" role="37wK5m">
                       <node concept="29HgVG" id="2LxIQemW9Mj" role="lGtFl">
                         <node concept="3NFfHV" id="2LxIQemW9Mk" role="3NFExx">
@@ -1918,7 +1918,7 @@
           <node concept="37vLTG" id="61G6TdBo87A" role="3clF46">
             <property role="TrG5h" value="session" />
             <node concept="3uibUv" id="61G6TdBo87B" role="1tU5fm">
-              <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
+              <ref role="3uigEE" to="ugy2:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
             </node>
           </node>
           <node concept="37vLTG" id="C1f6iEPj1q" role="3clF46">
@@ -1934,7 +1934,7 @@
             <node concept="3clFbF" id="61G6TdBo87G" role="3cqZAp">
               <node concept="2OqwBi" id="61G6TdBo87H" role="3clFbG">
                 <node concept="liA8E" id="61G6TdBo87I" role="2OqNvi">
-                  <ref role="37wK5l" to="i348:3Pxu0s8x4Kl" resolve="reportFeedback" />
+                  <ref role="37wK5l" to="ugy2:3Pxu0s8x4Kl" resolve="reportFeedback" />
                   <node concept="37vLTw" id="C1f6iEPjFs" role="37wK5m">
                     <ref role="3cqZAo" node="C1f6iEPj1q" resolve="input" />
                     <node concept="1sPUBX" id="C1f6iEPjXU" role="lGtFl">
@@ -2021,7 +2021,7 @@
           <node concept="37vLTG" id="5HVB6JR7KJx" role="3clF46">
             <property role="TrG5h" value="session" />
             <node concept="3uibUv" id="5HVB6JR7KJy" role="1tU5fm">
-              <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
+              <ref role="3uigEE" to="ugy2:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
             </node>
           </node>
           <node concept="3Tm6S6" id="5HVB6JR7KJz" role="1B3o_S" />
@@ -2031,7 +2031,7 @@
             <node concept="3clFbF" id="5HVB6JR7KJB" role="3cqZAp">
               <node concept="2OqwBi" id="5HVB6JR7KJC" role="3clFbG">
                 <node concept="liA8E" id="5HVB6JR7KJD" role="2OqNvi">
-                  <ref role="37wK5l" to="i348:5HVB6JR7NAD" resolve="memoize" />
+                  <ref role="37wK5l" to="ugy2:5HVB6JR7NAD" resolve="memoize" />
                   <node concept="10Nm6u" id="5HVB6JR8u3o" role="37wK5m">
                     <node concept="29HgVG" id="5HVB6JR8u8z" role="lGtFl">
                       <node concept="3NFfHV" id="5HVB6JR8u8$" role="3NFExx">
@@ -2106,7 +2106,7 @@
           <node concept="37vLTG" id="ZNYuguqhp2" role="3clF46">
             <property role="TrG5h" value="session" />
             <node concept="3uibUv" id="ZNYuguqhp3" role="1tU5fm">
-              <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
+              <ref role="3uigEE" to="ugy2:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
             </node>
           </node>
           <node concept="3Tm6S6" id="ZNYuguqhp4" role="1B3o_S" />
@@ -2116,7 +2116,7 @@
             <node concept="3clFbF" id="ZNYuguqhp8" role="3cqZAp">
               <node concept="2OqwBi" id="ZNYuguqhp9" role="3clFbG">
                 <node concept="liA8E" id="ZNYuguqhpa" role="2OqNvi">
-                  <ref role="37wK5l" to="i348:ZNYuguqmlg" resolve="resolve" />
+                  <ref role="37wK5l" to="ugy2:ZNYuguqmlg" resolve="resolve" />
                   <node concept="2YIFZM" id="ZNYuguqWvO" role="37wK5m">
                     <ref role="1Pybhc" to="w1kc:~SNodePointer" resolve="SNodePointer" />
                     <ref role="37wK5l" to="w1kc:~SNodePointer.deserialize(java.lang.String)" resolve="deserialize" />
@@ -2247,7 +2247,7 @@
           <node concept="37vLTG" id="34$A1Mfs$fh" role="3clF46">
             <property role="TrG5h" value="session" />
             <node concept="3uibUv" id="34$A1Mfs$R7" role="1tU5fm">
-              <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
+              <ref role="3uigEE" to="ugy2:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
             </node>
           </node>
           <node concept="3cqZAl" id="4sSe4$oM8ed" role="3clF45" />
@@ -2258,7 +2258,7 @@
                 <node concept="2OqwBi" id="4sSe4$oMmCC" role="2Oq$k0">
                   <node concept="2ShNRf" id="4sSe4$oMcNl" role="2Oq$k0">
                     <node concept="1pGfFk" id="4sSe4$oMiQP" role="2ShVmc">
-                      <ref role="37wK5l" to="i348:4sSe4$oM2rk" resolve="ConstraintBuilder" />
+                      <ref role="37wK5l" to="ugy2:4sSe4$oM2rk" resolve="ConstraintBuilder" />
                       <node concept="10Nm6u" id="2WtKs4t_Kb8" role="37wK5m">
                         <node concept="5jKBG" id="2WtKs4t_Kb9" role="lGtFl">
                           <ref role="v9R2y" node="2WtKs4tys2W" resolve="constraint_sym" />
@@ -2279,7 +2279,7 @@
                     </node>
                   </node>
                   <node concept="liA8E" id="4sSe4$oMnlX" role="2OqNvi">
-                    <ref role="37wK5l" to="i348:4sSe4$oM2sT" resolve="withArguments" />
+                    <ref role="37wK5l" to="ugy2:4sSe4$oM2sT" resolve="withArguments" />
                     <node concept="10Nm6u" id="4sSe4$oMnYP" role="37wK5m">
                       <node concept="2b32R4" id="4sSe4$oMnYQ" role="lGtFl">
                         <node concept="3JmXsc" id="4sSe4$oMnYR" role="2P8S$">
@@ -2299,7 +2299,7 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="4sSe4$oMppe" role="2OqNvi">
-                  <ref role="37wK5l" to="i348:4sSe4$oM2zI" resolve="toConstraint" />
+                  <ref role="37wK5l" to="ugy2:4sSe4$oM2zI" resolve="toConstraint" />
                 </node>
                 <node concept="raruj" id="4sSe4$oMq3O" role="lGtFl" />
               </node>
@@ -2354,7 +2354,7 @@
           <node concept="37vLTG" id="34$A1MfsBWM" role="3clF46">
             <property role="TrG5h" value="session" />
             <node concept="3uibUv" id="34$A1MfsBWN" role="1tU5fm">
-              <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
+              <ref role="3uigEE" to="ugy2:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
             </node>
           </node>
           <node concept="3cqZAl" id="4sSe4$p4Qe1" role="3clF45" />
@@ -2366,7 +2366,7 @@
                   <node concept="2OqwBi" id="4sSe4$p4Qe7" role="2Oq$k0">
                     <node concept="2ShNRf" id="4sSe4$p4Qe8" role="2Oq$k0">
                       <node concept="1pGfFk" id="4sSe4$p4Qe9" role="2ShVmc">
-                        <ref role="37wK5l" to="i348:4sSe4$oM2rk" resolve="ConstraintBuilder" />
+                        <ref role="37wK5l" to="ugy2:4sSe4$oM2rk" resolve="ConstraintBuilder" />
                         <node concept="10Nm6u" id="2WtKs4t_KiD" role="37wK5m">
                           <node concept="5jKBG" id="2WtKs4t_KiE" role="lGtFl">
                             <ref role="v9R2y" node="2WtKs4tys2W" resolve="constraint_sym" />
@@ -2387,7 +2387,7 @@
                       </node>
                     </node>
                     <node concept="liA8E" id="4sSe4$p4Qew" role="2OqNvi">
-                      <ref role="37wK5l" to="i348:4sSe4$oM2sT" resolve="withArguments" />
+                      <ref role="37wK5l" to="ugy2:4sSe4$oM2sT" resolve="withArguments" />
                       <node concept="10Nm6u" id="4sSe4$p4Qex" role="37wK5m">
                         <node concept="2b32R4" id="4sSe4$p4Qey" role="lGtFl">
                           <node concept="3JmXsc" id="4sSe4$p4Qez" role="2P8S$">
@@ -2450,7 +2450,7 @@
                     </node>
                   </node>
                   <node concept="liA8E" id="4sSe4$p4QeD" role="2OqNvi">
-                    <ref role="37wK5l" to="i348:4sSe4$oM05h" resolve="withPatternLogicals" />
+                    <ref role="37wK5l" to="ugy2:4sSe4$oM05h" resolve="withPatternLogicals" />
                     <node concept="10Nm6u" id="4sSe4$p549E" role="37wK5m">
                       <node concept="2b32R4" id="4sSe4$p5B3e" role="lGtFl">
                         <node concept="3JmXsc" id="4sSe4$p5B3h" role="2P8S$">
@@ -2513,7 +2513,7 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="4sSe4$p4QeE" role="2OqNvi">
-                  <ref role="37wK5l" to="i348:4sSe4$oM2zI" resolve="toConstraint" />
+                  <ref role="37wK5l" to="ugy2:4sSe4$oM2zI" resolve="toConstraint" />
                 </node>
                 <node concept="raruj" id="4sSe4$p4QeF" role="lGtFl" />
               </node>
@@ -2571,15 +2571,15 @@
                 <node concept="2OqwBi" id="4sSe4$oNkWH" role="2Oq$k0">
                   <node concept="2ShNRf" id="4sSe4$oNii8" role="2Oq$k0">
                     <node concept="1pGfFk" id="4sSe4$oNjiF" role="2ShVmc">
-                      <ref role="37wK5l" to="i348:4sSe4$oM2B4" resolve="PredicateBuilder" />
+                      <ref role="37wK5l" to="ugy2:4sSe4$oM2B4" resolve="PredicateBuilder" />
                       <node concept="10M0yZ" id="4sSe4$oNkqg" role="37wK5m">
-                        <ref role="1PxDUh" to="cxk7:2GO7tyJVmP4" resolve="UnificationPredicate" />
-                        <ref role="3cqZAo" to="cxk7:5uFPQ7C29mw" resolve="UNI_SYM" />
+                        <ref role="1PxDUh" to="tpfl:2GO7tyJVmP4" resolve="UnificationPredicate" />
+                        <ref role="3cqZAo" to="tpfl:5uFPQ7C29mw" resolve="UNI_SYM" />
                       </node>
                     </node>
                   </node>
                   <node concept="liA8E" id="4sSe4$oNlwW" role="2OqNvi">
-                    <ref role="37wK5l" to="i348:4sSe4$oM2Bb" resolve="withArguments" />
+                    <ref role="37wK5l" to="ugy2:4sSe4$oM2Bb" resolve="withArguments" />
                     <node concept="10Nm6u" id="4sSe4$oNm3g" role="37wK5m">
                       <node concept="29HgVG" id="4sSe4$oNm3h" role="lGtFl">
                         <node concept="3NFfHV" id="4sSe4$oNm3i" role="3NFExx">
@@ -2615,7 +2615,7 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="4sSe4$oNneG" role="2OqNvi">
-                  <ref role="37wK5l" to="i348:4sSe4$oM2Bs" resolve="toPredicate" />
+                  <ref role="37wK5l" to="ugy2:4sSe4$oM2Bs" resolve="toPredicate" />
                 </node>
                 <node concept="raruj" id="4sSe4$oNrUd" role="lGtFl" />
               </node>
@@ -2637,15 +2637,15 @@
                 <node concept="2OqwBi" id="4boCUQu3b5Z" role="2Oq$k0">
                   <node concept="2ShNRf" id="4boCUQu3b60" role="2Oq$k0">
                     <node concept="1pGfFk" id="4boCUQu3b61" role="2ShVmc">
-                      <ref role="37wK5l" to="i348:4sSe4$oM2B4" resolve="PredicateBuilder" />
+                      <ref role="37wK5l" to="ugy2:4sSe4$oM2B4" resolve="PredicateBuilder" />
                       <node concept="10M0yZ" id="4boCUQu3b62" role="37wK5m">
-                        <ref role="1PxDUh" to="cxk7:2GO7tyJVmP4" resolve="UnificationPredicate" />
-                        <ref role="3cqZAo" to="cxk7:5uFPQ7C29mw" resolve="UNI_SYM" />
+                        <ref role="1PxDUh" to="tpfl:2GO7tyJVmP4" resolve="UnificationPredicate" />
+                        <ref role="3cqZAo" to="tpfl:5uFPQ7C29mw" resolve="UNI_SYM" />
                       </node>
                     </node>
                   </node>
                   <node concept="liA8E" id="4boCUQu3b63" role="2OqNvi">
-                    <ref role="37wK5l" to="i348:4sSe4$oM2Bb" resolve="withArguments" />
+                    <ref role="37wK5l" to="ugy2:4sSe4$oM2Bb" resolve="withArguments" />
                     <node concept="10Nm6u" id="4boCUQu3b64" role="37wK5m">
                       <node concept="29HgVG" id="4boCUQu3b65" role="lGtFl">
                         <node concept="3NFfHV" id="4boCUQu3b66" role="3NFExx">
@@ -2681,7 +2681,7 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="4boCUQu3b6k" role="2OqNvi">
-                  <ref role="37wK5l" to="i348:4sSe4$oM2Bs" resolve="toPredicate" />
+                  <ref role="37wK5l" to="ugy2:4sSe4$oM2Bs" resolve="toPredicate" />
                 </node>
                 <node concept="raruj" id="4boCUQu3b6l" role="lGtFl" />
               </node>
@@ -2703,15 +2703,15 @@
                 <node concept="2OqwBi" id="1CcQBrQdWyc" role="2Oq$k0">
                   <node concept="2ShNRf" id="1CcQBrQdWyd" role="2Oq$k0">
                     <node concept="1pGfFk" id="1CcQBrQdWye" role="2ShVmc">
-                      <ref role="37wK5l" to="i348:4sSe4$oM2B4" resolve="PredicateBuilder" />
+                      <ref role="37wK5l" to="ugy2:4sSe4$oM2B4" resolve="PredicateBuilder" />
                       <node concept="10M0yZ" id="1CcQBrQdWyf" role="37wK5m">
-                        <ref role="1PxDUh" to="cxk7:3HJTsBn4kk_" resolve="EqualsPredicate" />
-                        <ref role="3cqZAo" to="cxk7:5uFPQ7C23RV" resolve="EQ_SYM" />
+                        <ref role="1PxDUh" to="tpfl:3HJTsBn4kk_" resolve="EqualsPredicate" />
+                        <ref role="3cqZAo" to="tpfl:5uFPQ7C23RV" resolve="EQ_SYM" />
                       </node>
                     </node>
                   </node>
                   <node concept="liA8E" id="1CcQBrQdWyg" role="2OqNvi">
-                    <ref role="37wK5l" to="i348:4sSe4$oM2Bb" resolve="withArguments" />
+                    <ref role="37wK5l" to="ugy2:4sSe4$oM2Bb" resolve="withArguments" />
                     <node concept="10Nm6u" id="1CcQBrQdWyh" role="37wK5m">
                       <node concept="29HgVG" id="1CcQBrQdWyi" role="lGtFl">
                         <node concept="3NFfHV" id="1CcQBrQdWyj" role="3NFExx">
@@ -2747,7 +2747,7 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="1CcQBrQdWyx" role="2OqNvi">
-                  <ref role="37wK5l" to="i348:4sSe4$oM2Bs" resolve="toPredicate" />
+                  <ref role="37wK5l" to="ugy2:4sSe4$oM2Bs" resolve="toPredicate" />
                 </node>
                 <node concept="raruj" id="1CcQBrQdWyy" role="lGtFl" />
               </node>
@@ -2769,15 +2769,15 @@
                 <node concept="2OqwBi" id="4sSe4$oNucR" role="2Oq$k0">
                   <node concept="2ShNRf" id="4sSe4$oNucS" role="2Oq$k0">
                     <node concept="1pGfFk" id="4sSe4$oNucT" role="2ShVmc">
-                      <ref role="37wK5l" to="i348:4sSe4$oM2B4" resolve="PredicateBuilder" />
+                      <ref role="37wK5l" to="ugy2:4sSe4$oM2B4" resolve="PredicateBuilder" />
                       <node concept="10M0yZ" id="4sSe4$oNuMW" role="37wK5m">
-                        <ref role="1PxDUh" to="cxk7:5$WbtTOYoMb" resolve="LogicalPredicate" />
-                        <ref role="3cqZAo" to="cxk7:5uFPQ7C279$" resolve="FREE_SYM" />
+                        <ref role="1PxDUh" to="tpfl:5$WbtTOYoMb" resolve="LogicalPredicate" />
+                        <ref role="3cqZAo" to="tpfl:5uFPQ7C279$" resolve="FREE_SYM" />
                       </node>
                     </node>
                   </node>
                   <node concept="liA8E" id="4sSe4$oNucV" role="2OqNvi">
-                    <ref role="37wK5l" to="i348:4sSe4$oM2Bb" resolve="withArguments" />
+                    <ref role="37wK5l" to="ugy2:4sSe4$oM2Bb" resolve="withArguments" />
                     <node concept="10Nm6u" id="4sSe4$oNvV9" role="37wK5m">
                       <node concept="29HgVG" id="4sSe4$oNvVa" role="lGtFl">
                         <node concept="3NFfHV" id="4sSe4$oNvVb" role="3NFExx">
@@ -2797,7 +2797,7 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="4sSe4$oNudc" role="2OqNvi">
-                  <ref role="37wK5l" to="i348:4sSe4$oM2Bs" resolve="toPredicate" />
+                  <ref role="37wK5l" to="ugy2:4sSe4$oM2Bs" resolve="toPredicate" />
                 </node>
                 <node concept="raruj" id="4sSe4$oNudd" role="lGtFl" />
               </node>
@@ -2819,15 +2819,15 @@
                 <node concept="2OqwBi" id="4sSe4$oNxC8" role="2Oq$k0">
                   <node concept="2ShNRf" id="4sSe4$oNxC9" role="2Oq$k0">
                     <node concept="1pGfFk" id="4sSe4$oNxCa" role="2ShVmc">
-                      <ref role="37wK5l" to="i348:4sSe4$oM2B4" resolve="PredicateBuilder" />
+                      <ref role="37wK5l" to="ugy2:4sSe4$oM2B4" resolve="PredicateBuilder" />
                       <node concept="10M0yZ" id="4sSe4$oNyeb" role="37wK5m">
-                        <ref role="1PxDUh" to="cxk7:5$WbtTOYoMb" resolve="LogicalPredicate" />
-                        <ref role="3cqZAo" to="cxk7:5uFPQ7C26$b" resolve="NONFREE_SYM" />
+                        <ref role="1PxDUh" to="tpfl:5$WbtTOYoMb" resolve="LogicalPredicate" />
+                        <ref role="3cqZAo" to="tpfl:5uFPQ7C26$b" resolve="NONFREE_SYM" />
                       </node>
                     </node>
                   </node>
                   <node concept="liA8E" id="4sSe4$oNxCc" role="2OqNvi">
-                    <ref role="37wK5l" to="i348:4sSe4$oM2Bb" resolve="withArguments" />
+                    <ref role="37wK5l" to="ugy2:4sSe4$oM2Bb" resolve="withArguments" />
                     <node concept="10Nm6u" id="4sSe4$oNzmY" role="37wK5m">
                       <node concept="29HgVG" id="4sSe4$oNzmZ" role="lGtFl">
                         <node concept="3NFfHV" id="4sSe4$oNzn0" role="3NFExx">
@@ -2847,7 +2847,7 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="4sSe4$oNxCl" role="2OqNvi">
-                  <ref role="37wK5l" to="i348:4sSe4$oM2Bs" resolve="toPredicate" />
+                  <ref role="37wK5l" to="ugy2:4sSe4$oM2Bs" resolve="toPredicate" />
                 </node>
                 <node concept="raruj" id="4sSe4$oNxCm" role="lGtFl" />
               </node>
@@ -2869,15 +2869,15 @@
                 <node concept="2OqwBi" id="7lmP5gAmsdY" role="2Oq$k0">
                   <node concept="2ShNRf" id="7lmP5gAmsdZ" role="2Oq$k0">
                     <node concept="1pGfFk" id="7lmP5gAmse0" role="2ShVmc">
-                      <ref role="37wK5l" to="i348:4sSe4$oM2B4" resolve="PredicateBuilder" />
+                      <ref role="37wK5l" to="ugy2:4sSe4$oM2B4" resolve="PredicateBuilder" />
                       <node concept="10M0yZ" id="7lmP5gAmvtU" role="37wK5m">
-                        <ref role="3cqZAo" to="cxk7:7lmP5gAgJxn" resolve="GROUND_SYM" />
-                        <ref role="1PxDUh" to="cxk7:7lmP5gAgjDe" resolve="TermPredicate" />
+                        <ref role="3cqZAo" to="tpfl:7lmP5gAgJxn" resolve="GROUND_SYM" />
+                        <ref role="1PxDUh" to="tpfl:7lmP5gAgjDe" resolve="TermPredicate" />
                       </node>
                     </node>
                   </node>
                   <node concept="liA8E" id="7lmP5gAmse2" role="2OqNvi">
-                    <ref role="37wK5l" to="i348:4sSe4$oM2Bb" resolve="withArguments" />
+                    <ref role="37wK5l" to="ugy2:4sSe4$oM2Bb" resolve="withArguments" />
                     <node concept="10Nm6u" id="7lmP5gAmse3" role="37wK5m">
                       <node concept="29HgVG" id="7lmP5gAmse4" role="lGtFl">
                         <node concept="3NFfHV" id="7lmP5gAmse5" role="3NFExx">
@@ -2897,7 +2897,7 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="7lmP5gAmseb" role="2OqNvi">
-                  <ref role="37wK5l" to="i348:4sSe4$oM2Bs" resolve="toPredicate" />
+                  <ref role="37wK5l" to="ugy2:4sSe4$oM2Bs" resolve="toPredicate" />
                 </node>
                 <node concept="raruj" id="7lmP5gAmsec" role="lGtFl" />
               </node>
@@ -2919,15 +2919,15 @@
                 <node concept="2OqwBi" id="7lmP5gAmv_S" role="2Oq$k0">
                   <node concept="2ShNRf" id="7lmP5gAmv_T" role="2Oq$k0">
                     <node concept="1pGfFk" id="7lmP5gAmv_U" role="2ShVmc">
-                      <ref role="37wK5l" to="i348:4sSe4$oM2B4" resolve="PredicateBuilder" />
+                      <ref role="37wK5l" to="ugy2:4sSe4$oM2B4" resolve="PredicateBuilder" />
                       <node concept="10M0yZ" id="7lmP5gAmyvr" role="37wK5m">
-                        <ref role="3cqZAo" to="cxk7:7lmP5gAh361" resolve="NONGROUND_SYM" />
-                        <ref role="1PxDUh" to="cxk7:7lmP5gAgjDe" resolve="TermPredicate" />
+                        <ref role="3cqZAo" to="tpfl:7lmP5gAh361" resolve="NONGROUND_SYM" />
+                        <ref role="1PxDUh" to="tpfl:7lmP5gAgjDe" resolve="TermPredicate" />
                       </node>
                     </node>
                   </node>
                   <node concept="liA8E" id="7lmP5gAmv_W" role="2OqNvi">
-                    <ref role="37wK5l" to="i348:4sSe4$oM2Bb" resolve="withArguments" />
+                    <ref role="37wK5l" to="ugy2:4sSe4$oM2Bb" resolve="withArguments" />
                     <node concept="10Nm6u" id="7lmP5gAmv_X" role="37wK5m">
                       <node concept="29HgVG" id="7lmP5gAmv_Y" role="lGtFl">
                         <node concept="3NFfHV" id="7lmP5gAmv_Z" role="3NFExx">
@@ -2947,7 +2947,7 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="7lmP5gAmvA5" role="2OqNvi">
-                  <ref role="37wK5l" to="i348:4sSe4$oM2Bs" resolve="toPredicate" />
+                  <ref role="37wK5l" to="ugy2:4sSe4$oM2Bs" resolve="toPredicate" />
                 </node>
                 <node concept="raruj" id="7lmP5gAmvA6" role="lGtFl" />
               </node>
@@ -3009,15 +3009,15 @@
                 <node concept="2OqwBi" id="5WBVN_M3sDY" role="2Oq$k0">
                   <node concept="2ShNRf" id="5WBVN_M3sDZ" role="2Oq$k0">
                     <node concept="1pGfFk" id="5WBVN_M3sE0" role="2ShVmc">
-                      <ref role="37wK5l" to="i348:4sSe4$oM2B4" resolve="PredicateBuilder" />
+                      <ref role="37wK5l" to="ugy2:4sSe4$oM2B4" resolve="PredicateBuilder" />
                       <node concept="10M0yZ" id="5WBVN_M3zjB" role="37wK5m">
-                        <ref role="3cqZAo" to="cxk7:5WBVN_M2qrL" resolve="EVAL_SYM" />
-                        <ref role="1PxDUh" to="cxk7:5WBVN_M1SJ9" resolve="EvalExpressionPredicate" />
+                        <ref role="3cqZAo" to="tpfl:5WBVN_M2qrL" resolve="EVAL_SYM" />
+                        <ref role="1PxDUh" to="tpfl:5WBVN_M1SJ9" resolve="EvalExpressionPredicate" />
                       </node>
                     </node>
                   </node>
                   <node concept="liA8E" id="5WBVN_M3sEi" role="2OqNvi">
-                    <ref role="37wK5l" to="i348:4sSe4$oM2Bb" resolve="withArguments" />
+                    <ref role="37wK5l" to="ugy2:4sSe4$oM2Bb" resolve="withArguments" />
                     <node concept="10Nm6u" id="5WBVN_M3sEt" role="37wK5m">
                       <node concept="5jKBG" id="1HWyn8iYt2Y" role="lGtFl">
                         <ref role="v9R2y" node="1HWyn8iTl_Y" resolve="LateParameter_expression" />
@@ -3026,7 +3026,7 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="5WBVN_M3sEE" role="2OqNvi">
-                  <ref role="37wK5l" to="i348:4sSe4$oM2Bs" resolve="toPredicate" />
+                  <ref role="37wK5l" to="ugy2:4sSe4$oM2Bs" resolve="toPredicate" />
                 </node>
                 <node concept="raruj" id="5WBVN_M3sEF" role="lGtFl" />
               </node>
@@ -3057,15 +3057,15 @@
                 <node concept="2OqwBi" id="1laj_RThtfi" role="2Oq$k0">
                   <node concept="2ShNRf" id="1laj_RThtfj" role="2Oq$k0">
                     <node concept="1pGfFk" id="1laj_RThtfk" role="2ShVmc">
-                      <ref role="37wK5l" to="i348:4sSe4$oM2B4" resolve="PredicateBuilder" />
+                      <ref role="37wK5l" to="ugy2:4sSe4$oM2B4" resolve="PredicateBuilder" />
                       <node concept="10M0yZ" id="1laj_RThtfl" role="37wK5m">
-                        <ref role="3cqZAo" to="cxk7:4jcOV4hx9DP" resolve="FEEDBACK_SYM" />
-                        <ref role="1PxDUh" to="cxk7:4jcOV4hx9Du" resolve="ProvideFeedbackPredicate" />
+                        <ref role="3cqZAo" to="tpfl:4jcOV4hx9DP" resolve="FEEDBACK_SYM" />
+                        <ref role="1PxDUh" to="tpfl:4jcOV4hx9Du" resolve="ProvideFeedbackPredicate" />
                       </node>
                     </node>
                   </node>
                   <node concept="liA8E" id="1laj_RThtfm" role="2OqNvi">
-                    <ref role="37wK5l" to="i348:4sSe4$oM2Bb" resolve="withArguments" />
+                    <ref role="37wK5l" to="ugy2:4sSe4$oM2Bb" resolve="withArguments" />
                     <node concept="10Nm6u" id="1laj_RThtfn" role="37wK5m">
                       <node concept="5jKBG" id="1laj_RThtfo" role="lGtFl">
                         <ref role="v9R2y" node="1HWyn8iTl_Y" resolve="LateParameter_expression" />
@@ -3146,8 +3146,8 @@
                         </node>
                         <node concept="gft3U" id="1laj_RTCfws" role="UU_$l">
                           <node concept="10M0yZ" id="4ekZiHduFGk" role="gfFT$">
-                            <ref role="3cqZAo" to="cxk7:1laj_RTNVH9" resolve="NO_ARGUMENT" />
-                            <ref role="1PxDUh" to="cxk7:6Kcfpq7B0Wu" resolve="AbstractPredicate" />
+                            <ref role="3cqZAo" to="tpfl:1laj_RTNVH9" resolve="NO_ARGUMENT" />
+                            <ref role="1PxDUh" to="tpfl:6Kcfpq7B0Wu" resolve="AbstractPredicate" />
                           </node>
                         </node>
                       </node>
@@ -3170,7 +3170,7 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="1laj_RThtfz" role="2OqNvi">
-                  <ref role="37wK5l" to="i348:4sSe4$oM2Bs" resolve="toPredicate" />
+                  <ref role="37wK5l" to="ugy2:4sSe4$oM2Bs" resolve="toPredicate" />
                 </node>
                 <node concept="raruj" id="1laj_RThtf$" role="lGtFl" />
               </node>
@@ -3192,15 +3192,15 @@
                 <node concept="2OqwBi" id="4jcOV4hEQkc" role="2Oq$k0">
                   <node concept="2ShNRf" id="4jcOV4hEQkd" role="2Oq$k0">
                     <node concept="1pGfFk" id="4jcOV4hEQke" role="2ShVmc">
-                      <ref role="37wK5l" to="i348:4sSe4$oM2B4" resolve="PredicateBuilder" />
+                      <ref role="37wK5l" to="ugy2:4sSe4$oM2B4" resolve="PredicateBuilder" />
                       <node concept="10M0yZ" id="4jcOV4hEQvj" role="37wK5m">
-                        <ref role="3cqZAo" to="cxk7:4jcOV4hENDE" resolve="FAIL_SYM" />
-                        <ref role="1PxDUh" to="cxk7:4jcOV4hENDg" resolve="FailPredicate" />
+                        <ref role="3cqZAo" to="tpfl:4jcOV4hENDE" resolve="FAIL_SYM" />
+                        <ref role="1PxDUh" to="tpfl:4jcOV4hENDg" resolve="FailPredicate" />
                       </node>
                     </node>
                   </node>
                   <node concept="liA8E" id="4jcOV4hEQkg" role="2OqNvi">
-                    <ref role="37wK5l" to="i348:4sSe4$oM2Bb" resolve="withArguments" />
+                    <ref role="37wK5l" to="ugy2:4sSe4$oM2Bb" resolve="withArguments" />
                     <node concept="10Nm6u" id="4jcOV4hEQkh" role="37wK5m">
                       <node concept="5jKBG" id="4jcOV4hEQki" role="lGtFl">
                         <ref role="v9R2y" node="1HWyn8iTl_Y" resolve="LateParameter_expression" />
@@ -3209,7 +3209,7 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="4jcOV4hEQkr" role="2OqNvi">
-                  <ref role="37wK5l" to="i348:4sSe4$oM2Bs" resolve="toPredicate" />
+                  <ref role="37wK5l" to="ugy2:4sSe4$oM2Bs" resolve="toPredicate" />
                 </node>
                 <node concept="raruj" id="4jcOV4hEQks" role="lGtFl" />
               </node>
@@ -3261,7 +3261,7 @@
                   <node concept="1Y3b0j" id="1HWyn8juJKj" role="YeSDq">
                     <property role="2bfB8j" value="true" />
                     <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
-                    <ref role="1Y3XeK" to="i348:5WBVN_M1BKE" resolve="LateExpression" />
+                    <ref role="1Y3XeK" to="ugy2:5WBVN_M1BKE" resolve="LateExpression" />
                     <node concept="3Tm1VV" id="1HWyn8juJKk" role="1B3o_S" />
                     <node concept="3clFb_" id="1HWyn8juJKl" role="jymVt">
                       <property role="1EzhhJ" value="false" />
@@ -3439,7 +3439,7 @@
                   <node concept="1Y3b0j" id="3pMFS1zdix7" role="YeSDq">
                     <property role="2bfB8j" value="true" />
                     <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
-                    <ref role="1Y3XeK" to="i348:5WBVN_M1BKE" resolve="LateExpression" />
+                    <ref role="1Y3XeK" to="ugy2:5WBVN_M1BKE" resolve="LateExpression" />
                     <node concept="3Tm1VV" id="3pMFS1zdix8" role="1B3o_S" />
                     <node concept="3clFb_" id="3pMFS1zdix9" role="jymVt">
                       <property role="1EzhhJ" value="false" />
@@ -4444,12 +4444,12 @@
           <node concept="3Tm1VV" id="18kNIl1cSsT" role="1B3o_S" />
           <node concept="3clFbS" id="18kNIl1cSsU" role="3clF47" />
           <node concept="2AHcQZ" id="18kNIl1cRkO" role="2AJF6D">
-            <ref role="2AI5Lk" to="i348:4OKkcnfu_Am" resolve="RuleTemplateMethod" />
+            <ref role="2AI5Lk" to="ugy2:4OKkcnfu_Am" resolve="RuleTemplateMethod" />
             <node concept="2B6LJw" id="18kNIl1cRr5" role="2B76xF">
-              <ref role="2B6OnR" to="i348:4OKkcnfu_An" resolve="kind" />
+              <ref role="2B6OnR" to="ugy2:4OKkcnfu_An" resolve="kind" />
               <node concept="Rm8GO" id="18kNIl1cRsd" role="2B70Vg">
-                <ref role="Rm8GQ" to="i348:4OKkcnfu_Ah" resolve="HEAD_KEPT" />
-                <ref role="1Px2BO" to="i348:4OKkcnfu_Ag" resolve="RuleTemplateMehodKind" />
+                <ref role="Rm8GQ" to="ugy2:4OKkcnfu_Ah" resolve="HEAD_KEPT" />
+                <ref role="1Px2BO" to="ugy2:4OKkcnfu_Ag" resolve="RuleTemplateMehodKind" />
               </node>
               <node concept="2b32R4" id="18kNIl1cVZ9" role="lGtFl">
                 <node concept="3JmXsc" id="18kNIl1cVZc" role="2P8S$">
@@ -4467,7 +4467,7 @@
               </node>
             </node>
             <node concept="2B6LJw" id="18kNIl1cW8m" role="2B76xF">
-              <ref role="2B6OnR" to="i348:18kNIl1cCoL" resolve="generated" />
+              <ref role="2B6OnR" to="ugy2:18kNIl1cCoL" resolve="generated" />
               <node concept="3clFbT" id="18kNIl1cWnQ" role="2B70Vg">
                 <property role="3clFbU" value="true" />
               </node>
@@ -4486,7 +4486,7 @@
                 <node concept="2JrnkZ" id="3BqfYtgCQhN" role="2Oq$k0">
                   <node concept="2tJFMh" id="3BqfYtgCQhM" role="2JrQYb">
                     <node concept="ZC_QK" id="3BqfYtgCQhL" role="2tJFKM">
-                      <ref role="2aWVGs" to="i348:4OKkcnfu_Am" resolve="RuleTemplateMethod" />
+                      <ref role="2aWVGs" to="ugy2:4OKkcnfu_Am" resolve="RuleTemplateMethod" />
                     </node>
                   </node>
                 </node>
@@ -4602,7 +4602,7 @@
         <node concept="37vLTG" id="1yw2nYxUub5" role="3clF46">
           <property role="TrG5h" value="session" />
           <node concept="3uibUv" id="1yw2nYxUxkr" role="1tU5fm">
-            <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
+            <ref role="3uigEE" to="ugy2:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
           </node>
           <node concept="2ZBi8u" id="1yw2nYxUxl7" role="lGtFl">
             <ref role="2rW$FS" node="1yw2nYxUwhm" resolve="rulemethod_session_parameter" />
@@ -4618,7 +4618,7 @@
           </node>
         </node>
         <node concept="3uibUv" id="77AxcO50NnR" role="3clF45">
-          <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
+          <ref role="3uigEE" to="ugy2:7eGEHDlc$ap" resolve="RuleBuilder" />
         </node>
         <node concept="3Tm1VV" id="6FQzrygSO2i" role="1B3o_S" />
         <node concept="3clFbS" id="6FQzrygSO2j" role="3clF47">
@@ -4626,11 +4626,11 @@
             <node concept="3cpWsn" id="6FQzrygST3u" role="3cpWs9">
               <property role="TrG5h" value="builder" />
               <node concept="3uibUv" id="6FQzrygST3v" role="1tU5fm">
-                <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
+                <ref role="3uigEE" to="ugy2:7eGEHDlc$ap" resolve="RuleBuilder" />
               </node>
               <node concept="2ShNRf" id="6FQzrygST3w" role="33vP2m">
                 <node concept="1pGfFk" id="6FQzrygST3x" role="2ShVmc">
-                  <ref role="37wK5l" to="i348:5yr01fE1Jnt" resolve="RuleBuilder" />
+                  <ref role="37wK5l" to="ugy2:5yr01fE1Jnt" resolve="RuleBuilder" />
                   <node concept="37vLTw" id="C1f6iEP$FR" role="37wK5m">
                     <ref role="3cqZAo" node="1yw2nYxUub5" resolve="session" />
                   </node>
@@ -4704,12 +4704,12 @@
           </node>
         </node>
         <node concept="2AHcQZ" id="6FQzrygTpZ5" role="2AJF6D">
-          <ref role="2AI5Lk" to="i348:4OKkcnfu_Am" resolve="RuleTemplateMethod" />
+          <ref role="2AI5Lk" to="ugy2:4OKkcnfu_Am" resolve="RuleTemplateMethod" />
           <node concept="1SXeKx" id="6FQzrygTq_t" role="2B76xF">
-            <ref role="2B6OnR" to="i348:4OKkcnfu_An" resolve="kind" />
+            <ref role="2B6OnR" to="ugy2:4OKkcnfu_An" resolve="kind" />
             <node concept="Rm8GO" id="6FQzrygTrRC" role="2B70Vg">
-              <ref role="Rm8GQ" to="i348:4OKkcnfu_Ah" resolve="HEAD_KEPT" />
-              <ref role="1Px2BO" to="i348:4OKkcnfu_Ag" resolve="RuleTemplateMehodKind" />
+              <ref role="Rm8GQ" to="ugy2:4OKkcnfu_Ah" resolve="HEAD_KEPT" />
+              <ref role="1Px2BO" to="ugy2:4OKkcnfu_Ag" resolve="RuleTemplateMehodKind" />
             </node>
           </node>
           <node concept="2b32R4" id="6FQzrygTr5Q" role="lGtFl">
@@ -4749,7 +4749,7 @@
       <node concept="2YIFZL" id="6FQzrygU_5h" role="jymVt">
         <property role="TrG5h" value="method" />
         <node concept="3uibUv" id="6FQzrygU_9T" role="3clF45">
-          <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
+          <ref role="3uigEE" to="ugy2:7eGEHDlc$ap" resolve="RuleBuilder" />
         </node>
         <node concept="3Tm1VV" id="6FQzrygU_5k" role="1B3o_S" />
         <node concept="3clFbS" id="6FQzrygU_5l" role="3clF47">
@@ -4772,13 +4772,13 @@
         <node concept="37vLTG" id="3KXGt7WsTGm" role="3clF46">
           <property role="TrG5h" value="builder" />
           <node concept="3uibUv" id="3KXGt7WsTUU" role="1tU5fm">
-            <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
+            <ref role="3uigEE" to="ugy2:7eGEHDlc$ap" resolve="RuleBuilder" />
           </node>
         </node>
         <node concept="37vLTG" id="1yw2nYxUzzp" role="3clF46">
           <property role="TrG5h" value="session" />
           <node concept="3uibUv" id="1yw2nYxUzM1" role="1tU5fm">
-            <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
+            <ref role="3uigEE" to="ugy2:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
           </node>
         </node>
         <node concept="37vLTG" id="C1f6iEPHm8" role="3clF46">
@@ -4822,7 +4822,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="77AxcO50SKT" role="2OqNvi">
-                <ref role="37wK5l" to="i348:2_NfR5wo4nJ" resolve="merge" />
+                <ref role="37wK5l" to="ugy2:2_NfR5wo4nJ" resolve="merge" />
                 <node concept="3cmrfG" id="2_NfR5wolXZ" role="37wK5m">
                   <property role="3cmrfH" value="0" />
                   <node concept="17Uvod" id="2_NfR5wom9_" role="lGtFl">
@@ -4958,7 +4958,7 @@
       <node concept="2YIFZL" id="2QE4RCGdVob" role="jymVt">
         <property role="TrG5h" value="method" />
         <node concept="3uibUv" id="2QE4RCGdVoc" role="3clF45">
-          <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
+          <ref role="3uigEE" to="ugy2:7eGEHDlc$ap" resolve="RuleBuilder" />
         </node>
         <node concept="3Tm1VV" id="2QE4RCGdVod" role="1B3o_S" />
         <node concept="3clFbS" id="2QE4RCGdVoe" role="3clF47">
@@ -5013,7 +5013,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="2QE4RCGdVoI" role="2OqNvi">
-                <ref role="37wK5l" to="i348:77AxcO4ZwMR" resolve="merge" />
+                <ref role="37wK5l" to="ugy2:77AxcO4ZwMR" resolve="merge" />
                 <node concept="2YIFZM" id="2QE4RCGdVoJ" role="37wK5m">
                   <ref role="1Pybhc" node="2QE4RCGdVo9" resolve="Context" />
                   <ref role="37wK5l" node="2QE4RCGdVob" resolve="method" />
@@ -5127,13 +5127,13 @@
         <node concept="37vLTG" id="3KXGt7WsR3a" role="3clF46">
           <property role="TrG5h" value="builder" />
           <node concept="3uibUv" id="3KXGt7WsR39" role="1tU5fm">
-            <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
+            <ref role="3uigEE" to="ugy2:7eGEHDlc$ap" resolve="RuleBuilder" />
           </node>
         </node>
         <node concept="37vLTG" id="1yw2nYxUARH" role="3clF46">
           <property role="TrG5h" value="session" />
           <node concept="3uibUv" id="1yw2nYxUBrW" role="1tU5fm">
-            <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
+            <ref role="3uigEE" to="ugy2:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
           </node>
         </node>
         <node concept="37vLTG" id="C1f6iEPIg5" role="3clF46">
@@ -5636,7 +5636,7 @@
           <node concept="37vLTG" id="4qGA5WCTsuW" role="3clF46">
             <property role="TrG5h" value="session" />
             <node concept="3uibUv" id="4qGA5WCTsuX" role="1tU5fm">
-              <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
+              <ref role="3uigEE" to="ugy2:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
             </node>
           </node>
           <node concept="3Tm6S6" id="4qGA5WCTsuY" role="1B3o_S" />
@@ -5670,7 +5670,7 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="4qGA5WCTsve" role="2OqNvi">
-                  <ref role="37wK5l" to="i348:7DvO2M9IiMz" resolve="getParameter" />
+                  <ref role="37wK5l" to="ugy2:7DvO2M9IiMz" resolve="getParameter" />
                   <node concept="Xl_RD" id="4qGA5WCTsvf" role="37wK5m">
                     <property role="Xl_RC" value="" />
                     <node concept="29HgVG" id="4qGA5WCTuhX" role="lGtFl">
@@ -5837,7 +5837,7 @@
       <node concept="16euLQ" id="5itBwM7reH5" role="16eVyc">
         <property role="TrG5h" value="T" />
         <node concept="3uibUv" id="5itBwM86MyC" role="3ztrMU">
-          <ref role="3uigEE" to="i348:5itBwM86qUH" resolve="ExpandMacroTemplate.Token" />
+          <ref role="3uigEE" to="ugy2:5itBwM86qUH" resolve="ExpandMacroTemplate.Token" />
         </node>
       </node>
       <node concept="3clFbS" id="5itBwM7reH7" role="3clF47">
@@ -5864,7 +5864,7 @@
             <property role="TrG5h" value="result" />
             <node concept="_YKpA" id="4U$Q3dLVgBd" role="1tU5fm">
               <node concept="3uibUv" id="4U$Q3dLVhkK" role="_ZDj9">
-                <ref role="3uigEE" to="i348:5itBwM75Jiy" resolve="ExpandMacroTemplate" />
+                <ref role="3uigEE" to="ugy2:5itBwM75Jiy" resolve="ExpandMacroTemplate" />
                 <node concept="16syzq" id="4U$Q3dLVhkL" role="11_B2D">
                   <ref role="16sUi3" node="5itBwM7reH5" resolve="T" />
                 </node>
@@ -5873,7 +5873,7 @@
             <node concept="2ShNRf" id="4U$Q3dLVhyB" role="33vP2m">
               <node concept="Tc6Ow" id="4U$Q3dLVhxD" role="2ShVmc">
                 <node concept="3uibUv" id="4U$Q3dLVhxE" role="HW$YZ">
-                  <ref role="3uigEE" to="i348:5itBwM75Jiy" resolve="ExpandMacroTemplate" />
+                  <ref role="3uigEE" to="ugy2:5itBwM75Jiy" resolve="ExpandMacroTemplate" />
                   <node concept="16syzq" id="4U$Q3dLVhxF" role="11_B2D">
                     <ref role="16sUi3" node="5itBwM7reH5" resolve="T" />
                   </node>
@@ -5935,7 +5935,7 @@
       </node>
       <node concept="3vKaQO" id="4U$Q3dLVcDv" role="3clF45">
         <node concept="3uibUv" id="5itBwM7reH1" role="3O5elw">
-          <ref role="3uigEE" to="i348:5itBwM75Jiy" resolve="ExpandMacroTemplate" />
+          <ref role="3uigEE" to="ugy2:5itBwM75Jiy" resolve="ExpandMacroTemplate" />
           <node concept="16syzq" id="5itBwM7reH2" role="11_B2D">
             <ref role="16sUi3" node="5itBwM7reH5" resolve="T" />
           </node>
@@ -5950,7 +5950,7 @@
         <node concept="17QB3L" id="7mIqwW53r8I" role="1tU5fm" />
       </node>
       <node concept="3uibUv" id="4MEOIDEgqbw" role="3clF45">
-        <ref role="3uigEE" to="i348:5itBwM7auSJ" resolve="CallMacroTemplate" />
+        <ref role="3uigEE" to="ugy2:5itBwM7auSJ" resolve="CallMacroTemplate" />
         <node concept="16syzq" id="5itBwM8MSG6" role="11_B2D">
           <ref role="16sUi3" node="4MEOIDEgqco" resolve="T" />
         </node>
@@ -6000,7 +6000,7 @@
               <node concept="3cpWs6" id="2TBKtozZDTs" role="3cqZAp">
                 <node concept="10QFUN" id="2TBKtozZDTt" role="3cqZAk">
                   <node concept="3uibUv" id="2TBKtozZDTu" role="10QFUM">
-                    <ref role="3uigEE" to="i348:5itBwM7auSJ" resolve="CallMacroTemplate" />
+                    <ref role="3uigEE" to="ugy2:5itBwM7auSJ" resolve="CallMacroTemplate" />
                     <node concept="16syzq" id="2TBKtozZDTv" role="11_B2D">
                       <ref role="16sUi3" node="4MEOIDEgqco" resolve="T" />
                     </node>
@@ -6066,7 +6066,7 @@
       <node concept="16euLQ" id="4MEOIDEgqco" role="16eVyc">
         <property role="TrG5h" value="T" />
         <node concept="3uibUv" id="5itBwM8MTuK" role="3ztrMU">
-          <ref role="3uigEE" to="i348:5itBwM86qnn" resolve="CallMacroTemplate.Token" />
+          <ref role="3uigEE" to="ugy2:5itBwM86qnn" resolve="CallMacroTemplate.Token" />
         </node>
       </node>
     </node>
@@ -6184,7 +6184,7 @@
       <ref role="n9lRv" to="wq2x:1pPth$m5B4X" resolve="MacroTable" />
     </node>
     <node concept="3uibUv" id="2N2MQGCMIsX" role="1zkMxy">
-      <ref role="3uigEE" to="i348:1pPth$m7IVF" resolve="AbstractMacroTable" />
+      <ref role="3uigEE" to="ugy2:1pPth$m7IVF" resolve="AbstractMacroTable" />
     </node>
     <node concept="17Uvod" id="2N2MQGCZANh" role="lGtFl">
       <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
@@ -6827,7 +6827,7 @@
             <node concept="3cpWsn" id="7nPD14NP47U" role="3cpWs9">
               <property role="TrG5h" value="$_T" />
               <node concept="3uibUv" id="7nPD14NP47V" role="1tU5fm">
-                <ref role="3uigEE" to="oy3s:1fvYCPC9rB6" resolve="MetaLogicalArray" />
+                <ref role="3uigEE" to="uwx2:1fvYCPC9rB6" resolve="MetaLogicalArray" />
               </node>
               <node concept="17Uvod" id="7nPD14NP47W" role="lGtFl">
                 <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
@@ -6866,8 +6866,8 @@
                 </node>
               </node>
               <node concept="2YIFZM" id="4$YN6QudHeW" role="33vP2m">
-                <ref role="37wK5l" to="oy3s:7nPD14NOI_T" resolve="multiMetaLogical" />
-                <ref role="1Pybhc" to="oy3s:7nPD14NOCSa" resolve="MetaLogicalFactory" />
+                <ref role="37wK5l" to="uwx2:7nPD14NOI_T" resolve="multiMetaLogical" />
+                <ref role="1Pybhc" to="uwx2:7nPD14NOCSa" resolve="MetaLogicalFactory" />
                 <node concept="Xl_RD" id="7nPD14NP4PX" role="37wK5m">
                   <property role="Xl_RC" value="name" />
                   <node concept="17Uvod" id="7nPD14NP4PY" role="lGtFl">
@@ -7031,8 +7031,8 @@
                 </node>
               </node>
               <node concept="2YIFZM" id="4$YN6QudHeT" role="33vP2m">
-                <ref role="37wK5l" to="oy3s:7nPD14NOCTS" resolve="metaLogical" />
-                <ref role="1Pybhc" to="oy3s:7nPD14NOCSa" resolve="MetaLogicalFactory" />
+                <ref role="37wK5l" to="uwx2:7nPD14NOCTS" resolve="metaLogical" />
+                <ref role="1Pybhc" to="uwx2:7nPD14NOCSa" resolve="MetaLogicalFactory" />
                 <node concept="Xl_RD" id="7nPD14NOM99" role="37wK5m">
                   <property role="Xl_RC" value="name" />
                   <node concept="17Uvod" id="7nPD14NOM9a" role="lGtFl">
@@ -7177,14 +7177,14 @@
             <node concept="3cpWsn" id="75vUFrSLxaT" role="3cpWs9">
               <property role="TrG5h" value="multiLogical" />
               <node concept="3uibUv" id="7HUwyZaPUUk" role="1tU5fm">
-                <ref role="3uigEE" to="oy3s:1fvYCPC9rB6" resolve="MetaLogicalArray" />
+                <ref role="3uigEE" to="uwx2:1fvYCPC9rB6" resolve="MetaLogicalArray" />
               </node>
             </node>
           </node>
           <node concept="3clFbF" id="7HUwyZaPVcS" role="3cqZAp">
             <node concept="2OqwBi" id="7HUwyZaPVgJ" role="3clFbG">
               <node concept="liA8E" id="7HUwyZaPVif" role="2OqNvi">
-                <ref role="37wK5l" to="oy3s:1fvYCPC9rDX" resolve="logicalAt" />
+                <ref role="37wK5l" to="uwx2:1fvYCPC9rDX" resolve="logicalAt" />
                 <node concept="3cmrfG" id="7HUwyZaPVje" role="37wK5m">
                   <property role="3cmrfH" value="0" />
                   <node concept="29HgVG" id="7HUwyZaPVjf" role="lGtFl">
@@ -7468,7 +7468,7 @@
               <property role="TrG5h" value="multiLogical" />
               <node concept="3Tm1VV" id="452KZTbtm6U" role="1B3o_S" />
               <node concept="3uibUv" id="7HUwyZaPLv5" role="1tU5fm">
-                <ref role="3uigEE" to="oy3s:1fvYCPC9rB6" resolve="MetaLogicalArray" />
+                <ref role="3uigEE" to="uwx2:1fvYCPC9rB6" resolve="MetaLogicalArray" />
                 <node concept="3uibUv" id="7nPD14NP2dv" role="11_B2D">
                   <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
                 </node>
@@ -7495,8 +7495,8 @@
               <node concept="3clFbF" id="7nPD14NOYDF" role="3cqZAp">
                 <node concept="37vLTI" id="7nPD14NOYDG" role="3clFbG">
                   <node concept="2YIFZM" id="4$YN6QudHeX" role="37vLTx">
-                    <ref role="37wK5l" to="oy3s:7nPD14NOI_T" resolve="multiMetaLogical" />
-                    <ref role="1Pybhc" to="oy3s:7nPD14NOCSa" resolve="MetaLogicalFactory" />
+                    <ref role="37wK5l" to="uwx2:7nPD14NOI_T" resolve="multiMetaLogical" />
+                    <ref role="1Pybhc" to="uwx2:7nPD14NOCSa" resolve="MetaLogicalFactory" />
                     <node concept="Xl_RD" id="7nPD14NP3gr" role="37wK5m">
                       <property role="Xl_RC" value="name" />
                       <node concept="17Uvod" id="7nPD14NP3gs" role="lGtFl">
@@ -7652,8 +7652,8 @@
               <node concept="3clFbF" id="7nPD14NOJf$" role="3cqZAp">
                 <node concept="37vLTI" id="7nPD14NOJf_" role="3clFbG">
                   <node concept="2YIFZM" id="4$YN6QudHeU" role="37vLTx">
-                    <ref role="37wK5l" to="oy3s:7nPD14NOCTS" resolve="metaLogical" />
-                    <ref role="1Pybhc" to="oy3s:7nPD14NOCSa" resolve="MetaLogicalFactory" />
+                    <ref role="37wK5l" to="uwx2:7nPD14NOCTS" resolve="metaLogical" />
+                    <ref role="1Pybhc" to="uwx2:7nPD14NOCSa" resolve="MetaLogicalFactory" />
                     <node concept="Xl_RD" id="7nPD14NOKAI" role="37wK5m">
                       <property role="Xl_RC" value="name" />
                       <node concept="17Uvod" id="7nPD14NOKAJ" role="lGtFl">
@@ -7774,7 +7774,7 @@
           <node concept="312cEg" id="452KZTbxHgV" role="jymVt">
             <property role="TrG5h" value="var" />
             <node concept="3uibUv" id="7HUwyZaVmga" role="1tU5fm">
-              <ref role="3uigEE" to="oy3s:1fvYCPC9rB6" resolve="MetaLogicalArray" />
+              <ref role="3uigEE" to="uwx2:1fvYCPC9rB6" resolve="MetaLogicalArray" />
             </node>
             <node concept="3Tmbuc" id="4KRwoemkxBz" role="1B3o_S" />
             <node concept="raruj" id="452KZTbxHh5" role="lGtFl" />
@@ -8006,7 +8006,7 @@
               <property role="TrG5h" value="multiLogical" />
               <node concept="3Tm1VV" id="452KZTby0Uk" role="1B3o_S" />
               <node concept="3uibUv" id="7HUwyZaWNoa" role="1tU5fm">
-                <ref role="3uigEE" to="oy3s:1fvYCPC9rB6" resolve="MetaLogicalArray" />
+                <ref role="3uigEE" to="uwx2:1fvYCPC9rB6" resolve="MetaLogicalArray" />
               </node>
             </node>
             <node concept="3Tm6S6" id="452KZTby0Um" role="1B3o_S" />
@@ -8083,7 +8083,7 @@
                     </node>
                   </node>
                   <node concept="liA8E" id="7HUwyZaWNV2" role="2OqNvi">
-                    <ref role="37wK5l" to="oy3s:1fvYCPC9rDX" resolve="logicalAt" />
+                    <ref role="37wK5l" to="uwx2:1fvYCPC9rDX" resolve="logicalAt" />
                     <node concept="3cmrfG" id="452KZTbxZd8" role="37wK5m">
                       <property role="3cmrfH" value="1" />
                       <node concept="29HgVG" id="452KZTbxZd9" role="lGtFl">
@@ -8155,7 +8155,7 @@
       </node>
       <node concept="1Koe21" id="6zber0NHX29" role="1lVwrX">
         <node concept="3VsKOn" id="6zber0NHX2a" role="1Koe22">
-          <ref role="3VsUkX" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+          <ref role="3VsUkX" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
           <node concept="raruj" id="6zber0NHX2b" role="lGtFl" />
         </node>
       </node>
@@ -8296,7 +8296,7 @@
                         <node concept="3cpWs6" id="2BFWJjNRc43" role="3cqZAp">
                           <node concept="2c44tf" id="2BFWJjNRc5A" role="3cqZAk">
                             <node concept="3uibUv" id="2BFWJjNRc5B" role="2c44tc">
-                              <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                              <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                             </node>
                           </node>
                         </node>
@@ -8345,12 +8345,12 @@
         <property role="DiZV1" value="false" />
         <property role="od$2w" value="false" />
         <node concept="2AHcQZ" id="3yhgKRI8wmC" role="2AJF6D">
-          <ref role="2AI5Lk" to="i348:4OKkcnfu_Am" resolve="RuleTemplateMethod" />
+          <ref role="2AI5Lk" to="ugy2:4OKkcnfu_Am" resolve="RuleTemplateMethod" />
           <node concept="2B6LJw" id="18kNIl1n7rE" role="2B76xF">
-            <ref role="2B6OnR" to="i348:4OKkcnfu_An" resolve="kind" />
+            <ref role="2B6OnR" to="ugy2:4OKkcnfu_An" resolve="kind" />
             <node concept="Rm8GO" id="18kNIl1n7X7" role="2B70Vg">
-              <ref role="Rm8GQ" to="i348:4OKkcnfu_Ah" resolve="HEAD_KEPT" />
-              <ref role="1Px2BO" to="i348:4OKkcnfu_Ag" resolve="RuleTemplateMehodKind" />
+              <ref role="Rm8GQ" to="ugy2:4OKkcnfu_Ah" resolve="HEAD_KEPT" />
+              <ref role="1Px2BO" to="ugy2:4OKkcnfu_Ag" resolve="RuleTemplateMehodKind" />
             </node>
           </node>
           <node concept="2b32R4" id="3yhgKRI8wmF" role="lGtFl">
@@ -8373,11 +8373,11 @@
             <node concept="3cpWsn" id="3yhgKRI8wm6" role="3cpWs9">
               <property role="TrG5h" value="builder" />
               <node concept="3uibUv" id="3yhgKRI8wm7" role="1tU5fm">
-                <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
+                <ref role="3uigEE" to="ugy2:7eGEHDlc$ap" resolve="RuleBuilder" />
               </node>
               <node concept="2ShNRf" id="3yhgKRI8wm8" role="33vP2m">
                 <node concept="1pGfFk" id="3yhgKRI8wm9" role="2ShVmc">
-                  <ref role="37wK5l" to="i348:5yr01fE1Jnt" resolve="RuleBuilder" />
+                  <ref role="37wK5l" to="ugy2:5yr01fE1Jnt" resolve="RuleBuilder" />
                   <node concept="37vLTw" id="C1f6iEP$3Q" role="37wK5m">
                     <ref role="3cqZAo" node="5yr01fDhHDa" resolve="session" />
                   </node>
@@ -8456,7 +8456,7 @@
         <node concept="37vLTG" id="5yr01fDhHDa" role="3clF46">
           <property role="TrG5h" value="session" />
           <node concept="3uibUv" id="5yr01fDhHDb" role="1tU5fm">
-            <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
+            <ref role="3uigEE" to="ugy2:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
           </node>
           <node concept="2ZBi8u" id="5yr01fDhHDc" role="lGtFl">
             <ref role="2rW$FS" node="1yw2nYxUwhm" resolve="rulemethod_session_parameter" />
@@ -8472,7 +8472,7 @@
           </node>
         </node>
         <node concept="3uibUv" id="3yhgKRI8wm2" role="3clF45">
-          <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
+          <ref role="3uigEE" to="ugy2:7eGEHDlc$ap" resolve="RuleBuilder" />
         </node>
         <node concept="3Tm1VV" id="3yhgKRI8wm3" role="1B3o_S" />
         <node concept="17Uvod" id="3yhgKRIa57g" role="lGtFl">
@@ -8523,7 +8523,7 @@
           </node>
         </node>
         <node concept="3uibUv" id="3yhgKRI$z2g" role="3clF45">
-          <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
+          <ref role="3uigEE" to="ugy2:7eGEHDlc$ap" resolve="RuleBuilder" />
         </node>
         <node concept="3Tm1VV" id="3yhgKRI$z2h" role="1B3o_S" />
       </node>
@@ -8566,7 +8566,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="3yhgKRI$Hw6" role="2OqNvi">
-                <ref role="37wK5l" to="i348:77AxcO4ZwMR" resolve="merge" />
+                <ref role="37wK5l" to="ugy2:77AxcO4ZwMR" resolve="merge" />
                 <node concept="2OqwBi" id="3yhgKRI$HwQ" role="37wK5m">
                   <node concept="37vLTw" id="3yhgKRI$HwR" role="2Oq$k0">
                     <ref role="3cqZAo" node="3yhgKRI$_As" resolve="context" />
@@ -8685,7 +8685,7 @@
         <node concept="37vLTG" id="3yhgKRI$z3W" role="3clF46">
           <property role="TrG5h" value="builder" />
           <node concept="3uibUv" id="3yhgKRI$z3X" role="1tU5fm">
-            <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
+            <ref role="3uigEE" to="ugy2:7eGEHDlc$ap" resolve="RuleBuilder" />
           </node>
         </node>
         <node concept="37vLTG" id="3yhgKRI$_As" role="3clF46">
@@ -8697,7 +8697,7 @@
         <node concept="37vLTG" id="1yw2nYxUJc$" role="3clF46">
           <property role="TrG5h" value="session" />
           <node concept="3uibUv" id="1yw2nYxUJuP" role="1tU5fm">
-            <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
+            <ref role="3uigEE" to="ugy2:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
           </node>
         </node>
         <node concept="37vLTG" id="C1f6iEPD8C" role="3clF46">
@@ -8742,7 +8742,7 @@
       <node concept="2YIFZL" id="1yw2nYyfLGD" role="jymVt">
         <property role="TrG5h" value="method" />
         <node concept="3uibUv" id="1yw2nYyfLGE" role="3clF45">
-          <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
+          <ref role="3uigEE" to="ugy2:7eGEHDlc$ap" resolve="RuleBuilder" />
         </node>
         <node concept="3Tm1VV" id="1yw2nYyfLGF" role="1B3o_S" />
         <node concept="3clFbS" id="1yw2nYyfLGG" role="3clF47">
@@ -8798,7 +8798,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="1yw2nYyfLI8" role="2OqNvi">
-                <ref role="37wK5l" to="i348:77AxcO4ZwMR" resolve="merge" />
+                <ref role="37wK5l" to="ugy2:77AxcO4ZwMR" resolve="merge" />
                 <node concept="1rXfSq" id="1yw2nYyfLI9" role="37wK5m">
                   <ref role="37wK5l" node="1yw2nYyfLGD" resolve="method" />
                   <node concept="10Nm6u" id="1yw2nYyfLIa" role="37wK5m">
@@ -8883,13 +8883,13 @@
         <node concept="37vLTG" id="1yw2nYyfLIK" role="3clF46">
           <property role="TrG5h" value="builder" />
           <node concept="3uibUv" id="1yw2nYyfLIL" role="1tU5fm">
-            <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
+            <ref role="3uigEE" to="ugy2:7eGEHDlc$ap" resolve="RuleBuilder" />
           </node>
         </node>
         <node concept="37vLTG" id="5yr01fDhIMu" role="3clF46">
           <property role="TrG5h" value="session" />
           <node concept="3uibUv" id="5yr01fDhIMv" role="1tU5fm">
-            <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
+            <ref role="3uigEE" to="ugy2:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
           </node>
         </node>
         <node concept="37vLTG" id="C1f6iEPEXT" role="3clF46">
@@ -8924,7 +8924,7 @@
               <property role="TrG5h" value="multiLogical" />
               <node concept="3Tm1VV" id="36tQV5AufcX" role="1B3o_S" />
               <node concept="3uibUv" id="36tQV5AufcY" role="1tU5fm">
-                <ref role="3uigEE" to="oy3s:1fvYCPC9rB6" resolve="MetaLogicalArray" />
+                <ref role="3uigEE" to="uwx2:1fvYCPC9rB6" resolve="MetaLogicalArray" />
                 <node concept="3uibUv" id="36tQV5AufcZ" role="11_B2D">
                   <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
                 </node>
@@ -9256,7 +9256,7 @@
           <node concept="37vLTG" id="1L74NXExmUc" role="3clF46">
             <property role="TrG5h" value="session" />
             <node concept="3uibUv" id="1L74NXExobd" role="1tU5fm">
-              <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
+              <ref role="3uigEE" to="ugy2:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
             </node>
           </node>
           <node concept="3Tm6S6" id="1L74NXExmHY" role="1B3o_S" />
@@ -9300,7 +9300,7 @@
           <node concept="37vLTG" id="1L74NXExsfh" role="3clF46">
             <property role="TrG5h" value="session" />
             <node concept="3uibUv" id="1L74NXExsfi" role="1tU5fm">
-              <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
+              <ref role="3uigEE" to="ugy2:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
             </node>
           </node>
           <node concept="3Tm6S6" id="1L74NXExsfj" role="1B3o_S" />
@@ -9359,7 +9359,7 @@
               <node concept="3cpWsn" id="1L74NXE_$Wp" role="3cpWs9">
                 <property role="TrG5h" value="builder" />
                 <node concept="3uibUv" id="1L74NXE_$Wq" role="1tU5fm">
-                  <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
+                  <ref role="3uigEE" to="ugy2:7eGEHDlc$ap" resolve="RuleBuilder" />
                 </node>
                 <node concept="10Nm6u" id="1L74NXE_$Yi" role="33vP2m" />
               </node>
@@ -9406,7 +9406,7 @@
               <node concept="3cpWsn" id="1L74NXE_BTK" role="3cpWs9">
                 <property role="TrG5h" value="builder" />
                 <node concept="3uibUv" id="1L74NXE_BTL" role="1tU5fm">
-                  <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
+                  <ref role="3uigEE" to="ugy2:7eGEHDlc$ap" resolve="RuleBuilder" />
                 </node>
                 <node concept="10Nm6u" id="1L74NXE_BTM" role="33vP2m" />
               </node>
@@ -9476,7 +9476,7 @@
                 <property role="TrG5h" value="multiLogical" />
                 <node concept="3Tm1VV" id="12QmIo_3sJb" role="1B3o_S" />
                 <node concept="3uibUv" id="12QmIo_3sJc" role="1tU5fm">
-                  <ref role="3uigEE" to="oy3s:1fvYCPC9rB6" resolve="MetaLogicalArray" />
+                  <ref role="3uigEE" to="uwx2:1fvYCPC9rB6" resolve="MetaLogicalArray" />
                   <node concept="3uibUv" id="12QmIo_3sJd" role="11_B2D">
                     <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
                   </node>
@@ -9507,8 +9507,8 @@
                   <node concept="3clFbF" id="12QmIo_3vhF" role="3cqZAp">
                     <node concept="37vLTI" id="12QmIo_3vhG" role="3clFbG">
                       <node concept="2YIFZM" id="4$YN6QudHeY" role="37vLTx">
-                        <ref role="37wK5l" to="oy3s:7nPD14NOI_T" resolve="multiMetaLogical" />
-                        <ref role="1Pybhc" to="oy3s:7nPD14NOCSa" resolve="MetaLogicalFactory" />
+                        <ref role="37wK5l" to="uwx2:7nPD14NOI_T" resolve="multiMetaLogical" />
+                        <ref role="1Pybhc" to="uwx2:7nPD14NOCSa" resolve="MetaLogicalFactory" />
                         <node concept="Xl_RD" id="12QmIo_3vhI" role="37wK5m">
                           <property role="Xl_RC" value="name" />
                           <node concept="17Uvod" id="12QmIo_3vhJ" role="lGtFl">
@@ -9628,8 +9628,8 @@
                 <node concept="3clFbF" id="12QmIo_3_hA" role="3cqZAp">
                   <node concept="37vLTI" id="12QmIo_3_hB" role="3clFbG">
                     <node concept="2YIFZM" id="4$YN6QudHeV" role="37vLTx">
-                      <ref role="37wK5l" to="oy3s:7nPD14NOCTS" resolve="metaLogical" />
-                      <ref role="1Pybhc" to="oy3s:7nPD14NOCSa" resolve="MetaLogicalFactory" />
+                      <ref role="37wK5l" to="uwx2:7nPD14NOCTS" resolve="metaLogical" />
+                      <ref role="1Pybhc" to="uwx2:7nPD14NOCSa" resolve="MetaLogicalFactory" />
                       <node concept="Xl_RD" id="12QmIo_3_hD" role="37wK5m">
                         <property role="Xl_RC" value="name" />
                         <node concept="17Uvod" id="12QmIo_3_hE" role="lGtFl">
@@ -9732,14 +9732,14 @@
       <node concept="37vLTG" id="1LBj9w_9Ss$" role="3clF46">
         <property role="TrG5h" value="manifest" />
         <node concept="3uibUv" id="1LBj9w_9SE1" role="1tU5fm">
-          <ref role="3uigEE" to="fqlx:5EDW3XF5Z95" resolve="AbstractCoderulesManifest" />
+          <ref role="3uigEE" to="pxw9:5EDW3XF5Z95" resolve="AbstractCoderulesManifest" />
         </node>
       </node>
       <node concept="3cqZAl" id="4MqhgXUhXXT" role="3clF45" />
       <node concept="3Tmbuc" id="7P_FdVQ43kJ" role="1B3o_S" />
       <node concept="3clFbS" id="4MqhgXUhXXV" role="3clF47">
         <node concept="XkiVB" id="1LBj9w_9S$X" role="3cqZAp">
-          <ref role="37wK5l" to="i348:1LBj9w_9RIX" resolve="AbstractRuleTable" />
+          <ref role="37wK5l" to="ugy2:1LBj9w_9RIX" resolve="AbstractRuleTable" />
           <node concept="37vLTw" id="1LBj9w_9SGG" role="37wK5m">
             <ref role="3cqZAo" node="1LBj9w_9Ss$" resolve="manifest" />
           </node>
@@ -9875,7 +9875,7 @@
       </node>
       <node concept="3vKaQO" id="tbauFxRsrK" role="3clF45">
         <node concept="3uibUv" id="tbauFxRsrM" role="3O5elw">
-          <ref role="3uigEE" to="i348:1ffsG7bW_V4" resolve="RuleTemplate" />
+          <ref role="3uigEE" to="ugy2:1ffsG7bW_V4" resolve="RuleTemplate" />
           <node concept="3qTvmN" id="tbauFxRsrN" role="11_B2D" />
         </node>
       </node>
@@ -9891,14 +9891,14 @@
             <property role="TrG5h" value="list" />
             <node concept="_YKpA" id="4MqhgXUcvdv" role="1tU5fm">
               <node concept="3uibUv" id="4MqhgXUcvdy" role="_ZDj9">
-                <ref role="3uigEE" to="i348:1ffsG7bW_V4" resolve="RuleTemplate" />
+                <ref role="3uigEE" to="ugy2:1ffsG7bW_V4" resolve="RuleTemplate" />
                 <node concept="3qTvmN" id="6OXbTD$jrdS" role="11_B2D" />
               </node>
             </node>
             <node concept="2ShNRf" id="4MqhgXUcvd_" role="33vP2m">
               <node concept="Tc6Ow" id="4MqhgXUcvdA" role="2ShVmc">
                 <node concept="3uibUv" id="4MqhgXUcvdB" role="HW$YZ">
-                  <ref role="3uigEE" to="i348:1ffsG7bW_V4" resolve="RuleTemplate" />
+                  <ref role="3uigEE" to="ugy2:1ffsG7bW_V4" resolve="RuleTemplate" />
                   <node concept="3qTvmN" id="6OXbTD$js5s" role="11_B2D" />
                 </node>
               </node>
@@ -9975,7 +9975,7 @@
       <node concept="3Tm6S6" id="4MqhgXUcr4J" role="1B3o_S" />
       <node concept="_YKpA" id="4MqhgXUcrn4" role="1tU5fm">
         <node concept="3uibUv" id="4MqhgXUcrpr" role="_ZDj9">
-          <ref role="3uigEE" to="i348:1ffsG7bW_V4" resolve="RuleTemplate" />
+          <ref role="3uigEE" to="ugy2:1ffsG7bW_V4" resolve="RuleTemplate" />
           <node concept="3qTvmN" id="6OXbTD$jqHa" role="11_B2D" />
         </node>
       </node>
@@ -9985,7 +9985,7 @@
       <ref role="n9lRv" to="wq2x:7eGEHDlgPKk" resolve="RulesList" />
     </node>
     <node concept="3uibUv" id="4MqhgXUa3o$" role="EKbjA">
-      <ref role="3uigEE" to="i348:4MqhgXU9fm3" resolve="RuleTable" />
+      <ref role="3uigEE" to="ugy2:4MqhgXU9fm3" resolve="RuleTable" />
     </node>
     <node concept="17Uvod" id="5EDW3XF6tVm" role="lGtFl">
       <property role="2qtEX9" value="name" />
@@ -10004,7 +10004,7 @@
       </node>
     </node>
     <node concept="3uibUv" id="5EDW3XF6tvV" role="1zkMxy">
-      <ref role="3uigEE" to="i348:5EDW3XF5Zh6" resolve="AbstractRuleTable" />
+      <ref role="3uigEE" to="ugy2:5EDW3XF5Zh6" resolve="AbstractRuleTable" />
     </node>
   </node>
   <node concept="jVnub" id="20Ay2VewuOL">
@@ -10057,7 +10057,7 @@
           <node concept="37vLTG" id="5itBwM7X0cc" role="3clF46">
             <property role="TrG5h" value="session" />
             <node concept="3uibUv" id="5itBwM7X0cq" role="1tU5fm">
-              <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
+              <ref role="3uigEE" to="ugy2:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
             </node>
           </node>
           <node concept="3cqZAl" id="5itBwM7X0bM" role="3clF45" />
@@ -10067,11 +10067,11 @@
               <node concept="3cpWsn" id="5itBwM7X0h9" role="3cpWs9">
                 <property role="TrG5h" value="builder" />
                 <node concept="3uibUv" id="5itBwM7X0ha" role="1tU5fm">
-                  <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
+                  <ref role="3uigEE" to="ugy2:7eGEHDlc$ap" resolve="RuleBuilder" />
                 </node>
                 <node concept="2ShNRf" id="5itBwM7X0hb" role="33vP2m">
                   <node concept="1pGfFk" id="5itBwM7X0hc" role="2ShVmc">
-                    <ref role="37wK5l" to="i348:5yr01fE1Jnt" resolve="RuleBuilder" />
+                    <ref role="37wK5l" to="ugy2:5yr01fE1Jnt" resolve="RuleBuilder" />
                     <node concept="10Nm6u" id="5itBwM7X0hd" role="37wK5m" />
                     <node concept="Xl_RD" id="5itBwM7X0he" role="37wK5m">
                       <property role="Xl_RC" value="" />
@@ -10109,7 +10109,7 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="5itBwM7X0x0" role="2OqNvi">
-                  <ref role="37wK5l" to="i348:2_NfR5wo4nJ" resolve="merge" />
+                  <ref role="37wK5l" to="ugy2:2_NfR5wo4nJ" resolve="merge" />
                   <node concept="3cmrfG" id="4p2fwwrRRsD" role="37wK5m">
                     <property role="3cmrfH" value="0" />
                     <node concept="17Uvod" id="4p2fwwrRV5L" role="lGtFl">
@@ -10185,7 +10185,7 @@
                       </node>
                     </node>
                     <node concept="liA8E" id="5itBwM7X0P0" role="2OqNvi">
-                      <ref role="37wK5l" to="i348:7mIqwW50Qjs" resolve="callMacro" />
+                      <ref role="37wK5l" to="ugy2:7mIqwW50Qjs" resolve="callMacro" />
                       <node concept="10Nm6u" id="1VeWL_e4aBL" role="37wK5m">
                         <node concept="1sPUBX" id="1VeWL_e4aBM" role="lGtFl">
                           <ref role="v9R2y" node="2LxIQen0ctm" resolve="implicit_rule_input_reference" />
@@ -10225,7 +10225,7 @@
                                     <ref role="3cqZAo" node="5itBwM9qSbM" resolve="tok" />
                                   </node>
                                   <node concept="liA8E" id="5itBwM9qTvB" role="2OqNvi">
-                                    <ref role="37wK5l" to="i348:5itBwM86qET" resolve="withLogical" />
+                                    <ref role="37wK5l" to="ugy2:5itBwM86qET" resolve="withLogical" />
                                     <node concept="10Nm6u" id="5itBwM9qTvC" role="37wK5m">
                                       <node concept="2b32R4" id="5itBwM9qTvD" role="lGtFl">
                                         <node concept="3JmXsc" id="5itBwM9qTvE" role="2P8S$">
@@ -10308,7 +10308,7 @@
                                   </node>
                                 </node>
                                 <node concept="liA8E" id="5itBwM9qTvK" role="2OqNvi">
-                                  <ref role="37wK5l" to="i348:5ynGfcflmng" resolve="withParam" />
+                                  <ref role="37wK5l" to="ugy2:5ynGfcflmng" resolve="withParam" />
                                   <node concept="10Nm6u" id="5itBwM9qTvL" role="37wK5m">
                                     <node concept="1W57fq" id="1OAJnGrxLr" role="lGtFl">
                                       <node concept="3IZrLx" id="1OAJnGrxLs" role="3IZSJc">
@@ -10519,7 +10519,7 @@
                                 </node>
                               </node>
                               <node concept="liA8E" id="5itBwM9qTvT" role="2OqNvi">
-                                <ref role="37wK5l" to="i348:5itBwM7bY2d" resolve="apply" />
+                                <ref role="37wK5l" to="ugy2:5itBwM7bY2d" resolve="apply" />
                               </node>
                             </node>
                           </node>
@@ -10527,7 +10527,7 @@
                         <node concept="37vLTG" id="5itBwM9qSbM" role="1bW2Oz">
                           <property role="TrG5h" value="tok" />
                           <node concept="3uibUv" id="5itBwM9qT6N" role="1tU5fm">
-                            <ref role="3uigEE" to="i348:5itBwM86qnn" resolve="CallMacroTemplate.Token" />
+                            <ref role="3uigEE" to="ugy2:5itBwM86qnn" resolve="CallMacroTemplate.Token" />
                           </node>
                         </node>
                       </node>
@@ -10550,7 +10550,7 @@
           <node concept="37vLTG" id="5itBwMbdiJf" role="3clF46">
             <property role="TrG5h" value="session" />
             <node concept="3uibUv" id="5itBwMbdiJg" role="1tU5fm">
-              <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
+              <ref role="3uigEE" to="ugy2:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
             </node>
           </node>
           <node concept="3cqZAl" id="5itBwMbdiJh" role="3clF45" />
@@ -10560,11 +10560,11 @@
               <node concept="3cpWsn" id="5itBwMbdiJl" role="3cpWs9">
                 <property role="TrG5h" value="builder" />
                 <node concept="3uibUv" id="5itBwMbdiJm" role="1tU5fm">
-                  <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
+                  <ref role="3uigEE" to="ugy2:7eGEHDlc$ap" resolve="RuleBuilder" />
                 </node>
                 <node concept="2ShNRf" id="5itBwMbdiJn" role="33vP2m">
                   <node concept="1pGfFk" id="5itBwMbdiJo" role="2ShVmc">
-                    <ref role="37wK5l" to="i348:5yr01fE1Jnt" resolve="RuleBuilder" />
+                    <ref role="37wK5l" to="ugy2:5yr01fE1Jnt" resolve="RuleBuilder" />
                     <node concept="10Nm6u" id="5itBwMbdiJp" role="37wK5m" />
                     <node concept="Xl_RD" id="5itBwMbdiJq" role="37wK5m">
                       <property role="Xl_RC" value="" />
@@ -10601,7 +10601,7 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="5itBwMbdiKk" role="2OqNvi">
-                  <ref role="37wK5l" to="i348:2_NfR5wo4nJ" resolve="merge" />
+                  <ref role="37wK5l" to="ugy2:2_NfR5wo4nJ" resolve="merge" />
                   <node concept="3cmrfG" id="4p2fwwrRSwL" role="37wK5m">
                     <property role="3cmrfH" value="0" />
                     <node concept="17Uvod" id="4p2fwwrT2Pl" role="lGtFl">
@@ -10677,7 +10677,7 @@
                       </node>
                     </node>
                     <node concept="liA8E" id="5itBwMbdiKx" role="2OqNvi">
-                      <ref role="37wK5l" to="i348:7mIqwW50wJB" resolve="expandMacro" />
+                      <ref role="37wK5l" to="ugy2:7mIqwW50wJB" resolve="expandMacro" />
                       <node concept="10Nm6u" id="At0yqMchOa" role="37wK5m">
                         <node concept="1sPUBX" id="At0yqMcjWx" role="lGtFl">
                           <ref role="v9R2y" node="2LxIQen0ctm" resolve="implicit_rule_input_reference" />
@@ -10733,7 +10733,7 @@
                                     <ref role="3cqZAo" node="5itBwMbdiLb" resolve="tok" />
                                   </node>
                                   <node concept="liA8E" id="4qGA5WD2R9O" role="2OqNvi">
-                                    <ref role="37wK5l" to="i348:5itBwM86qUR" resolve="withLogical" />
+                                    <ref role="37wK5l" to="ugy2:5itBwM86qUR" resolve="withLogical" />
                                     <node concept="10Nm6u" id="4qGA5WD2R9P" role="37wK5m">
                                       <node concept="2b32R4" id="4qGA5WD2R9Q" role="lGtFl">
                                         <node concept="3JmXsc" id="4qGA5WD2R9R" role="2P8S$">
@@ -10816,7 +10816,7 @@
                                   </node>
                                 </node>
                                 <node concept="liA8E" id="4qGA5WD2R9X" role="2OqNvi">
-                                  <ref role="37wK5l" to="i348:4qGA5WD0pSH" resolve="withParams" />
+                                  <ref role="37wK5l" to="ugy2:4qGA5WD0pSH" resolve="withParams" />
                                   <node concept="10Nm6u" id="4qGA5WD2R9Y" role="37wK5m">
                                     <node concept="1WS0z7" id="4qGA5WD2R9Z" role="lGtFl">
                                       <node concept="3JmXsc" id="4qGA5WD2Ra0" role="3Jn$fo">
@@ -10993,7 +10993,7 @@
                                 </node>
                               </node>
                               <node concept="liA8E" id="4qGA5WD2RaA" role="2OqNvi">
-                                <ref role="37wK5l" to="i348:5itBwM7bY2d" resolve="apply" />
+                                <ref role="37wK5l" to="ugy2:5itBwM7bY2d" resolve="apply" />
                               </node>
                             </node>
                           </node>
@@ -11001,7 +11001,7 @@
                         <node concept="37vLTG" id="5itBwMbdiLb" role="1bW2Oz">
                           <property role="TrG5h" value="tok" />
                           <node concept="3uibUv" id="5itBwMbdiLc" role="1tU5fm">
-                            <ref role="3uigEE" to="i348:5itBwM86qUH" resolve="ExpandMacroTemplate.Token" />
+                            <ref role="3uigEE" to="ugy2:5itBwM86qUH" resolve="ExpandMacroTemplate.Token" />
                           </node>
                         </node>
                       </node>
@@ -11028,11 +11028,11 @@
               <node concept="3cpWsn" id="7kTeLbPzYQG" role="3cpWs9">
                 <property role="TrG5h" value="builder" />
                 <node concept="3uibUv" id="7kTeLbPzYQH" role="1tU5fm">
-                  <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
+                  <ref role="3uigEE" to="ugy2:7eGEHDlc$ap" resolve="RuleBuilder" />
                 </node>
                 <node concept="2ShNRf" id="7kTeLbPzYQI" role="33vP2m">
                   <node concept="1pGfFk" id="7kTeLbPzYQJ" role="2ShVmc">
-                    <ref role="37wK5l" to="i348:5yr01fE1Jnt" resolve="RuleBuilder" />
+                    <ref role="37wK5l" to="ugy2:5yr01fE1Jnt" resolve="RuleBuilder" />
                     <node concept="10Nm6u" id="5yr01fE236U" role="37wK5m" />
                     <node concept="Xl_RD" id="7kTeLbPzYQK" role="37wK5m">
                       <property role="Xl_RC" value="" />
@@ -11055,7 +11055,7 @@
             <node concept="3clFbF" id="7kTeLbPzYQO" role="3cqZAp">
               <node concept="2OqwBi" id="7kTeLbPzYQP" role="3clFbG">
                 <node concept="liA8E" id="7kTeLbPzYQQ" role="2OqNvi">
-                  <ref role="37wK5l" to="i348:7eGEHDlc$bR" resolve="appendHeadKept" />
+                  <ref role="37wK5l" to="ugy2:7eGEHDlc$bR" resolve="appendHeadKept" />
                   <node concept="10Nm6u" id="7kTeLbPzYQR" role="37wK5m">
                     <node concept="29HgVG" id="7kTeLbPzYQS" role="lGtFl" />
                   </node>
@@ -11145,11 +11145,11 @@
               <node concept="3cpWsn" id="5itBwM5OFSi" role="3cpWs9">
                 <property role="TrG5h" value="builder" />
                 <node concept="3uibUv" id="5itBwM5OFSj" role="1tU5fm">
-                  <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
+                  <ref role="3uigEE" to="ugy2:7eGEHDlc$ap" resolve="RuleBuilder" />
                 </node>
                 <node concept="2ShNRf" id="5itBwM5OFSk" role="33vP2m">
                   <node concept="1pGfFk" id="5itBwM5OFSl" role="2ShVmc">
-                    <ref role="37wK5l" to="i348:5yr01fE1Jnt" resolve="RuleBuilder" />
+                    <ref role="37wK5l" to="ugy2:5yr01fE1Jnt" resolve="RuleBuilder" />
                     <node concept="10Nm6u" id="5itBwM5OFSm" role="37wK5m" />
                     <node concept="Xl_RD" id="5itBwM5OFSn" role="37wK5m">
                       <property role="Xl_RC" value="" />
@@ -11172,7 +11172,7 @@
             <node concept="3clFbF" id="5itBwM5OFT1" role="3cqZAp">
               <node concept="2OqwBi" id="5itBwM5OFT2" role="3clFbG">
                 <node concept="liA8E" id="5itBwM5OFT3" role="2OqNvi">
-                  <ref role="37wK5l" to="i348:7eGEHDlc$bq" resolve="appendHeadReplaced" />
+                  <ref role="37wK5l" to="ugy2:7eGEHDlc$bq" resolve="appendHeadReplaced" />
                   <node concept="10Nm6u" id="5itBwM5OFT4" role="37wK5m">
                     <node concept="29HgVG" id="5itBwM5OFT5" role="lGtFl" />
                   </node>
@@ -11308,11 +11308,11 @@
               <node concept="3cpWsn" id="5itBwM5OPs6" role="3cpWs9">
                 <property role="TrG5h" value="builder" />
                 <node concept="3uibUv" id="5itBwM5OPs7" role="1tU5fm">
-                  <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
+                  <ref role="3uigEE" to="ugy2:7eGEHDlc$ap" resolve="RuleBuilder" />
                 </node>
                 <node concept="2ShNRf" id="5itBwM5OPs8" role="33vP2m">
                   <node concept="1pGfFk" id="5itBwM5OPs9" role="2ShVmc">
-                    <ref role="37wK5l" to="i348:5yr01fE1Jnt" resolve="RuleBuilder" />
+                    <ref role="37wK5l" to="ugy2:5yr01fE1Jnt" resolve="RuleBuilder" />
                     <node concept="10Nm6u" id="5itBwM5OPsa" role="37wK5m" />
                     <node concept="Xl_RD" id="5itBwM5OPsb" role="37wK5m">
                       <property role="Xl_RC" value="" />
@@ -11335,7 +11335,7 @@
             <node concept="3clFbF" id="5itBwM5OPtq" role="3cqZAp">
               <node concept="2OqwBi" id="5itBwM5OPtr" role="3clFbG">
                 <node concept="liA8E" id="5itBwM5OPts" role="2OqNvi">
-                  <ref role="37wK5l" to="i348:7eGEHDlc$aX" resolve="appendGuard" />
+                  <ref role="37wK5l" to="ugy2:7eGEHDlc$aX" resolve="appendGuard" />
                   <node concept="10Nm6u" id="5itBwM5OPtt" role="37wK5m">
                     <node concept="29HgVG" id="5itBwM5OPtu" role="lGtFl" />
                   </node>
@@ -11404,11 +11404,11 @@
               <node concept="3cpWsn" id="5itBwM5Pc$T" role="3cpWs9">
                 <property role="TrG5h" value="builder" />
                 <node concept="3uibUv" id="5itBwM5Pc$U" role="1tU5fm">
-                  <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
+                  <ref role="3uigEE" to="ugy2:7eGEHDlc$ap" resolve="RuleBuilder" />
                 </node>
                 <node concept="2ShNRf" id="5itBwM5Pc$V" role="33vP2m">
                   <node concept="1pGfFk" id="5itBwM5Pc$W" role="2ShVmc">
-                    <ref role="37wK5l" to="i348:5yr01fE1Jnt" resolve="RuleBuilder" />
+                    <ref role="37wK5l" to="ugy2:5yr01fE1Jnt" resolve="RuleBuilder" />
                     <node concept="10Nm6u" id="5itBwM5Pc$X" role="37wK5m" />
                     <node concept="Xl_RD" id="5itBwM5Pc$Y" role="37wK5m">
                       <property role="Xl_RC" value="" />
@@ -11431,7 +11431,7 @@
             <node concept="3clFbF" id="5itBwM5Pc_4" role="3cqZAp">
               <node concept="2OqwBi" id="5itBwM5Pc_5" role="3clFbG">
                 <node concept="liA8E" id="5itBwM5Pc_6" role="2OqNvi">
-                  <ref role="37wK5l" to="i348:7eGEHDlc$aw" resolve="appendBody" />
+                  <ref role="37wK5l" to="ugy2:7eGEHDlc$aw" resolve="appendBody" />
                   <node concept="10Nm6u" id="5itBwM5Pc_7" role="37wK5m">
                     <node concept="29HgVG" id="5itBwM5Pc_8" role="lGtFl" />
                   </node>
@@ -11501,11 +11501,11 @@
               <node concept="3cpWsn" id="5itBwM5P1R9" role="3cpWs9">
                 <property role="TrG5h" value="builder" />
                 <node concept="3uibUv" id="5itBwM5P1Ra" role="1tU5fm">
-                  <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
+                  <ref role="3uigEE" to="ugy2:7eGEHDlc$ap" resolve="RuleBuilder" />
                 </node>
                 <node concept="2ShNRf" id="5itBwM5P1Rb" role="33vP2m">
                   <node concept="1pGfFk" id="5itBwM5P1Rc" role="2ShVmc">
-                    <ref role="37wK5l" to="i348:5yr01fE1Jnt" resolve="RuleBuilder" />
+                    <ref role="37wK5l" to="ugy2:5yr01fE1Jnt" resolve="RuleBuilder" />
                     <node concept="10Nm6u" id="5itBwM5P1Rd" role="37wK5m" />
                     <node concept="Xl_RD" id="5itBwM5P1Re" role="37wK5m">
                       <property role="Xl_RC" value="" />
@@ -11528,7 +11528,7 @@
             <node concept="3clFbF" id="5itBwM5P1Sh" role="3cqZAp">
               <node concept="2OqwBi" id="5itBwM5P1Si" role="3clFbG">
                 <node concept="liA8E" id="5itBwM5P1Sj" role="2OqNvi">
-                  <ref role="37wK5l" to="i348:7eGEHDlc$bR" resolve="appendHeadKept" />
+                  <ref role="37wK5l" to="ugy2:7eGEHDlc$bR" resolve="appendHeadKept" />
                   <node concept="10Nm6u" id="5itBwM5P1Sk" role="37wK5m">
                     <node concept="29HgVG" id="5itBwM5P1Sl" role="lGtFl" />
                   </node>
@@ -11580,8 +11580,8 @@
                           </node>
                         </node>
                         <node concept="Rm8GO" id="5itBwM5P1SH" role="3uHU7w">
-                          <ref role="1Px2BO" to="i348:4OKkcnfu_Ag" resolve="RuleTemplateMehodKind" />
-                          <ref role="Rm8GQ" to="i348:4OKkcnfu_Ah" resolve="HEAD_KEPT" />
+                          <ref role="1Px2BO" to="ugy2:4OKkcnfu_Ag" resolve="RuleTemplateMehodKind" />
+                          <ref role="Rm8GQ" to="ugy2:4OKkcnfu_Ah" resolve="HEAD_KEPT" />
                         </node>
                       </node>
                     </node>
@@ -11611,8 +11611,8 @@
                 </node>
               </node>
               <node concept="Rm8GO" id="5itBwM5Psg7" role="3uHU7w">
-                <ref role="1Px2BO" to="i348:4OKkcnfu_Ag" resolve="RuleTemplateMehodKind" />
-                <ref role="Rm8GQ" to="i348:4OKkcnfu_Ah" resolve="HEAD_KEPT" />
+                <ref role="1Px2BO" to="ugy2:4OKkcnfu_Ag" resolve="RuleTemplateMehodKind" />
+                <ref role="Rm8GQ" to="ugy2:4OKkcnfu_Ah" resolve="HEAD_KEPT" />
               </node>
             </node>
           </node>
@@ -11632,11 +11632,11 @@
               <node concept="3cpWsn" id="5itBwM5Ppq_" role="3cpWs9">
                 <property role="TrG5h" value="builder" />
                 <node concept="3uibUv" id="5itBwM5PpqA" role="1tU5fm">
-                  <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
+                  <ref role="3uigEE" to="ugy2:7eGEHDlc$ap" resolve="RuleBuilder" />
                 </node>
                 <node concept="2ShNRf" id="5itBwM5PpqB" role="33vP2m">
                   <node concept="1pGfFk" id="5itBwM5PpqC" role="2ShVmc">
-                    <ref role="37wK5l" to="i348:5yr01fE1Jnt" resolve="RuleBuilder" />
+                    <ref role="37wK5l" to="ugy2:5yr01fE1Jnt" resolve="RuleBuilder" />
                     <node concept="10Nm6u" id="5itBwM5PpqD" role="37wK5m" />
                     <node concept="Xl_RD" id="5itBwM5PpqE" role="37wK5m">
                       <property role="Xl_RC" value="" />
@@ -11659,7 +11659,7 @@
             <node concept="3clFbF" id="5itBwM5Pprd" role="3cqZAp">
               <node concept="2OqwBi" id="5itBwM5Ppre" role="3clFbG">
                 <node concept="liA8E" id="5itBwM5Pprf" role="2OqNvi">
-                  <ref role="37wK5l" to="i348:7eGEHDlc$bq" resolve="appendHeadReplaced" />
+                  <ref role="37wK5l" to="ugy2:7eGEHDlc$bq" resolve="appendHeadReplaced" />
                   <node concept="10Nm6u" id="5itBwM5Pprg" role="37wK5m">
                     <node concept="29HgVG" id="5itBwM5Pprh" role="lGtFl" />
                   </node>
@@ -11714,8 +11714,8 @@
                 </node>
               </node>
               <node concept="Rm8GO" id="5itBwM5PyNg" role="3uHU7w">
-                <ref role="1Px2BO" to="i348:4OKkcnfu_Ag" resolve="RuleTemplateMehodKind" />
-                <ref role="Rm8GQ" to="i348:4OKkcnfu_Ai" resolve="HEAD_REPLACED" />
+                <ref role="1Px2BO" to="ugy2:4OKkcnfu_Ag" resolve="RuleTemplateMehodKind" />
+                <ref role="Rm8GQ" to="ugy2:4OKkcnfu_Ai" resolve="HEAD_REPLACED" />
               </node>
             </node>
           </node>
@@ -11735,11 +11735,11 @@
               <node concept="3cpWsn" id="5itBwM5Pw0T" role="3cpWs9">
                 <property role="TrG5h" value="builder" />
                 <node concept="3uibUv" id="5itBwM5Pw0U" role="1tU5fm">
-                  <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
+                  <ref role="3uigEE" to="ugy2:7eGEHDlc$ap" resolve="RuleBuilder" />
                 </node>
                 <node concept="2ShNRf" id="5itBwM5Pw0V" role="33vP2m">
                   <node concept="1pGfFk" id="5itBwM5Pw0W" role="2ShVmc">
-                    <ref role="37wK5l" to="i348:5yr01fE1Jnt" resolve="RuleBuilder" />
+                    <ref role="37wK5l" to="ugy2:5yr01fE1Jnt" resolve="RuleBuilder" />
                     <node concept="10Nm6u" id="5itBwM5Pw0X" role="37wK5m" />
                     <node concept="Xl_RD" id="5itBwM5Pw0Y" role="37wK5m">
                       <property role="Xl_RC" value="" />
@@ -11762,7 +11762,7 @@
             <node concept="3clFbF" id="5itBwM5Pw1y" role="3cqZAp">
               <node concept="2OqwBi" id="5itBwM5Pw1z" role="3clFbG">
                 <node concept="liA8E" id="5itBwM5Pw1$" role="2OqNvi">
-                  <ref role="37wK5l" to="i348:7eGEHDlc$aX" resolve="appendGuard" />
+                  <ref role="37wK5l" to="ugy2:7eGEHDlc$aX" resolve="appendGuard" />
                   <node concept="10Nm6u" id="5itBwM5Pw1_" role="37wK5m">
                     <node concept="29HgVG" id="5itBwM5Pw1A" role="lGtFl" />
                   </node>
@@ -11817,8 +11817,8 @@
                 </node>
               </node>
               <node concept="Rm8GO" id="5itBwM5PFti" role="3uHU7w">
-                <ref role="1Px2BO" to="i348:4OKkcnfu_Ag" resolve="RuleTemplateMehodKind" />
-                <ref role="Rm8GQ" to="i348:4OKkcnfu_Aj" resolve="GUARD" />
+                <ref role="1Px2BO" to="ugy2:4OKkcnfu_Ag" resolve="RuleTemplateMehodKind" />
+                <ref role="Rm8GQ" to="ugy2:4OKkcnfu_Aj" resolve="GUARD" />
               </node>
             </node>
           </node>
@@ -11838,11 +11838,11 @@
               <node concept="3cpWsn" id="5itBwM5PCrl" role="3cpWs9">
                 <property role="TrG5h" value="builder" />
                 <node concept="3uibUv" id="5itBwM5PCrm" role="1tU5fm">
-                  <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
+                  <ref role="3uigEE" to="ugy2:7eGEHDlc$ap" resolve="RuleBuilder" />
                 </node>
                 <node concept="2ShNRf" id="5itBwM5PCrn" role="33vP2m">
                   <node concept="1pGfFk" id="5itBwM5PCro" role="2ShVmc">
-                    <ref role="37wK5l" to="i348:5yr01fE1Jnt" resolve="RuleBuilder" />
+                    <ref role="37wK5l" to="ugy2:5yr01fE1Jnt" resolve="RuleBuilder" />
                     <node concept="10Nm6u" id="5itBwM5PCrp" role="37wK5m" />
                     <node concept="Xl_RD" id="5itBwM5PCrq" role="37wK5m">
                       <property role="Xl_RC" value="" />
@@ -11865,7 +11865,7 @@
             <node concept="3clFbF" id="5itBwM5PCrX" role="3cqZAp">
               <node concept="2OqwBi" id="5itBwM5PCrY" role="3clFbG">
                 <node concept="liA8E" id="5itBwM5PCrZ" role="2OqNvi">
-                  <ref role="37wK5l" to="i348:7eGEHDlc$aw" resolve="appendBody" />
+                  <ref role="37wK5l" to="ugy2:7eGEHDlc$aw" resolve="appendBody" />
                   <node concept="10Nm6u" id="5itBwM5PCs0" role="37wK5m">
                     <node concept="29HgVG" id="5itBwM5PCs1" role="lGtFl" />
                   </node>
@@ -11920,8 +11920,8 @@
                 </node>
               </node>
               <node concept="Rm8GO" id="5itBwM5PL8t" role="3uHU7w">
-                <ref role="Rm8GQ" to="i348:4OKkcnfu_Ak" resolve="BODY" />
-                <ref role="1Px2BO" to="i348:4OKkcnfu_Ag" resolve="RuleTemplateMehodKind" />
+                <ref role="Rm8GQ" to="ugy2:4OKkcnfu_Ak" resolve="BODY" />
+                <ref role="1Px2BO" to="ugy2:4OKkcnfu_Ag" resolve="RuleTemplateMehodKind" />
               </node>
             </node>
           </node>
@@ -11941,11 +11941,11 @@
               <node concept="3cpWsn" id="5itBwM5PHX9" role="3cpWs9">
                 <property role="TrG5h" value="builder" />
                 <node concept="3uibUv" id="5itBwM5PHXa" role="1tU5fm">
-                  <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
+                  <ref role="3uigEE" to="ugy2:7eGEHDlc$ap" resolve="RuleBuilder" />
                 </node>
                 <node concept="2ShNRf" id="5itBwM5PHXb" role="33vP2m">
                   <node concept="1pGfFk" id="5itBwM5PHXc" role="2ShVmc">
-                    <ref role="37wK5l" to="i348:5yr01fE1Jnt" resolve="RuleBuilder" />
+                    <ref role="37wK5l" to="ugy2:5yr01fE1Jnt" resolve="RuleBuilder" />
                     <node concept="10Nm6u" id="5itBwM5PHXd" role="37wK5m" />
                     <node concept="Xl_RD" id="5itBwM5PHXe" role="37wK5m">
                       <property role="Xl_RC" value="" />
@@ -11987,7 +11987,7 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="5itBwM5PHY5" role="2OqNvi">
-                  <ref role="37wK5l" to="i348:7eGEHDlc$aw" resolve="appendBody" />
+                  <ref role="37wK5l" to="ugy2:7eGEHDlc$aw" resolve="appendBody" />
                   <node concept="10Nm6u" id="5itBwM5PHY6" role="37wK5m">
                     <node concept="29HgVG" id="5itBwM5PHY7" role="lGtFl" />
                   </node>
@@ -12040,7 +12040,7 @@
               <node concept="1Y3b0j" id="1HWyn8iTlB0" role="YeSDq">
                 <property role="2bfB8j" value="true" />
                 <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
-                <ref role="1Y3XeK" to="i348:5WBVN_M1BKE" resolve="LateExpression" />
+                <ref role="1Y3XeK" to="ugy2:5WBVN_M1BKE" resolve="LateExpression" />
                 <node concept="3Tm1VV" id="1HWyn8iTlB1" role="1B3o_S" />
                 <node concept="3clFb_" id="1HWyn8iTlB2" role="jymVt">
                   <property role="1EzhhJ" value="false" />
@@ -12443,7 +12443,7 @@
         <node concept="37vLTG" id="6R6MIbUQYO2" role="3clF46">
           <property role="TrG5h" value="session" />
           <node concept="3uibUv" id="6R6MIbUQYO3" role="1tU5fm">
-            <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
+            <ref role="3uigEE" to="ugy2:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
           </node>
         </node>
       </node>
@@ -12453,7 +12453,7 @@
         <property role="TrG5h" value="apply" />
         <node concept="A3Dl8" id="36tQV5AoEOP" role="3clF45">
           <node concept="3uibUv" id="36tQV5AoEOQ" role="A3Ik2">
-            <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
+            <ref role="3uigEE" to="ugy2:7eGEHDlc$ap" resolve="RuleBuilder" />
           </node>
         </node>
         <node concept="3Tm1VV" id="36tQV5AoEOU" role="1B3o_S" />
@@ -12462,7 +12462,7 @@
             <node concept="3cpWsn" id="6R6MIbUR3Tc" role="3cpWs9">
               <property role="TrG5h" value="_session" />
               <node concept="3uibUv" id="6R6MIbUR3Td" role="1tU5fm">
-                <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
+                <ref role="3uigEE" to="ugy2:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
               </node>
               <node concept="37vLTw" id="6R6MIbUSyZz" role="33vP2m">
                 <ref role="3cqZAo" node="6R6MIbUQZ$L" resolve="session" />
@@ -12477,7 +12477,7 @@
               <node concept="2ShNRf" id="6R6MIbTvFeW" role="37vLTx">
                 <node concept="Tc6Ow" id="6R6MIbTvFL7" role="2ShVmc">
                   <node concept="3uibUv" id="6R6MIbTvGnC" role="HW$YZ">
-                    <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
+                    <ref role="3uigEE" to="ugy2:7eGEHDlc$ap" resolve="RuleBuilder" />
                   </node>
                 </node>
               </node>
@@ -12636,7 +12636,7 @@
         </node>
         <node concept="_YKpA" id="6R6MIbTvEQ4" role="1tU5fm">
           <node concept="3uibUv" id="6R6MIbTvEQ5" role="_ZDj9">
-            <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
+            <ref role="3uigEE" to="ugy2:7eGEHDlc$ap" resolve="RuleBuilder" />
           </node>
         </node>
       </node>
@@ -12649,14 +12649,14 @@
         <property role="TrG5h" value="session" />
         <node concept="3Tmbuc" id="6R6MIbUR0XN" role="1B3o_S" />
         <node concept="3uibUv" id="6R6MIbUQZ$O" role="1tU5fm">
-          <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
+          <ref role="3uigEE" to="ugy2:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
         </node>
         <node concept="2ZBi8u" id="6R6MIbUR125" role="lGtFl">
           <ref role="2rW$FS" node="6R6MIbUtc6X" resolve="apply_session_field" />
         </node>
       </node>
       <node concept="3uibUv" id="6R6MIbTakqu" role="EKbjA">
-        <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplate.Token" />
+        <ref role="3uigEE" to="ugy2:2RRx4MZ6_68" resolve="RuleTemplate.Token" />
       </node>
     </node>
     <node concept="2tJIrI" id="36tQV5AoEXD" role="jymVt" />
@@ -12665,14 +12665,14 @@
       <node concept="37vLTG" id="36tQV5AoEXG" role="3clF46">
         <property role="TrG5h" value="ruleTable" />
         <node concept="3uibUv" id="36tQV5AoEXH" role="1tU5fm">
-          <ref role="3uigEE" to="i348:4MqhgXU9fm3" resolve="RuleTable" />
+          <ref role="3uigEE" to="ugy2:4MqhgXU9fm3" resolve="RuleTable" />
         </node>
       </node>
       <node concept="3cqZAl" id="36tQV5AoEXI" role="3clF45" />
       <node concept="3Tm1VV" id="36tQV5AoEXJ" role="1B3o_S" />
       <node concept="3clFbS" id="36tQV5AoEXK" role="3clF47">
         <node concept="XkiVB" id="36tQV5AoEXL" role="3cqZAp">
-          <ref role="37wK5l" to="i348:1ffsG7bUbEV" resolve="AbstractRuleTemplate" />
+          <ref role="37wK5l" to="ugy2:1ffsG7bUbEV" resolve="AbstractRuleTemplate" />
           <node concept="37vLTw" id="36tQV5AoEXM" role="37wK5m">
             <ref role="3cqZAo" node="36tQV5AoEXG" resolve="ruleTable" />
           </node>
@@ -12923,7 +12923,7 @@
       </node>
     </node>
     <node concept="3uibUv" id="36tQV5AoF2O" role="1zkMxy">
-      <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstractRuleTemplate" />
+      <ref role="3uigEE" to="ugy2:1ffsG7bUbCM" resolve="AbstractRuleTemplate" />
       <node concept="3uibUv" id="36tQV5AoF33" role="11_B2D">
         <ref role="3uigEE" node="36tQV5AoEKJ" resolve="RuleTemplateImpl.Token" />
         <node concept="1ZhdrF" id="36tQV5AoF34" role="lGtFl">
@@ -12954,7 +12954,7 @@
       <node concept="37vLTG" id="6R6MIbTM3nA" role="3clF46">
         <property role="TrG5h" value="session" />
         <node concept="3uibUv" id="6R6MIbTM3nB" role="1tU5fm">
-          <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
+          <ref role="3uigEE" to="ugy2:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
         </node>
       </node>
       <node concept="3uibUv" id="6R6MIbTM3nQ" role="3clF45">
@@ -13014,7 +13014,7 @@
                       <node concept="37vLTG" id="36tQV5AxhPV" role="3clF46">
                         <property role="TrG5h" value="session" />
                         <node concept="3uibUv" id="36tQV5AxhPW" role="1tU5fm">
-                          <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
+                          <ref role="3uigEE" to="ugy2:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
                         </node>
                         <node concept="2ZBi8u" id="36tQV5BcPaJ" role="lGtFl">
                           <ref role="2rW$FS" node="429xoypVg6q" resolve="apply_session_parameter" />
@@ -13053,11 +13053,11 @@
                           <node concept="3cpWsn" id="36tQV5AxhQ2" role="3cpWs9">
                             <property role="TrG5h" value="builder" />
                             <node concept="3uibUv" id="36tQV5AxhQ3" role="1tU5fm">
-                              <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
+                              <ref role="3uigEE" to="ugy2:7eGEHDlc$ap" resolve="RuleBuilder" />
                             </node>
                             <node concept="2ShNRf" id="36tQV5AxhQ4" role="33vP2m">
                               <node concept="1pGfFk" id="36tQV5AxhQ5" role="2ShVmc">
-                                <ref role="37wK5l" to="i348:7nPD14OeqYJ" resolve="RuleBuilder" />
+                                <ref role="37wK5l" to="ugy2:7nPD14OeqYJ" resolve="RuleBuilder" />
                                 <node concept="37vLTw" id="5yr01fE1Y_1" role="37wK5m">
                                   <ref role="3cqZAo" node="36tQV5AxhPV" resolve="session" />
                                 </node>
@@ -13088,7 +13088,7 @@
                                   </node>
                                 </node>
                                 <node concept="1rXfSq" id="6R6MIbTNlX8" role="37wK5m">
-                                  <ref role="37wK5l" to="i348:62MNP_kY8lD" resolve="getTemplateRef" />
+                                  <ref role="37wK5l" to="ugy2:62MNP_kY8lD" resolve="getTemplateRef" />
                                 </node>
                                 <node concept="10Nm6u" id="aZPZmIa3_t" role="37wK5m">
                                   <node concept="1sPUBX" id="aZPZmIa3Tl" role="lGtFl">
@@ -13188,7 +13188,7 @@
                                   <ref role="3cqZAo" node="36tQV5AxhQ2" resolve="builder" />
                                 </node>
                                 <node concept="liA8E" id="6E2cNibq5E$" role="2OqNvi">
-                                  <ref role="37wK5l" to="i348:32fHqDf8Vx1" resolve="appendAlternation" />
+                                  <ref role="37wK5l" to="ugy2:32fHqDf8Vx1" resolve="appendAlternation" />
                                 </node>
                               </node>
                             </node>
@@ -13323,19 +13323,19 @@
           <node concept="3Tm6S6" id="6R6MIbTaKAI" role="1B3o_S" />
           <node concept="_YKpA" id="6R6MIbTAz77" role="1tU5fm">
             <node concept="3uibUv" id="6R6MIbTAz78" role="_ZDj9">
-              <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
+              <ref role="3uigEE" to="ugy2:7eGEHDlc$ap" resolve="RuleBuilder" />
             </node>
           </node>
         </node>
         <node concept="3Tm1VV" id="36tQV5AxhJe" role="1B3o_S" />
         <node concept="3uibUv" id="6R6MIbUgkER" role="EKbjA">
-          <ref role="3uigEE" to="i348:mJ_D14woL$" resolve="Template.Token" />
+          <ref role="3uigEE" to="ugy2:mJ_D14woL$" resolve="Template.Token" />
         </node>
       </node>
       <node concept="2tJIrI" id="6R6MIbTN7mU" role="jymVt" />
       <node concept="3Tm1VV" id="6R6MIbTN7kh" role="1B3o_S" />
       <node concept="3uibUv" id="6R6MIbU1iPN" role="1zkMxy">
-        <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstractRuleTemplate" />
+        <ref role="3uigEE" to="ugy2:1ffsG7bUbCM" resolve="AbstractRuleTemplate" />
         <node concept="3uibUv" id="6R6MIbU1kcI" role="11_B2D">
           <ref role="3uigEE" node="36tQV5AxhJd" resolve="__Template.Token" />
         </node>
@@ -13344,7 +13344,7 @@
         <node concept="37vLTG" id="6R6MIbU1l5A" role="3clF46">
           <property role="TrG5h" value="ruleTable" />
           <node concept="3uibUv" id="6R6MIbU1l5B" role="1tU5fm">
-            <ref role="3uigEE" to="i348:4MqhgXU9fm3" resolve="RuleTable" />
+            <ref role="3uigEE" to="ugy2:4MqhgXU9fm3" resolve="RuleTable" />
           </node>
         </node>
         <node concept="37vLTG" id="6R6MIbU1l5C" role="3clF46">
@@ -13365,7 +13365,7 @@
         <node concept="3Tm1VV" id="6R6MIbU1l5H" role="1B3o_S" />
         <node concept="3clFbS" id="6R6MIbU1l5I" role="3clF47">
           <node concept="XkiVB" id="6R6MIbU1l61" role="3cqZAp">
-            <ref role="37wK5l" to="i348:1ffsG7bUbEV" resolve="AbstractRuleTemplate" />
+            <ref role="37wK5l" to="ugy2:1ffsG7bUbEV" resolve="AbstractRuleTemplate" />
             <node concept="37vLTw" id="6R6MIbU1l62" role="37wK5m">
               <ref role="3cqZAo" node="6R6MIbU1l5A" resolve="ruleTable" />
             </node>
@@ -13382,7 +13382,7 @@
         </node>
       </node>
       <node concept="3uibUv" id="6R6MIbU9RKN" role="EKbjA">
-        <ref role="3uigEE" to="i348:6R6MIbU9$OD" resolve="Template" />
+        <ref role="3uigEE" to="ugy2:6R6MIbU9$OD" resolve="Template" />
       </node>
     </node>
   </node>
@@ -13399,14 +13399,14 @@
             <property role="TrG5h" value="query" />
             <node concept="3Tmbuc" id="5EDW3XECiGe" role="1B3o_S" />
             <node concept="3uibUv" id="5EDW3XECjsb" role="1tU5fm">
-              <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
+              <ref role="3uigEE" to="ugy2:5EDW3XDYeWv" resolve="Query" />
             </node>
           </node>
           <node concept="2tJIrI" id="5EDW3XECk_x" role="jymVt" />
           <node concept="3clFb_" id="5EDW3XECkC0" role="jymVt">
             <property role="TrG5h" value="context" />
             <node concept="3uibUv" id="5EDW3XECkGd" role="3clF45">
-              <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
+              <ref role="3uigEE" to="ugy2:5EDW3XDYeWv" resolve="Query" />
             </node>
             <node concept="3Tm6S6" id="5EDW3XECkC3" role="1B3o_S" />
             <node concept="3clFbS" id="5EDW3XECkC4" role="3clF47">
@@ -13464,7 +13464,7 @@
       <node concept="37vLTG" id="2WtKs4tywX_" role="3clF46">
         <property role="TrG5h" value="session" />
         <node concept="3uibUv" id="2WtKs4tywXA" role="1tU5fm">
-          <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
+          <ref role="3uigEE" to="ugy2:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
         </node>
       </node>
       <node concept="3cqZAl" id="2WtKs4tywXB" role="3clF45" />
@@ -13661,7 +13661,7 @@
         </node>
         <node concept="3Tm1VV" id="2J$kxDHVq4V" role="1B3o_S" />
         <node concept="3uibUv" id="2J$kxDHVqq9" role="EKbjA">
-          <ref role="3uigEE" to="i348:36tQV5AurZW" resolve="ConstraintRuleTemplate" />
+          <ref role="3uigEE" to="ugy2:36tQV5AurZW" resolve="ConstraintRuleTemplate" />
         </node>
         <node concept="2tJIrI" id="2J$kxDHVqCo" role="jymVt" />
         <node concept="312cEg" id="2J$kxDHW1_A" role="jymVt">
@@ -13947,7 +13947,7 @@
             <node concept="37vLTG" id="5itBwM60U_p" role="3clF46">
               <property role="TrG5h" value="session" />
               <node concept="3uibUv" id="5itBwM60VoO" role="1tU5fm">
-                <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
+                <ref role="3uigEE" to="ugy2:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
               </node>
             </node>
             <node concept="3cqZAl" id="5itBwM5TmEQ" role="3clF45" />
@@ -14321,7 +14321,7 @@
           <node concept="3clFb_" id="5itBwM5E5aB" role="jymVt">
             <property role="TrG5h" value="apply" />
             <node concept="3uibUv" id="5itBwM5Jp4x" role="3clF45">
-              <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
+              <ref role="3uigEE" to="ugy2:7eGEHDlc$ap" resolve="RuleBuilder" />
             </node>
             <node concept="3Tm1VV" id="5itBwM5E5aE" role="1B3o_S" />
             <node concept="3clFbS" id="5itBwM5MGqi" role="3clF47">
@@ -14334,7 +14334,7 @@
                 <node concept="3cpWsn" id="5itBwM63Owb" role="3cpWs9">
                   <property role="TrG5h" value="_session" />
                   <node concept="3uibUv" id="5itBwM63Owc" role="1tU5fm">
-                    <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
+                    <ref role="3uigEE" to="ugy2:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
                   </node>
                   <node concept="37vLTw" id="5itBwM63Owd" role="33vP2m">
                     <ref role="3cqZAo" node="5itBwM5SoMw" resolve="session" />
@@ -14348,11 +14348,11 @@
                 <node concept="3cpWsn" id="5itBwM5S4wZ" role="3cpWs9">
                   <property role="TrG5h" value="builder" />
                   <node concept="3uibUv" id="5itBwM5S4x0" role="1tU5fm">
-                    <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
+                    <ref role="3uigEE" to="ugy2:7eGEHDlc$ap" resolve="RuleBuilder" />
                   </node>
                   <node concept="2ShNRf" id="5itBwM5S4x1" role="33vP2m">
                     <node concept="1pGfFk" id="5itBwM5S4x2" role="2ShVmc">
-                      <ref role="37wK5l" to="i348:5yr01fE1Jnt" resolve="RuleBuilder" />
+                      <ref role="37wK5l" to="ugy2:5yr01fE1Jnt" resolve="RuleBuilder" />
                       <node concept="37vLTw" id="5itBwM5Srje" role="37wK5m">
                         <ref role="3cqZAo" node="5itBwM5SoMw" resolve="session" />
                       </node>
@@ -14432,7 +14432,7 @@
             <property role="TrG5h" value="session" />
             <node concept="3Tm6S6" id="5itBwM5SoMx" role="1B3o_S" />
             <node concept="3uibUv" id="5itBwM5Sqvi" role="1tU5fm">
-              <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
+              <ref role="3uigEE" to="ugy2:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
             </node>
           </node>
           <node concept="312cEg" id="5itBwM60YWo" role="jymVt">
@@ -14522,7 +14522,7 @@
           </node>
           <node concept="3Tm1VV" id="5itBwM5JjhB" role="1B3o_S" />
           <node concept="3uibUv" id="5itBwM8aqrA" role="EKbjA">
-            <ref role="3uigEE" to="i348:5itBwM86qnn" resolve="CallMacroTemplate.Token" />
+            <ref role="3uigEE" to="ugy2:5itBwM86qnn" resolve="CallMacroTemplate.Token" />
           </node>
           <node concept="2ZBi8u" id="5itBwM82QgH" role="lGtFl">
             <ref role="2rW$FS" node="7XmdqtdHiM8" resolve="macro_token_class" />
@@ -14534,7 +14534,7 @@
           <node concept="3Tm1VV" id="5itBwM7icrK" role="1B3o_S" />
           <node concept="3clFbS" id="5itBwM7icrL" role="3clF47">
             <node concept="XkiVB" id="5itBwM7if34" role="3cqZAp">
-              <ref role="37wK5l" to="i348:5yr01fDEuEm" resolve="AbstractMacroTemplate" />
+              <ref role="37wK5l" to="ugy2:5yr01fDEuEm" resolve="AbstractMacroTemplate" />
               <node concept="2YIFZM" id="5itBwM7if35" role="37wK5m">
                 <ref role="37wK5l" to="w1kc:~SNodePointer.deserialize(java.lang.String)" resolve="deserialize" />
                 <ref role="1Pybhc" to="w1kc:~SNodePointer" resolve="SNodePointer" />
@@ -14620,13 +14620,13 @@
           </node>
         </node>
         <node concept="3uibUv" id="5itBwM7ebUF" role="1zkMxy">
-          <ref role="3uigEE" to="i348:1hX44vNlvEV" resolve="AbstractMacroTemplate" />
+          <ref role="3uigEE" to="ugy2:1hX44vNlvEV" resolve="AbstractMacroTemplate" />
           <node concept="3uibUv" id="5itBwM7eeUX" role="11_B2D">
             <ref role="3uigEE" node="5itBwM5JjhA" resolve="__MacroTable._Call.Token" />
           </node>
         </node>
         <node concept="3uibUv" id="5itBwM7eoUk" role="EKbjA">
-          <ref role="3uigEE" to="i348:5itBwM7auSJ" resolve="CallMacroTemplate" />
+          <ref role="3uigEE" to="ugy2:5itBwM7auSJ" resolve="CallMacroTemplate" />
           <node concept="3uibUv" id="5itBwM7eslN" role="11_B2D">
             <ref role="3uigEE" node="5itBwM5JjhA" resolve="__MacroTable._Call.Token" />
           </node>
@@ -14640,7 +14640,7 @@
           <node concept="37vLTG" id="5itBwM7fU2t" role="3clF46">
             <property role="TrG5h" value="session" />
             <node concept="3uibUv" id="5itBwM7fU2u" role="1tU5fm">
-              <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
+              <ref role="3uigEE" to="ugy2:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
             </node>
           </node>
           <node concept="3uibUv" id="5itBwM7fXJY" role="3clF45">
@@ -14697,7 +14697,7 @@
             <node concept="37vLTG" id="5itBwM6XBG3" role="3clF46">
               <property role="TrG5h" value="session" />
               <node concept="3uibUv" id="5itBwM6XBG4" role="1tU5fm">
-                <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
+                <ref role="3uigEE" to="ugy2:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
               </node>
             </node>
             <node concept="3cqZAl" id="5itBwM6XBG5" role="3clF45" />
@@ -15203,7 +15203,7 @@
           <node concept="3clFb_" id="5itBwM6VImB" role="jymVt">
             <property role="TrG5h" value="apply" />
             <node concept="3uibUv" id="5itBwM6VImZ" role="3clF45">
-              <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
+              <ref role="3uigEE" to="ugy2:7eGEHDlc$ap" resolve="RuleBuilder" />
             </node>
             <node concept="3Tm1VV" id="5itBwM6VIn0" role="1B3o_S" />
             <node concept="3clFbS" id="5itBwM6VIn1" role="3clF47">
@@ -15216,7 +15216,7 @@
                 <node concept="3cpWsn" id="5itBwM6VIn3" role="3cpWs9">
                   <property role="TrG5h" value="_session" />
                   <node concept="3uibUv" id="5itBwM6VIn4" role="1tU5fm">
-                    <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
+                    <ref role="3uigEE" to="ugy2:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
                   </node>
                   <node concept="37vLTw" id="5itBwM6XZyo" role="33vP2m">
                     <ref role="3cqZAo" node="5itBwM6XBHK" resolve="session" />
@@ -15230,11 +15230,11 @@
                 <node concept="3cpWsn" id="5itBwM6VIn8" role="3cpWs9">
                   <property role="TrG5h" value="builder" />
                   <node concept="3uibUv" id="5itBwM6VIn9" role="1tU5fm">
-                    <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
+                    <ref role="3uigEE" to="ugy2:7eGEHDlc$ap" resolve="RuleBuilder" />
                   </node>
                   <node concept="2ShNRf" id="5itBwM6VIna" role="33vP2m">
                     <node concept="1pGfFk" id="5itBwM6VInb" role="2ShVmc">
-                      <ref role="37wK5l" to="i348:5yr01fE1Jnt" resolve="RuleBuilder" />
+                      <ref role="37wK5l" to="ugy2:5yr01fE1Jnt" resolve="RuleBuilder" />
                       <node concept="37vLTw" id="5itBwM6XZAl" role="37wK5m">
                         <ref role="3cqZAo" node="5itBwM6XBHK" resolve="session" />
                       </node>
@@ -15292,7 +15292,7 @@
                     <ref role="3cqZAo" node="5itBwM6VIn8" resolve="builder" />
                   </node>
                   <node concept="liA8E" id="5NUR$Nyqhm" role="2OqNvi">
-                    <ref role="37wK5l" to="i348:6VRLMeOeOlh" resolve="processMacroInput" />
+                    <ref role="37wK5l" to="ugy2:6VRLMeOeOlh" resolve="processMacroInput" />
                     <node concept="35c_gC" id="5NUR$NyqRu" role="37wK5m">
                       <ref role="35c_gD" to="tpck:gw2VY9q" resolve="BaseConcept" />
                       <node concept="1ZhdrF" id="5NUR$NyqXa" role="lGtFl">
@@ -15354,7 +15354,7 @@
             <property role="TrG5h" value="session" />
             <node concept="3Tmbuc" id="5itBwM6XBHL" role="1B3o_S" />
             <node concept="3uibUv" id="5itBwM6XBHM" role="1tU5fm">
-              <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
+              <ref role="3uigEE" to="ugy2:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
             </node>
           </node>
           <node concept="3Tm1VV" id="5itBwM6XBHN" role="1B3o_S" />
@@ -15533,7 +15533,7 @@
             <ref role="2rW$FS" node="7XmdqtdHiM8" resolve="macro_token_class" />
           </node>
           <node concept="3uibUv" id="5itBwM8b8eg" role="EKbjA">
-            <ref role="3uigEE" to="i348:5itBwM86qUH" resolve="ExpandMacroTemplate.Token" />
+            <ref role="3uigEE" to="ugy2:5itBwM86qUH" resolve="ExpandMacroTemplate.Token" />
           </node>
         </node>
         <node concept="2tJIrI" id="5itBwM6P5hY" role="jymVt" />
@@ -15542,7 +15542,7 @@
           <node concept="3Tm1VV" id="5itBwM7hMpB" role="1B3o_S" />
           <node concept="3clFbS" id="5itBwM7hMpC" role="3clF47">
             <node concept="XkiVB" id="5itBwM7hWDC" role="3cqZAp">
-              <ref role="37wK5l" to="i348:5yr01fDEuEm" resolve="AbstractMacroTemplate" />
+              <ref role="37wK5l" to="ugy2:5yr01fDEuEm" resolve="AbstractMacroTemplate" />
               <node concept="2YIFZM" id="5itBwM7hWDD" role="37wK5m">
                 <ref role="37wK5l" to="w1kc:~SNodePointer.deserialize(java.lang.String)" resolve="deserialize" />
                 <ref role="1Pybhc" to="w1kc:~SNodePointer" resolve="SNodePointer" />
@@ -15628,7 +15628,7 @@
           </node>
         </node>
         <node concept="3uibUv" id="5itBwM78Os4" role="EKbjA">
-          <ref role="3uigEE" to="i348:5itBwM75Jiy" resolve="ExpandMacroTemplate" />
+          <ref role="3uigEE" to="ugy2:5itBwM75Jiy" resolve="ExpandMacroTemplate" />
           <node concept="3uibUv" id="5itBwM78Sxy" role="11_B2D">
             <ref role="3uigEE" node="5itBwM6XBFY" resolve="__MacroTable._Expand.Token" />
           </node>
@@ -15683,7 +15683,7 @@
           <node concept="37vLTG" id="5itBwM797ER" role="3clF46">
             <property role="TrG5h" value="session" />
             <node concept="3uibUv" id="5itBwM797ES" role="1tU5fm">
-              <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
+              <ref role="3uigEE" to="ugy2:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
             </node>
           </node>
           <node concept="3uibUv" id="5itBwM7fMF2" role="3clF45">
@@ -15713,7 +15713,7 @@
           </node>
         </node>
         <node concept="3uibUv" id="5itBwM7eBu_" role="1zkMxy">
-          <ref role="3uigEE" to="i348:1hX44vNlvEV" resolve="AbstractMacroTemplate" />
+          <ref role="3uigEE" to="ugy2:1hX44vNlvEV" resolve="AbstractMacroTemplate" />
           <node concept="3uibUv" id="5itBwM7eDRo" role="11_B2D">
             <ref role="3uigEE" node="5itBwM6XBFY" resolve="__MacroTable._Expand.Token" />
           </node>
@@ -15757,7 +15757,7 @@
       <node concept="3clFb_" id="5hSMZ_lNZhp" role="jymVt">
         <property role="TrG5h" value="feature" />
         <node concept="3uibUv" id="5hSMZ_lNZhq" role="3clF45">
-          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+          <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
         </node>
         <node concept="3Tm1VV" id="7c96q9tN7xJ" role="1B3o_S" />
         <node concept="3clFbS" id="5hSMZ_lNZhs" role="3clF47">
@@ -15852,7 +15852,7 @@
         <property role="TrG5h" value="getTerm" />
         <property role="1EzhhJ" value="false" />
         <node concept="3uibUv" id="5hSMZ_lNZhV" role="3clF45">
-          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+          <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
         </node>
         <node concept="3Tm1VV" id="5hSMZ_lNZhW" role="1B3o_S" />
         <node concept="3clFbS" id="5hSMZ_lNZhX" role="3clF47">
@@ -15911,7 +15911,7 @@
         </node>
       </node>
       <node concept="3uibUv" id="5hSMZ_lNZiR" role="1zkMxy">
-        <ref role="3uigEE" to="i348:4MEOIDFA48I" resolve="AbstractTermDeclaration" />
+        <ref role="3uigEE" to="ugy2:4MEOIDFA48I" resolve="AbstractTermDeclaration" />
       </node>
     </node>
     <node concept="2tJIrI" id="JOGAOsG6Mn" role="jymVt" />
@@ -15969,7 +15969,7 @@
               <node concept="3clFbF" id="5hSMZ_ljA5G" role="3cqZAp">
                 <node concept="2OqwBi" id="5hSMZ_ljA5H" role="3clFbG">
                   <node concept="liA8E" id="5hSMZ_ljA5I" role="2OqNvi">
-                    <ref role="37wK5l" to="i348:4MEOIDFA4bP" resolve="getTerm" />
+                    <ref role="37wK5l" to="ugy2:4MEOIDFA4bP" resolve="getTerm" />
                   </node>
                   <node concept="1eOMI4" id="5hSMZ_ljA5J" role="2Oq$k0">
                     <node concept="2ShNRf" id="5hSMZ_ljA5K" role="1eOMHV">
@@ -16009,7 +16009,7 @@
                           <node concept="3clFb_" id="5hSMZ_ljA5Y" role="3MN40a">
                             <property role="TrG5h" value="feature" />
                             <node concept="3uibUv" id="5hSMZ_ljA5Z" role="3clF45">
-                              <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                              <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                             </node>
                             <node concept="3Tm1VV" id="7c96q9tP8pA" role="1B3o_S" />
                             <node concept="3clFbS" id="5hSMZ_ljA61" role="3clF47">
@@ -16059,7 +16059,7 @@
                           </node>
                           <node concept="3Tm1VV" id="5hSMZ_ljA6u" role="1B3o_S" />
                           <node concept="3uibUv" id="5hSMZ_ljA6v" role="1L3L74">
-                            <ref role="3uigEE" to="i348:4MEOIDFA48I" resolve="AbstractTermDeclaration" />
+                            <ref role="3uigEE" to="ugy2:4MEOIDFA48I" resolve="AbstractTermDeclaration" />
                           </node>
                           <node concept="17Uvod" id="5hSMZ_ljA6w" role="lGtFl">
                             <property role="P4ACc" value="df345b11-b8c7-4213-ac66-48d2a9b75d88/3421461530438559753/3421461530438559973" />
@@ -16139,7 +16139,7 @@
                     </node>
                   </node>
                   <node concept="3uibUv" id="5hSMZ_ljTTZ" role="2lIhxL">
-                    <ref role="3uigEE" to="i348:4MEOIDFA48I" resolve="AbstractTermDeclaration" />
+                    <ref role="3uigEE" to="ugy2:4MEOIDFA48I" resolve="AbstractTermDeclaration" />
                   </node>
                   <node concept="17Uvod" id="5hSMZ_ljTU0" role="lGtFl">
                     <property role="P4ACc" value="df345b11-b8c7-4213-ac66-48d2a9b75d88/1173996401517/1173996588177" />
@@ -16176,7 +16176,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="5hSMZ_ljTU9" role="2OqNvi">
-                <ref role="37wK5l" to="i348:4MEOIDFA4bP" resolve="getTerm" />
+                <ref role="37wK5l" to="ugy2:4MEOIDFA4bP" resolve="getTerm" />
               </node>
               <node concept="raruj" id="5hSMZ_ljTUa" role="lGtFl" />
             </node>
@@ -16213,7 +16213,7 @@
             <node concept="3cpWsn" id="24ciDNzqUsg" role="3cpWs9">
               <property role="TrG5h" value="df" />
               <node concept="3uibUv" id="24ciDNzqUsh" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                 <node concept="raruj" id="24ciDNzqUsp" role="lGtFl" />
               </node>
             </node>
@@ -16239,7 +16239,7 @@
             <node concept="3cpWsn" id="4nUKN9YPm7k" role="3cpWs9">
               <property role="TrG5h" value="ln" />
               <node concept="3uibUv" id="4nUKN9YPm7l" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:3OPtF03lco4" resolve="ListNode" />
+                <ref role="3uigEE" to="cof4:3OPtF03lco4" resolve="ListNode" />
                 <node concept="raruj" id="4nUKN9YPm7m" role="lGtFl" />
               </node>
             </node>
@@ -16374,7 +16374,7 @@
           <node concept="3clFb_" id="5dFCr0xEfZX" role="jymVt">
             <property role="TrG5h" value="feature" />
             <node concept="3uibUv" id="5dFCr0xEfZY" role="3clF45">
-              <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+              <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
             </node>
             <node concept="3Tm1VV" id="5dFCr0xEfZZ" role="1B3o_S" />
             <node concept="3clFbS" id="5dFCr0xEg00" role="3clF47">
@@ -16417,8 +16417,8 @@
                           <node concept="3clFbS" id="4APe_wKgWQN" role="2VODD2">
                             <node concept="3clFbF" id="4APe_wKgWQO" role="3cqZAp">
                               <node concept="10M0yZ" id="4APe_wKgWQP" role="3clFbG">
-                                <ref role="3cqZAo" to="jpi6:1RYTbd6oE68" resolve="DECLARATION" />
-                                <ref role="1PxDUh" to="jpi6:1RYTbd6oE5l" resolve="TermUtil" />
+                                <ref role="3cqZAo" to="hh42:1RYTbd6oE68" resolve="DECLARATION" />
+                                <ref role="1PxDUh" to="hh42:1RYTbd6oE5l" resolve="TermUtil" />
                               </node>
                             </node>
                           </node>
@@ -16535,8 +16535,8 @@
                           <node concept="3clFbS" id="4APe_wKgWRB" role="2VODD2">
                             <node concept="3clFbF" id="4APe_wKgWRC" role="3cqZAp">
                               <node concept="10M0yZ" id="4APe_wKgWRD" role="3clFbG">
-                                <ref role="1PxDUh" to="jpi6:1RYTbd6oE5l" resolve="TermUtil" />
-                                <ref role="3cqZAo" to="jpi6:1RYTbd6oE9B" resolve="SPECIFICATION" />
+                                <ref role="1PxDUh" to="hh42:1RYTbd6oE5l" resolve="TermUtil" />
+                                <ref role="3cqZAo" to="hh42:1RYTbd6oE9B" resolve="SPECIFICATION" />
                               </node>
                             </node>
                           </node>
@@ -16574,7 +16574,7 @@
           <node concept="3clFb_" id="5dFCr0xEfb4" role="jymVt">
             <property role="TrG5h" value="feature" />
             <node concept="3uibUv" id="5dFCr0xEfcn" role="3clF45">
-              <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+              <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
             </node>
             <node concept="3Tm1VV" id="5dFCr0xEfb7" role="1B3o_S" />
             <node concept="3clFbS" id="5dFCr0xEfb8" role="3clF47">
@@ -16617,8 +16617,8 @@
                           <node concept="3clFbS" id="1RYTbd6oJ8u" role="2VODD2">
                             <node concept="3clFbF" id="1RYTbd6oJio" role="3cqZAp">
                               <node concept="10M0yZ" id="1RYTbd6oJiB" role="3clFbG">
-                                <ref role="3cqZAo" to="jpi6:1RYTbd6oE68" resolve="DECLARATION" />
-                                <ref role="1PxDUh" to="jpi6:1RYTbd6oE5l" resolve="TermUtil" />
+                                <ref role="3cqZAo" to="hh42:1RYTbd6oE68" resolve="DECLARATION" />
+                                <ref role="1PxDUh" to="hh42:1RYTbd6oE5l" resolve="TermUtil" />
                               </node>
                             </node>
                           </node>
@@ -16727,8 +16727,8 @@
                           <node concept="3clFbS" id="1RYTbd6H$v6" role="2VODD2">
                             <node concept="3clFbF" id="1RYTbd6H$v7" role="3cqZAp">
                               <node concept="10M0yZ" id="1RYTbd6H$v8" role="3clFbG">
-                                <ref role="3cqZAo" to="jpi6:1RYTbd6oE9B" resolve="SPECIFICATION" />
-                                <ref role="1PxDUh" to="jpi6:1RYTbd6oE5l" resolve="TermUtil" />
+                                <ref role="3cqZAo" to="hh42:1RYTbd6oE9B" resolve="SPECIFICATION" />
+                                <ref role="1PxDUh" to="hh42:1RYTbd6oE5l" resolve="TermUtil" />
                               </node>
                             </node>
                           </node>
@@ -17320,8 +17320,8 @@
               <node concept="1oi5XN" id="Lu45F8oXbJ" role="1oi5zu">
                 <node concept="22Ky0T" id="Lu45F8oXbK" role="lGtFl">
                   <node concept="2YIFZM" id="4$YN6QudHf0" role="22Ky0K">
-                    <ref role="37wK5l" to="oy3s:7nPD14NOHGU" resolve="wildcardMetaLogical" />
-                    <ref role="1Pybhc" to="oy3s:7nPD14NOCSa" resolve="MetaLogicalFactory" />
+                    <ref role="37wK5l" to="uwx2:7nPD14NOHGU" resolve="wildcardMetaLogical" />
+                    <ref role="1Pybhc" to="uwx2:7nPD14NOCSa" resolve="MetaLogicalFactory" />
                     <node concept="3VsKOn" id="W6bnNelN8X" role="37wK5m">
                       <ref role="3VsUkX" to="wyt6:~Object" resolve="Object" />
                     </node>
@@ -17419,10 +17419,10 @@
               <node concept="1oi5UN" id="Lu45F8j02J" role="1oi5TL">
                 <node concept="22Ky0T" id="Lu45F8j02K" role="lGtFl">
                   <node concept="2YIFZM" id="4$YN6QudHf1" role="22Ky0K">
-                    <ref role="37wK5l" to="oy3s:7nPD14NOHGU" resolve="wildcardMetaLogical" />
-                    <ref role="1Pybhc" to="oy3s:7nPD14NOCSa" resolve="MetaLogicalFactory" />
+                    <ref role="37wK5l" to="uwx2:7nPD14NOHGU" resolve="wildcardMetaLogical" />
+                    <ref role="1Pybhc" to="uwx2:7nPD14NOCSa" resolve="MetaLogicalFactory" />
                     <node concept="3VsKOn" id="6YPNC4OjWjb" role="37wK5m">
-                      <ref role="3VsUkX" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                      <ref role="3VsUkX" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                     </node>
                   </node>
                 </node>
@@ -17637,7 +17637,7 @@
             <node concept="3bZ5Sz" id="4U$Q3dLR14H" role="1tU5fm" />
           </node>
           <node concept="3uibUv" id="4U$Q3dLR14I" role="3clF45">
-            <ref role="3uigEE" to="i348:5itBwM75Jiy" resolve="ExpandMacroTemplate" />
+            <ref role="3uigEE" to="ugy2:5itBwM75Jiy" resolve="ExpandMacroTemplate" />
             <node concept="16syzq" id="4U$Q3dLR14J" role="11_B2D">
               <ref role="16sUi3" node="4U$Q3dLR15h" resolve="T" />
             </node>
@@ -17649,7 +17649,7 @@
                 <property role="TrG5h" value="result" />
                 <node concept="_YKpA" id="4U$Q3dLVpFd" role="1tU5fm">
                   <node concept="3uibUv" id="4U$Q3dLVpJi" role="_ZDj9">
-                    <ref role="3uigEE" to="i348:5itBwM75Jiy" resolve="ExpandMacroTemplate" />
+                    <ref role="3uigEE" to="ugy2:5itBwM75Jiy" resolve="ExpandMacroTemplate" />
                     <node concept="16syzq" id="4U$Q3dLVpJj" role="11_B2D">
                       <ref role="16sUi3" node="4U$Q3dLR15h" resolve="T" />
                     </node>
@@ -17694,7 +17694,7 @@
                     <node concept="TSZUe" id="631nQp3Zyd6" role="2OqNvi">
                       <node concept="10QFUN" id="631nQp3Zyd7" role="25WWJ7">
                         <node concept="3uibUv" id="631nQp3Zyd8" role="10QFUM">
-                          <ref role="3uigEE" to="i348:5itBwM75Jiy" resolve="ExpandMacroTemplate" />
+                          <ref role="3uigEE" to="ugy2:5itBwM75Jiy" resolve="ExpandMacroTemplate" />
                           <node concept="16syzq" id="631nQp3Zyd9" role="11_B2D">
                             <ref role="16sUi3" node="4U$Q3dLR15h" resolve="T" />
                           </node>
@@ -17766,7 +17766,7 @@
           <node concept="16euLQ" id="4U$Q3dLR15h" role="16eVyc">
             <property role="TrG5h" value="T" />
             <node concept="3uibUv" id="4U$Q3dLR15i" role="3ztrMU">
-              <ref role="3uigEE" to="i348:5itBwM86qUH" resolve="ExpandMacroTemplate.Token" />
+              <ref role="3uigEE" to="ugy2:5itBwM86qUH" resolve="ExpandMacroTemplate.Token" />
             </node>
           </node>
         </node>
@@ -17800,7 +17800,7 @@
             <node concept="3bZ5Sz" id="4U$Q3dLqoGv" role="1tU5fm" />
           </node>
           <node concept="3uibUv" id="4U$Q3dLqoGw" role="3clF45">
-            <ref role="3uigEE" to="i348:5itBwM75Jiy" resolve="ExpandMacroTemplate" />
+            <ref role="3uigEE" to="ugy2:5itBwM75Jiy" resolve="ExpandMacroTemplate" />
             <node concept="16syzq" id="4U$Q3dLqoGx" role="11_B2D">
               <ref role="16sUi3" node="4U$Q3dLqoH3" resolve="T" />
             </node>
@@ -17812,7 +17812,7 @@
                 <property role="TrG5h" value="result" />
                 <node concept="_YKpA" id="4U$Q3dLVtI1" role="1tU5fm">
                   <node concept="3uibUv" id="4U$Q3dLVtI2" role="_ZDj9">
-                    <ref role="3uigEE" to="i348:5itBwM75Jiy" resolve="ExpandMacroTemplate" />
+                    <ref role="3uigEE" to="ugy2:5itBwM75Jiy" resolve="ExpandMacroTemplate" />
                     <node concept="16syzq" id="4U$Q3dLVtI3" role="11_B2D">
                       <ref role="16sUi3" node="4U$Q3dLqoH3" resolve="T" />
                     </node>
@@ -17857,7 +17857,7 @@
                     <node concept="TSZUe" id="631nQp3ZzIF" role="2OqNvi">
                       <node concept="10QFUN" id="631nQp3ZzIG" role="25WWJ7">
                         <node concept="3uibUv" id="631nQp3ZzIH" role="10QFUM">
-                          <ref role="3uigEE" to="i348:5itBwM75Jiy" resolve="ExpandMacroTemplate" />
+                          <ref role="3uigEE" to="ugy2:5itBwM75Jiy" resolve="ExpandMacroTemplate" />
                           <node concept="16syzq" id="631nQp3ZzII" role="11_B2D">
                             <ref role="16sUi3" node="4U$Q3dLqoH3" resolve="T" />
                           </node>
@@ -17930,7 +17930,7 @@
           <node concept="16euLQ" id="4U$Q3dLqoH3" role="16eVyc">
             <property role="TrG5h" value="T" />
             <node concept="3uibUv" id="4U$Q3dLqoH4" role="3ztrMU">
-              <ref role="3uigEE" to="i348:5itBwM86qUH" resolve="ExpandMacroTemplate.Token" />
+              <ref role="3uigEE" to="ugy2:5itBwM86qUH" resolve="ExpandMacroTemplate.Token" />
             </node>
           </node>
         </node>
@@ -17964,7 +17964,7 @@
       <ref role="30HIoZ" to="5j4j:7E86$tKtfM3" resolve="LogicalVariableDeclaration" />
       <node concept="1Koe21" id="zb1Nk71YkB" role="1lVwrX">
         <node concept="3uibUv" id="zb1Nk71ZnK" role="1Koe22">
-          <ref role="3uigEE" to="oy3s:1fvYCPC9rB6" resolve="MetaLogicalArray" />
+          <ref role="3uigEE" to="uwx2:1fvYCPC9rB6" resolve="MetaLogicalArray" />
           <node concept="raruj" id="zb1Nk71ZnN" role="lGtFl" />
         </node>
       </node>
@@ -18063,7 +18063,7 @@
       <property role="TrG5h" value="queryTemplates" />
       <node concept="3vKaQO" id="tbauFy9s_2" role="3clF45">
         <node concept="3uibUv" id="tbauFy9txT" role="3O5elw">
-          <ref role="3uigEE" to="i348:6OXbTD$iNPP" resolve="QueryTemplate" />
+          <ref role="3uigEE" to="ugy2:6OXbTD$iNPP" resolve="QueryTemplate" />
         </node>
       </node>
       <node concept="3Tm1VV" id="tbauFy9s_5" role="1B3o_S" />
@@ -18089,13 +18089,13 @@
             <property role="TrG5h" value="list" />
             <node concept="_YKpA" id="tbauFy9s_h" role="1tU5fm">
               <node concept="3uibUv" id="tbauFy9Dba" role="_ZDj9">
-                <ref role="3uigEE" to="i348:6OXbTD$iNPP" resolve="QueryTemplate" />
+                <ref role="3uigEE" to="ugy2:6OXbTD$iNPP" resolve="QueryTemplate" />
               </node>
             </node>
             <node concept="2ShNRf" id="tbauFy9s_k" role="33vP2m">
               <node concept="Tc6Ow" id="tbauFy9s_l" role="2ShVmc">
                 <node concept="3uibUv" id="tbauFy9DUH" role="HW$YZ">
-                  <ref role="3uigEE" to="i348:6OXbTD$iNPP" resolve="QueryTemplate" />
+                  <ref role="3uigEE" to="ugy2:6OXbTD$iNPP" resolve="QueryTemplate" />
                 </node>
               </node>
             </node>
@@ -18171,7 +18171,7 @@
       <node concept="3Tm6S6" id="tbauFy9s_S" role="1B3o_S" />
       <node concept="_YKpA" id="tbauFy9s_T" role="1tU5fm">
         <node concept="3uibUv" id="tbauFy9uAo" role="_ZDj9">
-          <ref role="3uigEE" to="i348:6OXbTD$iNPP" resolve="QueryTemplate" />
+          <ref role="3uigEE" to="ugy2:6OXbTD$iNPP" resolve="QueryTemplate" />
         </node>
       </node>
     </node>
@@ -18181,7 +18181,7 @@
       <ref role="n9lRv" to="wq2x:5EDW3XE0OAL" resolve="QueryTable" />
     </node>
     <node concept="3uibUv" id="tbauFy4M1q" role="1zkMxy">
-      <ref role="3uigEE" to="i348:5EDW3XF608m" resolve="AbstractQueryTable" />
+      <ref role="3uigEE" to="ugy2:5EDW3XF608m" resolve="AbstractQueryTable" />
     </node>
     <node concept="17Uvod" id="tbauFy4M79" role="lGtFl">
       <property role="2qtEX9" value="name" />
@@ -18215,7 +18215,7 @@
           <node concept="3Tm1VV" id="tbauFy5HM3" role="1B3o_S" />
           <node concept="3clFbS" id="tbauFy5HM4" role="3clF47">
             <node concept="XkiVB" id="tbauFy5JfR" role="3cqZAp">
-              <ref role="37wK5l" to="i348:6R6MIbU8QE_" resolve="AbstractQueryTemplate" />
+              <ref role="37wK5l" to="ugy2:6R6MIbU8QE_" resolve="AbstractQueryTemplate" />
               <node concept="Xl_RD" id="tbauFy5JfS" role="37wK5m">
                 <node concept="17Uvod" id="tbauFy5JfT" role="lGtFl">
                   <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
@@ -18317,7 +18317,7 @@
             <node concept="37vLTG" id="tbauFy5dA1" role="3clF46">
               <property role="TrG5h" value="session" />
               <node concept="3uibUv" id="tbauFy5dA2" role="1tU5fm">
-                <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
+                <ref role="3uigEE" to="ugy2:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
               </node>
             </node>
           </node>
@@ -18326,12 +18326,12 @@
             <property role="TrG5h" value="withQuery" />
             <node concept="3Tm1VV" id="tbauFy5dA5" role="1B3o_S" />
             <node concept="3uibUv" id="tbauFy5dA6" role="3clF45">
-              <ref role="3uigEE" to="i348:6R6MIbU8M46" resolve="QueryTemplate.Token" />
+              <ref role="3uigEE" to="ugy2:6R6MIbU8M46" resolve="QueryTemplate.Token" />
             </node>
             <node concept="37vLTG" id="tbauFy5dA7" role="3clF46">
               <property role="TrG5h" value="query" />
               <node concept="3uibUv" id="tbauFy5dA8" role="1tU5fm">
-                <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
+                <ref role="3uigEE" to="ugy2:5EDW3XDYeWv" resolve="Query" />
                 <node concept="1ZhdrF" id="tbauFy5dA9" role="lGtFl">
                   <property role="2qtEX8" value="classifier" />
                   <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1107535904670/1107535924139" />
@@ -18383,7 +18383,7 @@
             <property role="TrG5h" value="apply" />
             <node concept="A3Dl8" id="tbauFy5dAx" role="3clF45">
               <node concept="3uibUv" id="tbauFy5dAy" role="A3Ik2">
-                <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
+                <ref role="3uigEE" to="ugy2:7eGEHDlc$ap" resolve="RuleBuilder" />
               </node>
             </node>
             <node concept="3Tm1VV" id="tbauFy5dAz" role="1B3o_S" />
@@ -18392,7 +18392,7 @@
                 <node concept="3cpWsn" id="tbauFy5dAA" role="3cpWs9">
                   <property role="TrG5h" value="_session" />
                   <node concept="3uibUv" id="tbauFy5dAB" role="1tU5fm">
-                    <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
+                    <ref role="3uigEE" to="ugy2:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
                   </node>
                   <node concept="37vLTw" id="tbauFy5dAC" role="33vP2m">
                     <ref role="3cqZAo" node="tbauFy5dBL" resolve="session" />
@@ -18407,7 +18407,7 @@
                   <node concept="2ShNRf" id="tbauFy5dAG" role="37vLTx">
                     <node concept="Tc6Ow" id="tbauFy5dAH" role="2ShVmc">
                       <node concept="3uibUv" id="tbauFy5dAI" role="HW$YZ">
-                        <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
+                        <ref role="3uigEE" to="ugy2:7eGEHDlc$ap" resolve="RuleBuilder" />
                       </node>
                     </node>
                   </node>
@@ -18512,7 +18512,7 @@
             <property role="TrG5h" value="query" />
             <node concept="3Tmbuc" id="tbauFy5dBt" role="1B3o_S" />
             <node concept="3uibUv" id="tbauFy5dBu" role="1tU5fm">
-              <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
+              <ref role="3uigEE" to="ugy2:5EDW3XDYeWv" resolve="Query" />
               <node concept="1ZhdrF" id="tbauFy5dBv" role="lGtFl">
                 <property role="2qtEX8" value="classifier" />
                 <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1107535904670/1107535924139" />
@@ -18544,7 +18544,7 @@
             <node concept="3Tmbuc" id="tbauFy5dBH" role="1B3o_S" />
             <node concept="_YKpA" id="tbauFy5dBI" role="1tU5fm">
               <node concept="3uibUv" id="tbauFy5dBJ" role="_ZDj9">
-                <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
+                <ref role="3uigEE" to="ugy2:7eGEHDlc$ap" resolve="RuleBuilder" />
               </node>
             </node>
             <node concept="2ZBi8u" id="tbauFy5dBK" role="lGtFl">
@@ -18555,7 +18555,7 @@
             <property role="TrG5h" value="session" />
             <node concept="3Tmbuc" id="tbauFy5dBM" role="1B3o_S" />
             <node concept="3uibUv" id="tbauFy5dBN" role="1tU5fm">
-              <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
+              <ref role="3uigEE" to="ugy2:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
             </node>
             <node concept="2ZBi8u" id="tbauFy5dBO" role="lGtFl">
               <ref role="2rW$FS" node="6R6MIbUtc6X" resolve="apply_session_field" />
@@ -18564,9 +18564,9 @@
           <node concept="2tJIrI" id="tbauFy5dBP" role="jymVt" />
           <node concept="3Tm1VV" id="tbauFy5dBQ" role="1B3o_S" />
           <node concept="3uibUv" id="tbauFy5dBR" role="EKbjA">
-            <ref role="3uigEE" to="i348:6R6MIbU8M46" resolve="QueryTemplate.Token" />
+            <ref role="3uigEE" to="ugy2:6R6MIbU8M46" resolve="QueryTemplate.Token" />
             <node concept="3uibUv" id="tbauFy5dBS" role="11_B2D">
-              <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
+              <ref role="3uigEE" to="ugy2:5EDW3XDYeWv" resolve="Query" />
               <node concept="1ZhdrF" id="tbauFy5dBT" role="lGtFl">
                 <property role="2qtEX8" value="classifier" />
                 <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1107535904670/1107535924139" />
@@ -18599,14 +18599,14 @@
             <ref role="3uigEE" to="wyt6:~Class" resolve="Class" />
             <node concept="3qUE_q" id="tbauFy5uaB" role="11_B2D">
               <node concept="3uibUv" id="tbauFy5uaC" role="3qUE_r">
-                <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
+                <ref role="3uigEE" to="ugy2:5EDW3XDYeWv" resolve="Query" />
               </node>
             </node>
           </node>
           <node concept="3clFbS" id="tbauFy5uaD" role="3clF47">
             <node concept="3clFbF" id="tbauFy5uaE" role="3cqZAp">
               <node concept="3VsKOn" id="tbauFy5uaF" role="3clFbG">
-                <ref role="3VsUkX" to="i348:5EDW3XDYeWv" resolve="Query" />
+                <ref role="3VsUkX" to="ugy2:5EDW3XDYeWv" resolve="Query" />
                 <node concept="1ZhdrF" id="tbauFy5uaG" role="lGtFl">
                   <property role="2qtEX8" value="classifier" />
                   <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1116615150612/1116615189566" />
@@ -18641,7 +18641,7 @@
           <node concept="37vLTG" id="tbauFy5ub8" role="3clF46">
             <property role="TrG5h" value="session" />
             <node concept="3uibUv" id="tbauFy5ub9" role="1tU5fm">
-              <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
+              <ref role="3uigEE" to="ugy2:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
             </node>
           </node>
           <node concept="3uibUv" id="tbauFy5Cd4" role="3clF45">
@@ -18700,7 +18700,7 @@
           <node concept="2tJIrI" id="tbauFy5ubw" role="jymVt" />
           <node concept="3Tm1VV" id="tbauFy5ubx" role="1B3o_S" />
           <node concept="3uibUv" id="tbauFy5uby" role="EKbjA">
-            <ref role="3uigEE" to="i348:7P_FdVPsDC0" resolve="QueryTemplate.QueryConfigurable" />
+            <ref role="3uigEE" to="ugy2:7P_FdVPsDC0" resolve="QueryTemplate.QueryConfigurable" />
           </node>
         </node>
         <node concept="2tJIrI" id="tbauFy5dc3" role="jymVt" />
@@ -18723,7 +18723,7 @@
           </node>
         </node>
         <node concept="3uibUv" id="tbauFy5chm" role="1zkMxy">
-          <ref role="3uigEE" to="i348:6R6MIbU8KKa" resolve="AbstractQueryTemplate" />
+          <ref role="3uigEE" to="ugy2:6R6MIbU8KKa" resolve="AbstractQueryTemplate" />
           <node concept="3uibUv" id="tbauFy5Fby" role="11_B2D">
             <ref role="3uigEE" node="tbauFy5d_P" resolve="__QueryTable._QueryTemplate.Token" />
           </node>
@@ -18754,8 +18754,8 @@
         </node>
         <node concept="3clFbF" id="61G6TdBu_r2" role="3cqZAp">
           <node concept="2YIFZM" id="61G6TdBuqvc" role="3clFbG">
-            <ref role="1Pybhc" to="cxk7:61G6TdBsGY8" resolve="FeedbackUtil" />
-            <ref role="37wK5l" to="cxk7:61G6TdBsHeb" resolve="feedback" />
+            <ref role="1Pybhc" to="tpfl:61G6TdBsGY8" resolve="FeedbackUtil" />
+            <ref role="37wK5l" to="tpfl:61G6TdBsHeb" resolve="feedback" />
             <node concept="raruj" id="61G6TdBuqvd" role="lGtFl" />
             <node concept="Xl_RD" id="61G6TdBuwoZ" role="37wK5m">
               <property role="Xl_RC" value="" />
@@ -19208,13 +19208,13 @@
             <property role="TrG5h" value="qts" />
             <node concept="_YKpA" id="7lmP5gAPVKh" role="1tU5fm">
               <node concept="3uibUv" id="7lmP5gAPVKi" role="_ZDj9">
-                <ref role="3uigEE" to="i348:tbauFxRORi" resolve="QueryTable" />
+                <ref role="3uigEE" to="ugy2:tbauFxRORi" resolve="QueryTable" />
               </node>
             </node>
             <node concept="2ShNRf" id="7lmP5gAPVKj" role="33vP2m">
               <node concept="Tc6Ow" id="7lmP5gAPVKk" role="2ShVmc">
                 <node concept="3uibUv" id="7lmP5gAPVKl" role="HW$YZ">
-                  <ref role="3uigEE" to="i348:tbauFxRORi" resolve="QueryTable" />
+                  <ref role="3uigEE" to="ugy2:tbauFxRORi" resolve="QueryTable" />
                 </node>
               </node>
             </node>
@@ -19279,14 +19279,14 @@
       <node concept="37vLTG" id="1LBj9w_9V6Z" role="3clF46">
         <property role="TrG5h" value="coderulesAspect" />
         <node concept="3uibUv" id="1LBj9w_9VdC" role="1tU5fm">
-          <ref role="3uigEE" to="fqlx:NKt6yp1COZ" resolve="AbstractCoderulesAspect" />
+          <ref role="3uigEE" to="pxw9:NKt6yp1COZ" resolve="AbstractCoderulesAspect" />
         </node>
       </node>
       <node concept="3cqZAl" id="5EDW3XF6_7u" role="3clF45" />
       <node concept="3Tm1VV" id="5EDW3XF6_7v" role="1B3o_S" />
       <node concept="3clFbS" id="5EDW3XF6_7w" role="3clF47">
         <node concept="XkiVB" id="1LBj9w_9Won" role="3cqZAp">
-          <ref role="37wK5l" to="fqlx:1LBj9w_9VgG" resolve="AbstractCoderulesManifest" />
+          <ref role="37wK5l" to="pxw9:1LBj9w_9VgG" resolve="AbstractCoderulesManifest" />
           <node concept="37vLTw" id="1LBj9w_9Wty" role="37wK5m">
             <ref role="3cqZAo" node="1LBj9w_9V6Z" resolve="coderulesAspect" />
           </node>
@@ -19302,13 +19302,13 @@
     <node concept="3Tm1VV" id="5EDW3XF62FI" role="1B3o_S" />
     <node concept="n94m4" id="5EDW3XF62FJ" role="lGtFl" />
     <node concept="3uibUv" id="5EDW3XF62I7" role="1zkMxy">
-      <ref role="3uigEE" to="fqlx:5EDW3XF5Z95" resolve="AbstractCoderulesManifest" />
+      <ref role="3uigEE" to="pxw9:5EDW3XF5Z95" resolve="AbstractCoderulesManifest" />
     </node>
     <node concept="3clFb_" id="5EDW3XF62Nx" role="jymVt">
       <property role="TrG5h" value="macroTables" />
       <node concept="3vKaQO" id="5EDW3XF62Ny" role="3clF45">
         <node concept="3uibUv" id="tbauFxRBs0" role="3O5elw">
-          <ref role="3uigEE" to="i348:tbauFxRzkz" resolve="MacroTable" />
+          <ref role="3uigEE" to="ugy2:tbauFxRzkz" resolve="MacroTable" />
         </node>
       </node>
       <node concept="3Tm1VV" id="5EDW3XF62N$" role="1B3o_S" />
@@ -19328,7 +19328,7 @@
       <property role="TrG5h" value="ruleTables" />
       <node concept="3vKaQO" id="5EDW3XF62ND" role="3clF45">
         <node concept="3uibUv" id="tbauFxRR$Z" role="3O5elw">
-          <ref role="3uigEE" to="i348:4MqhgXU9fm3" resolve="RuleTable" />
+          <ref role="3uigEE" to="ugy2:4MqhgXU9fm3" resolve="RuleTable" />
         </node>
       </node>
       <node concept="3Tm1VV" id="5EDW3XF62NF" role="1B3o_S" />
@@ -19348,7 +19348,7 @@
       <property role="TrG5h" value="queryTables" />
       <node concept="3vKaQO" id="5EDW3XF62NK" role="3clF45">
         <node concept="3uibUv" id="tbauFxRQM5" role="3O5elw">
-          <ref role="3uigEE" to="i348:tbauFxRORi" resolve="QueryTable" />
+          <ref role="3uigEE" to="ugy2:tbauFxRORi" resolve="QueryTable" />
         </node>
       </node>
       <node concept="3Tm1VV" id="5EDW3XF62NM" role="1B3o_S" />
@@ -19376,13 +19376,13 @@
                 <property role="TrG5h" value="macroTables" />
                 <node concept="_YKpA" id="5EDW3XF6mH2" role="1tU5fm">
                   <node concept="3uibUv" id="tbauFxRC5q" role="_ZDj9">
-                    <ref role="3uigEE" to="i348:tbauFxRzkz" resolve="MacroTable" />
+                    <ref role="3uigEE" to="ugy2:tbauFxRzkz" resolve="MacroTable" />
                   </node>
                 </node>
                 <node concept="2ShNRf" id="5EDW3XF6mH4" role="33vP2m">
                   <node concept="Tc6Ow" id="5EDW3XF6mH5" role="2ShVmc">
                     <node concept="3uibUv" id="tbauFxRCtR" role="HW$YZ">
-                      <ref role="3uigEE" to="i348:tbauFxRzkz" resolve="MacroTable" />
+                      <ref role="3uigEE" to="ugy2:tbauFxRzkz" resolve="MacroTable" />
                     </node>
                   </node>
                 </node>
@@ -19463,13 +19463,13 @@
                 <property role="TrG5h" value="rtables" />
                 <node concept="_YKpA" id="5EDW3XF6enN" role="1tU5fm">
                   <node concept="3uibUv" id="tbauFxRSbT" role="_ZDj9">
-                    <ref role="3uigEE" to="i348:4MqhgXU9fm3" resolve="RuleTable" />
+                    <ref role="3uigEE" to="ugy2:4MqhgXU9fm3" resolve="RuleTable" />
                   </node>
                 </node>
                 <node concept="2ShNRf" id="5EDW3XF6enP" role="33vP2m">
                   <node concept="Tc6Ow" id="5EDW3XF6enQ" role="2ShVmc">
                     <node concept="3uibUv" id="tbauFxRS$o" role="HW$YZ">
-                      <ref role="3uigEE" to="i348:4MqhgXU9fm3" resolve="RuleTable" />
+                      <ref role="3uigEE" to="ugy2:4MqhgXU9fm3" resolve="RuleTable" />
                     </node>
                   </node>
                 </node>
@@ -19551,13 +19551,13 @@
                 <property role="TrG5h" value="qts" />
                 <node concept="_YKpA" id="tbauFy4Doz" role="1tU5fm">
                   <node concept="3uibUv" id="tbauFy4E4W" role="_ZDj9">
-                    <ref role="3uigEE" to="i348:tbauFxRORi" resolve="QueryTable" />
+                    <ref role="3uigEE" to="ugy2:tbauFxRORi" resolve="QueryTable" />
                   </node>
                 </node>
                 <node concept="2ShNRf" id="tbauFy4Do_" role="33vP2m">
                   <node concept="Tc6Ow" id="tbauFy4DoA" role="2ShVmc">
                     <node concept="3uibUv" id="tbauFy4EvA" role="HW$YZ">
-                      <ref role="3uigEE" to="i348:tbauFxRORi" resolve="QueryTable" />
+                      <ref role="3uigEE" to="ugy2:tbauFxRORi" resolve="QueryTable" />
                     </node>
                   </node>
                 </node>
@@ -19598,7 +19598,7 @@
       <node concept="3Tm6S6" id="5EDW3XF6blb" role="1B3o_S" />
       <node concept="_YKpA" id="5EDW3XF6blc" role="1tU5fm">
         <node concept="3uibUv" id="tbauFxRBL0" role="_ZDj9">
-          <ref role="3uigEE" to="i348:tbauFxRzkz" resolve="MacroTable" />
+          <ref role="3uigEE" to="ugy2:tbauFxRzkz" resolve="MacroTable" />
         </node>
       </node>
     </node>
@@ -19607,7 +19607,7 @@
       <node concept="3Tm6S6" id="5EDW3XF6d9A" role="1B3o_S" />
       <node concept="_YKpA" id="5EDW3XF6d9B" role="1tU5fm">
         <node concept="3uibUv" id="tbauFxRRRg" role="_ZDj9">
-          <ref role="3uigEE" to="i348:4MqhgXU9fm3" resolve="RuleTable" />
+          <ref role="3uigEE" to="ugy2:4MqhgXU9fm3" resolve="RuleTable" />
         </node>
       </node>
     </node>
@@ -19617,7 +19617,7 @@
       <node concept="3Tm6S6" id="tbauFy4C_X" role="1B3o_S" />
       <node concept="_YKpA" id="tbauFy4C_Y" role="1tU5fm">
         <node concept="3uibUv" id="tbauFy4De_" role="_ZDj9">
-          <ref role="3uigEE" to="i348:tbauFxRORi" resolve="QueryTable" />
+          <ref role="3uigEE" to="ugy2:tbauFxRORi" resolve="QueryTable" />
         </node>
       </node>
     </node>
@@ -19724,7 +19724,7 @@
       <node concept="3clFb_" id="5EDW3XF61YL" role="jymVt">
         <property role="TrG5h" value="createManifest" />
         <node concept="3uibUv" id="5EDW3XF61YM" role="3clF45">
-          <ref role="3uigEE" to="fqlx:5EDW3XF5Z95" resolve="AbstractCoderulesManifest" />
+          <ref role="3uigEE" to="pxw9:5EDW3XF5Z95" resolve="AbstractCoderulesManifest" />
         </node>
         <node concept="3Tm1VV" id="5EDW3XF61YN" role="1B3o_S" />
         <node concept="3clFbS" id="5EDW3XF61YQ" role="3clF47">
@@ -19780,10 +19780,10 @@
       <node concept="2tJIrI" id="sL9MTQxrUM" role="jymVt" />
       <node concept="3Tm1VV" id="sL9MTQxkJy" role="1B3o_S" />
       <node concept="3uibUv" id="sL9MTQxqA1" role="EKbjA">
-        <ref role="3uigEE" to="fqlx:NKt6yomNZE" resolve="CoderulesAspect" />
+        <ref role="3uigEE" to="pxw9:NKt6yomNZE" resolve="CoderulesAspect" />
       </node>
       <node concept="3uibUv" id="sL9MTQxr5x" role="1zkMxy">
-        <ref role="3uigEE" to="fqlx:NKt6yp1COZ" resolve="AbstractCoderulesAspect" />
+        <ref role="3uigEE" to="pxw9:NKt6yp1COZ" resolve="AbstractCoderulesAspect" />
       </node>
     </node>
   </node>
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/jetbrains.mps.lang.coderules.mpl b/coderules/languages/jetbrains.mps.lang.coderules/jetbrains.mps.lang.coderules.mpl
index 2f7f2cda..59402758 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/jetbrains.mps.lang.coderules.mpl
+++ b/coderules/languages/jetbrains.mps.lang.coderules/jetbrains.mps.lang.coderules.mpl
@@ -25,14 +25,13 @@
       </facets>
       <external-templates />
       <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="true">26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)</dependency>
-        <dependency reexport="true">ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)</dependency>
         <dependency reexport="true">bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)</dependency>
         <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
         <dependency reexport="false">9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)</dependency>
         <dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
+        <dependency reexport="false">a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)</dependency>
       </dependencies>
       <languageVersions>
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
@@ -69,7 +68,6 @@
         <module reference="c4803b19-6d89-4a3b-bf82-390769514add(jetbrains.mps.lang.coderules)" version="0" />
         <module reference="21d5540d-cd6b-44dd-b6ab-6835bf032803(jetbrains.mps.lang.coderules#4578927328670739933)" version="0" />
         <module reference="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" version="0" />
-        <module reference="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" version="0" />
         <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
         <module reference="f4ad079d-bc71-4ffb-9600-9328705cf998(jetbrains.mps.lang.descriptor)" version="0" />
         <module reference="446c26eb-2b7b-4bf0-9b35-f83fa582753e(jetbrains.mps.lang.modelapi)" version="0" />
@@ -89,14 +87,13 @@
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)</dependency>
     <dependency reexport="false">c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)</dependency>
-    <dependency reexport="false">ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)</dependency>
     <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
     <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
+    <dependency reexport="false">fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)</dependency>
+    <dependency reexport="false">34e84b8f-afa8-4364-abcd-a279fddddbe7(jetbrains.mps.editor.runtime)</dependency>
+    <dependency reexport="false">26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)</dependency>
     <dependency reexport="false">bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)</dependency>
     <dependency reexport="false">a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)</dependency>
-    <dependency reexport="false">fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)</dependency>
-    <dependency reexport="false">528ff3b9-5fc4-40dd-931f-c6ce3650640e(jetbrains.mps.lang.migration.runtime)</dependency>
-    <dependency reexport="false">34e84b8f-afa8-4364-abcd-a279fddddbe7(jetbrains.mps.editor.runtime)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
@@ -167,11 +164,10 @@
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
     <module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
     <module reference="c4803b19-6d89-4a3b-bf82-390769514add(jetbrains.mps.lang.coderules)" version="0" />
-    <module reference="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" version="0" />
+    <module reference="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="f4ad079d-bc71-4ffb-9600-9328705cf998(jetbrains.mps.lang.descriptor)" version="0" />
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
-    <module reference="528ff3b9-5fc4-40dd-931f-c6ce3650640e(jetbrains.mps.lang.migration.runtime)" version="0" />
     <module reference="446c26eb-2b7b-4bf0-9b35-f83fa582753e(jetbrains.mps.lang.modelapi)" version="0" />
     <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
     <module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="1" />
@@ -182,7 +178,6 @@
     <module reference="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" version="0" />
   </dependencyVersions>
   <runtime>
-    <dependency reexport="false">ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)</dependency>
     <dependency reexport="false">26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)</dependency>
   </runtime>
   <extendedLanguages>
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps
index dcf6b4a1..bdf753e3 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps
@@ -14,17 +14,11 @@
   <imports>
     <import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
-    <import index="o8zo" ref="r:314576fc-3aee-4386-a0a5-a38348ac317d(jetbrains.mps.scope)" />
     <import index="tpek" ref="r:00000000-0000-4000-0000-011c895902c0(jetbrains.mps.baseLanguage.behavior)" />
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
     <import index="ha02" ref="r:09e53496-6477-45e7-abd5-eaf3fac3b360(jetbrains.mps.logic.behavior)" />
     <import index="5j4j" ref="r:c8fb1c5e-8204-4904-a38f-678899d447c1(jetbrains.mps.logic.structure)" />
     <import index="wq2x" ref="r:83137295-aa87-45e8-b0c0-ede2adf2a396(jetbrains.mps.lang.coderules.structure)" />
-    <import index="w7la" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.evaluation(jetbrains.mps.logic.reactor/)" />
-    <import index="tp25" ref="r:00000000-0000-4000-0000-011c89590301(jetbrains.mps.lang.smodel.structure)" />
-    <import index="tpce" ref="r:00000000-0000-4000-0000-011c89590292(jetbrains.mps.lang.structure.structure)" />
-    <import index="mhfm" ref="3f233e7f-b8a6-46d2-a57f-795d56775243/java:org.jetbrains.annotations(Annotations/)" />
-    <import index="18ew" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.util(MPS.Core/)" />
     <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
     <import index="tpeu" ref="r:00000000-0000-4000-0000-011c895902fa(jetbrains.mps.lang.smodel.behavior)" />
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/constraints.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/constraints.mps
index fc337111..a2d0e20a 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/constraints.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/constraints.mps
@@ -14,20 +14,17 @@
     <devkit ref="00000000-0000-4000-0000-5604ebd4f22c(jetbrains.mps.devkit.aspect.constraints)" />
   </languages>
   <imports>
-    <import index="fnmy" ref="r:89c0fb70-0977-4113-a076-5906f9d8630f(jetbrains.mps.baseLanguage.scopes)" />
     <import index="o8zo" ref="r:314576fc-3aee-4386-a0a5-a38348ac317d(jetbrains.mps.scope)" />
     <import index="wq2x" ref="r:83137295-aa87-45e8-b0c0-ede2adf2a396(jetbrains.mps.lang.coderules.structure)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
-    <import index="tpce" ref="r:00000000-0000-4000-0000-011c89590292(jetbrains.mps.lang.structure.structure)" />
-    <import index="tpcn" ref="r:00000000-0000-4000-0000-011c8959028b(jetbrains.mps.lang.structure.behavior)" />
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
     <import index="hy7p" ref="r:01ee26d6-df00-4ffb-931c-1ddec5984886(jetbrains.mps.lang.coderules.util)" />
-    <import index="i348" ref="r:42a15dec-83a9-4fe1-80d6-3bf898c512bd(jetbrains.mps.lang.coderules.template)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
     <import index="x5bw" ref="r:15ea4f4e-2f41-4ce3-b7e4-a4e0737f0171(jetbrains.mps.lang.coderules.behavior)" />
     <import index="ni5j" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.regex(JDK/)" />
     <import index="18ew" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.util(MPS.Core/)" />
+    <import index="ugy2" ref="r:57b2449f-b7c7-4941-bd75-9c594835f5cd(jetbrains.mps.lang.coderules.template)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -508,7 +505,7 @@
           <node concept="3cpWsn" id="1mdVbTSoaPH" role="3cpWs9">
             <property role="TrG5h" value="methk" />
             <node concept="3uibUv" id="1mdVbTSoaPI" role="1tU5fm">
-              <ref role="3uigEE" to="i348:4OKkcnfu_Ag" resolve="RuleTemplateMehodKind" />
+              <ref role="3uigEE" to="ugy2:4OKkcnfu_Ag" resolve="RuleTemplateMehodKind" />
             </node>
             <node concept="2YIFZM" id="1mdVbTSoaPJ" role="33vP2m">
               <ref role="37wK5l" to="hy7p:746Sd4ujSOx" resolve="templateMethodKind" />
@@ -531,8 +528,8 @@
             <node concept="22lmx$" id="1mdVbTSoaPR" role="37vLTx">
               <node concept="3clFbC" id="1mdVbTSoaPS" role="3uHU7w">
                 <node concept="Rm8GO" id="1mdVbTSoaPT" role="3uHU7w">
-                  <ref role="1Px2BO" to="i348:4OKkcnfu_Ag" resolve="RuleTemplateMehodKind" />
-                  <ref role="Rm8GQ" to="i348:4OKkcnfu_Aj" resolve="GUARD" />
+                  <ref role="1Px2BO" to="ugy2:4OKkcnfu_Ag" resolve="RuleTemplateMehodKind" />
+                  <ref role="Rm8GQ" to="ugy2:4OKkcnfu_Aj" resolve="GUARD" />
                 </node>
                 <node concept="37vLTw" id="1mdVbTSoaPU" role="3uHU7B">
                   <ref role="3cqZAo" node="1mdVbTSoaPH" resolve="methk" />
@@ -543,8 +540,8 @@
                   <ref role="3cqZAo" node="1mdVbTSoaPH" resolve="methk" />
                 </node>
                 <node concept="Rm8GO" id="1mdVbTSoaPX" role="3uHU7w">
-                  <ref role="1Px2BO" to="i348:4OKkcnfu_Ag" resolve="RuleTemplateMehodKind" />
-                  <ref role="Rm8GQ" to="i348:4OKkcnfu_Ak" resolve="BODY" />
+                  <ref role="1Px2BO" to="ugy2:4OKkcnfu_Ag" resolve="RuleTemplateMehodKind" />
+                  <ref role="Rm8GQ" to="ugy2:4OKkcnfu_Ak" resolve="BODY" />
                 </node>
               </node>
             </node>
@@ -598,7 +595,7 @@
           <node concept="3cpWsn" id="1mdVbTSocwU" role="3cpWs9">
             <property role="TrG5h" value="methk" />
             <node concept="3uibUv" id="1mdVbTSocwV" role="1tU5fm">
-              <ref role="3uigEE" to="i348:4OKkcnfu_Ag" resolve="RuleTemplateMehodKind" />
+              <ref role="3uigEE" to="ugy2:4OKkcnfu_Ag" resolve="RuleTemplateMehodKind" />
             </node>
             <node concept="2YIFZM" id="1mdVbTSocwW" role="33vP2m">
               <ref role="37wK5l" to="hy7p:746Sd4ujSOx" resolve="templateMethodKind" />
@@ -621,8 +618,8 @@
             <node concept="22lmx$" id="1mdVbTSocx4" role="37vLTx">
               <node concept="3clFbC" id="1mdVbTSocx5" role="3uHU7w">
                 <node concept="Rm8GO" id="1mdVbTSocx6" role="3uHU7w">
-                  <ref role="1Px2BO" to="i348:4OKkcnfu_Ag" resolve="RuleTemplateMehodKind" />
-                  <ref role="Rm8GQ" to="i348:4OKkcnfu_Aj" resolve="GUARD" />
+                  <ref role="1Px2BO" to="ugy2:4OKkcnfu_Ag" resolve="RuleTemplateMehodKind" />
+                  <ref role="Rm8GQ" to="ugy2:4OKkcnfu_Aj" resolve="GUARD" />
                 </node>
                 <node concept="37vLTw" id="1mdVbTSocx7" role="3uHU7B">
                   <ref role="3cqZAo" node="1mdVbTSocwU" resolve="methk" />
@@ -633,8 +630,8 @@
                   <ref role="3cqZAo" node="1mdVbTSocwU" resolve="methk" />
                 </node>
                 <node concept="Rm8GO" id="1mdVbTSocxa" role="3uHU7w">
-                  <ref role="Rm8GQ" to="i348:4OKkcnfu_Ak" resolve="BODY" />
-                  <ref role="1Px2BO" to="i348:4OKkcnfu_Ag" resolve="RuleTemplateMehodKind" />
+                  <ref role="Rm8GQ" to="ugy2:4OKkcnfu_Ak" resolve="BODY" />
+                  <ref role="1Px2BO" to="ugy2:4OKkcnfu_Ag" resolve="RuleTemplateMehodKind" />
                 </node>
               </node>
             </node>
@@ -688,7 +685,7 @@
           <node concept="3cpWsn" id="1mdVbTSo18d" role="3cpWs9">
             <property role="TrG5h" value="methk" />
             <node concept="3uibUv" id="1mdVbTSo187" role="1tU5fm">
-              <ref role="3uigEE" to="i348:4OKkcnfu_Ag" resolve="RuleTemplateMehodKind" />
+              <ref role="3uigEE" to="ugy2:4OKkcnfu_Ag" resolve="RuleTemplateMehodKind" />
             </node>
             <node concept="2YIFZM" id="1mdVbTSo18e" role="33vP2m">
               <ref role="37wK5l" to="hy7p:746Sd4ujSOx" resolve="templateMethodKind" />
@@ -711,8 +708,8 @@
             <node concept="22lmx$" id="1mdVbTSo5zK" role="37vLTx">
               <node concept="3clFbC" id="1mdVbTSo6uw" role="3uHU7w">
                 <node concept="Rm8GO" id="1mdVbTSo7iY" role="3uHU7w">
-                  <ref role="Rm8GQ" to="i348:4OKkcnfu_Aj" resolve="GUARD" />
-                  <ref role="1Px2BO" to="i348:4OKkcnfu_Ag" resolve="RuleTemplateMehodKind" />
+                  <ref role="Rm8GQ" to="ugy2:4OKkcnfu_Aj" resolve="GUARD" />
+                  <ref role="1Px2BO" to="ugy2:4OKkcnfu_Ag" resolve="RuleTemplateMehodKind" />
                 </node>
                 <node concept="37vLTw" id="1mdVbTSo5Oz" role="3uHU7B">
                   <ref role="3cqZAo" node="1mdVbTSo18d" resolve="methk" />
@@ -723,8 +720,8 @@
                   <ref role="3cqZAo" node="1mdVbTSo18d" resolve="methk" />
                 </node>
                 <node concept="Rm8GO" id="1mdVbTSo4Yh" role="3uHU7w">
-                  <ref role="Rm8GQ" to="i348:4OKkcnfu_Ak" resolve="BODY" />
-                  <ref role="1Px2BO" to="i348:4OKkcnfu_Ag" resolve="RuleTemplateMehodKind" />
+                  <ref role="Rm8GQ" to="ugy2:4OKkcnfu_Ak" resolve="BODY" />
+                  <ref role="1Px2BO" to="ugy2:4OKkcnfu_Ag" resolve="RuleTemplateMehodKind" />
                 </node>
               </node>
             </node>
@@ -945,7 +942,7 @@
           <node concept="3cpWsn" id="4jcOV4hwMJ5" role="3cpWs9">
             <property role="TrG5h" value="methk" />
             <node concept="3uibUv" id="4jcOV4hwMJ6" role="1tU5fm">
-              <ref role="3uigEE" to="i348:4OKkcnfu_Ag" resolve="RuleTemplateMehodKind" />
+              <ref role="3uigEE" to="ugy2:4OKkcnfu_Ag" resolve="RuleTemplateMehodKind" />
             </node>
             <node concept="2YIFZM" id="4jcOV4hwMJ7" role="33vP2m">
               <ref role="37wK5l" to="hy7p:746Sd4ujSOx" resolve="templateMethodKind" />
@@ -970,8 +967,8 @@
                 <ref role="3cqZAo" node="4jcOV4hwMJ5" resolve="methk" />
               </node>
               <node concept="Rm8GO" id="4jcOV4hwMJl" role="3uHU7w">
-                <ref role="1Px2BO" to="i348:4OKkcnfu_Ag" resolve="RuleTemplateMehodKind" />
-                <ref role="Rm8GQ" to="i348:4OKkcnfu_Ak" resolve="BODY" />
+                <ref role="1Px2BO" to="ugy2:4OKkcnfu_Ag" resolve="RuleTemplateMehodKind" />
+                <ref role="Rm8GQ" to="ugy2:4OKkcnfu_Ak" resolve="BODY" />
               </node>
             </node>
             <node concept="37vLTw" id="4jcOV4hwMJm" role="37vLTJ">
@@ -1021,7 +1018,7 @@
           <node concept="3cpWsn" id="4jcOV4hEF_v" role="3cpWs9">
             <property role="TrG5h" value="methk" />
             <node concept="3uibUv" id="4jcOV4hEF_w" role="1tU5fm">
-              <ref role="3uigEE" to="i348:4OKkcnfu_Ag" resolve="RuleTemplateMehodKind" />
+              <ref role="3uigEE" to="ugy2:4OKkcnfu_Ag" resolve="RuleTemplateMehodKind" />
             </node>
             <node concept="2YIFZM" id="4jcOV4hEF_x" role="33vP2m">
               <ref role="37wK5l" to="hy7p:746Sd4ujSOx" resolve="templateMethodKind" />
@@ -1046,8 +1043,8 @@
                 <ref role="3cqZAo" node="4jcOV4hEF_v" resolve="methk" />
               </node>
               <node concept="Rm8GO" id="4jcOV4hEF_F" role="3uHU7w">
-                <ref role="1Px2BO" to="i348:4OKkcnfu_Ag" resolve="RuleTemplateMehodKind" />
-                <ref role="Rm8GQ" to="i348:4OKkcnfu_Ak" resolve="BODY" />
+                <ref role="1Px2BO" to="ugy2:4OKkcnfu_Ag" resolve="RuleTemplateMehodKind" />
+                <ref role="Rm8GQ" to="ugy2:4OKkcnfu_Ak" resolve="BODY" />
               </node>
             </node>
             <node concept="37vLTw" id="4jcOV4hEF_G" role="37vLTJ">
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
index 4b0fa5be..f57fc45b 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
@@ -15,17 +15,12 @@
     <import index="wq2x" ref="r:83137295-aa87-45e8-b0c0-ede2adf2a396(jetbrains.mps.lang.coderules.structure)" />
     <import index="tpen" ref="r:00000000-0000-4000-0000-011c895902c3(jetbrains.mps.baseLanguage.editor)" />
     <import index="tpco" ref="r:00000000-0000-4000-0000-011c89590284(jetbrains.mps.lang.core.editor)" />
-    <import index="z60i" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt(JDK/)" />
     <import index="18ew" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.util(MPS.Core/)" />
-    <import index="hy7p" ref="r:01ee26d6-df00-4ffb-931c-1ddec5984886(jetbrains.mps.lang.coderules.util)" />
-    <import index="ykok" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel.constraints(MPS.Core/)" />
-    <import index="35tq" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.scope(MPS.Core/)" />
     <import index="5j4j" ref="r:c8fb1c5e-8204-4904-a38f-678899d447c1(jetbrains.mps.logic.structure)" />
     <import index="qgy9" ref="r:5195f849-566d-46a3-bb0a-7ae9911e2652(jetbrains.mps.logic.editor)" />
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
     <import index="nprl" ref="r:81151157-4aa6-41ac-acda-128bb1020041(jetbrains.mps.lang.coderules.constraints)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
-    <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="tp2c" ref="r:00000000-0000-4000-0000-011c89590338(jetbrains.mps.baseLanguage.closures.structure)" />
     <import index="7a0s" ref="r:2af017c2-293f-4ebb-99f3-81e353b3d6e6(jetbrains.mps.editor.runtime)" />
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/findUsages.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/findUsages.mps
index 45dd06cf..9062966c 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/findUsages.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/findUsages.mps
@@ -6,7 +6,6 @@
     <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
   </languages>
   <imports>
-    <import index="o8zo" ref="r:314576fc-3aee-4386-a0a5-a38348ac317d(jetbrains.mps.scope)" />
     <import index="tpci" ref="r:00000000-0000-4000-0000-011c8959028e(jetbrains.mps.lang.structure.findUsages)" />
     <import index="wq2x" ref="r:83137295-aa87-45e8-b0c0-ede2adf2a396(jetbrains.mps.lang.coderules.structure)" implicit="true" />
   </imports>
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/intentions.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/intentions.mps
index 759c217a..9cfe10e1 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/intentions.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/intentions.mps
@@ -13,10 +13,8 @@
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
-    <import index="35tq" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.scope(MPS.Core/)" />
     <import index="wq2x" ref="r:83137295-aa87-45e8-b0c0-ede2adf2a396(jetbrains.mps.lang.coderules.structure)" />
     <import index="5j4j" ref="r:c8fb1c5e-8204-4904-a38f-678899d447c1(jetbrains.mps.logic.structure)" />
-    <import index="hy7p" ref="r:01ee26d6-df00-4ffb-931c-1ddec5984886(jetbrains.mps.lang.coderules.util)" />
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" implicit="true" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
     <import index="x5bw" ref="r:15ea4f4e-2f41-4ce3-b7e4-a4e0737f0171(jetbrains.mps.lang.coderules.behavior)" implicit="true" />
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/migration.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/migration.mps
index e644dd1d..9473dfb0 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/migration.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/migration.mps
@@ -13,26 +13,12 @@
     <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
   </languages>
   <imports>
-    <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" />
     <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
-    <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
     <import index="wq2x" ref="r:83137295-aa87-45e8-b0c0-ede2adf2a396(jetbrains.mps.lang.coderules.structure)" />
-    <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
-    <import index="tpci" ref="r:00000000-0000-4000-0000-011c8959028e(jetbrains.mps.lang.structure.findUsages)" />
-    <import index="o8zo" ref="r:314576fc-3aee-4386-a0a5-a38348ac317d(jetbrains.mps.scope)" />
-    <import index="mte5" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.ide.findusages.model.scopes(MPS.Core/)" />
-    <import index="mk8z" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.progress(MPS.Core/)" />
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
-    <import index="tp25" ref="r:00000000-0000-4000-0000-011c89590301(jetbrains.mps.lang.smodel.structure)" />
-    <import index="18ew" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.util(MPS.Core/)" />
     <import index="5j4j" ref="r:c8fb1c5e-8204-4904-a38f-678899d447c1(jetbrains.mps.logic.structure)" />
     <import index="slm6" ref="90746344-04fd-4286-97d5-b46ae6a81709/r:52a3d974-bd4f-4651-ba6e-a2de5e336d95(jetbrains.mps.lang.migration/jetbrains.mps.lang.migration.methods)" />
-    <import index="tpek" ref="r:00000000-0000-4000-0000-011c895902c0(jetbrains.mps.baseLanguage.behavior)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
-    <import index="6f4m" ref="528ff3b9-5fc4-40dd-931f-c6ce3650640e/r:f69c3fa1-0e30-4980-84e2-190ae44e4c3d(jetbrains.mps.lang.migration.runtime/jetbrains.mps.lang.migration.runtime.base)" />
-    <import index="w1kc" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel(MPS.Core/)" />
-    <import index="nejq" ref="r:43d4629d-ce89-487f-b335-2aac72284228(jetbrains.mps.logic.migration)" />
-    <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.dataform)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -112,7 +98,6 @@
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
       <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
-        <property id="890797661671409019" name="forceMultiLine" index="3yWfEV" />
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
       </concept>
@@ -157,9 +142,6 @@
       <concept id="8182547171709752110" name="jetbrains.mps.lang.quotation.structure.NodeBuilderExpression" flags="nn" index="36biLy">
         <child id="8182547171709752112" name="expression" index="36biLW" />
       </concept>
-      <concept id="8182547171709614739" name="jetbrains.mps.lang.quotation.structure.NodeBuilderRef" flags="nn" index="36bGnv">
-        <reference id="8182547171709614741" name="target" index="36bGnp" />
-      </concept>
     </language>
     <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging">
       <concept id="2034914114981261497" name="jetbrains.mps.baseLanguage.logging.structure.LogLowLevelStatement" flags="ng" index="RRSsy">
@@ -183,7 +165,6 @@
       </concept>
       <concept id="1171305280644" name="jetbrains.mps.lang.smodel.structure.Node_GetDescendantsOperation" flags="nn" index="2Rf3mk" />
       <concept id="1139184414036" name="jetbrains.mps.lang.smodel.structure.LinkList_AddNewChildOperation" flags="nn" index="WFELt" />
-      <concept id="1227264722563" name="jetbrains.mps.lang.smodel.structure.EqualsStructurallyExpression" flags="nn" index="2YFouu" />
       <concept id="1139621453865" name="jetbrains.mps.lang.smodel.structure.Node_IsInstanceOfOperation" flags="nn" index="1mIQ4w">
         <child id="1177027386292" name="conceptArgument" index="cj9EA" />
       </concept>
@@ -1526,82 +1507,10 @@
       <ref role="2VtyIY" to="slm6:4ubqdNOF9cA" resolve="execute" />
       <node concept="3Tm1VV" id="7L5omgeIEkq" role="1B3o_S" />
       <node concept="3clFbS" id="7L5omgeIEks" role="3clF47">
-        <node concept="L3pyB" id="4nUKN9YPTwz" role="3cqZAp">
-          <node concept="3clFbS" id="4nUKN9YPTw$" role="L3pyw">
-            <node concept="3clFbF" id="4nUKN9YPTw_" role="3cqZAp">
-              <node concept="2OqwBi" id="4nUKN9YPTwA" role="3clFbG">
-                <node concept="2OqwBi" id="4nUKN9YPTwB" role="2Oq$k0">
-                  <node concept="qVDSY" id="4nUKN9YPTwC" role="2Oq$k0">
-                    <node concept="chp4Y" id="4nUKN9YPUh3" role="qVDSX">
-                      <ref role="cht4Q" to="5j4j:75vUFrS_9Sg" resolve="LogicalVariableDeclarationContainer" />
-                    </node>
-                    <node concept="1dO9Bo" id="4nUKN9YPTwE" role="1dOa5D" />
-                  </node>
-                  <node concept="3zZkjj" id="4nUKN9YPTwF" role="2OqNvi">
-                    <node concept="1bVj0M" id="4nUKN9YPTwG" role="23t8la">
-                      <node concept="3clFbS" id="4nUKN9YPTwH" role="1bW5cS">
-                        <node concept="3clFbF" id="4nUKN9YPVwc" role="3cqZAp">
-                          <node concept="2YFouu" id="4nUKN9YPWGO" role="3clFbG">
-                            <node concept="2pJPEk" id="4nUKN9YPWSA" role="3uHU7w">
-                              <node concept="2pJPED" id="4nUKN9YPXiq" role="2pJPEn">
-                                <ref role="2pJxaS" to="tpee:g7uibYu" resolve="ClassifierType" />
-                                <node concept="2pIpSj" id="4nUKN9YPXzV" role="2pJxcM">
-                                  <ref role="2pIpSl" to="tpee:g7uigIF" resolve="classifier" />
-                                  <node concept="36bGnv" id="4nUKN9YPZP2" role="28nt2d">
-                                    <ref role="36bGnp" to="6exd:3OPtF03lco4" resolve="ListNode" />
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                            <node concept="2OqwBi" id="4nUKN9YPVPh" role="3uHU7B">
-                              <node concept="37vLTw" id="4nUKN9YPVwb" role="2Oq$k0">
-                                <ref role="3cqZAo" node="6E5fMGvfKMn" resolve="it" />
-                              </node>
-                              <node concept="3TrEf2" id="4nUKN9YPWc3" role="2OqNvi">
-                                <ref role="3Tt5mk" to="5j4j:5zfvpQ72gqq" resolve="dataType" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="gl6BB" id="6E5fMGvfKMn" role="1bW2Oz">
-                        <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="6E5fMGvfKMo" role="1tU5fm" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="2es0OD" id="4nUKN9YPTwY" role="2OqNvi">
-                  <node concept="1bVj0M" id="4nUKN9YPTwZ" role="23t8la">
-                    <property role="3yWfEV" value="true" />
-                    <node concept="3clFbS" id="4nUKN9YPTx0" role="1bW5cS">
-                      <node concept="3clFbF" id="4nUKN9YQ0PS" role="3cqZAp">
-                        <node concept="2OqwBi" id="4nUKN9YQ24D" role="3clFbG">
-                          <node concept="2OqwBi" id="4nUKN9YQ1lE" role="2Oq$k0">
-                            <node concept="37vLTw" id="4nUKN9YQ0PQ" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6E5fMGvfKMp" resolve="lvdc" />
-                            </node>
-                            <node concept="3TrEf2" id="4nUKN9YQ1HM" role="2OqNvi">
-                              <ref role="3Tt5mk" to="5j4j:5zfvpQ72gqq" resolve="dataType" />
-                            </node>
-                          </node>
-                          <node concept="1_qnLN" id="4nUKN9YQ2HT" role="2OqNvi">
-                            <ref role="1_rbq0" to="wq2x:4nUKN9YPlxw" resolve="TermListType" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="gl6BB" id="6E5fMGvfKMp" role="1bW2Oz">
-                      <property role="TrG5h" value="lvdc" />
-                      <node concept="2jxLKc" id="6E5fMGvfKMq" role="1tU5fm" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="37vLTw" id="4nUKN9YPTxJ" role="L3pyr">
-            <ref role="3cqZAo" node="7L5omgeIEku" resolve="m" />
+        <node concept="RRSsy" id="4HQe0WHev1S" role="3cqZAp">
+          <property role="RRSoG" value="gZ5fh_4/error" />
+          <node concept="Xl_RD" id="4HQe0WHev1T" role="RRSoy">
+            <property role="Xl_RC" value="Migration has been truncated, please downgrade. (UseTermListType)" />
           </node>
         </node>
       </node>
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/plugin.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/plugin.mps
index 983e2e18..ba34e7e2 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/plugin.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/plugin.mps
@@ -7,10 +7,7 @@
     <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
-  <imports>
-    <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
-    <import index="5zyv" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.concurrent(JDK/)" />
-  </imports>
+  <imports />
   <registry />
 </model>
 
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/typesystem.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/typesystem.mps
index 80464376..770d654f 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/typesystem.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/typesystem.mps
@@ -11,14 +11,14 @@
   <imports>
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
     <import index="wq2x" ref="r:83137295-aa87-45e8-b0c0-ede2adf2a396(jetbrains.mps.lang.coderules.structure)" />
-    <import index="i348" ref="r:42a15dec-83a9-4fe1-80d6-3bf898c512bd(jetbrains.mps.lang.coderules.template)" />
     <import index="5j4j" ref="r:c8fb1c5e-8204-4904-a38f-678899d447c1(jetbrains.mps.logic.structure)" />
     <import index="tpek" ref="r:00000000-0000-4000-0000-011c895902c0(jetbrains.mps.baseLanguage.behavior)" />
     <import index="bj13" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.logical(jetbrains.mps.logic.reactor/)" />
     <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
     <import index="tp25" ref="r:00000000-0000-4000-0000-011c89590301(jetbrains.mps.lang.smodel.structure)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
-    <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.dataform)" />
+    <import index="ugy2" ref="r:57b2449f-b7c7-4941-bd75-9c594835f5cd(jetbrains.mps.lang.coderules.template)" />
+    <import index="cof4" ref="r:0a9d1d47-250c-4f98-8962-b65edf8b0721(jetbrains.mps.logic.dataform)" />
     <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" implicit="true" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
     <import index="x5bw" ref="r:15ea4f4e-2f41-4ce3-b7e4-a4e0737f0171(jetbrains.mps.lang.coderules.behavior)" implicit="true" />
@@ -415,7 +415,7 @@
                         </node>
                         <node concept="2tJFMh" id="4JBuioHu4qp" role="3uHU7w">
                           <node concept="ZC_QK" id="4JBuioHu4qq" role="2tJFKM">
-                            <ref role="2aWVGs" to="i348:4OKkcnfu_Am" resolve="RuleTemplateMethod" />
+                            <ref role="2aWVGs" to="ugy2:4OKkcnfu_Am" resolve="RuleTemplateMethod" />
                           </node>
                         </node>
                       </node>
@@ -560,7 +560,7 @@
                               </node>
                               <node concept="2tJFMh" id="4cvvxaYhA_C" role="3uHU7w">
                                 <node concept="ZC_QK" id="4cvvxaYhAWD" role="2tJFKM">
-                                  <ref role="2aWVGs" to="i348:4OKkcnfu_Am" resolve="RuleTemplateMethod" />
+                                  <ref role="2aWVGs" to="ugy2:4OKkcnfu_Am" resolve="RuleTemplateMethod" />
                                 </node>
                               </node>
                             </node>
@@ -715,9 +715,9 @@
                   </node>
                   <node concept="2OqwBi" id="1zN1RIlskwm" role="3clFbw">
                     <node concept="2OqwBi" id="1zN1RIlskpr" role="2Oq$k0">
-                      <node concept="Rm8GO" id="1zN1RIlskps" role="2Oq$k0">
-                        <ref role="Rm8GQ" to="i348:4OKkcnfu_Ah" resolve="HEAD_KEPT" />
-                        <ref role="1Px2BO" to="i348:4OKkcnfu_Ag" resolve="RuleTemplateMehodKind" />
+                      <node concept="Rm8GO" id="UFo5tZGtFD" role="2Oq$k0">
+                        <ref role="Rm8GQ" to="ugy2:4OKkcnfu_Ah" resolve="HEAD_KEPT" />
+                        <ref role="1Px2BO" to="ugy2:4OKkcnfu_Ag" resolve="RuleTemplateMehodKind" />
                       </node>
                       <node concept="liA8E" id="1zN1RIlskpt" role="2OqNvi">
                         <ref role="37wK5l" to="wyt6:~Enum.name()" resolve="name" />
@@ -775,9 +775,9 @@
                     </node>
                     <node concept="2OqwBi" id="1zN1RIlsnks" role="3eO9$A">
                       <node concept="2OqwBi" id="1zN1RIlsnkt" role="2Oq$k0">
-                        <node concept="Rm8GO" id="1zN1RIlsnoS" role="2Oq$k0">
-                          <ref role="Rm8GQ" to="i348:4OKkcnfu_Ai" resolve="HEAD_REPLACED" />
-                          <ref role="1Px2BO" to="i348:4OKkcnfu_Ag" resolve="RuleTemplateMehodKind" />
+                        <node concept="Rm8GO" id="UFo5tZGtDE" role="2Oq$k0">
+                          <ref role="Rm8GQ" to="ugy2:4OKkcnfu_Ai" resolve="HEAD_REPLACED" />
+                          <ref role="1Px2BO" to="ugy2:4OKkcnfu_Ag" resolve="RuleTemplateMehodKind" />
                         </node>
                         <node concept="liA8E" id="1zN1RIlsnkv" role="2OqNvi">
                           <ref role="37wK5l" to="wyt6:~Enum.name()" resolve="name" />
@@ -819,9 +819,9 @@
                     </node>
                     <node concept="2OqwBi" id="1zN1RIlsntE" role="3eO9$A">
                       <node concept="2OqwBi" id="1zN1RIlsntF" role="2Oq$k0">
-                        <node concept="Rm8GO" id="1zN1RIlsn$x" role="2Oq$k0">
-                          <ref role="Rm8GQ" to="i348:4OKkcnfu_Aj" resolve="GUARD" />
-                          <ref role="1Px2BO" to="i348:4OKkcnfu_Ag" resolve="RuleTemplateMehodKind" />
+                        <node concept="Rm8GO" id="UFo5tZGtB5" role="2Oq$k0">
+                          <ref role="Rm8GQ" to="ugy2:4OKkcnfu_Aj" resolve="GUARD" />
+                          <ref role="1Px2BO" to="ugy2:4OKkcnfu_Ag" resolve="RuleTemplateMehodKind" />
                         </node>
                         <node concept="liA8E" id="1zN1RIlsntH" role="2OqNvi">
                           <ref role="37wK5l" to="wyt6:~Enum.name()" resolve="name" />
@@ -863,9 +863,9 @@
                     </node>
                     <node concept="2OqwBi" id="1zN1RIlsnBg" role="3eO9$A">
                       <node concept="2OqwBi" id="1zN1RIlsnBh" role="2Oq$k0">
-                        <node concept="Rm8GO" id="1zN1RIlsnJ2" role="2Oq$k0">
-                          <ref role="Rm8GQ" to="i348:4OKkcnfu_Ak" resolve="BODY" />
-                          <ref role="1Px2BO" to="i348:4OKkcnfu_Ag" resolve="RuleTemplateMehodKind" />
+                        <node concept="Rm8GO" id="UFo5tZGt$a" role="2Oq$k0">
+                          <ref role="Rm8GQ" to="ugy2:4OKkcnfu_Ak" resolve="BODY" />
+                          <ref role="1Px2BO" to="ugy2:4OKkcnfu_Ag" resolve="RuleTemplateMehodKind" />
                         </node>
                         <node concept="liA8E" id="1zN1RIlsnBj" role="2OqNvi">
                           <ref role="37wK5l" to="wyt6:~Enum.name()" resolve="name" />
@@ -1411,7 +1411,7 @@
       <node concept="3clFbF" id="4nUKN9YPlzW" role="3cqZAp">
         <node concept="2c44tf" id="4nUKN9YPlzX" role="3clFbG">
           <node concept="3uibUv" id="4nUKN9YPl$t" role="2c44tc">
-            <ref role="3uigEE" to="6exd:3OPtF03lco4" resolve="ListNode" />
+            <ref role="3uigEE" to="cof4:3OPtF03lco4" resolve="ListNode" />
           </node>
         </node>
       </node>
@@ -1429,7 +1429,7 @@
       <node concept="3clFbF" id="24ciDNzqUu6" role="3cqZAp">
         <node concept="2c44tf" id="24ciDNzqUu4" role="3clFbG">
           <node concept="3uibUv" id="24ciDNzqUv3" role="2c44tc">
-            <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+            <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
           </node>
         </node>
       </node>
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/util.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/util.mps
index 7e940dc5..05c65f49 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/util.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/util.mps
@@ -12,12 +12,12 @@
     <import index="5j4j" ref="r:c8fb1c5e-8204-4904-a38f-678899d447c1(jetbrains.mps.logic.structure)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
-    <import index="i348" ref="r:42a15dec-83a9-4fe1-80d6-3bf898c512bd(jetbrains.mps.lang.coderules.template)" />
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
     <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
     <import index="wq2x" ref="r:83137295-aa87-45e8-b0c0-ede2adf2a396(jetbrains.mps.lang.coderules.structure)" />
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
     <import index="5zyv" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.concurrent(JDK/)" />
+    <import index="ugy2" ref="r:57b2449f-b7c7-4941-bd75-9c594835f5cd(jetbrains.mps.lang.coderules.template)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -195,7 +195,7 @@
         </node>
       </node>
       <node concept="3uibUv" id="746Sd4ujSPT" role="3clF45">
-        <ref role="3uigEE" to="i348:4OKkcnfu_Ag" resolve="RuleTemplateMehodKind" />
+        <ref role="3uigEE" to="ugy2:4OKkcnfu_Ag" resolve="RuleTemplateMehodKind" />
       </node>
       <node concept="3Tm1VV" id="746Sd4ujSO$" role="1B3o_S" />
       <node concept="3clFbS" id="746Sd4ujSO_" role="3clF47">
@@ -381,7 +381,7 @@
               <node concept="3clFbS" id="746Sd4uks9l" role="3clFbx">
                 <node concept="3cpWs6" id="746Sd4ukrxL" role="3cqZAp">
                   <node concept="unr1b" id="746Sd4ukrGP" role="3cqZAk">
-                    <ref role="un$jP" to="i348:4OKkcnfu_Ag" resolve="RuleTemplateMehodKind" />
+                    <ref role="un$jP" to="ugy2:4OKkcnfu_Ag" resolve="RuleTemplateMehodKind" />
                     <node concept="2OqwBi" id="746Sd4ukrGQ" role="unwt0">
                       <node concept="2OqwBi" id="746Sd4ukrGR" role="2Oq$k0">
                         <node concept="37vLTw" id="746Sd4ukrGS" role="2Oq$k0">
@@ -675,7 +675,7 @@
               <node concept="2JrnkZ" id="3BqfYtgCQhB" role="2Oq$k0">
                 <node concept="2tJFMh" id="3BqfYtgCQhA" role="2JrQYb">
                   <node concept="ZC_QK" id="3BqfYtgCQh_" role="2tJFKM">
-                    <ref role="2aWVGs" to="i348:4OKkcnfu_Am" resolve="RuleTemplateMethod" />
+                    <ref role="2aWVGs" to="ugy2:4OKkcnfu_Am" resolve="RuleTemplateMethod" />
                   </node>
                 </node>
               </node>
@@ -714,7 +714,7 @@
                       <node concept="2JrnkZ" id="3BqfYtgCQhE" role="2Oq$k0">
                         <node concept="2tJFMh" id="3BqfYtgCQhD" role="2JrQYb">
                           <node concept="ZC_QK" id="3BqfYtgCQhC" role="2tJFKM">
-                            <ref role="2aWVGs" to="i348:4OKkcnfu_Am" resolve="RuleTemplateMethod" />
+                            <ref role="2aWVGs" to="ugy2:4OKkcnfu_Am" resolve="RuleTemplateMethod" />
                           </node>
                         </node>
                       </node>
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/runtime/jetbrains.mps.lang.coderules.runtime.msd b/coderules/languages/jetbrains.mps.lang.coderules/runtime/jetbrains.mps.lang.coderules.runtime.msd
index 093f31ad..e1124dc9 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/runtime/jetbrains.mps.lang.coderules.runtime.msd
+++ b/coderules/languages/jetbrains.mps.lang.coderules/runtime/jetbrains.mps.lang.coderules.runtime.msd
@@ -12,12 +12,12 @@
   </facets>
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
-    <dependency reexport="true">a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)</dependency>
-    <dependency reexport="true">ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)</dependency>
     <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
     <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
     <dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
-    <dependency reexport="false">f113d56b-63e3-4120-a89c-2f5dcb8c6290(jetbrains.mps.coderules.runtime)</dependency>
+    <dependency reexport="false">9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)</dependency>
+    <dependency reexport="false">bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)</dependency>
+    <dependency reexport="false">a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
@@ -29,6 +29,7 @@
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
+    <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
     <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
@@ -39,13 +40,12 @@
     <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
     <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
     <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
-    <module reference="f113d56b-63e3-4120-a89c-2f5dcb8c6290(jetbrains.mps.coderules.runtime)" version="0" />
     <module reference="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" version="0" />
-    <module reference="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" 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="da80355b-a098-4248-9ec8-70d10dd7e9af(jetbrains.mps.reporting.runtime)" version="0" />
+    <module reference="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" version="0" />
   </dependencyVersions>
 </solution>
 
diff --git a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.aspect.mps b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.aspect.mps
similarity index 99%
rename from coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.aspect.mps
rename to coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.aspect.mps
index 5db3e19b..ceead530 100644
--- a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.aspect.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.aspect.mps
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:2cc226a9-8a78-4010-b962-823343fd28ff(jetbrains.mps.lang.coderules.aspect)">
+<model ref="r:e3417884-ba0a-4330-9cea-64f01ace2e9d(jetbrains.mps.lang.coderules.aspect)">
   <persistence version="9" />
   <languages>
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
@@ -14,7 +14,6 @@
     <import index="ze1i" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel.runtime(MPS.Core/)" />
     <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" />
     <import index="vndm" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel.language(MPS.Core/)" />
-    <import index="i348" ref="r:42a15dec-83a9-4fe1-80d6-3bf898c512bd(jetbrains.mps.lang.coderules.template)" />
     <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
     <import index="w1kc" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel(MPS.Core/)" />
     <import index="i5cy" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.concurrent.atomic(JDK/)" />
@@ -22,9 +21,9 @@
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
     <import index="5zyv" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.concurrent(JDK/)" />
     <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
-    <import index="mhfm" ref="3f233e7f-b8a6-46d2-a57f-795d56775243/java:org.jetbrains.annotations(Annotations/)" />
     <import index="mpcv" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang.ref(JDK/)" />
     <import index="j9co" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel.event(MPS.Core/)" />
+    <import index="ugy2" ref="r:57b2449f-b7c7-4941-bd75-9c594835f5cd(jetbrains.mps.lang.coderules.template)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -4371,7 +4370,7 @@
       <property role="1EzhhJ" value="true" />
       <node concept="3vKaQO" id="6UWSvq4Vu6$" role="3clF45">
         <node concept="3uibUv" id="tbauFxRB8v" role="3O5elw">
-          <ref role="3uigEE" to="i348:tbauFxRzkz" resolve="MacroTable" />
+          <ref role="3uigEE" to="ugy2:tbauFxRzkz" resolve="MacroTable" />
         </node>
       </node>
       <node concept="3Tm1VV" id="6UWSvq4Vu5Y" role="1B3o_S" />
@@ -4383,7 +4382,7 @@
       <property role="1EzhhJ" value="true" />
       <node concept="3vKaQO" id="5EDW3XF609H" role="3clF45">
         <node concept="3uibUv" id="tbauFxRRsb" role="3O5elw">
-          <ref role="3uigEE" to="i348:4MqhgXU9fm3" resolve="RuleTable" />
+          <ref role="3uigEE" to="ugy2:4MqhgXU9fm3" resolve="RuleTable" />
         </node>
       </node>
       <node concept="3Tm1VV" id="4MqhgXUaiLA" role="1B3o_S" />
@@ -4395,7 +4394,7 @@
       <property role="1EzhhJ" value="true" />
       <node concept="3vKaQO" id="5EDW3XF60af" role="3clF45">
         <node concept="3uibUv" id="tbauFxRQEm" role="3O5elw">
-          <ref role="3uigEE" to="i348:tbauFxRORi" resolve="QueryTable" />
+          <ref role="3uigEE" to="ugy2:tbauFxRORi" resolve="QueryTable" />
         </node>
       </node>
       <node concept="3Tm1VV" id="5EDW3XF60ah" role="1B3o_S" />
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps
index e9fdb63b..1dcf3c1c 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps
@@ -14,24 +14,24 @@
   </languages>
   <imports>
     <import index="av0y" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.program(jetbrains.mps.logic.reactor/)" />
-    <import index="cxk7" ref="r:daa544a7-0a5c-49c0-a54c-4c2a5b4868aa(jetbrains.mps.logic.predicate)" />
-    <import index="i348" ref="r:42a15dec-83a9-4fe1-80d6-3bf898c512bd(jetbrains.mps.lang.coderules.template)" />
     <import index="w7la" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.evaluation(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="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.dataform)" />
-    <import index="fqlx" ref="r:2cc226a9-8a78-4010-b962-823343fd28ff(jetbrains.mps.lang.coderules.aspect)" />
     <import index="bj13" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.logical(jetbrains.mps.logic.reactor/)" />
-    <import index="oy3s" ref="r:a6030cee-34eb-4503-b1bf-015fe5cd8c1a(jetbrains.mps.logic.unification)" />
     <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
     <import index="ksgm" ref="r:6285678b-007f-4527-bcf5-6fd38ba8c969(jetbrains.mps.lang.coderules.program)" />
     <import index="et5u" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.messages(MPS.Core/)" />
     <import index="82uw" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.function(JDK/)" />
     <import index="5zyv" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.concurrent(JDK/)" />
-    <import index="lehm" ref="r:464fcc95-fddb-47d1-b620-592cbf6b8bf2(jetbrains.mps.coderules.runtime.memoizer)" />
-    <import index="psoy" ref="r:78313117-90ee-47a5-a91e-b5213df7f611(jetbrains.mps.coderules.runtime.result)" />
     <import index="mhfm" ref="3f233e7f-b8a6-46d2-a57f-795d56775243/java:org.jetbrains.annotations(Annotations/)" />
     <import index="bid0" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.util(jetbrains.mps.logic.reactor/)" />
+    <import index="xydz" ref="r:b198cb67-efdc-40c0-8817-11ab64523a5b(jetbrains.mps.lang.coderules.result)" />
+    <import index="pxw9" ref="r:e3417884-ba0a-4330-9cea-64f01ace2e9d(jetbrains.mps.lang.coderules.aspect)" />
+    <import index="ugy2" ref="r:57b2449f-b7c7-4941-bd75-9c594835f5cd(jetbrains.mps.lang.coderules.template)" />
+    <import index="tpfl" ref="r:97d6f79f-4a27-4a9b-9122-9bccfb5317c9(jetbrains.mps.lang.coderules.predicate)" />
+    <import index="aedp" ref="r:969c74a0-af0a-4247-9dda-0da7708b8c0d(jetbrains.mps.lang.coderules.memoizer)" />
+    <import index="cof4" ref="r:0a9d1d47-250c-4f98-8962-b65edf8b0721(jetbrains.mps.logic.dataform)" />
+    <import index="uwx2" ref="r:76101703-3fc5-4e76-aa48-9728dde91f7b(jetbrains.mps.logic.unification)" />
     <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" implicit="true" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
     <import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" implicit="true" />
@@ -681,14 +681,14 @@
                 <node concept="2OqwBi" id="3GlpCDSC7E5" role="37wK5m">
                   <node concept="2ShNRf" id="3GlpCDSC7E6" role="2Oq$k0">
                     <node concept="1pGfFk" id="3GlpCDSC7E7" role="2ShVmc">
-                      <ref role="37wK5l" to="i348:4sSe4$oM2rk" resolve="ConstraintBuilder" />
+                      <ref role="37wK5l" to="ugy2:4sSe4$oM2rk" resolve="ConstraintBuilder" />
                       <node concept="37vLTw" id="73aHuggfcRw" role="37wK5m">
                         <ref role="3cqZAo" node="73aHuggfcRr" resolve="mainSymbol" />
                       </node>
                     </node>
                   </node>
                   <node concept="liA8E" id="3GlpCDSC7Ec" role="2OqNvi">
-                    <ref role="37wK5l" to="i348:4sSe4$oM2zI" resolve="toConstraint" />
+                    <ref role="37wK5l" to="ugy2:4sSe4$oM2zI" resolve="toConstraint" />
                   </node>
                 </node>
               </node>
@@ -737,8 +737,8 @@
         <node concept="3clFbH" id="3GlpCDSBYQN" role="3cqZAp" />
         <node concept="3clFbF" id="1Ry9kf2v6ed" role="3cqZAp">
           <node concept="2YIFZM" id="5wYq9r5EDbG" role="3clFbG">
-            <ref role="37wK5l" to="lehm:2tjs8VC1byF" resolve="push" />
-            <ref role="1Pybhc" to="lehm:2tjs8VC0K0m" resolve="Memoizer" />
+            <ref role="37wK5l" to="aedp:2tjs8VC1byF" resolve="push" />
+            <ref role="1Pybhc" to="aedp:2tjs8VC0K0m" resolve="Memoizer" />
           </node>
         </node>
         <node concept="3clFbF" id="4J__M6MhyL" role="3cqZAp">
@@ -756,11 +756,11 @@
           <node concept="3cpWsn" id="62kWyaxUaeA" role="3cpWs9">
             <property role="TrG5h" value="result" />
             <node concept="3uibUv" id="62kWyaxTO6P" role="1tU5fm">
-              <ref role="3uigEE" to="psoy:7Oc59RSEjdb" resolve="Result" />
+              <ref role="3uigEE" to="xydz:7Oc59RSEjdb" resolve="Result" />
             </node>
             <node concept="2YIFZM" id="7TC1Xcd$6oB" role="33vP2m">
-              <ref role="37wK5l" to="psoy:7Oc59RSEjeq" resolve="OK" />
-              <ref role="1Pybhc" to="psoy:7Oc59RSEjdb" resolve="Result" />
+              <ref role="37wK5l" to="xydz:7Oc59RSEjeq" resolve="OK" />
+              <ref role="1Pybhc" to="xydz:7Oc59RSEjdb" resolve="Result" />
             </node>
           </node>
         </node>
@@ -786,8 +786,8 @@
               </node>
               <node concept="3cpWs6" id="6gnqipLr9_Q" role="3cqZAp">
                 <node concept="2YIFZM" id="6gnqipLrbEb" role="3cqZAk">
-                  <ref role="37wK5l" to="psoy:5X1yxJHYTYX" resolve="RECOVER" />
-                  <ref role="1Pybhc" to="psoy:7Oc59RSEjdb" resolve="Result" />
+                  <ref role="37wK5l" to="xydz:5X1yxJHYTYX" resolve="RECOVER" />
+                  <ref role="1Pybhc" to="xydz:7Oc59RSEjdb" resolve="Result" />
                   <node concept="37vLTw" id="6gnqipLrcIE" role="37wK5m">
                     <ref role="3cqZAo" node="6gnqipLr6Ri" resolve="efe" />
                   </node>
@@ -872,8 +872,8 @@
                 <node concept="3clFbF" id="62kWyaxUwip" role="3cqZAp">
                   <node concept="37vLTI" id="62kWyaxUwsQ" role="3clFbG">
                     <node concept="2YIFZM" id="51ek2rQtURt" role="37vLTx">
-                      <ref role="37wK5l" to="psoy:5X1yxJHYTYX" resolve="RECOVER" />
-                      <ref role="1Pybhc" to="psoy:7Oc59RSEjdb" resolve="Result" />
+                      <ref role="37wK5l" to="xydz:5X1yxJHYTYX" resolve="RECOVER" />
+                      <ref role="1Pybhc" to="xydz:7Oc59RSEjdb" resolve="Result" />
                       <node concept="2OqwBi" id="51ek2rQtURu" role="37wK5m">
                         <node concept="37vLTw" id="51ek2rQtURv" role="2Oq$k0">
                           <ref role="3cqZAo" node="1X0h_efYbPi" resolve="feedback" />
@@ -930,8 +930,8 @@
               </node>
               <node concept="3cpWs6" id="RZQG98SpJk" role="3cqZAp">
                 <node concept="2YIFZM" id="7TC1Xcd$6oP" role="3cqZAk">
-                  <ref role="37wK5l" to="psoy:5X1yxJHYPm2" resolve="FAIL" />
-                  <ref role="1Pybhc" to="psoy:7Oc59RSEjdb" resolve="Result" />
+                  <ref role="37wK5l" to="xydz:5X1yxJHYPm2" resolve="FAIL" />
+                  <ref role="1Pybhc" to="xydz:7Oc59RSEjdb" resolve="Result" />
                   <node concept="37vLTw" id="RZQG98SraT" role="37wK5m">
                     <ref role="3cqZAo" node="RZQG98Sokj" resolve="ex" />
                   </node>
@@ -962,8 +962,8 @@
               </node>
               <node concept="3cpWs6" id="7rf49NgqUQx" role="3cqZAp">
                 <node concept="2YIFZM" id="7TC1Xcd$6oQ" role="3cqZAk">
-                  <ref role="37wK5l" to="psoy:5X1yxJHYPm2" resolve="FAIL" />
-                  <ref role="1Pybhc" to="psoy:7Oc59RSEjdb" resolve="Result" />
+                  <ref role="37wK5l" to="xydz:5X1yxJHYPm2" resolve="FAIL" />
+                  <ref role="1Pybhc" to="xydz:7Oc59RSEjdb" resolve="Result" />
                   <node concept="37vLTw" id="7rf49Ngr2H$" role="37wK5m">
                     <ref role="3cqZAo" node="7rf49NgqSol" resolve="vmerr" />
                   </node>
@@ -976,8 +976,8 @@
             <node concept="3clFbS" id="1Ry9kf2vh7I" role="1wplMD">
               <node concept="3clFbF" id="1Ry9kf2vk7J" role="3cqZAp">
                 <node concept="2YIFZM" id="5wYq9r5EDbI" role="3clFbG">
-                  <ref role="37wK5l" to="lehm:2tjs8VC1f3O" resolve="pop" />
-                  <ref role="1Pybhc" to="lehm:2tjs8VC0K0m" resolve="Memoizer" />
+                  <ref role="37wK5l" to="aedp:2tjs8VC1f3O" resolve="pop" />
+                  <ref role="1Pybhc" to="aedp:2tjs8VC0K0m" resolve="Memoizer" />
                 </node>
               </node>
             </node>
@@ -991,7 +991,7 @@
         </node>
       </node>
       <node concept="3uibUv" id="3GlpCDSFjwR" role="3clF45">
-        <ref role="3uigEE" to="psoy:7Oc59RSEjdb" resolve="Result" />
+        <ref role="3uigEE" to="xydz:7Oc59RSEjdb" resolve="Result" />
       </node>
       <node concept="3Tm1VV" id="41ox5VnkgxL" role="1B3o_S" />
       <node concept="P$JXv" id="3GlpCDSBF3O" role="lGtFl">
@@ -1052,10 +1052,10 @@
       </node>
       <node concept="3vKaQO" id="7gMIJIyo$IU" role="3clF45">
         <node concept="3uibUv" id="7gMIJIyo$IW" role="3O5elw">
-          <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstractRuleTemplate" />
+          <ref role="3uigEE" to="ugy2:1ffsG7bUbCM" resolve="AbstractRuleTemplate" />
           <node concept="3qUE_q" id="7gMIJIyo$IX" role="11_B2D">
             <node concept="3uibUv" id="7gMIJIyo$IY" role="3qUE_r">
-              <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplate.Token" />
+              <ref role="3uigEE" to="ugy2:2RRx4MZ6_68" resolve="RuleTemplate.Token" />
             </node>
           </node>
         </node>
@@ -1067,7 +1067,7 @@
             <property role="TrG5h" value="allMatching" />
             <node concept="3vKaQO" id="7gMIJIyn$3J" role="1tU5fm">
               <node concept="3uibUv" id="7gMIJIyn$3Q" role="3O5elw">
-                <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstractRuleTemplate" />
+                <ref role="3uigEE" to="ugy2:1ffsG7bUbCM" resolve="AbstractRuleTemplate" />
                 <node concept="3qTvmN" id="7gMIJIyn$3R" role="11_B2D" />
               </node>
             </node>
@@ -1093,7 +1093,7 @@
                     <node concept="2ShNRf" id="7gMIJIynJDX" role="37vLTx">
                       <node concept="Tc6Ow" id="7gMIJIynJDY" role="2ShVmc">
                         <node concept="3uibUv" id="7gMIJIynJDZ" role="HW$YZ">
-                          <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstractRuleTemplate" />
+                          <ref role="3uigEE" to="ugy2:1ffsG7bUbCM" resolve="AbstractRuleTemplate" />
                           <node concept="3qTvmN" id="7gMIJIynJE0" role="11_B2D" />
                         </node>
                       </node>
@@ -1239,7 +1239,7 @@
                         <property role="TrG5h" value="matching" />
                         <node concept="3vKaQO" id="12yN8DyD$_b" role="1tU5fm">
                           <node concept="3uibUv" id="7XdbJdyRSmQ" role="3O5elw">
-                            <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstractRuleTemplate" />
+                            <ref role="3uigEE" to="ugy2:1ffsG7bUbCM" resolve="AbstractRuleTemplate" />
                             <node concept="3qTvmN" id="7gMIJIymZpv" role="11_B2D" />
                           </node>
                         </node>
@@ -1283,7 +1283,7 @@
                             <node concept="3fqX7Q" id="7XdbJdyJLha" role="3uHU7w">
                               <node concept="2OqwBi" id="7XdbJdyJLhc" role="3fr31v">
                                 <node concept="liA8E" id="7XdbJdyJLhe" role="2OqNvi">
-                                  <ref role="37wK5l" to="i348:7XdbJdz3PF6" resolve="isExactMatch" />
+                                  <ref role="37wK5l" to="ugy2:7XdbJdz3PF6" resolve="isExactMatch" />
                                 </node>
                                 <node concept="37vLTw" id="6tPOoeTaKuA" role="2Oq$k0">
                                   <ref role="3cqZAo" node="12yN8DyDOdM" resolve="tpl" />
@@ -1296,7 +1296,7 @@
                       <node concept="3cpWsn" id="12yN8DyDOdM" role="1Duv9x">
                         <property role="TrG5h" value="tpl" />
                         <node concept="3uibUv" id="6tPOoeTaJl8" role="1tU5fm">
-                          <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstractRuleTemplate" />
+                          <ref role="3uigEE" to="ugy2:1ffsG7bUbCM" resolve="AbstractRuleTemplate" />
                           <node concept="3qTvmN" id="7gMIJIyn0Eu" role="11_B2D" />
                         </node>
                       </node>
@@ -1355,10 +1355,10 @@
       <property role="TrG5h" value="allRuleTemplatesWithNoInput" />
       <node concept="A3Dl8" id="5NuEpF1qn9B" role="3clF45">
         <node concept="3uibUv" id="7XdbJdyRWsv" role="A3Ik2">
-          <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstractRuleTemplate" />
+          <ref role="3uigEE" to="ugy2:1ffsG7bUbCM" resolve="AbstractRuleTemplate" />
           <node concept="3qUE_q" id="7XdbJdyRWsw" role="11_B2D">
             <node concept="3uibUv" id="7XdbJdyRWsx" role="3qUE_r">
-              <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplate.Token" />
+              <ref role="3uigEE" to="ugy2:2RRx4MZ6_68" resolve="RuleTemplate.Token" />
             </node>
           </node>
         </node>
@@ -1370,10 +1370,10 @@
             <property role="TrG5h" value="result" />
             <node concept="_YKpA" id="5NuEpF1qn9H" role="1tU5fm">
               <node concept="3uibUv" id="6tPOoeTaMF9" role="_ZDj9">
-                <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstractRuleTemplate" />
+                <ref role="3uigEE" to="ugy2:1ffsG7bUbCM" resolve="AbstractRuleTemplate" />
                 <node concept="3qUE_q" id="6tPOoeTaMFa" role="11_B2D">
                   <node concept="3uibUv" id="6tPOoeTaMFb" role="3qUE_r">
-                    <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplate.Token" />
+                    <ref role="3uigEE" to="ugy2:2RRx4MZ6_68" resolve="RuleTemplate.Token" />
                   </node>
                 </node>
               </node>
@@ -1381,10 +1381,10 @@
             <node concept="2ShNRf" id="5NuEpF1qn9J" role="33vP2m">
               <node concept="Tc6Ow" id="5NuEpF1qn9K" role="2ShVmc">
                 <node concept="3uibUv" id="6tPOoeTaOFc" role="HW$YZ">
-                  <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstractRuleTemplate" />
+                  <ref role="3uigEE" to="ugy2:1ffsG7bUbCM" resolve="AbstractRuleTemplate" />
                   <node concept="3qUE_q" id="6tPOoeTaOFd" role="11_B2D">
                     <node concept="3uibUv" id="6tPOoeTaOFe" role="3qUE_r">
-                      <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplate.Token" />
+                      <ref role="3uigEE" to="ugy2:2RRx4MZ6_68" resolve="RuleTemplate.Token" />
                     </node>
                   </node>
                 </node>
@@ -1400,10 +1400,10 @@
                 <property role="TrG5h" value="matching" />
                 <node concept="3vKaQO" id="5NuEpF1qnan" role="1tU5fm">
                   <node concept="3uibUv" id="6tPOoeTaQxm" role="3O5elw">
-                    <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstractRuleTemplate" />
+                    <ref role="3uigEE" to="ugy2:1ffsG7bUbCM" resolve="AbstractRuleTemplate" />
                     <node concept="3qUE_q" id="6tPOoeTaQxn" role="11_B2D">
                       <node concept="3uibUv" id="6tPOoeTaQxo" role="3qUE_r">
-                        <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplate.Token" />
+                        <ref role="3uigEE" to="ugy2:2RRx4MZ6_68" resolve="RuleTemplate.Token" />
                       </node>
                     </node>
                   </node>
@@ -1435,10 +1435,10 @@
               <node concept="3cpWsn" id="5NuEpF1qnaO" role="1Duv9x">
                 <property role="TrG5h" value="tpl" />
                 <node concept="3uibUv" id="6tPOoeTaR5p" role="1tU5fm">
-                  <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstractRuleTemplate" />
+                  <ref role="3uigEE" to="ugy2:1ffsG7bUbCM" resolve="AbstractRuleTemplate" />
                   <node concept="3qUE_q" id="6tPOoeTaR5q" role="11_B2D">
                     <node concept="3uibUv" id="6tPOoeTaR5r" role="3qUE_r">
-                      <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplate.Token" />
+                      <ref role="3uigEE" to="ugy2:2RRx4MZ6_68" resolve="RuleTemplate.Token" />
                     </node>
                   </node>
                 </node>
@@ -1523,7 +1523,7 @@
         <property role="TrG5h" value="manifests" />
         <node concept="A3Dl8" id="7P_FdVPGxfw" role="1tU5fm">
           <node concept="3uibUv" id="5EDW3XFuIWi" role="A3Ik2">
-            <ref role="3uigEE" to="fqlx:5EDW3XF5Z95" resolve="AbstractCoderulesManifest" />
+            <ref role="3uigEE" to="pxw9:5EDW3XF5Z95" resolve="AbstractCoderulesManifest" />
           </node>
         </node>
       </node>
@@ -1535,7 +1535,7 @@
             <property role="TrG5h" value="ruleTables" />
             <node concept="A3Dl8" id="zL5ZaNMxza" role="1tU5fm">
               <node concept="3uibUv" id="zL5ZaNMxzd" role="A3Ik2">
-                <ref role="3uigEE" to="i348:4MqhgXU9fm3" resolve="RuleTable" />
+                <ref role="3uigEE" to="ugy2:4MqhgXU9fm3" resolve="RuleTable" />
               </node>
             </node>
             <node concept="2OqwBi" id="zL5ZaNMxMG" role="33vP2m">
@@ -1552,7 +1552,7 @@
                             <ref role="3cqZAo" node="6E5fMGvfKQ4" resolve="it" />
                           </node>
                           <node concept="liA8E" id="zL5ZaNMxMP" role="2OqNvi">
-                            <ref role="37wK5l" to="fqlx:4MqhgXUaiLz" resolve="ruleTables" />
+                            <ref role="37wK5l" to="pxw9:4MqhgXUaiLz" resolve="ruleTables" />
                           </node>
                         </node>
                         <node concept="ANE8D" id="zL5ZaNMxMQ" role="2OqNvi" />
@@ -1596,7 +1596,7 @@
                           <ref role="3cqZAo" node="zL5ZaNMy0E" resolve="ruleTable" />
                         </node>
                         <node concept="liA8E" id="zL5ZaNMxZL" role="2OqNvi">
-                          <ref role="37wK5l" to="i348:7P_FdVQoZmr" resolve="fqName" />
+                          <ref role="37wK5l" to="ugy2:7P_FdVQoZmr" resolve="fqName" />
                         </node>
                       </node>
                       <node concept="37vLTw" id="zL5ZaNMxZM" role="3ElQJh">
@@ -1614,7 +1614,7 @@
                         <property role="TrG5h" value="templates" />
                         <node concept="3vKaQO" id="zL5ZaNMxZT" role="1tU5fm">
                           <node concept="3uibUv" id="zL5ZaNMxZU" role="3O5elw">
-                            <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstractRuleTemplate" />
+                            <ref role="3uigEE" to="ugy2:1ffsG7bUbCM" resolve="AbstractRuleTemplate" />
                             <node concept="3qTvmN" id="zL5ZaNMxZV" role="11_B2D" />
                           </node>
                         </node>
@@ -1624,7 +1624,7 @@
                               <ref role="3cqZAo" node="zL5ZaNMy0$" resolve="tpl" />
                             </node>
                             <node concept="liA8E" id="zL5ZaNMxZZ" role="2OqNvi">
-                              <ref role="37wK5l" to="i348:1ffsG7bWxkw" resolve="applicableConcept" />
+                              <ref role="37wK5l" to="ugy2:1ffsG7bWxkw" resolve="applicableConcept" />
                             </node>
                           </node>
                           <node concept="37vLTw" id="zL5ZaNMy00" role="3ElQJh">
@@ -1642,7 +1642,7 @@
                                 <node concept="2ShNRf" id="zL5ZaNMy07" role="37vLTx">
                                   <node concept="Tc6Ow" id="zL5ZaNMy08" role="2ShVmc">
                                     <node concept="3uibUv" id="zL5ZaNMy09" role="HW$YZ">
-                                      <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstractRuleTemplate" />
+                                      <ref role="3uigEE" to="ugy2:1ffsG7bUbCM" resolve="AbstractRuleTemplate" />
                                       <node concept="3qTvmN" id="zL5ZaNMy0a" role="11_B2D" />
                                     </node>
                                   </node>
@@ -1658,7 +1658,7 @@
                                   <ref role="3cqZAo" node="zL5ZaNMy0$" resolve="tpl" />
                                 </node>
                                 <node concept="liA8E" id="zL5ZaNMy0f" role="2OqNvi">
-                                  <ref role="37wK5l" to="i348:1ffsG7bWxkw" resolve="applicableConcept" />
+                                  <ref role="37wK5l" to="ugy2:1ffsG7bWxkw" resolve="applicableConcept" />
                                 </node>
                               </node>
                               <node concept="37vLTw" id="zL5ZaNMy0g" role="3ElQJh">
@@ -1704,7 +1704,7 @@
                                 <ref role="3cqZAo" node="zL5ZaNMy0$" resolve="tpl" />
                               </node>
                               <node concept="3uibUv" id="zL5ZaNMy0y" role="10QFUM">
-                                <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstractRuleTemplate" />
+                                <ref role="3uigEE" to="ugy2:1ffsG7bUbCM" resolve="AbstractRuleTemplate" />
                                 <node concept="3qTvmN" id="zL5ZaNMy0z" role="11_B2D" />
                               </node>
                             </node>
@@ -1716,7 +1716,7 @@
                   <node concept="3cpWsn" id="zL5ZaNMy0$" role="1Duv9x">
                     <property role="TrG5h" value="tpl" />
                     <node concept="3uibUv" id="zL5ZaNMy0_" role="1tU5fm">
-                      <ref role="3uigEE" to="i348:1ffsG7bW_V4" resolve="RuleTemplate" />
+                      <ref role="3uigEE" to="ugy2:1ffsG7bW_V4" resolve="RuleTemplate" />
                       <node concept="3qTvmN" id="zL5ZaNMy0A" role="11_B2D" />
                     </node>
                   </node>
@@ -1725,7 +1725,7 @@
                       <ref role="3cqZAo" node="zL5ZaNMy0E" resolve="ruleTable" />
                     </node>
                     <node concept="liA8E" id="zL5ZaNMy0D" role="2OqNvi">
-                      <ref role="37wK5l" to="i348:4MqhgXUaiON" resolve="ruleTemplates" />
+                      <ref role="37wK5l" to="ugy2:4MqhgXUaiON" resolve="ruleTemplates" />
                     </node>
                   </node>
                 </node>
@@ -1741,7 +1741,7 @@
                         <ref role="3cqZAo" node="zL5ZaNMy0E" resolve="ruleTable" />
                       </node>
                       <node concept="liA8E" id="zL5ZaNMGS5" role="2OqNvi">
-                        <ref role="37wK5l" to="i348:7P_FdVQoZmr" resolve="fqName" />
+                        <ref role="37wK5l" to="ugy2:7P_FdVQoZmr" resolve="fqName" />
                       </node>
                     </node>
                   </node>
@@ -1752,7 +1752,7 @@
           <node concept="3cpWsn" id="zL5ZaNMy0E" role="1Duv9x">
             <property role="TrG5h" value="ruleTable" />
             <node concept="3uibUv" id="zL5ZaNMy0F" role="1tU5fm">
-              <ref role="3uigEE" to="i348:4MqhgXU9fm3" resolve="RuleTable" />
+              <ref role="3uigEE" to="ugy2:4MqhgXU9fm3" resolve="RuleTable" />
             </node>
           </node>
           <node concept="37vLTw" id="zL5ZaNMy0H" role="1DdaDG">
@@ -1769,7 +1769,7 @@
         <node concept="3bZ5Sz" id="YGS68MZPLr" role="3rvQeY" />
         <node concept="3vKaQO" id="12yN8DyDzne" role="3rvSg0">
           <node concept="3uibUv" id="7XdbJdyRSXd" role="3O5elw">
-            <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstractRuleTemplate" />
+            <ref role="3uigEE" to="ugy2:1ffsG7bUbCM" resolve="AbstractRuleTemplate" />
             <node concept="3qTvmN" id="7gMIJIymJOx" role="11_B2D" />
           </node>
         </node>
@@ -1779,7 +1779,7 @@
           <node concept="3bZ5Sz" id="YGS68MZQMl" role="3rHrn6" />
           <node concept="3vKaQO" id="429xoypKEop" role="3rHtpV">
             <node concept="3uibUv" id="6tPOoeTa_2l" role="3O5elw">
-              <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstractRuleTemplate" />
+              <ref role="3uigEE" to="ugy2:1ffsG7bUbCM" resolve="AbstractRuleTemplate" />
               <node concept="3qTvmN" id="7gMIJIymMCO" role="11_B2D" />
             </node>
           </node>
@@ -1794,7 +1794,7 @@
         <node concept="3bZ5Sz" id="7gMIJIynsDy" role="3rvQeY" />
         <node concept="3vKaQO" id="7gMIJIynsDz" role="3rvSg0">
           <node concept="3uibUv" id="7gMIJIynsD$" role="3O5elw">
-            <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstractRuleTemplate" />
+            <ref role="3uigEE" to="ugy2:1ffsG7bUbCM" resolve="AbstractRuleTemplate" />
             <node concept="3qTvmN" id="7gMIJIynsD_" role="11_B2D" />
           </node>
         </node>
@@ -1804,7 +1804,7 @@
           <node concept="3bZ5Sz" id="7gMIJIynsDC" role="3rHrn6" />
           <node concept="3vKaQO" id="7gMIJIynsDD" role="3rHtpV">
             <node concept="3uibUv" id="7gMIJIynsDE" role="3O5elw">
-              <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstractRuleTemplate" />
+              <ref role="3uigEE" to="ugy2:1ffsG7bUbCM" resolve="AbstractRuleTemplate" />
               <node concept="3qTvmN" id="7gMIJIynsDF" role="11_B2D" />
             </node>
           </node>
@@ -1818,14 +1818,14 @@
       <node concept="3rvAFt" id="7P_FdVQpvfA" role="1tU5fm">
         <node concept="17QB3L" id="7P_FdVQpvhe" role="3rvQeY" />
         <node concept="3uibUv" id="7P_FdVQpviN" role="3rvSg0">
-          <ref role="3uigEE" to="i348:4MqhgXU9fm3" resolve="RuleTable" />
+          <ref role="3uigEE" to="ugy2:4MqhgXU9fm3" resolve="RuleTable" />
         </node>
       </node>
       <node concept="2ShNRf" id="7P_FdVQpvy1" role="33vP2m">
         <node concept="3rGOSV" id="7P_FdVQpvww" role="2ShVmc">
           <node concept="17QB3L" id="7P_FdVQpvwx" role="3rHrn6" />
           <node concept="3uibUv" id="7P_FdVQpvwy" role="3rHtpV">
-            <ref role="3uigEE" to="i348:4MqhgXU9fm3" resolve="RuleTable" />
+            <ref role="3uigEE" to="ugy2:4MqhgXU9fm3" resolve="RuleTable" />
           </node>
         </node>
       </node>
@@ -1854,7 +1854,7 @@
       <property role="TrG5h" value="macroTables" />
       <node concept="3vKaQO" id="4JJCDIn5Foj" role="3clF45">
         <node concept="3uibUv" id="tbauFxRN6a" role="3O5elw">
-          <ref role="3uigEE" to="i348:tbauFxRzkz" resolve="MacroTable" />
+          <ref role="3uigEE" to="ugy2:tbauFxRzkz" resolve="MacroTable" />
         </node>
       </node>
       <node concept="3Tm1VV" id="4JJCDIn5F0q" role="1B3o_S" />
@@ -1874,7 +1874,7 @@
         <node concept="17QB3L" id="7mIqwW52Ng5" role="1tU5fm" />
       </node>
       <node concept="3uibUv" id="5itBwM7WF$q" role="3clF45">
-        <ref role="3uigEE" to="i348:5itBwM7auSJ" resolve="CallMacroTemplate" />
+        <ref role="3uigEE" to="ugy2:5itBwM7auSJ" resolve="CallMacroTemplate" />
         <node concept="16syzq" id="5itBwM7WF$r" role="11_B2D">
           <ref role="16sUi3" node="5itBwM7WF$V" resolve="T" />
         </node>
@@ -1887,7 +1887,7 @@
               <node concept="3cpWsn" id="5itBwM8MNtV" role="3cpWs9">
                 <property role="TrG5h" value="macroTemplate" />
                 <node concept="3uibUv" id="5itBwM8MNtW" role="1tU5fm">
-                  <ref role="3uigEE" to="i348:5itBwM7auSJ" resolve="CallMacroTemplate" />
+                  <ref role="3uigEE" to="ugy2:5itBwM7auSJ" resolve="CallMacroTemplate" />
                   <node concept="16syzq" id="5itBwM8MNtX" role="11_B2D">
                     <ref role="16sUi3" node="5itBwM7WF$V" resolve="T" />
                   </node>
@@ -1897,7 +1897,7 @@
                     <ref role="2Gs0qQ" node="5itBwM8MNub" resolve="macroTable" />
                   </node>
                   <node concept="liA8E" id="5itBwM8MNu0" role="2OqNvi">
-                    <ref role="37wK5l" to="i348:7mIqwW53gCg" resolve="callMacroTemplate" />
+                    <ref role="37wK5l" to="ugy2:7mIqwW53gCg" resolve="callMacroTemplate" />
                     <node concept="37vLTw" id="5itBwM8MNu1" role="37wK5m">
                       <ref role="3cqZAo" node="5itBwM7WF$o" resolve="templateFqn" />
                     </node>
@@ -1944,7 +1944,7 @@
         <node concept="YS8fn" id="5X1yxJHVsuI" role="3cqZAp">
           <node concept="2ShNRf" id="5X1yxJHVsuJ" role="YScLw">
             <node concept="1pGfFk" id="5X1yxJHVsuK" role="2ShVmc">
-              <ref role="37wK5l" to="i348:5X1yxJHUoaI" resolve="TemplateApplicationException" />
+              <ref role="37wK5l" to="ugy2:5X1yxJHUoaI" resolve="TemplateApplicationException" />
               <node concept="3cpWs3" id="5X1yxJHVvcr" role="37wK5m">
                 <node concept="3cpWs3" id="5X1yxJHVvcs" role="3uHU7B">
                   <node concept="Xl_RD" id="5X1yxJHVvct" role="3uHU7B">
@@ -1965,7 +1965,7 @@
       <node concept="16euLQ" id="5itBwM7WF$V" role="16eVyc">
         <property role="TrG5h" value="T" />
         <node concept="3uibUv" id="5itBwM86U8g" role="3ztrMU">
-          <ref role="3uigEE" to="i348:5itBwM86qnn" resolve="CallMacroTemplate.Token" />
+          <ref role="3uigEE" to="ugy2:5itBwM86qnn" resolve="CallMacroTemplate.Token" />
         </node>
       </node>
     </node>
@@ -1981,7 +1981,7 @@
         <node concept="17QB3L" id="7mIqwW51D4B" role="1tU5fm" />
       </node>
       <node concept="3uibUv" id="7mIqwW51Ay9" role="3clF45">
-        <ref role="3uigEE" to="i348:5itBwM75Jiy" resolve="ExpandMacroTemplate" />
+        <ref role="3uigEE" to="ugy2:5itBwM75Jiy" resolve="ExpandMacroTemplate" />
         <node concept="16syzq" id="7mIqwW51Aya" role="11_B2D">
           <ref role="16sUi3" node="7mIqwW51AyJ" resolve="T" />
         </node>
@@ -1999,7 +1999,7 @@
                         <ref role="2Gs0qQ" node="7mIqwW51Ayw" resolve="macroTemplate" />
                       </node>
                       <node concept="liA8E" id="7mIqwW51Ayl" role="2OqNvi">
-                        <ref role="37wK5l" to="i348:7mIqwW51r8J" resolve="getPrototypeTemplateFqName" />
+                        <ref role="37wK5l" to="ugy2:7mIqwW51r8J" resolve="getPrototypeTemplateFqName" />
                       </node>
                     </node>
                     <node concept="liA8E" id="7mIqwW51Aym" role="2OqNvi">
@@ -2023,7 +2023,7 @@
                   <ref role="2Gs0qQ" node="7mIqwW51Ayy" resolve="macroTable" />
                 </node>
                 <node concept="liA8E" id="7mIqwW51Ayt" role="2OqNvi">
-                  <ref role="37wK5l" to="i348:tbauFxRK5_" resolve="expandMacroTemplate" />
+                  <ref role="37wK5l" to="ugy2:tbauFxRK5_" resolve="expandMacroTemplate" />
                   <node concept="37vLTw" id="7mIqwW51Ayu" role="37wK5m">
                     <ref role="3cqZAo" node="7mIqwW51Ay5" resolve="concept" />
                   </node>
@@ -2057,7 +2057,7 @@
         <node concept="YS8fn" id="7mIqwW51AyB" role="3cqZAp">
           <node concept="2ShNRf" id="7mIqwW51AyC" role="YScLw">
             <node concept="1pGfFk" id="7mIqwW51AyD" role="2ShVmc">
-              <ref role="37wK5l" to="i348:5X1yxJHUoaI" resolve="TemplateApplicationException" />
+              <ref role="37wK5l" to="ugy2:5X1yxJHUoaI" resolve="TemplateApplicationException" />
               <node concept="3cpWs3" id="7mIqwW51AyE" role="37wK5m">
                 <node concept="3cpWs3" id="7mIqwW51AyF" role="3uHU7B">
                   <node concept="Xl_RD" id="7mIqwW51AyG" role="3uHU7B">
@@ -2078,7 +2078,7 @@
       <node concept="16euLQ" id="7mIqwW51AyJ" role="16eVyc">
         <property role="TrG5h" value="T" />
         <node concept="3uibUv" id="7mIqwW51AyK" role="3ztrMU">
-          <ref role="3uigEE" to="i348:5itBwM86qUH" resolve="ExpandMacroTemplate.Token" />
+          <ref role="3uigEE" to="ugy2:5itBwM86qUH" resolve="ExpandMacroTemplate.Token" />
         </node>
       </node>
     </node>
@@ -2090,7 +2090,7 @@
         <property role="TrG5h" value="manifests" />
         <node concept="A3Dl8" id="5EDW3XFuukc" role="1tU5fm">
           <node concept="3uibUv" id="5EDW3XFuukd" role="A3Ik2">
-            <ref role="3uigEE" to="fqlx:5EDW3XF5Z95" resolve="AbstractCoderulesManifest" />
+            <ref role="3uigEE" to="pxw9:5EDW3XF5Z95" resolve="AbstractCoderulesManifest" />
           </node>
         </node>
       </node>
@@ -2133,7 +2133,7 @@
                               <ref role="2Gs0qQ" node="6UWSvq4VKfN" resolve="macroTable" />
                             </node>
                             <node concept="liA8E" id="tbauFxRO$E" role="2OqNvi">
-                              <ref role="37wK5l" to="i348:7mIqwW4ZFxX" resolve="getFqName" />
+                              <ref role="37wK5l" to="ugy2:7mIqwW4ZFxX" resolve="getFqName" />
                             </node>
                           </node>
                           <node concept="37vLTw" id="zL5ZaNN7ql" role="3ElQJh">
@@ -2154,7 +2154,7 @@
                             <ref role="2Gs0qQ" node="6UWSvq4VKfN" resolve="macroTable" />
                           </node>
                           <node concept="liA8E" id="zL5ZaNN62O" role="2OqNvi">
-                            <ref role="37wK5l" to="i348:7mIqwW4ZFxX" resolve="getFqName" />
+                            <ref role="37wK5l" to="ugy2:7mIqwW4ZFxX" resolve="getFqName" />
                           </node>
                         </node>
                       </node>
@@ -2167,7 +2167,7 @@
                   <ref role="2Gs0qQ" node="7DvO2MamWSO" resolve="macroManifest" />
                 </node>
                 <node concept="liA8E" id="6UWSvq4VHk3" role="2OqNvi">
-                  <ref role="37wK5l" to="fqlx:6UWSvq4Vu5V" resolve="macroTables" />
+                  <ref role="37wK5l" to="pxw9:6UWSvq4Vu5V" resolve="macroTables" />
                 </node>
               </node>
               <node concept="2GrKxI" id="6UWSvq4VKfN" role="2Gsz3X">
@@ -2225,13 +2225,13 @@
             <property role="TrG5h" value="stack" />
             <node concept="oyxx6" id="3Vcd0Fo3j_G" role="1tU5fm">
               <node concept="3uibUv" id="3Vcd0Fo3AEh" role="3O5elw">
-                <ref role="3uigEE" to="i348:tbauFxRzkz" resolve="MacroTable" />
+                <ref role="3uigEE" to="ugy2:tbauFxRzkz" resolve="MacroTable" />
               </node>
             </node>
             <node concept="2ShNRf" id="3Vcd0Fo3j_I" role="33vP2m">
               <node concept="2Jqq0_" id="3Vcd0Fo3j_J" role="2ShVmc">
                 <node concept="3uibUv" id="3Vcd0Fo3DGz" role="HW$YZ">
-                  <ref role="3uigEE" to="i348:tbauFxRzkz" resolve="MacroTable" />
+                  <ref role="3uigEE" to="ugy2:tbauFxRzkz" resolve="MacroTable" />
                 </node>
               </node>
             </node>
@@ -2304,7 +2304,7 @@
                       <node concept="3cpWsn" id="3Vcd0Fo3jAi" role="3cpWs9">
                         <property role="TrG5h" value="next" />
                         <node concept="3uibUv" id="3Vcd0Fo3RxN" role="1tU5fm">
-                          <ref role="3uigEE" to="i348:tbauFxRzkz" resolve="MacroTable" />
+                          <ref role="3uigEE" to="ugy2:tbauFxRzkz" resolve="MacroTable" />
                         </node>
                         <node concept="2OqwBi" id="3Vcd0Fo3jAk" role="33vP2m">
                           <node concept="37vLTw" id="3Vcd0Fo3jAl" role="2Oq$k0">
@@ -2336,7 +2336,7 @@
                               <ref role="3cqZAo" node="3Vcd0Fo3jAi" resolve="next" />
                             </node>
                             <node concept="liA8E" id="wtfavH8hcw" role="2OqNvi">
-                              <ref role="37wK5l" to="i348:7mIqwW4ZFxX" resolve="getFqName" />
+                              <ref role="37wK5l" to="ugy2:7mIqwW4ZFxX" resolve="getFqName" />
                             </node>
                           </node>
                         </node>
@@ -2367,7 +2367,7 @@
                                   <ref role="3cqZAo" node="3Vcd0Fo3jAi" resolve="next" />
                                 </node>
                                 <node concept="liA8E" id="wtfavH8TKw" role="2OqNvi">
-                                  <ref role="37wK5l" to="i348:7mIqwW4ZFxX" resolve="getFqName" />
+                                  <ref role="37wK5l" to="ugy2:7mIqwW4ZFxX" resolve="getFqName" />
                                 </node>
                               </node>
                             </node>
@@ -2384,7 +2384,7 @@
                                   <ref role="3cqZAo" node="3Vcd0Fo3jAi" resolve="next" />
                                 </node>
                                 <node concept="liA8E" id="wtfavH96XP" role="2OqNvi">
-                                  <ref role="37wK5l" to="i348:7mIqwW4ZFxX" resolve="getFqName" />
+                                  <ref role="37wK5l" to="ugy2:7mIqwW4ZFxX" resolve="getFqName" />
                                 </node>
                               </node>
                             </node>
@@ -2410,7 +2410,7 @@
                               <ref role="3cqZAo" node="3Vcd0Fo3jAi" resolve="next" />
                             </node>
                             <node concept="liA8E" id="wtfavH8$sq" role="2OqNvi">
-                              <ref role="37wK5l" to="i348:7mIqwW4ZFxX" resolve="getFqName" />
+                              <ref role="37wK5l" to="ugy2:7mIqwW4ZFxX" resolve="getFqName" />
                             </node>
                           </node>
                         </node>
@@ -2427,7 +2427,7 @@
                               <ref role="3cqZAo" node="3Vcd0Fo3jAi" resolve="next" />
                             </node>
                             <node concept="liA8E" id="wtfavH9rCr" role="2OqNvi">
-                              <ref role="37wK5l" to="i348:7mIqwW4ZFxX" resolve="getFqName" />
+                              <ref role="37wK5l" to="ugy2:7mIqwW4ZFxX" resolve="getFqName" />
                             </node>
                           </node>
                         </node>
@@ -2442,7 +2442,7 @@
                             <ref role="3cqZAo" node="3Vcd0Fo3jAi" resolve="next" />
                           </node>
                           <node concept="liA8E" id="wtfavH9J5R" role="2OqNvi">
-                            <ref role="37wK5l" to="i348:7mIqwW4ZFTw" resolve="getExtendsFqName" />
+                            <ref role="37wK5l" to="ugy2:7mIqwW4ZFTw" resolve="getExtendsFqName" />
                           </node>
                         </node>
                       </node>
@@ -2559,13 +2559,13 @@
       <node concept="3Tm6S6" id="4JJCDImRYzX" role="1B3o_S" />
       <node concept="_YKpA" id="4JJCDImRYIM" role="1tU5fm">
         <node concept="3uibUv" id="tbauFxRIHm" role="_ZDj9">
-          <ref role="3uigEE" to="i348:tbauFxRzkz" resolve="MacroTable" />
+          <ref role="3uigEE" to="ugy2:tbauFxRzkz" resolve="MacroTable" />
         </node>
       </node>
       <node concept="2ShNRf" id="4JJCDImRZ41" role="33vP2m">
         <node concept="2Jqq0_" id="75mc6t92UUC" role="2ShVmc">
           <node concept="3uibUv" id="75mc6t92UUE" role="HW$YZ">
-            <ref role="3uigEE" to="i348:tbauFxRzkz" resolve="MacroTable" />
+            <ref role="3uigEE" to="ugy2:tbauFxRzkz" resolve="MacroTable" />
           </node>
         </node>
       </node>
@@ -2576,14 +2576,14 @@
       <node concept="3rvAFt" id="zL5ZaNN4mn" role="1tU5fm">
         <node concept="17QB3L" id="7mIqwW5082h" role="3rvQeY" />
         <node concept="3uibUv" id="zL5ZaNN4vM" role="3rvSg0">
-          <ref role="3uigEE" to="i348:tbauFxRzkz" resolve="MacroTable" />
+          <ref role="3uigEE" to="ugy2:tbauFxRzkz" resolve="MacroTable" />
         </node>
       </node>
       <node concept="2ShNRf" id="zL5ZaNN4LC" role="33vP2m">
         <node concept="3rGOSV" id="zL5ZaNN4KW" role="2ShVmc">
           <node concept="17QB3L" id="7mIqwW50dkf" role="3rHrn6" />
           <node concept="3uibUv" id="zL5ZaNN4KY" role="3rHtpV">
-            <ref role="3uigEE" to="i348:tbauFxRzkz" resolve="MacroTable" />
+            <ref role="3uigEE" to="ugy2:tbauFxRzkz" resolve="MacroTable" />
           </node>
         </node>
       </node>
@@ -2676,8 +2676,8 @@
             <node concept="3cpWs6" id="1HWyn8jvWel" role="3cqZAp">
               <node concept="2OqwBi" id="1HWyn8jvX$q" role="3cqZAk">
                 <node concept="2YIFZM" id="1HWyn8jvX$r" role="2Oq$k0">
-                  <ref role="1Pybhc" to="6exd:3OPtF02T8yx" resolve="Mappers" />
-                  <ref role="37wK5l" to="6exd:5s497VqteR6" resolve="mapper" />
+                  <ref role="1Pybhc" to="cof4:3OPtF02T8yx" resolve="Mappers" />
+                  <ref role="37wK5l" to="cof4:5s497VqteR6" resolve="mapper" />
                   <node concept="2ShNRf" id="1HWyn8jvX$s" role="37wK5m">
                     <node concept="1pGfFk" id="1HWyn8jvX$t" role="2ShVmc">
                       <ref role="37wK5l" node="1HWyn8jvsPg" resolve="CopyUtil.CopyDelegate" />
@@ -2688,10 +2688,10 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="1HWyn8jvX$y" role="2OqNvi">
-                  <ref role="37wK5l" to="6exd:3OPtF02TgQt" resolve="map" />
+                  <ref role="37wK5l" to="cof4:3OPtF02TgQt" resolve="map" />
                   <node concept="10QFUN" id="1HWyn8jvX$v" role="37wK5m">
                     <node concept="3uibUv" id="1HWyn8jvX$w" role="10QFUM">
-                      <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                      <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                     </node>
                     <node concept="37vLTw" id="1HWyn8jx8Ln" role="10QFUP">
                       <ref role="3cqZAo" node="1HWyn8jwLcm" resolve="value" />
@@ -2703,7 +2703,7 @@
           </node>
           <node concept="2ZW3vV" id="1HWyn8jvVmW" role="3clFbw">
             <node concept="3uibUv" id="1HWyn8jvVq1" role="2ZW6by">
-              <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+              <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
             </node>
             <node concept="37vLTw" id="1HWyn8jwLtB" role="2ZW6bz">
               <ref role="3cqZAo" node="1HWyn8jwLcm" resolve="value" />
@@ -2727,7 +2727,7 @@
       <node concept="2tJIrI" id="1HWyn8jv_$D" role="jymVt" />
       <node concept="3Tm6S6" id="1HWyn8jvsP4" role="1B3o_S" />
       <node concept="3uibUv" id="1HWyn8jvsP5" role="EKbjA">
-        <ref role="3uigEE" to="6exd:3OPtF031GQe" resolve="Mappers.MapDelegate" />
+        <ref role="3uigEE" to="cof4:3OPtF031GQe" resolve="Mappers.MapDelegate" />
       </node>
       <node concept="3clFbW" id="1HWyn8jvsPg" role="jymVt">
         <property role="DiZV1" value="false" />
@@ -2766,7 +2766,7 @@
           <property role="TrG5h" value="tf" />
           <property role="3TUv4t" value="false" />
           <node concept="3uibUv" id="1HWyn8jvsPu" role="1tU5fm">
-            <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+            <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
           </node>
         </node>
         <node concept="3clFbS" id="1HWyn8jvsPv" role="3clF47">
@@ -2788,14 +2788,14 @@
           <property role="TrG5h" value="tf" />
           <property role="3TUv4t" value="false" />
           <node concept="3uibUv" id="1HWyn8jvsPC" role="1tU5fm">
-            <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+            <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
           </node>
         </node>
         <node concept="37vLTG" id="1HWyn8jvsPD" role="3clF46">
           <property role="TrG5h" value="fallback" />
           <property role="3TUv4t" value="false" />
           <node concept="3uibUv" id="1HWyn8jvsPE" role="1tU5fm">
-            <ref role="3uigEE" to="6exd:3OPtF02TdNT" resolve="DataForm.Mapper" />
+            <ref role="3uigEE" to="cof4:3OPtF02TdNT" resolve="DataForm.Mapper" />
           </node>
         </node>
         <node concept="3clFbS" id="1HWyn8jvsPF" role="3clF47">
@@ -2805,7 +2805,7 @@
                 <ref role="3cqZAo" node="1HWyn8jvsPB" resolve="tf" />
               </node>
               <node concept="3uibUv" id="1HWyn8jvx1M" role="2ZW6by">
-                <ref role="3uigEE" to="oy3s:4TCblo5MJ1m" resolve="LogicalDataForm" />
+                <ref role="3uigEE" to="uwx2:4TCblo5MJ1m" resolve="LogicalDataForm" />
               </node>
             </node>
             <node concept="3clFbS" id="1HWyn8jvsPL" role="3clFbx">
@@ -2825,12 +2825,12 @@
                             <ref role="3cqZAo" node="1HWyn8jvsPB" resolve="tf" />
                           </node>
                           <node concept="3uibUv" id="1HWyn8jvsPU" role="10QFUM">
-                            <ref role="3uigEE" to="oy3s:4TCblo5MJ1m" resolve="LogicalDataForm" />
+                            <ref role="3uigEE" to="uwx2:4TCblo5MJ1m" resolve="LogicalDataForm" />
                           </node>
                         </node>
                       </node>
                       <node concept="liA8E" id="1HWyn8jvsPW" role="2OqNvi">
-                        <ref role="37wK5l" to="oy3s:4TCblo5MS1o" resolve="logical" />
+                        <ref role="37wK5l" to="uwx2:4TCblo5MS1o" resolve="logical" />
                       </node>
                     </node>
                     <node concept="liA8E" id="1HWyn8jvsPX" role="2OqNvi">
@@ -2923,7 +2923,7 @@
                     <node concept="3cpWs6" id="1HWyn8jvsQM" role="3cqZAp">
                       <node concept="2ShNRf" id="1HWyn8jvzyn" role="3cqZAk">
                         <node concept="1pGfFk" id="1HWyn8jvzA9" role="2ShVmc">
-                          <ref role="37wK5l" to="oy3s:4TCblo5ML4I" resolve="LogicalDataForm" />
+                          <ref role="37wK5l" to="uwx2:4TCblo5ML4I" resolve="LogicalDataForm" />
                           <node concept="37vLTw" id="1HWyn8jvzAa" role="37wK5m">
                             <ref role="3cqZAo" node="1HWyn8jvsQq" resolve="logicalCopy" />
                           </node>
@@ -2956,7 +2956,7 @@
                         <ref role="3cqZAo" node="1HWyn8jvsQ2" resolve="value" />
                       </node>
                       <node concept="3uibUv" id="1HWyn8jvsQ8" role="2ZW6by">
-                        <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                        <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                       </node>
                     </node>
                     <node concept="9aQIb" id="1HWyn8jvsQk" role="9aQIa">
@@ -2995,12 +2995,12 @@
                                 <ref role="3cqZAo" node="1HWyn8jvsQ2" resolve="value" />
                               </node>
                               <node concept="3uibUv" id="1HWyn8jvsQg" role="10QFUM">
-                                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                               </node>
                             </node>
                           </node>
                           <node concept="liA8E" id="1HWyn8jvsQi" role="2OqNvi">
-                            <ref role="37wK5l" to="6exd:3OPtF02Tjpr" resolve="mapRecursively" />
+                            <ref role="37wK5l" to="cof4:3OPtF02Tjpr" resolve="mapRecursively" />
                             <node concept="37vLTw" id="1HWyn8jvsQj" role="37wK5m">
                               <ref role="3cqZAo" node="1HWyn8jvsPD" resolve="fallback" />
                             </node>
@@ -3025,7 +3025,7 @@
                     <ref role="3cqZAo" node="1HWyn8jvsPB" resolve="tf" />
                   </node>
                   <node concept="liA8E" id="oyq0R0fg5i" role="2OqNvi">
-                    <ref role="37wK5l" to="6exd:5BGv8yzvvIZ" resolve="variablesCount" />
+                    <ref role="37wK5l" to="cof4:5BGv8yzvvIZ" resolve="variablesCount" />
                   </node>
                 </node>
               </node>
@@ -3036,7 +3036,7 @@
                       <ref role="3cqZAo" node="1HWyn8jvsPB" resolve="tf" />
                     </node>
                     <node concept="liA8E" id="oyq0R0eXJS" role="2OqNvi">
-                      <ref role="37wK5l" to="6exd:1bm7a6EXvNI" resolve="copyRecursively" />
+                      <ref role="37wK5l" to="cof4:1bm7a6EXvNI" resolve="copyRecursively" />
                     </node>
                   </node>
                 </node>
@@ -3051,7 +3051,7 @@
                       <ref role="3cqZAo" node="1HWyn8jvsPB" resolve="tf" />
                     </node>
                     <node concept="liA8E" id="1HWyn8jvtFf" role="2OqNvi">
-                      <ref role="37wK5l" to="6exd:3OPtF02Tjpr" resolve="mapRecursively" />
+                      <ref role="37wK5l" to="cof4:3OPtF02Tjpr" resolve="mapRecursively" />
                       <node concept="37vLTw" id="1HWyn8jvtFg" role="37wK5m">
                         <ref role="3cqZAo" node="1HWyn8jvsPD" resolve="fallback" />
                       </node>
@@ -3064,7 +3064,7 @@
         </node>
         <node concept="3Tm1VV" id="1HWyn8jvsQU" role="1B3o_S" />
         <node concept="3uibUv" id="1HWyn8jvsQV" role="3clF45">
-          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+          <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
         </node>
       </node>
       <node concept="2tJIrI" id="1HWyn8jvA20" role="jymVt" />
@@ -3170,7 +3170,7 @@
                 <ref role="3cqZAo" node="7DvO2M9VeM8" resolve="aspectClique" />
               </node>
               <node concept="liA8E" id="zL5ZaNDXZV" role="2OqNvi">
-                <ref role="37wK5l" to="fqlx:3KN3A4uUhpW" resolve="aspects" />
+                <ref role="37wK5l" to="pxw9:3KN3A4uUhpW" resolve="aspects" />
               </node>
             </node>
           </node>
@@ -3179,7 +3179,7 @@
       <node concept="37vLTG" id="7DvO2M9VeM8" role="3clF46">
         <property role="TrG5h" value="aspectClique" />
         <node concept="3uibUv" id="zL5ZaND$Lw" role="1tU5fm">
-          <ref role="3uigEE" to="fqlx:3KN3A4uUhmW" resolve="AspectClique" />
+          <ref role="3uigEE" to="pxw9:3KN3A4uUhmW" resolve="AspectClique" />
           <node concept="16syzq" id="zL5ZaNV6rc" role="11_B2D">
             <ref role="16sUi3" node="zL5ZaNV5nL" resolve="T" />
           </node>
@@ -3217,7 +3217,7 @@
     <node concept="3clFb_" id="zL5ZaO3vWj" role="jymVt">
       <property role="TrG5h" value="aspectClique" />
       <node concept="3uibUv" id="zL5ZaO3xpd" role="3clF45">
-        <ref role="3uigEE" to="fqlx:3KN3A4uUhmW" resolve="AspectClique" />
+        <ref role="3uigEE" to="pxw9:3KN3A4uUhmW" resolve="AspectClique" />
         <node concept="16syzq" id="zL5ZaO3xK7" role="11_B2D">
           <ref role="16sUi3" node="zL5ZaNV5nL" resolve="T" />
         </node>
@@ -3310,13 +3310,13 @@
             <property role="TrG5h" value="manifests" />
             <node concept="_YKpA" id="5EDW3XFuncv" role="1tU5fm">
               <node concept="3uibUv" id="5EDW3XFuncy" role="_ZDj9">
-                <ref role="3uigEE" to="fqlx:5EDW3XF5Z95" resolve="AbstractCoderulesManifest" />
+                <ref role="3uigEE" to="pxw9:5EDW3XF5Z95" resolve="AbstractCoderulesManifest" />
               </node>
             </node>
             <node concept="2ShNRf" id="5EDW3XFuncV" role="33vP2m">
               <node concept="Tc6Ow" id="5EDW3XFuncW" role="2ShVmc">
                 <node concept="3uibUv" id="5EDW3XFuncX" role="HW$YZ">
-                  <ref role="3uigEE" to="fqlx:5EDW3XF5Z95" resolve="AbstractCoderulesManifest" />
+                  <ref role="3uigEE" to="pxw9:5EDW3XF5Z95" resolve="AbstractCoderulesManifest" />
                 </node>
               </node>
             </node>
@@ -3329,14 +3329,14 @@
               <node concept="3cpWsn" id="5EDW3XFurcS" role="3cpWs9">
                 <property role="TrG5h" value="manifest" />
                 <node concept="3uibUv" id="5EDW3XFuqYq" role="1tU5fm">
-                  <ref role="3uigEE" to="fqlx:5EDW3XF5Z95" resolve="AbstractCoderulesManifest" />
+                  <ref role="3uigEE" to="pxw9:5EDW3XF5Z95" resolve="AbstractCoderulesManifest" />
                 </node>
                 <node concept="2OqwBi" id="5EDW3XFurcT" role="33vP2m">
                   <node concept="2GrUjf" id="5EDW3XFurcU" role="2Oq$k0">
                     <ref role="2Gs0qQ" node="NKt6yoTa9Y" resolve="aspect" />
                   </node>
                   <node concept="liA8E" id="5EDW3XFurcV" role="2OqNvi">
-                    <ref role="37wK5l" to="fqlx:5EDW3XF61A_" resolve="createManifest" />
+                    <ref role="37wK5l" to="pxw9:5EDW3XF61A_" resolve="createManifest" />
                   </node>
                 </node>
               </node>
@@ -3479,7 +3479,7 @@
       <property role="TrG5h" value="aspectClique" />
       <node concept="3Tm6S6" id="zL5ZaND_7b" role="1B3o_S" />
       <node concept="3uibUv" id="zL5ZaND_7d" role="1tU5fm">
-        <ref role="3uigEE" to="fqlx:3KN3A4uUhmW" resolve="AspectClique" />
+        <ref role="3uigEE" to="pxw9:3KN3A4uUhmW" resolve="AspectClique" />
         <node concept="16syzq" id="zL5ZaNY028" role="11_B2D">
           <ref role="16sUi3" node="zL5ZaNV5nL" resolve="T" />
         </node>
@@ -3496,7 +3496,7 @@
     <node concept="16euLQ" id="zL5ZaNV5nL" role="16eVyc">
       <property role="TrG5h" value="T" />
       <node concept="3uibUv" id="zL5ZaNV64v" role="3ztrMU">
-        <ref role="3uigEE" to="fqlx:NKt6yomNZE" resolve="CoderulesAspect" />
+        <ref role="3uigEE" to="pxw9:NKt6yomNZE" resolve="CoderulesAspect" />
       </node>
     </node>
     <node concept="3UR2Jj" id="1ufy3d8YZIN" role="lGtFl">
@@ -3588,7 +3588,7 @@
       <node concept="37vLTG" id="2gPa6JI$ZiC" role="3clF46">
         <property role="TrG5h" value="applicationSession" />
         <node concept="3uibUv" id="2gPa6JI$ZiD" role="1tU5fm">
-          <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
+          <ref role="3uigEE" to="ugy2:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
         </node>
       </node>
       <node concept="37vLTG" id="2gPa6JI$ZiE" role="3clF46">
@@ -3601,7 +3601,7 @@
         <property role="TrG5h" value="queryTemplate" />
         <node concept="_YKpA" id="9UUIHJAUiz" role="1tU5fm">
           <node concept="3uibUv" id="9UUIHJAUi$" role="_ZDj9">
-            <ref role="3uigEE" to="i348:6OXbTD$iNPP" resolve="QueryTemplate" />
+            <ref role="3uigEE" to="ugy2:6OXbTD$iNPP" resolve="QueryTemplate" />
             <node concept="3qTvmN" id="9UUIHJBkzR" role="11_B2D" />
           </node>
         </node>
@@ -3699,7 +3699,7 @@
       <property role="TrG5h" value="produce" />
       <node concept="3Tm1VV" id="7kTeLbPopUh" role="1B3o_S" />
       <node concept="3uibUv" id="7kTeLbPojC_" role="3clF45">
-        <ref role="3uigEE" to="psoy:7Oc59RSEjdb" resolve="Result" />
+        <ref role="3uigEE" to="xydz:7Oc59RSEjdb" resolve="Result" />
       </node>
       <node concept="37vLTG" id="7i3KM7gki_o" role="3clF46">
         <property role="TrG5h" value="planHandler" />
@@ -3724,7 +3724,7 @@
       <node concept="37vLTG" id="5EDW3XEu33d" role="3clF46">
         <property role="TrG5h" value="query" />
         <node concept="3uibUv" id="5EDW3XEu3xO" role="1tU5fm">
-          <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
+          <ref role="3uigEE" to="ugy2:5EDW3XDYeWv" resolve="Query" />
         </node>
       </node>
       <node concept="3clFbS" id="7kTeLbPojCE" role="3clF47">
@@ -3766,11 +3766,11 @@
                   <node concept="3cpWsn" id="6OXbTDxOoZd" role="3cpWs9">
                     <property role="TrG5h" value="result" />
                     <node concept="3uibUv" id="6OXbTDxOoZ1" role="1tU5fm">
-                      <ref role="3uigEE" to="psoy:7Oc59RSEjdb" resolve="Result" />
+                      <ref role="3uigEE" to="xydz:7Oc59RSEjdb" resolve="Result" />
                     </node>
                     <node concept="2YIFZM" id="3VwM5b5YQL6" role="33vP2m">
-                      <ref role="37wK5l" to="psoy:3VwM5b5YDoi" resolve="SKIP" />
-                      <ref role="1Pybhc" to="psoy:7Oc59RSEjdb" resolve="Result" />
+                      <ref role="37wK5l" to="xydz:3VwM5b5YDoi" resolve="SKIP" />
+                      <ref role="1Pybhc" to="xydz:7Oc59RSEjdb" resolve="Result" />
                     </node>
                   </node>
                 </node>
@@ -3798,7 +3798,7 @@
                         <ref role="3cqZAo" node="6OXbTDxOoZd" resolve="result" />
                       </node>
                       <node concept="liA8E" id="6OXbTDzR3$y" role="2OqNvi">
-                        <ref role="37wK5l" to="psoy:7nkyKX7v7xb" resolve="and" />
+                        <ref role="37wK5l" to="xydz:7nkyKX7v7xb" resolve="and" />
                         <node concept="2OqwBi" id="6OXbTDxOoZe" role="37wK5m">
                           <node concept="37vLTw" id="6OXbTDxOoZf" role="2Oq$k0">
                             <ref role="3cqZAo" node="7kTeLbPojCI" resolve="factory" />
@@ -3836,7 +3836,7 @@
                                     <ref role="3cqZAo" node="6OXbTDxOoZd" resolve="result" />
                                   </node>
                                   <node concept="liA8E" id="6OXbTDxPptb" role="2OqNvi">
-                                    <ref role="37wK5l" to="psoy:7nkyKX7v7xb" resolve="and" />
+                                    <ref role="37wK5l" to="xydz:7nkyKX7v7xb" resolve="and" />
                                     <node concept="2OqwBi" id="6OXbTDxPpIU" role="37wK5m">
                                       <node concept="37vLTw" id="6OXbTDxPp_9" role="2Oq$k0">
                                         <ref role="3cqZAo" node="7kTeLbPojCI" resolve="factory" />
@@ -3848,7 +3848,7 @@
                                             <ref role="3cqZAo" node="9UUIHJBawL" resolve="qt" />
                                           </node>
                                           <node concept="3uibUv" id="5EDW3XEx1PF" role="10QFUM">
-                                            <ref role="3uigEE" to="i348:6OXbTD$iNPP" resolve="QueryTemplate" />
+                                            <ref role="3uigEE" to="ugy2:6OXbTD$iNPP" resolve="QueryTemplate" />
                                             <node concept="16syzq" id="5EDW3XEx26X" role="11_B2D">
                                               <ref role="16sUi3" node="6OXbTDyaL_y" resolve="T" />
                                             </node>
@@ -3872,7 +3872,7 @@
                           <node concept="3cpWsn" id="9UUIHJBawL" role="1Duv9x">
                             <property role="TrG5h" value="qt" />
                             <node concept="3uibUv" id="9UUIHJBawP" role="1tU5fm">
-                              <ref role="3uigEE" to="i348:6OXbTD$iNPP" resolve="QueryTemplate" />
+                              <ref role="3uigEE" to="ugy2:6OXbTD$iNPP" resolve="QueryTemplate" />
                               <node concept="3qTvmN" id="9UUIHJBhnl" role="11_B2D" />
                             </node>
                           </node>
@@ -3898,7 +3898,7 @@
                             <ref role="3cqZAo" node="6OXbTDxOoZd" resolve="result" />
                           </node>
                           <node concept="liA8E" id="3VwM5b5XfL6" role="2OqNvi">
-                            <ref role="37wK5l" to="psoy:7nkyKX7v7xb" resolve="and" />
+                            <ref role="37wK5l" to="xydz:7nkyKX7v7xb" resolve="and" />
                             <node concept="2OqwBi" id="3VwM5b5XfL7" role="37wK5m">
                               <node concept="37vLTw" id="3VwM5b5XfL8" role="2Oq$k0">
                                 <ref role="3cqZAo" node="7kTeLbPojCI" resolve="factory" />
@@ -3918,7 +3918,7 @@
                         <ref role="3cqZAo" node="6OXbTDxOoZd" resolve="result" />
                       </node>
                       <node concept="liA8E" id="3VwM5b5YSVI" role="2OqNvi">
-                        <ref role="37wK5l" to="psoy:3VwM5b5XMK9" resolve="isTrivial" />
+                        <ref role="37wK5l" to="xydz:3VwM5b5XMK9" resolve="isTrivial" />
                       </node>
                     </node>
                   </node>
@@ -3957,13 +3957,13 @@
       <node concept="16euLQ" id="5EDW3XEvo5m" role="16eVyc">
         <property role="TrG5h" value="Q" />
         <node concept="3uibUv" id="5EDW3XEvwaZ" role="3ztrMU">
-          <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
+          <ref role="3uigEE" to="ugy2:5EDW3XDYeWv" resolve="Query" />
         </node>
       </node>
       <node concept="16euLQ" id="6OXbTDyaL_y" role="16eVyc">
         <property role="TrG5h" value="T" />
         <node concept="3uibUv" id="6R6MIbUdgwE" role="3ztrMU">
-          <ref role="3uigEE" to="i348:6R6MIbU8M46" resolve="QueryTemplate.Token" />
+          <ref role="3uigEE" to="ugy2:6R6MIbU8M46" resolve="QueryTemplate.Token" />
           <node concept="16syzq" id="5EDW3XEvy57" role="11_B2D">
             <ref role="16sUi3" node="5EDW3XEvo5m" resolve="Q" />
           </node>
@@ -4023,7 +4023,7 @@
         </node>
       </node>
       <node concept="3uibUv" id="7kTeLbPnVDn" role="3clF45">
-        <ref role="3uigEE" to="psoy:7Oc59RSEjdb" resolve="Result" />
+        <ref role="3uigEE" to="xydz:7Oc59RSEjdb" resolve="Result" />
       </node>
       <node concept="3Tm6S6" id="7kTeLbPnEee" role="1B3o_S" />
       <node concept="3clFbS" id="7kTeLbPnDc4" role="3clF47">
@@ -4102,11 +4102,11 @@
             <node concept="3cpWsn" id="1imVejV_lwG" role="3cpWs9">
               <property role="TrG5h" value="cachedResultsFilter" />
               <node concept="3uibUv" id="1imVejV_lwH" role="1tU5fm">
-                <ref role="3uigEE" to="i348:1imVejVxYQd" resolve="TemplateApplicationFilter" />
+                <ref role="3uigEE" to="ugy2:1imVejVxYQd" resolve="TemplateApplicationFilter" />
               </node>
               <node concept="10M0yZ" id="2gPa6JIusoL" role="33vP2m">
-                <ref role="3cqZAo" to="i348:5F2qBBEpoqL" resolve="EMPTY" />
-                <ref role="1PxDUh" to="i348:1imVejVxYQd" resolve="TemplateApplicationFilter" />
+                <ref role="3cqZAo" to="ugy2:5F2qBBEpoqL" resolve="EMPTY" />
+                <ref role="1PxDUh" to="ugy2:1imVejVxYQd" resolve="TemplateApplicationFilter" />
               </node>
             </node>
           </node>
@@ -4238,7 +4238,7 @@
           <node concept="3cpWsn" id="7kTeLbPnP2B" role="3cpWs9">
             <property role="TrG5h" value="result" />
             <node concept="3uibUv" id="7kTeLbPnP2C" role="1tU5fm">
-              <ref role="3uigEE" to="psoy:7Oc59RSEjdb" resolve="Result" />
+              <ref role="3uigEE" to="xydz:7Oc59RSEjdb" resolve="Result" />
             </node>
             <node concept="1rXfSq" id="4vBwiiVeFWN" role="33vP2m">
               <ref role="37wK5l" node="7kTeLbPg82h" resolve="withMemoizer" />
@@ -4308,7 +4308,7 @@
                     <ref role="3cqZAo" node="7kTeLbPnP2B" resolve="result" />
                   </node>
                   <node concept="liA8E" id="3VwM5b5WvHU" role="2OqNvi">
-                    <ref role="37wK5l" to="psoy:7nkyKX7v7xb" resolve="and" />
+                    <ref role="37wK5l" to="xydz:7nkyKX7v7xb" resolve="and" />
                     <node concept="2OqwBi" id="3VwM5b5WvTK" role="37wK5m">
                       <node concept="37vLTw" id="3VwM5b5WvTL" role="2Oq$k0">
                         <ref role="3cqZAo" node="6tPOoeTaVAY" resolve="programBuilder" />
@@ -4357,7 +4357,7 @@
                   <ref role="3cqZAo" node="7kTeLbPnP2B" resolve="result" />
                 </node>
                 <node concept="liA8E" id="cmlg9OCaV3" role="2OqNvi">
-                  <ref role="37wK5l" to="psoy:7Oc59RS_hsj" resolve="isSuccessful" />
+                  <ref role="37wK5l" to="xydz:7Oc59RS_hsj" resolve="isSuccessful" />
                 </node>
               </node>
             </node>
@@ -4368,7 +4368,7 @@
                 <ref role="3cqZAo" node="7kTeLbPnP2B" resolve="result" />
               </node>
               <node concept="liA8E" id="3VwM5b5YYtC" role="2OqNvi">
-                <ref role="37wK5l" to="psoy:3VwM5b5XMK9" resolve="isTrivial" />
+                <ref role="37wK5l" to="xydz:3VwM5b5XMK9" resolve="isTrivial" />
               </node>
             </node>
           </node>
@@ -4387,7 +4387,7 @@
             <ref role="3uigEE" to="ksgm:12yN8DyF_E1" resolve="ProgramFactory" />
           </node>
           <node concept="3uibUv" id="7kTeLbPnOYu" role="1ajl9A">
-            <ref role="3uigEE" to="psoy:7Oc59RSEjdb" resolve="Result" />
+            <ref role="3uigEE" to="xydz:7Oc59RSEjdb" resolve="Result" />
           </node>
         </node>
       </node>
@@ -4400,19 +4400,19 @@
         <property role="TrG5h" value="action" />
         <node concept="1ajhzC" id="7kTeLbPgemd" role="1tU5fm">
           <node concept="3uibUv" id="7kTeLbPgeo8" role="1ajl9A">
-            <ref role="3uigEE" to="psoy:7Oc59RSEjdb" resolve="Result" />
+            <ref role="3uigEE" to="xydz:7Oc59RSEjdb" resolve="Result" />
           </node>
         </node>
       </node>
       <node concept="3uibUv" id="7kTeLbPgdQB" role="3clF45">
-        <ref role="3uigEE" to="psoy:7Oc59RSEjdb" resolve="Result" />
+        <ref role="3uigEE" to="xydz:7Oc59RSEjdb" resolve="Result" />
       </node>
       <node concept="3Tm6S6" id="7kTeLbPg96d" role="1B3o_S" />
       <node concept="3clFbS" id="7kTeLbPg82l" role="3clF47">
         <node concept="3clFbF" id="7kTeLbPgepw" role="3cqZAp">
           <node concept="2YIFZM" id="5wYq9r5EDbH" role="3clFbG">
-            <ref role="37wK5l" to="lehm:2tjs8VC1byF" resolve="push" />
-            <ref role="1Pybhc" to="lehm:2tjs8VC0K0m" resolve="Memoizer" />
+            <ref role="37wK5l" to="aedp:2tjs8VC1byF" resolve="push" />
+            <ref role="1Pybhc" to="aedp:2tjs8VC0K0m" resolve="Memoizer" />
           </node>
         </node>
         <node concept="3J1_TO" id="7kTeLbPgepy" role="3cqZAp">
@@ -4430,8 +4430,8 @@
             <node concept="3clFbS" id="7kTeLbPgepI" role="1wplMD">
               <node concept="3clFbF" id="7kTeLbPgepJ" role="3cqZAp">
                 <node concept="2YIFZM" id="5wYq9r5EDbJ" role="3clFbG">
-                  <ref role="37wK5l" to="lehm:2tjs8VC1f3O" resolve="pop" />
-                  <ref role="1Pybhc" to="lehm:2tjs8VC0K0m" resolve="Memoizer" />
+                  <ref role="37wK5l" to="aedp:2tjs8VC1f3O" resolve="pop" />
+                  <ref role="1Pybhc" to="aedp:2tjs8VC0K0m" resolve="Memoizer" />
                 </node>
               </node>
             </node>
@@ -4484,7 +4484,7 @@
           </node>
         </node>
         <node concept="3uibUv" id="1XKnVPrwGm" role="3clF45">
-          <ref role="3uigEE" to="psoy:7Oc59RSEjdb" resolve="Result" />
+          <ref role="3uigEE" to="xydz:7Oc59RSEjdb" resolve="Result" />
         </node>
         <node concept="3clFbS" id="1XKnVPruHH" role="3clF47">
           <node concept="3clFbF" id="1XKnVPtF9v" role="3cqZAp">
@@ -4553,7 +4553,7 @@
       <property role="TrG5h" value="applicationSession" />
       <node concept="3Tm6S6" id="61G6TdBoK18" role="1B3o_S" />
       <node concept="3uibUv" id="61G6TdBpBFP" role="1tU5fm">
-        <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
+        <ref role="3uigEE" to="ugy2:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
       </node>
     </node>
     <node concept="312cEg" id="7WKNeR9bpBf" role="jymVt">
@@ -4568,7 +4568,7 @@
       <node concept="3Tm6S6" id="7WKNeR9b_iS" role="1B3o_S" />
       <node concept="_YKpA" id="9UUIHJAWuR" role="1tU5fm">
         <node concept="3uibUv" id="9UUIHJAWuS" role="_ZDj9">
-          <ref role="3uigEE" to="i348:6OXbTD$iNPP" resolve="QueryTemplate" />
+          <ref role="3uigEE" to="ugy2:6OXbTD$iNPP" resolve="QueryTemplate" />
           <node concept="3qTvmN" id="9UUIHJBjt4" role="11_B2D" />
         </node>
       </node>
@@ -4780,7 +4780,7 @@
                 </node>
                 <node concept="2ShNRf" id="3pMFS1zlzeG" role="37vLTx">
                   <node concept="1pGfFk" id="3pMFS1zlzG9" role="2ShVmc">
-                    <ref role="37wK5l" to="oy3s:4TCblo5ML4I" resolve="LogicalDataForm" />
+                    <ref role="37wK5l" to="uwx2:4TCblo5ML4I" resolve="LogicalDataForm" />
                     <node concept="10QFUN" id="3pMFS1zlzWI" role="37wK5m">
                       <node concept="3uibUv" id="3pMFS1zlzWF" role="10QFUM">
                         <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
@@ -4811,14 +4811,14 @@
               <node concept="3cpWsn" id="2dF51l1dRXU" role="3cpWs9">
                 <property role="TrG5h" value="groundPatternForm" />
                 <node concept="3uibUv" id="2dF51l1dRXQ" role="1tU5fm">
-                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                  <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                 </node>
                 <node concept="2YIFZM" id="2dF51l1dRZC" role="33vP2m">
-                  <ref role="37wK5l" to="6exd:6HT7BWBOXr$" resolve="ground" />
-                  <ref role="1Pybhc" to="6exd:6HT7BWBOXme" resolve="DataFormUtil" />
+                  <ref role="37wK5l" to="cof4:6HT7BWBOXr$" resolve="ground" />
+                  <ref role="1Pybhc" to="cof4:6HT7BWBOXme" resolve="DataFormUtil" />
                   <node concept="10QFUN" id="2dF51l1dRXV" role="37wK5m">
                     <node concept="3uibUv" id="2dF51l1dRXW" role="10QFUM">
-                      <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                      <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                     </node>
                     <node concept="37vLTw" id="2dF51l1dRXX" role="10QFUP">
                       <ref role="3cqZAo" node="3pMFS1zdF5I" resolve="patternForm" />
@@ -4831,14 +4831,14 @@
               <node concept="3cpWsn" id="3pMFS1znIYA" role="3cpWs9">
                 <property role="TrG5h" value="groundOrigForm" />
                 <node concept="3uibUv" id="3pMFS1znIY$" role="1tU5fm">
-                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                  <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                 </node>
                 <node concept="2YIFZM" id="3pMFS1znIYB" role="33vP2m">
-                  <ref role="37wK5l" to="6exd:6HT7BWBOXr$" resolve="ground" />
-                  <ref role="1Pybhc" to="6exd:6HT7BWBOXme" resolve="DataFormUtil" />
+                  <ref role="37wK5l" to="cof4:6HT7BWBOXr$" resolve="ground" />
+                  <ref role="1Pybhc" to="cof4:6HT7BWBOXme" resolve="DataFormUtil" />
                   <node concept="10QFUN" id="3pMFS1znIYC" role="37wK5m">
                     <node concept="3uibUv" id="3pMFS1znIYD" role="10QFUM">
-                      <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                      <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                     </node>
                     <node concept="37vLTw" id="3pMFS1znIYE" role="10QFUP">
                       <ref role="3cqZAo" node="3pMFS1zdqnB" resolve="origForm" />
@@ -4862,7 +4862,7 @@
                     </node>
                     <node concept="10QFUN" id="3pMFS1znIGj" role="37wK5m">
                       <node concept="3uibUv" id="3pMFS1znIGk" role="10QFUM">
-                        <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                        <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                       </node>
                       <node concept="37vLTw" id="3pMFS1znIGl" role="10QFUP">
                         <ref role="3cqZAo" node="3pMFS1zdJbw" resolve="replForm" />
@@ -4879,14 +4879,14 @@
             <node concept="3cpWs6" id="3pMFS1zdqnY" role="3cqZAp">
               <node concept="2OqwBi" id="3pMFS1zdqnZ" role="3cqZAk">
                 <node concept="2YIFZM" id="3pMFS1zdqo0" role="2Oq$k0">
-                  <ref role="1Pybhc" to="6exd:3OPtF02T8yx" resolve="Mappers" />
-                  <ref role="37wK5l" to="6exd:5s497VqteR6" resolve="mapper" />
+                  <ref role="1Pybhc" to="cof4:3OPtF02T8yx" resolve="Mappers" />
+                  <ref role="37wK5l" to="cof4:5s497VqteR6" resolve="mapper" />
                   <node concept="37vLTw" id="3pMFS1znIGn" role="37wK5m">
                     <ref role="3cqZAo" node="3pMFS1znIGd" resolve="substDelegate" />
                   </node>
                 </node>
                 <node concept="liA8E" id="3pMFS1zdqo4" role="2OqNvi">
-                  <ref role="37wK5l" to="6exd:3OPtF02TgQt" resolve="map" />
+                  <ref role="37wK5l" to="cof4:3OPtF02TgQt" resolve="map" />
                   <node concept="37vLTw" id="3pMFS1znIYF" role="37wK5m">
                     <ref role="3cqZAo" node="3pMFS1znIYA" resolve="groundOrigForm" />
                   </node>
@@ -4897,7 +4897,7 @@
           <node concept="1Wc70l" id="3pMFS1zdLQ2" role="3clFbw">
             <node concept="2ZW3vV" id="3pMFS1zdMhx" role="3uHU7w">
               <node concept="3uibUv" id="3pMFS1zdMmz" role="2ZW6by">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="37vLTw" id="3pMFS1zlUbQ" role="2ZW6bz">
                 <ref role="3cqZAo" node="3pMFS1zdJbw" resolve="replForm" />
@@ -4906,7 +4906,7 @@
             <node concept="1Wc70l" id="3pMFS1zdI29" role="3uHU7B">
               <node concept="2ZW3vV" id="3pMFS1zdqo8" role="3uHU7B">
                 <node concept="3uibUv" id="3pMFS1zdqo9" role="2ZW6by">
-                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                  <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                 </node>
                 <node concept="37vLTw" id="3pMFS1zdqoa" role="2ZW6bz">
                   <ref role="3cqZAo" node="3pMFS1zdqnB" resolve="origForm" />
@@ -4914,7 +4914,7 @@
               </node>
               <node concept="2ZW3vV" id="3pMFS1zdIuP" role="3uHU7w">
                 <node concept="3uibUv" id="3pMFS1zdIz_" role="2ZW6by">
-                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                  <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                 </node>
                 <node concept="37vLTw" id="3pMFS1zdIcI" role="2ZW6bz">
                   <ref role="3cqZAo" node="3pMFS1zdF5I" resolve="patternForm" />
@@ -4940,7 +4940,7 @@
       <node concept="2tJIrI" id="3pMFS1zdqog" role="jymVt" />
       <node concept="3Tm6S6" id="3pMFS1zdqoh" role="1B3o_S" />
       <node concept="3uibUv" id="3pMFS1zdqoi" role="EKbjA">
-        <ref role="3uigEE" to="6exd:3OPtF031GQe" resolve="Mappers.MapDelegate" />
+        <ref role="3uigEE" to="cof4:3OPtF031GQe" resolve="Mappers.MapDelegate" />
       </node>
       <node concept="3clFbW" id="3pMFS1zdqoj" role="jymVt">
         <property role="DiZV1" value="false" />
@@ -4949,13 +4949,13 @@
         <node concept="37vLTG" id="3pMFS1zdEoF" role="3clF46">
           <property role="TrG5h" value="patternForm" />
           <node concept="3uibUv" id="3pMFS1zdMRH" role="1tU5fm">
-            <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+            <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
           </node>
         </node>
         <node concept="37vLTG" id="3pMFS1zdNt1" role="3clF46">
           <property role="TrG5h" value="replacementForm" />
           <node concept="3uibUv" id="3pMFS1zdNt2" role="1tU5fm">
-            <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+            <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
           </node>
         </node>
         <node concept="37vLTG" id="3pMFS1zdqol" role="3clF46">
@@ -5017,7 +5017,7 @@
           <property role="TrG5h" value="tf" />
           <property role="3TUv4t" value="false" />
           <node concept="3uibUv" id="3pMFS1zdqoy" role="1tU5fm">
-            <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+            <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
           </node>
         </node>
         <node concept="3clFbS" id="3pMFS1zdqoz" role="3clF47">
@@ -5039,14 +5039,14 @@
           <property role="TrG5h" value="tf" />
           <property role="3TUv4t" value="false" />
           <node concept="3uibUv" id="3pMFS1zdqoJ" role="1tU5fm">
-            <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+            <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
           </node>
         </node>
         <node concept="37vLTG" id="3pMFS1zdqoK" role="3clF46">
           <property role="TrG5h" value="fallback" />
           <property role="3TUv4t" value="false" />
           <node concept="3uibUv" id="3pMFS1zdqoL" role="1tU5fm">
-            <ref role="3uigEE" to="6exd:3OPtF02TdNT" resolve="DataForm.Mapper" />
+            <ref role="3uigEE" to="cof4:3OPtF02TdNT" resolve="DataForm.Mapper" />
           </node>
         </node>
         <node concept="3clFbS" id="3pMFS1zdqoM" role="3clF47">
@@ -5055,14 +5055,14 @@
               <node concept="3cpWs6" id="2dF51l167BC" role="3cqZAp">
                 <node concept="2OqwBi" id="2dF51l167BD" role="3cqZAk">
                   <node concept="2YIFZM" id="2dF51l167BE" role="2Oq$k0">
-                    <ref role="37wK5l" to="6exd:5s497VqteR6" resolve="mapper" />
-                    <ref role="1Pybhc" to="6exd:3OPtF02T8yx" resolve="Mappers" />
+                    <ref role="37wK5l" to="cof4:5s497VqteR6" resolve="mapper" />
+                    <ref role="1Pybhc" to="cof4:3OPtF02T8yx" resolve="Mappers" />
                     <node concept="37vLTw" id="2dF51l167BF" role="37wK5m">
                       <ref role="3cqZAo" node="3pMFS1zeln4" resolve="copyDelegate" />
                     </node>
                   </node>
                   <node concept="liA8E" id="2dF51l167BG" role="2OqNvi">
-                    <ref role="37wK5l" to="6exd:3OPtF02TgQt" resolve="map" />
+                    <ref role="37wK5l" to="cof4:3OPtF02TgQt" resolve="map" />
                     <node concept="37vLTw" id="2dF51l167BH" role="37wK5m">
                       <ref role="3cqZAo" node="3pMFS1zdPaL" resolve="replacementForm" />
                     </node>
@@ -5079,7 +5079,7 @@
                       <ref role="3cqZAo" node="3pMFS1zdqoI" resolve="tf" />
                     </node>
                     <node concept="liA8E" id="2dF51l167CG" role="2OqNvi">
-                      <ref role="37wK5l" to="6exd:3OPtF02Tjpr" resolve="mapRecursively" />
+                      <ref role="37wK5l" to="cof4:3OPtF02Tjpr" resolve="mapRecursively" />
                       <node concept="37vLTw" id="2dF51l167CH" role="37wK5m">
                         <ref role="3cqZAo" node="3pMFS1zdqoK" resolve="fallback" />
                       </node>
@@ -5106,7 +5106,7 @@
         </node>
         <node concept="3Tm1VV" id="3pMFS1zdqqf" role="1B3o_S" />
         <node concept="3uibUv" id="3pMFS1zdqqg" role="3clF45">
-          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+          <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
         </node>
       </node>
       <node concept="2tJIrI" id="3pMFS1zdqqh" role="jymVt" />
@@ -5114,13 +5114,13 @@
         <property role="TrG5h" value="copyDelegate" />
         <node concept="3Tm6S6" id="3pMFS1zeln5" role="1B3o_S" />
         <node concept="3uibUv" id="3pMFS1zem09" role="1tU5fm">
-          <ref role="3uigEE" to="6exd:3OPtF031GQe" resolve="Mappers.MapDelegate" />
+          <ref role="3uigEE" to="cof4:3OPtF031GQe" resolve="Mappers.MapDelegate" />
         </node>
         <node concept="2ShNRf" id="3pMFS1zemcd" role="33vP2m">
           <node concept="YeOm9" id="3pMFS1zems9" role="2ShVmc">
             <node concept="1Y3b0j" id="3pMFS1zemsc" role="YeSDq">
               <property role="2bfB8j" value="true" />
-              <ref role="1Y3XeK" to="6exd:3OPtF031GQe" resolve="Mappers.MapDelegate" />
+              <ref role="1Y3XeK" to="cof4:3OPtF031GQe" resolve="Mappers.MapDelegate" />
               <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
               <node concept="3Tm1VV" id="3pMFS1zemsd" role="1B3o_S" />
               <node concept="3clFb_" id="3pMFS1zeegr" role="jymVt">
@@ -5129,7 +5129,7 @@
                 <node concept="37vLTG" id="3pMFS1zeegs" role="3clF46">
                   <property role="TrG5h" value="tf" />
                   <node concept="3uibUv" id="3pMFS1zeegt" role="1tU5fm">
-                    <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                    <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                   </node>
                 </node>
                 <node concept="10P_77" id="3pMFS1zeegu" role="3clF45" />
@@ -5152,18 +5152,18 @@
                 <node concept="37vLTG" id="3pMFS1zeegA" role="3clF46">
                   <property role="TrG5h" value="tf" />
                   <node concept="3uibUv" id="3pMFS1zeegB" role="1tU5fm">
-                    <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                    <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                   </node>
                 </node>
                 <node concept="37vLTG" id="3pMFS1zeegC" role="3clF46">
                   <property role="TrG5h" value="fallback" />
                   <node concept="3uibUv" id="3pMFS1zeegD" role="1tU5fm">
-                    <ref role="3uigEE" to="6exd:3OPtF02TdNT" resolve="DataForm.Mapper" />
+                    <ref role="3uigEE" to="cof4:3OPtF02TdNT" resolve="DataForm.Mapper" />
                   </node>
                 </node>
                 <node concept="3Tm1VV" id="3pMFS1zeegE" role="1B3o_S" />
                 <node concept="3uibUv" id="3pMFS1zeegG" role="3clF45">
-                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                  <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                 </node>
                 <node concept="3clFbS" id="3pMFS1zeegH" role="3clF47">
                   <node concept="3clFbJ" id="3pMFS1zdqoN" role="3cqZAp">
@@ -5172,7 +5172,7 @@
                         <ref role="3cqZAo" node="3pMFS1zeegA" resolve="tf" />
                       </node>
                       <node concept="3uibUv" id="3pMFS1zdqoQ" role="2ZW6by">
-                        <ref role="3uigEE" to="oy3s:4TCblo5MJ1m" resolve="LogicalDataForm" />
+                        <ref role="3uigEE" to="uwx2:4TCblo5MJ1m" resolve="LogicalDataForm" />
                       </node>
                     </node>
                     <node concept="9aQIb" id="3pMFS1zdqoR" role="9aQIa">
@@ -5183,7 +5183,7 @@
                               <ref role="3cqZAo" node="3pMFS1zeegA" resolve="tf" />
                             </node>
                             <node concept="liA8E" id="3pMFS1zdqoW" role="2OqNvi">
-                              <ref role="37wK5l" to="6exd:3OPtF02Tjpr" resolve="mapRecursively" />
+                              <ref role="37wK5l" to="cof4:3OPtF02Tjpr" resolve="mapRecursively" />
                               <node concept="37vLTw" id="3pMFS1zdqoX" role="37wK5m">
                                 <ref role="3cqZAo" node="3pMFS1zeegC" resolve="fallback" />
                               </node>
@@ -5224,7 +5224,7 @@
                       <node concept="3cpWs6" id="3pMFS1zeyhu" role="3cqZAp">
                         <node concept="2ShNRf" id="3pMFS1zeyhv" role="3cqZAk">
                           <node concept="1pGfFk" id="3pMFS1zeyhw" role="2ShVmc">
-                            <ref role="37wK5l" to="oy3s:4TCblo5ML4I" resolve="LogicalDataForm" />
+                            <ref role="37wK5l" to="uwx2:4TCblo5ML4I" resolve="LogicalDataForm" />
                             <node concept="2OqwBi" id="3pMFS1zez0W" role="37wK5m">
                               <node concept="1eOMI4" id="3pMFS1zez0X" role="2Oq$k0">
                                 <node concept="10QFUN" id="3pMFS1zez0Y" role="1eOMHV">
@@ -5232,12 +5232,12 @@
                                     <ref role="3cqZAo" node="3pMFS1zeegA" resolve="tf" />
                                   </node>
                                   <node concept="3uibUv" id="3pMFS1zez10" role="10QFUM">
-                                    <ref role="3uigEE" to="oy3s:4TCblo5MJ1m" resolve="LogicalDataForm" />
+                                    <ref role="3uigEE" to="uwx2:4TCblo5MJ1m" resolve="LogicalDataForm" />
                                   </node>
                                 </node>
                               </node>
                               <node concept="liA8E" id="3pMFS1zez11" role="2OqNvi">
-                                <ref role="37wK5l" to="oy3s:4TCblo5MS1o" resolve="logical" />
+                                <ref role="37wK5l" to="uwx2:4TCblo5MS1o" resolve="logical" />
                               </node>
                             </node>
                           </node>
@@ -5270,14 +5270,14 @@
         <property role="TrG5h" value="patternForm" />
         <node concept="3Tm6S6" id="3pMFS1zdOFb" role="1B3o_S" />
         <node concept="3uibUv" id="3pMFS1zdOFd" role="1tU5fm">
-          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+          <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
         </node>
       </node>
       <node concept="312cEg" id="3pMFS1zdPaL" role="jymVt">
         <property role="TrG5h" value="replacementForm" />
         <node concept="3Tm6S6" id="3pMFS1zdPaM" role="1B3o_S" />
         <node concept="3uibUv" id="3pMFS1zdPaO" role="1tU5fm">
-          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+          <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
         </node>
       </node>
       <node concept="312cEg" id="6SwZmzBz6$Y" role="jymVt">
@@ -5316,7 +5316,7 @@
         <node concept="3clFbS" id="6SwZmzBHSg0" role="3clF47">
           <node concept="3clFbF" id="6SwZmzBHTsF" role="3cqZAp">
             <node concept="1rXfSq" id="6SwZmzBHTsE" role="3clFbG">
-              <ref role="37wK5l" to="cxk7:2UGjFq4lB$H" resolve="doAsk" />
+              <ref role="37wK5l" to="tpfl:2UGjFq4lB$H" resolve="doAsk" />
               <node concept="37vLTw" id="6SwZmzBHT$R" role="37wK5m">
                 <ref role="3cqZAo" node="6SwZmzBHStw" resolve="a" />
               </node>
@@ -5330,7 +5330,7 @@
       <node concept="2tJIrI" id="6SwZmzBHSeY" role="jymVt" />
       <node concept="3Tm6S6" id="6SwZmzBHShJ" role="1B3o_S" />
       <node concept="3uibUv" id="6SwZmzBHS6n" role="1zkMxy">
-        <ref role="3uigEE" to="cxk7:3HJTsBn4ogZ" resolve="EqualsPredicate.EqualsSolver" />
+        <ref role="3uigEE" to="tpfl:3HJTsBn4ogZ" resolve="EqualsPredicate.EqualsSolver" />
       </node>
     </node>
     <node concept="2tJIrI" id="3pMFS1zdqqy" role="jymVt" />
@@ -5354,14 +5354,14 @@
           <ref role="3uigEE" to="wyt6:~Class" resolve="Class" />
           <node concept="3qUE_q" id="5EDW3XE$fMP" role="11_B2D">
             <node concept="3uibUv" id="5EDW3XE$fVy" role="3qUE_r">
-              <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
+              <ref role="3uigEE" to="ugy2:5EDW3XDYeWv" resolve="Query" />
             </node>
           </node>
         </node>
       </node>
       <node concept="_YKpA" id="9UUIHJ_XzB" role="3clF45">
         <node concept="3uibUv" id="9UUIHJ_XzC" role="_ZDj9">
-          <ref role="3uigEE" to="i348:6OXbTD$iNPP" resolve="QueryTemplate" />
+          <ref role="3uigEE" to="ugy2:6OXbTD$iNPP" resolve="QueryTemplate" />
           <node concept="3qTvmN" id="9UUIHJBuPj" role="11_B2D" />
         </node>
       </node>
@@ -5389,7 +5389,7 @@
         <property role="TrG5h" value="manifests" />
         <node concept="A3Dl8" id="7WKNeR96eOM" role="1tU5fm">
           <node concept="3uibUv" id="5EDW3XFuMuQ" role="A3Ik2">
-            <ref role="3uigEE" to="fqlx:5EDW3XF5Z95" resolve="AbstractCoderulesManifest" />
+            <ref role="3uigEE" to="pxw9:5EDW3XF5Z95" resolve="AbstractCoderulesManifest" />
           </node>
         </node>
       </node>
@@ -5401,7 +5401,7 @@
             <property role="TrG5h" value="queryTemplates" />
             <node concept="A3Dl8" id="7WKNeR97vRj" role="1tU5fm">
               <node concept="3uibUv" id="6OXbTD$ktkA" role="A3Ik2">
-                <ref role="3uigEE" to="i348:6OXbTD$iNPP" resolve="QueryTemplate" />
+                <ref role="3uigEE" to="ugy2:6OXbTD$iNPP" resolve="QueryTemplate" />
               </node>
             </node>
             <node concept="2OqwBi" id="7LI_gNLXJSr" role="33vP2m">
@@ -5418,7 +5418,7 @@
                             <ref role="3cqZAo" node="6E5fMGvfKQ6" resolve="it" />
                           </node>
                           <node concept="liA8E" id="7LI_gNLXJbt" role="2OqNvi">
-                            <ref role="37wK5l" to="fqlx:5EDW3XF60ae" resolve="queryTables" />
+                            <ref role="37wK5l" to="pxw9:5EDW3XF60ae" resolve="queryTables" />
                           </node>
                         </node>
                       </node>
@@ -5439,7 +5439,7 @@
                           <ref role="3cqZAo" node="6E5fMGvfKQ8" resolve="it" />
                         </node>
                         <node concept="liA8E" id="7LI_gNLXLP8" role="2OqNvi">
-                          <ref role="37wK5l" to="i348:tbauFy9ROe" resolve="queryTemplates" />
+                          <ref role="37wK5l" to="ugy2:tbauFy9ROe" resolve="queryTemplates" />
                         </node>
                       </node>
                     </node>
@@ -5462,7 +5462,7 @@
                     <property role="TrG5h" value="queries" />
                     <node concept="_YKpA" id="9UUIHJAkSt" role="1tU5fm">
                       <node concept="3uibUv" id="9UUIHJAkSw" role="_ZDj9">
-                        <ref role="3uigEE" to="i348:6OXbTD$iNPP" resolve="QueryTemplate" />
+                        <ref role="3uigEE" to="ugy2:6OXbTD$iNPP" resolve="QueryTemplate" />
                         <node concept="3qTvmN" id="9UUIHJBynM" role="11_B2D" />
                       </node>
                     </node>
@@ -5475,7 +5475,7 @@
                           <ref role="2Gs0qQ" node="7WKNeR97wDT" resolve="qt" />
                         </node>
                         <node concept="liA8E" id="9UUIHJAlnl" role="2OqNvi">
-                          <ref role="37wK5l" to="i348:5EDW3XE0DF4" resolve="queryType" />
+                          <ref role="37wK5l" to="ugy2:5EDW3XE0DF4" resolve="queryType" />
                         </node>
                       </node>
                     </node>
@@ -5490,7 +5490,7 @@
                             <node concept="2ShNRf" id="9UUIHJAxUQ" role="37vLTx">
                               <node concept="Tc6Ow" id="9UUIHJA$ft" role="2ShVmc">
                                 <node concept="3uibUv" id="9UUIHJAAcD" role="HW$YZ">
-                                  <ref role="3uigEE" to="i348:6OXbTD$iNPP" resolve="QueryTemplate" />
+                                  <ref role="3uigEE" to="ugy2:6OXbTD$iNPP" resolve="QueryTemplate" />
                                   <node concept="3qTvmN" id="9UUIHJBz38" role="11_B2D" />
                                 </node>
                               </node>
@@ -5509,7 +5509,7 @@
                               <ref role="2Gs0qQ" node="7WKNeR97wDT" resolve="qt" />
                             </node>
                             <node concept="liA8E" id="9UUIHJAsJb" role="2OqNvi">
-                              <ref role="37wK5l" to="i348:5EDW3XE0DF4" resolve="queryType" />
+                              <ref role="37wK5l" to="ugy2:5EDW3XE0DF4" resolve="queryType" />
                             </node>
                           </node>
                         </node>
@@ -5544,7 +5544,7 @@
                     <ref role="2Gs0qQ" node="7WKNeR97wDT" resolve="qt" />
                   </node>
                   <node concept="liA8E" id="5EDW3XEzVHj" role="2OqNvi">
-                    <ref role="37wK5l" to="i348:5EDW3XE0DF4" resolve="queryType" />
+                    <ref role="37wK5l" to="ugy2:5EDW3XE0DF4" resolve="queryType" />
                   </node>
                 </node>
               </node>
@@ -5594,7 +5594,7 @@
         </node>
         <node concept="_YKpA" id="9UUIHJ_YWW" role="3rvSg0">
           <node concept="3uibUv" id="9UUIHJ_YWX" role="_ZDj9">
-            <ref role="3uigEE" to="i348:6OXbTD$iNPP" resolve="QueryTemplate" />
+            <ref role="3uigEE" to="ugy2:6OXbTD$iNPP" resolve="QueryTemplate" />
             <node concept="3qTvmN" id="9UUIHJBwk0" role="11_B2D" />
           </node>
         </node>
@@ -5607,7 +5607,7 @@
           </node>
           <node concept="_YKpA" id="9UUIHJ_Zrr" role="3rHtpV">
             <node concept="3uibUv" id="9UUIHJ_Zrs" role="_ZDj9">
-              <ref role="3uigEE" to="i348:6OXbTD$iNPP" resolve="QueryTemplate" />
+              <ref role="3uigEE" to="ugy2:6OXbTD$iNPP" resolve="QueryTemplate" />
               <node concept="3qTvmN" id="9UUIHJBxV9" role="11_B2D" />
             </node>
           </node>
@@ -5831,7 +5831,7 @@
                               <node concept="3uibUv" id="60zk4o6SxJt" role="10QFUM">
                                 <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
                                 <node concept="3uibUv" id="60zk4o6SxJu" role="11_B2D">
-                                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                                  <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                                 </node>
                               </node>
                             </node>
@@ -5846,7 +5846,7 @@
               <node concept="3eNFk2" id="5WBVN_M1CZI" role="3eNLev">
                 <node concept="2ZW3vV" id="5WBVN_M1Djq" role="3eO9$A">
                   <node concept="3uibUv" id="5WBVN_M1Dpb" role="2ZW6by">
-                    <ref role="3uigEE" to="i348:5WBVN_M1BKE" resolve="LateExpression" />
+                    <ref role="3uigEE" to="ugy2:5WBVN_M1BKE" resolve="LateExpression" />
                   </node>
                   <node concept="37vLTw" id="5WBVN_M1DbI" role="2ZW6bz">
                     <ref role="3cqZAo" node="60zk4o6SxJP" resolve="a" />
@@ -5857,13 +5857,13 @@
                     <node concept="3cpWsn" id="5WBVN_M1J08" role="3cpWs9">
                       <property role="TrG5h" value="exp" />
                       <node concept="3uibUv" id="5WBVN_M1J02" role="1tU5fm">
-                        <ref role="3uigEE" to="i348:5WBVN_M1BKE" resolve="LateExpression" />
+                        <ref role="3uigEE" to="ugy2:5WBVN_M1BKE" resolve="LateExpression" />
                         <node concept="3qTvmN" id="5WBVN_M1J05" role="11_B2D" />
                       </node>
                       <node concept="1eOMI4" id="5WBVN_M1J09" role="33vP2m">
                         <node concept="10QFUN" id="5WBVN_M1J0a" role="1eOMHV">
                           <node concept="3uibUv" id="5WBVN_M1J0b" role="10QFUM">
-                            <ref role="3uigEE" to="i348:5WBVN_M1BKE" resolve="LateExpression" />
+                            <ref role="3uigEE" to="ugy2:5WBVN_M1BKE" resolve="LateExpression" />
                             <node concept="3qTvmN" id="5WBVN_M1J0c" role="11_B2D" />
                           </node>
                           <node concept="37vLTw" id="5WBVN_M1J0d" role="10QFUP">
@@ -5890,7 +5890,7 @@
                               <ref role="3cqZAo" node="5WBVN_M1J08" resolve="exp" />
                             </node>
                             <node concept="liA8E" id="5WBVN_M1GEA" role="2OqNvi">
-                              <ref role="37wK5l" to="i348:5WBVN_M1BSf" resolve="metaArgs" />
+                              <ref role="37wK5l" to="ugy2:5WBVN_M1BSf" resolve="metaArgs" />
                             </node>
                           </node>
                         </node>
@@ -5928,7 +5928,7 @@
                             <ref role="3cqZAo" node="5WBVN_M1J08" resolve="exp" />
                           </node>
                           <node concept="liA8E" id="5WBVN_M1JVL" role="2OqNvi">
-                            <ref role="37wK5l" to="i348:5WBVN_M1BLN" resolve="eval" />
+                            <ref role="37wK5l" to="ugy2:5WBVN_M1BLN" resolve="eval" />
                             <node concept="37vLTw" id="6yUEjXvTvSG" role="37wK5m">
                               <ref role="3cqZAo" node="60zk4o6Suop" resolve="logicalContext" />
                             </node>
@@ -5960,11 +5960,11 @@
                     <node concept="liA8E" id="60zk4o6SxJ$" role="2OqNvi">
                       <ref role="37wK5l" to="33ny:~ArrayList.add(java.lang.Object)" resolve="add" />
                       <node concept="2YIFZM" id="3gNap3fNlJv" role="37wK5m">
-                        <ref role="37wK5l" to="oy3s:4TCblo5NqWF" resolve="instantiateMetaLogicals" />
-                        <ref role="1Pybhc" to="oy3s:677NV565N1x" resolve="LogicalUtil" />
+                        <ref role="37wK5l" to="uwx2:4TCblo5NqWF" resolve="instantiateMetaLogicals" />
+                        <ref role="1Pybhc" to="uwx2:677NV565N1x" resolve="LogicalUtil" />
                         <node concept="10QFUN" id="60zk4o6SxJA" role="37wK5m">
                           <node concept="3uibUv" id="60zk4o6SxJB" role="10QFUM">
-                            <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                            <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                           </node>
                           <node concept="37vLTw" id="60zk4o6SxJC" role="10QFUP">
                             <ref role="3cqZAo" node="60zk4o6SxJP" resolve="a" />
@@ -5981,7 +5981,7 @@
               </node>
               <node concept="2ZW3vV" id="60zk4o6SxJF" role="3clFbw">
                 <node concept="3uibUv" id="60zk4o6SxJG" role="2ZW6by">
-                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                  <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                 </node>
                 <node concept="37vLTw" id="60zk4o6SxJH" role="2ZW6bz">
                   <ref role="3cqZAo" node="60zk4o6SxJP" resolve="a" />
@@ -6286,12 +6286,12 @@
               <node concept="3cpWsn" id="1laj_RSiJwS" role="3cpWs9">
                 <property role="TrG5h" value="rule" />
                 <node concept="3uibUv" id="1laj_RSiJwx" role="1tU5fm">
-                  <ref role="3uigEE" to="i348:7nPD14OaO1O" resolve="RuleEx" />
+                  <ref role="3uigEE" to="ugy2:7nPD14OaO1O" resolve="RuleEx" />
                 </node>
                 <node concept="1eOMI4" id="1laj_RSiJwT" role="33vP2m">
                   <node concept="10QFUN" id="1laj_RSiJwU" role="1eOMHV">
                     <node concept="3uibUv" id="1laj_RSiJwV" role="10QFUM">
-                      <ref role="3uigEE" to="i348:7nPD14OaO1O" resolve="RuleEx" />
+                      <ref role="3uigEE" to="ugy2:7nPD14OaO1O" resolve="RuleEx" />
                     </node>
                     <node concept="2OqwBi" id="1laj_RSiJy7" role="10QFUP">
                       <node concept="37vLTw" id="55xYlrlTM9p" role="2Oq$k0">
@@ -6329,7 +6329,7 @@
                       <node concept="1eOMI4" id="1laj_RTMMUV" role="2Oq$k0">
                         <node concept="10QFUN" id="1laj_RTMMUS" role="1eOMHV">
                           <node concept="3uibUv" id="4ekZiHddLrv" role="10QFUM">
-                            <ref role="3uigEE" to="cxk7:4ekZiHddiXo" resolve="FeedbackOrigin" />
+                            <ref role="3uigEE" to="tpfl:4ekZiHddiXo" resolve="FeedbackOrigin" />
                           </node>
                           <node concept="2OqwBi" id="1laj_RTMMUY" role="10QFUP">
                             <node concept="37vLTw" id="55xYlrlTMwf" role="2Oq$k0">
@@ -6342,7 +6342,7 @@
                         </node>
                       </node>
                       <node concept="liA8E" id="4ekZiHddLRK" role="2OqNvi">
-                        <ref role="37wK5l" to="cxk7:4ekZiHddjeb" resolve="getTarget" />
+                        <ref role="37wK5l" to="tpfl:4ekZiHddjeb" resolve="getTarget" />
                       </node>
                     </node>
                     <node concept="37vLTw" id="1laj_RTMMMd" role="37vLTJ">
@@ -6356,7 +6356,7 @@
                       <node concept="1eOMI4" id="4ekZiHde4OD" role="2Oq$k0">
                         <node concept="10QFUN" id="4ekZiHde4OE" role="1eOMHV">
                           <node concept="3uibUv" id="4ekZiHde4OF" role="10QFUM">
-                            <ref role="3uigEE" to="cxk7:4ekZiHddiXo" resolve="FeedbackOrigin" />
+                            <ref role="3uigEE" to="tpfl:4ekZiHddiXo" resolve="FeedbackOrigin" />
                           </node>
                           <node concept="2OqwBi" id="4ekZiHde4OG" role="10QFUP">
                             <node concept="37vLTw" id="55xYlrlTMFC" role="2Oq$k0">
@@ -6369,7 +6369,7 @@
                         </node>
                       </node>
                       <node concept="liA8E" id="4ekZiHde4OJ" role="2OqNvi">
-                        <ref role="37wK5l" to="cxk7:4ekZiHddjyV" resolve="getTemplate" />
+                        <ref role="37wK5l" to="tpfl:4ekZiHddjyV" resolve="getTemplate" />
                       </node>
                     </node>
                     <node concept="37vLTw" id="4ekZiHde5kW" role="37vLTJ">
@@ -6380,7 +6380,7 @@
               </node>
               <node concept="2ZW3vV" id="1laj_RTMMF0" role="3clFbw">
                 <node concept="3uibUv" id="4ekZiHddLpG" role="2ZW6by">
-                  <ref role="3uigEE" to="cxk7:4ekZiHddiXo" resolve="FeedbackOrigin" />
+                  <ref role="3uigEE" to="tpfl:4ekZiHddiXo" resolve="FeedbackOrigin" />
                 </node>
                 <node concept="2OqwBi" id="1laj_RTMMt7" role="2ZW6bz">
                   <node concept="37vLTw" id="55xYlrlTMkQ" role="2Oq$k0">
@@ -6405,7 +6405,7 @@
                         <ref role="3cqZAo" node="1laj_RSiJwS" resolve="rule" />
                       </node>
                       <node concept="liA8E" id="1laj_RTMJXt" role="2OqNvi">
-                        <ref role="37wK5l" to="i348:7nPD14Ob4em" resolve="targetRef" />
+                        <ref role="37wK5l" to="ugy2:7nPD14Ob4em" resolve="targetRef" />
                       </node>
                     </node>
                   </node>
@@ -6417,7 +6417,7 @@
                         <ref role="3cqZAo" node="1laj_RSiJwS" resolve="rule" />
                       </node>
                       <node concept="liA8E" id="4ekZiHdRxy4" role="2OqNvi">
-                        <ref role="37wK5l" to="i348:7nPD14Ob4lt" resolve="templateRef" />
+                        <ref role="37wK5l" to="ugy2:7nPD14Ob4lt" resolve="templateRef" />
                       </node>
                     </node>
                     <node concept="37vLTw" id="4ekZiHdRx4$" role="37vLTJ">
@@ -6510,7 +6510,7 @@
           </node>
           <node concept="2ZW3vV" id="1laj_RSiJjE" role="3clFbw">
             <node concept="3uibUv" id="1laj_RSiJvv" role="2ZW6by">
-              <ref role="3uigEE" to="i348:7nPD14OaO1O" resolve="RuleEx" />
+              <ref role="3uigEE" to="ugy2:7nPD14OaO1O" resolve="RuleEx" />
             </node>
             <node concept="2OqwBi" id="1laj_RSiJ2d" role="2ZW6bz">
               <node concept="37vLTw" id="55xYlrlTLXT" role="2Oq$k0">
@@ -7070,7 +7070,7 @@
           <node concept="3cpWsn" id="3o9wrC3VMgt" role="3cpWs9">
             <property role="TrG5h" value="rule" />
             <node concept="3uibUv" id="6tnA467920x" role="1tU5fm">
-              <ref role="3uigEE" to="i348:7nPD14OaO1O" resolve="RuleEx" />
+              <ref role="3uigEE" to="ugy2:7nPD14OaO1O" resolve="RuleEx" />
             </node>
             <node concept="10QFUN" id="6tnA46791Of" role="33vP2m">
               <node concept="2OqwBi" id="6tnA46791Oc" role="10QFUP">
@@ -7082,7 +7082,7 @@
                 </node>
               </node>
               <node concept="3uibUv" id="6tnA46791Wb" role="10QFUM">
-                <ref role="3uigEE" to="i348:7nPD14OaO1O" resolve="RuleEx" />
+                <ref role="3uigEE" to="ugy2:7nPD14OaO1O" resolve="RuleEx" />
               </node>
             </node>
           </node>
@@ -7113,7 +7113,7 @@
                       <node concept="1eOMI4" id="1laj_RTZd92" role="2Oq$k0">
                         <node concept="10QFUN" id="1laj_RTZd93" role="1eOMHV">
                           <node concept="3uibUv" id="4ekZiHde3W3" role="10QFUM">
-                            <ref role="3uigEE" to="cxk7:4ekZiHddiXo" resolve="FeedbackOrigin" />
+                            <ref role="3uigEE" to="tpfl:4ekZiHddiXo" resolve="FeedbackOrigin" />
                           </node>
                           <node concept="2OqwBi" id="1laj_RTZd95" role="10QFUP">
                             <node concept="37vLTw" id="55xYlrmndA8" role="2Oq$k0">
@@ -7126,7 +7126,7 @@
                         </node>
                       </node>
                       <node concept="liA8E" id="4ekZiHde4pF" role="2OqNvi">
-                        <ref role="37wK5l" to="cxk7:4ekZiHddjeb" resolve="getTarget" />
+                        <ref role="37wK5l" to="tpfl:4ekZiHddjeb" resolve="getTarget" />
                       </node>
                     </node>
                     <node concept="37vLTw" id="1laj_RTZdnv" role="37vLTJ">
@@ -7140,7 +7140,7 @@
                       <node concept="1eOMI4" id="4ekZiHde8bH" role="2Oq$k0">
                         <node concept="10QFUN" id="4ekZiHde8bI" role="1eOMHV">
                           <node concept="3uibUv" id="4ekZiHde8bJ" role="10QFUM">
-                            <ref role="3uigEE" to="cxk7:4ekZiHddiXo" resolve="FeedbackOrigin" />
+                            <ref role="3uigEE" to="tpfl:4ekZiHddiXo" resolve="FeedbackOrigin" />
                           </node>
                           <node concept="2OqwBi" id="4ekZiHde8bK" role="10QFUP">
                             <node concept="37vLTw" id="55xYlrmndNh" role="2Oq$k0">
@@ -7153,7 +7153,7 @@
                         </node>
                       </node>
                       <node concept="liA8E" id="4ekZiHde8bN" role="2OqNvi">
-                        <ref role="37wK5l" to="cxk7:4ekZiHddjyV" resolve="getTemplate" />
+                        <ref role="37wK5l" to="tpfl:4ekZiHddjyV" resolve="getTemplate" />
                       </node>
                     </node>
                     <node concept="37vLTw" id="4ekZiHde8EH" role="37vLTJ">
@@ -7164,7 +7164,7 @@
               </node>
               <node concept="2ZW3vV" id="1laj_RTZd9a" role="3clFbw">
                 <node concept="3uibUv" id="4ekZiHde3Jw" role="2ZW6by">
-                  <ref role="3uigEE" to="cxk7:4ekZiHddiXo" resolve="FeedbackOrigin" />
+                  <ref role="3uigEE" to="tpfl:4ekZiHddiXo" resolve="FeedbackOrigin" />
                 </node>
                 <node concept="2OqwBi" id="1laj_RTZd9c" role="2ZW6bz">
                   <node concept="37vLTw" id="55xYlrmndoZ" role="2Oq$k0">
@@ -7189,7 +7189,7 @@
                         <ref role="3cqZAo" node="3o9wrC3VMgt" resolve="rule" />
                       </node>
                       <node concept="liA8E" id="3o9wrC3VMii" role="2OqNvi">
-                        <ref role="37wK5l" to="i348:7nPD14Ob4em" resolve="targetRef" />
+                        <ref role="37wK5l" to="ugy2:7nPD14Ob4em" resolve="targetRef" />
                       </node>
                     </node>
                   </node>
@@ -7204,7 +7204,7 @@
                         <ref role="3cqZAo" node="3o9wrC3VMgt" resolve="rule" />
                       </node>
                       <node concept="liA8E" id="4ekZiHdRz8V" role="2OqNvi">
-                        <ref role="37wK5l" to="i348:7nPD14Ob4lt" resolve="templateRef" />
+                        <ref role="37wK5l" to="ugy2:7nPD14Ob4lt" resolve="templateRef" />
                       </node>
                     </node>
                   </node>
@@ -7295,7 +7295,7 @@
           <node concept="22lmx$" id="1laj_RTZc_0" role="3clFbw">
             <node concept="2ZW3vV" id="1laj_RTZc_1" role="3uHU7w">
               <node concept="3uibUv" id="4ekZiHdDRLC" role="2ZW6by">
-                <ref role="3uigEE" to="cxk7:4ekZiHddiXo" resolve="FeedbackOrigin" />
+                <ref role="3uigEE" to="tpfl:4ekZiHddiXo" resolve="FeedbackOrigin" />
               </node>
               <node concept="2OqwBi" id="1laj_RTZc_3" role="2ZW6bz">
                 <node concept="37vLTw" id="55xYlrmndbQ" role="2Oq$k0">
@@ -7308,7 +7308,7 @@
             </node>
             <node concept="2ZW3vV" id="1laj_RTZc_6" role="3uHU7B">
               <node concept="3uibUv" id="1laj_RTZc_7" role="2ZW6by">
-                <ref role="3uigEE" to="i348:7nPD14OaO1O" resolve="RuleEx" />
+                <ref role="3uigEE" to="ugy2:7nPD14OaO1O" resolve="RuleEx" />
               </node>
               <node concept="2OqwBi" id="1laj_RTZc_8" role="2ZW6bz">
                 <node concept="37vLTw" id="55xYlrmncVd" role="2Oq$k0">
@@ -8102,10 +8102,10 @@
       <node concept="37vLTG" id="4Q576RaSm$3" role="3clF46">
         <property role="TrG5h" value="template" />
         <node concept="3uibUv" id="4Q576RaSm$4" role="1tU5fm">
-          <ref role="3uigEE" to="i348:1ffsG7bW_V4" resolve="RuleTemplate" />
+          <ref role="3uigEE" to="ugy2:1ffsG7bW_V4" resolve="RuleTemplate" />
           <node concept="3qUE_q" id="4Q576RaSm$5" role="11_B2D">
             <node concept="3uibUv" id="4Q576RaSm$6" role="3qUE_r">
-              <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplate.Token" />
+              <ref role="3uigEE" to="ugy2:2RRx4MZ6_68" resolve="RuleTemplate.Token" />
             </node>
           </node>
         </node>
@@ -8113,7 +8113,7 @@
       <node concept="37vLTG" id="3YPJJpIcFzZ" role="3clF46">
         <property role="TrG5h" value="applyResult" />
         <node concept="3uibUv" id="3YPJJpIcF$0" role="1tU5fm">
-          <ref role="3uigEE" to="psoy:7Oc59RSEjdb" resolve="Result" />
+          <ref role="3uigEE" to="xydz:7Oc59RSEjdb" resolve="Result" />
         </node>
       </node>
       <node concept="37vLTG" id="4Q576RaSm$7" role="3clF46">
@@ -9310,13 +9310,13 @@
         <node concept="37vLTG" id="39eNUjlVKZu" role="3clF46">
           <property role="TrG5h" value="tpl" />
           <node concept="3uibUv" id="39eNUjlVM36" role="1tU5fm">
-            <ref role="3uigEE" to="i348:1ffsG7bW_V4" resolve="RuleTemplate" />
+            <ref role="3uigEE" to="ugy2:1ffsG7bW_V4" resolve="RuleTemplate" />
           </node>
         </node>
         <node concept="37vLTG" id="3YPJJpIdHED" role="3clF46">
           <property role="TrG5h" value="applyResult" />
           <node concept="3uibUv" id="3YPJJpIdIQs" role="1tU5fm">
-            <ref role="3uigEE" to="psoy:7Oc59RSEjdb" resolve="Result" />
+            <ref role="3uigEE" to="xydz:7Oc59RSEjdb" resolve="Result" />
           </node>
         </node>
         <node concept="37vLTG" id="4Q576RbGusm" role="3clF46">
@@ -9357,7 +9357,7 @@
                   <ref role="3cqZAo" node="39eNUjlVKZu" resolve="tpl" />
                 </node>
                 <node concept="liA8E" id="39eNUjlVMU6" role="2OqNvi">
-                  <ref role="37wK5l" to="i348:6R6MIbU9_nr" resolve="getTemplateRef" />
+                  <ref role="37wK5l" to="ugy2:6R6MIbU9_nr" resolve="getTemplateRef" />
                 </node>
               </node>
               <node concept="37vLTw" id="39eNUjlVKZD" role="37vLTJ">
@@ -9373,11 +9373,11 @@
                     <ref role="3cqZAo" node="39eNUjlVKZu" resolve="tpl" />
                   </node>
                   <node concept="liA8E" id="4Q576RbJqOp" role="2OqNvi">
-                    <ref role="37wK5l" to="i348:4MqhgXUndvp" resolve="table" />
+                    <ref role="37wK5l" to="ugy2:4MqhgXUndvp" resolve="table" />
                   </node>
                 </node>
                 <node concept="liA8E" id="4Q576RbOXjk" role="2OqNvi">
-                  <ref role="37wK5l" to="i348:7P_FdVQoZmr" resolve="fqName" />
+                  <ref role="37wK5l" to="ugy2:7P_FdVQoZmr" resolve="fqName" />
                 </node>
               </node>
               <node concept="37vLTw" id="39eNUjlVKZL" role="37vLTJ">
@@ -9392,7 +9392,7 @@
                   <ref role="3cqZAo" node="39eNUjlVKZu" resolve="tpl" />
                 </node>
                 <node concept="liA8E" id="6YRY30_KnA9" role="2OqNvi">
-                  <ref role="37wK5l" to="i348:4vBwiiUVL7_" resolve="name" />
+                  <ref role="37wK5l" to="ugy2:4vBwiiUVL7_" resolve="name" />
                 </node>
               </node>
               <node concept="37vLTw" id="4tC1JBnnBAf" role="37vLTJ">
@@ -9412,7 +9412,7 @@
                             <ref role="3cqZAo" node="3YPJJpIdHED" resolve="applyResult" />
                           </node>
                           <node concept="liA8E" id="3YPJJpIebg4" role="2OqNvi">
-                            <ref role="37wK5l" to="psoy:5X1yxJI3E6N" resolve="allCauses" />
+                            <ref role="37wK5l" to="xydz:5X1yxJI3E6N" resolve="allCauses" />
                           </node>
                         </node>
                         <node concept="3$u5V9" id="3YPJJpIecvd" role="2OqNvi">
@@ -9454,7 +9454,7 @@
                 <ref role="3cqZAo" node="3YPJJpIdHED" resolve="applyResult" />
               </node>
               <node concept="liA8E" id="3YPJJpIe9uV" role="2OqNvi">
-                <ref role="37wK5l" to="psoy:2gw7OvgCNSM" resolve="hasErrors" />
+                <ref role="37wK5l" to="xydz:2gw7OvgCNSM" resolve="hasErrors" />
               </node>
             </node>
             <node concept="9aQIb" id="3YPJJpIeouD" role="9aQIa">
@@ -9652,10 +9652,10 @@
       <node concept="37vLTG" id="799SgOKyIsE" role="3clF46">
         <property role="TrG5h" value="template" />
         <node concept="3uibUv" id="799SgOKyIsH" role="1tU5fm">
-          <ref role="3uigEE" to="i348:1ffsG7bW_V4" resolve="RuleTemplate" />
+          <ref role="3uigEE" to="ugy2:1ffsG7bW_V4" resolve="RuleTemplate" />
           <node concept="3qUE_q" id="799SgOKyIsI" role="11_B2D">
             <node concept="3uibUv" id="799SgOKyIsJ" role="3qUE_r">
-              <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplate.Token" />
+              <ref role="3uigEE" to="ugy2:2RRx4MZ6_68" resolve="RuleTemplate.Token" />
             </node>
           </node>
         </node>
@@ -9663,7 +9663,7 @@
       <node concept="37vLTG" id="3YPJJpIcuBv" role="3clF46">
         <property role="TrG5h" value="applyResult" />
         <node concept="3uibUv" id="3YPJJpIcuFa" role="1tU5fm">
-          <ref role="3uigEE" to="psoy:7Oc59RSEjdb" resolve="Result" />
+          <ref role="3uigEE" to="xydz:7Oc59RSEjdb" resolve="Result" />
         </node>
       </node>
       <node concept="37vLTG" id="799SgOKyMZj" role="3clF46">
@@ -9826,10 +9826,10 @@
         <node concept="37vLTG" id="4Q576RaXnYp" role="3clF46">
           <property role="TrG5h" value="template" />
           <node concept="3uibUv" id="4Q576RaXnYq" role="1tU5fm">
-            <ref role="3uigEE" to="i348:1ffsG7bW_V4" resolve="RuleTemplate" />
+            <ref role="3uigEE" to="ugy2:1ffsG7bW_V4" resolve="RuleTemplate" />
             <node concept="3qUE_q" id="4Q576RaXnYr" role="11_B2D">
               <node concept="3uibUv" id="4Q576RaXnYs" role="3qUE_r">
-                <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplate.Token" />
+                <ref role="3uigEE" to="ugy2:2RRx4MZ6_68" resolve="RuleTemplate.Token" />
               </node>
             </node>
           </node>
@@ -9837,7 +9837,7 @@
         <node concept="37vLTG" id="3YPJJpIcDTF" role="3clF46">
           <property role="TrG5h" value="applyResult" />
           <node concept="3uibUv" id="3YPJJpIcDTG" role="1tU5fm">
-            <ref role="3uigEE" to="psoy:7Oc59RSEjdb" resolve="Result" />
+            <ref role="3uigEE" to="xydz:7Oc59RSEjdb" resolve="Result" />
           </node>
         </node>
         <node concept="37vLTG" id="4Q576RaXnYt" role="3clF46">
diff --git a/coderules/solutions/jetbrains.mps.coderules.runtime/models/jetbrains.mps.coderules.runtime.memoizer.mps b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.memoizer.mps
similarity index 99%
rename from coderules/solutions/jetbrains.mps.coderules.runtime/models/jetbrains.mps.coderules.runtime.memoizer.mps
rename to coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.memoizer.mps
index 3c9168d6..e366b3d4 100644
--- a/coderules/solutions/jetbrains.mps.coderules.runtime/models/jetbrains.mps.coderules.runtime.memoizer.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.memoizer.mps
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:464fcc95-fddb-47d1-b620-592cbf6b8bf2(jetbrains.mps.coderules.runtime.memoizer)">
+<model ref="r:969c74a0-af0a-4247-9dda-0da7708b8c0d(jetbrains.mps.lang.coderules.memoizer)">
   <persistence version="9" />
   <languages>
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
diff --git a/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.predicate.mps b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.predicate.mps
similarity index 99%
rename from coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.predicate.mps
rename to coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.predicate.mps
index 763726ae..68b4bb38 100644
--- a/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.predicate.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.predicate.mps
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:daa544a7-0a5c-49c0-a54c-4c2a5b4868aa(jetbrains.mps.logic.predicate)">
+<model ref="r:97d6f79f-4a27-4a9b-9122-9bccfb5317c9(jetbrains.mps.lang.coderules.predicate)">
   <persistence version="9" />
   <languages>
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
@@ -16,14 +16,13 @@
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
     <import index="w7la" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.evaluation(jetbrains.mps.logic.reactor/)" />
     <import index="bj13" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.logical(jetbrains.mps.logic.reactor/)" />
-    <import index="oy3s" ref="r:a6030cee-34eb-4503-b1bf-015fe5cd8c1a(jetbrains.mps.logic.unification)" />
     <import index="yt73" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.unification(jetbrains.mps.logic.reactor/)" />
-    <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.dataform)" />
     <import index="w1kc" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel(MPS.Core/)" />
     <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
     <import index="i8bi" ref="r:c3548bac-30eb-4a2a-937c-0111d5697309(jetbrains.mps.lang.smodel.generator.smodelAdapter)" />
-    <import index="5zyv" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.concurrent(JDK/)" />
     <import index="2gg1" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.errors(MPS.Core/)" />
+    <import index="cof4" ref="r:0a9d1d47-250c-4f98-8962-b65edf8b0721(jetbrains.mps.logic.dataform)" />
+    <import index="uwx2" ref="r:76101703-3fc5-4e76-aa48-9728dde91f7b(jetbrains.mps.logic.unification)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -1870,7 +1869,7 @@
                           <node concept="3eNFk2" id="3gNap3fZk_$" role="3eNLev">
                             <node concept="2ZW3vV" id="3gNap3fZk$r" role="3eO9$A">
                               <node concept="3uibUv" id="3gNap3fZk$D" role="2ZW6by">
-                                <ref role="3uigEE" to="6exd:2xQ7eRAD2dj" resolve="Value" />
+                                <ref role="3uigEE" to="cof4:2xQ7eRAD2dj" resolve="Value" />
                               </node>
                               <node concept="2OqwBi" id="3gNap3fZkgd" role="2ZW6bz">
                                 <node concept="37vLTw" id="3gNap3fZkbt" role="2Oq$k0">
@@ -1911,7 +1910,7 @@
                                     <node concept="1eOMI4" id="3gNap3fZlum" role="2Oq$k0">
                                       <node concept="10QFUN" id="3gNap3fZlun" role="1eOMHV">
                                         <node concept="3uibUv" id="3gNap3fZluo" role="10QFUM">
-                                          <ref role="3uigEE" to="6exd:2xQ7eRAD2dj" resolve="Value" />
+                                          <ref role="3uigEE" to="cof4:2xQ7eRAD2dj" resolve="Value" />
                                         </node>
                                         <node concept="2OqwBi" id="3gNap3fZlup" role="10QFUP">
                                           <node concept="37vLTw" id="3gNap3fZluq" role="2Oq$k0">
@@ -1924,7 +1923,7 @@
                                       </node>
                                     </node>
                                     <node concept="liA8E" id="3gNap3fZlus" role="2OqNvi">
-                                      <ref role="37wK5l" to="6exd:1msb0mq8QTt" resolve="symbol" />
+                                      <ref role="37wK5l" to="cof4:1msb0mq8QTt" resolve="symbol" />
                                     </node>
                                   </node>
                                 </node>
@@ -2844,13 +2843,13 @@
                           <node concept="2ShNRf" id="4WeLqVwTqn2" role="2Oq$k0">
                             <node concept="1pGfFk" id="4WeLqVwT$f1" role="2ShVmc">
                               <property role="373rjd" value="true" />
-                              <ref role="37wK5l" to="6exd:4WeLqVxOSvl" resolve="DataFormWalk" />
+                              <ref role="37wK5l" to="cof4:4WeLqVxOSvl" resolve="DataFormWalk" />
                               <node concept="2ShNRf" id="4WeLqVwX5c$" role="37wK5m">
                                 <node concept="YeOm9" id="4WeLqVwXrvH" role="2ShVmc">
                                   <node concept="1Y3b0j" id="4WeLqVwXrvK" role="YeSDq">
                                     <property role="2bfB8j" value="true" />
                                     <property role="373rjd" value="true" />
-                                    <ref role="1Y3XeK" to="6exd:2ev$9JFHDMZ" resolve="DataFormWalk.IdleWalker" />
+                                    <ref role="1Y3XeK" to="cof4:2ev$9JFHDMZ" resolve="DataFormWalk.IdleWalker" />
                                     <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
                                     <node concept="3Tm1VV" id="4WeLqVwXrvL" role="1B3o_S" />
                                     <node concept="3clFb_" id="4WeLqVwYscQ" role="jymVt">
@@ -2858,11 +2857,11 @@
                                       <node concept="37vLTG" id="4WeLqVwYscR" role="3clF46">
                                         <property role="TrG5h" value="variable" />
                                         <node concept="3uibUv" id="4WeLqVwYscS" role="1tU5fm">
-                                          <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+                                          <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
                                         </node>
                                       </node>
                                       <node concept="3uibUv" id="4WeLqVwYsd3" role="3clF45">
-                                        <ref role="3uigEE" to="6exd:2q_78a95hAL" resolve="Action" />
+                                        <ref role="3uigEE" to="cof4:2q_78a95hAL" resolve="Action" />
                                       </node>
                                       <node concept="3Tm1VV" id="4WeLqVwYscU" role="1B3o_S" />
                                       <node concept="3clFbS" id="4WeLqVwYsd4" role="3clF47">
@@ -2910,15 +2909,15 @@
                                                 <ref role="3cqZAo" node="4WeLqVwYscR" resolve="variable" />
                                               </node>
                                               <node concept="liA8E" id="4WeLqVxeDAu" role="2OqNvi">
-                                                <ref role="37wK5l" to="6exd:4p5SefkhK7Y" resolve="isBound" />
+                                                <ref role="37wK5l" to="cof4:4p5SefkhK7Y" resolve="isBound" />
                                               </node>
                                             </node>
                                           </node>
                                         </node>
                                         <node concept="3clFbF" id="4WeLqVx2Zq5" role="3cqZAp">
                                           <node concept="Rm8GO" id="4WeLqVxdVcm" role="3clFbG">
-                                            <ref role="Rm8GQ" to="6exd:2q_78a95hAM" resolve="WALK" />
-                                            <ref role="1Px2BO" to="6exd:2q_78a95hAL" resolve="Action" />
+                                            <ref role="Rm8GQ" to="cof4:2q_78a95hAM" resolve="WALK" />
+                                            <ref role="1Px2BO" to="cof4:2q_78a95hAL" resolve="Action" />
                                           </node>
                                         </node>
                                       </node>
@@ -2935,13 +2934,13 @@
                             </node>
                           </node>
                           <node concept="liA8E" id="4WeLqVxhiWc" role="2OqNvi">
-                            <ref role="37wK5l" to="6exd:1hOy_Afq63K" resolve="walk" />
+                            <ref role="37wK5l" to="cof4:1hOy_Afq63K" resolve="walk" />
                             <node concept="10QFUN" id="4WeLqVxhA59" role="37wK5m">
                               <node concept="37vLTw" id="4WeLqVxhA58" role="10QFUP">
                                 <ref role="3cqZAo" node="1POzLwyWxZd" resolve="val" />
                               </node>
                               <node concept="3uibUv" id="4WeLqVxhA55" role="10QFUM">
-                                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                               </node>
                             </node>
                           </node>
@@ -2973,7 +2972,7 @@
                 </node>
                 <node concept="2ZW3vV" id="4WeLqVwSa0u" role="3clFbw">
                   <node concept="3uibUv" id="4WeLqVwSa0v" role="2ZW6by">
-                    <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                    <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                   </node>
                   <node concept="37vLTw" id="4WeLqVwSa0w" role="2ZW6bz">
                     <ref role="3cqZAo" node="1POzLwyWxZd" resolve="val" />
@@ -3049,7 +3048,7 @@
                             <ref role="37wK5l" to="yt73:~Unification.unify(jetbrains.mps.unification.Term,jetbrains.mps.unification.Term)" resolve="unify" />
                             <node concept="2ShNRf" id="1POzLwyWxY_" role="37wK5m">
                               <node concept="1pGfFk" id="1POzLwyWxYA" role="2ShVmc">
-                                <ref role="37wK5l" to="oy3s:4TCblo5ML4I" resolve="LogicalDataForm" />
+                                <ref role="37wK5l" to="uwx2:4TCblo5ML4I" resolve="LogicalDataForm" />
                                 <node concept="37vLTw" id="1POzLwyWxYB" role="37wK5m">
                                   <ref role="3cqZAo" node="1POzLwyWxYm" resolve="termLeftRepr" />
                                 </node>
@@ -3445,7 +3444,7 @@
                           <node concept="3eNFk2" id="3gNap3g8ZRz" role="3eNLev">
                             <node concept="2ZW3vV" id="3gNap3g91$1" role="3eO9$A">
                               <node concept="3uibUv" id="3gNap3g91$i" role="2ZW6by">
-                                <ref role="3uigEE" to="6exd:2xQ7eRAD2dj" resolve="Value" />
+                                <ref role="3uigEE" to="cof4:2xQ7eRAD2dj" resolve="Value" />
                               </node>
                               <node concept="2OqwBi" id="3gNap3g91ii" role="2ZW6bz">
                                 <node concept="37vLTw" id="3gNap3g8ZT7" role="2Oq$k0">
@@ -3464,7 +3463,7 @@
                                       <node concept="1eOMI4" id="3gNap3g94bV" role="2Oq$k0">
                                         <node concept="10QFUN" id="3gNap3g94bS" role="1eOMHV">
                                           <node concept="3uibUv" id="3gNap3g94bX" role="10QFUM">
-                                            <ref role="3uigEE" to="6exd:2xQ7eRAD2dj" resolve="Value" />
+                                            <ref role="3uigEE" to="cof4:2xQ7eRAD2dj" resolve="Value" />
                                           </node>
                                           <node concept="2OqwBi" id="3gNap3g94bY" role="10QFUP">
                                             <node concept="37vLTw" id="3gNap3g94bZ" role="2Oq$k0">
@@ -3477,7 +3476,7 @@
                                         </node>
                                       </node>
                                       <node concept="liA8E" id="3gNap3g94p1" role="2OqNvi">
-                                        <ref role="37wK5l" to="6exd:1msb0mq8QTt" resolve="symbol" />
+                                        <ref role="37wK5l" to="cof4:1msb0mq8QTt" resolve="symbol" />
                                       </node>
                                     </node>
                                     <node concept="2OqwBi" id="3gNap3g93Zu" role="3uHU7B">
@@ -3809,7 +3808,7 @@
                           <ref role="37wK5l" to="yt73:~Unification.unify(jetbrains.mps.unification.Term,jetbrains.mps.unification.Term)" resolve="unify" />
                           <node concept="2ShNRf" id="5TfjU0xCksa" role="37wK5m">
                             <node concept="1pGfFk" id="5TfjU0xCksb" role="2ShVmc">
-                              <ref role="37wK5l" to="oy3s:4TCblo5ML4I" resolve="LogicalDataForm" />
+                              <ref role="37wK5l" to="uwx2:4TCblo5ML4I" resolve="LogicalDataForm" />
                               <node concept="37vLTw" id="5TfjU0xCksc" role="37wK5m">
                                 <ref role="3cqZAo" node="5TfjU0xCkrV" resolve="termLeftRepr" />
                               </node>
@@ -4048,7 +4047,7 @@
                               <node concept="3eNFk2" id="5TfjU0xHMHL" role="3eNLev">
                                 <node concept="2ZW3vV" id="5TfjU0xHMHM" role="3eO9$A">
                                   <node concept="3uibUv" id="5TfjU0xHMHN" role="2ZW6by">
-                                    <ref role="3uigEE" to="6exd:2xQ7eRAD2dj" resolve="Value" />
+                                    <ref role="3uigEE" to="cof4:2xQ7eRAD2dj" resolve="Value" />
                                   </node>
                                   <node concept="2OqwBi" id="5TfjU0xHMHO" role="2ZW6bz">
                                     <node concept="37vLTw" id="5TfjU0xHMHP" role="2Oq$k0">
@@ -4067,7 +4066,7 @@
                                           <node concept="1eOMI4" id="5TfjU0xHMHW" role="2Oq$k0">
                                             <node concept="10QFUN" id="5TfjU0xHMHX" role="1eOMHV">
                                               <node concept="3uibUv" id="5TfjU0xHMHY" role="10QFUM">
-                                                <ref role="3uigEE" to="6exd:2xQ7eRAD2dj" resolve="Value" />
+                                                <ref role="3uigEE" to="cof4:2xQ7eRAD2dj" resolve="Value" />
                                               </node>
                                               <node concept="2OqwBi" id="5TfjU0xHMHZ" role="10QFUP">
                                                 <node concept="37vLTw" id="5TfjU0xHMI0" role="2Oq$k0">
@@ -4080,7 +4079,7 @@
                                             </node>
                                           </node>
                                           <node concept="liA8E" id="5TfjU0xHMI2" role="2OqNvi">
-                                            <ref role="37wK5l" to="6exd:1msb0mq8QTt" resolve="symbol" />
+                                            <ref role="37wK5l" to="cof4:1msb0mq8QTt" resolve="symbol" />
                                           </node>
                                         </node>
                                         <node concept="2OqwBi" id="5TfjU0xHMI3" role="3uHU7B">
@@ -4709,7 +4708,7 @@
                           <ref role="3cqZAo" node="3FIATxbQg$O" resolve="var" />
                         </node>
                         <node concept="3uibUv" id="3gNap3fMVwq" role="10QFUM">
-                          <ref role="3uigEE" to="oy3s:4TCblo5MJ1m" resolve="LogicalDataForm" />
+                          <ref role="3uigEE" to="uwx2:4TCblo5MJ1m" resolve="LogicalDataForm" />
                           <node concept="16syzq" id="3gNap3fMVwA" role="11_B2D">
                             <ref role="16sUi3" node="3FIATxbQg$T" resolve="TERM" />
                           </node>
@@ -4717,7 +4716,7 @@
                       </node>
                     </node>
                     <node concept="liA8E" id="3gNap3fzGMh" role="2OqNvi">
-                      <ref role="37wK5l" to="oy3s:4TCblo5MS1o" resolve="logical" />
+                      <ref role="37wK5l" to="uwx2:4TCblo5MS1o" resolve="logical" />
                     </node>
                   </node>
                   <node concept="3uibUv" id="3gNap3fzGMi" role="10QFUM">
@@ -4732,7 +4731,7 @@
             </node>
             <node concept="2ZW3vV" id="3gNap3fzGL3" role="3clFbw">
               <node concept="3uibUv" id="3gNap3fMVwe" role="2ZW6by">
-                <ref role="3uigEE" to="oy3s:4TCblo5MJ1m" resolve="LogicalDataForm" />
+                <ref role="3uigEE" to="uwx2:4TCblo5MJ1m" resolve="LogicalDataForm" />
               </node>
               <node concept="37vLTw" id="3gNap3fzF_q" role="2ZW6bz">
                 <ref role="3cqZAo" node="3FIATxbQg$O" resolve="var" />
@@ -4784,7 +4783,7 @@
                           <ref role="3cqZAo" node="3gNap3fZimz" resolve="var" />
                         </node>
                         <node concept="3uibUv" id="3gNap3fZimN" role="10QFUM">
-                          <ref role="3uigEE" to="oy3s:3gNap3fN2hw" resolve="LogicalValue" />
+                          <ref role="3uigEE" to="uwx2:3gNap3fN2hw" resolve="LogicalValue" />
                           <node concept="16syzq" id="3gNap3fZimO" role="11_B2D">
                             <ref role="16sUi3" node="3gNap3fZimC" resolve="T" />
                           </node>
@@ -4792,7 +4791,7 @@
                       </node>
                     </node>
                     <node concept="liA8E" id="3gNap3fZimP" role="2OqNvi">
-                      <ref role="37wK5l" to="oy3s:3gNap3fN7SD" resolve="logical" />
+                      <ref role="37wK5l" to="uwx2:3gNap3fN7SD" resolve="logical" />
                     </node>
                   </node>
                   <node concept="3uibUv" id="3gNap3fZimQ" role="10QFUM">
@@ -4807,7 +4806,7 @@
             </node>
             <node concept="2ZW3vV" id="3gNap3fZimT" role="3clFbw">
               <node concept="3uibUv" id="3gNap3fZiRQ" role="2ZW6by">
-                <ref role="3uigEE" to="oy3s:3gNap3fN2hw" resolve="LogicalValue" />
+                <ref role="3uigEE" to="uwx2:3gNap3fN2hw" resolve="LogicalValue" />
               </node>
               <node concept="37vLTw" id="3gNap3fZimV" role="2ZW6bz">
                 <ref role="3cqZAo" node="3gNap3fZimz" resolve="var" />
@@ -4843,7 +4842,7 @@
           <node concept="3clFbF" id="3FIATxbQg_d" role="3cqZAp">
             <node concept="2ZW3vV" id="3FIATxbQg_e" role="3clFbG">
               <node concept="3uibUv" id="3gNap3fMVIc" role="2ZW6by">
-                <ref role="3uigEE" to="oy3s:4TCblo5MJ1m" resolve="LogicalDataForm" />
+                <ref role="3uigEE" to="uwx2:4TCblo5MJ1m" resolve="LogicalDataForm" />
               </node>
               <node concept="37vLTw" id="3FIATxbQg_g" role="2ZW6bz">
                 <ref role="3cqZAo" node="3FIATxbQg_8" resolve="term" />
@@ -4868,7 +4867,7 @@
           <node concept="3clFbF" id="3gNap3fZhXq" role="3cqZAp">
             <node concept="2ZW3vV" id="3gNap3fZhXr" role="3clFbG">
               <node concept="3uibUv" id="3gNap3fZidi" role="2ZW6by">
-                <ref role="3uigEE" to="oy3s:3gNap3fN2hw" resolve="LogicalValue" />
+                <ref role="3uigEE" to="uwx2:3gNap3fN2hw" resolve="LogicalValue" />
               </node>
               <node concept="37vLTw" id="3gNap3fZhXt" role="2ZW6bz">
                 <ref role="3cqZAo" node="3gNap3fZhXl" resolve="term" />
@@ -7822,7 +7821,7 @@
           <node concept="3clFbF" id="6SwZmzBBJSR" role="3cqZAp">
             <node concept="2ZW3vV" id="6SwZmzBBJSS" role="3clFbG">
               <node concept="3uibUv" id="6SwZmzBBJST" role="2ZW6by">
-                <ref role="3uigEE" to="oy3s:4TCblo5MJ1m" resolve="LogicalDataForm" />
+                <ref role="3uigEE" to="uwx2:4TCblo5MJ1m" resolve="LogicalDataForm" />
               </node>
               <node concept="37vLTw" id="6SwZmzBBJSU" role="2ZW6bz">
                 <ref role="3cqZAo" node="6SwZmzBBJSM" resolve="term" />
@@ -7847,7 +7846,7 @@
           <node concept="3clFbF" id="6SwZmzBBJT2" role="3cqZAp">
             <node concept="2ZW3vV" id="6SwZmzBBJT3" role="3clFbG">
               <node concept="3uibUv" id="6SwZmzBBJT4" role="2ZW6by">
-                <ref role="3uigEE" to="oy3s:3gNap3fN2hw" resolve="LogicalValue" />
+                <ref role="3uigEE" to="uwx2:3gNap3fN2hw" resolve="LogicalValue" />
               </node>
               <node concept="37vLTw" id="6SwZmzBBJT5" role="2ZW6bz">
                 <ref role="3cqZAo" node="6SwZmzBBJSX" resolve="term" />
@@ -10552,7 +10551,7 @@
             <node concept="3eNFk2" id="7lmP5gAgrgh" role="3eNLev">
               <node concept="2ZW3vV" id="7lmP5gAgrGm" role="3eO9$A">
                 <node concept="3uibUv" id="7lmP5gAgrSw" role="2ZW6by">
-                  <ref role="3uigEE" to="6exd:1msb0mq9ID4" resolve="DataNode" />
+                  <ref role="3uigEE" to="cof4:1msb0mq9ID4" resolve="DataNode" />
                 </node>
                 <node concept="37vLTw" id="7lmP5gAgrsA" role="2ZW6bz">
                   <ref role="3cqZAo" node="7lmP5gAgp_n" resolve="arg" />
@@ -10568,7 +10567,7 @@
                           <ref role="3cqZAo" node="7lmP5gAgp_n" resolve="arg" />
                         </node>
                         <node concept="3uibUv" id="7lmP5gAgzke" role="10QFUM">
-                          <ref role="3uigEE" to="6exd:1msb0mq9ID4" resolve="DataNode" />
+                          <ref role="3uigEE" to="cof4:1msb0mq9ID4" resolve="DataNode" />
                         </node>
                       </node>
                     </node>
@@ -10677,7 +10676,7 @@
         <node concept="37vLTG" id="7lmP5gAgn8y" role="3clF46">
           <property role="TrG5h" value="dataForm" />
           <node concept="3uibUv" id="7lmP5gAip9z" role="1tU5fm">
-            <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+            <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
           </node>
         </node>
         <node concept="10P_77" id="7lmP5gAgn8_" role="3clF45" />
@@ -10745,7 +10744,7 @@
                               <ref role="3cqZAo" node="7lmP5gAgBdB" resolve="value" />
                             </node>
                             <node concept="3uibUv" id="7lmP5gAiiu5" role="10QFUM">
-                              <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                              <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                             </node>
                           </node>
                         </node>
@@ -10754,7 +10753,7 @@
                   </node>
                   <node concept="2ZW3vV" id="7lmP5gAgBRi" role="3clFbw">
                     <node concept="3uibUv" id="7lmP5gAihFJ" role="2ZW6by">
-                      <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                      <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                     </node>
                     <node concept="37vLTw" id="7lmP5gAgBdH" role="2ZW6bz">
                       <ref role="3cqZAo" node="7lmP5gAgBdB" resolve="value" />
@@ -10787,7 +10786,7 @@
           <node concept="37vLTG" id="7lmP5gAgoAZ" role="3clF46">
             <property role="TrG5h" value="dataForm" />
             <node concept="3uibUv" id="7lmP5gAij10" role="1tU5fm">
-              <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+              <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
             </node>
           </node>
           <node concept="10P_77" id="7lmP5gAgoB1" role="3clF45" />
@@ -10796,8 +10795,8 @@
             <node concept="3clFbF" id="7lmP5gAifKD" role="3cqZAp">
               <node concept="2OqwBi" id="7lmP5gAil7b" role="3clFbG">
                 <node concept="2YIFZM" id="7lmP5gAigr7" role="2Oq$k0">
-                  <ref role="37wK5l" to="6exd:7lmP5gAhuVX" resolve="freeVariables" />
-                  <ref role="1Pybhc" to="6exd:7lmP5gAhjKr" resolve="FreeVariablesFinder" />
+                  <ref role="37wK5l" to="cof4:7lmP5gAhuVX" resolve="freeVariables" />
+                  <ref role="1Pybhc" to="cof4:7lmP5gAhjKr" resolve="FreeVariablesFinder" />
                   <node concept="37vLTw" id="7lmP5gAih7E" role="37wK5m">
                     <ref role="3cqZAo" node="7lmP5gAgoAZ" resolve="dataForm" />
                   </node>
@@ -10883,7 +10882,7 @@
                                 <ref role="3cqZAo" node="7lmP5gAgFzV" resolve="value" />
                               </node>
                               <node concept="3uibUv" id="7lmP5gAizLw" role="10QFUM">
-                                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                               </node>
                             </node>
                           </node>
@@ -10892,7 +10891,7 @@
                     </node>
                     <node concept="2ZW3vV" id="7lmP5gAgF$a" role="3clFbw">
                       <node concept="3uibUv" id="7lmP5gAiz2R" role="2ZW6by">
-                        <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                        <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                       </node>
                       <node concept="37vLTw" id="7lmP5gAgF$c" role="2ZW6bz">
                         <ref role="3cqZAo" node="7lmP5gAgFzV" resolve="value" />
@@ -10923,7 +10922,7 @@
           <node concept="37vLTG" id="7lmP5gAgF$m" role="3clF46">
             <property role="TrG5h" value="dataForm" />
             <node concept="3uibUv" id="7lmP5gAi$QN" role="1tU5fm">
-              <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+              <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
             </node>
           </node>
           <node concept="10P_77" id="7lmP5gAgF$o" role="3clF45" />
@@ -10932,8 +10931,8 @@
             <node concept="3clFbF" id="7lmP5gAiAJQ" role="3cqZAp">
               <node concept="2OqwBi" id="7lmP5gAiAJR" role="3clFbG">
                 <node concept="2YIFZM" id="7lmP5gAiAJS" role="2Oq$k0">
-                  <ref role="37wK5l" to="6exd:7lmP5gAhuVX" resolve="freeVariables" />
-                  <ref role="1Pybhc" to="6exd:7lmP5gAhjKr" resolve="FreeVariablesFinder" />
+                  <ref role="37wK5l" to="cof4:7lmP5gAhuVX" resolve="freeVariables" />
+                  <ref role="1Pybhc" to="cof4:7lmP5gAhjKr" resolve="FreeVariablesFinder" />
                   <node concept="37vLTw" id="7lmP5gAiAJT" role="37wK5m">
                     <ref role="3cqZAo" node="7lmP5gAgF$m" resolve="dataForm" />
                   </node>
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps
index b878756b..32a733c0 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps
@@ -18,9 +18,7 @@
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
     <import index="av0y" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.program(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.predicate)" />
     <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
-    <import index="i348" ref="r:42a15dec-83a9-4fe1-80d6-3bf898c512bd(jetbrains.mps.lang.coderules.template)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
     <import index="hano" ref="r:2b43b673-12f9-49ea-8e43-d0c7a401586a(jetbrains.mps.lang.coderules.eval)" />
     <import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" />
@@ -28,10 +26,12 @@
     <import index="cmfw" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.event(MPS.OpenAPI/)" />
     <import index="mhfm" ref="3f233e7f-b8a6-46d2-a57f-795d56775243/java:org.jetbrains.annotations(Annotations/)" />
     <import index="82uw" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.function(JDK/)" />
-    <import index="psoy" ref="r:78313117-90ee-47a5-a91e-b5213df7f611(jetbrains.mps.coderules.runtime.result)" />
     <import index="w1kc" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel(MPS.Core/)" />
-    <import index="fqlx" ref="r:2cc226a9-8a78-4010-b962-823343fd28ff(jetbrains.mps.lang.coderules.aspect)" />
     <import index="bid0" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.util(jetbrains.mps.logic.reactor/)" />
+    <import index="xydz" ref="r:b198cb67-efdc-40c0-8817-11ab64523a5b(jetbrains.mps.lang.coderules.result)" />
+    <import index="pxw9" ref="r:e3417884-ba0a-4330-9cea-64f01ace2e9d(jetbrains.mps.lang.coderules.aspect)" />
+    <import index="ugy2" ref="r:57b2449f-b7c7-4941-bd75-9c594835f5cd(jetbrains.mps.lang.coderules.template)" />
+    <import index="tpfl" ref="r:97d6f79f-4a27-4a9b-9122-9bccfb5317c9(jetbrains.mps.lang.coderules.predicate)" />
   </imports>
   <registry>
     <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples">
@@ -719,17 +719,17 @@
         <property role="TrG5h" value="manifests" />
         <node concept="A3Dl8" id="5EDW3XFuukc" role="1tU5fm">
           <node concept="3uibUv" id="5EDW3XFuukd" role="A3Ik2">
-            <ref role="3uigEE" to="fqlx:5EDW3XF5Z95" resolve="AbstractCoderulesManifest" />
+            <ref role="3uigEE" to="pxw9:5EDW3XF5Z95" resolve="AbstractCoderulesManifest" />
           </node>
         </node>
       </node>
       <node concept="37vLTG" id="1Pi9pJ$cIw8" role="3clF46">
         <property role="TrG5h" value="aspectClique" />
         <node concept="3uibUv" id="1Pi9pJ$cIw9" role="1tU5fm">
-          <ref role="3uigEE" to="fqlx:3KN3A4uUhmW" resolve="AspectClique" />
+          <ref role="3uigEE" to="pxw9:3KN3A4uUhmW" resolve="AspectClique" />
           <node concept="3qUE_q" id="1Pi9pJ$cIwa" role="11_B2D">
             <node concept="3uibUv" id="1Pi9pJ$cIwb" role="3qUE_r">
-              <ref role="3uigEE" to="fqlx:NKt6yomNZE" resolve="CoderulesAspect" />
+              <ref role="3uigEE" to="pxw9:NKt6yomNZE" resolve="CoderulesAspect" />
             </node>
           </node>
         </node>
@@ -742,7 +742,7 @@
             <property role="TrG5h" value="ruleTables" />
             <node concept="A3Dl8" id="zL5ZaNMxza" role="1tU5fm">
               <node concept="3uibUv" id="zL5ZaNMxzd" role="A3Ik2">
-                <ref role="3uigEE" to="i348:4MqhgXU9fm3" resolve="RuleTable" />
+                <ref role="3uigEE" to="ugy2:4MqhgXU9fm3" resolve="RuleTable" />
               </node>
             </node>
             <node concept="2OqwBi" id="zL5ZaNMxMG" role="33vP2m">
@@ -759,7 +759,7 @@
                             <ref role="3cqZAo" node="6E5fMGvfKQe" resolve="it" />
                           </node>
                           <node concept="liA8E" id="zL5ZaNMxMP" role="2OqNvi">
-                            <ref role="37wK5l" to="fqlx:4MqhgXUaiLz" resolve="ruleTables" />
+                            <ref role="37wK5l" to="pxw9:4MqhgXUaiLz" resolve="ruleTables" />
                           </node>
                         </node>
                         <node concept="ANE8D" id="zL5ZaNMxMQ" role="2OqNvi" />
@@ -828,7 +828,7 @@
                         <ref role="3cqZAo" node="1Pi9pJ$dFhI" resolve="ruleTable" />
                       </node>
                       <node concept="liA8E" id="1Pi9pJ$cdk8" role="2OqNvi">
-                        <ref role="37wK5l" to="i348:4MqhgXUaiON" resolve="ruleTemplates" />
+                        <ref role="37wK5l" to="ugy2:4MqhgXUaiON" resolve="ruleTemplates" />
                       </node>
                     </node>
                   </node>
@@ -858,7 +858,7 @@
           <node concept="3cpWsn" id="1Pi9pJ$dFhI" role="1Duv9x">
             <property role="TrG5h" value="ruleTable" />
             <node concept="3uibUv" id="1Pi9pJ$dFhM" role="1tU5fm">
-              <ref role="3uigEE" to="i348:4MqhgXU9fm3" resolve="RuleTable" />
+              <ref role="3uigEE" to="ugy2:4MqhgXU9fm3" resolve="RuleTable" />
             </node>
           </node>
           <node concept="2YIFZM" id="IfzMHGfQZT" role="1DdaDG">
@@ -881,7 +881,7 @@
       <node concept="37vLTG" id="7DvO2M9Uagr" role="3clF46">
         <property role="TrG5h" value="ruleTemplate" />
         <node concept="3uibUv" id="7DvO2M9Uags" role="1tU5fm">
-          <ref role="3uigEE" to="i348:1ffsG7bW_V4" resolve="RuleTemplate" />
+          <ref role="3uigEE" to="ugy2:1ffsG7bW_V4" resolve="RuleTemplate" />
         </node>
       </node>
       <node concept="37vLTG" id="3OUB6BCcGW4" role="3clF46">
@@ -900,7 +900,7 @@
           <node concept="1LlUBW" id="47oVduOFbBr" role="1ajl9A">
             <node concept="3vKaQO" id="47oVduOF92p" role="1Lm7xW">
               <node concept="3uibUv" id="47oVduOF92r" role="3O5elw">
-                <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
+                <ref role="3uigEE" to="ugy2:7eGEHDlc$ap" resolve="RuleBuilder" />
               </node>
             </node>
             <node concept="3vKaQO" id="47oVduOFeYx" role="1Lm7xW">
@@ -920,7 +920,7 @@
                   <ref role="3cqZAo" node="7DvO2M9Uagr" resolve="ruleTemplate" />
                 </node>
                 <node concept="liA8E" id="7DvO2M9UagI" role="2OqNvi">
-                  <ref role="37wK5l" to="i348:4MqhgXUndvp" resolve="table" />
+                  <ref role="37wK5l" to="ugy2:4MqhgXUndvp" resolve="table" />
                 </node>
               </node>
             </node>
@@ -1014,7 +1014,7 @@
       <node concept="37vLTG" id="6OXbTDy0I1M" role="3clF46">
         <property role="TrG5h" value="queryTemplate" />
         <node concept="3uibUv" id="6OXbTD$xzi7" role="1tU5fm">
-          <ref role="3uigEE" to="i348:6OXbTD$iNPP" resolve="QueryTemplate" />
+          <ref role="3uigEE" to="ugy2:6OXbTD$iNPP" resolve="QueryTemplate" />
           <node concept="3qTvmN" id="6OXbTD$xEq3" role="11_B2D" />
         </node>
       </node>
@@ -1022,7 +1022,7 @@
         <property role="TrG5h" value="ruleBuilders" />
         <node concept="A3Dl8" id="6OXbTDy0Z6V" role="1tU5fm">
           <node concept="3uibUv" id="6OXbTDy0Z6W" role="A3Ik2">
-            <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
+            <ref role="3uigEE" to="ugy2:7eGEHDlc$ap" resolve="RuleBuilder" />
           </node>
         </node>
       </node>
@@ -1036,7 +1036,7 @@
       <node concept="37vLTG" id="cmlg9Ov1RK" role="3clF46">
         <property role="TrG5h" value="ruleTemplate" />
         <node concept="3uibUv" id="cmlg9Ov1RL" role="1tU5fm">
-          <ref role="3uigEE" to="i348:1ffsG7bW_V4" resolve="RuleTemplate" />
+          <ref role="3uigEE" to="ugy2:1ffsG7bW_V4" resolve="RuleTemplate" />
         </node>
       </node>
       <node concept="37vLTG" id="4J__M64SiG" role="3clF46">
@@ -1062,7 +1062,7 @@
                   <ref role="3cqZAo" node="cmlg9Ov1RK" resolve="ruleTemplate" />
                 </node>
                 <node concept="liA8E" id="cmlg9Ov5u9" role="2OqNvi">
-                  <ref role="37wK5l" to="i348:4MqhgXUndvp" resolve="table" />
+                  <ref role="37wK5l" to="ugy2:4MqhgXUndvp" resolve="table" />
                 </node>
               </node>
             </node>
@@ -1176,16 +1176,16 @@
       <node concept="37vLTG" id="zL5ZaO39JA" role="3clF46">
         <property role="TrG5h" value="aspectClique" />
         <node concept="3uibUv" id="zL5ZaO3n$t" role="1tU5fm">
-          <ref role="3uigEE" to="fqlx:3KN3A4uUhmW" resolve="AspectClique" />
+          <ref role="3uigEE" to="pxw9:3KN3A4uUhmW" resolve="AspectClique" />
           <node concept="3qUE_q" id="zL5ZaO3q51" role="11_B2D">
             <node concept="3uibUv" id="zL5ZaO3r3A" role="3qUE_r">
-              <ref role="3uigEE" to="fqlx:NKt6yomNZE" resolve="CoderulesAspect" />
+              <ref role="3uigEE" to="pxw9:NKt6yomNZE" resolve="CoderulesAspect" />
             </node>
           </node>
         </node>
       </node>
       <node concept="3uibUv" id="1XKnVPvPdt" role="3clF45">
-        <ref role="3uigEE" to="psoy:7Oc59RSEjdb" resolve="Result" />
+        <ref role="3uigEE" to="xydz:7Oc59RSEjdb" resolve="Result" />
       </node>
       <node concept="3Tm1VV" id="7DvO2M9UagX" role="1B3o_S" />
       <node concept="3clFbS" id="7DvO2M9UagY" role="3clF47">
@@ -1193,11 +1193,11 @@
           <node concept="3cpWsn" id="1XKnVPw3aj" role="3cpWs9">
             <property role="TrG5h" value="res" />
             <node concept="3uibUv" id="1XKnVPw3ak" role="1tU5fm">
-              <ref role="3uigEE" to="psoy:7Oc59RSEjdb" resolve="Result" />
+              <ref role="3uigEE" to="xydz:7Oc59RSEjdb" resolve="Result" />
             </node>
             <node concept="2YIFZM" id="1XKnVPw3z6" role="33vP2m">
-              <ref role="37wK5l" to="psoy:7Oc59RSEjeq" resolve="OK" />
-              <ref role="1Pybhc" to="psoy:7Oc59RSEjdb" resolve="Result" />
+              <ref role="37wK5l" to="xydz:7Oc59RSEjeq" resolve="OK" />
+              <ref role="1Pybhc" to="xydz:7Oc59RSEjdb" resolve="Result" />
             </node>
           </node>
         </node>
@@ -1272,7 +1272,7 @@
                     <ref role="3cqZAo" node="1XKnVPw3aj" resolve="res" />
                   </node>
                   <node concept="liA8E" id="1XKnVPw4F9" role="2OqNvi">
-                    <ref role="37wK5l" to="psoy:7nkyKX7v7xb" resolve="and" />
+                    <ref role="37wK5l" to="xydz:7nkyKX7v7xb" resolve="and" />
                     <node concept="2OqwBi" id="1XKnVPtx5I" role="37wK5m">
                       <node concept="liA8E" id="1XKnVPtx5J" role="2OqNvi">
                         <ref role="37wK5l" node="4MqhgXUNDLG" resolve="buildPlan" />
@@ -1331,7 +1331,7 @@
                     <ref role="3cqZAo" node="1XKnVPw3aj" resolve="res" />
                   </node>
                   <node concept="liA8E" id="1XKnVPw6u4" role="2OqNvi">
-                    <ref role="37wK5l" to="psoy:7nkyKX7v7xb" resolve="and" />
+                    <ref role="37wK5l" to="xydz:7nkyKX7v7xb" resolve="and" />
                     <node concept="2OqwBi" id="1XKnVPt$bI" role="37wK5m">
                       <node concept="37vLTw" id="1XKnVPt$bJ" role="2Oq$k0">
                         <ref role="3cqZAo" node="6OXbTDzHkqu" resolve="planBuilder" />
@@ -1387,7 +1387,7 @@
                     <ref role="3cqZAo" node="1XKnVPw3aj" resolve="res" />
                   </node>
                   <node concept="liA8E" id="1XKnVPw83K" role="2OqNvi">
-                    <ref role="37wK5l" to="psoy:7nkyKX7v7xb" resolve="and" />
+                    <ref role="37wK5l" to="xydz:7nkyKX7v7xb" resolve="and" />
                     <node concept="2OqwBi" id="1XKnVPbu84" role="37wK5m">
                       <node concept="37vLTw" id="1XKnVPbu85" role="2Oq$k0">
                         <ref role="3cqZAo" node="1XKnVPbu89" resolve="planBuilder" />
@@ -1481,7 +1481,7 @@
     <node concept="3clFb_" id="2hQbw6HTiY$" role="jymVt">
       <property role="TrG5h" value="lastResult" />
       <node concept="3uibUv" id="2hQbw6HTsYY" role="3clF45">
-        <ref role="3uigEE" to="psoy:7Oc59RSEjdb" resolve="Result" />
+        <ref role="3uigEE" to="xydz:7Oc59RSEjdb" resolve="Result" />
       </node>
       <node concept="3Tm1VV" id="2hQbw6HTiYB" role="1B3o_S" />
       <node concept="3clFbS" id="2hQbw6HTiYC" role="3clF47">
@@ -1498,14 +1498,14 @@
       <node concept="37vLTG" id="7DvO2M9Uahq" role="3clF46">
         <property role="TrG5h" value="key" />
         <node concept="3uibUv" id="5F2qBBEuFVp" role="1tU5fm">
-          <ref role="3uigEE" to="i348:1ffsG7bW_V4" resolve="RuleTemplate" />
+          <ref role="3uigEE" to="ugy2:1ffsG7bW_V4" resolve="RuleTemplate" />
         </node>
       </node>
       <node concept="37vLTG" id="1XKnVP6hBI" role="3clF46">
         <property role="TrG5h" value="ruleBuilders" />
         <node concept="3vKaQO" id="47oVduOM7$h" role="1tU5fm">
           <node concept="3uibUv" id="47oVduOM7$j" role="3O5elw">
-            <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
+            <ref role="3uigEE" to="ugy2:7eGEHDlc$ap" resolve="RuleBuilder" />
           </node>
         </node>
       </node>
@@ -1625,7 +1625,7 @@
       <node concept="37vLTG" id="1XKnVP4HJy" role="3clF46">
         <property role="TrG5h" value="ruleTable" />
         <node concept="3uibUv" id="1XKnVP4HJz" role="1tU5fm">
-          <ref role="3uigEE" to="i348:4MqhgXU9fm3" resolve="RuleTable" />
+          <ref role="3uigEE" to="ugy2:4MqhgXU9fm3" resolve="RuleTable" />
         </node>
       </node>
       <node concept="3uibUv" id="1XKnVP4HJ$" role="3clF45">
@@ -1682,7 +1682,7 @@
       <node concept="37vLTG" id="6OXbTDy166s" role="3clF46">
         <property role="TrG5h" value="queryTemplate" />
         <node concept="3uibUv" id="6OXbTD$xHlq" role="1tU5fm">
-          <ref role="3uigEE" to="i348:6OXbTD$iNPP" resolve="QueryTemplate" />
+          <ref role="3uigEE" to="ugy2:6OXbTD$iNPP" resolve="QueryTemplate" />
           <node concept="3qTvmN" id="6OXbTD$xHAd" role="11_B2D" />
         </node>
       </node>
@@ -1827,7 +1827,7 @@
           <property role="TrG5h" value="ruleBuilders" />
           <node concept="A3Dl8" id="5NUR$PxJct" role="1tU5fm">
             <node concept="3uibUv" id="5NUR$PxJcu" role="A3Ik2">
-              <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
+              <ref role="3uigEE" to="ugy2:7eGEHDlc$ap" resolve="RuleBuilder" />
             </node>
           </node>
         </node>
@@ -1862,7 +1862,7 @@
               <property role="TrG5h" value="oldRules" />
               <node concept="_YKpA" id="4baZKvaXzQK" role="1tU5fm">
                 <node concept="3uibUv" id="4baZKvaXzQN" role="_ZDj9">
-                  <ref role="3uigEE" to="i348:7nPD14OaO1O" resolve="RuleEx" />
+                  <ref role="3uigEE" to="ugy2:7nPD14OaO1O" resolve="RuleEx" />
                 </node>
               </node>
               <node concept="3K4zz7" id="2gPa6JJBXfD" role="33vP2m">
@@ -1926,13 +1926,13 @@
               <property role="TrG5h" value="newRules" />
               <node concept="_YKpA" id="5NUR$PxV0f" role="1tU5fm">
                 <node concept="3uibUv" id="5NUR$PxV0g" role="_ZDj9">
-                  <ref role="3uigEE" to="i348:7nPD14OaO1O" resolve="RuleEx" />
+                  <ref role="3uigEE" to="ugy2:7nPD14OaO1O" resolve="RuleEx" />
                 </node>
               </node>
               <node concept="2ShNRf" id="5NUR$PxV0h" role="33vP2m">
                 <node concept="Tc6Ow" id="5NUR$PxV0i" role="2ShVmc">
                   <node concept="3uibUv" id="5NUR$PxV0j" role="HW$YZ">
-                    <ref role="3uigEE" to="i348:7nPD14OaO1O" resolve="RuleEx" />
+                    <ref role="3uigEE" to="ugy2:7nPD14OaO1O" resolve="RuleEx" />
                   </node>
                   <node concept="3cmrfG" id="5NUR$PxV0k" role="3lWHg$">
                     <property role="3cmrfH" value="1" />
@@ -1947,14 +1947,14 @@
                 <node concept="3cpWsn" id="1XKnVPFIXq" role="3cpWs9">
                   <property role="TrG5h" value="toRule" />
                   <node concept="3uibUv" id="1XKnVPFIMs" role="1tU5fm">
-                    <ref role="3uigEE" to="i348:7nPD14OaO1O" resolve="RuleEx" />
+                    <ref role="3uigEE" to="ugy2:7nPD14OaO1O" resolve="RuleEx" />
                   </node>
                   <node concept="2OqwBi" id="1XKnVPFIXr" role="33vP2m">
                     <node concept="37vLTw" id="1XKnVPFIXs" role="2Oq$k0">
                       <ref role="3cqZAo" node="5NUR$PxV0u" resolve="rb" />
                     </node>
                     <node concept="liA8E" id="1XKnVPFIXt" role="2OqNvi">
-                      <ref role="37wK5l" to="i348:7eGEHDlc$ck" resolve="toRule" />
+                      <ref role="37wK5l" to="ugy2:7eGEHDlc$ck" resolve="toRule" />
                     </node>
                   </node>
                 </node>
@@ -1975,7 +1975,7 @@
             <node concept="3cpWsn" id="5NUR$PxV0u" role="1Duv9x">
               <property role="TrG5h" value="rb" />
               <node concept="3uibUv" id="5NUR$PxV0v" role="1tU5fm">
-                <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
+                <ref role="3uigEE" to="ugy2:7eGEHDlc$ap" resolve="RuleBuilder" />
               </node>
             </node>
             <node concept="37vLTw" id="5NUR$PxV0w" role="1DdaDG">
@@ -2276,7 +2276,7 @@
         <node concept="37vLTG" id="5NUR$OCWAB" role="3clF46">
           <property role="TrG5h" value="template" />
           <node concept="3uibUv" id="5F2qBBEqhDJ" role="1tU5fm">
-            <ref role="3uigEE" to="i348:1ffsG7bW_V4" resolve="RuleTemplate" />
+            <ref role="3uigEE" to="ugy2:1ffsG7bW_V4" resolve="RuleTemplate" />
           </node>
         </node>
         <node concept="37vLTG" id="5NUR$OCWAD" role="3clF46">
@@ -2295,7 +2295,7 @@
             <node concept="1LlUBW" id="47oVduOF4Kf" role="1ajl9A">
               <node concept="3vKaQO" id="47oVduOF78l" role="1Lm7xW">
                 <node concept="3uibUv" id="47oVduOF78n" role="3O5elw">
-                  <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
+                  <ref role="3uigEE" to="ugy2:7eGEHDlc$ap" resolve="RuleBuilder" />
                 </node>
               </node>
               <node concept="3vKaQO" id="47oVduOF7Mh" role="1Lm7xW">
@@ -2355,7 +2355,7 @@
                   <property role="TrG5h" value="cachedRules" />
                   <node concept="_YKpA" id="4baZKvaHsXi" role="1tU5fm">
                     <node concept="3uibUv" id="4baZKvaHsXl" role="_ZDj9">
-                      <ref role="3uigEE" to="i348:7nPD14OaO1O" resolve="RuleEx" />
+                      <ref role="3uigEE" to="ugy2:7nPD14OaO1O" resolve="RuleEx" />
                     </node>
                   </node>
                   <node concept="2OqwBi" id="2gPa6JJMTJC" role="33vP2m">
@@ -2498,13 +2498,13 @@
               <property role="TrG5h" value="rules" />
               <node concept="_YKpA" id="5NUR$OD58Y" role="1tU5fm">
                 <node concept="3uibUv" id="5NUR$OD58Z" role="_ZDj9">
-                  <ref role="3uigEE" to="i348:7nPD14OaO1O" resolve="RuleEx" />
+                  <ref role="3uigEE" to="ugy2:7nPD14OaO1O" resolve="RuleEx" />
                 </node>
               </node>
               <node concept="2ShNRf" id="5NUR$OD590" role="33vP2m">
                 <node concept="Tc6Ow" id="5NUR$OD591" role="2ShVmc">
                   <node concept="3uibUv" id="5NUR$OD592" role="HW$YZ">
-                    <ref role="3uigEE" to="i348:7nPD14OaO1O" resolve="RuleEx" />
+                    <ref role="3uigEE" to="ugy2:7nPD14OaO1O" resolve="RuleEx" />
                   </node>
                   <node concept="3cmrfG" id="5NUR$OD593" role="3lWHg$">
                     <property role="3cmrfH" value="1" />
@@ -2519,7 +2519,7 @@
               <node concept="1LlUBW" id="47oVduOHax0" role="1tU5fm">
                 <node concept="3vKaQO" id="47oVduOHaxf" role="1Lm7xW">
                   <node concept="3uibUv" id="47oVduOHaxg" role="3O5elw">
-                    <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
+                    <ref role="3uigEE" to="ugy2:7eGEHDlc$ap" resolve="RuleBuilder" />
                   </node>
                 </node>
                 <node concept="3vKaQO" id="47oVduOHaxd" role="1Lm7xW">
@@ -2552,7 +2552,7 @@
               <property role="TrG5h" value="rbs" />
               <node concept="3vKaQO" id="47oVduOHju4" role="1tU5fm">
                 <node concept="3uibUv" id="47oVduOHju7" role="3O5elw">
-                  <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
+                  <ref role="3uigEE" to="ugy2:7eGEHDlc$ap" resolve="RuleBuilder" />
                 </node>
               </node>
               <node concept="1LFfDK" id="47oVduOIc2C" role="33vP2m">
@@ -2595,7 +2595,7 @@
                         <ref role="3cqZAo" node="5NUR$OD59d" resolve="rb" />
                       </node>
                       <node concept="liA8E" id="5NUR$OD59c" role="2OqNvi">
-                        <ref role="37wK5l" to="i348:7eGEHDlc$ck" resolve="toRule" />
+                        <ref role="37wK5l" to="ugy2:7eGEHDlc$ck" resolve="toRule" />
                       </node>
                     </node>
                   </node>
@@ -2605,7 +2605,7 @@
             <node concept="3cpWsn" id="5NUR$OD59d" role="1Duv9x">
               <property role="TrG5h" value="rb" />
               <node concept="3uibUv" id="5NUR$OD59e" role="1tU5fm">
-                <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
+                <ref role="3uigEE" to="ugy2:7eGEHDlc$ap" resolve="RuleBuilder" />
               </node>
             </node>
             <node concept="37vLTw" id="47oVduOIc2F" role="1DdaDG">
@@ -2764,7 +2764,7 @@
                       <property role="TrG5h" value="rules" />
                       <node concept="3vKaQO" id="47oVduOI8VZ" role="1tU5fm">
                         <node concept="3uibUv" id="47oVduOI8W1" role="3O5elw">
-                          <ref role="3uigEE" to="i348:7nPD14OaO1O" resolve="RuleEx" />
+                          <ref role="3uigEE" to="ugy2:7nPD14OaO1O" resolve="RuleEx" />
                         </node>
                       </node>
                       <node concept="2OqwBi" id="2gPa6JK0X9L" role="33vP2m">
@@ -2885,7 +2885,7 @@
                         <node concept="3cpWsn" id="6tXRJZa_gUE" role="1Duv9x">
                           <property role="TrG5h" value="r" />
                           <node concept="3uibUv" id="6tXRJZa_gUI" role="1tU5fm">
-                            <ref role="3uigEE" to="i348:7nPD14OaO1O" resolve="RuleEx" />
+                            <ref role="3uigEE" to="ugy2:7nPD14OaO1O" resolve="RuleEx" />
                           </node>
                         </node>
                         <node concept="37vLTw" id="6tXRJZa_gUJ" role="1DdaDG">
@@ -2961,7 +2961,7 @@
           <property role="TrG5h" value="rules" />
           <node concept="A3Dl8" id="3OUB6BCcnKy" role="1tU5fm">
             <node concept="3uibUv" id="3OUB6BCemLr" role="A3Ik2">
-              <ref role="3uigEE" to="i348:7nPD14OaO1O" resolve="RuleEx" />
+              <ref role="3uigEE" to="ugy2:7nPD14OaO1O" resolve="RuleEx" />
             </node>
           </node>
         </node>
@@ -3013,7 +3013,7 @@
             <node concept="3cpWsn" id="2fVm_54IMbM" role="1Duv9x">
               <property role="TrG5h" value="rule" />
               <node concept="3uibUv" id="2fVm_54IMbQ" role="1tU5fm">
-                <ref role="3uigEE" to="i348:7nPD14OaO1O" resolve="RuleEx" />
+                <ref role="3uigEE" to="ugy2:7nPD14OaO1O" resolve="RuleEx" />
               </node>
             </node>
             <node concept="37vLTw" id="2fVm_54IMbR" role="1DdaDG">
@@ -3026,7 +3026,7 @@
           <property role="TrG5h" value="rules" />
           <node concept="A3Dl8" id="2fVm_54I9GE" role="1tU5fm">
             <node concept="3uibUv" id="2fVm_54I9GF" role="A3Ik2">
-              <ref role="3uigEE" to="i348:7nPD14OaO1O" resolve="RuleEx" />
+              <ref role="3uigEE" to="ugy2:7nPD14OaO1O" resolve="RuleEx" />
             </node>
           </node>
         </node>
@@ -3196,7 +3196,7 @@
       <node concept="3clFb_" id="4MqhgXUNDLG" role="jymVt">
         <property role="TrG5h" value="buildPlan" />
         <node concept="3uibUv" id="1XKnVPvVj6" role="3clF45">
-          <ref role="3uigEE" to="psoy:7Oc59RSEjdb" resolve="Result" />
+          <ref role="3uigEE" to="xydz:7Oc59RSEjdb" resolve="Result" />
         </node>
         <node concept="3Tm6S6" id="1XKnVPgiq6" role="1B3o_S" />
         <node concept="3clFbS" id="4MqhgXUNDLK" role="3clF47">
@@ -3204,11 +3204,11 @@
             <node concept="3cpWsn" id="1XKnVPw9A5" role="3cpWs9">
               <property role="TrG5h" value="res" />
               <node concept="3uibUv" id="1XKnVPw2nj" role="1tU5fm">
-                <ref role="3uigEE" to="psoy:7Oc59RSEjdb" resolve="Result" />
+                <ref role="3uigEE" to="xydz:7Oc59RSEjdb" resolve="Result" />
               </node>
               <node concept="2YIFZM" id="1XKnVPw9A6" role="33vP2m">
-                <ref role="37wK5l" to="psoy:7Oc59RSEjeq" resolve="OK" />
-                <ref role="1Pybhc" to="psoy:7Oc59RSEjdb" resolve="Result" />
+                <ref role="37wK5l" to="xydz:7Oc59RSEjeq" resolve="OK" />
+                <ref role="1Pybhc" to="xydz:7Oc59RSEjdb" resolve="Result" />
               </node>
             </node>
           </node>
@@ -3269,7 +3269,7 @@
                         <node concept="3cpWsn" id="2gPa6JK8Imn" role="1Duv9x">
                           <property role="TrG5h" value="r" />
                           <node concept="3uibUv" id="2gPa6JK8Imr" role="1tU5fm">
-                            <ref role="3uigEE" to="i348:7nPD14OaO1O" resolve="RuleEx" />
+                            <ref role="3uigEE" to="ugy2:7nPD14OaO1O" resolve="RuleEx" />
                           </node>
                         </node>
                         <node concept="2OqwBi" id="2gPa6JK8Ims" role="1DdaDG">
@@ -3718,7 +3718,7 @@
         <node concept="3Tm6S6" id="2gPa6JIZMvq" role="1B3o_S" />
         <node concept="_YKpA" id="2gPa6JJ11ft" role="1tU5fm">
           <node concept="3uibUv" id="2gPa6JJ11fv" role="_ZDj9">
-            <ref role="3uigEE" to="i348:7nPD14OaO1O" resolve="RuleEx" />
+            <ref role="3uigEE" to="ugy2:7nPD14OaO1O" resolve="RuleEx" />
           </node>
         </node>
       </node>
@@ -3774,7 +3774,7 @@
         <property role="TrG5h" value="rules" />
         <node concept="_YKpA" id="2gPa6JJ214p" role="3clF45">
           <node concept="3uibUv" id="2gPa6JJ214r" role="_ZDj9">
-            <ref role="3uigEE" to="i348:7nPD14OaO1O" resolve="RuleEx" />
+            <ref role="3uigEE" to="ugy2:7nPD14OaO1O" resolve="RuleEx" />
           </node>
         </node>
         <node concept="3Tm1VV" id="2gPa6JIZSXs" role="1B3o_S" />
@@ -3880,7 +3880,7 @@
           <property role="TrG5h" value="rules" />
           <node concept="_YKpA" id="2gPa6JJ0ZT$" role="1tU5fm">
             <node concept="3uibUv" id="2gPa6JJ0ZTA" role="_ZDj9">
-              <ref role="3uigEE" to="i348:7nPD14OaO1O" resolve="RuleEx" />
+              <ref role="3uigEE" to="ugy2:7nPD14OaO1O" resolve="RuleEx" />
             </node>
           </node>
         </node>
@@ -4028,7 +4028,7 @@
       <node concept="3Tm6S6" id="7DvO2M9Uaih" role="1B3o_S" />
       <node concept="3rvAFt" id="7DvO2M9Uaii" role="1tU5fm">
         <node concept="3uibUv" id="1XKnVP758O" role="3rvQeY">
-          <ref role="3uigEE" to="i348:4MqhgXU9fm3" resolve="RuleTable" />
+          <ref role="3uigEE" to="ugy2:4MqhgXU9fm3" resolve="RuleTable" />
         </node>
         <node concept="3uibUv" id="7DvO2M9Uaik" role="3rvSg0">
           <ref role="3uigEE" node="4MqhgXUMauK" resolve="RulesPlanHandler.PlanBuilder" />
@@ -4037,7 +4037,7 @@
       <node concept="2ShNRf" id="7DvO2M9Uail" role="33vP2m">
         <node concept="32Fmki" id="1Pi9pJ$efCe" role="2ShVmc">
           <node concept="3uibUv" id="1Pi9pJ$et84" role="3rHrn6">
-            <ref role="3uigEE" to="i348:4MqhgXU9fm3" resolve="RuleTable" />
+            <ref role="3uigEE" to="ugy2:4MqhgXU9fm3" resolve="RuleTable" />
           </node>
           <node concept="3uibUv" id="1Pi9pJ$eLZg" role="3rHtpV">
             <ref role="3uigEE" node="4MqhgXUMauK" resolve="RulesPlanHandler.PlanBuilder" />
@@ -4071,7 +4071,7 @@
       <property role="TrG5h" value="lastResult" />
       <node concept="3Tm6S6" id="2hQbw6HSS4L" role="1B3o_S" />
       <node concept="3uibUv" id="2hQbw6HT3UL" role="1tU5fm">
-        <ref role="3uigEE" to="psoy:7Oc59RSEjdb" resolve="Result" />
+        <ref role="3uigEE" to="xydz:7Oc59RSEjdb" resolve="Result" />
       </node>
       <node concept="10Nm6u" id="2hQbw6HT6iu" role="33vP2m" />
     </node>
@@ -5468,7 +5468,7 @@
       <node concept="37vLTG" id="cmlg9OJCww" role="3clF46">
         <property role="TrG5h" value="applicationSession" />
         <node concept="3uibUv" id="cmlg9OJEno" role="1tU5fm">
-          <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
+          <ref role="3uigEE" to="ugy2:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
         </node>
       </node>
       <node concept="37vLTG" id="cmlg9OINa8" role="3clF46">
@@ -5500,7 +5500,7 @@
     <node concept="3clFb_" id="7nkyKX7ncaN" role="jymVt">
       <property role="TrG5h" value="processAux" />
       <node concept="3uibUv" id="7nkyKX7nfei" role="3clF45">
-        <ref role="3uigEE" to="psoy:7Oc59RSEjdb" resolve="Result" />
+        <ref role="3uigEE" to="xydz:7Oc59RSEjdb" resolve="Result" />
       </node>
       <node concept="3Tm1VV" id="cmlg9O$qY1" role="1B3o_S" />
       <node concept="3clFbS" id="7nkyKX7ncaR" role="3clF47">
@@ -5508,11 +5508,11 @@
           <node concept="3cpWsn" id="2Z9Itkddll6" role="3cpWs9">
             <property role="TrG5h" value="res" />
             <node concept="3uibUv" id="2Z9Itkddll7" role="1tU5fm">
-              <ref role="3uigEE" to="psoy:7Oc59RSEjdb" resolve="Result" />
+              <ref role="3uigEE" to="xydz:7Oc59RSEjdb" resolve="Result" />
             </node>
             <node concept="2YIFZM" id="7TC1Xcd$6oD" role="33vP2m">
-              <ref role="37wK5l" to="psoy:7Oc59RSEjeq" resolve="OK" />
-              <ref role="1Pybhc" to="psoy:7Oc59RSEjdb" resolve="Result" />
+              <ref role="37wK5l" to="xydz:7Oc59RSEjeq" resolve="OK" />
+              <ref role="1Pybhc" to="xydz:7Oc59RSEjdb" resolve="Result" />
             </node>
           </node>
         </node>
@@ -5551,10 +5551,10 @@
                       <ref role="3cqZAo" node="2Z9Itkddll6" resolve="res" />
                     </node>
                     <node concept="liA8E" id="2Z9Itkdf37I" role="2OqNvi">
-                      <ref role="37wK5l" to="psoy:7nkyKX7v7xb" resolve="and" />
+                      <ref role="37wK5l" to="xydz:7nkyKX7v7xb" resolve="and" />
                       <node concept="2YIFZM" id="7TC1Xcd$6oR" role="37wK5m">
-                        <ref role="37wK5l" to="psoy:5X1yxJHYPm2" resolve="FAIL" />
-                        <ref role="1Pybhc" to="psoy:7Oc59RSEjdb" resolve="Result" />
+                        <ref role="37wK5l" to="xydz:5X1yxJHYPm2" resolve="FAIL" />
+                        <ref role="1Pybhc" to="xydz:7Oc59RSEjdb" resolve="Result" />
                         <node concept="37vLTw" id="2TBKto$2$X$" role="37wK5m">
                           <ref role="3cqZAo" node="2TBKto$1GRD" resolve="e" />
                         </node>
@@ -5573,11 +5573,11 @@
               <node concept="3cpWsn" id="6i42QSskaRC" role="3cpWs9">
                 <property role="TrG5h" value="mainRulesBuilder" />
                 <node concept="3uibUv" id="6i42QSskaR_" role="1tU5fm">
-                  <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
+                  <ref role="3uigEE" to="ugy2:7eGEHDlc$ap" resolve="RuleBuilder" />
                 </node>
                 <node concept="2ShNRf" id="6i42QSskaRD" role="33vP2m">
                   <node concept="1pGfFk" id="6i42QSskaRE" role="2ShVmc">
-                    <ref role="37wK5l" to="i348:5yr01fE1Jnt" resolve="RuleBuilder" />
+                    <ref role="37wK5l" to="ugy2:5yr01fE1Jnt" resolve="RuleBuilder" />
                     <node concept="10Nm6u" id="5yr01fE2e5j" role="37wK5m" />
                     <node concept="Xl_RD" id="6i42QSskaRF" role="37wK5m">
                       <property role="Xl_RC" value="main" />
@@ -5592,7 +5592,7 @@
                   <ref role="3cqZAo" node="6i42QSskaRC" resolve="mainRulesBuilder" />
                 </node>
                 <node concept="liA8E" id="6i42QSskfKn" role="2OqNvi">
-                  <ref role="37wK5l" to="i348:7eGEHDlc$bq" resolve="appendHeadReplaced" />
+                  <ref role="37wK5l" to="ugy2:7eGEHDlc$bq" resolve="appendHeadReplaced" />
                   <node concept="37vLTw" id="6i42QSskgaA" role="37wK5m">
                     <ref role="3cqZAo" node="6i42QSsj_y2" resolve="mainConstraint" />
                   </node>
@@ -5605,10 +5605,10 @@
                   <ref role="3cqZAo" node="6i42QSskaRC" resolve="mainRulesBuilder" />
                 </node>
                 <node concept="liA8E" id="6i42QSskhfn" role="2OqNvi">
-                  <ref role="37wK5l" to="i348:7eGEHDlc$aw" resolve="appendBody" />
+                  <ref role="37wK5l" to="ugy2:7eGEHDlc$aw" resolve="appendBody" />
                   <node concept="2ShNRf" id="6i42QSskpry" role="37wK5m">
                     <node concept="1pGfFk" id="6i42QSskq5F" role="2ShVmc">
-                      <ref role="37wK5l" to="cxk7:4xBopTzrPWl" resolve="AssertPredicate" />
+                      <ref role="37wK5l" to="tpfl:4xBopTzrPWl" resolve="AssertPredicate" />
                       <node concept="10M0yZ" id="6i42QSskqiG" role="37wK5m">
                         <ref role="1PxDUh" to="wyt6:~Boolean" resolve="Boolean" />
                         <ref role="3cqZAo" to="wyt6:~Boolean.TRUE" resolve="TRUE" />
@@ -5622,11 +5622,11 @@
               <node concept="3cpWsn" id="5F2qBBEuDVO" role="3cpWs9">
                 <property role="TrG5h" value="dummyMainTemplate" />
                 <node concept="3uibUv" id="5F2qBBEuDVP" role="1tU5fm">
-                  <ref role="3uigEE" to="i348:1ffsG7bW_V4" resolve="RuleTemplate" />
+                  <ref role="3uigEE" to="ugy2:1ffsG7bW_V4" resolve="RuleTemplate" />
                 </node>
                 <node concept="2ShNRf" id="5F2qBBEuEZW" role="33vP2m">
                   <node concept="1pGfFk" id="5F2qBBEuFvp" role="2ShVmc">
-                    <ref role="37wK5l" to="i348:5F2qBBEufuQ" resolve="ConstRuleTemplate" />
+                    <ref role="37wK5l" to="ugy2:5F2qBBEufuQ" resolve="ConstRuleTemplate" />
                     <node concept="Xl_RD" id="5F2qBBEuFAr" role="37wK5m">
                       <property role="Xl_RC" value="main" />
                     </node>
@@ -5651,7 +5651,7 @@
                   <node concept="2ShNRf" id="1XKnVPlvCB" role="37wK5m">
                     <node concept="Tc6Ow" id="47oVduORjgv" role="2ShVmc">
                       <node concept="3uibUv" id="47oVduORjN9" role="HW$YZ">
-                        <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
+                        <ref role="3uigEE" to="ugy2:7eGEHDlc$ap" resolve="RuleBuilder" />
                       </node>
                       <node concept="37vLTw" id="47oVduORkvF" role="HW$Y0">
                         <ref role="3cqZAo" node="6i42QSskaRC" resolve="mainRulesBuilder" />
@@ -5689,7 +5689,7 @@
         <node concept="10P_77" id="3VwM5b6aAXH" role="1tU5fm" />
       </node>
       <node concept="3uibUv" id="4QPCta1bMC8" role="3clF45">
-        <ref role="3uigEE" to="psoy:7Oc59RSEjdb" resolve="Result" />
+        <ref role="3uigEE" to="xydz:7Oc59RSEjdb" resolve="Result" />
       </node>
       <node concept="3Tm1VV" id="4$YN6QuyBIN" role="1B3o_S" />
       <node concept="3clFbS" id="4QPCta1bMCa" role="3clF47">
@@ -5697,11 +5697,11 @@
           <node concept="3cpWsn" id="4QPCta1bMCc" role="3cpWs9">
             <property role="TrG5h" value="result" />
             <node concept="3uibUv" id="4QPCta1bMCd" role="1tU5fm">
-              <ref role="3uigEE" to="psoy:7Oc59RSEjdb" resolve="Result" />
+              <ref role="3uigEE" to="xydz:7Oc59RSEjdb" resolve="Result" />
             </node>
             <node concept="2YIFZM" id="3VwM5b5YOTJ" role="33vP2m">
-              <ref role="37wK5l" to="psoy:3VwM5b5YDoi" resolve="SKIP" />
-              <ref role="1Pybhc" to="psoy:7Oc59RSEjdb" resolve="Result" />
+              <ref role="37wK5l" to="xydz:3VwM5b5YDoi" resolve="SKIP" />
+              <ref role="1Pybhc" to="xydz:7Oc59RSEjdb" resolve="Result" />
             </node>
           </node>
         </node>
@@ -5778,10 +5778,10 @@
                 <property role="TrG5h" value="allRuleTemplatesWithNoInput" />
                 <node concept="A3Dl8" id="2hQbw6Hw1nD" role="1tU5fm">
                   <node concept="3uibUv" id="2hQbw6Hw1nQ" role="A3Ik2">
-                    <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstractRuleTemplate" />
+                    <ref role="3uigEE" to="ugy2:1ffsG7bUbCM" resolve="AbstractRuleTemplate" />
                     <node concept="3qUE_q" id="2hQbw6Hw1nR" role="11_B2D">
                       <node concept="3uibUv" id="2hQbw6Hw1nS" role="3qUE_r">
-                        <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplate.Token" />
+                        <ref role="3uigEE" to="ugy2:2RRx4MZ6_68" resolve="RuleTemplate.Token" />
                       </node>
                     </node>
                   </node>
@@ -5791,7 +5791,7 @@
                     <ref role="3cqZAo" node="7DvO2Mah9z5" resolve="applicationSession" />
                   </node>
                   <node concept="liA8E" id="2hQbw6Hw_XT" role="2OqNvi">
-                    <ref role="37wK5l" to="i348:5HVB6JR7NAD" resolve="memoize" />
+                    <ref role="37wK5l" to="ugy2:5HVB6JR7NAD" resolve="memoize" />
                     <node concept="Xl_RD" id="2hQbw6HwASR" role="37wK5m">
                       <property role="Xl_RC" value="allRuleTemplatesWithNoInput" />
                     </node>
@@ -5824,7 +5824,7 @@
                 <property role="TrG5h" value="res_reqs" />
                 <node concept="1LlUBW" id="2Qe6u2cltUt" role="1tU5fm">
                   <node concept="3uibUv" id="2Qe6u2cltUu" role="1Lm7xW">
-                    <ref role="3uigEE" to="psoy:7Oc59RSEjdb" resolve="Result" />
+                    <ref role="3uigEE" to="xydz:7Oc59RSEjdb" resolve="Result" />
                   </node>
                   <node concept="3vKaQO" id="2Qe6u2cltUv" role="1Lm7xW">
                     <node concept="3Tqbb2" id="2Qe6u2cltUw" role="3O5elw" />
@@ -5850,7 +5850,7 @@
                     <ref role="3cqZAo" node="4QPCta1bMCc" resolve="result" />
                   </node>
                   <node concept="liA8E" id="4QPCta1bMCk" role="2OqNvi">
-                    <ref role="37wK5l" to="psoy:7nkyKX7v7xb" resolve="and" />
+                    <ref role="37wK5l" to="xydz:7nkyKX7v7xb" resolve="and" />
                     <node concept="1LFfDK" id="2Qe6u2clsyS" role="37wK5m">
                       <node concept="3cmrfG" id="2Qe6u2clsJr" role="1LF_Uc">
                         <property role="3cmrfH" value="0" />
@@ -5960,7 +5960,7 @@
                     <ref role="3cqZAo" node="4QPCta1bMCc" resolve="result" />
                   </node>
                   <node concept="liA8E" id="5HxDM7D5RUo" role="2OqNvi">
-                    <ref role="37wK5l" to="psoy:7nkyKX7v7xb" resolve="and" />
+                    <ref role="37wK5l" to="xydz:7nkyKX7v7xb" resolve="and" />
                     <node concept="1rXfSq" id="5HxDM7D5RUp" role="37wK5m">
                       <ref role="37wK5l" node="tIwzd1MM22" resolve="processRequired" />
                       <node concept="37vLTw" id="5HxDM7D8W7g" role="37wK5m">
@@ -6097,7 +6097,7 @@
                     <ref role="3cqZAo" node="4QPCta1bMCc" resolve="result" />
                   </node>
                   <node concept="liA8E" id="4QPCta1bMCt" role="2OqNvi">
-                    <ref role="37wK5l" to="psoy:7nkyKX7v7xb" resolve="and" />
+                    <ref role="37wK5l" to="xydz:7nkyKX7v7xb" resolve="and" />
                     <node concept="2OqwBi" id="4QPCta1bMCu" role="37wK5m">
                       <node concept="Xjq3P" id="4QPCta1bMCv" role="2Oq$k0" />
                       <node concept="liA8E" id="4QPCta1bMCw" role="2OqNvi">
@@ -6157,7 +6157,7 @@
       <node concept="37vLTG" id="cmlg9OIsrb" role="3clF46">
         <property role="TrG5h" value="queryTemplate" />
         <node concept="3uibUv" id="cmlg9OI$gY" role="1tU5fm">
-          <ref role="3uigEE" to="i348:6OXbTD$iNPP" resolve="QueryTemplate" />
+          <ref role="3uigEE" to="ugy2:6OXbTD$iNPP" resolve="QueryTemplate" />
           <node concept="16syzq" id="5EDW3XEwYlf" role="11_B2D">
             <ref role="16sUi3" node="5EDW3XEwI2k" resolve="T" />
           </node>
@@ -6170,7 +6170,7 @@
         </node>
       </node>
       <node concept="3uibUv" id="6OXbTDxOCKa" role="3clF45">
-        <ref role="3uigEE" to="psoy:7Oc59RSEjdb" resolve="Result" />
+        <ref role="3uigEE" to="xydz:7Oc59RSEjdb" resolve="Result" />
       </node>
       <node concept="3Tm1VV" id="4$YN6QuyIUM" role="1B3o_S" />
       <node concept="3clFbS" id="6OXbTDxOzxx" role="3clF47">
@@ -6179,7 +6179,7 @@
             <property role="TrG5h" value="res_reqs" />
             <node concept="1LlUBW" id="1C_jAsq3VSa" role="1tU5fm">
               <node concept="3uibUv" id="1C_jAsq3VSl" role="1Lm7xW">
-                <ref role="3uigEE" to="psoy:7Oc59RSEjdb" resolve="Result" />
+                <ref role="3uigEE" to="xydz:7Oc59RSEjdb" resolve="Result" />
               </node>
               <node concept="_YKpA" id="1C_jAsq3VSj" role="1Lm7xW">
                 <node concept="3Tqbb2" id="1C_jAsq3VSk" role="_ZDj9" />
@@ -6200,7 +6200,7 @@
           <node concept="3cpWsn" id="1C_jAsq5j9W" role="3cpWs9">
             <property role="TrG5h" value="result" />
             <node concept="3uibUv" id="1C_jAsq5ghJ" role="1tU5fm">
-              <ref role="3uigEE" to="psoy:7Oc59RSEjdb" resolve="Result" />
+              <ref role="3uigEE" to="xydz:7Oc59RSEjdb" resolve="Result" />
             </node>
             <node concept="1LFfDK" id="1C_jAsq5j9X" role="33vP2m">
               <node concept="3cmrfG" id="1C_jAsq5j9Y" role="1LF_Uc">
@@ -6224,7 +6224,7 @@
                     <ref role="3cqZAo" node="1C_jAsq5j9W" resolve="result" />
                   </node>
                   <node concept="liA8E" id="1C_jAsq6tUY" role="2OqNvi">
-                    <ref role="37wK5l" to="psoy:7nkyKX7v7xb" resolve="and" />
+                    <ref role="37wK5l" to="xydz:7nkyKX7v7xb" resolve="and" />
                     <node concept="1rXfSq" id="1C_jAsq6tUZ" role="37wK5m">
                       <ref role="37wK5l" node="tIwzd1MM22" resolve="processRequired" />
                       <node concept="1LFfDK" id="1C_jAsq6I3m" role="37wK5m">
@@ -6252,7 +6252,7 @@
               <ref role="3cqZAo" node="1C_jAsq5j9W" resolve="result" />
             </node>
             <node concept="liA8E" id="1C_jAsq6a68" role="2OqNvi">
-              <ref role="37wK5l" to="psoy:7Oc59RS_hsj" resolve="isSuccessful" />
+              <ref role="37wK5l" to="xydz:7Oc59RS_hsj" resolve="isSuccessful" />
             </node>
           </node>
         </node>
@@ -6265,13 +6265,13 @@
       <node concept="16euLQ" id="5EDW3XEwI2i" role="16eVyc">
         <property role="TrG5h" value="Q" />
         <node concept="3uibUv" id="5EDW3XEwI2j" role="3ztrMU">
-          <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
+          <ref role="3uigEE" to="ugy2:5EDW3XDYeWv" resolve="Query" />
         </node>
       </node>
       <node concept="16euLQ" id="5EDW3XEwI2k" role="16eVyc">
         <property role="TrG5h" value="T" />
         <node concept="3uibUv" id="5EDW3XEwI2l" role="3ztrMU">
-          <ref role="3uigEE" to="i348:6R6MIbU8M46" resolve="QueryTemplate.Token" />
+          <ref role="3uigEE" to="ugy2:6R6MIbU8M46" resolve="QueryTemplate.Token" />
           <node concept="16syzq" id="5EDW3XEwI2m" role="11_B2D">
             <ref role="16sUi3" node="5EDW3XEwI2i" resolve="Q" />
           </node>
@@ -6292,7 +6292,7 @@
         <node concept="10P_77" id="61G6TdDKV8U" role="1tU5fm" />
       </node>
       <node concept="3uibUv" id="4QPCta1aZLv" role="3clF45">
-        <ref role="3uigEE" to="psoy:7Oc59RSEjdb" resolve="Result" />
+        <ref role="3uigEE" to="xydz:7Oc59RSEjdb" resolve="Result" />
       </node>
       <node concept="3Tm6S6" id="4QPCta1aZLw" role="1B3o_S" />
       <node concept="3clFbS" id="4QPCta1aZLx" role="3clF47">
@@ -6378,7 +6378,7 @@
           <node concept="3cpWsn" id="4QPCta1aZLF" role="3cpWs9">
             <property role="TrG5h" value="applyResult" />
             <node concept="3uibUv" id="4QPCta1aZLG" role="1tU5fm">
-              <ref role="3uigEE" to="psoy:7Oc59RSEjdb" resolve="Result" />
+              <ref role="3uigEE" to="xydz:7Oc59RSEjdb" resolve="Result" />
             </node>
             <node concept="2OqwBi" id="4QPCta1aZLH" role="33vP2m">
               <node concept="37vLTw" id="4QPCta1aZLI" role="2Oq$k0">
@@ -6448,14 +6448,14 @@
           <node concept="3cpWsn" id="23Habm5RYmg" role="3cpWs9">
             <property role="TrG5h" value="result" />
             <node concept="3uibUv" id="23Habm5RVOA" role="1tU5fm">
-              <ref role="3uigEE" to="psoy:7Oc59RSEjdb" resolve="Result" />
+              <ref role="3uigEE" to="xydz:7Oc59RSEjdb" resolve="Result" />
             </node>
             <node concept="2OqwBi" id="23Habm5RYmh" role="33vP2m">
               <node concept="37vLTw" id="23Habm5RYmi" role="2Oq$k0">
                 <ref role="3cqZAo" node="4QPCta1aZLF" resolve="applyResult" />
               </node>
               <node concept="liA8E" id="23Habm5RYmj" role="2OqNvi">
-                <ref role="37wK5l" to="psoy:7nkyKX7v7xb" resolve="and" />
+                <ref role="37wK5l" to="xydz:7nkyKX7v7xb" resolve="and" />
                 <node concept="1rXfSq" id="23Habm5RYmk" role="37wK5m">
                   <ref role="37wK5l" node="tIwzd1MM22" resolve="processRequired" />
                   <node concept="2OqwBi" id="23Habm5RYml" role="37wK5m">
@@ -6508,18 +6508,18 @@
       <property role="TrG5h" value="processRequired" />
       <node concept="3Tm6S6" id="tIwzd1MM23" role="1B3o_S" />
       <node concept="3uibUv" id="6i42QSsq0Nv" role="3clF45">
-        <ref role="3uigEE" to="psoy:7Oc59RSEjdb" resolve="Result" />
+        <ref role="3uigEE" to="xydz:7Oc59RSEjdb" resolve="Result" />
       </node>
       <node concept="3clFbS" id="tIwzd1MM0J" role="3clF47">
         <node concept="3cpWs8" id="6i42QSsq4kW" role="3cqZAp">
           <node concept="3cpWsn" id="6i42QSsq4kX" role="3cpWs9">
             <property role="TrG5h" value="result" />
             <node concept="3uibUv" id="6i42QSsq4kV" role="1tU5fm">
-              <ref role="3uigEE" to="psoy:7Oc59RSEjdb" resolve="Result" />
+              <ref role="3uigEE" to="xydz:7Oc59RSEjdb" resolve="Result" />
             </node>
             <node concept="2YIFZM" id="7TC1Xcd$6oG" role="33vP2m">
-              <ref role="37wK5l" to="psoy:7Oc59RSEjeq" resolve="OK" />
-              <ref role="1Pybhc" to="psoy:7Oc59RSEjdb" resolve="Result" />
+              <ref role="37wK5l" to="xydz:7Oc59RSEjeq" resolve="OK" />
+              <ref role="1Pybhc" to="xydz:7Oc59RSEjdb" resolve="Result" />
             </node>
           </node>
         </node>
@@ -6602,7 +6602,7 @@
                     <ref role="3cqZAo" node="6i42QSsq4kX" resolve="result" />
                   </node>
                   <node concept="liA8E" id="6i42QSsvreX" role="2OqNvi">
-                    <ref role="37wK5l" to="psoy:7nkyKX7v7xb" resolve="and" />
+                    <ref role="37wK5l" to="xydz:7nkyKX7v7xb" resolve="and" />
                     <node concept="2OqwBi" id="4MqhgXUA1zd" role="37wK5m">
                       <node concept="37vLTw" id="4MqhgXUA1j8" role="2Oq$k0">
                         <ref role="3cqZAo" node="6i42QSsvfVd" resolve="applyResult" />
@@ -6716,7 +6716,7 @@
       <node concept="37vLTG" id="5ntLU8GlSnJ" role="3clF46">
         <property role="TrG5h" value="tpl" />
         <node concept="3uibUv" id="1ffsG7c51iR" role="1tU5fm">
-          <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstractRuleTemplate" />
+          <ref role="3uigEE" to="ugy2:1ffsG7bUbCM" resolve="AbstractRuleTemplate" />
           <node concept="16syzq" id="7XdbJdyQi3s" role="11_B2D">
             <ref role="16sUi3" node="7XdbJdyQdwM" resolve="T" />
           </node>
@@ -6734,7 +6734,7 @@
               <property role="TrG5h" value="ex" />
               <node concept="nSUau" id="5X1yxJI7J0Y" role="1tU5fm">
                 <node concept="3uibUv" id="5X1yxJI7Rqk" role="nSUat">
-                  <ref role="3uigEE" to="i348:5X1yxJHUo54" resolve="TemplateApplicationException" />
+                  <ref role="3uigEE" to="ugy2:5X1yxJHUo54" resolve="TemplateApplicationException" />
                 </node>
               </node>
             </node>
@@ -6742,11 +6742,11 @@
               <node concept="3cpWs6" id="5X1yxJI8ze0" role="3cqZAp">
                 <node concept="1Ls8ON" id="5X1yxJI8ze1" role="3cqZAk">
                   <node concept="2YIFZM" id="7TC1Xcd$6oW" role="1Lso8e">
-                    <ref role="37wK5l" to="psoy:5X1yxJHYTYX" resolve="RECOVER" />
-                    <ref role="1Pybhc" to="psoy:7Oc59RSEjdb" resolve="Result" />
+                    <ref role="37wK5l" to="xydz:5X1yxJHYTYX" resolve="RECOVER" />
+                    <ref role="1Pybhc" to="xydz:7Oc59RSEjdb" resolve="Result" />
                     <node concept="2ShNRf" id="5X1yxJI8ze3" role="37wK5m">
                       <node concept="1pGfFk" id="5X1yxJI8ze4" role="2ShVmc">
-                        <ref role="37wK5l" to="i348:5X1yxJHUoaR" resolve="TemplateApplicationException" />
+                        <ref role="37wK5l" to="ugy2:5X1yxJHUoaR" resolve="TemplateApplicationException" />
                         <node concept="3cpWs3" id="5X1yxJI8ze5" role="37wK5m">
                           <node concept="1rXfSq" id="5X1yxJI8ze6" role="3uHU7w">
                             <ref role="37wK5l" node="5X1yxJI81iu" resolve="details" />
@@ -6778,7 +6778,7 @@
                     <ref role="37wK5l" to="33ny:~Collections.emptyList()" resolve="emptyList" />
                     <ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
                     <node concept="3uibUv" id="5HVB6JRWByM" role="3PaCim">
-                      <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
+                      <ref role="3uigEE" to="ugy2:7eGEHDlc$ap" resolve="RuleBuilder" />
                     </node>
                   </node>
                   <node concept="2YIFZM" id="5HVB6JRVLiA" role="1Lso8e">
@@ -6804,11 +6804,11 @@
               <node concept="3cpWs6" id="30mNApVb1dm" role="3cqZAp">
                 <node concept="1Ls8ON" id="30mNApVb1dn" role="3cqZAk">
                   <node concept="2YIFZM" id="30mNApVb1do" role="1Lso8e">
-                    <ref role="37wK5l" to="psoy:5X1yxJHYTYX" resolve="RECOVER" />
-                    <ref role="1Pybhc" to="psoy:7Oc59RSEjdb" resolve="Result" />
+                    <ref role="37wK5l" to="xydz:5X1yxJHYTYX" resolve="RECOVER" />
+                    <ref role="1Pybhc" to="xydz:7Oc59RSEjdb" resolve="Result" />
                     <node concept="2ShNRf" id="30mNApVb1dp" role="37wK5m">
                       <node concept="1pGfFk" id="30mNApVb1dq" role="2ShVmc">
-                        <ref role="37wK5l" to="i348:5X1yxJHUoaR" resolve="TemplateApplicationException" />
+                        <ref role="37wK5l" to="ugy2:5X1yxJHUoaR" resolve="TemplateApplicationException" />
                         <node concept="3cpWs3" id="30mNApVb1dr" role="37wK5m">
                           <node concept="1rXfSq" id="30mNApVb1ds" role="3uHU7w">
                             <ref role="37wK5l" node="5X1yxJI81iu" resolve="details" />
@@ -6840,7 +6840,7 @@
                     <ref role="37wK5l" to="33ny:~Collections.emptyList()" resolve="emptyList" />
                     <ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
                     <node concept="3uibUv" id="30mNApVb1d_" role="3PaCim">
-                      <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
+                      <ref role="3uigEE" to="ugy2:7eGEHDlc$ap" resolve="RuleBuilder" />
                     </node>
                   </node>
                   <node concept="2YIFZM" id="30mNApVb1dA" role="1Lso8e">
@@ -6860,7 +6860,7 @@
                 <node concept="1LlUBW" id="1C_jAspWyvn" role="1tU5fm">
                   <node concept="_YKpA" id="1C_jAspWyvz" role="1Lm7xW">
                     <node concept="3uibUv" id="1C_jAspWyv$" role="_ZDj9">
-                      <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
+                      <ref role="3uigEE" to="ugy2:7eGEHDlc$ap" resolve="RuleBuilder" />
                     </node>
                   </node>
                   <node concept="_YKpA" id="1C_jAspWyv_" role="1Lm7xW">
@@ -6877,7 +6877,7 @@
                             <ref role="3cqZAo" node="5ntLU8GlSnJ" resolve="tpl" />
                           </node>
                           <node concept="liA8E" id="1C_jAspW_tZ" role="2OqNvi">
-                            <ref role="37wK5l" to="i348:7XdbJdyi9Ld" resolve="applyReduce" />
+                            <ref role="37wK5l" to="ugy2:7XdbJdyi9Ld" resolve="applyReduce" />
                             <node concept="37vLTw" id="1C_jAspW_u0" role="37wK5m">
                               <ref role="3cqZAo" node="5ntLU8GlSnL" resolve="node" />
                             </node>
@@ -6887,7 +6887,7 @@
                             <node concept="2ShNRf" id="1C_jAspW_u2" role="37wK5m">
                               <node concept="Tc6Ow" id="1C_jAspW_u3" role="2ShVmc">
                                 <node concept="3uibUv" id="1C_jAspW_u4" role="HW$YZ">
-                                  <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
+                                  <ref role="3uigEE" to="ugy2:7eGEHDlc$ap" resolve="RuleBuilder" />
                                 </node>
                               </node>
                             </node>
@@ -6896,7 +6896,7 @@
                                 <property role="TrG5h" value="builders" />
                                 <node concept="_YKpA" id="1C_jAspW_u7" role="1tU5fm">
                                   <node concept="3uibUv" id="1C_jAspW_u8" role="_ZDj9">
-                                    <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
+                                    <ref role="3uigEE" to="ugy2:7eGEHDlc$ap" resolve="RuleBuilder" />
                                   </node>
                                 </node>
                               </node>
@@ -6918,7 +6918,7 @@
                                           <ref role="3cqZAo" node="1C_jAspW_u9" resolve="token" />
                                         </node>
                                         <node concept="liA8E" id="1C_jAspW_ui" role="2OqNvi">
-                                          <ref role="37wK5l" to="i348:2RRx4MZ6CCe" resolve="apply" />
+                                          <ref role="37wK5l" to="ugy2:2RRx4MZ6CCe" resolve="apply" />
                                         </node>
                                       </node>
                                     </node>
@@ -6945,8 +6945,8 @@
             <node concept="3cpWs6" id="5MHpiyl_Uhz" role="3cqZAp">
               <node concept="1Ls8ON" id="6i42QSsqED_" role="3cqZAk">
                 <node concept="2YIFZM" id="7TC1Xcd$6oH" role="1Lso8e">
-                  <ref role="37wK5l" to="psoy:7Oc59RSEjeq" resolve="OK" />
-                  <ref role="1Pybhc" to="psoy:7Oc59RSEjdb" resolve="Result" />
+                  <ref role="37wK5l" to="xydz:7Oc59RSEjeq" resolve="OK" />
+                  <ref role="1Pybhc" to="xydz:7Oc59RSEjdb" resolve="Result" />
                 </node>
                 <node concept="1LFfDK" id="1C_jAspX5cl" role="1Lso8e">
                   <node concept="3cmrfG" id="1C_jAspXe5s" role="1LF_Uc">
@@ -6982,11 +6982,11 @@
               <node concept="3cpWs6" id="5MHpiylA5DD" role="3cqZAp">
                 <node concept="1Ls8ON" id="6i42QSsqS_w" role="3cqZAk">
                   <node concept="2YIFZM" id="51h1DIGuKJm" role="1Lso8e">
-                    <ref role="37wK5l" to="psoy:5X1yxJHYTYX" resolve="RECOVER" />
-                    <ref role="1Pybhc" to="psoy:7Oc59RSEjdb" resolve="Result" />
+                    <ref role="37wK5l" to="xydz:5X1yxJHYTYX" resolve="RECOVER" />
+                    <ref role="1Pybhc" to="xydz:7Oc59RSEjdb" resolve="Result" />
                     <node concept="2ShNRf" id="51h1DIGuKJn" role="37wK5m">
                       <node concept="1pGfFk" id="51h1DIGuKJo" role="2ShVmc">
-                        <ref role="37wK5l" to="i348:5X1yxJHUoaR" resolve="TemplateApplicationException" />
+                        <ref role="37wK5l" to="ugy2:5X1yxJHUoaR" resolve="TemplateApplicationException" />
                         <node concept="3cpWs3" id="51h1DIGuKJp" role="37wK5m">
                           <node concept="1rXfSq" id="51h1DIGuKJq" role="3uHU7w">
                             <ref role="37wK5l" node="5X1yxJI81iu" resolve="details" />
@@ -7018,7 +7018,7 @@
                     <ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
                     <ref role="37wK5l" to="33ny:~Collections.emptyList()" resolve="emptyList" />
                     <node concept="3uibUv" id="5HVB6JRY6BJ" role="3PaCim">
-                      <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
+                      <ref role="3uigEE" to="ugy2:7eGEHDlc$ap" resolve="RuleBuilder" />
                     </node>
                   </node>
                   <node concept="2YIFZM" id="5HVB6JRY6BK" role="1Lso8e">
@@ -7035,11 +7035,11 @@
       </node>
       <node concept="1LlUBW" id="6i42QSsqj9x" role="3clF45">
         <node concept="3uibUv" id="6i42QSsqniA" role="1Lm7xW">
-          <ref role="3uigEE" to="psoy:7Oc59RSEjdb" resolve="Result" />
+          <ref role="3uigEE" to="xydz:7Oc59RSEjdb" resolve="Result" />
         </node>
         <node concept="_YKpA" id="5HVB6JRXu9t" role="1Lm7xW">
           <node concept="3uibUv" id="5HVB6JRXu9v" role="_ZDj9">
-            <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
+            <ref role="3uigEE" to="ugy2:7eGEHDlc$ap" resolve="RuleBuilder" />
           </node>
         </node>
         <node concept="_YKpA" id="5HVB6JRPZ0M" role="1Lm7xW">
@@ -7049,7 +7049,7 @@
       <node concept="16euLQ" id="7XdbJdyQdwM" role="16eVyc">
         <property role="TrG5h" value="T" />
         <node concept="3uibUv" id="7XdbJdyQhEU" role="3ztrMU">
-          <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplate.Token" />
+          <ref role="3uigEE" to="ugy2:2RRx4MZ6_68" resolve="RuleTemplate.Token" />
         </node>
       </node>
     </node>
@@ -7060,7 +7060,7 @@
       <node concept="37vLTG" id="6OXbTDyaLzX" role="3clF46">
         <property role="TrG5h" value="tpl" />
         <node concept="3uibUv" id="6OXbTDybcP0" role="1tU5fm">
-          <ref role="3uigEE" to="i348:6OXbTD$iNPP" resolve="QueryTemplate" />
+          <ref role="3uigEE" to="ugy2:6OXbTD$iNPP" resolve="QueryTemplate" />
           <node concept="16syzq" id="6OXbTDybqOL" role="11_B2D">
             <ref role="16sUi3" node="6OXbTDyaL_y" resolve="T" />
           </node>
@@ -7079,7 +7079,7 @@
               <property role="TrG5h" value="ex" />
               <node concept="nSUau" id="5X1yxJI9h8F" role="1tU5fm">
                 <node concept="3uibUv" id="5X1yxJI9qC6" role="nSUat">
-                  <ref role="3uigEE" to="i348:5X1yxJHUo54" resolve="TemplateApplicationException" />
+                  <ref role="3uigEE" to="ugy2:5X1yxJHUo54" resolve="TemplateApplicationException" />
                 </node>
               </node>
             </node>
@@ -7087,11 +7087,11 @@
               <node concept="3cpWs6" id="5X1yxJI9FIO" role="3cqZAp">
                 <node concept="1Ls8ON" id="5X1yxJI9FIP" role="3cqZAk">
                   <node concept="2YIFZM" id="HwwsI3jg_D" role="1Lso8e">
-                    <ref role="37wK5l" to="psoy:5X1yxJHYPm2" resolve="FAIL" />
-                    <ref role="1Pybhc" to="psoy:7Oc59RSEjdb" resolve="Result" />
+                    <ref role="37wK5l" to="xydz:5X1yxJHYPm2" resolve="FAIL" />
+                    <ref role="1Pybhc" to="xydz:7Oc59RSEjdb" resolve="Result" />
                     <node concept="2ShNRf" id="HwwsI3jg_E" role="37wK5m">
                       <node concept="1pGfFk" id="HwwsI3jg_F" role="2ShVmc">
-                        <ref role="37wK5l" to="i348:5X1yxJHUoaR" resolve="TemplateApplicationException" />
+                        <ref role="37wK5l" to="ugy2:5X1yxJHUoaR" resolve="TemplateApplicationException" />
                         <node concept="3cpWs3" id="HwwsI3jg_G" role="37wK5m">
                           <node concept="2YIFZM" id="HwwsI3jg_H" role="3uHU7w">
                             <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object)" resolve="valueOf" />
@@ -7123,7 +7123,7 @@
                   <node concept="2ShNRf" id="5X1yxJI9FJ2" role="1Lso8e">
                     <node concept="kMnCb" id="5X1yxJI9FJ3" role="2ShVmc">
                       <node concept="3uibUv" id="5X1yxJI9FJ4" role="kMuH3">
-                        <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
+                        <ref role="3uigEE" to="ugy2:7eGEHDlc$ap" resolve="RuleBuilder" />
                       </node>
                     </node>
                   </node>
@@ -7144,7 +7144,7 @@
                 <node concept="1LlUBW" id="1C_jAspZNKM" role="1tU5fm">
                   <node concept="A3Dl8" id="1C_jAspZNL0" role="1Lm7xW">
                     <node concept="3uibUv" id="1C_jAspZNL1" role="A3Ik2">
-                      <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
+                      <ref role="3uigEE" to="ugy2:7eGEHDlc$ap" resolve="RuleBuilder" />
                     </node>
                   </node>
                   <node concept="_YKpA" id="1C_jAspZNKY" role="1Lm7xW">
@@ -7164,14 +7164,14 @@
                                   <ref role="3cqZAo" node="6OXbTDyaLzX" resolve="tpl" />
                                 </node>
                                 <node concept="liA8E" id="1C_jAspZQGz" role="2OqNvi">
-                                  <ref role="37wK5l" to="i348:5itBwM78vMu" resolve="createToken" />
+                                  <ref role="37wK5l" to="ugy2:5itBwM78vMu" resolve="createToken" />
                                   <node concept="37vLTw" id="1C_jAspZQG$" role="37wK5m">
                                     <ref role="3cqZAo" node="7DvO2Mah9z5" resolve="applicationSession" />
                                   </node>
                                 </node>
                               </node>
                               <node concept="liA8E" id="1C_jAspZQG_" role="2OqNvi">
-                                <ref role="37wK5l" to="i348:5EDW3XEg_7p" resolve="withQuery" />
+                                <ref role="37wK5l" to="ugy2:5EDW3XEg_7p" resolve="withQuery" />
                                 <node concept="37vLTw" id="1C_jAspZQGA" role="37wK5m">
                                   <ref role="3cqZAo" node="5EDW3XEuKDu" resolve="query" />
                                 </node>
@@ -7179,7 +7179,7 @@
                             </node>
                           </node>
                           <node concept="liA8E" id="1C_jAspZQGB" role="2OqNvi">
-                            <ref role="37wK5l" to="i348:6R6MIbUcYSn" resolve="apply" />
+                            <ref role="37wK5l" to="ugy2:6R6MIbUcYSn" resolve="apply" />
                           </node>
                         </node>
                       </node>
@@ -7191,8 +7191,8 @@
             <node concept="3cpWs6" id="6OXbTDyc$Kv" role="3cqZAp">
               <node concept="1Ls8ON" id="6OXbTDyc$Kw" role="3cqZAk">
                 <node concept="2YIFZM" id="7TC1Xcd$6oI" role="1Lso8e">
-                  <ref role="37wK5l" to="psoy:7Oc59RSEjeq" resolve="OK" />
-                  <ref role="1Pybhc" to="psoy:7Oc59RSEjdb" resolve="Result" />
+                  <ref role="37wK5l" to="xydz:7Oc59RSEjeq" resolve="OK" />
+                  <ref role="1Pybhc" to="xydz:7Oc59RSEjdb" resolve="Result" />
                 </node>
                 <node concept="1LFfDK" id="1C_jAsq0y4T" role="1Lso8e">
                   <node concept="3cmrfG" id="1C_jAsq0FmN" role="1LF_Uc">
@@ -7228,11 +7228,11 @@
               <node concept="3cpWs6" id="6OXbTDyaL_g" role="3cqZAp">
                 <node concept="1Ls8ON" id="6OXbTDyaL_h" role="3cqZAk">
                   <node concept="2YIFZM" id="7TC1Xcd$6oT" role="1Lso8e">
-                    <ref role="37wK5l" to="psoy:5X1yxJHYPm2" resolve="FAIL" />
-                    <ref role="1Pybhc" to="psoy:7Oc59RSEjdb" resolve="Result" />
+                    <ref role="37wK5l" to="xydz:5X1yxJHYPm2" resolve="FAIL" />
+                    <ref role="1Pybhc" to="xydz:7Oc59RSEjdb" resolve="Result" />
                     <node concept="2ShNRf" id="5X1yxJIa385" role="37wK5m">
                       <node concept="1pGfFk" id="5X1yxJIa386" role="2ShVmc">
-                        <ref role="37wK5l" to="i348:5X1yxJHUoaR" resolve="TemplateApplicationException" />
+                        <ref role="37wK5l" to="ugy2:5X1yxJHUoaR" resolve="TemplateApplicationException" />
                         <node concept="3cpWs3" id="5X1yxJIa387" role="37wK5m">
                           <node concept="2YIFZM" id="5X1yxJIa388" role="3uHU7w">
                             <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object)" resolve="valueOf" />
@@ -7264,7 +7264,7 @@
                   <node concept="2ShNRf" id="6OXbTDyaL_r" role="1Lso8e">
                     <node concept="kMnCb" id="6OXbTDyaL_s" role="2ShVmc">
                       <node concept="3uibUv" id="6OXbTDyaL_t" role="kMuH3">
-                        <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
+                        <ref role="3uigEE" to="ugy2:7eGEHDlc$ap" resolve="RuleBuilder" />
                       </node>
                     </node>
                   </node>
@@ -7281,11 +7281,11 @@
       </node>
       <node concept="1LlUBW" id="6OXbTDyaL_u" role="3clF45">
         <node concept="3uibUv" id="6OXbTDyaL_v" role="1Lm7xW">
-          <ref role="3uigEE" to="psoy:7Oc59RSEjdb" resolve="Result" />
+          <ref role="3uigEE" to="xydz:7Oc59RSEjdb" resolve="Result" />
         </node>
         <node concept="A3Dl8" id="6OXbTDyaL_w" role="1Lm7xW">
           <node concept="3uibUv" id="6OXbTDyaL_x" role="A3Ik2">
-            <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
+            <ref role="3uigEE" to="ugy2:7eGEHDlc$ap" resolve="RuleBuilder" />
           </node>
         </node>
         <node concept="_YKpA" id="1C_jAsq1uOM" role="1Lm7xW">
@@ -7295,13 +7295,13 @@
       <node concept="16euLQ" id="5EDW3XEvo5m" role="16eVyc">
         <property role="TrG5h" value="Q" />
         <node concept="3uibUv" id="5EDW3XEvwaZ" role="3ztrMU">
-          <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
+          <ref role="3uigEE" to="ugy2:5EDW3XDYeWv" resolve="Query" />
         </node>
       </node>
       <node concept="16euLQ" id="6OXbTDyaL_y" role="16eVyc">
         <property role="TrG5h" value="T" />
         <node concept="3uibUv" id="6R6MIbUdgwE" role="3ztrMU">
-          <ref role="3uigEE" to="i348:6R6MIbU8M46" resolve="QueryTemplate.Token" />
+          <ref role="3uigEE" to="ugy2:6R6MIbU8M46" resolve="QueryTemplate.Token" />
           <node concept="16syzq" id="5EDW3XEvy57" role="11_B2D">
             <ref role="16sUi3" node="5EDW3XEvo5m" resolve="Q" />
           </node>
@@ -7340,14 +7340,14 @@
           <node concept="3cpWsn" id="1C_jAspMZ7T" role="3cpWs9">
             <property role="TrG5h" value="requiredCollector" />
             <node concept="3uibUv" id="1C_jAspMZ7U" role="1tU5fm">
-              <ref role="3uigEE" to="i348:4vBwiiV6130" resolve="TemplateApplicationSession.RequireHook" />
+              <ref role="3uigEE" to="ugy2:4vBwiiV6130" resolve="TemplateApplicationSession.RequireHook" />
             </node>
             <node concept="2ShNRf" id="1C_jAspMZ7V" role="33vP2m">
               <node concept="YeOm9" id="1C_jAspMZ7W" role="2ShVmc">
                 <node concept="1Y3b0j" id="1C_jAspMZ7X" role="YeSDq">
                   <property role="2bfB8j" value="true" />
                   <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
-                  <ref role="1Y3XeK" to="i348:4vBwiiV6130" resolve="TemplateApplicationSession.RequireHook" />
+                  <ref role="1Y3XeK" to="ugy2:4vBwiiV6130" resolve="TemplateApplicationSession.RequireHook" />
                   <node concept="3Tm1VV" id="1C_jAspMZ7Y" role="1B3o_S" />
                   <node concept="3clFb_" id="1C_jAspMZ7Z" role="jymVt">
                     <property role="1EzhhJ" value="false" />
@@ -7387,7 +7387,7 @@
             <node concept="3clFbF" id="1C_jAspNPR2" role="3cqZAp">
               <node concept="2OqwBi" id="1C_jAspNPR3" role="3clFbG">
                 <node concept="liA8E" id="1C_jAspNPR4" role="2OqNvi">
-                  <ref role="37wK5l" to="i348:7DvO2M9IiN4" resolve="addRequireHook" />
+                  <ref role="37wK5l" to="ugy2:7DvO2M9IiN4" resolve="addRequireHook" />
                   <node concept="37vLTw" id="1C_jAspNPR5" role="37wK5m">
                     <ref role="3cqZAo" node="1C_jAspMZ7T" resolve="requiredCollector" />
                   </node>
@@ -7430,7 +7430,7 @@
               <node concept="3clFbF" id="1C_jAspO0d7" role="3cqZAp">
                 <node concept="2OqwBi" id="1C_jAspO0d8" role="3clFbG">
                   <node concept="liA8E" id="1C_jAspO0d9" role="2OqNvi">
-                    <ref role="37wK5l" to="i348:7DvO2M9IiNh" resolve="removeRequireHook" />
+                    <ref role="37wK5l" to="ugy2:7DvO2M9IiNh" resolve="removeRequireHook" />
                     <node concept="37vLTw" id="1C_jAspO0da" role="37wK5m">
                       <ref role="3cqZAo" node="1C_jAspMZ7T" resolve="requiredCollector" />
                     </node>
@@ -7465,10 +7465,10 @@
         <property role="TrG5h" value="tpls" />
         <node concept="A3Dl8" id="tIwzd1I3Xn" role="1tU5fm">
           <node concept="3uibUv" id="6tPOoeTdbj8" role="A3Ik2">
-            <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstractRuleTemplate" />
+            <ref role="3uigEE" to="ugy2:1ffsG7bUbCM" resolve="AbstractRuleTemplate" />
             <node concept="3qUE_q" id="6tPOoeTdbj9" role="11_B2D">
               <node concept="3uibUv" id="6tPOoeTdbja" role="3qUE_r">
-                <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplate.Token" />
+                <ref role="3uigEE" to="ugy2:2RRx4MZ6_68" resolve="RuleTemplate.Token" />
               </node>
             </node>
           </node>
@@ -7540,11 +7540,11 @@
           <node concept="3cpWsn" id="6i42QSsrVMO" role="3cpWs9">
             <property role="TrG5h" value="result" />
             <node concept="3uibUv" id="6i42QSsrVMM" role="1tU5fm">
-              <ref role="3uigEE" to="psoy:7Oc59RSEjdb" resolve="Result" />
+              <ref role="3uigEE" to="xydz:7Oc59RSEjdb" resolve="Result" />
             </node>
             <node concept="2YIFZM" id="7TC1Xcd$6oJ" role="33vP2m">
-              <ref role="37wK5l" to="psoy:7Oc59RSEjeq" resolve="OK" />
-              <ref role="1Pybhc" to="psoy:7Oc59RSEjdb" resolve="Result" />
+              <ref role="37wK5l" to="xydz:7Oc59RSEjeq" resolve="OK" />
+              <ref role="1Pybhc" to="xydz:7Oc59RSEjdb" resolve="Result" />
             </node>
           </node>
         </node>
@@ -7574,7 +7574,7 @@
                 </node>
                 <node concept="2OqwBi" id="xaaVXvp6wJ" role="3uHU7w">
                   <node concept="liA8E" id="xaaVXvp77z" role="2OqNvi">
-                    <ref role="37wK5l" to="i348:xaaVXv6GTE" resolve="isAuxiliary" />
+                    <ref role="37wK5l" to="ugy2:xaaVXv6GTE" resolve="isAuxiliary" />
                   </node>
                   <node concept="37vLTw" id="5HxDM7D5qHb" role="2Oq$k0">
                     <ref role="3cqZAo" node="4MqhgXUBzFo" resolve="template" />
@@ -7648,13 +7648,13 @@
                           <ref role="3cqZAo" node="6i42QSsrVMO" resolve="result" />
                         </node>
                         <node concept="liA8E" id="47oVduOAAdp" role="2OqNvi">
-                          <ref role="37wK5l" to="psoy:7nkyKX7v7xb" resolve="and" />
+                          <ref role="37wK5l" to="xydz:7nkyKX7v7xb" resolve="and" />
                           <node concept="2YIFZM" id="51h1DIGuTeM" role="37wK5m">
-                            <ref role="37wK5l" to="psoy:5X1yxJHYTYX" resolve="RECOVER" />
-                            <ref role="1Pybhc" to="psoy:7Oc59RSEjdb" resolve="Result" />
+                            <ref role="37wK5l" to="xydz:5X1yxJHYTYX" resolve="RECOVER" />
+                            <ref role="1Pybhc" to="xydz:7Oc59RSEjdb" resolve="Result" />
                             <node concept="2ShNRf" id="51h1DIGuTeN" role="37wK5m">
                               <node concept="1pGfFk" id="51h1DIGuTeO" role="2ShVmc">
-                                <ref role="37wK5l" to="i348:5X1yxJHUoaR" resolve="TemplateApplicationException" />
+                                <ref role="37wK5l" to="ugy2:5X1yxJHUoaR" resolve="TemplateApplicationException" />
                                 <node concept="3cpWs3" id="51h1DIGuTeP" role="37wK5m">
                                   <node concept="37vLTw" id="51h1DIGuTeQ" role="3uHU7w">
                                     <ref role="3cqZAo" node="47oVduOAAd2" resolve="details" />
@@ -7679,7 +7679,7 @@
                                           <ref role="3cqZAo" node="4MqhgXUBzFo" resolve="template" />
                                         </node>
                                         <node concept="liA8E" id="51h1DIGuTf0" role="2OqNvi">
-                                          <ref role="37wK5l" to="i348:1ffsG7bUgP4" resolve="toString" />
+                                          <ref role="37wK5l" to="ugy2:1ffsG7bUgP4" resolve="toString" />
                                         </node>
                                       </node>
                                     </node>
@@ -7742,11 +7742,11 @@
                                 <property role="TrG5h" value="res_rbs_reqs" />
                                 <node concept="1LlUBW" id="47oVduO$9gw" role="1tU5fm">
                                   <node concept="3uibUv" id="47oVduO$9gJ" role="1Lm7xW">
-                                    <ref role="3uigEE" to="psoy:7Oc59RSEjdb" resolve="Result" />
+                                    <ref role="3uigEE" to="xydz:7Oc59RSEjdb" resolve="Result" />
                                   </node>
                                   <node concept="_YKpA" id="47oVduO$9gK" role="1Lm7xW">
                                     <node concept="3uibUv" id="47oVduO$9gL" role="_ZDj9">
-                                      <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
+                                      <ref role="3uigEE" to="ugy2:7eGEHDlc$ap" resolve="RuleBuilder" />
                                     </node>
                                   </node>
                                   <node concept="_YKpA" id="47oVduO$9gM" role="1Lm7xW">
@@ -7768,7 +7768,7 @@
                               <node concept="3cpWsn" id="47oVduO$eJY" role="3cpWs9">
                                 <property role="TrG5h" value="res" />
                                 <node concept="3uibUv" id="47oVduO$eAV" role="1tU5fm">
-                                  <ref role="3uigEE" to="psoy:7Oc59RSEjdb" resolve="Result" />
+                                  <ref role="3uigEE" to="xydz:7Oc59RSEjdb" resolve="Result" />
                                 </node>
                                 <node concept="1LFfDK" id="47oVduO$eJZ" role="33vP2m">
                                   <node concept="3cmrfG" id="47oVduO$eK0" role="1LF_Uc">
@@ -7785,7 +7785,7 @@
                                 <property role="TrG5h" value="builders" />
                                 <node concept="3vKaQO" id="47oVduOQIbA" role="1tU5fm">
                                   <node concept="3uibUv" id="47oVduOQIbC" role="3O5elw">
-                                    <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
+                                    <ref role="3uigEE" to="ugy2:7eGEHDlc$ap" resolve="RuleBuilder" />
                                   </node>
                                 </node>
                                 <node concept="1LFfDK" id="47oVduO$fi9" role="33vP2m">
@@ -7845,7 +7845,7 @@
                                     <ref role="3cqZAo" node="6i42QSsrVMO" resolve="result" />
                                   </node>
                                   <node concept="liA8E" id="47oVduOApPl" role="2OqNvi">
-                                    <ref role="37wK5l" to="psoy:7nkyKX7v7xb" resolve="and" />
+                                    <ref role="37wK5l" to="xydz:7nkyKX7v7xb" resolve="and" />
                                     <node concept="37vLTw" id="47oVduOAqZE" role="37wK5m">
                                       <ref role="3cqZAo" node="47oVduO$eJY" resolve="res" />
                                     </node>
@@ -7884,7 +7884,7 @@
                                   <ref role="3cqZAo" node="47oVduO$eJY" resolve="res" />
                                 </node>
                                 <node concept="liA8E" id="47oVduO_P3f" role="2OqNvi">
-                                  <ref role="37wK5l" to="psoy:7Oc59RS_hsj" resolve="isSuccessful" />
+                                  <ref role="37wK5l" to="xydz:7Oc59RS_hsj" resolve="isSuccessful" />
                                 </node>
                               </node>
                               <node concept="9aQIb" id="47oVduOAna0" role="9aQIa">
@@ -7897,7 +7897,7 @@
                                             <ref role="3cqZAo" node="47oVduO$eJY" resolve="res" />
                                           </node>
                                           <node concept="liA8E" id="6cGbuqO82xb" role="2OqNvi">
-                                            <ref role="37wK5l" to="psoy:5X1yxJI3E6N" resolve="allCauses" />
+                                            <ref role="37wK5l" to="xydz:5X1yxJI3E6N" resolve="allCauses" />
                                           </node>
                                         </node>
                                         <node concept="1uHKPH" id="6cGbuqO8k5q" role="2OqNvi" />
@@ -7986,13 +7986,13 @@
                             <ref role="3cqZAo" node="6i42QSsrVMO" resolve="result" />
                           </node>
                           <node concept="liA8E" id="3rrtTcS7pRb" role="2OqNvi">
-                            <ref role="37wK5l" to="psoy:7nkyKX7v7xb" resolve="and" />
+                            <ref role="37wK5l" to="xydz:7nkyKX7v7xb" resolve="and" />
                             <node concept="2YIFZM" id="51h1DIGv0Lu" role="37wK5m">
-                              <ref role="37wK5l" to="psoy:5X1yxJHYTYX" resolve="RECOVER" />
-                              <ref role="1Pybhc" to="psoy:7Oc59RSEjdb" resolve="Result" />
+                              <ref role="37wK5l" to="xydz:5X1yxJHYTYX" resolve="RECOVER" />
+                              <ref role="1Pybhc" to="xydz:7Oc59RSEjdb" resolve="Result" />
                               <node concept="2ShNRf" id="51h1DIGv0Lv" role="37wK5m">
                                 <node concept="1pGfFk" id="51h1DIGv0Lw" role="2ShVmc">
-                                  <ref role="37wK5l" to="i348:5X1yxJHUoaR" resolve="TemplateApplicationException" />
+                                  <ref role="37wK5l" to="ugy2:5X1yxJHUoaR" resolve="TemplateApplicationException" />
                                   <node concept="3cpWs3" id="51h1DIGv0Lx" role="37wK5m">
                                     <node concept="37vLTw" id="51h1DIGv0Ly" role="3uHU7w">
                                       <ref role="3cqZAo" node="3rrtTcS7pQO" resolve="details" />
@@ -8017,7 +8017,7 @@
                                             <ref role="3cqZAo" node="4MqhgXUBzFo" resolve="template" />
                                           </node>
                                           <node concept="liA8E" id="51h1DIGv0LG" role="2OqNvi">
-                                            <ref role="37wK5l" to="i348:1ffsG7bUgP4" resolve="toString" />
+                                            <ref role="37wK5l" to="ugy2:1ffsG7bUgP4" resolve="toString" />
                                           </node>
                                         </node>
                                       </node>
@@ -8116,7 +8116,7 @@
                                         <ref role="3cqZAo" node="4MqhgXUBzFo" resolve="template" />
                                       </node>
                                       <node concept="3uibUv" id="47oVduO_Y9$" role="10QFUM">
-                                        <ref role="3uigEE" to="i348:1ffsG7bW_V4" resolve="RuleTemplate" />
+                                        <ref role="3uigEE" to="ugy2:1ffsG7bW_V4" resolve="RuleTemplate" />
                                       </node>
                                     </node>
                                   </node>
@@ -8163,10 +8163,10 @@
           <node concept="3cpWsn" id="4MqhgXUBzFo" role="1Duv9x">
             <property role="TrG5h" value="template" />
             <node concept="3uibUv" id="4MqhgXUBzF7" role="1tU5fm">
-              <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstractRuleTemplate" />
+              <ref role="3uigEE" to="ugy2:1ffsG7bUbCM" resolve="AbstractRuleTemplate" />
               <node concept="3qUE_q" id="7XdbJdyRy2h" role="11_B2D">
                 <node concept="3uibUv" id="7XdbJdyRyYU" role="3qUE_r">
-                  <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplate.Token" />
+                  <ref role="3uigEE" to="ugy2:2RRx4MZ6_68" resolve="RuleTemplate.Token" />
                 </node>
               </node>
             </node>
@@ -8199,7 +8199,7 @@
       </node>
       <node concept="1LlUBW" id="6i42QSss8Ot" role="3clF45">
         <node concept="3uibUv" id="6i42QSssbTx" role="1Lm7xW">
-          <ref role="3uigEE" to="psoy:7Oc59RSEjdb" resolve="Result" />
+          <ref role="3uigEE" to="xydz:7Oc59RSEjdb" resolve="Result" />
         </node>
         <node concept="3vKaQO" id="tIwzd1JBnD" role="1Lm7xW">
           <node concept="3Tqbb2" id="tIwzd1JBnF" role="3O5elw" />
@@ -8219,7 +8219,7 @@
         <property role="TrG5h" value="builders" />
         <node concept="A3Dl8" id="47oVduO_dYg" role="1tU5fm">
           <node concept="3uibUv" id="47oVduO_gBJ" role="A3Ik2">
-            <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
+            <ref role="3uigEE" to="ugy2:7eGEHDlc$ap" resolve="RuleBuilder" />
           </node>
         </node>
       </node>
@@ -8286,7 +8286,7 @@
                       <ref role="2Gs0qQ" node="47oVduO$qD_" resolve="builder" />
                     </node>
                     <node concept="liA8E" id="47oVduO$qCc" role="2OqNvi">
-                      <ref role="37wK5l" to="i348:7eGEHDlc$bR" resolve="appendHeadKept" />
+                      <ref role="37wK5l" to="ugy2:7eGEHDlc$bR" resolve="appendHeadKept" />
                       <node concept="37vLTw" id="47oVduO$qCd" role="37wK5m">
                         <ref role="3cqZAo" node="6i42QSsj_y2" resolve="mainConstraint" />
                       </node>
@@ -8300,7 +8300,7 @@
                     <ref role="2Gs0qQ" node="47oVduO$qD_" resolve="builder" />
                   </node>
                   <node concept="liA8E" id="47oVduO$qCh" role="2OqNvi">
-                    <ref role="37wK5l" to="i348:7nkyKX7mcq7" resolve="hasHead" />
+                    <ref role="37wK5l" to="ugy2:7nkyKX7mcq7" resolve="hasHead" />
                   </node>
                 </node>
               </node>
@@ -8388,10 +8388,10 @@
                       <ref role="2Gs0qQ" node="47oVduO$qD_" resolve="builder" />
                     </node>
                     <node concept="liA8E" id="47oVduO$qCM" role="2OqNvi">
-                      <ref role="37wK5l" to="i348:7eGEHDlc$aw" resolve="appendBody" />
+                      <ref role="37wK5l" to="ugy2:7eGEHDlc$aw" resolve="appendBody" />
                       <node concept="2ShNRf" id="47oVduO$qCN" role="37wK5m">
                         <node concept="1pGfFk" id="47oVduO$qCO" role="2ShVmc">
-                          <ref role="37wK5l" to="cxk7:4xBopTzrPWl" resolve="AssertPredicate" />
+                          <ref role="37wK5l" to="tpfl:4xBopTzrPWl" resolve="AssertPredicate" />
                           <node concept="10M0yZ" id="47oVduO$qCP" role="37wK5m">
                             <ref role="1PxDUh" to="wyt6:~Boolean" resolve="Boolean" />
                             <ref role="3cqZAo" to="wyt6:~Boolean.TRUE" resolve="TRUE" />
@@ -8408,7 +8408,7 @@
                     <ref role="2Gs0qQ" node="47oVduO$qD_" resolve="builder" />
                   </node>
                   <node concept="liA8E" id="47oVduO$qCT" role="2OqNvi">
-                    <ref role="37wK5l" to="i348:7nkyKX7mnWq" resolve="hasBody" />
+                    <ref role="37wK5l" to="ugy2:7nkyKX7mnWq" resolve="hasBody" />
                   </node>
                 </node>
               </node>
@@ -8458,7 +8458,7 @@
                       <ref role="2Gs0qQ" node="47oVduO$qD_" resolve="builder" />
                     </node>
                     <node concept="liA8E" id="47oVduO$qDc" role="2OqNvi">
-                      <ref role="37wK5l" to="i348:1lzLQ0zuv5E" resolve="setTagSuffix" />
+                      <ref role="37wK5l" to="ugy2:1lzLQ0zuv5E" resolve="setTagSuffix" />
                       <node concept="3uNrnE" id="47oVduO$qDd" role="37wK5m">
                         <node concept="37vLTw" id="47oVduO$qDe" role="2$L3a6">
                           <ref role="3cqZAo" node="47oVduO$qBS" resolve="tagSuffix" />
@@ -8478,7 +8478,7 @@
                       <ref role="2Gs0qQ" node="47oVduO$qD_" resolve="builder" />
                     </node>
                     <node concept="liA8E" id="47oVduO$qDk" role="2OqNvi">
-                      <ref role="37wK5l" to="i348:1lzLQ0zv1m2" resolve="tag" />
+                      <ref role="37wK5l" to="ugy2:1lzLQ0zv1m2" resolve="tag" />
                     </node>
                   </node>
                 </node>
@@ -8496,7 +8496,7 @@
                             <ref role="2Gs0qQ" node="47oVduO$qD_" resolve="builder" />
                           </node>
                           <node concept="liA8E" id="47oVduO$qDt" role="2OqNvi">
-                            <ref role="37wK5l" to="i348:1lzLQ0zv1m2" resolve="tag" />
+                            <ref role="37wK5l" to="ugy2:1lzLQ0zv1m2" resolve="tag" />
                           </node>
                         </node>
                       </node>
@@ -8520,7 +8520,7 @@
       <property role="TrG5h" value="applyQueryTemplates" />
       <node concept="1LlUBW" id="1C_jAsq31kx" role="3clF45">
         <node concept="3uibUv" id="1C_jAsq3xnU" role="1Lm7xW">
-          <ref role="3uigEE" to="psoy:7Oc59RSEjdb" resolve="Result" />
+          <ref role="3uigEE" to="xydz:7Oc59RSEjdb" resolve="Result" />
         </node>
         <node concept="_YKpA" id="1C_jAsq3KmN" role="1Lm7xW">
           <node concept="3Tqbb2" id="1C_jAsq3Qj7" role="_ZDj9" />
@@ -8532,11 +8532,11 @@
           <node concept="3cpWsn" id="6OXbTDyef8r" role="3cpWs9">
             <property role="TrG5h" value="result" />
             <node concept="3uibUv" id="6OXbTDyef8s" role="1tU5fm">
-              <ref role="3uigEE" to="psoy:7Oc59RSEjdb" resolve="Result" />
+              <ref role="3uigEE" to="xydz:7Oc59RSEjdb" resolve="Result" />
             </node>
             <node concept="2YIFZM" id="7TC1Xcd$6oK" role="33vP2m">
-              <ref role="37wK5l" to="psoy:7Oc59RSEjeq" resolve="OK" />
-              <ref role="1Pybhc" to="psoy:7Oc59RSEjdb" resolve="Result" />
+              <ref role="37wK5l" to="xydz:7Oc59RSEjeq" resolve="OK" />
+              <ref role="1Pybhc" to="xydz:7Oc59RSEjdb" resolve="Result" />
             </node>
           </node>
         </node>
@@ -8546,11 +8546,11 @@
             <property role="TrG5h" value="result_builders_reqs" />
             <node concept="1LlUBW" id="6OXbTDydyMo" role="1tU5fm">
               <node concept="3uibUv" id="6OXbTDydyMz" role="1Lm7xW">
-                <ref role="3uigEE" to="psoy:7Oc59RSEjdb" resolve="Result" />
+                <ref role="3uigEE" to="xydz:7Oc59RSEjdb" resolve="Result" />
               </node>
               <node concept="A3Dl8" id="6OXbTDydyMx" role="1Lm7xW">
                 <node concept="3uibUv" id="6OXbTDydyMy" role="A3Ik2">
-                  <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
+                  <ref role="3uigEE" to="ugy2:7eGEHDlc$ap" resolve="RuleBuilder" />
                 </node>
               </node>
               <node concept="_YKpA" id="1C_jAsq27SG" role="1Lm7xW">
@@ -8575,7 +8575,7 @@
                 <ref role="3cqZAo" node="6OXbTDyef8r" resolve="result" />
               </node>
               <node concept="liA8E" id="2BZXJed1We4" role="2OqNvi">
-                <ref role="37wK5l" to="psoy:7nkyKX7v7xb" resolve="and" />
+                <ref role="37wK5l" to="xydz:7nkyKX7v7xb" resolve="and" />
                 <node concept="1LFfDK" id="2BZXJed1X2p" role="37wK5m">
                   <node concept="3cmrfG" id="2BZXJed1Xfp" role="1LF_Uc">
                     <property role="3cmrfH" value="0" />
@@ -8600,13 +8600,13 @@
                 <property role="TrG5h" value="builders" />
                 <node concept="3vKaQO" id="6OXbTDzFnYK" role="1tU5fm">
                   <node concept="3uibUv" id="6OXbTDzFnYL" role="3O5elw">
-                    <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
+                    <ref role="3uigEE" to="ugy2:7eGEHDlc$ap" resolve="RuleBuilder" />
                   </node>
                 </node>
                 <node concept="2ShNRf" id="6OXbTDzFnYM" role="33vP2m">
                   <node concept="Tc6Ow" id="6OXbTDzFnYN" role="2ShVmc">
                     <node concept="3uibUv" id="6OXbTDzFnYO" role="HW$YZ">
-                      <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
+                      <ref role="3uigEE" to="ugy2:7eGEHDlc$ap" resolve="RuleBuilder" />
                     </node>
                     <node concept="1LFfDK" id="6OXbTDzFnYP" role="I$8f6">
                       <node concept="3cmrfG" id="6OXbTDzFnYQ" role="1LF_Uc">
@@ -8657,7 +8657,7 @@
                               <ref role="2Gs0qQ" node="6OXbTDzFl4V" resolve="builder" />
                             </node>
                             <node concept="liA8E" id="6OXbTDzFl4x" role="2OqNvi">
-                              <ref role="37wK5l" to="i348:7eGEHDlc$bR" resolve="appendHeadKept" />
+                              <ref role="37wK5l" to="ugy2:7eGEHDlc$bR" resolve="appendHeadKept" />
                               <node concept="37vLTw" id="6OXbTDzFl4y" role="37wK5m">
                                 <ref role="3cqZAo" node="6i42QSsj_y2" resolve="mainConstraint" />
                               </node>
@@ -8671,7 +8671,7 @@
                             <ref role="2Gs0qQ" node="6OXbTDzFl4V" resolve="builder" />
                           </node>
                           <node concept="liA8E" id="6OXbTDzFl4A" role="2OqNvi">
-                            <ref role="37wK5l" to="i348:7nkyKX7mcq7" resolve="hasHead" />
+                            <ref role="37wK5l" to="ugy2:7nkyKX7mcq7" resolve="hasHead" />
                           </node>
                         </node>
                       </node>
@@ -8759,10 +8759,10 @@
                               <ref role="2Gs0qQ" node="6OXbTDzFl4V" resolve="builder" />
                             </node>
                             <node concept="liA8E" id="6OXbTDzFl4M" role="2OqNvi">
-                              <ref role="37wK5l" to="i348:7eGEHDlc$aw" resolve="appendBody" />
+                              <ref role="37wK5l" to="ugy2:7eGEHDlc$aw" resolve="appendBody" />
                               <node concept="2ShNRf" id="6OXbTDzFl4N" role="37wK5m">
                                 <node concept="1pGfFk" id="6OXbTDzFl4O" role="2ShVmc">
-                                  <ref role="37wK5l" to="cxk7:4xBopTzrPWl" resolve="AssertPredicate" />
+                                  <ref role="37wK5l" to="tpfl:4xBopTzrPWl" resolve="AssertPredicate" />
                                   <node concept="10M0yZ" id="6OXbTDzFl4P" role="37wK5m">
                                     <ref role="3cqZAo" to="wyt6:~Boolean.TRUE" resolve="TRUE" />
                                     <ref role="1PxDUh" to="wyt6:~Boolean" resolve="Boolean" />
@@ -8779,7 +8779,7 @@
                             <ref role="2Gs0qQ" node="6OXbTDzFl4V" resolve="builder" />
                           </node>
                           <node concept="liA8E" id="6OXbTDzFl4T" role="2OqNvi">
-                            <ref role="37wK5l" to="i348:7nkyKX7mnWq" resolve="hasBody" />
+                            <ref role="37wK5l" to="ugy2:7nkyKX7mnWq" resolve="hasBody" />
                           </node>
                         </node>
                       </node>
@@ -8790,7 +8790,7 @@
                           <ref role="2Gs0qQ" node="6OXbTDzFl4V" resolve="builder" />
                         </node>
                         <node concept="liA8E" id="7L9cSENHzYC" role="2OqNvi">
-                          <ref role="37wK5l" to="i348:7L9cSENGVlN" resolve="setQuery" />
+                          <ref role="37wK5l" to="ugy2:7L9cSENGVlN" resolve="setQuery" />
                           <node concept="3clFbT" id="7L9cSENH$5H" role="37wK5m">
                             <property role="3clFbU" value="true" />
                           </node>
@@ -8857,13 +8857,13 @@
                           <ref role="3cqZAo" node="6OXbTDyef8r" resolve="result" />
                         </node>
                         <node concept="liA8E" id="6OXbTDydY2r" role="2OqNvi">
-                          <ref role="37wK5l" to="psoy:7nkyKX7v7xb" resolve="and" />
+                          <ref role="37wK5l" to="xydz:7nkyKX7v7xb" resolve="and" />
                           <node concept="2YIFZM" id="7TC1Xcd$6oV" role="37wK5m">
-                            <ref role="37wK5l" to="psoy:5X1yxJHYPm2" resolve="FAIL" />
-                            <ref role="1Pybhc" to="psoy:7Oc59RSEjdb" resolve="Result" />
+                            <ref role="37wK5l" to="xydz:5X1yxJHYPm2" resolve="FAIL" />
+                            <ref role="1Pybhc" to="xydz:7Oc59RSEjdb" resolve="Result" />
                             <node concept="2ShNRf" id="5X1yxJI1zs_" role="37wK5m">
                               <node concept="1pGfFk" id="5X1yxJI1zsA" role="2ShVmc">
-                                <ref role="37wK5l" to="i348:5X1yxJHUoaR" resolve="TemplateApplicationException" />
+                                <ref role="37wK5l" to="ugy2:5X1yxJHUoaR" resolve="TemplateApplicationException" />
                                 <node concept="3cpWs3" id="5X1yxJI1zsB" role="37wK5m">
                                   <node concept="37vLTw" id="5X1yxJI1zsC" role="3uHU7w">
                                     <ref role="3cqZAo" node="6OXbTDydY24" resolve="details" />
@@ -8919,7 +8919,7 @@
               <ref role="3cqZAo" node="6OXbTDyef8r" resolve="result" />
             </node>
             <node concept="liA8E" id="6OXbTDye0IL" role="2OqNvi">
-              <ref role="37wK5l" to="psoy:7Oc59RS_hsj" resolve="isSuccessful" />
+              <ref role="37wK5l" to="xydz:7Oc59RS_hsj" resolve="isSuccessful" />
             </node>
           </node>
         </node>
@@ -8948,7 +8948,7 @@
       <node concept="37vLTG" id="6OXbTDydhIZ" role="3clF46">
         <property role="TrG5h" value="queryTemplate" />
         <node concept="3uibUv" id="6tPOoeT4z8$" role="1tU5fm">
-          <ref role="3uigEE" to="i348:6OXbTD$iNPP" resolve="QueryTemplate" />
+          <ref role="3uigEE" to="ugy2:6OXbTD$iNPP" resolve="QueryTemplate" />
           <node concept="16syzq" id="5EDW3XEwzKu" role="11_B2D">
             <ref role="16sUi3" node="5EDW3XEwksj" resolve="T" />
           </node>
@@ -8963,13 +8963,13 @@
       <node concept="16euLQ" id="5EDW3XEwksh" role="16eVyc">
         <property role="TrG5h" value="Q" />
         <node concept="3uibUv" id="5EDW3XEwksi" role="3ztrMU">
-          <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
+          <ref role="3uigEE" to="ugy2:5EDW3XDYeWv" resolve="Query" />
         </node>
       </node>
       <node concept="16euLQ" id="5EDW3XEwksj" role="16eVyc">
         <property role="TrG5h" value="T" />
         <node concept="3uibUv" id="5EDW3XEwksk" role="3ztrMU">
-          <ref role="3uigEE" to="i348:6R6MIbU8M46" resolve="QueryTemplate.Token" />
+          <ref role="3uigEE" to="ugy2:6R6MIbU8M46" resolve="QueryTemplate.Token" />
           <node concept="16syzq" id="5EDW3XEwksl" role="11_B2D">
             <ref role="16sUi3" node="5EDW3XEwksh" resolve="Q" />
           </node>
@@ -9175,10 +9175,10 @@
               <property role="TrG5h" value="tpls" />
               <node concept="3vKaQO" id="7gMIJIyrFld" role="1tU5fm">
                 <node concept="3uibUv" id="7gMIJIyrFlf" role="3O5elw">
-                  <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstractRuleTemplate" />
+                  <ref role="3uigEE" to="ugy2:1ffsG7bUbCM" resolve="AbstractRuleTemplate" />
                   <node concept="3qUE_q" id="7gMIJIyrFlg" role="11_B2D">
                     <node concept="3uibUv" id="7gMIJIyrFlh" role="3qUE_r">
-                      <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplate.Token" />
+                      <ref role="3uigEE" to="ugy2:2RRx4MZ6_68" resolve="RuleTemplate.Token" />
                     </node>
                   </node>
                 </node>
@@ -9222,7 +9222,7 @@
               <property role="TrG5h" value="res_reqs" />
               <node concept="1LlUBW" id="6i42QSssRXK" role="1tU5fm">
                 <node concept="3uibUv" id="6i42QSssRXT" role="1Lm7xW">
-                  <ref role="3uigEE" to="psoy:7Oc59RSEjdb" resolve="Result" />
+                  <ref role="3uigEE" to="xydz:7Oc59RSEjdb" resolve="Result" />
                 </node>
                 <node concept="3vKaQO" id="6i42QSssRXU" role="1Lm7xW">
                   <node concept="3Tqbb2" id="6i42QSssRXV" role="3O5elw" />
@@ -9258,7 +9258,7 @@
                       <ref role="3cqZAo" node="6nFpYlujVzU" resolve="updatesRecorder" />
                     </node>
                     <node concept="liA8E" id="6nFpYlu0$Ow" role="2OqNvi">
-                      <ref role="37wK5l" to="i348:4VNF0fT1ttn" resolve="addDependencies" />
+                      <ref role="37wK5l" to="ugy2:4VNF0fT1ttn" resolve="addDependencies" />
                       <node concept="37vLTw" id="6nFpYlu0_0q" role="37wK5m">
                         <ref role="3cqZAo" node="5ntLU8GlzgG" resolve="node" />
                       </node>
@@ -9353,7 +9353,7 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="4MqhgXU_oyu" role="2OqNvi">
-                  <ref role="37wK5l" to="psoy:7nkyKX7v7xb" resolve="and" />
+                  <ref role="37wK5l" to="xydz:7nkyKX7v7xb" resolve="and" />
                   <node concept="2OqwBi" id="4MqhgXU_oWF" role="37wK5m">
                     <node concept="37vLTw" id="4MqhgXU_oPW" role="2Oq$k0">
                       <ref role="3cqZAo" node="tIwzd1IJm8" resolve="b" />
@@ -9475,8 +9475,8 @@
           <node concept="3clFbF" id="4MqhgXU_6Q4" role="3cqZAp">
             <node concept="37vLTI" id="4MqhgXU_7co" role="3clFbG">
               <node concept="2YIFZM" id="7TC1Xcd$6oL" role="37vLTx">
-                <ref role="37wK5l" to="psoy:7Oc59RSEjeq" resolve="OK" />
-                <ref role="1Pybhc" to="psoy:7Oc59RSEjdb" resolve="Result" />
+                <ref role="37wK5l" to="xydz:7Oc59RSEjeq" resolve="OK" />
+                <ref role="1Pybhc" to="xydz:7Oc59RSEjdb" resolve="Result" />
               </node>
               <node concept="2OqwBi" id="4MqhgXU_6Vu" role="37vLTJ">
                 <node concept="Xjq3P" id="4MqhgXU_6Q3" role="2Oq$k0" />
@@ -9523,7 +9523,7 @@
         <node concept="37vLTG" id="4MqhgXU_ypL" role="3clF46">
           <property role="TrG5h" value="result" />
           <node concept="3uibUv" id="4MqhgXU_yqB" role="1tU5fm">
-            <ref role="3uigEE" to="psoy:7Oc59RSEjdb" resolve="Result" />
+            <ref role="3uigEE" to="xydz:7Oc59RSEjdb" resolve="Result" />
           </node>
         </node>
         <node concept="37vLTG" id="4MqhgXU_yxm" role="3clF46">
@@ -9587,7 +9587,7 @@
         <property role="TrG5h" value="result" />
         <node concept="3Tm6S6" id="4MqhgXU_0W$" role="1B3o_S" />
         <node concept="3uibUv" id="4MqhgXU_11X" role="1tU5fm">
-          <ref role="3uigEE" to="psoy:7Oc59RSEjdb" resolve="Result" />
+          <ref role="3uigEE" to="xydz:7Oc59RSEjdb" resolve="Result" />
         </node>
       </node>
       <node concept="312cEg" id="4MqhgXU_1ti" role="jymVt">
@@ -10751,7 +10751,7 @@
       <property role="TrG5h" value="applicationSession" />
       <node concept="3Tm6S6" id="7DvO2Mah9z3" role="1B3o_S" />
       <node concept="3uibUv" id="6OXbTDxQvHL" role="1tU5fm">
-        <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
+        <ref role="3uigEE" to="ugy2:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
       </node>
     </node>
     <node concept="312cEg" id="cmlg9OIRky" role="jymVt">
@@ -10784,7 +10784,7 @@
       <node concept="2OqwBi" id="7kTeLbPnP2o" role="33vP2m">
         <node concept="2ShNRf" id="7kTeLbPnP2p" role="2Oq$k0">
           <node concept="1pGfFk" id="7kTeLbPnP2q" role="2ShVmc">
-            <ref role="37wK5l" to="i348:4sSe4$oM2rk" resolve="ConstraintBuilder" />
+            <ref role="37wK5l" to="ugy2:4sSe4$oM2rk" resolve="ConstraintBuilder" />
             <node concept="2YIFZM" id="7kTeLbPnP2r" role="37wK5m">
               <ref role="1Pybhc" to="av0y:~ConstraintSymbol" resolve="ConstraintSymbol" />
               <ref role="37wK5l" to="av0y:~ConstraintSymbol.symbol(java.lang.String,int)" resolve="symbol" />
@@ -10798,7 +10798,7 @@
           </node>
         </node>
         <node concept="liA8E" id="7kTeLbPnP2u" role="2OqNvi">
-          <ref role="37wK5l" to="i348:4sSe4$oM2zI" resolve="toConstraint" />
+          <ref role="37wK5l" to="ugy2:4sSe4$oM2zI" resolve="toConstraint" />
         </node>
       </node>
     </node>
@@ -10845,7 +10845,7 @@
       <node concept="3Tm1VV" id="7DvO2Ma0h_P" role="1B3o_S" />
       <node concept="3clFbS" id="7DvO2Ma0h_Q" role="3clF47">
         <node concept="XkiVB" id="5yr01fEef9a" role="3cqZAp">
-          <ref role="37wK5l" to="i348:5yr01fEdYJE" resolve="TemplateApplicationSession" />
+          <ref role="37wK5l" to="ugy2:5yr01fEdYJE" resolve="TemplateApplicationSession" />
           <node concept="37vLTw" id="5yr01fEefkr" role="37wK5m">
             <ref role="3cqZAo" node="5yr01fEeeBY" resolve="repository" />
           </node>
@@ -10883,7 +10883,7 @@
       <node concept="37vLTG" id="6PWFJfG6VOr" role="3clF46">
         <property role="TrG5h" value="memo" />
         <node concept="3uibUv" id="6PWFJfG6VOs" role="1tU5fm">
-          <ref role="3uigEE" to="i348:6PWFJfG5LMK" resolve="Memo" />
+          <ref role="3uigEE" to="ugy2:6PWFJfG5LMK" resolve="Memo" />
         </node>
       </node>
       <node concept="3uibUv" id="6PWFJfG6Xbm" role="3clF45">
@@ -10894,7 +10894,7 @@
         <node concept="3clFbF" id="6PWFJfG6VOA" role="3cqZAp">
           <node concept="10QFUN" id="6PWFJfG6XPZ" role="3clFbG">
             <node concept="3nyPlj" id="6PWFJfG6XPX" role="10QFUP">
-              <ref role="37wK5l" to="i348:6PWFJfG6OFJ" resolve="withMemo" />
+              <ref role="37wK5l" to="ugy2:6PWFJfG6OFJ" resolve="withMemo" />
               <node concept="37vLTw" id="6PWFJfG6XPY" role="37wK5m">
                 <ref role="3cqZAo" node="6PWFJfG6VOr" resolve="memo" />
               </node>
@@ -10915,7 +10915,7 @@
       <node concept="37vLTG" id="4VNF0fT85xM" role="3clF46">
         <property role="TrG5h" value="updatable" />
         <node concept="3uibUv" id="4VNF0fT867l" role="1tU5fm">
-          <ref role="3uigEE" to="i348:4VNF0fT1sxk" resolve="DependencyUpdatable" />
+          <ref role="3uigEE" to="ugy2:4VNF0fT1sxk" resolve="DependencyUpdatable" />
         </node>
       </node>
       <node concept="3uibUv" id="4VNF0fT8171" role="3clF45">
@@ -10926,7 +10926,7 @@
         <node concept="3clFbF" id="4VNF0fT8174" role="3cqZAp">
           <node concept="10QFUN" id="4VNF0fT8175" role="3clFbG">
             <node concept="3nyPlj" id="4VNF0fT8176" role="10QFUP">
-              <ref role="37wK5l" to="i348:4VNF0fT26a5" resolve="withDependencyUpdatable" />
+              <ref role="37wK5l" to="ugy2:4VNF0fT26a5" resolve="withDependencyUpdatable" />
               <node concept="37vLTw" id="4VNF0fT87eP" role="37wK5m">
                 <ref role="3cqZAo" node="4VNF0fT85xM" resolve="updatable" />
               </node>
@@ -10966,18 +10966,18 @@
             </node>
           </node>
           <node concept="3uibUv" id="At0yqM7N1x" role="11_B2D">
-            <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
+            <ref role="3uigEE" to="ugy2:7eGEHDlc$ap" resolve="RuleBuilder" />
           </node>
         </node>
       </node>
       <node concept="3uibUv" id="At0yqM7N1y" role="3clF45">
-        <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
+        <ref role="3uigEE" to="ugy2:7eGEHDlc$ap" resolve="RuleBuilder" />
       </node>
       <node concept="3Tm1VV" id="At0yqM7N1z" role="1B3o_S" />
       <node concept="16euLQ" id="At0yqM7N1_" role="16eVyc">
         <property role="TrG5h" value="T" />
         <node concept="3uibUv" id="At0yqM7N1A" role="3ztrMU">
-          <ref role="3uigEE" to="i348:5itBwM86qUH" resolve="ExpandMacroTemplate.Token" />
+          <ref role="3uigEE" to="ugy2:5itBwM86qUH" resolve="ExpandMacroTemplate.Token" />
         </node>
       </node>
       <node concept="3clFbS" id="At0yqM7N1B" role="3clF47">
@@ -11019,8 +11019,8 @@
           <node concept="3clFbS" id="At0yqM7Pnj" role="3clFbx">
             <node concept="3cpWs6" id="At0yqM7Pnk" role="3cqZAp">
               <node concept="10M0yZ" id="At0yqM7Pnl" role="3cqZAk">
-                <ref role="1PxDUh" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
-                <ref role="3cqZAo" to="i348:5yr01fDteq2" resolve="EMPTY" />
+                <ref role="1PxDUh" to="ugy2:7eGEHDlc$ap" resolve="RuleBuilder" />
+                <ref role="3cqZAo" to="ugy2:5yr01fDteq2" resolve="EMPTY" />
               </node>
             </node>
           </node>
@@ -11056,7 +11056,7 @@
         </node>
         <node concept="3clFbF" id="At0yqM7Pog" role="3cqZAp">
           <node concept="1rXfSq" id="At0yqM7Poh" role="3clFbG">
-            <ref role="37wK5l" to="i348:2hQbw6HlwSO" resolve="triggerRequireHooks" />
+            <ref role="37wK5l" to="ugy2:2hQbw6HlwSO" resolve="triggerRequireHooks" />
             <node concept="37vLTw" id="At0yqM80kM" role="37wK5m">
               <ref role="3cqZAo" node="At0yqM7N1p" resolve="macroInput" />
             </node>
@@ -11066,7 +11066,7 @@
           <node concept="3clFbS" id="At0yqM9Flo" role="3clFbx">
             <node concept="3clFbF" id="At0yqM9IJU" role="3cqZAp">
               <node concept="1rXfSq" id="At0yqM9IJS" role="3clFbG">
-                <ref role="37wK5l" to="i348:4VNF0fT2w6j" resolve="addDependency" />
+                <ref role="37wK5l" to="ugy2:4VNF0fT2w6j" resolve="addDependency" />
                 <node concept="37vLTw" id="At0yqM9J$I" role="37wK5m">
                   <ref role="3cqZAo" node="At0yqM7N1n" resolve="ruleInput" />
                 </node>
@@ -11088,7 +11088,7 @@
           <node concept="3cpWsn" id="At0yqM7Pol" role="3cpWs9">
             <property role="TrG5h" value="tpl" />
             <node concept="3uibUv" id="At0yqM7Pom" role="1tU5fm">
-              <ref role="3uigEE" to="i348:5itBwM75Jiy" resolve="ExpandMacroTemplate" />
+              <ref role="3uigEE" to="ugy2:5itBwM75Jiy" resolve="ExpandMacroTemplate" />
               <node concept="16syzq" id="At0yqM7Pon" role="11_B2D">
                 <ref role="16sUi3" node="At0yqM7N1_" resolve="T" />
               </node>
@@ -11133,7 +11133,7 @@
                     <ref role="3cqZAo" node="At0yqM7Pol" resolve="tpl" />
                   </node>
                   <node concept="liA8E" id="At0yqM7PoD" role="2OqNvi">
-                    <ref role="37wK5l" to="i348:5ynGfcflmnr" resolve="createToken" />
+                    <ref role="37wK5l" to="ugy2:5ynGfcflmnr" resolve="createToken" />
                     <node concept="37vLTw" id="At0yqM81GT" role="37wK5m">
                       <ref role="3cqZAo" node="At0yqM7N1n" resolve="ruleInput" />
                     </node>
@@ -11170,8 +11170,8 @@
             <node concept="3clFbS" id="At0yqM7PoR" role="9aQI4">
               <node concept="3cpWs6" id="At0yqM7PoS" role="3cqZAp">
                 <node concept="10M0yZ" id="At0yqM7PoT" role="3cqZAk">
-                  <ref role="1PxDUh" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
-                  <ref role="3cqZAo" to="i348:5yr01fDteq2" resolve="EMPTY" />
+                  <ref role="1PxDUh" to="ugy2:7eGEHDlc$ap" resolve="RuleBuilder" />
+                  <ref role="3cqZAo" to="ugy2:5yr01fDteq2" resolve="EMPTY" />
                 </node>
               </node>
             </node>
@@ -11207,18 +11207,18 @@
             </node>
           </node>
           <node concept="3uibUv" id="C1f6iEy$1u" role="11_B2D">
-            <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
+            <ref role="3uigEE" to="ugy2:7eGEHDlc$ap" resolve="RuleBuilder" />
           </node>
         </node>
       </node>
       <node concept="3uibUv" id="C1f6iEy$1v" role="3clF45">
-        <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
+        <ref role="3uigEE" to="ugy2:7eGEHDlc$ap" resolve="RuleBuilder" />
       </node>
       <node concept="3Tm1VV" id="C1f6iEy$1w" role="1B3o_S" />
       <node concept="16euLQ" id="C1f6iEy$1y" role="16eVyc">
         <property role="TrG5h" value="T" />
         <node concept="3uibUv" id="C1f6iEy$1z" role="3ztrMU">
-          <ref role="3uigEE" to="i348:5itBwM86qUH" resolve="ExpandMacroTemplate.Token" />
+          <ref role="3uigEE" to="ugy2:5itBwM86qUH" resolve="ExpandMacroTemplate.Token" />
         </node>
       </node>
       <node concept="3clFbS" id="C1f6iEy$1$" role="3clF47">
@@ -11227,7 +11227,7 @@
           <node concept="3cpWsn" id="C1f6iEyAqy" role="3cpWs9">
             <property role="TrG5h" value="tpl" />
             <node concept="3uibUv" id="C1f6iEyAqz" role="1tU5fm">
-              <ref role="3uigEE" to="i348:5itBwM75Jiy" resolve="ExpandMacroTemplate" />
+              <ref role="3uigEE" to="ugy2:5itBwM75Jiy" resolve="ExpandMacroTemplate" />
               <node concept="16syzq" id="C1f6iEyAq$" role="11_B2D">
                 <ref role="16sUi3" node="C1f6iEy$1y" resolve="T" />
               </node>
@@ -11269,7 +11269,7 @@
                     <ref role="3cqZAo" node="C1f6iEyAqy" resolve="tpl" />
                   </node>
                   <node concept="liA8E" id="C1f6iEyAqO" role="2OqNvi">
-                    <ref role="37wK5l" to="i348:5ynGfcflmnr" resolve="createToken" />
+                    <ref role="37wK5l" to="ugy2:5ynGfcflmnr" resolve="createToken" />
                     <node concept="37vLTw" id="C1f6iEyBXA" role="37wK5m">
                       <ref role="3cqZAo" node="C1f6iEy$1k" resolve="ruleInput" />
                     </node>
@@ -11304,8 +11304,8 @@
             <node concept="3clFbS" id="C1f6iEyAr2" role="9aQI4">
               <node concept="3cpWs6" id="C1f6iEyAr3" role="3cqZAp">
                 <node concept="10M0yZ" id="C1f6iEyAr4" role="3cqZAk">
-                  <ref role="1PxDUh" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
-                  <ref role="3cqZAo" to="i348:5yr01fDteq2" resolve="EMPTY" />
+                  <ref role="1PxDUh" to="ugy2:7eGEHDlc$ap" resolve="RuleBuilder" />
+                  <ref role="3cqZAo" to="ugy2:5yr01fDteq2" resolve="EMPTY" />
                 </node>
               </node>
             </node>
@@ -11338,18 +11338,18 @@
             </node>
           </node>
           <node concept="3uibUv" id="1VeWL_e4YPl" role="11_B2D">
-            <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
+            <ref role="3uigEE" to="ugy2:7eGEHDlc$ap" resolve="RuleBuilder" />
           </node>
         </node>
       </node>
       <node concept="3uibUv" id="1VeWL_e4YPm" role="3clF45">
-        <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
+        <ref role="3uigEE" to="ugy2:7eGEHDlc$ap" resolve="RuleBuilder" />
       </node>
       <node concept="3Tm1VV" id="1VeWL_e4YPn" role="1B3o_S" />
       <node concept="16euLQ" id="1VeWL_e4YPp" role="16eVyc">
         <property role="TrG5h" value="T" />
         <node concept="3uibUv" id="1VeWL_e4YPq" role="3ztrMU">
-          <ref role="3uigEE" to="i348:5itBwM86qnn" resolve="CallMacroTemplate.Token" />
+          <ref role="3uigEE" to="ugy2:5itBwM86qnn" resolve="CallMacroTemplate.Token" />
         </node>
       </node>
       <node concept="3clFbS" id="1VeWL_e4YPr" role="3clF47">
@@ -11357,7 +11357,7 @@
           <node concept="3cpWsn" id="5itBwM7W$4$" role="3cpWs9">
             <property role="TrG5h" value="tpl" />
             <node concept="3uibUv" id="5itBwM7W$4_" role="1tU5fm">
-              <ref role="3uigEE" to="i348:5itBwM7auSJ" resolve="CallMacroTemplate" />
+              <ref role="3uigEE" to="ugy2:5itBwM7auSJ" resolve="CallMacroTemplate" />
               <node concept="16syzq" id="5itBwM7W$4A" role="11_B2D">
                 <ref role="16sUi3" node="1VeWL_e4YPp" resolve="T" />
               </node>
@@ -11396,7 +11396,7 @@
                     <ref role="3cqZAo" node="5itBwM7W$4$" resolve="tpl" />
                   </node>
                   <node concept="liA8E" id="5itBwM7W$4P" role="2OqNvi">
-                    <ref role="37wK5l" to="i348:1VeWL_ePsIw" resolve="createToken" />
+                    <ref role="37wK5l" to="ugy2:1VeWL_ePsIw" resolve="createToken" />
                     <node concept="37vLTw" id="1VeWL_ePryi" role="37wK5m">
                       <ref role="3cqZAo" node="1VeWL_e4YPd" resolve="ruleInput" />
                     </node>
@@ -11430,8 +11430,8 @@
             <node concept="3clFbS" id="5itBwM7W$52" role="9aQI4">
               <node concept="3cpWs6" id="5itBwM7W$53" role="3cqZAp">
                 <node concept="10M0yZ" id="5itBwM7W$54" role="3cqZAk">
-                  <ref role="1PxDUh" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
-                  <ref role="3cqZAo" to="i348:5yr01fDteq2" resolve="EMPTY" />
+                  <ref role="1PxDUh" to="ugy2:7eGEHDlc$ap" resolve="RuleBuilder" />
+                  <ref role="3cqZAo" to="ugy2:5yr01fDteq2" resolve="EMPTY" />
                 </node>
               </node>
             </node>
@@ -11459,7 +11459,7 @@
       </node>
     </node>
     <node concept="3uibUv" id="7DvO2M9IiOV" role="1zkMxy">
-      <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
+      <ref role="3uigEE" to="ugy2:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
     </node>
     <node concept="3UR2Jj" id="3swcsd3HoUS" role="lGtFl">
       <node concept="TZ5HA" id="3swcsd3HoUT" role="TZ5H$">
@@ -11734,7 +11734,7 @@
         <property role="TrG5h" value="update" />
         <node concept="1LlUBW" id="51ek2rQMJ04" role="1tU5fm">
           <node concept="3uibUv" id="51ek2rQMJ05" role="1Lm7xW">
-            <ref role="3uigEE" to="i348:1ffsG7bW_V4" resolve="RuleTemplate" />
+            <ref role="3uigEE" to="ugy2:1ffsG7bW_V4" resolve="RuleTemplate" />
           </node>
           <node concept="3vKaQO" id="51ek2rQMJ06" role="1Lm7xW">
             <node concept="3uibUv" id="51ek2rQMJ07" role="3O5elw">
@@ -11893,7 +11893,7 @@
                 <property role="TrG5h" value="update" />
                 <node concept="1LlUBW" id="1XKnVQjTxo" role="1tU5fm">
                   <node concept="3uibUv" id="1XKnVQjTxp" role="1Lm7xW">
-                    <ref role="3uigEE" to="i348:1ffsG7bW_V4" resolve="RuleTemplate" />
+                    <ref role="3uigEE" to="ugy2:1ffsG7bW_V4" resolve="RuleTemplate" />
                   </node>
                   <node concept="3vKaQO" id="1XKnVQjTxq" role="1Lm7xW">
                     <node concept="3uibUv" id="1XKnVQjTxr" role="3O5elw">
@@ -11968,7 +11968,7 @@
           <node concept="3Tqbb2" id="4J__M64MBW" role="1ajw0F" />
           <node concept="1LlUBW" id="1XKnVQjVhx" role="1ajw0F">
             <node concept="3uibUv" id="1XKnVQjVhy" role="1Lm7xW">
-              <ref role="3uigEE" to="i348:1ffsG7bW_V4" resolve="RuleTemplate" />
+              <ref role="3uigEE" to="ugy2:1ffsG7bW_V4" resolve="RuleTemplate" />
             </node>
             <node concept="3vKaQO" id="1XKnVQjVhz" role="1Lm7xW">
               <node concept="3uibUv" id="1XKnVQjVh$" role="3O5elw">
@@ -11999,7 +11999,7 @@
                 <node concept="_YKpA" id="6nFpYlueY$a" role="1tU5fm">
                   <node concept="1LlUBW" id="1XKnVQjYKA" role="_ZDj9">
                     <node concept="3uibUv" id="1XKnVQjYKB" role="1Lm7xW">
-                      <ref role="3uigEE" to="i348:1ffsG7bW_V4" resolve="RuleTemplate" />
+                      <ref role="3uigEE" to="ugy2:1ffsG7bW_V4" resolve="RuleTemplate" />
                     </node>
                     <node concept="3vKaQO" id="1XKnVQjYKC" role="1Lm7xW">
                       <node concept="3uibUv" id="1XKnVQjYKD" role="3O5elw">
@@ -12042,7 +12042,7 @@
                     <property role="TrG5h" value="u" />
                     <node concept="1LlUBW" id="1XKnVQk15T" role="1tU5fm">
                       <node concept="3uibUv" id="1XKnVQk15U" role="1Lm7xW">
-                        <ref role="3uigEE" to="i348:1ffsG7bW_V4" resolve="RuleTemplate" />
+                        <ref role="3uigEE" to="ugy2:1ffsG7bW_V4" resolve="RuleTemplate" />
                       </node>
                       <node concept="3vKaQO" id="1XKnVQk15V" role="1Lm7xW">
                         <node concept="3uibUv" id="1XKnVQk15W" role="3O5elw">
@@ -12658,7 +12658,7 @@
       <node concept="_YKpA" id="6nFpYludUyx" role="3clF45">
         <node concept="1LlUBW" id="1XKnVQk48U" role="_ZDj9">
           <node concept="3uibUv" id="1XKnVQk48V" role="1Lm7xW">
-            <ref role="3uigEE" to="i348:1ffsG7bW_V4" resolve="RuleTemplate" />
+            <ref role="3uigEE" to="ugy2:1ffsG7bW_V4" resolve="RuleTemplate" />
           </node>
           <node concept="3vKaQO" id="1XKnVQk48W" role="1Lm7xW">
             <node concept="3uibUv" id="1XKnVQk48X" role="3O5elw">
@@ -12689,7 +12689,7 @@
                   <node concept="Tc6Ow" id="6nFpYludF0U" role="2ShVmc">
                     <node concept="1LlUBW" id="1XKnVQk61G" role="HW$YZ">
                       <node concept="3uibUv" id="1XKnVQk61H" role="1Lm7xW">
-                        <ref role="3uigEE" to="i348:1ffsG7bW_V4" resolve="RuleTemplate" />
+                        <ref role="3uigEE" to="ugy2:1ffsG7bW_V4" resolve="RuleTemplate" />
                       </node>
                       <node concept="3vKaQO" id="1XKnVQk61I" role="1Lm7xW">
                         <node concept="3uibUv" id="1XKnVQk61J" role="3O5elw">
@@ -14185,7 +14185,7 @@
         <node concept="_YKpA" id="6nFpYludxlp" role="3rvSg0">
           <node concept="1LlUBW" id="1XKnVQkaFP" role="_ZDj9">
             <node concept="3uibUv" id="1XKnVQkaFQ" role="1Lm7xW">
-              <ref role="3uigEE" to="i348:1ffsG7bW_V4" resolve="RuleTemplate" />
+              <ref role="3uigEE" to="ugy2:1ffsG7bW_V4" resolve="RuleTemplate" />
             </node>
             <node concept="3vKaQO" id="1XKnVQkaFR" role="1Lm7xW">
               <node concept="3uibUv" id="1XKnVQkaFS" role="3O5elw">
@@ -14201,7 +14201,7 @@
           <node concept="_YKpA" id="6nFpYludyYL" role="3rHtpV">
             <node concept="1LlUBW" id="1XKnVQkdYv" role="_ZDj9">
               <node concept="3uibUv" id="1XKnVQkdYw" role="1Lm7xW">
-                <ref role="3uigEE" to="i348:1ffsG7bW_V4" resolve="RuleTemplate" />
+                <ref role="3uigEE" to="ugy2:1ffsG7bW_V4" resolve="RuleTemplate" />
               </node>
               <node concept="3vKaQO" id="1XKnVQkdYx" role="1Lm7xW">
                 <node concept="3uibUv" id="1XKnVQkdYy" role="3O5elw">
@@ -14322,7 +14322,7 @@
       </node>
     </node>
     <node concept="3uibUv" id="4VNF0fT1Bx3" role="EKbjA">
-      <ref role="3uigEE" to="i348:4VNF0fT1sxk" resolve="DependencyUpdatable" />
+      <ref role="3uigEE" to="ugy2:4VNF0fT1sxk" resolve="DependencyUpdatable" />
     </node>
   </node>
   <node concept="312cEu" id="1XKnVPsWNc">
@@ -14570,7 +14570,7 @@
                   <node concept="3cpWsn" id="IfzMHGfK0X" role="3cpWs9">
                     <property role="TrG5h" value="mf" />
                     <node concept="3uibUv" id="IfzMHGfK0Y" role="1tU5fm">
-                      <ref role="3uigEE" to="fqlx:5EDW3XF5Z95" resolve="AbstractCoderulesManifest" />
+                      <ref role="3uigEE" to="pxw9:5EDW3XF5Z95" resolve="AbstractCoderulesManifest" />
                     </node>
                     <node concept="2OqwBi" id="IfzMHGfK0Z" role="33vP2m">
                       <node concept="1eOMI4" id="IfzMHGfK10" role="2Oq$k0">
@@ -14579,12 +14579,12 @@
                             <ref role="2Gs0qQ" node="IfzMHGfK1Q" resolve="tpl" />
                           </node>
                           <node concept="3uibUv" id="IfzMHGfK13" role="10QFUM">
-                            <ref role="3uigEE" to="i348:5EDW3XF5Zh6" resolve="AbstractRuleTable" />
+                            <ref role="3uigEE" to="ugy2:5EDW3XF5Zh6" resolve="AbstractRuleTable" />
                           </node>
                         </node>
                       </node>
                       <node concept="liA8E" id="IfzMHGfK14" role="2OqNvi">
-                        <ref role="37wK5l" to="i348:1LBj9w_9RCi" resolve="manifest" />
+                        <ref role="37wK5l" to="ugy2:1LBj9w_9RCi" resolve="manifest" />
                       </node>
                     </node>
                   </node>
@@ -14593,14 +14593,14 @@
                   <node concept="3cpWsn" id="IfzMHGfK16" role="3cpWs9">
                     <property role="TrG5h" value="asp" />
                     <node concept="3uibUv" id="IfzMHGfK17" role="1tU5fm">
-                      <ref role="3uigEE" to="fqlx:NKt6yomNZE" resolve="CoderulesAspect" />
+                      <ref role="3uigEE" to="pxw9:NKt6yomNZE" resolve="CoderulesAspect" />
                     </node>
                     <node concept="2OqwBi" id="IfzMHGfK18" role="33vP2m">
                       <node concept="37vLTw" id="IfzMHGfK19" role="2Oq$k0">
                         <ref role="3cqZAo" node="IfzMHGfK0X" resolve="mf" />
                       </node>
                       <node concept="liA8E" id="IfzMHGfK1a" role="2OqNvi">
-                        <ref role="37wK5l" to="fqlx:1LBj9w_9VAl" resolve="coderulesAspect" />
+                        <ref role="37wK5l" to="pxw9:1LBj9w_9VAl" resolve="coderulesAspect" />
                       </node>
                     </node>
                   </node>
@@ -14613,7 +14613,7 @@
                           <ref role="3cqZAo" node="IfzMHGfK4u" resolve="aspectClique" />
                         </node>
                         <node concept="liA8E" id="IfzMHGfK1g" role="2OqNvi">
-                          <ref role="37wK5l" to="fqlx:3KN3A4uUhpW" resolve="aspects" />
+                          <ref role="37wK5l" to="pxw9:3KN3A4uUhpW" resolve="aspects" />
                         </node>
                       </node>
                       <node concept="2WmjW8" id="IfzMHGfK1h" role="2OqNvi">
@@ -14648,7 +14648,7 @@
                         <ref role="2Gs0qQ" node="IfzMHGfK1Q" resolve="tpl" />
                       </node>
                       <node concept="liA8E" id="IfzMHGfK1v" role="2OqNvi">
-                        <ref role="37wK5l" to="i348:7P_FdVQoZmr" resolve="fqName" />
+                        <ref role="37wK5l" to="ugy2:7P_FdVQoZmr" resolve="fqName" />
                       </node>
                     </node>
                   </node>
@@ -14685,7 +14685,7 @@
                           <ref role="2Gs0qQ" node="IfzMHGfK1Q" resolve="tpl" />
                         </node>
                         <node concept="liA8E" id="IfzMHGfK1I" role="2OqNvi">
-                          <ref role="37wK5l" to="i348:7P_FdVQoZmr" resolve="fqName" />
+                          <ref role="37wK5l" to="ugy2:7P_FdVQoZmr" resolve="fqName" />
                         </node>
                       </node>
                       <node concept="37vLTw" id="IfzMHGfK1J" role="3ElQJh">
@@ -14893,7 +14893,7 @@
                             </node>
                           </node>
                           <node concept="liA8E" id="IfzMHGfK32" role="2OqNvi">
-                            <ref role="37wK5l" to="i348:4MqhgXUN1Pe" resolve="name" />
+                            <ref role="37wK5l" to="ugy2:4MqhgXUN1Pe" resolve="name" />
                           </node>
                         </node>
                       </node>
@@ -15106,24 +15106,24 @@
         <property role="TrG5h" value="unsorted" />
         <node concept="A3Dl8" id="IfzMHGfK4s" role="1tU5fm">
           <node concept="3uibUv" id="IfzMHGfK4t" role="A3Ik2">
-            <ref role="3uigEE" to="i348:4MqhgXU9fm3" resolve="RuleTable" />
+            <ref role="3uigEE" to="ugy2:4MqhgXU9fm3" resolve="RuleTable" />
           </node>
         </node>
       </node>
       <node concept="37vLTG" id="IfzMHGfK4u" role="3clF46">
         <property role="TrG5h" value="aspectClique" />
         <node concept="3uibUv" id="IfzMHGfK4v" role="1tU5fm">
-          <ref role="3uigEE" to="fqlx:3KN3A4uUhmW" resolve="AspectClique" />
+          <ref role="3uigEE" to="pxw9:3KN3A4uUhmW" resolve="AspectClique" />
           <node concept="3qUE_q" id="IfzMHGfK4w" role="11_B2D">
             <node concept="3uibUv" id="IfzMHGfK4x" role="3qUE_r">
-              <ref role="3uigEE" to="fqlx:NKt6yomNZE" resolve="CoderulesAspect" />
+              <ref role="3uigEE" to="pxw9:NKt6yomNZE" resolve="CoderulesAspect" />
             </node>
           </node>
         </node>
       </node>
       <node concept="3vKaQO" id="IfzMHGfK4y" role="3clF45">
         <node concept="3uibUv" id="IfzMHGfK4z" role="3O5elw">
-          <ref role="3uigEE" to="i348:4MqhgXU9fm3" resolve="RuleTable" />
+          <ref role="3uigEE" to="ugy2:4MqhgXU9fm3" resolve="RuleTable" />
         </node>
       </node>
       <node concept="3Tm1VV" id="IfzMHGfKWO" role="1B3o_S" />
@@ -15135,7 +15135,7 @@
         <node concept="37vLTG" id="IfzMHGfK4C" role="3clF46">
           <property role="TrG5h" value="ruleTemplateTable" />
           <node concept="3uibUv" id="IfzMHGfK4D" role="1tU5fm">
-            <ref role="3uigEE" to="i348:4MqhgXU9fm3" resolve="RuleTable" />
+            <ref role="3uigEE" to="ugy2:4MqhgXU9fm3" resolve="RuleTable" />
           </node>
         </node>
         <node concept="37vLTG" id="IfzMHGfK4E" role="3clF46">
@@ -15206,7 +15206,7 @@
                           <ref role="3cqZAo" node="IfzMHGfK5K" resolve="ruleTemplateTable" />
                         </node>
                         <node concept="liA8E" id="IfzMHGfK5e" role="2OqNvi">
-                          <ref role="37wK5l" to="i348:7P_FdVQoGPt" resolve="extendedFqName" />
+                          <ref role="37wK5l" to="ugy2:7P_FdVQoGPt" resolve="extendedFqName" />
                         </node>
                       </node>
                       <node concept="37vLTw" id="IfzMHGfK5f" role="3ElQJh">
@@ -15227,7 +15227,7 @@
                     <ref role="3cqZAo" node="IfzMHGfK5K" resolve="ruleTemplateTable" />
                   </node>
                   <node concept="liA8E" id="IfzMHGfK5l" role="2OqNvi">
-                    <ref role="37wK5l" to="i348:7P_FdVQoGPt" resolve="extendedFqName" />
+                    <ref role="37wK5l" to="ugy2:7P_FdVQoGPt" resolve="extendedFqName" />
                   </node>
                 </node>
               </node>
@@ -15259,7 +15259,7 @@
                       <ref role="3cqZAo" node="IfzMHGfK5K" resolve="ruleTemplateTable" />
                     </node>
                     <node concept="liA8E" id="IfzMHGfK5$" role="2OqNvi">
-                      <ref role="37wK5l" to="i348:7P_FdVQoZmr" resolve="fqName" />
+                      <ref role="37wK5l" to="ugy2:7P_FdVQoZmr" resolve="fqName" />
                     </node>
                   </node>
                   <node concept="liA8E" id="IfzMHGfK5_" role="2OqNvi">
@@ -15274,7 +15274,7 @@
                         </node>
                       </node>
                       <node concept="liA8E" id="IfzMHGfK5E" role="2OqNvi">
-                        <ref role="37wK5l" to="i348:7P_FdVQoGPt" resolve="extendedFqName" />
+                        <ref role="37wK5l" to="ugy2:7P_FdVQoGPt" resolve="extendedFqName" />
                       </node>
                     </node>
                   </node>
@@ -15298,7 +15298,7 @@
         <property role="TrG5h" value="ruleTemplateTable" />
         <node concept="3Tm6S6" id="IfzMHGfK5L" role="1B3o_S" />
         <node concept="3uibUv" id="IfzMHGfK5M" role="1tU5fm">
-          <ref role="3uigEE" to="i348:4MqhgXU9fm3" resolve="RuleTable" />
+          <ref role="3uigEE" to="ugy2:4MqhgXU9fm3" resolve="RuleTable" />
         </node>
       </node>
       <node concept="312cEg" id="IfzMHGfK5N" role="jymVt">
diff --git a/coderules/solutions/jetbrains.mps.coderules.runtime/models/jetbrains.mps.coderules.runtime.result.mps b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.result.mps
similarity index 99%
rename from coderules/solutions/jetbrains.mps.coderules.runtime/models/jetbrains.mps.coderules.runtime.result.mps
rename to coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.result.mps
index 4b81e49e..b939173e 100644
--- a/coderules/solutions/jetbrains.mps.coderules.runtime/models/jetbrains.mps.coderules.runtime.result.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.result.mps
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:78313117-90ee-47a5-a91e-b5213df7f611(jetbrains.mps.coderules.runtime.result)">
+<model ref="r:b198cb67-efdc-40c0-8817-11ab64523a5b(jetbrains.mps.lang.coderules.result)">
   <persistence version="9" />
   <languages>
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
@@ -190,6 +190,7 @@
   <node concept="312cEu" id="7Oc59RSEjdb">
     <property role="TrG5h" value="Result" />
     <property role="1sVAO0" value="true" />
+    <node concept="2tJIrI" id="74$3PKmogFr" role="jymVt" />
     <node concept="2tJIrI" id="7Oc59RSEmi9" role="jymVt" />
     <node concept="2YIFZL" id="7Oc59RSEjeq" role="jymVt">
       <property role="TrG5h" value="OK" />
diff --git a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.template.mps
similarity index 99%
rename from coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps
rename to coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.template.mps
index 55c2ee08..cf4c3cd5 100644
--- a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.template.mps
@@ -1,15 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:42a15dec-83a9-4fe1-80d6-3bf898c512bd(jetbrains.mps.lang.coderules.template)">
+<model ref="r:57b2449f-b7c7-4941-bd75-9c594835f5cd(jetbrains.mps.lang.coderules.template)">
   <persistence version="9" />
   <languages>
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
-    <use id="daafa647-f1f7-4b0b-b096-69cd7c8408c0" name="jetbrains.mps.baseLanguage.regexp" version="0" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
     <use id="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text" version="0" />
-    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="13" />
     <use id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples" version="0" />
   </languages>
   <imports>
@@ -21,16 +19,16 @@
     <import index="av0y" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.program(jetbrains.mps.logic.reactor/)" />
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
     <import index="bj13" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.logical(jetbrains.mps.logic.reactor/)" />
-    <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.dataform)" />
-    <import index="cxk7" ref="r:daa544a7-0a5c-49c0-a54c-4c2a5b4868aa(jetbrains.mps.logic.predicate)" />
     <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
     <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" />
     <import index="82uw" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.function(JDK/)" />
     <import index="mhfm" ref="3f233e7f-b8a6-46d2-a57f-795d56775243/java:org.jetbrains.annotations(Annotations/)" />
     <import index="d6hs" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.errors.item(MPS.Core/)" />
     <import index="2gg1" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.errors(MPS.Core/)" />
-    <import index="lehm" ref="r:464fcc95-fddb-47d1-b620-592cbf6b8bf2(jetbrains.mps.coderules.runtime.memoizer)" />
-    <import index="fqlx" ref="r:2cc226a9-8a78-4010-b962-823343fd28ff(jetbrains.mps.lang.coderules.aspect)" />
+    <import index="pxw9" ref="r:e3417884-ba0a-4330-9cea-64f01ace2e9d(jetbrains.mps.lang.coderules.aspect)" />
+    <import index="tpfl" ref="r:97d6f79f-4a27-4a9b-9122-9bccfb5317c9(jetbrains.mps.lang.coderules.predicate)" />
+    <import index="aedp" ref="r:969c74a0-af0a-4247-9dda-0da7708b8c0d(jetbrains.mps.lang.coderules.memoizer)" />
+    <import index="cof4" ref="r:0a9d1d47-250c-4f98-8962-b65edf8b0721(jetbrains.mps.logic.dataform)" />
   </imports>
   <registry>
     <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples">
@@ -1476,7 +1474,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="6exd:1msb0mq9ID4" resolve="DataNode" />
+                    <ref role="3uigEE" to="cof4:1msb0mq9ID4" resolve="DataNode" />
                   </node>
                   <node concept="37vLTw" id="4sSe4$prv0k" role="2ZW6bz">
                     <ref role="3cqZAo" node="78CwJJcO_55" resolve="arg" />
@@ -1531,7 +1529,7 @@
                       <node concept="liA8E" id="4sSe4$prIpP" role="2OqNvi">
                         <ref role="37wK5l" to="33ny:~ArrayList.add(java.lang.Object)" resolve="add" />
                         <node concept="3VsKOn" id="4sSe4$prJvo" role="37wK5m">
-                          <ref role="3VsUkX" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                          <ref role="3VsUkX" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                         </node>
                       </node>
                     </node>
@@ -1660,7 +1658,7 @@
                       <ref role="37wK5l" to="33ny:~ArrayList.add(java.lang.Object)" resolve="add" />
                       <node concept="2ShNRf" id="4sSe4$p0jEu" role="37wK5m">
                         <node concept="1pGfFk" id="4sSe4$p0lnr" role="2ShVmc">
-                          <ref role="37wK5l" to="cxk7:4xBopTzmopz" resolve="UnificationPredicate" />
+                          <ref role="37wK5l" to="tpfl:4xBopTzmopz" resolve="UnificationPredicate" />
                           <node concept="37vLTw" id="4sSe4$p0p1w" role="37wK5m">
                             <ref role="3cqZAo" node="4sSe4$oZLtc" resolve="occArg" />
                           </node>
@@ -2068,8 +2066,8 @@
             <node concept="3clFbS" id="5HVB6JRjlzg" role="9aQI4">
               <node concept="3cpWs6" id="5HVB6JRjmhn" role="3cqZAp">
                 <node concept="2YIFZM" id="5HVB6JRjmho" role="3cqZAk">
-                  <ref role="37wK5l" to="lehm:2tjs8VC2Blb" resolve="getOrPut" />
-                  <ref role="1Pybhc" to="lehm:2tjs8VC0K0m" resolve="Memoizer" />
+                  <ref role="37wK5l" to="aedp:2tjs8VC2Blb" resolve="getOrPut" />
+                  <ref role="1Pybhc" to="aedp:2tjs8VC0K0m" resolve="Memoizer" />
                   <node concept="37vLTw" id="5HVB6JRjmhp" role="37wK5m">
                     <ref role="3cqZAo" node="5HVB6JR7RzF" resolve="key" />
                   </node>
@@ -5234,7 +5232,7 @@
               <node concept="3clFbJ" id="500mE4_xd$R" role="3cqZAp">
                 <node concept="2ZW3vV" id="500mE4_xd_1" role="3clFbw">
                   <node concept="3uibUv" id="500mE4_xd_2" role="2ZW6by">
-                    <ref role="3uigEE" to="6exd:1msb0mq9ID4" resolve="DataNode" />
+                    <ref role="3uigEE" to="cof4:1msb0mq9ID4" resolve="DataNode" />
                   </node>
                   <node concept="37vLTw" id="500mE4_xKfz" role="2ZW6bz">
                     <ref role="3cqZAo" node="5yr01fECOnu" resolve="arg" />
@@ -5246,7 +5244,7 @@
                       <node concept="1eOMI4" id="500mE4_xd_7" role="2Oq$k0">
                         <node concept="10QFUN" id="500mE4_xd_8" role="1eOMHV">
                           <node concept="3uibUv" id="500mE4_xd_9" role="10QFUM">
-                            <ref role="3uigEE" to="6exd:1msb0mq9ID4" resolve="DataNode" />
+                            <ref role="3uigEE" to="cof4:1msb0mq9ID4" resolve="DataNode" />
                           </node>
                           <node concept="37vLTw" id="500mE4_xKhu" role="10QFUP">
                             <ref role="3cqZAo" node="5yr01fECOnu" resolve="arg" />
@@ -5254,12 +5252,12 @@
                         </node>
                       </node>
                       <node concept="liA8E" id="500mE4_xd_b" role="2OqNvi">
-                        <ref role="37wK5l" to="6exd:104EUzFOBnD" resolve="acceptVisitor" />
+                        <ref role="37wK5l" to="cof4:104EUzFOBnD" resolve="acceptVisitor" />
                         <node concept="2ShNRf" id="500mE4_xd_c" role="37wK5m">
                           <node concept="YeOm9" id="500mE4_xd_d" role="2ShVmc">
                             <node concept="1Y3b0j" id="500mE4_xd_e" role="YeSDq">
                               <property role="2bfB8j" value="true" />
-                              <ref role="1Y3XeK" to="6exd:104EUzFOARB" resolve="DataForm.Visitor" />
+                              <ref role="1Y3XeK" to="cof4:104EUzFOARB" resolve="DataForm.Visitor" />
                               <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
                               <node concept="3Tm1VV" id="500mE4_xd_f" role="1B3o_S" />
                               <node concept="3clFb_" id="500mE4_xd_g" role="jymVt">
@@ -5267,7 +5265,7 @@
                                 <node concept="37vLTG" id="500mE4_xd_h" role="3clF46">
                                   <property role="TrG5h" value="value" />
                                   <node concept="3uibUv" id="500mE4_xd_i" role="1tU5fm">
-                                    <ref role="3uigEE" to="6exd:2xQ7eRAD2dj" resolve="Value" />
+                                    <ref role="3uigEE" to="cof4:2xQ7eRAD2dj" resolve="Value" />
                                     <node concept="16syzq" id="500mE4_xd_j" role="11_B2D">
                                       <ref role="16sUi3" node="500mE4_xd_m" resolve="V" />
                                     </node>
@@ -5295,7 +5293,7 @@
                                           <ref role="3cqZAo" node="500mE4_xd_h" resolve="value" />
                                         </node>
                                         <node concept="liA8E" id="500mE4_xd_u" role="2OqNvi">
-                                          <ref role="37wK5l" to="6exd:1msb0mq8QTt" resolve="symbol" />
+                                          <ref role="37wK5l" to="cof4:1msb0mq8QTt" resolve="symbol" />
                                         </node>
                                       </node>
                                     </node>
@@ -5338,7 +5336,7 @@
                                 <node concept="37vLTG" id="500mE4_xd_I" role="3clF46">
                                   <property role="TrG5h" value="node" />
                                   <node concept="3uibUv" id="500mE4_xd_J" role="1tU5fm">
-                                    <ref role="3uigEE" to="6exd:1msb0mq9ID4" resolve="DataNode" />
+                                    <ref role="3uigEE" to="cof4:1msb0mq9ID4" resolve="DataNode" />
                                   </node>
                                 </node>
                                 <node concept="3uibUv" id="500mE4_xd_K" role="3clF45">
@@ -5353,7 +5351,7 @@
                                     <node concept="3cpWsn" id="500mE4_xd_P" role="3cpWs9">
                                       <property role="TrG5h" value="visitor" />
                                       <node concept="3uibUv" id="500mE4_xd_Q" role="1tU5fm">
-                                        <ref role="3uigEE" to="6exd:104EUzFOARB" resolve="DataForm.Visitor" />
+                                        <ref role="3uigEE" to="cof4:104EUzFOARB" resolve="DataForm.Visitor" />
                                         <node concept="3uibUv" id="500mE4_xd_R" role="11_B2D">
                                           <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
                                         </node>
@@ -5367,7 +5365,7 @@
                                         <node concept="10QFUN" id="500mE4_xd_W" role="1eOMHV">
                                           <node concept="3vKaQO" id="500mE4_xd_X" role="10QFUM">
                                             <node concept="3uibUv" id="500mE4_xd_Y" role="3O5elw">
-                                              <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                                              <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                                             </node>
                                           </node>
                                           <node concept="2OqwBi" id="500mE4_xd_Z" role="10QFUP">
@@ -5375,7 +5373,7 @@
                                               <ref role="3cqZAo" node="500mE4_xd_I" resolve="node" />
                                             </node>
                                             <node concept="liA8E" id="500mE4_xdA1" role="2OqNvi">
-                                              <ref role="37wK5l" to="6exd:5JQSuNswjSg" resolve="arguments" />
+                                              <ref role="37wK5l" to="cof4:5JQSuNswjSg" resolve="arguments" />
                                             </node>
                                           </node>
                                         </node>
@@ -5389,7 +5387,7 @@
                                                   <ref role="3cqZAo" node="6E5fMGvfKTq" resolve="it" />
                                                 </node>
                                                 <node concept="liA8E" id="500mE4_xdA8" role="2OqNvi">
-                                                  <ref role="37wK5l" to="6exd:104EUzFOBnD" resolve="acceptVisitor" />
+                                                  <ref role="37wK5l" to="cof4:104EUzFOBnD" resolve="acceptVisitor" />
                                                   <node concept="37vLTw" id="500mE4_xdA9" role="37wK5m">
                                                     <ref role="3cqZAo" node="500mE4_xd_P" resolve="visitor" />
                                                   </node>
@@ -5953,7 +5951,7 @@
                     </node>
                     <node concept="2ZW3vV" id="500mE4_Jc9W" role="3uHU7w">
                       <node concept="3uibUv" id="500mE4_Jcri" role="2ZW6by">
-                        <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                        <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                       </node>
                       <node concept="37vLTw" id="500mE4_Jc05" role="2ZW6bz">
                         <ref role="3cqZAo" node="500mE4_vARD" resolve="arg" />
@@ -6857,7 +6855,7 @@
                 <node concept="1eOMI4" id="7lt0LtQvs86" role="2Oq$k0">
                   <node concept="10QFUN" id="7lt0LtQvs83" role="1eOMHV">
                     <node concept="3uibUv" id="7lt0LtQvs88" role="10QFUM">
-                      <ref role="3uigEE" to="cxk7:7lt0LtQvaw_" resolve="PredicateSymbolExt" />
+                      <ref role="3uigEE" to="tpfl:7lt0LtQvaw_" resolve="PredicateSymbolExt" />
                     </node>
                     <node concept="37vLTw" id="7lt0LtQvs89" role="10QFUP">
                       <ref role="3cqZAo" node="4sSe4$oM2YO" resolve="symbol" />
@@ -6865,7 +6863,7 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="7lt0LtQvth2" role="2OqNvi">
-                  <ref role="37wK5l" to="cxk7:7lt0LtQvpyU" resolve="predicate" />
+                  <ref role="37wK5l" to="tpfl:7lt0LtQvpyU" resolve="predicate" />
                   <node concept="37vLTw" id="7lt0LtQvugb" role="37wK5m">
                     <ref role="3cqZAo" node="4sSe4$oM2EL" resolve="args" />
                   </node>
@@ -6875,7 +6873,7 @@
           </node>
           <node concept="2ZW3vV" id="7lt0LtQvrip" role="3clFbw">
             <node concept="3uibUv" id="7lt0LtQvruv" role="2ZW6by">
-              <ref role="3uigEE" to="cxk7:7lt0LtQvaw_" resolve="PredicateSymbolExt" />
+              <ref role="3uigEE" to="tpfl:7lt0LtQvaw_" resolve="PredicateSymbolExt" />
             </node>
             <node concept="37vLTw" id="7lt0LtQvqOX" role="2ZW6bz">
               <ref role="3cqZAo" node="4sSe4$oM2YO" resolve="symbol" />
@@ -8175,7 +8173,7 @@
       <property role="TrG5h" value="getTerm" />
       <property role="1EzhhJ" value="true" />
       <node concept="3uibUv" id="4MEOIDFA4e5" role="3clF45">
-        <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+        <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
       </node>
       <node concept="3Tm1VV" id="4MEOIDFA4bS" role="1B3o_S" />
       <node concept="3clFbS" id="4MEOIDFA4bT" role="3clF47" />
@@ -8504,7 +8502,7 @@
       <node concept="37vLTG" id="1LBj9w_9RJS" role="3clF46">
         <property role="TrG5h" value="manifest" />
         <node concept="3uibUv" id="1LBj9w_9RLv" role="1tU5fm">
-          <ref role="3uigEE" to="fqlx:5EDW3XF5Z95" resolve="AbstractCoderulesManifest" />
+          <ref role="3uigEE" to="pxw9:5EDW3XF5Z95" resolve="AbstractCoderulesManifest" />
         </node>
       </node>
       <node concept="3cqZAl" id="1LBj9w_9RIZ" role="3clF45" />
@@ -8529,7 +8527,7 @@
     <node concept="3clFb_" id="1LBj9w_9RCi" role="jymVt">
       <property role="TrG5h" value="manifest" />
       <node concept="3uibUv" id="1LBj9w_9REs" role="3clF45">
-        <ref role="3uigEE" to="fqlx:5EDW3XF5Z95" resolve="AbstractCoderulesManifest" />
+        <ref role="3uigEE" to="pxw9:5EDW3XF5Z95" resolve="AbstractCoderulesManifest" />
       </node>
       <node concept="3Tm1VV" id="1LBj9w_9RCl" role="1B3o_S" />
       <node concept="3clFbS" id="1LBj9w_9RCm" role="3clF47">
@@ -8545,7 +8543,7 @@
       <property role="TrG5h" value="manifest" />
       <node concept="3Tm6S6" id="1LBj9w_9RN3" role="1B3o_S" />
       <node concept="3uibUv" id="1LBj9w_9RN5" role="1tU5fm">
-        <ref role="3uigEE" to="fqlx:5EDW3XF5Z95" resolve="AbstractCoderulesManifest" />
+        <ref role="3uigEE" to="pxw9:5EDW3XF5Z95" resolve="AbstractCoderulesManifest" />
       </node>
     </node>
     <node concept="2tJIrI" id="1LBj9w_9RYl" role="jymVt" />
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.terms.mps b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.terms.mps
index dd75d1f8..586222ff 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.terms.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.terms.mps
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:4c913df4-f2d5-43f7-af56-6bccd35aeb11(jetbrains.mps.lang.coderules.terms)">
+<model ref="r:75494708-a5bf-40c3-8a06-1176e662985f(jetbrains.mps.lang.coderules.terms)">
   <persistence version="9" />
   <languages>
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
   </languages>
   <imports>
-    <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.dataform)" />
-    <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="cof4" ref="r:0a9d1d47-250c-4f98-8962-b65edf8b0721(jetbrains.mps.logic.dataform)" />
     <import index="yt73" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.unification(jetbrains.mps.logic.reactor/)" implicit="true" />
   </imports>
   <registry>
@@ -176,7 +175,7 @@
       <node concept="37vLTG" id="1RYTbd6E3Ql" role="3clF46">
         <property role="TrG5h" value="spec" />
         <node concept="3uibUv" id="1RYTbd6E3QL" role="1tU5fm">
-          <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="TermNode" />
+          <ref role="3uigEE" to="cof4:5JQSuNswOXL" resolve="TermNode" />
         </node>
       </node>
       <node concept="37vLTG" id="1RYTbd6E3P6" role="3clF46">
@@ -187,12 +186,12 @@
         <property role="TrG5h" value="contents" />
         <node concept="8X2XB" id="1RYTbd6E3SK" role="1tU5fm">
           <node concept="3uibUv" id="1RYTbd6E3Sg" role="8Xvag">
-            <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+            <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
           </node>
         </node>
       </node>
       <node concept="3uibUv" id="1RYTbd6E3MV" role="3clF45">
-        <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="TermNode" />
+        <ref role="3uigEE" to="cof4:5JQSuNswOXL" resolve="TermNode" />
       </node>
       <node concept="3Tm1VV" id="1RYTbd6E3Mk" role="1B3o_S" />
       <node concept="3clFbS" id="1RYTbd6E3Ml" role="3clF47">
@@ -201,13 +200,13 @@
             <property role="TrG5h" value="newContents" />
             <node concept="_YKpA" id="1RYTbd6Ea_4" role="1tU5fm">
               <node concept="3uibUv" id="1RYTbd6Ea_7" role="_ZDj9">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
             </node>
             <node concept="2ShNRf" id="1RYTbd6Ea_Y" role="33vP2m">
               <node concept="Tc6Ow" id="1RYTbd6Ea_Z" role="2ShVmc">
                 <node concept="3uibUv" id="1RYTbd6EaA0" role="HW$YZ">
-                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                  <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                 </node>
               </node>
             </node>
@@ -220,14 +219,14 @@
             </node>
             <node concept="TSZUe" id="1RYTbd6Eh$H" role="2OqNvi">
               <node concept="2YIFZM" id="1RYTbd6E4dX" role="25WWJ7">
-                <ref role="1Pybhc" to="6exd:1msb0mq99GH" resolve="ValueRole" />
-                <ref role="37wK5l" to="6exd:6cHSm2DiUE1" resolve="create" />
+                <ref role="1Pybhc" to="cof4:1msb0mq99GH" resolve="ValueRole" />
+                <ref role="37wK5l" to="cof4:6cHSm2DiUE1" resolve="create" />
                 <node concept="37vLTw" id="1RYTbd6Eh_W" role="37wK5m">
                   <ref role="3cqZAo" node="1RYTbd6oE68" resolve="DECLARATION" />
                 </node>
                 <node concept="2YIFZM" id="1RYTbd6E4OO" role="37wK5m">
-                  <ref role="37wK5l" to="6exd:5JQSuNsxb_I" resolve="create" />
-                  <ref role="1Pybhc" to="6exd:2xQ7eRAD2dj" resolve="Value" />
+                  <ref role="37wK5l" to="cof4:5JQSuNsxb_I" resolve="create" />
+                  <ref role="1Pybhc" to="cof4:2xQ7eRAD2dj" resolve="Value" />
                   <node concept="37vLTw" id="1RYTbd6E50m" role="37wK5m">
                     <ref role="3cqZAo" node="1RYTbd6E3P6" resolve="declaration" />
                   </node>
@@ -258,8 +257,8 @@
             </node>
             <node concept="TSZUe" id="1RYTbd6Ebru" role="2OqNvi">
               <node concept="2YIFZM" id="1RYTbd6EnAA" role="25WWJ7">
-                <ref role="1Pybhc" to="6exd:6YPNC4NYnau" resolve="ChildRole" />
-                <ref role="37wK5l" to="6exd:6YPNC4NYnI9" resolve="create" />
+                <ref role="1Pybhc" to="cof4:6YPNC4NYnau" resolve="ChildRole" />
+                <ref role="37wK5l" to="cof4:6YPNC4NYnI9" resolve="create" />
                 <node concept="37vLTw" id="1RYTbd6EnTq" role="37wK5m">
                   <ref role="3cqZAo" node="1RYTbd6oE9B" resolve="SPECIFICATION" />
                 </node>
@@ -272,8 +271,8 @@
         </node>
         <node concept="3clFbF" id="1RYTbd6E3Ty" role="3cqZAp">
           <node concept="2YIFZM" id="1RYTbd6E3UM" role="3clFbG">
-            <ref role="37wK5l" to="6exd:1RYTbd66m3S" resolve="create" />
-            <ref role="1Pybhc" to="6exd:5JQSuNswOXL" resolve="TermNode" />
+            <ref role="37wK5l" to="cof4:1RYTbd66m3S" resolve="create" />
+            <ref role="1Pybhc" to="cof4:5JQSuNswOXL" resolve="TermNode" />
             <node concept="2OqwBi" id="1RYTbd6EemB" role="37wK5m">
               <node concept="37vLTw" id="1RYTbd6Eebr" role="2Oq$k0">
                 <ref role="3cqZAo" node="1RYTbd6Ea_X" resolve="newContents" />
@@ -295,12 +294,12 @@
         <property role="TrG5h" value="contents" />
         <node concept="8X2XB" id="1RYTbd6Ek9w" role="1tU5fm">
           <node concept="3uibUv" id="1RYTbd6Ek9x" role="8Xvag">
-            <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+            <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
           </node>
         </node>
       </node>
       <node concept="3uibUv" id="1RYTbd6Ek9y" role="3clF45">
-        <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="TermNode" />
+        <ref role="3uigEE" to="cof4:5JQSuNswOXL" resolve="TermNode" />
       </node>
       <node concept="3Tm1VV" id="1RYTbd6Ek9z" role="1B3o_S" />
       <node concept="3clFbS" id="1RYTbd6Ek9$" role="3clF47">
@@ -309,13 +308,13 @@
             <property role="TrG5h" value="newContents" />
             <node concept="_YKpA" id="1RYTbd6Ek9B" role="1tU5fm">
               <node concept="3uibUv" id="1RYTbd6Ek9C" role="_ZDj9">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
             </node>
             <node concept="2ShNRf" id="1RYTbd6Ek9D" role="33vP2m">
               <node concept="Tc6Ow" id="1RYTbd6Ek9E" role="2ShVmc">
                 <node concept="3uibUv" id="1RYTbd6Ek9F" role="HW$YZ">
-                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                  <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                 </node>
               </node>
             </node>
@@ -328,14 +327,14 @@
             </node>
             <node concept="TSZUe" id="1RYTbd6Ek9J" role="2OqNvi">
               <node concept="2YIFZM" id="1RYTbd6Ek9K" role="25WWJ7">
-                <ref role="1Pybhc" to="6exd:1msb0mq99GH" resolve="ValueRole" />
-                <ref role="37wK5l" to="6exd:6cHSm2DiUE1" resolve="create" />
+                <ref role="1Pybhc" to="cof4:1msb0mq99GH" resolve="ValueRole" />
+                <ref role="37wK5l" to="cof4:6cHSm2DiUE1" resolve="create" />
                 <node concept="37vLTw" id="1RYTbd6Ek9L" role="37wK5m">
                   <ref role="3cqZAo" node="1RYTbd6oE68" resolve="DECLARATION" />
                 </node>
                 <node concept="2YIFZM" id="1RYTbd6Ek9M" role="37wK5m">
-                  <ref role="37wK5l" to="6exd:5JQSuNsxb_I" resolve="create" />
-                  <ref role="1Pybhc" to="6exd:2xQ7eRAD2dj" resolve="Value" />
+                  <ref role="37wK5l" to="cof4:5JQSuNsxb_I" resolve="create" />
+                  <ref role="1Pybhc" to="cof4:2xQ7eRAD2dj" resolve="Value" />
                   <node concept="37vLTw" id="1RYTbd6Ek9N" role="37wK5m">
                     <ref role="3cqZAo" node="1RYTbd6Ek9r" resolve="declaration" />
                   </node>
@@ -361,8 +360,8 @@
         </node>
         <node concept="3clFbF" id="1RYTbd6Eka0" role="3cqZAp">
           <node concept="2YIFZM" id="1RYTbd6Eka1" role="3clFbG">
-            <ref role="37wK5l" to="6exd:1RYTbd66m3S" resolve="create" />
-            <ref role="1Pybhc" to="6exd:5JQSuNswOXL" resolve="TermNode" />
+            <ref role="37wK5l" to="cof4:1RYTbd66m3S" resolve="create" />
+            <ref role="1Pybhc" to="cof4:5JQSuNswOXL" resolve="TermNode" />
             <node concept="2OqwBi" id="1RYTbd6Eka2" role="37wK5m">
               <node concept="37vLTw" id="1RYTbd6Eka3" role="2Oq$k0">
                 <ref role="3cqZAo" node="1RYTbd6Ek9A" resolve="newContents" />
@@ -384,12 +383,12 @@
         <property role="TrG5h" value="contents" />
         <node concept="8X2XB" id="1RYTbd6EEG5" role="1tU5fm">
           <node concept="3uibUv" id="1RYTbd6EEG6" role="8Xvag">
-            <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+            <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
           </node>
         </node>
       </node>
       <node concept="3uibUv" id="1RYTbd6EEG7" role="3clF45">
-        <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="TermNode" />
+        <ref role="3uigEE" to="cof4:5JQSuNswOXL" resolve="TermNode" />
       </node>
       <node concept="3Tm1VV" id="1RYTbd6EEG8" role="1B3o_S" />
       <node concept="3clFbS" id="1RYTbd6EEG9" role="3clF47">
@@ -398,13 +397,13 @@
             <property role="TrG5h" value="newContents" />
             <node concept="_YKpA" id="1RYTbd6EEGc" role="1tU5fm">
               <node concept="3uibUv" id="1RYTbd6EEGd" role="_ZDj9">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
             </node>
             <node concept="2ShNRf" id="1RYTbd6EEGe" role="33vP2m">
               <node concept="Tc6Ow" id="1RYTbd6EEGf" role="2ShVmc">
                 <node concept="3uibUv" id="1RYTbd6EEGg" role="HW$YZ">
-                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                  <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                 </node>
               </node>
             </node>
@@ -417,14 +416,14 @@
             </node>
             <node concept="TSZUe" id="1RYTbd6EEGk" role="2OqNvi">
               <node concept="2YIFZM" id="1RYTbd6EEGl" role="25WWJ7">
-                <ref role="1Pybhc" to="6exd:1msb0mq99GH" resolve="ValueRole" />
-                <ref role="37wK5l" to="6exd:6cHSm2DiUE1" resolve="create" />
+                <ref role="1Pybhc" to="cof4:1msb0mq99GH" resolve="ValueRole" />
+                <ref role="37wK5l" to="cof4:6cHSm2DiUE1" resolve="create" />
                 <node concept="37vLTw" id="1RYTbd6EEGm" role="37wK5m">
                   <ref role="3cqZAo" node="1RYTbd6oE68" resolve="DECLARATION" />
                 </node>
                 <node concept="2YIFZM" id="1RYTbd6EEGn" role="37wK5m">
-                  <ref role="37wK5l" to="6exd:5JQSuNsxb_I" resolve="create" />
-                  <ref role="1Pybhc" to="6exd:2xQ7eRAD2dj" resolve="Value" />
+                  <ref role="37wK5l" to="cof4:5JQSuNsxb_I" resolve="create" />
+                  <ref role="1Pybhc" to="cof4:2xQ7eRAD2dj" resolve="Value" />
                   <node concept="37vLTw" id="1RYTbd6EEGo" role="37wK5m">
                     <ref role="3cqZAo" node="1RYTbd6EEG2" resolve="declaration" />
                   </node>
@@ -468,14 +467,14 @@
             </node>
             <node concept="TSZUe" id="1RYTbd6EEGC" role="2OqNvi">
               <node concept="2YIFZM" id="1RYTbd6EEGD" role="25WWJ7">
-                <ref role="1Pybhc" to="6exd:6YPNC4NYnau" resolve="ChildRole" />
-                <ref role="37wK5l" to="6exd:6YPNC4NYnI9" resolve="create" />
+                <ref role="1Pybhc" to="cof4:6YPNC4NYnau" resolve="ChildRole" />
+                <ref role="37wK5l" to="cof4:6YPNC4NYnI9" resolve="create" />
                 <node concept="37vLTw" id="1RYTbd6EEGE" role="37wK5m">
                   <ref role="3cqZAo" node="1RYTbd6oE9B" resolve="SPECIFICATION" />
                 </node>
                 <node concept="2YIFZM" id="1RYTbd6EEGF" role="37wK5m">
-                  <ref role="37wK5l" to="6exd:1RYTbd66m3S" resolve="create" />
-                  <ref role="1Pybhc" to="6exd:5JQSuNswOXL" resolve="TermNode" />
+                  <ref role="37wK5l" to="cof4:1RYTbd66m3S" resolve="create" />
+                  <ref role="1Pybhc" to="cof4:5JQSuNswOXL" resolve="TermNode" />
                 </node>
               </node>
             </node>
@@ -483,8 +482,8 @@
         </node>
         <node concept="3clFbF" id="1RYTbd6EEGG" role="3cqZAp">
           <node concept="2YIFZM" id="1RYTbd6EEGH" role="3clFbG">
-            <ref role="37wK5l" to="6exd:1RYTbd66m3S" resolve="create" />
-            <ref role="1Pybhc" to="6exd:5JQSuNswOXL" resolve="TermNode" />
+            <ref role="37wK5l" to="cof4:1RYTbd66m3S" resolve="create" />
+            <ref role="1Pybhc" to="cof4:5JQSuNswOXL" resolve="TermNode" />
             <node concept="2OqwBi" id="1RYTbd6EEGI" role="37wK5m">
               <node concept="37vLTw" id="1RYTbd6EEGJ" role="2Oq$k0">
                 <ref role="3cqZAo" node="1RYTbd6EEGb" resolve="newContents" />
@@ -501,11 +500,11 @@
       <node concept="37vLTG" id="1RYTbd7gcKe" role="3clF46">
         <property role="TrG5h" value="term" />
         <node concept="3uibUv" id="1RYTbd7gcLF" role="1tU5fm">
-          <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="TermNode" />
+          <ref role="3uigEE" to="cof4:5JQSuNswOXL" resolve="TermNode" />
         </node>
       </node>
       <node concept="3uibUv" id="1RYTbd7gqm6" role="3clF45">
-        <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="TermNode" />
+        <ref role="3uigEE" to="cof4:5JQSuNswOXL" resolve="TermNode" />
       </node>
       <node concept="3Tm1VV" id="1RYTbd7gcCx" role="1B3o_S" />
       <node concept="3clFbS" id="1RYTbd7gcCy" role="3clF47">
@@ -515,7 +514,7 @@
             <node concept="3vKaQO" id="1RYTbd7gfYL" role="1tU5fm">
               <node concept="3qUE_q" id="1RYTbd7gipt" role="3O5elw">
                 <node concept="3uibUv" id="1RYTbd7giER" role="3qUE_r">
-                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                  <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                 </node>
               </node>
             </node>
@@ -524,7 +523,7 @@
                 <ref role="3cqZAo" node="1RYTbd7gcKe" resolve="term" />
               </node>
               <node concept="liA8E" id="1RYTbd7gfK0" role="2OqNvi">
-                <ref role="37wK5l" to="6exd:5JQSuNswjSg" resolve="arguments" />
+                <ref role="37wK5l" to="cof4:5JQSuNswjSg" resolve="arguments" />
               </node>
             </node>
           </node>
@@ -533,7 +532,7 @@
           <node concept="3cpWsn" id="1RYTbd7gmHr" role="3cpWs9">
             <property role="TrG5h" value="last" />
             <node concept="3uibUv" id="1RYTbd7gmHs" role="1tU5fm">
-              <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+              <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
             </node>
             <node concept="2OqwBi" id="1RYTbd7gmHt" role="33vP2m">
               <node concept="37vLTw" id="1RYTbd7gmHu" role="2Oq$k0">
@@ -549,13 +548,13 @@
               <node concept="3cpWsn" id="1RYTbd7gpNd" role="3cpWs9">
                 <property role="TrG5h" value="spec" />
                 <node concept="3uibUv" id="1RYTbd7gpKG" role="1tU5fm">
-                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                  <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                 </node>
                 <node concept="2OqwBi" id="1RYTbd7gpNe" role="33vP2m">
                   <node concept="1eOMI4" id="1RYTbd7gpNf" role="2Oq$k0">
                     <node concept="10QFUN" id="1RYTbd7gpNg" role="1eOMHV">
                       <node concept="3uibUv" id="1RYTbd7gpNh" role="10QFUM">
-                        <ref role="3uigEE" to="6exd:6YPNC4NYnau" resolve="ChildRole" />
+                        <ref role="3uigEE" to="cof4:6YPNC4NYnau" resolve="ChildRole" />
                       </node>
                       <node concept="37vLTw" id="1RYTbd7gpNi" role="10QFUP">
                         <ref role="3cqZAo" node="1RYTbd7gmHr" resolve="last" />
@@ -563,7 +562,7 @@
                     </node>
                   </node>
                   <node concept="liA8E" id="1RYTbd7gpNj" role="2OqNvi">
-                    <ref role="37wK5l" to="6exd:6YPNC4OE9DW" resolve="argument" />
+                    <ref role="37wK5l" to="cof4:6YPNC4OE9DW" resolve="argument" />
                   </node>
                 </node>
               </node>
@@ -573,7 +572,7 @@
                 <node concept="3cpWs6" id="1RYTbd7gCsE" role="3cqZAp">
                   <node concept="10QFUN" id="1RYTbd7gDaX" role="3cqZAk">
                     <node concept="3uibUv" id="1RYTbd7gDaV" role="10QFUM">
-                      <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="TermNode" />
+                      <ref role="3uigEE" to="cof4:5JQSuNswOXL" resolve="TermNode" />
                     </node>
                     <node concept="37vLTw" id="1RYTbd7gDk4" role="10QFUP">
                       <ref role="3cqZAo" node="1RYTbd7gpNd" resolve="spec" />
@@ -583,7 +582,7 @@
               </node>
               <node concept="2ZW3vV" id="1RYTbd7gCm5" role="3clFbw">
                 <node concept="3uibUv" id="1RYTbd7gCq9" role="2ZW6by">
-                  <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="TermNode" />
+                  <ref role="3uigEE" to="cof4:5JQSuNswOXL" resolve="TermNode" />
                 </node>
                 <node concept="37vLTw" id="1RYTbd7gC2J" role="2ZW6bz">
                   <ref role="3cqZAo" node="1RYTbd7gpNd" resolve="spec" />
@@ -601,7 +600,7 @@
                             <ref role="3cqZAo" node="1RYTbd7gpNd" resolve="spec" />
                           </node>
                           <node concept="3uibUv" id="1RYTbd7gEU1" role="10QFUM">
-                            <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+                            <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
                           </node>
                         </node>
                       </node>
@@ -610,7 +609,7 @@
                       </node>
                     </node>
                     <node concept="3uibUv" id="1RYTbd7gETW" role="10QFUM">
-                      <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="TermNode" />
+                      <ref role="3uigEE" to="cof4:5JQSuNswOXL" resolve="TermNode" />
                     </node>
                   </node>
                 </node>
@@ -619,7 +618,7 @@
                 <node concept="1eOMI4" id="1RYTbd7gDA$" role="3uHU7B">
                   <node concept="2ZW3vV" id="1RYTbd7gDA_" role="1eOMHV">
                     <node concept="3uibUv" id="1RYTbd7gDAA" role="2ZW6by">
-                      <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+                      <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
                     </node>
                     <node concept="37vLTw" id="1RYTbd7gDAB" role="2ZW6bz">
                       <ref role="3cqZAo" node="1RYTbd7gpNd" resolve="spec" />
@@ -631,7 +630,7 @@
                     <node concept="1eOMI4" id="1RYTbd7gDAF" role="2Oq$k0">
                       <node concept="10QFUN" id="1RYTbd7gDAG" role="1eOMHV">
                         <node concept="3uibUv" id="1RYTbd7gDAH" role="10QFUM">
-                          <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+                          <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
                         </node>
                         <node concept="37vLTw" id="1RYTbd7gDAI" role="10QFUP">
                           <ref role="3cqZAo" node="1RYTbd7gpNd" resolve="spec" />
@@ -639,7 +638,7 @@
                       </node>
                     </node>
                     <node concept="liA8E" id="1RYTbd7gDAJ" role="2OqNvi">
-                      <ref role="37wK5l" to="6exd:4p5SefkhK7Y" resolve="isBound" />
+                      <ref role="37wK5l" to="cof4:4p5SefkhK7Y" resolve="isBound" />
                     </node>
                   </node>
                 </node>
@@ -661,23 +660,23 @@
                           <ref role="3cqZAo" node="1RYTbd7gmHr" resolve="last" />
                         </node>
                         <node concept="3uibUv" id="1RYTbd7$1N2" role="10QFUM">
-                          <ref role="3uigEE" to="6exd:6YPNC4NYnau" resolve="ChildRole" />
+                          <ref role="3uigEE" to="cof4:6YPNC4NYnau" resolve="ChildRole" />
                         </node>
                       </node>
                     </node>
                     <node concept="liA8E" id="1RYTbd7gn9v" role="2OqNvi">
-                      <ref role="37wK5l" to="6exd:1RYTbd7zQ_K" resolve="symbol" />
+                      <ref role="37wK5l" to="cof4:1RYTbd7zQ_K" resolve="symbol" />
                     </node>
                   </node>
                   <node concept="liA8E" id="1RYTbd7$4mw" role="2OqNvi">
-                    <ref role="37wK5l" to="6exd:1RYTbd7$2p6" resolve="getName" />
+                    <ref role="37wK5l" to="cof4:1RYTbd7$2p6" resolve="getName" />
                   </node>
                 </node>
               </node>
             </node>
             <node concept="2ZW3vV" id="1RYTbd7gh9m" role="3uHU7B">
               <node concept="3uibUv" id="1RYTbd7gheH" role="2ZW6by">
-                <ref role="3uigEE" to="6exd:6YPNC4NYnau" resolve="ChildRole" />
+                <ref role="3uigEE" to="cof4:6YPNC4NYnau" resolve="ChildRole" />
               </node>
               <node concept="37vLTw" id="1RYTbd7gmHx" role="2ZW6bz">
                 <ref role="3cqZAo" node="1RYTbd7gmHr" resolve="last" />
@@ -696,7 +695,7 @@
       <node concept="37vLTG" id="1RYTbd7gusH" role="3clF46">
         <property role="TrG5h" value="term" />
         <node concept="3uibUv" id="1RYTbd7guuz" role="1tU5fm">
-          <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="TermNode" />
+          <ref role="3uigEE" to="cof4:5JQSuNswOXL" resolve="TermNode" />
         </node>
       </node>
       <node concept="10P_77" id="1RYTbd7guim" role="3clF45" />
diff --git a/coderules/languages/jetbrains.mps.lang.typechecking/models/behavior.mps b/coderules/languages/jetbrains.mps.lang.typechecking/models/behavior.mps
index a6a82879..520b7c5f 100644
--- a/coderules/languages/jetbrains.mps.lang.typechecking/models/behavior.mps
+++ b/coderules/languages/jetbrains.mps.lang.typechecking/models/behavior.mps
@@ -10,10 +10,10 @@
   <imports>
     <import index="zfi7" ref="r:39840d4e-f61c-4452-88c5-75b1eb10e892(jetbrains.mps.lang.typechecking.structure)" />
     <import index="tpeu" ref="r:00000000-0000-4000-0000-011c895902fa(jetbrains.mps.lang.smodel.behavior)" />
-    <import index="i348" ref="r:42a15dec-83a9-4fe1-80d6-3bf898c512bd(jetbrains.mps.lang.coderules.template)" />
     <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
     <import index="tj24" ref="r:0fbbb63a-fd15-46e1-8136-78049f6d6e63(jetbrains.mps.coderules.typechecking.service)" />
+    <import index="ugy2" ref="r:57b2449f-b7c7-4941-bd75-9c594835f5cd(jetbrains.mps.lang.coderules.template)" />
   </imports>
   <registry>
     <language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior">
@@ -113,7 +113,7 @@
           <node concept="2OqwBi" id="3vih52514Km" role="3cqZAk">
             <node concept="2c44tf" id="3vih52515Xj" role="2Oq$k0">
               <node concept="3uibUv" id="3vih52515Xk" role="2c44tc">
-                <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
+                <ref role="3uigEE" to="ugy2:5EDW3XDYeWv" resolve="Query" />
               </node>
             </node>
             <node concept="3TrEf2" id="3vih52515pt" role="2OqNvi">
diff --git a/coderules/languages/jetbrains.mps.lang.types/generator/templates/jetbrains.mps.lang.types.generator.templates@generator.mps b/coderules/languages/jetbrains.mps.lang.types/generator/templates/jetbrains.mps.lang.types.generator.templates@generator.mps
index 0dda6974..66c263ba 100644
--- a/coderules/languages/jetbrains.mps.lang.types/generator/templates/jetbrains.mps.lang.types.generator.templates@generator.mps
+++ b/coderules/languages/jetbrains.mps.lang.types/generator/templates/jetbrains.mps.lang.types.generator.templates@generator.mps
@@ -16,11 +16,11 @@
     <import index="hypd" ref="r:aa31e43e-9240-4f4d-b6db-5c1c9a86c59e(jetbrains.mps.lang.project.structure)" />
     <import index="u46i" ref="r:c2760840-3210-4ad4-9e64-a2dfd53620e1(jetbrains.mps.lang.typechecking.aspect)" />
     <import index="ucur" ref="r:1dfaf07d-c77a-451e-91d3-b6f80f0f8508(jetbrains.mps.lang.descriptor.generator.template.main@generator)" />
-    <import index="fqlx" ref="r:2cc226a9-8a78-4010-b962-823343fd28ff(jetbrains.mps.lang.coderules.aspect)" />
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
     <import index="18ew" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.util(MPS.Core/)" />
     <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
+    <import index="pxw9" ref="r:e3417884-ba0a-4330-9cea-64f01ace2e9d(jetbrains.mps.lang.coderules.aspect)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -296,7 +296,7 @@
     <node concept="3clFb_" id="5EDW3XF61YL" role="jymVt">
       <property role="TrG5h" value="createManifest" />
       <node concept="3uibUv" id="5EDW3XF61YM" role="3clF45">
-        <ref role="3uigEE" to="fqlx:5EDW3XF5Z95" resolve="AbstractCoderulesManifest" />
+        <ref role="3uigEE" to="pxw9:5EDW3XF5Z95" resolve="AbstractCoderulesManifest" />
       </node>
       <node concept="3Tm1VV" id="5EDW3XF61YN" role="1B3o_S" />
       <node concept="3clFbS" id="5EDW3XF61YQ" role="3clF47">
@@ -320,8 +320,8 @@
     <node concept="2tJIrI" id="7km57PkeXwk" role="jymVt" />
     <node concept="3Tm1VV" id="7km57PkeUQW" role="1B3o_S" />
     <node concept="n94m4" id="7km57PkeUQX" role="lGtFl" />
-    <node concept="3uibUv" id="NKt6yoCeXM" role="EKbjA">
-      <ref role="3uigEE" to="fqlx:NKt6yomNZE" resolve="CoderulesAspect" />
+    <node concept="3uibUv" id="UFo5u0IQ43" role="EKbjA">
+      <ref role="3uigEE" to="pxw9:NKt6yomNZE" resolve="CoderulesAspect" />
     </node>
     <node concept="17Uvod" id="NKt6ynQUyX" role="lGtFl">
       <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
@@ -357,7 +357,7 @@
       </node>
     </node>
     <node concept="3uibUv" id="NKt6yp1FJg" role="1zkMxy">
-      <ref role="3uigEE" to="fqlx:NKt6yp1COZ" resolve="AbstractCoderulesAspect" />
+      <ref role="3uigEE" to="pxw9:NKt6yp1COZ" resolve="AbstractCoderulesAspect" />
       <node concept="1ZhdrF" id="78H58odLtQH" role="lGtFl">
         <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1107535904670/1107535924139" />
         <property role="2qtEX8" value="classifier" />
diff --git a/coderules/languages/jetbrains.mps.lang.types/jetbrains.mps.lang.types.mpl b/coderules/languages/jetbrains.mps.lang.types/jetbrains.mps.lang.types.mpl
index 72164a2f..d103ad08 100644
--- a/coderules/languages/jetbrains.mps.lang.types/jetbrains.mps.lang.types.mpl
+++ b/coderules/languages/jetbrains.mps.lang.types/jetbrains.mps.lang.types.mpl
@@ -31,7 +31,7 @@
         <dependency reexport="false">86ef8290-12bb-4ca7-947f-093788f263a9(jetbrains.mps.lang.project)</dependency>
         <dependency reexport="false">f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)</dependency>
         <dependency reexport="false">4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462(jetbrains.mps.lang.typechecking)</dependency>
-        <dependency reexport="false">21d5540d-cd6b-44dd-b6ab-6835bf032803(jetbrains.mps.lang.coderules#4578927328670739933)</dependency>
+        <dependency reexport="false">26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)</dependency>
       </dependencies>
       <languageVersions>
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
@@ -67,9 +67,7 @@
         <module reference="e45a8b22-94f2-427f-b849-77f254c4eef5(jetbrains.mps.lang.aspect#3274906159125927726)" version="0" />
         <module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
         <module reference="c4803b19-6d89-4a3b-bf82-390769514add(jetbrains.mps.lang.coderules)" version="0" />
-        <module reference="21d5540d-cd6b-44dd-b6ab-6835bf032803(jetbrains.mps.lang.coderules#4578927328670739933)" version="0" />
         <module reference="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" version="0" />
-        <module reference="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" version="0" />
         <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
         <module reference="f4ad079d-bc71-4ffb-9600-9328705cf998(jetbrains.mps.lang.descriptor)" version="0" />
         <module reference="3ac18869-0828-4401-abad-822a47bf83f1(jetbrains.mps.lang.descriptor#9020561928507175817)" version="0" />
@@ -86,8 +84,6 @@
         <module reference="c9d137c4-3259-44f8-80ff-33ab2b506ee4(jetbrains.mps.lang.util.order)" version="0" />
         <module reference="b19b2d23-1869-41e0-9ee6-8eaad9ffcd84(jetbrains.mps.lang.util.order#174635545557533742)" version="0" />
         <module reference="35320f26-77cb-4c55-be9f-a97a27770af1(jetbrains.mps.logic)" 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>
       <mapping-priorities>
         <mapping-priority-rule kind="strictly_before">
diff --git a/coderules/languages/jetbrains.mps.logic/generator/template/main@generator.mps b/coderules/languages/jetbrains.mps.logic/generator/template/main@generator.mps
index 5d1ee7f1..4c1d3dfd 100644
--- a/coderules/languages/jetbrains.mps.logic/generator/template/main@generator.mps
+++ b/coderules/languages/jetbrains.mps.logic/generator/template/main@generator.mps
@@ -16,10 +16,10 @@
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
     <import index="bj13" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.logical(jetbrains.mps.logic.reactor/)" />
     <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.dataform)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
     <import index="ha02" ref="r:09e53496-6477-45e7-abd5-eaf3fac3b360(jetbrains.mps.logic.behavior)" />
-    <import index="oy3s" ref="r:a6030cee-34eb-4503-b1bf-015fe5cd8c1a(jetbrains.mps.logic.unification)" />
+    <import index="cof4" ref="r:0a9d1d47-250c-4f98-8962-b65edf8b0721(jetbrains.mps.logic.dataform)" />
+    <import index="uwx2" ref="r:76101703-3fc5-4e76-aa48-9728dde91f7b(jetbrains.mps.logic.unification)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -434,11 +434,11 @@
           </node>
           <node concept="gft3U" id="4OKkcneWb1C" role="150oIE">
             <node concept="2YIFZM" id="3gNap3fNlJg" role="gfFT$">
-              <ref role="37wK5l" to="oy3s:7HUwyZb7chj" resolve="asDataForm" />
-              <ref role="1Pybhc" to="oy3s:677NV565N1x" resolve="LogicalUtil" />
+              <ref role="37wK5l" to="uwx2:7HUwyZb7chj" resolve="asDataForm" />
+              <ref role="1Pybhc" to="uwx2:677NV565N1x" resolve="LogicalUtil" />
               <node concept="2YIFZM" id="1fvYCP_gnXn" role="37wK5m">
-                <ref role="1Pybhc" to="oy3s:7nPD14NOCSa" resolve="MetaLogicalFactory" />
-                <ref role="37wK5l" to="oy3s:7nPD14NOHGU" resolve="wildcardMetaLogical" />
+                <ref role="1Pybhc" to="uwx2:7nPD14NOCSa" resolve="MetaLogicalFactory" />
+                <ref role="37wK5l" to="uwx2:7nPD14NOHGU" resolve="wildcardMetaLogical" />
                 <node concept="3VsKOn" id="1fvYCP_gnXo" role="37wK5m">
                   <ref role="3VsUkX" to="wyt6:~Object" resolve="Object" />
                 </node>
@@ -448,13 +448,13 @@
         </node>
         <node concept="gft3U" id="4OKkcneWczK" role="14YRTM">
           <node concept="2YIFZM" id="3gNap3fNlJh" role="gfFT$">
-            <ref role="37wK5l" to="oy3s:7HUwyZb7chj" resolve="asDataForm" />
-            <ref role="1Pybhc" to="oy3s:677NV565N1x" resolve="LogicalUtil" />
+            <ref role="37wK5l" to="uwx2:7HUwyZb7chj" resolve="asDataForm" />
+            <ref role="1Pybhc" to="uwx2:677NV565N1x" resolve="LogicalUtil" />
             <node concept="2YIFZM" id="1fvYCP_gnSs" role="37wK5m">
-              <ref role="1Pybhc" to="oy3s:7nPD14NOCSa" resolve="MetaLogicalFactory" />
-              <ref role="37wK5l" to="oy3s:7nPD14NOHGU" resolve="wildcardMetaLogical" />
+              <ref role="1Pybhc" to="uwx2:7nPD14NOCSa" resolve="MetaLogicalFactory" />
+              <ref role="37wK5l" to="uwx2:7nPD14NOHGU" resolve="wildcardMetaLogical" />
               <node concept="3VsKOn" id="1fvYCP_gnSt" role="37wK5m">
-                <ref role="3VsUkX" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3VsUkX" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
             </node>
           </node>
@@ -513,8 +513,8 @@
       <ref role="30HIoZ" to="5j4j:6$jH9oLmYC_" resolve="TermNode" />
       <node concept="gft3U" id="29_L5zQWy8k" role="1lVwrX">
         <node concept="2YIFZM" id="1RYTbd66z3u" role="gfFT$">
-          <ref role="37wK5l" to="6exd:1RYTbd66m3S" resolve="create" />
-          <ref role="1Pybhc" to="6exd:5JQSuNswOXL" resolve="TermNode" />
+          <ref role="37wK5l" to="cof4:1RYTbd66m3S" resolve="create" />
+          <ref role="1Pybhc" to="cof4:5JQSuNswOXL" resolve="TermNode" />
           <node concept="10Nm6u" id="1RYTbd66z3v" role="37wK5m">
             <node concept="2b32R4" id="1RYTbd66z3w" role="lGtFl">
               <node concept="3JmXsc" id="1RYTbd66z3x" role="2P8S$">
@@ -632,8 +632,8 @@
       </node>
       <node concept="gft3U" id="kTK1BeIzdd" role="1lVwrX">
         <node concept="2YIFZM" id="kTK1Bf7oNx" role="gfFT$">
-          <ref role="37wK5l" to="6exd:6cHSm2DiUE1" resolve="create" />
-          <ref role="1Pybhc" to="6exd:1msb0mq99GH" resolve="ValueRole" />
+          <ref role="37wK5l" to="cof4:6cHSm2DiUE1" resolve="create" />
+          <ref role="1Pybhc" to="cof4:1msb0mq99GH" resolve="ValueRole" />
           <node concept="Xl_RD" id="kTK1Bf7oNy" role="37wK5m">
             <property role="Xl_RC" value="name" />
             <node concept="17Uvod" id="kTK1Bf7oNz" role="lGtFl">
@@ -719,8 +719,8 @@
           </node>
           <node concept="gft3U" id="6YPNC4OUyu3" role="150oIE">
             <node concept="2YIFZM" id="6YPNC4OUzug" role="gfFT$">
-              <ref role="37wK5l" to="6exd:6YPNC4OEDj2" resolve="create" />
-              <ref role="1Pybhc" to="6exd:6YPNC4OECgm" resolve="ListRole" />
+              <ref role="37wK5l" to="cof4:6YPNC4OEDj2" resolve="create" />
+              <ref role="1Pybhc" to="cof4:6YPNC4OECgm" resolve="ListRole" />
               <node concept="Xl_RD" id="1RYTbd7h8SV" role="37wK5m">
                 <property role="Xl_RC" value="name" />
                 <node concept="17Uvod" id="1RYTbd7h8SW" role="lGtFl">
@@ -761,8 +761,8 @@
         </node>
         <node concept="gft3U" id="6UqNvvALIHq" role="14YRTM">
           <node concept="2YIFZM" id="6YPNC4ObN7u" role="gfFT$">
-            <ref role="37wK5l" to="6exd:6YPNC4NYnI9" resolve="create" />
-            <ref role="1Pybhc" to="6exd:6YPNC4NYnau" resolve="ChildRole" />
+            <ref role="37wK5l" to="cof4:6YPNC4NYnI9" resolve="create" />
+            <ref role="1Pybhc" to="cof4:6YPNC4NYnau" resolve="ChildRole" />
             <node concept="Xl_RD" id="6YPNC4ObN7w" role="37wK5m">
               <property role="Xl_RC" value="name" />
               <node concept="17Uvod" id="6YPNC4ObN7x" role="lGtFl">
@@ -823,8 +823,8 @@
       </node>
       <node concept="gft3U" id="6UqNvvALHUZ" role="1lVwrX">
         <node concept="2YIFZM" id="6UqNvvALHV0" role="gfFT$">
-          <ref role="37wK5l" to="6exd:5JQSuNsxb_I" resolve="create" />
-          <ref role="1Pybhc" to="6exd:2xQ7eRAD2dj" resolve="Value" />
+          <ref role="37wK5l" to="cof4:5JQSuNsxb_I" resolve="create" />
+          <ref role="1Pybhc" to="cof4:2xQ7eRAD2dj" resolve="Value" />
           <node concept="Xl_RD" id="6UqNvvALHV1" role="37wK5m">
             <property role="Xl_RC" value="value" />
             <node concept="17Uvod" id="6UqNvvALHV2" role="lGtFl">
@@ -851,8 +851,8 @@
       <ref role="30HIoZ" to="5j4j:1OShD0HAY6y" resolve="ListNode" />
       <node concept="gft3U" id="6UqNvvALHva" role="1lVwrX">
         <node concept="2YIFZM" id="6UqNvvALHvb" role="gfFT$">
-          <ref role="1Pybhc" to="6exd:3OPtF03lco4" resolve="ListNode" />
-          <ref role="37wK5l" to="6exd:1OShD0HS45f" resolve="createList" />
+          <ref role="1Pybhc" to="cof4:3OPtF03lco4" resolve="ListNode" />
+          <ref role="37wK5l" to="cof4:1OShD0HS45f" resolve="createList" />
           <node concept="10Nm6u" id="7HUwyZb7cIG" role="37wK5m">
             <node concept="2b32R4" id="7HUwyZb7cIH" role="lGtFl">
               <node concept="3JmXsc" id="7HUwyZb7cII" role="2P8S$">
@@ -910,8 +910,8 @@
       </node>
       <node concept="gft3U" id="1fvYCPAnvWI" role="1lVwrX">
         <node concept="2YIFZM" id="1fvYCPAnvWJ" role="gfFT$">
-          <ref role="37wK5l" to="6exd:PltxfHVDa3" resolve="createConsList" />
-          <ref role="1Pybhc" to="6exd:3OPtF03lco4" resolve="ListNode" />
+          <ref role="37wK5l" to="cof4:PltxfHVDa3" resolve="createConsList" />
+          <ref role="1Pybhc" to="cof4:3OPtF03lco4" resolve="ListNode" />
           <node concept="10Nm6u" id="1fvYCPAnvWK" role="37wK5m">
             <node concept="29HgVG" id="1fvYCPAnvWL" role="lGtFl">
               <node concept="3NFfHV" id="1fvYCPAnvWM" role="3NFExx">
@@ -1026,7 +1026,7 @@
             <node concept="3cpWsn" id="7HUwyZb1KbI" role="3cpWs9">
               <property role="TrG5h" value="lv" />
               <node concept="3uibUv" id="7HUwyZb1KbJ" role="1tU5fm">
-                <ref role="3uigEE" to="oy3s:1fvYCPC9rB6" resolve="MetaLogicalArray" />
+                <ref role="3uigEE" to="uwx2:1fvYCPC9rB6" resolve="MetaLogicalArray" />
                 <node concept="raruj" id="7HUwyZb1KbK" role="lGtFl" />
                 <node concept="29HgVG" id="7HUwyZb1KbL" role="lGtFl">
                   <node concept="3NFfHV" id="7HUwyZb1KbM" role="3NFExx">
@@ -1108,17 +1108,17 @@
                 <node concept="3cpWsn" id="1fvYCPCmIOI" role="3cpWs9">
                   <property role="TrG5h" value="mlp" />
                   <node concept="3uibUv" id="1fvYCPCmIOJ" role="1tU5fm">
-                    <ref role="3uigEE" to="oy3s:1fvYCPC9rB6" resolve="MetaLogicalArray" />
+                    <ref role="3uigEE" to="uwx2:1fvYCPC9rB6" resolve="MetaLogicalArray" />
                   </node>
                 </node>
               </node>
               <node concept="3clFbF" id="1fvYCPCmIOK" role="3cqZAp">
                 <node concept="2YIFZM" id="1fvYCPCmIOL" role="3clFbG">
-                  <ref role="1Pybhc" to="6exd:3OPtF03lco4" resolve="ListNode" />
-                  <ref role="37wK5l" to="6exd:1OShD0HS45f" resolve="createList" />
+                  <ref role="1Pybhc" to="cof4:3OPtF03lco4" resolve="ListNode" />
+                  <ref role="37wK5l" to="cof4:1OShD0HS45f" resolve="createList" />
                   <node concept="2YIFZM" id="1fvYCPCmIOM" role="37wK5m">
-                    <ref role="1Pybhc" to="oy3s:677NV565N1x" resolve="LogicalUtil" />
-                    <ref role="37wK5l" to="oy3s:7HUwyZb7b7C" resolve="asDataFormArray" />
+                    <ref role="1Pybhc" to="uwx2:677NV565N1x" resolve="LogicalUtil" />
+                    <ref role="37wK5l" to="uwx2:7HUwyZb7b7C" resolve="asDataFormArray" />
                     <node concept="37vLTw" id="1fvYCPCmION" role="37wK5m">
                       <ref role="3cqZAo" node="1fvYCPCmIOI" resolve="mlp" />
                       <node concept="29HgVG" id="1fvYCPCmIOO" role="lGtFl">
@@ -1145,8 +1145,8 @@
         </node>
         <node concept="gft3U" id="1fvYCPA2_Zx" role="14YRTM">
           <node concept="2YIFZM" id="1fvYCPA2A5R" role="gfFT$">
-            <ref role="1Pybhc" to="oy3s:677NV565N1x" resolve="LogicalUtil" />
-            <ref role="37wK5l" to="oy3s:4TCblo5YI1H" resolve="asDataForm" />
+            <ref role="1Pybhc" to="uwx2:677NV565N1x" resolve="LogicalUtil" />
+            <ref role="37wK5l" to="uwx2:4TCblo5YI1H" resolve="asDataForm" />
             <node concept="10Nm6u" id="1fvYCPA2A8d" role="37wK5m">
               <node concept="29HgVG" id="1fvYCPA2Abr" role="lGtFl">
                 <node concept="3NFfHV" id="1fvYCPA2AcL" role="3NFExx">
@@ -1200,8 +1200,8 @@
       </node>
       <node concept="gft3U" id="kTK1Bf2M5C" role="1lVwrX">
         <node concept="2YIFZM" id="4U$Q3dKt8Ly" role="gfFT$">
-          <ref role="1Pybhc" to="oy3s:677NV565N1x" resolve="LogicalUtil" />
-          <ref role="37wK5l" to="oy3s:4U$Q3dKt9sz" resolve="asValue" />
+          <ref role="1Pybhc" to="uwx2:677NV565N1x" resolve="LogicalUtil" />
+          <ref role="37wK5l" to="uwx2:4U$Q3dKt9sz" resolve="asValue" />
           <node concept="Xl_RD" id="4U$Q3dKt8Lz" role="37wK5m">
             <property role="Xl_RC" value="" />
             <node concept="29HgVG" id="4U$Q3dKt8L$" role="lGtFl" />
@@ -1214,8 +1214,8 @@
       <ref role="30HIoZ" to="tpee:fz3vP1J" resolve="Expression" />
       <node concept="gft3U" id="4U$Q3dKtbLt" role="1lVwrX">
         <node concept="2YIFZM" id="4U$Q3dKtcAY" role="gfFT$">
-          <ref role="37wK5l" to="oy3s:4U$Q3dKg$bJ" resolve="asDataForm" />
-          <ref role="1Pybhc" to="oy3s:677NV565N1x" resolve="LogicalUtil" />
+          <ref role="37wK5l" to="uwx2:4U$Q3dKg$bJ" resolve="asDataForm" />
+          <ref role="1Pybhc" to="uwx2:677NV565N1x" resolve="LogicalUtil" />
           <node concept="10Nm6u" id="4U$Q3dKtd7n" role="37wK5m">
             <node concept="29HgVG" id="4U$Q3dKtd9t" role="lGtFl">
               <node concept="3NFfHV" id="4U$Q3dKtdad" role="3NFExx">
@@ -1263,7 +1263,7 @@
             <node concept="3cpWsn" id="6dMt3c5appH" role="3cpWs9">
               <property role="TrG5h" value="multiMetaLogical" />
               <node concept="3uibUv" id="7HUwyZaNQoy" role="1tU5fm">
-                <ref role="3uigEE" to="oy3s:1fvYCPC9rB6" resolve="MetaLogicalArray" />
+                <ref role="3uigEE" to="uwx2:1fvYCPC9rB6" resolve="MetaLogicalArray" />
               </node>
             </node>
           </node>
@@ -1327,7 +1327,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="7HUwyZaNQGE" role="2OqNvi">
-                <ref role="37wK5l" to="oy3s:1fvYCPC9rDX" resolve="logicalAt" />
+                <ref role="37wK5l" to="uwx2:1fvYCPC9rDX" resolve="logicalAt" />
                 <node concept="3cmrfG" id="7HUwyZaNQHA" role="37wK5m">
                   <property role="3cmrfH" value="0" />
                   <node concept="29HgVG" id="7HUwyZaNQHB" role="lGtFl">
diff --git a/coderules/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl b/coderules/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl
index 63d34858..fc1d031e 100644
--- a/coderules/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl
+++ b/coderules/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl
@@ -28,6 +28,8 @@
         <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
         <dependency reexport="false">bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)</dependency>
         <dependency reexport="false">5f9babc9-8d5d-4825-8e61-17b241ee6272(jetbrains.mps.baseLanguage.collections#1151699677197)</dependency>
+        <dependency reexport="false">26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)</dependency>
+        <dependency reexport="false">a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)</dependency>
       </dependencies>
       <languageVersions>
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
@@ -56,6 +58,7 @@
         <module reference="5f9babc9-8d5d-4825-8e61-17b241ee6272(jetbrains.mps.baseLanguage.collections#1151699677197)" version="0" />
         <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
         <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
+        <module reference="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" version="0" />
         <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
         <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" />
@@ -90,9 +93,11 @@
     <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>
     <dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
-    <dependency reexport="false">a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)</dependency>
     <dependency reexport="false">528ff3b9-5fc4-40dd-931f-c6ce3650640e(jetbrains.mps.lang.migration.runtime)</dependency>
     <dependency reexport="false">c4803b19-6d89-4a3b-bf82-390769514add(jetbrains.mps.lang.coderules)</dependency>
+    <dependency reexport="false">26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)</dependency>
+    <dependency reexport="false">bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)</dependency>
+    <dependency reexport="false">a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
@@ -156,6 +161,7 @@
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
     <module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
     <module reference="c4803b19-6d89-4a3b-bf82-390769514add(jetbrains.mps.lang.coderules)" version="0" />
+    <module reference="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="f4ad079d-bc71-4ffb-9600-9328705cf998(jetbrains.mps.lang.descriptor)" version="0" />
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
@@ -169,9 +175,6 @@
     <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>
-  <runtime>
-    <dependency reexport="false">a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)</dependency>
-  </runtime>
   <extendedLanguages>
     <extendedLanguage>f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</extendedLanguage>
   </extendedLanguages>
diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/behavior.mps b/coderules/languages/jetbrains.mps.logic/languageModels/behavior.mps
index 01361b51..9a74fb2b 100644
--- a/coderules/languages/jetbrains.mps.logic/languageModels/behavior.mps
+++ b/coderules/languages/jetbrains.mps.logic/languageModels/behavior.mps
@@ -12,10 +12,10 @@
   </languages>
   <imports>
     <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.dataform)" />
     <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="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
+    <import index="cof4" ref="r:0a9d1d47-250c-4f98-8962-b65edf8b0721(jetbrains.mps.logic.dataform)" />
   </imports>
   <registry>
     <language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior">
@@ -231,7 +231,7 @@
                 <node concept="2OqwBi" id="4cvvxaYheve" role="3cqZAk">
                   <node concept="2c44tf" id="4cvvxaYhe6r" role="2Oq$k0">
                     <node concept="3uibUv" id="4cvvxaYhegq" role="2c44tc">
-                      <ref role="3uigEE" to="6exd:3OPtF03lco4" resolve="ListNode" />
+                      <ref role="3uigEE" to="cof4:3OPtF03lco4" resolve="ListNode" />
                     </node>
                   </node>
                   <node concept="3TrEf2" id="4cvvxaYheXY" role="2OqNvi">
@@ -250,7 +250,7 @@
                 <node concept="2OqwBi" id="4cvvxaYhfL9" role="3cqZAk">
                   <node concept="2c44tf" id="4cvvxaYhfdx" role="2Oq$k0">
                     <node concept="3uibUv" id="4cvvxaYhfwe" role="2c44tc">
-                      <ref role="3uigEE" to="6exd:2xQ7eRAD2dj" resolve="Value" />
+                      <ref role="3uigEE" to="cof4:2xQ7eRAD2dj" resolve="Value" />
                     </node>
                   </node>
                   <node concept="3TrEf2" id="4cvvxaYhgi0" role="2OqNvi">
@@ -265,7 +265,7 @@
           <node concept="2OqwBi" id="4cvvxaYhgKJ" role="3clFbG">
             <node concept="2c44tf" id="4cvvxaYhgp3" role="2Oq$k0">
               <node concept="3uibUv" id="4cvvxaYhgzP" role="2c44tc">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
             </node>
             <node concept="3TrEf2" id="4cvvxaYhhd_" role="2OqNvi">
@@ -345,7 +345,7 @@
           <node concept="2OqwBi" id="4cvvxaYhcn$" role="3clFbG">
             <node concept="2c44tf" id="4cvvxaYhc6f" role="2Oq$k0">
               <node concept="3uibUv" id="4cvvxaYhcaI" role="2c44tc">
-                <ref role="3uigEE" to="6exd:2xQ7eRAD2dj" resolve="Value" />
+                <ref role="3uigEE" to="cof4:2xQ7eRAD2dj" resolve="Value" />
               </node>
             </node>
             <node concept="3TrEf2" id="4cvvxaYhcOo" role="2OqNvi">
@@ -376,7 +376,7 @@
           <node concept="2OqwBi" id="4cvvxaYhdbA" role="3clFbG">
             <node concept="2c44tf" id="4cvvxaYhcUi" role="2Oq$k0">
               <node concept="3uibUv" id="4cvvxaYhcYL" role="2c44tc">
-                <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="TermNode" />
+                <ref role="3uigEE" to="cof4:5JQSuNswOXL" resolve="TermNode" />
               </node>
             </node>
             <node concept="3TrEf2" id="4cvvxaYhdYJ" role="2OqNvi">
@@ -406,7 +406,7 @@
         <node concept="3clFbF" id="4cvvxaYhhl2" role="3cqZAp">
           <node concept="2c44tf" id="4cvvxaYhhkY" role="3clFbG">
             <node concept="3uibUv" id="4cvvxaYhhpt" role="2c44tc">
-              <ref role="3uigEE" to="6exd:3OPtF03lco4" resolve="ListNode" />
+              <ref role="3uigEE" to="cof4:3OPtF03lco4" resolve="ListNode" />
             </node>
           </node>
         </node>
@@ -431,7 +431,7 @@
           <node concept="2OqwBi" id="4cvvxaYhhL5" role="3clFbG">
             <node concept="2c44tf" id="4cvvxaYhhvL" role="2Oq$k0">
               <node concept="3uibUv" id="4cvvxaYhh$g" role="2c44tc">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
             </node>
             <node concept="3TrEf2" id="4cvvxaYhidS" role="2OqNvi">
diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/editor.mps b/coderules/languages/jetbrains.mps.logic/languageModels/editor.mps
index 0c36422b..b3471ef4 100644
--- a/coderules/languages/jetbrains.mps.logic/languageModels/editor.mps
+++ b/coderules/languages/jetbrains.mps.logic/languageModels/editor.mps
@@ -3972,61 +3972,6 @@
           </node>
         </node>
       </node>
-      <node concept="3ft6gW" id="1PN9XOIo4yC" role="3ft5RY">
-        <node concept="3clFbS" id="1PN9XOIo4yD" role="2VODD2">
-          <node concept="3SKdUt" id="1PN9XOIo4Jo" role="3cqZAp">
-            <node concept="1PaTwC" id="1PN9XOIo4Jp" role="1aUNEU">
-              <node concept="3oM_SD" id="1PN9XOIo4No" role="1PaTwD">
-                <property role="3oM_SC" value="only" />
-              </node>
-              <node concept="3oM_SD" id="1PN9XOIo4Nu" role="1PaTwD">
-                <property role="3oM_SC" value="allow" />
-              </node>
-              <node concept="3oM_SD" id="1PN9XOIo4NB" role="1PaTwD">
-                <property role="3oM_SC" value="as" />
-              </node>
-              <node concept="3oM_SD" id="1PN9XOIo4NI" role="1PaTwD">
-                <property role="3oM_SC" value="constraint" />
-              </node>
-              <node concept="3oM_SD" id="1PN9XOIo4NY" role="1PaTwD">
-                <property role="3oM_SC" value="argument" />
-              </node>
-              <node concept="3oM_SD" id="1PN9XOIo4Od" role="1PaTwD">
-                <property role="3oM_SC" value="or" />
-              </node>
-              <node concept="3oM_SD" id="1PN9XOIo4On" role="1PaTwD">
-                <property role="3oM_SC" value="a" />
-              </node>
-              <node concept="3oM_SD" id="1PN9XOIo4Ox" role="1PaTwD">
-                <property role="3oM_SC" value="term's" />
-              </node>
-              <node concept="3oM_SD" id="1PN9XOIo4OR" role="1PaTwD">
-                <property role="3oM_SC" value="value" />
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbF" id="1PN9XOIA7Ao" role="3cqZAp">
-            <node concept="22lmx$" id="1PN9XOIA8ol" role="3clFbG">
-              <node concept="2OqwBi" id="1PN9XOIA8sa" role="3uHU7w">
-                <node concept="3bvxqY" id="1PN9XOIA8pv" role="2Oq$k0" />
-                <node concept="1mIQ4w" id="1PN9XOIA8BW" role="2OqNvi">
-                  <node concept="chp4Y" id="1PN9XOIA8Ox" role="cj9EA">
-                    <ref role="cht4Q" to="wq2x:JOGAOsxTDl" resolve="TermFeatureOverride" />
-                  </node>
-                </node>
-              </node>
-              <node concept="2OqwBi" id="1PN9XOIA7Jh" role="3uHU7B">
-                <node concept="3bvxqY" id="1PN9XOIA7An" role="2Oq$k0" />
-                <node concept="1mIQ4w" id="1PN9XOIA7WK" role="2OqNvi">
-                  <node concept="chp4Y" id="1PN9XOIA82L" role="cj9EA">
-                    <ref role="cht4Q" to="wq2x:6p0DfM0ang5" resolve="UserConstraint" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
     </node>
     <node concept="3VyMlK" id="51ek2rSfDF9" role="3ft7WO" />
   </node>
diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/migration.mps b/coderules/languages/jetbrains.mps.logic/languageModels/migration.mps
index 44bc9f3d..09c18e3d 100644
--- a/coderules/languages/jetbrains.mps.logic/languageModels/migration.mps
+++ b/coderules/languages/jetbrains.mps.logic/languageModels/migration.mps
@@ -22,9 +22,9 @@
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
     <import index="slm6" ref="90746344-04fd-4286-97d5-b46ae6a81709/r:52a3d974-bd4f-4651-ba6e-a2de5e336d95(jetbrains.mps.lang.migration/jetbrains.mps.lang.migration.methods)" />
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
-    <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.dataform)" />
     <import index="6f4m" ref="528ff3b9-5fc4-40dd-931f-c6ce3650640e/r:f69c3fa1-0e30-4980-84e2-190ae44e4c3d(jetbrains.mps.lang.migration.runtime/jetbrains.mps.lang.migration.runtime.base)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
+    <import index="cof4" ref="r:0a9d1d47-250c-4f98-8962-b65edf8b0721(jetbrains.mps.logic.dataform)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/typesystem.mps b/coderules/languages/jetbrains.mps.logic/languageModels/typesystem.mps
index c971deb6..9e2d702d 100644
--- a/coderules/languages/jetbrains.mps.logic/languageModels/typesystem.mps
+++ b/coderules/languages/jetbrains.mps.logic/languageModels/typesystem.mps
@@ -13,9 +13,9 @@
     <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="bj13" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.logical(jetbrains.mps.logic.reactor/)" />
-    <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.dataform)" />
+    <import index="cof4" ref="r:0a9d1d47-250c-4f98-8962-b65edf8b0721(jetbrains.mps.logic.dataform)" />
+    <import index="uwx2" ref="r:76101703-3fc5-4e76-aa48-9728dde91f7b(jetbrains.mps.logic.unification)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
-    <import index="oy3s" ref="r:a6030cee-34eb-4503-b1bf-015fe5cd8c1a(jetbrains.mps.logic.unification)" implicit="true" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -240,7 +240,7 @@
             <node concept="mw_s8" id="6YPNC4OxD66" role="1ZfhKB">
               <node concept="2c44tf" id="6YPNC4OxD67" role="mwGJk">
                 <node concept="3uibUv" id="6YPNC4OxDfx" role="2c44tc">
-                  <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="TermNode" />
+                  <ref role="3uigEE" to="cof4:5JQSuNswOXL" resolve="TermNode" />
                 </node>
               </node>
             </node>
@@ -290,7 +290,7 @@
               <node concept="mw_s8" id="6YPNC4OxE_S" role="1ZfhKB">
                 <node concept="2c44tf" id="6YPNC4OxE_T" role="mwGJk">
                   <node concept="3uibUv" id="6YPNC4OxEY4" role="2c44tc">
-                    <ref role="3uigEE" to="6exd:1msb0mq99GH" resolve="ValueRole" />
+                    <ref role="3uigEE" to="cof4:1msb0mq99GH" resolve="ValueRole" />
                   </node>
                 </node>
               </node>
@@ -328,7 +328,7 @@
                   <node concept="mw_s8" id="6YPNC4P2P6M" role="1ZfhKB">
                     <node concept="2c44tf" id="6YPNC4P2P6N" role="mwGJk">
                       <node concept="3uibUv" id="6YPNC4P2Pw2" role="2c44tc">
-                        <ref role="3uigEE" to="6exd:6YPNC4OECgm" resolve="ListRole" />
+                        <ref role="3uigEE" to="cof4:6YPNC4OECgm" resolve="ListRole" />
                       </node>
                     </node>
                   </node>
@@ -379,7 +379,7 @@
                     <node concept="mw_s8" id="6YPNC4OxGmJ" role="1ZfhKB">
                       <node concept="2c44tf" id="6YPNC4OxGmK" role="mwGJk">
                         <node concept="3uibUv" id="6YPNC4OxGQV" role="2c44tc">
-                          <ref role="3uigEE" to="6exd:6YPNC4NYnau" resolve="ChildRole" />
+                          <ref role="3uigEE" to="cof4:6YPNC4NYnau" resolve="ChildRole" />
                         </node>
                       </node>
                     </node>
@@ -418,7 +418,7 @@
               <node concept="mw_s8" id="6YPNC4OxI_0" role="1ZfhKB">
                 <node concept="2c44tf" id="6YPNC4OxI_1" role="mwGJk">
                   <node concept="3uibUv" id="6YPNC4OxITb" role="2c44tc">
-                    <ref role="3uigEE" to="6exd:2xQ7eRAD2dj" resolve="Value" />
+                    <ref role="3uigEE" to="cof4:2xQ7eRAD2dj" resolve="Value" />
                   </node>
                 </node>
               </node>
@@ -454,7 +454,7 @@
               <node concept="mw_s8" id="6YPNC4OxK_1" role="1ZfhKB">
                 <node concept="2c44tf" id="6YPNC4OxK_2" role="mwGJk">
                   <node concept="3uibUv" id="6YPNC4OxKWl" role="2c44tc">
-                    <ref role="3uigEE" to="6exd:3OPtF03lco4" resolve="ListNode" />
+                    <ref role="3uigEE" to="cof4:3OPtF03lco4" resolve="ListNode" />
                   </node>
                 </node>
               </node>
@@ -475,7 +475,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="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                    <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                   </node>
                 </node>
               </node>
@@ -509,7 +509,7 @@
           <node concept="3K4zz7" id="5f6wxQ39Kg6" role="33vP2m">
             <node concept="2c44tf" id="5f6wxQ39Kg7" role="3K4E3e">
               <node concept="3uibUv" id="5f6wxQ39Kg8" role="2c44tc">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
             </node>
             <node concept="2OqwBi" id="5f6wxQ39Kg9" role="3K4GZi">
@@ -759,7 +759,7 @@
                   </node>
                   <node concept="2c44tf" id="5Ii$nZP2GwS" role="3JuZjQ">
                     <node concept="3uibUv" id="5Ii$nZP2GxX" role="2c44tc">
-                      <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+                      <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
                     </node>
                   </node>
                 </node>
@@ -780,7 +780,7 @@
                     </node>
                     <node concept="2c44tf" id="5Ii$nZP52Ws" role="3JuZjQ">
                       <node concept="3uibUv" id="6MYr6Jy880T" role="2c44tc">
-                        <ref role="3uigEE" to="6exd:2xQ7eRAD2dj" resolve="Value" />
+                        <ref role="3uigEE" to="cof4:2xQ7eRAD2dj" resolve="Value" />
                         <node concept="3uibUv" id="6MYr6Jy8824" role="11_B2D">
                           <ref role="3uigEE" to="wyt6:~String" resolve="String" />
                         </node>
@@ -969,7 +969,7 @@
       <node concept="3clFbF" id="7HUwyZb1IYI" role="3cqZAp">
         <node concept="2c44tf" id="7HUwyZb1IYG" role="3clFbG">
           <node concept="3uibUv" id="1HG00HGaTIh" role="2c44tc">
-            <ref role="3uigEE" to="oy3s:1fvYCPC9rB6" resolve="MetaLogicalArray" />
+            <ref role="3uigEE" to="uwx2:1fvYCPC9rB6" resolve="MetaLogicalArray" />
           </node>
         </node>
       </node>
@@ -1298,7 +1298,7 @@
                   <node concept="mw_s8" id="7zIaasjBjIa" role="1ZfhKB">
                     <node concept="2c44tf" id="7zIaasjBjIb" role="mwGJk">
                       <node concept="3uibUv" id="7zIaasjBjIc" role="2c44tc">
-                        <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                        <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                       </node>
                     </node>
                   </node>
diff --git a/coderules/languages/jetbrains.mps.logic/runtime/jetbrains.mps.logic.runtime.msd b/coderules/languages/jetbrains.mps.logic/runtime/jetbrains.mps.logic.runtime.msd
index 95ceb36b..c040a456 100644
--- a/coderules/languages/jetbrains.mps.logic/runtime/jetbrains.mps.logic.runtime.msd
+++ b/coderules/languages/jetbrains.mps.logic/runtime/jetbrains.mps.logic.runtime.msd
@@ -15,12 +15,11 @@
     <dependency reexport="true">bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)</dependency>
     <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
     <dependency reexport="false">9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)</dependency>
-    <dependency reexport="false">f113d56b-63e3-4120-a89c-2f5dcb8c6290(jetbrains.mps.coderules.runtime)</dependency>
+    <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
     <dependency reexport="false">26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
-    <language slang="l:774bf8a0-62e5-41e1-af63-f4812e60e48b:jetbrains.mps.baseLanguage.checkedDots" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
@@ -38,9 +37,7 @@
     <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
     <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
     <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
-    <module reference="f113d56b-63e3-4120-a89c-2f5dcb8c6290(jetbrains.mps.coderules.runtime)" version="0" />
     <module reference="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" version="0" />
-    <module reference="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" 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="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" version="0" />
diff --git a/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.dataform.mps b/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.dataform.mps
index 66fd1d77..aa1e9d55 100644
--- a/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.dataform.mps
+++ b/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.dataform.mps
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.dataform)">
+<model ref="r:0a9d1d47-250c-4f98-8962-b65edf8b0721(jetbrains.mps.logic.dataform)">
   <persistence version="9" />
   <languages>
-    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="-1" />
+    <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="12" />
     <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
     <use id="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text" version="0" />
@@ -15,11 +15,11 @@
     <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/)" />
     <import index="bj13" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.logical(jetbrains.mps.logic.reactor/)" />
-    <import index="oy3s" ref="r:a6030cee-34eb-4503-b1bf-015fe5cd8c1a(jetbrains.mps.logic.unification)" />
     <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" />
     <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
-    <import index="lehm" ref="r:464fcc95-fddb-47d1-b620-592cbf6b8bf2(jetbrains.mps.coderules.runtime.memoizer)" />
-    <import index="jpi6" ref="r:4c913df4-f2d5-43f7-af56-6bccd35aeb11(jetbrains.mps.lang.coderules.terms)" />
+    <import index="hh42" ref="r:75494708-a5bf-40c3-8a06-1176e662985f(jetbrains.mps.lang.coderules.terms)" />
+    <import index="aedp" ref="r:969c74a0-af0a-4247-9dda-0da7708b8c0d(jetbrains.mps.lang.coderules.memoizer)" />
+    <import index="uwx2" ref="r:76101703-3fc5-4e76-aa48-9728dde91f7b(jetbrains.mps.logic.unification)" />
     <import index="1ctc" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.stream(JDK/)" implicit="true" />
     <import index="guwi" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.io(JDK/)" implicit="true" />
   </imports>
@@ -9872,8 +9872,8 @@
           <node concept="3cpWsn" id="5wYq9r5UrxL" role="3cpWs9">
             <property role="TrG5h" value="presentable" />
             <node concept="2YIFZM" id="5wYq9r5UrxM" role="33vP2m">
-              <ref role="37wK5l" to="lehm:2tjs8VC2Csb" resolve="get" />
-              <ref role="1Pybhc" to="lehm:2tjs8VC0K0m" resolve="Memoizer" />
+              <ref role="37wK5l" to="aedp:2tjs8VC2Csb" resolve="get" />
+              <ref role="1Pybhc" to="aedp:2tjs8VC0K0m" resolve="Memoizer" />
               <node concept="3VsKOn" id="5wYq9r5UrxN" role="37wK5m">
                 <ref role="3VsUkX" node="19fWAfxiNy0" resolve="DataFormPrintable" />
               </node>
@@ -10502,8 +10502,8 @@
               </node>
             </node>
             <node concept="10M0yZ" id="1RYTbd6oXZW" role="2Oq$k0">
-              <ref role="3cqZAo" to="jpi6:1RYTbd6oE9B" resolve="SPECIFICATION" />
-              <ref role="1PxDUh" to="jpi6:1RYTbd6oE5l" resolve="TermUtil" />
+              <ref role="3cqZAo" to="hh42:1RYTbd6oE9B" resolve="SPECIFICATION" />
+              <ref role="1PxDUh" to="hh42:1RYTbd6oE5l" resolve="TermUtil" />
             </node>
           </node>
           <node concept="9aQIb" id="6Dg__VJ5289" role="9aQIa">
@@ -10791,8 +10791,8 @@
               </node>
             </node>
             <node concept="10M0yZ" id="1RYTbd6p4UZ" role="2Oq$k0">
-              <ref role="3cqZAo" to="jpi6:1RYTbd6oE68" resolve="DECLARATION" />
-              <ref role="1PxDUh" to="jpi6:1RYTbd6oE5l" resolve="TermUtil" />
+              <ref role="3cqZAo" to="hh42:1RYTbd6oE68" resolve="DECLARATION" />
+              <ref role="1PxDUh" to="hh42:1RYTbd6oE5l" resolve="TermUtil" />
             </node>
           </node>
           <node concept="9aQIb" id="1EFtv_BFU70" role="9aQIa">
@@ -11182,7 +11182,7 @@
                         <node concept="1eOMI4" id="6v6oK21SkKD" role="2Oq$k0">
                           <node concept="10QFUN" id="6v6oK21SkKE" role="1eOMHV">
                             <node concept="3uibUv" id="6v6oK21SkKF" role="10QFUM">
-                              <ref role="3uigEE" to="oy3s:4TCblo5MJ1m" resolve="LogicalDataForm" />
+                              <ref role="3uigEE" to="uwx2:4TCblo5MJ1m" resolve="LogicalDataForm" />
                             </node>
                             <node concept="37vLTw" id="6v6oK21SkKG" role="10QFUP">
                               <ref role="3cqZAo" node="6YPNC4PrVE9" resolve="variable" />
@@ -11190,7 +11190,7 @@
                           </node>
                         </node>
                         <node concept="liA8E" id="6v6oK21SkKH" role="2OqNvi">
-                          <ref role="37wK5l" to="oy3s:4TCblo5MS1o" resolve="logical" />
+                          <ref role="37wK5l" to="uwx2:4TCblo5MS1o" resolve="logical" />
                         </node>
                       </node>
                     </node>
@@ -11288,7 +11288,7 @@
           </node>
           <node concept="2ZW3vV" id="6v6oK21J7fV" role="3clFbw">
             <node concept="3uibUv" id="6v6oK21JczP" role="2ZW6by">
-              <ref role="3uigEE" to="oy3s:4TCblo5MJ1m" resolve="LogicalDataForm" />
+              <ref role="3uigEE" to="uwx2:4TCblo5MJ1m" resolve="LogicalDataForm" />
             </node>
             <node concept="37vLTw" id="6v6oK21J1o4" role="2ZW6bz">
               <ref role="3cqZAo" node="6YPNC4PrVE9" resolve="variable" />
@@ -11385,7 +11385,7 @@
             </node>
             <node concept="2ZW3vV" id="6v6oK21VkSR" role="3eO9$A">
               <node concept="3uibUv" id="6v6oK21Vq3P" role="2ZW6by">
-                <ref role="3uigEE" to="oy3s:3gNap3fN2hw" resolve="LogicalValue" />
+                <ref role="3uigEE" to="uwx2:3gNap3fN2hw" resolve="LogicalValue" />
               </node>
               <node concept="37vLTw" id="6v6oK21VfbQ" role="2ZW6bz">
                 <ref role="3cqZAo" node="6YPNC4PrVE9" resolve="variable" />
@@ -11457,7 +11457,7 @@
                 <node concept="1eOMI4" id="5wYq9r5yBOh" role="2Oq$k0">
                   <node concept="10QFUN" id="5wYq9r5yBOi" role="1eOMHV">
                     <node concept="3uibUv" id="5wYq9r5yBOj" role="10QFUM">
-                      <ref role="3uigEE" to="oy3s:4TCblo5MJ1m" resolve="LogicalDataForm" />
+                      <ref role="3uigEE" to="uwx2:4TCblo5MJ1m" resolve="LogicalDataForm" />
                     </node>
                     <node concept="37vLTw" id="5wYq9r5z3s$" role="10QFUP">
                       <ref role="3cqZAo" node="5wYq9r5yQXr" resolve="value" />
@@ -11465,14 +11465,14 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="5wYq9r5yBOl" role="2OqNvi">
-                  <ref role="37wK5l" to="oy3s:4TCblo5MSCA" resolve="isWildcard" />
+                  <ref role="37wK5l" to="uwx2:4TCblo5MSCA" resolve="isWildcard" />
                 </node>
               </node>
             </node>
           </node>
           <node concept="2ZW3vV" id="5wYq9r5yBOm" role="3clFbw">
             <node concept="3uibUv" id="5wYq9r5yBOn" role="2ZW6by">
-              <ref role="3uigEE" to="oy3s:4TCblo5MJ1m" resolve="LogicalDataForm" />
+              <ref role="3uigEE" to="uwx2:4TCblo5MJ1m" resolve="LogicalDataForm" />
             </node>
             <node concept="37vLTw" id="5wYq9r5z39W" role="2ZW6bz">
               <ref role="3cqZAo" node="5wYq9r5yQXr" resolve="value" />
@@ -11506,7 +11506,7 @@
                 <node concept="1eOMI4" id="5wYq9r5yBO_" role="2Oq$k0">
                   <node concept="10QFUN" id="5wYq9r5yBOA" role="1eOMHV">
                     <node concept="3uibUv" id="5wYq9r5yBOB" role="10QFUM">
-                      <ref role="3uigEE" to="oy3s:3gNap3fN2hw" resolve="LogicalValue" />
+                      <ref role="3uigEE" to="uwx2:3gNap3fN2hw" resolve="LogicalValue" />
                     </node>
                     <node concept="37vLTw" id="5wYq9r5z7Uc" role="10QFUP">
                       <ref role="3cqZAo" node="5wYq9r5yQXr" resolve="value" />
@@ -11514,14 +11514,14 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="5wYq9r5yBOD" role="2OqNvi">
-                  <ref role="37wK5l" to="oy3s:3gNap3fN2jR" resolve="isWildcard" />
+                  <ref role="37wK5l" to="uwx2:3gNap3fN2jR" resolve="isWildcard" />
                 </node>
               </node>
             </node>
           </node>
           <node concept="2ZW3vV" id="5wYq9r5yBOE" role="3clFbw">
             <node concept="3uibUv" id="5wYq9r5yBOF" role="2ZW6by">
-              <ref role="3uigEE" to="oy3s:3gNap3fN2hw" resolve="LogicalValue" />
+              <ref role="3uigEE" to="uwx2:3gNap3fN2hw" resolve="LogicalValue" />
             </node>
             <node concept="37vLTw" id="5wYq9r5z7Ce" role="2ZW6bz">
               <ref role="3cqZAo" node="5wYq9r5yQXr" resolve="value" />
@@ -11555,7 +11555,7 @@
                   <node concept="1eOMI4" id="6fwi$m9aVTk" role="2Oq$k0">
                     <node concept="10QFUN" id="6fwi$m9aVTh" role="1eOMHV">
                       <node concept="3uibUv" id="6fwi$m9aYEW" role="10QFUM">
-                        <ref role="3uigEE" to="oy3s:3gNap3fN2hw" resolve="LogicalValue" />
+                        <ref role="3uigEE" to="uwx2:3gNap3fN2hw" resolve="LogicalValue" />
                         <node concept="3qTvmN" id="6fwi$m9b0JU" role="11_B2D" />
                       </node>
                       <node concept="37vLTw" id="6fwi$m9b3IE" role="10QFUP">
@@ -11564,7 +11564,7 @@
                     </node>
                   </node>
                   <node concept="liA8E" id="6fwi$m9cpGE" role="2OqNvi">
-                    <ref role="37wK5l" to="oy3s:7BhUeN7ywU1" resolve="symbol" />
+                    <ref role="37wK5l" to="uwx2:7BhUeN7ywU1" resolve="symbol" />
                   </node>
                 </node>
               </node>
@@ -11572,7 +11572,7 @@
           </node>
           <node concept="2ZW3vV" id="6fwi$m9aHTD" role="3clFbw">
             <node concept="3uibUv" id="6fwi$m9cbiR" role="2ZW6by">
-              <ref role="3uigEE" to="oy3s:3gNap3fN2hw" resolve="LogicalValue" />
+              <ref role="3uigEE" to="uwx2:3gNap3fN2hw" resolve="LogicalValue" />
             </node>
             <node concept="37vLTw" id="6fwi$m9a_9r" role="2ZW6bz">
               <ref role="3cqZAo" node="1EFtv_BCm4U" resolve="value" />
diff --git a/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.unification.mps b/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.unification.mps
index 3b3032f7..a4fa1fb3 100644
--- a/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.unification.mps
+++ b/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.unification.mps
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:a6030cee-34eb-4503-b1bf-015fe5cd8c1a(jetbrains.mps.logic.unification)">
+<model ref="r:76101703-3fc5-4e76-aa48-9728dde91f7b(jetbrains.mps.logic.unification)">
   <persistence version="9" />
   <languages>
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
@@ -11,9 +11,9 @@
     <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="bj13" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.logical(jetbrains.mps.logic.reactor/)" />
-    <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.dataform)" />
     <import index="mhfm" ref="3f233e7f-b8a6-46d2-a57f-795d56775243/java:org.jetbrains.annotations(Annotations/)" />
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
+    <import index="cof4" ref="r:0a9d1d47-250c-4f98-8962-b65edf8b0721(jetbrains.mps.logic.dataform)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -251,7 +251,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="6exd:uNmovXiEVu" resolve="Variable" />
+          <ref role="37wK5l" to="cof4:uNmovXiEVu" resolve="Variable" />
         </node>
         <node concept="3SKdUt" id="4sSe4$pxFOq" role="3cqZAp">
           <node concept="1PaTwC" id="589APehYy5T" role="1aUNEU">
@@ -539,7 +539,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="6exd:uNmovXiEd4" resolve="Variable" />
+      <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
     </node>
     <node concept="312cEg" id="7HUwyZbdNB$" role="jymVt">
       <property role="TrG5h" value="metaLogical" />
@@ -584,7 +584,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="6exd:uNmovXiEVu" resolve="Variable" />
+          <ref role="37wK5l" to="cof4:uNmovXiEVu" resolve="Variable" />
         </node>
         <node concept="3clFbF" id="4TCblo5MPbq" role="3cqZAp">
           <node concept="37vLTI" id="4TCblo5MPBG" role="3clFbG">
@@ -795,7 +795,7 @@
                   <node concept="1eOMI4" id="3R6X$QVEpsn" role="2Oq$k0">
                     <node concept="10QFUN" id="3R6X$QVEqqz" role="1eOMHV">
                       <node concept="3uibUv" id="3R6X$QVErjO" role="10QFUM">
-                        <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                        <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                       </node>
                       <node concept="37vLTw" id="3R6X$QVEhXC" role="10QFUP">
                         <ref role="3cqZAo" node="3R6X$QVDXps" resolve="value" />
@@ -803,7 +803,7 @@
                     </node>
                   </node>
                   <node concept="liA8E" id="3R6X$QVEwY8" role="2OqNvi">
-                    <ref role="37wK5l" to="6exd:5BGv8yzvvIZ" resolve="variablesCount" />
+                    <ref role="37wK5l" to="cof4:5BGv8yzvvIZ" resolve="variablesCount" />
                   </node>
                 </node>
                 <node concept="3cmrfG" id="3R6X$QVExPQ" role="3K4GZi">
@@ -811,7 +811,7 @@
                 </node>
                 <node concept="2ZW3vV" id="3R6X$QVEc5Z" role="3K4Cdx">
                   <node concept="3uibUv" id="3R6X$QVEd5p" role="2ZW6by">
-                    <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                    <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                   </node>
                   <node concept="37vLTw" id="3R6X$QVEaYB" role="2ZW6bz">
                     <ref role="3cqZAo" node="3R6X$QVDXps" resolve="value" />
@@ -987,7 +987,7 @@
     </node>
     <node concept="3Tm1VV" id="4TCblo5MJ1n" role="1B3o_S" />
     <node concept="3uibUv" id="4TCblo5MK_c" role="1zkMxy">
-      <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+      <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
     </node>
     <node concept="3uibUv" id="4TCblo5MKQV" role="EKbjA">
       <ref role="3uigEE" to="bj13:~LogicalOwner" resolve="LogicalOwner" />
@@ -1044,7 +1044,7 @@
       <node concept="3Tm1VV" id="3gNap3fN2i$" role="1B3o_S" />
       <node concept="3clFbS" id="3gNap3fN2i_" role="3clF47">
         <node concept="XkiVB" id="3gNap3fN2iA" role="3cqZAp">
-          <ref role="37wK5l" to="6exd:uNmovXiEVu" resolve="Variable" />
+          <ref role="37wK5l" to="cof4:uNmovXiEVu" resolve="Variable" />
         </node>
         <node concept="3SKdUt" id="3gNap3fN2iC" role="3cqZAp">
           <node concept="1PaTwC" id="589APehYy61" role="1aUNEU">
@@ -1404,7 +1404,7 @@
     <node concept="2tJIrI" id="3gNap3fN2hT" role="jymVt" />
     <node concept="3Tm1VV" id="3gNap3fN2hx" role="1B3o_S" />
     <node concept="3uibUv" id="3gNap3fN2hA" role="1zkMxy">
-      <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+      <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
     </node>
     <node concept="16euLQ" id="3gNap3fN2hD" role="16eVyc">
       <property role="TrG5h" value="V" />
@@ -1435,7 +1435,7 @@
       <node concept="3Tm1VV" id="3gNap3fNdxz" role="1B3o_S" />
       <node concept="3clFbS" id="3gNap3fNdx$" role="3clF47">
         <node concept="XkiVB" id="3gNap3fNdx_" role="3cqZAp">
-          <ref role="37wK5l" to="6exd:uNmovXiEVu" resolve="Variable" />
+          <ref role="37wK5l" to="cof4:uNmovXiEVu" resolve="Variable" />
         </node>
         <node concept="3SKdUt" id="3gNap3fNdxB" role="3cqZAp">
           <node concept="1PaTwC" id="589APehYy65" role="1aUNEU">
@@ -1740,7 +1740,7 @@
     <node concept="2tJIrI" id="3gNap3fNdxt" role="jymVt" />
     <node concept="3Tm1VV" id="3gNap3fNdtL" role="1B3o_S" />
     <node concept="3uibUv" id="3gNap3fNdxm" role="1zkMxy">
-      <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+      <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
     </node>
     <node concept="16euLQ" id="3gNap3fNgV4" role="16eVyc">
       <property role="TrG5h" value="V" />
@@ -1766,7 +1766,7 @@
       </node>
       <node concept="10Q1$e" id="7HUwyZb7b7G" role="3clF45">
         <node concept="3uibUv" id="kTK1BeAfdG" role="10Q1$1">
-          <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+          <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
         </node>
       </node>
       <node concept="3Tm1VV" id="7HUwyZb7b7I" role="1B3o_S" />
@@ -1776,7 +1776,7 @@
             <property role="TrG5h" value="array" />
             <node concept="10Q1$e" id="7HUwyZb7b7T" role="1tU5fm">
               <node concept="3uibUv" id="kTK1BeAf2h" role="10Q1$1">
-                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
               </node>
             </node>
             <node concept="2ShNRf" id="7HUwyZb7b7V" role="33vP2m">
@@ -1792,7 +1792,7 @@
                   </node>
                 </node>
                 <node concept="3uibUv" id="kTK1BeAf7Z" role="3$_nBY">
-                  <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+                  <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
                 </node>
               </node>
             </node>
@@ -1827,7 +1827,7 @@
                       </node>
                     </node>
                     <node concept="3uibUv" id="4U$Q3dKgNvE" role="10QFUM">
-                      <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+                      <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
                     </node>
                   </node>
                 </node>
@@ -1890,7 +1890,7 @@
         </node>
       </node>
       <node concept="3uibUv" id="kTK1BeAdVX" role="3clF45">
-        <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+        <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
       </node>
       <node concept="3Tm1VV" id="7HUwyZb7chp" role="1B3o_S" />
       <node concept="3clFbS" id="7HUwyZb7chq" role="3clF47">
@@ -1926,7 +1926,7 @@
         </node>
       </node>
       <node concept="3uibUv" id="4U$Q3dKgMRO" role="3clF45">
-        <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+        <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
       </node>
       <node concept="3Tm1VV" id="4TCblo5YI1L" role="1B3o_S" />
       <node concept="3clFbS" id="4TCblo5YI1M" role="3clF47">
@@ -1968,14 +1968,14 @@
         </node>
       </node>
       <node concept="3uibUv" id="4U$Q3dL0BAN" role="3clF45">
-        <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+        <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
       </node>
       <node concept="3Tm1VV" id="4U$Q3dL0BAO" role="1B3o_S" />
       <node concept="3clFbS" id="4U$Q3dL0BAP" role="3clF47">
         <node concept="3clFbF" id="4U$Q3dL0E8K" role="3cqZAp">
           <node concept="2YIFZM" id="4U$Q3dL0E9q" role="3clFbG">
-            <ref role="37wK5l" to="6exd:1OShD0HS45f" resolve="createList" />
-            <ref role="1Pybhc" to="6exd:3OPtF03lco4" resolve="ListNode" />
+            <ref role="37wK5l" to="cof4:1OShD0HS45f" resolve="createList" />
+            <ref role="1Pybhc" to="cof4:3OPtF03lco4" resolve="ListNode" />
             <node concept="1rXfSq" id="4U$Q3dL0Ecm" role="37wK5m">
               <ref role="37wK5l" node="7HUwyZb7b7C" resolve="asDataFormArray" />
               <node concept="37vLTw" id="4U$Q3dL0EyT" role="37wK5m">
@@ -1999,11 +1999,11 @@
       <node concept="37vLTG" id="4U$Q3dKg$bK" role="3clF46">
         <property role="TrG5h" value="df" />
         <node concept="3uibUv" id="4U$Q3dKg$Kh" role="1tU5fm">
-          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+          <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
         </node>
       </node>
       <node concept="3uibUv" id="4U$Q3dKg_bR" role="3clF45">
-        <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+        <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
       </node>
       <node concept="3Tm1VV" id="4U$Q3dKg$bO" role="1B3o_S" />
       <node concept="3clFbS" id="4U$Q3dKg$bP" role="3clF47">
@@ -2034,7 +2034,7 @@
         </node>
       </node>
       <node concept="3uibUv" id="4U$Q3dKgRRM" role="3clF45">
-        <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+        <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
       </node>
       <node concept="3Tm1VV" id="3gNap3gwG55" role="1B3o_S" />
       <node concept="3clFbS" id="3gNap3gwG56" role="3clF47">
@@ -2076,7 +2076,7 @@
         </node>
       </node>
       <node concept="3uibUv" id="4U$Q3dKgRr5" role="3clF45">
-        <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+        <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
       </node>
       <node concept="3Tm1VV" id="3gNap3fZcVs" role="1B3o_S" />
       <node concept="3clFbS" id="3gNap3fZcVt" role="3clF47">
@@ -2118,11 +2118,11 @@
       <node concept="37vLTG" id="4U$Q3dKgTI6" role="3clF46">
         <property role="TrG5h" value="value" />
         <node concept="3uibUv" id="4U$Q3dKgUnL" role="1tU5fm">
-          <ref role="3uigEE" to="6exd:2xQ7eRAD2dj" resolve="Value" />
+          <ref role="3uigEE" to="cof4:2xQ7eRAD2dj" resolve="Value" />
         </node>
       </node>
       <node concept="3uibUv" id="4U$Q3dKgT0T" role="3clF45">
-        <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+        <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
       </node>
       <node concept="P$JXv" id="4U$Q3dKgVM9" role="lGtFl">
         <node concept="TZ5HA" id="4U$Q3dKgVMa" role="TZ5H$">
@@ -2146,11 +2146,11 @@
       <node concept="37vLTG" id="4U$Q3dLiFgz" role="3clF46">
         <property role="TrG5h" value="variable" />
         <node concept="3uibUv" id="4U$Q3dLiFEI" role="1tU5fm">
-          <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+          <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
         </node>
       </node>
       <node concept="3uibUv" id="4U$Q3dLiFg_" role="3clF45">
-        <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+        <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
       </node>
       <node concept="P$JXv" id="4U$Q3dLiFgA" role="lGtFl">
         <node concept="TZ5HA" id="4U$Q3dLiFgB" role="TZ5H$">
@@ -2167,8 +2167,8 @@
       <node concept="3clFbS" id="4U$Q3dKt4OA" role="3clF47">
         <node concept="3clFbF" id="4U$Q3dKt5X4" role="3cqZAp">
           <node concept="2YIFZM" id="4U$Q3dKt63l" role="3clFbG">
-            <ref role="37wK5l" to="6exd:5JQSuNsxb_I" resolve="create" />
-            <ref role="1Pybhc" to="6exd:2xQ7eRAD2dj" resolve="Value" />
+            <ref role="37wK5l" to="cof4:5JQSuNsxb_I" resolve="create" />
+            <ref role="1Pybhc" to="cof4:2xQ7eRAD2dj" resolve="Value" />
             <node concept="37vLTw" id="4U$Q3dKt69V" role="37wK5m">
               <ref role="3cqZAo" node="4U$Q3dKt4Oy" resolve="obj" />
             </node>
@@ -2182,7 +2182,7 @@
         </node>
       </node>
       <node concept="3uibUv" id="4U$Q3dKt4O$" role="3clF45">
-        <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+        <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
       </node>
       <node concept="P$JXv" id="4U$Q3dKt4OD" role="lGtFl">
         <node concept="TZ5HA" id="4U$Q3dKt4OE" role="TZ5H$">
@@ -2204,8 +2204,8 @@
             <node concept="3cpWs6" id="2gPa6JIiUjP" role="3cqZAp">
               <node concept="2OqwBi" id="2gPa6JIiUjQ" role="3cqZAk">
                 <node concept="2YIFZM" id="2gPa6JIiUjR" role="2Oq$k0">
-                  <ref role="37wK5l" to="6exd:5s497VqteR6" resolve="mapper" />
-                  <ref role="1Pybhc" to="6exd:3OPtF02T8yx" resolve="Mappers" />
+                  <ref role="37wK5l" to="cof4:5s497VqteR6" resolve="mapper" />
+                  <ref role="1Pybhc" to="cof4:3OPtF02T8yx" resolve="Mappers" />
                   <node concept="2ShNRf" id="2gPa6JIiUjS" role="37wK5m">
                     <node concept="1pGfFk" id="2gPa6JIiUjT" role="2ShVmc">
                       <ref role="37wK5l" node="4TCblo5MHYk" resolve="LogicalUtil.InstantiateDelegate" />
@@ -2216,7 +2216,7 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="2gPa6JIiUjV" role="2OqNvi">
-                  <ref role="37wK5l" to="6exd:3OPtF02TgQt" resolve="map" />
+                  <ref role="37wK5l" to="cof4:3OPtF02TgQt" resolve="map" />
                   <node concept="37vLTw" id="2gPa6JIiUjW" role="37wK5m">
                     <ref role="3cqZAo" node="4TCblo5NkAJ" resolve="tf" />
                   </node>
@@ -2234,7 +2234,7 @@
                 <ref role="3cqZAo" node="4TCblo5NkAJ" resolve="tf" />
               </node>
               <node concept="liA8E" id="2gPa6JIiTha" role="2OqNvi">
-                <ref role="37wK5l" to="6exd:5BGv8yzvvIZ" resolve="variablesCount" />
+                <ref role="37wK5l" to="cof4:5BGv8yzvvIZ" resolve="variablesCount" />
               </node>
             </node>
           </node>
@@ -2252,7 +2252,7 @@
       <node concept="37vLTG" id="4TCblo5NkAJ" role="3clF46">
         <property role="TrG5h" value="tf" />
         <node concept="3uibUv" id="4TCblo5NkFx" role="1tU5fm">
-          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+          <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
         </node>
       </node>
       <node concept="37vLTG" id="4TCblo5NkwR" role="3clF46">
@@ -2262,7 +2262,7 @@
         </node>
       </node>
       <node concept="3uibUv" id="4TCblo5Nlai" role="3clF45">
-        <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+        <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
       </node>
       <node concept="3Tm1VV" id="4TCblo5NkoK" role="1B3o_S" />
       <node concept="P$JXv" id="1fvYCP$W$Pe" role="lGtFl">
@@ -2313,7 +2313,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="6exd:3OPtF031GQe" resolve="Mappers.MapDelegate" />
+        <ref role="3uigEE" to="cof4:3OPtF031GQe" resolve="Mappers.MapDelegate" />
       </node>
       <node concept="3clFb_" id="6HT7BWBPa9I" role="jymVt">
         <property role="1EzhhJ" value="false" />
@@ -2321,7 +2321,7 @@
         <node concept="37vLTG" id="6HT7BWBPa9J" role="3clF46">
           <property role="TrG5h" value="tf" />
           <node concept="3uibUv" id="6HT7BWBPa9K" role="1tU5fm">
-            <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+            <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
           </node>
         </node>
         <node concept="10P_77" id="6HT7BWBPa9L" role="3clF45" />
@@ -2337,7 +2337,7 @@
                   <ref role="3cqZAo" node="6HT7BWBPa9J" resolve="tf" />
                 </node>
                 <node concept="liA8E" id="5BGv8yzxmhs" role="2OqNvi">
-                  <ref role="37wK5l" to="6exd:5BGv8yzvvIZ" resolve="variablesCount" />
+                  <ref role="37wK5l" to="cof4:5BGv8yzvvIZ" resolve="variablesCount" />
                 </node>
               </node>
             </node>
@@ -2351,18 +2351,18 @@
         <node concept="37vLTG" id="6HT7BWBPa9P" role="3clF46">
           <property role="TrG5h" value="tf" />
           <node concept="3uibUv" id="6HT7BWBPa9Q" role="1tU5fm">
-            <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+            <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
           </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="6exd:3OPtF02TdNT" resolve="DataForm.Mapper" />
+            <ref role="3uigEE" to="cof4:3OPtF02TdNT" resolve="DataForm.Mapper" />
           </node>
         </node>
         <node concept="3Tm1VV" id="6HT7BWBPa9T" role="1B3o_S" />
         <node concept="3uibUv" id="6HT7BWBPa9U" role="3clF45">
-          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+          <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
         </node>
         <node concept="3clFbS" id="6HT7BWBPa9V" role="3clF47">
           <node concept="3clFbJ" id="5BGv8yzxmXQ" role="3cqZAp">
@@ -2417,7 +2417,7 @@
                     <ref role="3cqZAo" node="6HT7BWBPa9P" resolve="tf" />
                   </node>
                   <node concept="liA8E" id="2gPa6JIiPBg" role="2OqNvi">
-                    <ref role="37wK5l" to="6exd:5BGv8yzvvIZ" resolve="variablesCount" />
+                    <ref role="37wK5l" to="cof4:5BGv8yzvvIZ" resolve="variablesCount" />
                   </node>
                 </node>
               </node>
@@ -2428,7 +2428,7 @@
                       <ref role="3cqZAo" node="6HT7BWBPa9P" resolve="tf" />
                     </node>
                     <node concept="liA8E" id="5BGv8yzxlnb" role="2OqNvi">
-                      <ref role="37wK5l" to="6exd:3OPtF02Tjpr" resolve="mapRecursively" />
+                      <ref role="37wK5l" to="cof4:3OPtF02Tjpr" resolve="mapRecursively" />
                       <node concept="37vLTw" id="5BGv8yzxlyp" role="37wK5m">
                         <ref role="3cqZAo" node="6HT7BWBPa9R" resolve="fallback" />
                       </node>
diff --git a/coderules/languages/jetbrains.mps.typechecking.testlang/jetbrains.mps.typechecking.testlang.mpl b/coderules/languages/jetbrains.mps.typechecking.testlang/jetbrains.mps.typechecking.testlang.mpl
index f462c3aa..2146d509 100644
--- a/coderules/languages/jetbrains.mps.typechecking.testlang/jetbrains.mps.typechecking.testlang.mpl
+++ b/coderules/languages/jetbrains.mps.typechecking.testlang/jetbrains.mps.typechecking.testlang.mpl
@@ -57,9 +57,8 @@
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.coderules.typechecking)</dependency>
-    <dependency reexport="false">3a1f0f04-b5e0-43be-884e-b856bfdeca21(jetbrains.mps.typechecking.testlang)</dependency>
     <dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
-    <dependency reexport="false">afc17aaf-3a3d-4d69-a38d-db90d5e858c6(jetbrains.mps.lang.types)</dependency>
+    <dependency reexport="false">a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
@@ -119,23 +118,13 @@
     <module reference="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" version="0" />
     <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
     <module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
-    <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
-    <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
     <module reference="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c(jetbrains.mps.coderules)" version="0" />
-    <module reference="f113d56b-63e3-4120-a89c-2f5dcb8c6290(jetbrains.mps.coderules.runtime)" version="0" />
     <module reference="6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.coderules.typechecking)" version="0" />
     <module reference="bfbdd672-7ff5-403f-af4f-16da5226f34c(jetbrains.mps.findUsages.runtime)" version="0" />
-    <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
-    <module reference="f159adf4-3c93-40f9-9c5a-1f245a8697af(jetbrains.mps.lang.aspect)" version="0" />
     <module reference="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" version="0" />
-    <module reference="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
-    <module reference="f4ad079d-bc71-4ffb-9600-9328705cf998(jetbrains.mps.lang.descriptor)" version="0" />
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
-    <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" version="0" />
-    <module reference="afc17aaf-3a3d-4d69-a38d-db90d5e858c6(jetbrains.mps.lang.types)" version="0" />
-    <module reference="c9d137c4-3259-44f8-80ff-33ab2b506ee4(jetbrains.mps.lang.util.order)" 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="da80355b-a098-4248-9ec8-70d10dd7e9af(jetbrains.mps.reporting.runtime)" version="0" />
diff --git a/coderules/languages/jetbrains.mps.typechecking.testlang/models/types.mps b/coderules/languages/jetbrains.mps.typechecking.testlang/models/types.mps
index 80a34c9f..5c93c7fd 100644
--- a/coderules/languages/jetbrains.mps.typechecking.testlang/models/types.mps
+++ b/coderules/languages/jetbrains.mps.typechecking.testlang/models/types.mps
@@ -13,7 +13,6 @@
   <imports>
     <import index="qulx" ref="r:ec0979fb-ae37-4823-9eaa-8550d9f5c6fd(jetbrains.mps.typechecking.testlang.structure)" />
     <import index="tj24" ref="r:0fbbb63a-fd15-46e1-8136-78049f6d6e63(jetbrains.mps.coderules.typechecking.service)" />
-    <import index="82uw" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.function(JDK/)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
   </imports>
diff --git a/coderules/solutions/jetbrains.mps.coderules.build/models/jetbrains.mps.coderules.build.mps b/coderules/solutions/jetbrains.mps.coderules.build/models/jetbrains.mps.coderules.build.mps
index dbb8e017..89d41b9a 100644
--- a/coderules/solutions/jetbrains.mps.coderules.build/models/jetbrains.mps.coderules.build.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.build/models/jetbrains.mps.coderules.build.mps
@@ -523,8 +523,8 @@
       <node concept="m$_yB" id="2ABzB2CYNDt" role="m$_yh">
         <ref role="m$_yA" node="7BVjoXzUxoR" resolve="jetbrains.mps.logic.reactor" />
       </node>
-      <node concept="m$_yB" id="2ABzB2CYNH2" role="m$_yh">
-        <ref role="m$_yA" node="7BVjoXzUx$V" resolve="jetbrains.mps.logic.runtime" />
+      <node concept="m$_yB" id="74$3PKm_LUD" role="m$_yh">
+        <ref role="m$_yA" node="74$3PKm_L$v" resolve="jetbrains.mps.logic.runtime" />
       </node>
       <node concept="m$_yB" id="2ABzB2CYNLS" role="m$_yh">
         <ref role="m$_yA" node="7BVjoXzUx6U" resolve="jetbrains.mps.lang.coderules" />
@@ -532,9 +532,6 @@
       <node concept="m$_yB" id="2ABzB2CYNOm" role="m$_yh">
         <ref role="m$_yA" node="7BVjoXzUxee" resolve="jetbrains.mps.lang.coderules.runtime" />
       </node>
-      <node concept="m$_yB" id="2ABzB2CYNTo" role="m$_yh">
-        <ref role="m$_yA" node="7BVjoXzUx9d" resolve="jetbrains.mps.lang.coderules.template" />
-      </node>
       <node concept="m$_yB" id="2ABzB2CYO9e" role="m$_yh">
         <ref role="m$_yA" node="NKt6ynvPIP" resolve="jetbrains.mps.lang.typechecking" />
       </node>
@@ -544,9 +541,6 @@
       <node concept="m$_yB" id="2ABzB2CYOB6" role="m$_yh">
         <ref role="m$_yA" node="5XWz8xxbp0o" resolve="jetbrains.mps.lang.types" />
       </node>
-      <node concept="m$_yB" id="2ABzB2CYNVW" role="m$_yh">
-        <ref role="m$_yA" node="5wYq9r5EBDN" resolve="jetbrains.mps.coderules.runtime" />
-      </node>
       <node concept="m$_yB" id="2ABzB2CYNYy" role="m$_yh">
         <ref role="m$_yA" node="NKt6yn9_8p" resolve="jetbrains.mps.coderules" />
       </node>
@@ -908,20 +902,20 @@
           </node>
         </node>
       </node>
-      <node concept="1E1JtA" id="7BVjoXzUx$V" role="2G$12L">
-        <property role="BnDLt" value="true" />
-        <property role="3LESm3" value="a5478664-6b44-4c62-a9f7-434f8aa57eee" />
+      <node concept="1E1JtA" id="74$3PKm_L$v" role="2G$12L">
         <property role="TrG5h" value="jetbrains.mps.logic.runtime" />
-        <node concept="55IIr" id="7BVjoXzUx$Y" role="3LF7KH">
-          <node concept="2Ry0Ak" id="7BVjoXzUxBC" role="iGT6I">
+        <property role="3LESm3" value="a5478664-6b44-4c62-a9f7-434f8aa57eee" />
+        <property role="BnDLt" value="true" />
+        <node concept="55IIr" id="74$3PKm_L$w" role="3LF7KH">
+          <node concept="2Ry0Ak" id="74$3PKm_L$x" role="iGT6I">
             <property role="2Ry0Am" value="coderules" />
-            <node concept="2Ry0Ak" id="7BVjoXzUxDN" role="2Ry0An">
+            <node concept="2Ry0Ak" id="74$3PKm_L$y" role="2Ry0An">
               <property role="2Ry0Am" value="languages" />
-              <node concept="2Ry0Ak" id="7BVjoXzUxI4" role="2Ry0An">
+              <node concept="2Ry0Ak" id="74$3PKm_L$z" role="2Ry0An">
                 <property role="2Ry0Am" value="jetbrains.mps.logic" />
-                <node concept="2Ry0Ak" id="7BVjoXzUxLi" role="2Ry0An">
+                <node concept="2Ry0Ak" id="74$3PKm_LC3" role="2Ry0An">
                   <property role="2Ry0Am" value="runtime" />
-                  <node concept="2Ry0Ak" id="7BVjoXzUxNt" role="2Ry0An">
+                  <node concept="2Ry0Ak" id="74$3PKm_LEm" role="2Ry0An">
                     <property role="2Ry0Am" value="jetbrains.mps.logic.runtime.msd" />
                   </node>
                 </node>
@@ -929,59 +923,71 @@
             </node>
           </node>
         </node>
-        <node concept="1SiIV0" id="4pNU3yqbyNj" role="3bR37C">
-          <node concept="3bR9La" id="4pNU3yqbyNk" role="1SiIV1">
+        <node concept="1SiIV0" id="74$3PKm_L$_" role="3bR37C">
+          <node concept="3bR9La" id="74$3PKm_L$A" role="1SiIV1">
             <ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
           </node>
         </node>
-        <node concept="1SiIV0" id="4pNU3yqbyNn" role="3bR37C">
-          <node concept="3bR9La" id="4pNU3yqbyNo" role="1SiIV1">
-            <property role="3bR36h" value="true" />
-            <ref role="3bR37D" node="7BVjoXzUxoR" resolve="jetbrains.mps.logic.reactor" />
+        <node concept="1SiIV0" id="74$3PKm_L$D" role="3bR37C">
+          <node concept="3bR9La" id="74$3PKm_L$E" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:1TaHNgiIbIQ" resolve="MPS.Core" />
           </node>
         </node>
-        <node concept="3rtmxn" id="3Z6zOnxMp$u" role="3bR31x">
-          <node concept="3LXTmp" id="3Z6zOnxMp$v" role="3rtmxm">
-            <node concept="3qWCbU" id="3Z6zOnxMp$w" role="3LXTna">
+        <node concept="3rtmxn" id="74$3PKm_L$F" role="3bR31x">
+          <node concept="3LXTmp" id="74$3PKm_L$G" role="3rtmxm">
+            <node concept="3qWCbU" id="74$3PKm_L$H" role="3LXTna">
               <property role="3qWCbO" value="icons/**, resources/**" />
             </node>
-            <node concept="55IIr" id="3Z6zOnxMp$x" role="3LXTmr">
-              <node concept="2Ry0Ak" id="3Z6zOnxMp$y" role="iGT6I">
+            <node concept="55IIr" id="74$3PKm_L$I" role="3LXTmr">
+              <node concept="2Ry0Ak" id="74$3PKm_L$J" role="iGT6I">
                 <property role="2Ry0Am" value="coderules" />
-                <node concept="2Ry0Ak" id="3Z6zOnxMp$z" role="2Ry0An">
-                  <property role="2Ry0Am" value="languages" />
-                  <node concept="2Ry0Ak" id="3Z6zOnxMp$$" role="2Ry0An">
-                    <property role="2Ry0Am" value="jetbrains.mps.logic" />
-                    <node concept="2Ry0Ak" id="3Z6zOnxMp$_" role="2Ry0An">
-                      <property role="2Ry0Am" value="runtime" />
-                    </node>
+                <node concept="2Ry0Ak" id="74$3PKm_L$K" role="2Ry0An">
+                  <property role="2Ry0Am" value="solutions" />
+                  <node concept="2Ry0Ak" id="74$3PKm_L$L" role="2Ry0An">
+                    <property role="2Ry0Am" value="jetbrains.mps.logic.reactor" />
                   </node>
                 </node>
               </node>
             </node>
           </node>
         </node>
-        <node concept="1SiIV0" id="70Wv0dJkDFs" role="3bR37C">
-          <node concept="3bR9La" id="70Wv0dJkDFt" role="1SiIV1">
+        <node concept="1SiIV0" id="74$3PKm_LGd" role="3bR37C">
+          <node concept="3bR9La" id="74$3PKm_LGe" role="1SiIV1">
             <ref role="3bR37D" to="ffeo:1H905DlDUSw" resolve="MPS.OpenAPI" />
           </node>
         </node>
-        <node concept="1BupzO" id="7zIaasjWoPp" role="3bR31x">
+        <node concept="1SiIV0" id="74$3PKm_LGf" role="3bR37C">
+          <node concept="3bR9La" id="74$3PKm_LGg" role="1SiIV1">
+            <ref role="3bR37D" node="7BVjoXzUxee" resolve="jetbrains.mps.lang.coderules.runtime" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="74$3PKm_LGh" role="3bR37C">
+          <node concept="3bR9La" id="74$3PKm_LGi" role="1SiIV1">
+            <property role="3bR36h" value="true" />
+            <ref role="3bR37D" node="7BVjoXzUxoR" resolve="jetbrains.mps.logic.reactor" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="74$3PKm_LGj" role="3bR37C">
+          <node concept="3bR9La" id="74$3PKm_LGk" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:7Kfy9QB6Lg8" resolve="jetbrains.mps.runtime" />
+          </node>
+        </node>
+        <node concept="1BupzO" id="74$3PKm_LGx" role="3bR31x">
           <property role="3ZfqAx" value="models" />
           <property role="1Hdu6h" value="true" />
           <property role="1HemKv" value="true" />
-          <node concept="3LXTmp" id="7zIaasjWoPq" role="1HemKq">
-            <node concept="398BVA" id="7zIaasjWoPd" role="3LXTmr">
+          <node concept="3LXTmp" id="74$3PKm_LGy" role="1HemKq">
+            <node concept="398BVA" id="74$3PKm_LGl" role="3LXTmr">
               <ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.coderules_home" />
-              <node concept="2Ry0Ak" id="7zIaasjWoPe" role="iGT6I">
+              <node concept="2Ry0Ak" id="74$3PKm_LGm" role="iGT6I">
                 <property role="2Ry0Am" value="coderules" />
-                <node concept="2Ry0Ak" id="7zIaasjWoPf" role="2Ry0An">
+                <node concept="2Ry0Ak" id="74$3PKm_LGn" role="2Ry0An">
                   <property role="2Ry0Am" value="languages" />
-                  <node concept="2Ry0Ak" id="7zIaasjWoPg" role="2Ry0An">
+                  <node concept="2Ry0Ak" id="74$3PKm_LGo" role="2Ry0An">
                     <property role="2Ry0Am" value="jetbrains.mps.logic" />
-                    <node concept="2Ry0Ak" id="7zIaasjWoPh" role="2Ry0An">
+                    <node concept="2Ry0Ak" id="74$3PKm_LGp" role="2Ry0An">
                       <property role="2Ry0Am" value="runtime" />
-                      <node concept="2Ry0Ak" id="7zIaasjWoPi" role="2Ry0An">
+                      <node concept="2Ry0Ak" id="74$3PKm_LGq" role="2Ry0An">
                         <property role="2Ry0Am" value="models" />
                       </node>
                     </node>
@@ -989,26 +995,11 @@
                 </node>
               </node>
             </node>
-            <node concept="3qWCbU" id="7zIaasjWoPr" role="3LXTna">
+            <node concept="3qWCbU" id="74$3PKm_LGz" role="3LXTna">
               <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
             </node>
           </node>
         </node>
-        <node concept="1SiIV0" id="3ca5Bh2cpLY" role="3bR37C">
-          <node concept="3bR9La" id="3ca5Bh2cpLZ" role="1SiIV1">
-            <ref role="3bR37D" to="ffeo:7Kfy9QB6Lg8" resolve="jetbrains.mps.runtime" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="5wYq9r5TDhx" role="3bR37C">
-          <node concept="3bR9La" id="5wYq9r5TDhy" role="1SiIV1">
-            <ref role="3bR37D" node="5wYq9r5EBDN" resolve="jetbrains.mps.coderules.runtime" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="1RYTbd6pb7T" role="3bR37C">
-          <node concept="3bR9La" id="1RYTbd6pb7U" role="1SiIV1">
-            <ref role="3bR37D" node="7BVjoXzUxee" resolve="jetbrains.mps.lang.coderules.runtime" />
-          </node>
-        </node>
       </node>
       <node concept="1E1JtD" id="7BVjoXzUxkQ" role="2G$12L">
         <property role="TrG5h" value="jetbrains.mps.logic" />
@@ -1028,11 +1019,6 @@
             </node>
           </node>
         </node>
-        <node concept="1SiIV0" id="7BVjoXzUxU2" role="3bR37C">
-          <node concept="3bR9La" id="7BVjoXzUxU3" role="1SiIV1">
-            <ref role="3bR37D" node="7BVjoXzUx$V" resolve="jetbrains.mps.logic.runtime" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="7BVjoXzUxU4" role="3bR37C">
           <node concept="3bR9La" id="7BVjoXzUxU5" role="1SiIV1">
             <ref role="3bR37D" to="ffeo:1d41uYMTRXo" resolve="jetbrains.mps.baseLanguage.scopes" />
@@ -1068,9 +1054,6 @@
             <ref role="3bR37D" to="ffeo:1TaHNgiIbIQ" resolve="MPS.Core" />
           </node>
         </node>
-        <node concept="1E0d5M" id="4pNU3yqbxem" role="1E1XAP">
-          <ref role="1E0d5P" node="7BVjoXzUx$V" resolve="jetbrains.mps.logic.runtime" />
-        </node>
         <node concept="1SiIV0" id="4pNU3yqbxen" role="3bR37C">
           <node concept="1Busua" id="4pNU3yqbxeo" role="1SiIV1">
             <ref role="1Busuk" to="ffeo:7Kfy9QB6KYb" resolve="jetbrains.mps.baseLanguage" />
@@ -1122,6 +1105,16 @@
               </node>
             </node>
           </node>
+          <node concept="1SiIV0" id="4HQe0WHvAyA" role="3bR37C">
+            <node concept="3bR9La" id="4HQe0WHvAyB" role="1SiIV1">
+              <ref role="3bR37D" node="7BVjoXzUxee" resolve="jetbrains.mps.lang.coderules.runtime" />
+            </node>
+          </node>
+          <node concept="1SiIV0" id="74$3PKm_LMY" role="3bR37C">
+            <node concept="3bR9La" id="74$3PKm_LMZ" role="1SiIV1">
+              <ref role="3bR37D" node="74$3PKm_L$v" resolve="jetbrains.mps.logic.runtime" />
+            </node>
+          </node>
         </node>
         <node concept="3rtmxn" id="3Z6zOnxMpzt" role="3bR31x">
           <node concept="3LXTmp" id="3Z6zOnxMpzu" role="3rtmxm">
@@ -1176,6 +1169,21 @@
             <ref role="3bR37D" node="7BVjoXzUx6U" resolve="jetbrains.mps.lang.coderules" />
           </node>
         </node>
+        <node concept="1SiIV0" id="4HQe0WHvAyq" role="3bR37C">
+          <node concept="3bR9La" id="4HQe0WHvAyr" role="1SiIV1">
+            <ref role="3bR37D" node="7BVjoXzUxee" resolve="jetbrains.mps.lang.coderules.runtime" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="1klUHMh1ANr" role="3bR37C">
+          <node concept="3bR9La" id="1klUHMh1ANs" role="1SiIV1">
+            <ref role="3bR37D" node="7BVjoXzUxoR" resolve="jetbrains.mps.logic.reactor" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="74$3PKm_LMM" role="3bR37C">
+          <node concept="3bR9La" id="74$3PKm_LMN" role="1SiIV1">
+            <ref role="3bR37D" node="74$3PKm_L$v" resolve="jetbrains.mps.logic.runtime" />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2G$12M" id="7Ant4WkHLpc" role="3989C9">
@@ -1204,12 +1212,6 @@
             <ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
           </node>
         </node>
-        <node concept="1SiIV0" id="7Ant4WkHLpn" role="3bR37C">
-          <node concept="3bR9La" id="7Ant4WkHLpo" role="1SiIV1">
-            <property role="3bR36h" value="true" />
-            <ref role="3bR37D" node="7BVjoXzUx$V" resolve="jetbrains.mps.logic.runtime" />
-          </node>
-        </node>
         <node concept="3rtmxn" id="3Z6zOnxMpzP" role="3bR31x">
           <node concept="3LXTmp" id="3Z6zOnxMpzQ" role="3rtmxm">
             <node concept="3qWCbU" id="3Z6zOnxMpzR" role="3LXTna">
@@ -1258,11 +1260,26 @@
             </node>
           </node>
         </node>
-        <node concept="1SiIV0" id="1RYTbd6Gsyl" role="3bR37C">
-          <node concept="3bR9La" id="1RYTbd6Gsym" role="1SiIV1">
+        <node concept="1SiIV0" id="3DKqHDePCR2" role="3bR37C">
+          <node concept="3bR9La" id="3DKqHDePCR3" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:1TaHNgiIbIQ" resolve="MPS.Core" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="4HQe0WHvAyO" role="3bR37C">
+          <node concept="3bR9La" id="4HQe0WHvAyP" role="1SiIV1">
             <ref role="3bR37D" node="7BVjoXzUxee" resolve="jetbrains.mps.lang.coderules.runtime" />
           </node>
         </node>
+        <node concept="1SiIV0" id="4HQe0WHvAyQ" role="3bR37C">
+          <node concept="3bR9La" id="4HQe0WHvAyR" role="1SiIV1">
+            <ref role="3bR37D" node="7BVjoXzUxoR" resolve="jetbrains.mps.logic.reactor" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="74$3PKm_LNc" role="3bR37C">
+          <node concept="3bR9La" id="74$3PKm_LNd" role="1SiIV1">
+            <ref role="3bR37D" node="74$3PKm_L$v" resolve="jetbrains.mps.logic.runtime" />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2G$12M" id="65DJywFj0uW" role="3989C9">
@@ -1336,6 +1353,12 @@
         <node concept="3LEDTy" id="4ot3PHRgk22" role="3LEDUa">
           <ref role="3LEDTV" to="ffeo:1d41uYMTTNW" resolve="jetbrains.mps.baseLanguage.varVariable" />
         </node>
+        <node concept="3LEDTM" id="74$3PKnBS04" role="3LEDUa">
+          <ref role="3LEDTN" node="74$3PKm_L$v" resolve="jetbrains.mps.logic.runtime" />
+        </node>
+        <node concept="3LEDTM" id="74$3PKnDh_5" role="3LEDUa">
+          <ref role="3LEDTN" node="2CPBoDB0Mtg" resolve="jetbrains.mps.coderules.typechecking" />
+        </node>
       </node>
       <node concept="1E1JtA" id="NKt6yomVLS" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -1360,12 +1383,6 @@
             <ref role="3bR37D" to="ffeo:1H905DlDUSw" resolve="MPS.OpenAPI" />
           </node>
         </node>
-        <node concept="1SiIV0" id="NKt6yomWQ6" role="3bR37C">
-          <node concept="3bR9La" id="NKt6yomWQ7" role="1SiIV1">
-            <property role="3bR36h" value="true" />
-            <ref role="3bR37D" node="7BVjoXzUx9d" resolve="jetbrains.mps.lang.coderules.template" />
-          </node>
-        </node>
         <node concept="1BupzO" id="7zIaasjWoQD" role="3bR31x">
           <property role="3ZfqAx" value="models" />
           <property role="1Hdu6h" value="true" />
@@ -1414,11 +1431,21 @@
             <ref role="3bR37D" to="ffeo:4DalL5sdlK7" resolve="jetbrains.mps.lang.descriptor.aspects" />
           </node>
         </node>
+        <node concept="1SiIV0" id="3DKqHDePCRe" role="3bR37C">
+          <node concept="3bR9La" id="3DKqHDePCRf" role="1SiIV1">
+            <ref role="3bR37D" node="7BVjoXzUxee" resolve="jetbrains.mps.lang.coderules.runtime" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="3DKqHDePCRg" role="3bR37C">
+          <node concept="3bR9La" id="3DKqHDePCRh" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:1TaHNgiIbIQ" resolve="MPS.Core" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="5XWz8xxbp0o" role="2G$12L">
-        <property role="BnDLt" value="true" />
         <property role="TrG5h" value="jetbrains.mps.lang.types" />
         <property role="3LESm3" value="afc17aaf-3a3d-4d69-a38d-db90d5e858c6" />
+        <property role="BnDLt" value="true" />
         <node concept="55IIr" id="5XWz8xxbp0r" role="3LF7KH">
           <node concept="2Ry0Ak" id="5XWz8xxbp9e" role="iGT6I">
             <property role="2Ry0Am" value="coderules" />
@@ -1476,11 +1503,6 @@
               <ref role="3bR37D" node="NKt6ynvPIP" resolve="jetbrains.mps.lang.typechecking" />
             </node>
           </node>
-          <node concept="1SiIV0" id="5XWz8xxbpxG" role="3bR37C">
-            <node concept="3bR9La" id="5XWz8xxbpxH" role="1SiIV1">
-              <ref role="3bR37D" node="7BVjoXzUxWX" resolve="jetbrains.mps.lang.coderules#4578927328670739933" />
-            </node>
-          </node>
           <node concept="1SiIV0" id="5XWz8xxbpxI" role="3bR37C">
             <node concept="3bR9La" id="5XWz8xxbpxJ" role="1SiIV1">
               <ref role="3bR37D" to="ffeo:7Kfy9QB6L8Y" resolve="jetbrains.mps.lang.project" />
@@ -1529,6 +1551,11 @@
               <ref role="3bR37D" to="ffeo:7YI57w6K0jH" resolve="jetbrains.mps.lang.descriptor#9020561928507175817" />
             </node>
           </node>
+          <node concept="1SiIV0" id="UFo5u0IQA5" role="3bR37C">
+            <node concept="3bR9La" id="UFo5u0IQA6" role="1SiIV1">
+              <ref role="3bR37D" node="7BVjoXzUxee" resolve="jetbrains.mps.lang.coderules.runtime" />
+            </node>
+          </node>
         </node>
       </node>
       <node concept="1E1JtD" id="NKt6ynvPIP" role="2G$12L">
@@ -1735,17 +1762,6 @@
             </node>
           </node>
         </node>
-        <node concept="1SiIV0" id="2CPBoDB0OQY" role="3bR37C">
-          <node concept="3bR9La" id="2CPBoDB0OQZ" role="1SiIV1">
-            <property role="3bR36h" value="true" />
-            <ref role="3bR37D" node="7BVjoXzUx$V" resolve="jetbrains.mps.logic.runtime" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="2CPBoDB0OR0" role="3bR37C">
-          <node concept="3bR9La" id="2CPBoDB0OR1" role="1SiIV1">
-            <ref role="3bR37D" node="7BVjoXzUx9d" resolve="jetbrains.mps.lang.coderules.template" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="2CPBoDB0OR2" role="3bR37C">
           <node concept="3bR9La" id="2CPBoDB0OR3" role="1SiIV1">
             <ref role="3bR37D" to="ffeo:1TaHNgiIbJb" resolve="MPS.Platform" />
@@ -1756,11 +1772,6 @@
             <ref role="3bR37D" node="46o4wsH5PJF" resolve="jetbrains.mps.typechecking.annotation" />
           </node>
         </node>
-        <node concept="1SiIV0" id="2CPBoDB0OR6" role="3bR37C">
-          <node concept="3bR9La" id="2CPBoDB0OR7" role="1SiIV1">
-            <ref role="3bR37D" node="5wYq9r5EBDN" resolve="jetbrains.mps.coderules.runtime" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="2CPBoDB0ORa" role="3bR37C">
           <node concept="3bR9La" id="2CPBoDB0ORb" role="1SiIV1">
             <ref role="3bR37D" to="ffeo:7Kfy9QB6Lc2" resolve="jetbrains.mps.lang.typesystem" />
@@ -1871,6 +1882,11 @@
             <ref role="3bR37D" to="ffeo:4m1I2e4jdlp" resolve="MPS.Boot" />
           </node>
         </node>
+        <node concept="1SiIV0" id="4HQe0WHvAzS" role="3bR37C">
+          <node concept="3bR9La" id="4HQe0WHvAzT" role="1SiIV1">
+            <ref role="3bR37D" node="7BVjoXzUxoR" resolve="jetbrains.mps.logic.reactor" />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2G$12M" id="5pz4PwHqqGu" role="3989C9">
@@ -1965,26 +1981,6 @@
             </node>
           </node>
         </node>
-        <node concept="1SiIV0" id="4XsNDZX1ud4" role="3bR37C">
-          <node concept="3bR9La" id="4XsNDZX1ud5" role="1SiIV1">
-            <ref role="3bR37D" node="7BVjoXzUx$V" resolve="jetbrains.mps.logic.runtime" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="4XsNDZX1ud6" role="3bR37C">
-          <node concept="3bR9La" id="4XsNDZX1ud7" role="1SiIV1">
-            <ref role="3bR37D" node="7BVjoXzUx9d" resolve="jetbrains.mps.lang.coderules.template" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="4XsNDZX1ud8" role="3bR37C">
-          <node concept="3bR9La" id="4XsNDZX1ud9" role="1SiIV1">
-            <ref role="3bR37D" to="ffeo:ymnOULAU0H" resolve="jetbrains.mps.lang.test" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="4XsNDZX1uda" role="3bR37C">
-          <node concept="3bR9La" id="4XsNDZX1udb" role="1SiIV1">
-            <ref role="3bR37D" node="5wYq9r5EBDN" resolve="jetbrains.mps.coderules.runtime" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="4XsNDZX1ude" role="3bR37C">
           <node concept="3bR9La" id="4XsNDZX1udf" role="1SiIV1">
             <ref role="3bR37D" to="ffeo:1H905DlDUSw" resolve="MPS.OpenAPI" />
@@ -2116,11 +2112,6 @@
             </node>
           </node>
         </node>
-        <node concept="1SiIV0" id="7mB3viLurcE" role="3bR37C">
-          <node concept="3bR9La" id="7mB3viLurcF" role="1SiIV1">
-            <ref role="3bR37D" node="7mB3viLuogo" resolve="jetbrains.mps.typechecking.testlang" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="72RDgIN6UHs" role="3bR37C">
           <node concept="3bR9La" id="72RDgIN6UHt" role="1SiIV1">
             <ref role="3bR37D" to="ffeo:1TaHNgiIbIZ" resolve="MPS.Editor" />
@@ -2169,16 +2160,16 @@
             </node>
           </node>
         </node>
-        <node concept="1SiIV0" id="2A2kySre4JI" role="3bR37C">
-          <node concept="3bR9La" id="2A2kySre4JJ" role="1SiIV1">
-            <ref role="3bR37D" node="5XWz8xxbp0o" resolve="jetbrains.mps.lang.types" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="2CPBoDB0P1Q" role="3bR37C">
           <node concept="3bR9La" id="2CPBoDB0P1R" role="1SiIV1">
             <ref role="3bR37D" node="2CPBoDB0Mtg" resolve="jetbrains.mps.coderules.typechecking" />
           </node>
         </node>
+        <node concept="1SiIV0" id="74$3PKn$Ukk" role="3bR37C">
+          <node concept="3bR9La" id="74$3PKn$Ukl" role="1SiIV1">
+            <ref role="3bR37D" node="74$3PKm_L$v" resolve="jetbrains.mps.logic.runtime" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtA" id="7mB3viLuq51" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -2266,11 +2257,6 @@
             <ref role="3bR37D" to="ffeo:1H905DlDUSw" resolve="MPS.OpenAPI" />
           </node>
         </node>
-        <node concept="1SiIV0" id="7mB3viLwHzV" role="3bR37C">
-          <node concept="3bR9La" id="7mB3viLwHzW" role="1SiIV1">
-            <ref role="3bR37D" node="7BVjoXzUx$V" resolve="jetbrains.mps.logic.runtime" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="7mB3viLwHzX" role="3bR37C">
           <node concept="3bR9La" id="7mB3viLwHzY" role="1SiIV1">
             <ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
@@ -2301,27 +2287,12 @@
             <ref role="3bR37D" node="7Ant4WkHLpd" resolve="jetbrains.mps.logic.test" />
           </node>
         </node>
-        <node concept="1SiIV0" id="6gZak$ALJS1" role="3bR37C">
-          <node concept="3bR9La" id="6gZak$ALJS2" role="1SiIV1">
-            <ref role="3bR37D" to="ffeo:7Kfy9QB6KXW" resolve="jetbrains.mps.lang.core" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="3czCaDuZESi" role="3bR37C">
           <node concept="3bR9La" id="3czCaDuZESj" role="1SiIV1">
             <property role="3bR36h" value="true" />
             <ref role="3bR37D" node="7BVjoXzUxee" resolve="jetbrains.mps.lang.coderules.runtime" />
           </node>
         </node>
-        <node concept="1SiIV0" id="Jfcwnvu3hk" role="3bR37C">
-          <node concept="3bR9La" id="Jfcwnvu3hl" role="1SiIV1">
-            <ref role="3bR37D" to="ffeo:7Kfy9QB6KYb" resolve="jetbrains.mps.baseLanguage" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="Jfcwnvu3hm" role="3bR37C">
-          <node concept="3bR9La" id="Jfcwnvu3hn" role="1SiIV1">
-            <ref role="3bR37D" node="7BVjoXzUx6U" resolve="jetbrains.mps.lang.coderules" />
-          </node>
-        </node>
         <node concept="1BupzO" id="7zIaasjWoSy" role="3bR31x">
           <property role="3ZfqAx" value="models" />
           <property role="1Hdu6h" value="true" />
@@ -2365,16 +2336,6 @@
             </node>
           </node>
         </node>
-        <node concept="1SiIV0" id="7TC1Xcd_mmV" role="3bR37C">
-          <node concept="3bR9La" id="7TC1Xcd_mmW" role="1SiIV1">
-            <ref role="3bR37D" node="5wYq9r5EBDN" resolve="jetbrains.mps.coderules.runtime" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="2Qsys8cJfZM" role="3bR37C">
-          <node concept="3bR9La" id="2Qsys8cJfZN" role="1SiIV1">
-            <ref role="3bR37D" to="ffeo:7Kfy9QB6Lc2" resolve="jetbrains.mps.lang.typesystem" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="61G6TdCC7yR" role="3bR37C">
           <node concept="3bR9La" id="61G6TdCC7yS" role="1SiIV1">
             <ref role="3bR37D" node="NKt6yn9_8p" resolve="jetbrains.mps.coderules" />
@@ -2385,348 +2346,20 @@
             <ref role="3bR37D" node="7BVjoXzUxoR" resolve="jetbrains.mps.logic.reactor" />
           </node>
         </node>
-        <node concept="1SiIV0" id="5SC$dmoIokH" role="3bR37C">
-          <node concept="3bR9La" id="5SC$dmoIokI" role="1SiIV1">
-            <ref role="3bR37D" to="ffeo:ymnOULAU0H" resolve="jetbrains.mps.lang.test" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="4XsNDZX1um2" role="3bR37C">
-          <node concept="3bR9La" id="4XsNDZX1um3" role="1SiIV1">
-            <ref role="3bR37D" node="4XsNDZX1tUA" resolve="jetbrains.mps.coderules.testhelper" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="2CPBoDB0P2o" role="3bR37C">
           <node concept="3bR9La" id="2CPBoDB0P2p" role="1SiIV1">
             <ref role="3bR37D" node="2CPBoDB0Mtg" resolve="jetbrains.mps.coderules.typechecking" />
           </node>
         </node>
+        <node concept="1SiIV0" id="74$3PKm_LPc" role="3bR37C">
+          <node concept="3bR9La" id="74$3PKm_LPd" role="1SiIV1">
+            <ref role="3bR37D" node="74$3PKm_L$v" resolve="jetbrains.mps.logic.runtime" />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2G$12M" id="7BVjoXzUx6$" role="3989C9">
       <property role="TrG5h" value="coderules" />
-      <node concept="1E1JtD" id="7BVjoXzUx6U" role="2G$12L">
-        <property role="BnDLt" value="true" />
-        <property role="TrG5h" value="jetbrains.mps.lang.coderules" />
-        <property role="3LESm3" value="c4803b19-6d89-4a3b-bf82-390769514add" />
-        <node concept="55IIr" id="7BVjoXzUx7_" role="3LF7KH">
-          <node concept="2Ry0Ak" id="7BVjoXzUx7F" role="iGT6I">
-            <property role="2Ry0Am" value="coderules" />
-            <node concept="2Ry0Ak" id="7BVjoXzUx7K" role="2Ry0An">
-              <property role="2Ry0Am" value="languages" />
-              <node concept="2Ry0Ak" id="7BVjoXzUx7P" role="2Ry0An">
-                <property role="2Ry0Am" value="jetbrains.mps.lang.coderules" />
-                <node concept="2Ry0Ak" id="5RIBdO$kQZz" role="2Ry0An">
-                  <property role="2Ry0Am" value="jetbrains.mps.lang.coderules.mpl" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="7BVjoXzUxWn" role="3bR37C">
-          <node concept="3bR9La" id="7BVjoXzUxWo" role="1SiIV1">
-            <ref role="3bR37D" node="7BVjoXzUx9d" resolve="jetbrains.mps.lang.coderules.template" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="7BVjoXzUxWr" role="3bR37C">
-          <node concept="3bR9La" id="7BVjoXzUxWs" role="1SiIV1">
-            <ref role="3bR37D" to="ffeo:7Kfy9QB6LaO" resolve="jetbrains.mps.lang.structure" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="7BVjoXzUxWt" role="3bR37C">
-          <node concept="3bR9La" id="7BVjoXzUxWu" role="1SiIV1">
-            <ref role="3bR37D" to="ffeo:1H905DlDUSw" resolve="MPS.OpenAPI" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="7BVjoXzUxWx" role="3bR37C">
-          <node concept="3bR9La" id="7BVjoXzUxWy" role="1SiIV1">
-            <ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="7BVjoXzUxWD" role="3bR37C">
-          <node concept="3bR9La" id="7BVjoXzUxWE" role="1SiIV1">
-            <ref role="3bR37D" to="ffeo:7Kfy9QB6LfQ" resolve="jetbrains.mps.kernel" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="7BVjoXzUxWF" role="3bR37C">
-          <node concept="3bR9La" id="7BVjoXzUxWG" role="1SiIV1">
-            <ref role="3bR37D" to="ffeo:1TaHNgiIbIQ" resolve="MPS.Core" />
-          </node>
-        </node>
-        <node concept="1E0d5M" id="7BVjoXzUxWL" role="1E1XAP">
-          <ref role="1E0d5P" node="7BVjoXzUxee" resolve="jetbrains.mps.lang.coderules.runtime" />
-        </node>
-        <node concept="1E0d5M" id="7BVjoXzUxWM" role="1E1XAP">
-          <ref role="1E0d5P" node="7BVjoXzUx9d" resolve="jetbrains.mps.lang.coderules.template" />
-        </node>
-        <node concept="1SiIV0" id="7BVjoXzUxWN" role="3bR37C">
-          <node concept="1Busua" id="7BVjoXzUxWO" role="1SiIV1">
-            <ref role="1Busuk" node="7BVjoXzUxkQ" resolve="jetbrains.mps.logic" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="7BVjoXzUxWP" role="3bR37C">
-          <node concept="1Busua" id="7BVjoXzUxWQ" role="1SiIV1">
-            <ref role="1Busuk" to="ffeo:7Kfy9QB6L9O" resolve="jetbrains.mps.lang.smodel" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="7BVjoXzUxWR" role="3bR37C">
-          <node concept="1Busua" id="7BVjoXzUxWS" role="1SiIV1">
-            <ref role="1Busuk" to="ffeo:7Kfy9QB6L0h" resolve="jetbrains.mps.baseLanguage.collections" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="7BVjoXzUxWT" role="3bR37C">
-          <node concept="1Busua" id="7BVjoXzUxWU" role="1SiIV1">
-            <ref role="1Busuk" to="ffeo:7Kfy9QB6KYb" resolve="jetbrains.mps.baseLanguage" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="7BVjoXzUxWV" role="3bR37C">
-          <node concept="1Busua" id="7BVjoXzUxWW" role="1SiIV1">
-            <ref role="1Busuk" to="ffeo:7Kfy9QB6L68" resolve="jetbrains.mps.lang.descriptor" />
-          </node>
-        </node>
-        <node concept="1yeLz9" id="7BVjoXzUxWX" role="1TViLv">
-          <property role="TrG5h" value="jetbrains.mps.lang.coderules#4578927328670739933" />
-          <property role="3LESm3" value="21d5540d-cd6b-44dd-b6ab-6835bf032803" />
-          <node concept="1SiIV0" id="7BVjoXzUxWY" role="3bR37C">
-            <node concept="3bR9La" id="7BVjoXzUxWZ" role="1SiIV1">
-              <ref role="3bR37D" node="7BVjoXzUx$V" resolve="jetbrains.mps.logic.runtime" />
-            </node>
-          </node>
-          <node concept="1SiIV0" id="7BVjoXzUxX0" role="3bR37C">
-            <node concept="3bR9La" id="7BVjoXzUxX1" role="1SiIV1">
-              <ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
-            </node>
-          </node>
-          <node concept="1SiIV0" id="7BVjoXzUxX2" role="3bR37C">
-            <node concept="3bR9La" id="7BVjoXzUxX3" role="1SiIV1">
-              <property role="3bR36h" value="true" />
-              <ref role="3bR37D" node="7BVjoXzUxoR" resolve="jetbrains.mps.logic.reactor" />
-            </node>
-          </node>
-          <node concept="1SiIV0" id="7BVjoXzUxX8" role="3bR37C">
-            <node concept="3bR9La" id="7BVjoXzUxX9" role="1SiIV1">
-              <property role="3bR36h" value="true" />
-              <ref role="3bR37D" node="7BVjoXzUxee" resolve="jetbrains.mps.lang.coderules.runtime" />
-            </node>
-          </node>
-          <node concept="1SiIV0" id="4pNU3yqbxFQ" role="3bR37C">
-            <node concept="3bR9La" id="4pNU3yqbxFR" role="1SiIV1">
-              <property role="3bR36h" value="true" />
-              <ref role="3bR37D" node="7BVjoXzUx9d" resolve="jetbrains.mps.lang.coderules.template" />
-            </node>
-          </node>
-          <node concept="1SiIV0" id="72RDgINuysr" role="3bR37C">
-            <node concept="3bR9La" id="72RDgINuyss" role="1SiIV1">
-              <ref role="3bR37D" to="ffeo:1H905DlDUSw" resolve="MPS.OpenAPI" />
-            </node>
-          </node>
-          <node concept="1SiIV0" id="3mytCjZ2GFM" role="3bR37C">
-            <node concept="3bR9La" id="3mytCjZ2GFN" role="1SiIV1">
-              <ref role="3bR37D" to="ffeo:7Kfy9QB6Lg8" resolve="jetbrains.mps.runtime" />
-            </node>
-          </node>
-          <node concept="1BupzO" id="7zIaasjWoU1" role="3bR31x">
-            <property role="3ZfqAx" value="generator/template" />
-            <property role="1Hdu6h" value="true" />
-            <property role="1HemKv" value="true" />
-            <node concept="3LXTmp" id="7zIaasjWoU2" role="1HemKq">
-              <node concept="398BVA" id="7zIaasjWoTP" role="3LXTmr">
-                <ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.coderules_home" />
-                <node concept="2Ry0Ak" id="7zIaasjWoTQ" role="iGT6I">
-                  <property role="2Ry0Am" value="coderules" />
-                  <node concept="2Ry0Ak" id="7zIaasjWoTR" role="2Ry0An">
-                    <property role="2Ry0Am" value="languages" />
-                    <node concept="2Ry0Ak" id="7zIaasjWoTS" role="2Ry0An">
-                      <property role="2Ry0Am" value="jetbrains.mps.lang.coderules" />
-                      <node concept="2Ry0Ak" id="7zIaasjWoTT" role="2Ry0An">
-                        <property role="2Ry0Am" value="generator" />
-                        <node concept="2Ry0Ak" id="7zIaasjWoTU" role="2Ry0An">
-                          <property role="2Ry0Am" value="template" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3qWCbU" id="7zIaasjWoU3" role="3LXTna">
-                <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
-              </node>
-            </node>
-          </node>
-          <node concept="1SiIV0" id="5XWz8xxb9yV" role="3bR37C">
-            <node concept="3bR9La" id="5XWz8xxb9yW" role="1SiIV1">
-              <ref role="3bR37D" to="ffeo:7Kfy9QB6KYb" resolve="jetbrains.mps.baseLanguage" />
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="wfREvqj2G8" role="3bR37C">
-          <node concept="3bR9La" id="wfREvqj2G9" role="1SiIV1">
-            <ref role="3bR37D" node="7BVjoXzUxoR" resolve="jetbrains.mps.logic.reactor" />
-          </node>
-        </node>
-        <node concept="3rtmxn" id="3Z6zOnxMpyH" role="3bR31x">
-          <node concept="3LXTmp" id="3Z6zOnxMpyI" role="3rtmxm">
-            <node concept="3qWCbU" id="3Z6zOnxMpyJ" role="3LXTna">
-              <property role="3qWCbO" value="icons/**, resources/**" />
-            </node>
-            <node concept="55IIr" id="3Z6zOnxMpyK" role="3LXTmr">
-              <node concept="2Ry0Ak" id="3Z6zOnxMpyL" role="iGT6I">
-                <property role="2Ry0Am" value="coderules" />
-                <node concept="2Ry0Ak" id="3Z6zOnxMpyM" role="2Ry0An">
-                  <property role="2Ry0Am" value="languages" />
-                  <node concept="2Ry0Ak" id="5mkBzAMMrGr" role="2Ry0An">
-                    <property role="2Ry0Am" value="jetbrains.mps.lang.coderules" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1BupzO" id="7zIaasjWoTM" role="3bR31x">
-          <property role="3ZfqAx" value="languageModels" />
-          <property role="1Hdu6h" value="true" />
-          <property role="1HemKv" value="true" />
-          <node concept="3LXTmp" id="7zIaasjWoTN" role="1HemKq">
-            <node concept="398BVA" id="7zIaasjWoTC" role="3LXTmr">
-              <ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.coderules_home" />
-              <node concept="2Ry0Ak" id="7zIaasjWoTD" role="iGT6I">
-                <property role="2Ry0Am" value="coderules" />
-                <node concept="2Ry0Ak" id="7zIaasjWoTE" role="2Ry0An">
-                  <property role="2Ry0Am" value="languages" />
-                  <node concept="2Ry0Ak" id="7zIaasjWoTF" role="2Ry0An">
-                    <property role="2Ry0Am" value="jetbrains.mps.lang.coderules" />
-                    <node concept="2Ry0Ak" id="7zIaasjWoTG" role="2Ry0An">
-                      <property role="2Ry0Am" value="languageModels" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3qWCbU" id="7zIaasjWoTO" role="3LXTna">
-              <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="7L5omgeIJmg" role="3bR37C">
-          <node concept="3bR9La" id="7L5omgeIJmh" role="1SiIV1">
-            <ref role="3bR37D" node="7BVjoXzUx$V" resolve="jetbrains.mps.logic.runtime" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="5HVB6JRnetC" role="3bR37C">
-          <node concept="3bR9La" id="5HVB6JRnetD" role="1SiIV1">
-            <ref role="3bR37D" to="ffeo:7Kfy9QB6KZG" resolve="jetbrains.mps.baseLanguage.closures" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="4JDHh1c5iYO" role="3bR37C">
-          <node concept="3bR9La" id="4JDHh1c5iYP" role="1SiIV1">
-            <ref role="3bR37D" to="ffeo:5cCcm$KATVz" resolve="jetbrains.mps.lang.migration.runtime" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="3swcsd2r5SU" role="3bR37C">
-          <node concept="3bR9La" id="3swcsd2r5SV" role="1SiIV1">
-            <ref role="3bR37D" to="ffeo:3MI1gu0QouH" resolve="jetbrains.mps.editor.runtime" />
-          </node>
-        </node>
-      </node>
-      <node concept="1E1JtA" id="7BVjoXzUx9d" role="2G$12L">
-        <property role="BnDLt" value="true" />
-        <property role="TrG5h" value="jetbrains.mps.lang.coderules.template" />
-        <property role="3LESm3" value="ff6372a2-2f45-4ec3-952b-02581666015f" />
-        <node concept="55IIr" id="7BVjoXzUx9g" role="3LF7KH">
-          <node concept="2Ry0Ak" id="7BVjoXzUx9P" role="iGT6I">
-            <property role="2Ry0Am" value="coderules" />
-            <node concept="2Ry0Ak" id="7BVjoXzUxag" role="2Ry0An">
-              <property role="2Ry0Am" value="solutions" />
-              <node concept="2Ry0Ak" id="7BVjoXzUxav" role="2Ry0An">
-                <property role="2Ry0Am" value="jetbrains.mps.lang.coderules.template" />
-                <node concept="2Ry0Ak" id="5RIBdO$kRiZ" role="2Ry0An">
-                  <property role="2Ry0Am" value="jetbrains.mps.lang.coderules.template.msd" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="7BVjoXzUxhM" role="3bR37C">
-          <node concept="3bR9La" id="7BVjoXzUxhN" role="1SiIV1">
-            <ref role="3bR37D" to="ffeo:1H905DlDUSw" resolve="MPS.OpenAPI" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="7BVjoXzUxXc" role="3bR37C">
-          <node concept="3bR9La" id="7BVjoXzUxXd" role="1SiIV1">
-            <property role="3bR36h" value="true" />
-            <ref role="3bR37D" node="7BVjoXzUx$V" resolve="jetbrains.mps.logic.runtime" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="7BVjoXzUxXe" role="3bR37C">
-          <node concept="3bR9La" id="7BVjoXzUxXf" role="1SiIV1">
-            <ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="7BVjoXzUxXk" role="3bR37C">
-          <node concept="3bR9La" id="7BVjoXzUxXl" role="1SiIV1">
-            <property role="3bR36h" value="true" />
-            <ref role="3bR37D" to="ffeo:1TaHNgiIbIQ" resolve="MPS.Core" />
-          </node>
-        </node>
-        <node concept="3rtmxn" id="3Z6zOnxMpzd" role="3bR31x">
-          <node concept="3LXTmp" id="3Z6zOnxMpze" role="3rtmxm">
-            <node concept="3qWCbU" id="3Z6zOnxMpzf" role="3LXTna">
-              <property role="3qWCbO" value="icons/**, resources/**" />
-            </node>
-            <node concept="55IIr" id="3Z6zOnxMpzg" role="3LXTmr">
-              <node concept="2Ry0Ak" id="3Z6zOnxMpzh" role="iGT6I">
-                <property role="2Ry0Am" value="coderules" />
-                <node concept="2Ry0Ak" id="3Z6zOnxMpzi" role="2Ry0An">
-                  <property role="2Ry0Am" value="solutions" />
-                  <node concept="2Ry0Ak" id="5mkBzAMMsjr" role="2Ry0An">
-                    <property role="2Ry0Am" value="jetbrains.mps.lang.coderules.template" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="4cvvxaYkWvj" role="3bR37C">
-          <node concept="3bR9La" id="4cvvxaYkWvk" role="1SiIV1">
-            <property role="3bR36h" value="true" />
-            <ref role="3bR37D" node="7BVjoXzUxoR" resolve="jetbrains.mps.logic.reactor" />
-          </node>
-        </node>
-        <node concept="1BupzO" id="7zIaasjWoUe" role="3bR31x">
-          <property role="3ZfqAx" value="models" />
-          <property role="1Hdu6h" value="true" />
-          <property role="1HemKv" value="true" />
-          <node concept="3LXTmp" id="7zIaasjWoUf" role="1HemKq">
-            <node concept="398BVA" id="7zIaasjWoU4" role="3LXTmr">
-              <ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.coderules_home" />
-              <node concept="2Ry0Ak" id="7zIaasjWoU5" role="iGT6I">
-                <property role="2Ry0Am" value="coderules" />
-                <node concept="2Ry0Ak" id="7zIaasjWoU6" role="2Ry0An">
-                  <property role="2Ry0Am" value="solutions" />
-                  <node concept="2Ry0Ak" id="7zIaasjWoU7" role="2Ry0An">
-                    <property role="2Ry0Am" value="jetbrains.mps.lang.coderules.template" />
-                    <node concept="2Ry0Ak" id="7zIaasjWoU8" role="2Ry0An">
-                      <property role="2Ry0Am" value="models" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3qWCbU" id="7zIaasjWoUg" role="3LXTna">
-              <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="5HVB6JRneu0" role="3bR37C">
-          <node concept="3bR9La" id="5HVB6JRneu1" role="1SiIV1">
-            <ref role="3bR37D" node="5wYq9r5EBDN" resolve="jetbrains.mps.coderules.runtime" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="IFW4V2Rmqp" role="3bR37C">
-          <node concept="3bR9La" id="IFW4V2Rmqq" role="1SiIV1">
-            <ref role="3bR37D" to="ffeo:44LXwdzyvTi" resolve="Annotations" />
-          </node>
-        </node>
-      </node>
       <node concept="1E1JtA" id="7BVjoXzUxee" role="2G$12L">
         <property role="BnDLt" value="true" />
         <property role="TrG5h" value="jetbrains.mps.lang.coderules.runtime" />
@@ -2753,18 +2386,6 @@
             <ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
           </node>
         </node>
-        <node concept="1SiIV0" id="7BVjoXzUxXt" role="3bR37C">
-          <node concept="3bR9La" id="7BVjoXzUxXu" role="1SiIV1">
-            <property role="3bR36h" value="true" />
-            <ref role="3bR37D" node="7BVjoXzUx$V" resolve="jetbrains.mps.logic.runtime" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="7BVjoXzUxXz" role="3bR37C">
-          <node concept="3bR9La" id="7BVjoXzUxX$" role="1SiIV1">
-            <property role="3bR36h" value="true" />
-            <ref role="3bR37D" node="7BVjoXzUx9d" resolve="jetbrains.mps.lang.coderules.template" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="3u5wJtgkkt" role="3bR37C">
           <node concept="3bR9La" id="3u5wJtgkku" role="1SiIV1">
             <ref role="3bR37D" to="ffeo:1H905DlDUSw" resolve="MPS.OpenAPI" />
@@ -2829,81 +2450,19 @@
             </node>
           </node>
         </node>
-        <node concept="1SiIV0" id="5wYq9r5EEqx" role="3bR37C">
-          <node concept="3bR9La" id="5wYq9r5EEqy" role="1SiIV1">
-            <ref role="3bR37D" node="5wYq9r5EBDN" resolve="jetbrains.mps.coderules.runtime" />
+        <node concept="1SiIV0" id="4HQe0WHvA_2" role="3bR37C">
+          <node concept="3bR9La" id="4HQe0WHvA_3" role="1SiIV1">
+            <ref role="3bR37D" node="7BVjoXzUxoR" resolve="jetbrains.mps.logic.reactor" />
           </node>
         </node>
-      </node>
-      <node concept="1E1JtA" id="5wYq9r5EBDN" role="2G$12L">
-        <property role="BnDLt" value="true" />
-        <property role="TrG5h" value="jetbrains.mps.coderules.runtime" />
-        <property role="3LESm3" value="f113d56b-63e3-4120-a89c-2f5dcb8c6290" />
-        <node concept="55IIr" id="5wYq9r5EBDO" role="3LF7KH">
-          <node concept="2Ry0Ak" id="5wYq9r5EALQ" role="iGT6I">
-            <property role="2Ry0Am" value="coderules" />
-            <node concept="2Ry0Ak" id="5wYq9r5EAZT" role="2Ry0An">
-              <property role="2Ry0Am" value="solutions" />
-              <node concept="2Ry0Ak" id="5wYq9r5EB1Q" role="2Ry0An">
-                <property role="2Ry0Am" value="jetbrains.mps.coderules.runtime" />
-                <node concept="2Ry0Ak" id="5wYq9r5EB3N" role="2Ry0An">
-                  <property role="2Ry0Am" value="jetbrains.mps.coderules.runtime.msd" />
-                </node>
-              </node>
-            </node>
+        <node concept="1SiIV0" id="4HQe0WHvA_4" role="3bR37C">
+          <node concept="3bR9La" id="4HQe0WHvA_5" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:7Kfy9QB6Lg8" resolve="jetbrains.mps.runtime" />
           </node>
         </node>
-        <node concept="1BupzO" id="5wYq9r5EB9P" role="3bR31x">
-          <property role="3ZfqAx" value="models" />
-          <property role="1Hdu6h" value="true" />
-          <property role="1HemKv" value="true" />
-          <node concept="3LXTmp" id="5wYq9r5EB9Q" role="1HemKq">
-            <node concept="398BVA" id="5wYq9r5EB9F" role="3LXTmr">
-              <ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.coderules_home" />
-              <node concept="2Ry0Ak" id="5wYq9r5EB9G" role="iGT6I">
-                <property role="2Ry0Am" value="coderules" />
-                <node concept="2Ry0Ak" id="5wYq9r5EB9H" role="2Ry0An">
-                  <property role="2Ry0Am" value="solutions" />
-                  <node concept="2Ry0Ak" id="5wYq9r5EB9I" role="2Ry0An">
-                    <property role="2Ry0Am" value="jetbrains.mps.coderules.runtime" />
-                    <node concept="2Ry0Ak" id="5wYq9r5EB9J" role="2Ry0An">
-                      <property role="2Ry0Am" value="models" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3qWCbU" id="5wYq9r5EB9R" role="3LXTna">
-              <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="5wYq9r5EEqJ" role="3bR37C">
-          <node concept="3bR9La" id="5wYq9r5EEqK" role="1SiIV1">
-            <ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="5wYq9r5EEqL" role="3bR37C">
-          <node concept="3bR9La" id="5wYq9r5EEqM" role="1SiIV1">
-            <ref role="3bR37D" to="ffeo:1TaHNgiIbIQ" resolve="MPS.Core" />
-          </node>
-        </node>
-        <node concept="3rtmxn" id="4XonyipwPR3" role="3bR31x">
-          <node concept="3LXTmp" id="4XonyipwPR4" role="3rtmxm">
-            <node concept="3qWCbU" id="4XonyipwPR5" role="3LXTna">
-              <property role="3qWCbO" value="icons/**, resources/**" />
-            </node>
-            <node concept="55IIr" id="4XonyipwPR6" role="3LXTmr">
-              <node concept="2Ry0Ak" id="4XonyipwPR7" role="iGT6I">
-                <property role="2Ry0Am" value="coderules" />
-                <node concept="2Ry0Ak" id="4XonyipwPR8" role="2Ry0An">
-                  <property role="2Ry0Am" value="solutions" />
-                  <node concept="2Ry0Ak" id="4XonyipwPR9" role="2Ry0An">
-                    <property role="2Ry0Am" value="jetbrains.mps.coderules.runtime" />
-                  </node>
-                </node>
-              </node>
-            </node>
+        <node concept="1SiIV0" id="74$3PKm_LPo" role="3bR37C">
+          <node concept="3bR9La" id="74$3PKm_LPp" role="1SiIV1">
+            <ref role="3bR37D" node="74$3PKm_L$v" resolve="jetbrains.mps.logic.runtime" />
           </node>
         </node>
       </node>
@@ -3065,17 +2624,21 @@
             </node>
           </node>
         </node>
-        <node concept="1SiIV0" id="5wYq9r5URUd" role="3bR37C">
-          <node concept="3bR9La" id="5wYq9r5URUe" role="1SiIV1">
-            <property role="3bR36h" value="true" />
-            <ref role="3bR37D" node="5wYq9r5EBDN" resolve="jetbrains.mps.coderules.runtime" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="5u1SQ54mIZF" role="3bR37C">
           <node concept="3bR9La" id="5u1SQ54mIZG" role="1SiIV1">
             <ref role="3bR37D" node="2CPBoDB0Mtg" resolve="jetbrains.mps.coderules.typechecking" />
           </node>
         </node>
+        <node concept="1SiIV0" id="4HQe0WHvA_i" role="3bR37C">
+          <node concept="3bR9La" id="4HQe0WHvA_j" role="1SiIV1">
+            <ref role="3bR37D" node="7BVjoXzUxoR" resolve="jetbrains.mps.logic.reactor" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="74$3PKm_LPA" role="3bR37C">
+          <node concept="3bR9La" id="74$3PKm_LPB" role="1SiIV1">
+            <ref role="3bR37D" node="74$3PKm_L$v" resolve="jetbrains.mps.logic.runtime" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtA" id="6Yb9hAqy9L2" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -3122,12 +2685,6 @@
             <ref role="3bR37D" to="ffeo:1TaHNgiIbIQ" resolve="MPS.Core" />
           </node>
         </node>
-        <node concept="1SiIV0" id="6Yb9hAqE1Ea" role="3bR37C">
-          <node concept="3bR9La" id="6Yb9hAqE1Eb" role="1SiIV1">
-            <property role="3bR36h" value="true" />
-            <ref role="3bR37D" node="7BVjoXzUx$V" resolve="jetbrains.mps.logic.runtime" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="2acLaGi2utJ" role="3bR37C">
           <node concept="3bR9La" id="2acLaGi2utK" role="1SiIV1">
             <property role="3bR36h" value="true" />
@@ -3188,15 +2745,234 @@
             <ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
           </node>
         </node>
+        <node concept="1SiIV0" id="4HQe0WHvAA2" role="3bR37C">
+          <node concept="3bR9La" id="4HQe0WHvAA3" role="1SiIV1">
+            <ref role="3bR37D" node="7BVjoXzUxoR" resolve="jetbrains.mps.logic.reactor" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="74$3PKm_LQm" role="3bR37C">
+          <node concept="3bR9La" id="74$3PKm_LQn" role="1SiIV1">
+            <ref role="3bR37D" node="74$3PKm_L$v" resolve="jetbrains.mps.logic.runtime" />
+          </node>
+        </node>
+      </node>
+      <node concept="1E1JtD" id="7BVjoXzUx6U" role="2G$12L">
+        <property role="BnDLt" value="true" />
+        <property role="TrG5h" value="jetbrains.mps.lang.coderules" />
+        <property role="3LESm3" value="c4803b19-6d89-4a3b-bf82-390769514add" />
+        <node concept="55IIr" id="7BVjoXzUx7_" role="3LF7KH">
+          <node concept="2Ry0Ak" id="7BVjoXzUx7F" role="iGT6I">
+            <property role="2Ry0Am" value="coderules" />
+            <node concept="2Ry0Ak" id="7BVjoXzUx7K" role="2Ry0An">
+              <property role="2Ry0Am" value="languages" />
+              <node concept="2Ry0Ak" id="7BVjoXzUx7P" role="2Ry0An">
+                <property role="2Ry0Am" value="jetbrains.mps.lang.coderules" />
+                <node concept="2Ry0Ak" id="5RIBdO$kQZz" role="2Ry0An">
+                  <property role="2Ry0Am" value="jetbrains.mps.lang.coderules.mpl" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1SiIV0" id="7BVjoXzUxWr" role="3bR37C">
+          <node concept="3bR9La" id="7BVjoXzUxWs" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:7Kfy9QB6LaO" resolve="jetbrains.mps.lang.structure" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="7BVjoXzUxWt" role="3bR37C">
+          <node concept="3bR9La" id="7BVjoXzUxWu" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:1H905DlDUSw" resolve="MPS.OpenAPI" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="7BVjoXzUxWx" role="3bR37C">
+          <node concept="3bR9La" id="7BVjoXzUxWy" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="7BVjoXzUxWD" role="3bR37C">
+          <node concept="3bR9La" id="7BVjoXzUxWE" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:7Kfy9QB6LfQ" resolve="jetbrains.mps.kernel" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="7BVjoXzUxWF" role="3bR37C">
+          <node concept="3bR9La" id="7BVjoXzUxWG" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:1TaHNgiIbIQ" resolve="MPS.Core" />
+          </node>
+        </node>
+        <node concept="1E0d5M" id="7BVjoXzUxWL" role="1E1XAP">
+          <ref role="1E0d5P" node="7BVjoXzUxee" resolve="jetbrains.mps.lang.coderules.runtime" />
+        </node>
+        <node concept="1SiIV0" id="7BVjoXzUxWN" role="3bR37C">
+          <node concept="1Busua" id="7BVjoXzUxWO" role="1SiIV1">
+            <ref role="1Busuk" node="7BVjoXzUxkQ" resolve="jetbrains.mps.logic" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="7BVjoXzUxWP" role="3bR37C">
+          <node concept="1Busua" id="7BVjoXzUxWQ" role="1SiIV1">
+            <ref role="1Busuk" to="ffeo:7Kfy9QB6L9O" resolve="jetbrains.mps.lang.smodel" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="7BVjoXzUxWR" role="3bR37C">
+          <node concept="1Busua" id="7BVjoXzUxWS" role="1SiIV1">
+            <ref role="1Busuk" to="ffeo:7Kfy9QB6L0h" resolve="jetbrains.mps.baseLanguage.collections" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="7BVjoXzUxWT" role="3bR37C">
+          <node concept="1Busua" id="7BVjoXzUxWU" role="1SiIV1">
+            <ref role="1Busuk" to="ffeo:7Kfy9QB6KYb" resolve="jetbrains.mps.baseLanguage" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="7BVjoXzUxWV" role="3bR37C">
+          <node concept="1Busua" id="7BVjoXzUxWW" role="1SiIV1">
+            <ref role="1Busuk" to="ffeo:7Kfy9QB6L68" resolve="jetbrains.mps.lang.descriptor" />
+          </node>
+        </node>
+        <node concept="1yeLz9" id="7BVjoXzUxWX" role="1TViLv">
+          <property role="TrG5h" value="jetbrains.mps.lang.coderules#4578927328670739933" />
+          <property role="3LESm3" value="21d5540d-cd6b-44dd-b6ab-6835bf032803" />
+          <node concept="1SiIV0" id="7BVjoXzUxX0" role="3bR37C">
+            <node concept="3bR9La" id="7BVjoXzUxX1" role="1SiIV1">
+              <ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
+            </node>
+          </node>
+          <node concept="1SiIV0" id="7BVjoXzUxX2" role="3bR37C">
+            <node concept="3bR9La" id="7BVjoXzUxX3" role="1SiIV1">
+              <property role="3bR36h" value="true" />
+              <ref role="3bR37D" node="7BVjoXzUxoR" resolve="jetbrains.mps.logic.reactor" />
+            </node>
+          </node>
+          <node concept="1SiIV0" id="7BVjoXzUxX8" role="3bR37C">
+            <node concept="3bR9La" id="7BVjoXzUxX9" role="1SiIV1">
+              <property role="3bR36h" value="true" />
+              <ref role="3bR37D" node="7BVjoXzUxee" resolve="jetbrains.mps.lang.coderules.runtime" />
+            </node>
+          </node>
+          <node concept="1SiIV0" id="72RDgINuysr" role="3bR37C">
+            <node concept="3bR9La" id="72RDgINuyss" role="1SiIV1">
+              <ref role="3bR37D" to="ffeo:1H905DlDUSw" resolve="MPS.OpenAPI" />
+            </node>
+          </node>
+          <node concept="1SiIV0" id="3mytCjZ2GFM" role="3bR37C">
+            <node concept="3bR9La" id="3mytCjZ2GFN" role="1SiIV1">
+              <ref role="3bR37D" to="ffeo:7Kfy9QB6Lg8" resolve="jetbrains.mps.runtime" />
+            </node>
+          </node>
+          <node concept="1BupzO" id="7zIaasjWoU1" role="3bR31x">
+            <property role="3ZfqAx" value="generator/template" />
+            <property role="1Hdu6h" value="true" />
+            <property role="1HemKv" value="true" />
+            <node concept="3LXTmp" id="7zIaasjWoU2" role="1HemKq">
+              <node concept="398BVA" id="7zIaasjWoTP" role="3LXTmr">
+                <ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.coderules_home" />
+                <node concept="2Ry0Ak" id="7zIaasjWoTQ" role="iGT6I">
+                  <property role="2Ry0Am" value="coderules" />
+                  <node concept="2Ry0Ak" id="7zIaasjWoTR" role="2Ry0An">
+                    <property role="2Ry0Am" value="languages" />
+                    <node concept="2Ry0Ak" id="7zIaasjWoTS" role="2Ry0An">
+                      <property role="2Ry0Am" value="jetbrains.mps.lang.coderules" />
+                      <node concept="2Ry0Ak" id="7zIaasjWoTT" role="2Ry0An">
+                        <property role="2Ry0Am" value="generator" />
+                        <node concept="2Ry0Ak" id="7zIaasjWoTU" role="2Ry0An">
+                          <property role="2Ry0Am" value="template" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3qWCbU" id="7zIaasjWoU3" role="3LXTna">
+                <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
+              </node>
+            </node>
+          </node>
+          <node concept="1SiIV0" id="5XWz8xxb9yV" role="3bR37C">
+            <node concept="3bR9La" id="5XWz8xxb9yW" role="1SiIV1">
+              <ref role="3bR37D" to="ffeo:7Kfy9QB6KYb" resolve="jetbrains.mps.baseLanguage" />
+            </node>
+          </node>
+          <node concept="1SiIV0" id="74$3PKm_LQI" role="3bR37C">
+            <node concept="3bR9La" id="74$3PKm_LQJ" role="1SiIV1">
+              <ref role="3bR37D" node="74$3PKm_L$v" resolve="jetbrains.mps.logic.runtime" />
+            </node>
+          </node>
+        </node>
+        <node concept="3rtmxn" id="3Z6zOnxMpyH" role="3bR31x">
+          <node concept="3LXTmp" id="3Z6zOnxMpyI" role="3rtmxm">
+            <node concept="3qWCbU" id="3Z6zOnxMpyJ" role="3LXTna">
+              <property role="3qWCbO" value="icons/**, resources/**" />
+            </node>
+            <node concept="55IIr" id="3Z6zOnxMpyK" role="3LXTmr">
+              <node concept="2Ry0Ak" id="3Z6zOnxMpyL" role="iGT6I">
+                <property role="2Ry0Am" value="coderules" />
+                <node concept="2Ry0Ak" id="3Z6zOnxMpyM" role="2Ry0An">
+                  <property role="2Ry0Am" value="languages" />
+                  <node concept="2Ry0Ak" id="5mkBzAMMrGr" role="2Ry0An">
+                    <property role="2Ry0Am" value="jetbrains.mps.lang.coderules" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1BupzO" id="7zIaasjWoTM" role="3bR31x">
+          <property role="3ZfqAx" value="languageModels" />
+          <property role="1Hdu6h" value="true" />
+          <property role="1HemKv" value="true" />
+          <node concept="3LXTmp" id="7zIaasjWoTN" role="1HemKq">
+            <node concept="398BVA" id="7zIaasjWoTC" role="3LXTmr">
+              <ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.coderules_home" />
+              <node concept="2Ry0Ak" id="7zIaasjWoTD" role="iGT6I">
+                <property role="2Ry0Am" value="coderules" />
+                <node concept="2Ry0Ak" id="7zIaasjWoTE" role="2Ry0An">
+                  <property role="2Ry0Am" value="languages" />
+                  <node concept="2Ry0Ak" id="7zIaasjWoTF" role="2Ry0An">
+                    <property role="2Ry0Am" value="jetbrains.mps.lang.coderules" />
+                    <node concept="2Ry0Ak" id="7zIaasjWoTG" role="2Ry0An">
+                      <property role="2Ry0Am" value="languageModels" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3qWCbU" id="7zIaasjWoTO" role="3LXTna">
+              <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
+            </node>
+          </node>
+        </node>
+        <node concept="1SiIV0" id="5HVB6JRnetC" role="3bR37C">
+          <node concept="3bR9La" id="5HVB6JRnetD" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:7Kfy9QB6KZG" resolve="jetbrains.mps.baseLanguage.closures" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="3swcsd2r5SU" role="3bR37C">
+          <node concept="3bR9La" id="3swcsd2r5SV" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:3MI1gu0QouH" resolve="jetbrains.mps.editor.runtime" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="3DKqHDePCTg" role="3bR37C">
+          <node concept="3bR9La" id="3DKqHDePCTh" role="1SiIV1">
+            <ref role="3bR37D" node="7BVjoXzUxee" resolve="jetbrains.mps.lang.coderules.runtime" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="UFo5tZPJlZ" role="3bR37C">
+          <node concept="3bR9La" id="UFo5tZPJm0" role="1SiIV1">
+            <ref role="3bR37D" node="7BVjoXzUxoR" resolve="jetbrains.mps.logic.reactor" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="74$3PKm_LQy" role="3bR37C">
+          <node concept="3bR9La" id="74$3PKm_LQz" role="1SiIV1">
+            <ref role="3bR37D" node="74$3PKm_L$v" resolve="jetbrains.mps.logic.runtime" />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2G$12M" id="1Lr58WFO8Mc" role="3989C9">
       <property role="TrG5h" value="coderules-test" />
       <node concept="1E1JtA" id="1Lr58WFO94R" role="2G$12L">
-        <property role="BnDLt" value="true" />
         <property role="TrG5h" value="jetbrains.mps.coderules.test" />
         <property role="3LESm3" value="c18711cb-f08b-4fae-81b0-1dd840be9c90" />
         <property role="aoJFB" value="eYcmk9QOlj/sources_and_tests" />
+        <property role="BnDLt" value="true" />
         <node concept="55IIr" id="1Lr58WFO94S" role="3LF7KH">
           <node concept="2Ry0Ak" id="1Lr58WFO9de" role="iGT6I">
             <property role="2Ry0Am" value="coderules" />
@@ -3275,12 +3051,6 @@
             </node>
           </node>
         </node>
-        <node concept="1SiIV0" id="_tf6vzNFc9" role="3bR37C">
-          <node concept="3bR9La" id="_tf6vzNFca" role="1SiIV1">
-            <property role="3bR36h" value="true" />
-            <ref role="3bR37D" node="7BVjoXzUx9d" resolve="jetbrains.mps.lang.coderules.template" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="2CPBoDB0P56" role="3bR37C">
           <node concept="3bR9La" id="2CPBoDB0P57" role="1SiIV1">
             <ref role="3bR37D" node="2CPBoDB0Mtg" resolve="jetbrains.mps.coderules.typechecking" />
@@ -3291,6 +3061,16 @@
             <ref role="3bR37D" to="ffeo:1ULLXZL0gZG" resolve="org.junit.junit5" />
           </node>
         </node>
+        <node concept="1SiIV0" id="6cDEUYiFiyL" role="3bR37C">
+          <node concept="3bR9La" id="6cDEUYiFiyM" role="1SiIV1">
+            <ref role="3bR37D" node="7BVjoXzUxoR" resolve="jetbrains.mps.logic.reactor" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="6cDEUYiFiyN" role="3bR37C">
+          <node concept="3bR9La" id="6cDEUYiFiyO" role="1SiIV1">
+            <ref role="3bR37D" node="74$3PKm_L$v" resolve="jetbrains.mps.logic.runtime" />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2sgV4H" id="7Ant4WkHLmd" role="1l3spa">
@@ -3430,8 +3210,8 @@
               </node>
             </node>
           </node>
-          <node concept="L2wRC" id="7Ant4WkHLmu" role="39821P">
-            <ref role="L2wRA" node="7BVjoXzUx$V" resolve="jetbrains.mps.logic.runtime" />
+          <node concept="L2wRC" id="74$3PKmU9k1" role="39821P">
+            <ref role="L2wRA" node="74$3PKm_L$v" resolve="jetbrains.mps.logic.runtime" />
           </node>
           <node concept="L2wRC" id="7Ant4WkHLmN" role="39821P">
             <ref role="L2wRA" node="7Ant4WkHLpd" resolve="jetbrains.mps.logic.test" />
@@ -3442,12 +3222,6 @@
           <node concept="L2wRC" id="7Ant4WkHLmr" role="39821P">
             <ref role="L2wRA" node="7BVjoXzUxee" resolve="jetbrains.mps.lang.coderules.runtime" />
           </node>
-          <node concept="L2wRC" id="7Ant4WkHLms" role="39821P">
-            <ref role="L2wRA" node="7BVjoXzUx9d" resolve="jetbrains.mps.lang.coderules.template" />
-          </node>
-          <node concept="L2wRC" id="NKt6yowV1X" role="39821P">
-            <ref role="L2wRA" node="5wYq9r5EBDN" resolve="jetbrains.mps.coderules.runtime" />
-          </node>
           <node concept="L2wRC" id="5wYq9r5FcqW" role="39821P">
             <ref role="L2wRA" node="NKt6yn9_8p" resolve="jetbrains.mps.coderules" />
           </node>
@@ -3661,9 +3435,6 @@
             <node concept="L2wRC" id="65DJywFk8r8" role="39821P">
               <ref role="L2wRA" node="7BVjoXzUxee" resolve="jetbrains.mps.lang.coderules.runtime" />
             </node>
-            <node concept="L2wRC" id="65DJywFk8vZ" role="39821P">
-              <ref role="L2wRA" node="7BVjoXzUx9d" resolve="jetbrains.mps.lang.coderules.template" />
-            </node>
             <node concept="L2wRC" id="65DJywFk9cZ" role="39821P">
               <ref role="L2wRA" node="7BVjoXzUxoR" resolve="jetbrains.mps.logic.reactor" />
               <node concept="3yLZsm" id="4EvsDTBGxZc" role="3yL2VB">
@@ -3731,8 +3502,9 @@
               </node>
               <node concept="3PtdJl" id="4EvsDTBFrfm" role="3PtcVe" />
             </node>
-            <node concept="L2wRC" id="65DJywFk8NI" role="39821P">
-              <ref role="L2wRA" node="7BVjoXzUx$V" resolve="jetbrains.mps.logic.runtime" />
+            <node concept="L2wRC" id="74$3PKmU9hq" role="39821P">
+              <ref role="L2wRA" node="74$3PKm_L$v" resolve="jetbrains.mps.logic.runtime" />
+              <node concept="3PtdJl" id="74$3PKmU9hK" role="3PtcVe" />
             </node>
             <node concept="L2wRC" id="5wYq9r5FcuF" role="39821P">
               <ref role="L2wRA" node="NKt6yn9_8p" resolve="jetbrains.mps.coderules" />
@@ -3800,9 +3572,6 @@
                 </node>
               </node>
             </node>
-            <node concept="L2wRC" id="NKt6yn9AaW" role="39821P">
-              <ref role="L2wRA" node="5wYq9r5EBDN" resolve="jetbrains.mps.coderules.runtime" />
-            </node>
             <node concept="L2wRC" id="6Yb9hAqybPB" role="39821P">
               <ref role="L2wRA" node="6Yb9hAqy9L2" resolve="jetbrains.mps.coderules.ui" />
             </node>
diff --git a/coderules/solutions/jetbrains.mps.coderules.test/jetbrains.mps.coderules.test.msd b/coderules/solutions/jetbrains.mps.coderules.test/jetbrains.mps.coderules.test.msd
index 3fd38212..b4105d8f 100644
--- a/coderules/solutions/jetbrains.mps.coderules.test/jetbrains.mps.coderules.test.msd
+++ b/coderules/solutions/jetbrains.mps.coderules.test/jetbrains.mps.coderules.test.msd
@@ -17,8 +17,9 @@
     <dependency reexport="false">2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)</dependency>
     <dependency reexport="true">707c4fde-f79a-44b5-b3d7-b5cef8844ccf(jetbrains.mps.lang.test.runtime)</dependency>
     <dependency reexport="false">6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.coderules.typechecking)</dependency>
-    <dependency reexport="true">ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)</dependency>
     <dependency reexport="false">63b449db-0918-4a4a-a891-2c430ab133e4(org.junit.junit5)</dependency>
+    <dependency reexport="false">a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)</dependency>
+    <dependency reexport="false">bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
@@ -56,14 +57,12 @@
     <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
     <module reference="f61473f9-130f-42f6-b98d-6c438812c2f6(jetbrains.mps.baseLanguage.unitTest)" version="0" />
     <module reference="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c(jetbrains.mps.coderules)" version="0" />
-    <module reference="f113d56b-63e3-4120-a89c-2f5dcb8c6290(jetbrains.mps.coderules.runtime)" version="0" />
     <module reference="c18711cb-f08b-4fae-81b0-1dd840be9c90(jetbrains.mps.coderules.test)" version="0" />
     <module reference="6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.coderules.typechecking)" version="0" />
     <module reference="fdaaf35f-8ee3-4c37-b09d-9efaeaaa7a41(jetbrains.mps.core.tool.environment)" version="0" />
     <module reference="bfbdd672-7ff5-403f-af4f-16da5226f34c(jetbrains.mps.findUsages.runtime)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
     <module reference="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" version="0" />
-    <module reference="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="8585453e-6bfb-4d80-98de-b16074f1d86c(jetbrains.mps.lang.test)" version="0" />
     <module reference="707c4fde-f79a-44b5-b3d7-b5cef8844ccf(jetbrains.mps.lang.test.runtime)" version="0" />
diff --git a/coderules/solutions/jetbrains.mps.coderules.test/models/jetbrains.mps.coderules.aspect@tests.mps b/coderules/solutions/jetbrains.mps.coderules.test/models/jetbrains.mps.coderules.aspect@tests.mps
index 14a6bfdf..421b3795 100644
--- a/coderules/solutions/jetbrains.mps.coderules.test/models/jetbrains.mps.coderules.aspect@tests.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.test/models/jetbrains.mps.coderules.aspect@tests.mps
@@ -8,8 +8,8 @@
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
   </languages>
   <imports>
-    <import index="fqlx" ref="r:2cc226a9-8a78-4010-b962-823343fd28ff(jetbrains.mps.lang.coderules.aspect)" />
     <import index="ze1i" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel.runtime(MPS.Core/)" />
+    <import index="pxw9" ref="r:e3417884-ba0a-4330-9cea-64f01ace2e9d(jetbrains.mps.lang.coderules.aspect)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
   </imports>
   <registry>
@@ -212,15 +212,15 @@
               <property role="TrG5h" value="acs" />
               <node concept="_YKpA" id="6nx4rRkY1ng" role="1tU5fm">
                 <node concept="3uibUv" id="6nx4rRkY1nn" role="_ZDj9">
-                  <ref role="3uigEE" to="fqlx:3KN3A4uUhmW" resolve="AspectClique" />
+                  <ref role="3uigEE" to="pxw9:3KN3A4uUhmW" resolve="AspectClique" />
                   <node concept="3uibUv" id="6nx4rRkY1no" role="11_B2D">
                     <ref role="3uigEE" node="6nx4rRkXZmQ" resolve="MockLanguageAspect" />
                   </node>
                 </node>
               </node>
               <node concept="2YIFZM" id="5Zr$fBZmYMt" role="33vP2m">
-                <ref role="37wK5l" to="fqlx:3KN3A4uV0IR" resolve="discoverAspects" />
-                <ref role="1Pybhc" to="fqlx:6nx4rRkNE1x" resolve="CliqueBuilder" />
+                <ref role="37wK5l" to="pxw9:3KN3A4uV0IR" resolve="discoverAspects" />
+                <ref role="1Pybhc" to="pxw9:6nx4rRkNE1x" resolve="CliqueBuilder" />
                 <node concept="2ShNRf" id="3Vcd0FocJVX" role="37wK5m">
                   <node concept="Tc6Ow" id="3Vcd0FocKc2" role="2ShVmc">
                     <node concept="3uibUv" id="3Vcd0FocKsy" role="HW$YZ">
@@ -259,7 +259,7 @@
                 <node concept="1uHKPH" id="_tf6vyUUF5" role="2OqNvi" />
               </node>
               <node concept="liA8E" id="_tf6vyUVv_" role="2OqNvi">
-                <ref role="37wK5l" to="fqlx:4ekZiHe4j$O" resolve="isEmpty" />
+                <ref role="37wK5l" to="pxw9:4ekZiHe4j$O" resolve="isEmpty" />
               </node>
             </node>
           </node>
@@ -357,15 +357,15 @@
               <property role="TrG5h" value="acs" />
               <node concept="3vKaQO" id="3Vcd0FocL9Y" role="1tU5fm">
                 <node concept="3uibUv" id="3Vcd0FocLa0" role="3O5elw">
-                  <ref role="3uigEE" to="fqlx:3KN3A4uUhmW" resolve="AspectClique" />
+                  <ref role="3uigEE" to="pxw9:3KN3A4uUhmW" resolve="AspectClique" />
                   <node concept="3uibUv" id="3Vcd0FocLa1" role="11_B2D">
                     <ref role="3uigEE" node="6nx4rRkXZmQ" resolve="MockLanguageAspect" />
                   </node>
                 </node>
               </node>
               <node concept="2YIFZM" id="5Zr$fBZmYMu" role="33vP2m">
-                <ref role="37wK5l" to="fqlx:3KN3A4uV0IR" resolve="discoverAspects" />
-                <ref role="1Pybhc" to="fqlx:6nx4rRkNE1x" resolve="CliqueBuilder" />
+                <ref role="37wK5l" to="pxw9:3KN3A4uV0IR" resolve="discoverAspects" />
+                <ref role="1Pybhc" to="pxw9:6nx4rRkNE1x" resolve="CliqueBuilder" />
                 <node concept="2ShNRf" id="3Vcd0FocIAX" role="37wK5m">
                   <node concept="Tc6Ow" id="3Vcd0FocIQ0" role="2ShVmc">
                     <node concept="37vLTw" id="3Vcd0FocJ5Y" role="HW$Y0">
@@ -403,7 +403,7 @@
             <node concept="3cpWsn" id="7u0sJ213RgB" role="3cpWs9">
               <property role="TrG5h" value="ac" />
               <node concept="3uibUv" id="7u0sJ213Rg$" role="1tU5fm">
-                <ref role="3uigEE" to="fqlx:3KN3A4uUhmW" resolve="AspectClique" />
+                <ref role="3uigEE" to="pxw9:3KN3A4uUhmW" resolve="AspectClique" />
                 <node concept="3uibUv" id="3Vcd0FocLGH" role="11_B2D">
                   <ref role="3uigEE" node="6nx4rRkXZmQ" resolve="MockLanguageAspect" />
                 </node>
@@ -427,7 +427,7 @@
                 <ref role="3cqZAo" node="7u0sJ213RgB" resolve="ac" />
               </node>
               <node concept="liA8E" id="7u0sJ213UeH" role="2OqNvi">
-                <ref role="37wK5l" to="fqlx:4ekZiHe4j$O" resolve="isEmpty" />
+                <ref role="37wK5l" to="pxw9:4ekZiHe4j$O" resolve="isEmpty" />
               </node>
             </node>
           </node>
@@ -438,7 +438,7 @@
                   <ref role="3cqZAo" node="7u0sJ213RgB" resolve="ac" />
                 </node>
                 <node concept="liA8E" id="7u0sJ21355X" role="2OqNvi">
-                  <ref role="37wK5l" to="fqlx:3KN3A4uUhpW" resolve="aspects" />
+                  <ref role="37wK5l" to="pxw9:3KN3A4uUhpW" resolve="aspects" />
                 </node>
               </node>
               <node concept="34oBXx" id="7u0sJ2136HX" role="2OqNvi" />
@@ -584,15 +584,15 @@
               <property role="TrG5h" value="acs" />
               <node concept="3vKaQO" id="_tf6vySnAY" role="1tU5fm">
                 <node concept="3uibUv" id="_tf6vySnAZ" role="3O5elw">
-                  <ref role="3uigEE" to="fqlx:3KN3A4uUhmW" resolve="AspectClique" />
+                  <ref role="3uigEE" to="pxw9:3KN3A4uUhmW" resolve="AspectClique" />
                   <node concept="3uibUv" id="_tf6vySnB0" role="11_B2D">
                     <ref role="3uigEE" node="6nx4rRkXZmQ" resolve="MockLanguageAspect" />
                   </node>
                 </node>
               </node>
               <node concept="2YIFZM" id="5Zr$fBZmYMv" role="33vP2m">
-                <ref role="37wK5l" to="fqlx:3KN3A4uV0IR" resolve="discoverAspects" />
-                <ref role="1Pybhc" to="fqlx:6nx4rRkNE1x" resolve="CliqueBuilder" />
+                <ref role="37wK5l" to="pxw9:3KN3A4uV0IR" resolve="discoverAspects" />
+                <ref role="1Pybhc" to="pxw9:6nx4rRkNE1x" resolve="CliqueBuilder" />
                 <node concept="2ShNRf" id="_tf6vySnB2" role="37wK5m">
                   <node concept="Tc6Ow" id="_tf6vySnB3" role="2ShVmc">
                     <node concept="37vLTw" id="_tf6vySo0M" role="HW$Y0">
@@ -671,7 +671,7 @@
                                   <ref role="3cqZAo" node="6E5fMGvfKQW" resolve="it" />
                                 </node>
                                 <node concept="liA8E" id="_tf6vyTK$o" role="2OqNvi">
-                                  <ref role="37wK5l" to="fqlx:_tf6vySXzF" resolve="allNamespaces" />
+                                  <ref role="37wK5l" to="pxw9:_tf6vySXzF" resolve="allNamespaces" />
                                 </node>
                               </node>
                             </node>
@@ -894,15 +894,15 @@
               <property role="TrG5h" value="acs" />
               <node concept="3vKaQO" id="_tf6vzI5QP" role="1tU5fm">
                 <node concept="3uibUv" id="_tf6vzI5QQ" role="3O5elw">
-                  <ref role="3uigEE" to="fqlx:3KN3A4uUhmW" resolve="AspectClique" />
+                  <ref role="3uigEE" to="pxw9:3KN3A4uUhmW" resolve="AspectClique" />
                   <node concept="3uibUv" id="_tf6vzI5QR" role="11_B2D">
                     <ref role="3uigEE" node="6nx4rRkXZmQ" resolve="MockLanguageAspect" />
                   </node>
                 </node>
               </node>
               <node concept="2YIFZM" id="5Zr$fBZmYMw" role="33vP2m">
-                <ref role="37wK5l" to="fqlx:3KN3A4uV0IR" resolve="discoverAspects" />
-                <ref role="1Pybhc" to="fqlx:6nx4rRkNE1x" resolve="CliqueBuilder" />
+                <ref role="37wK5l" to="pxw9:3KN3A4uV0IR" resolve="discoverAspects" />
+                <ref role="1Pybhc" to="pxw9:6nx4rRkNE1x" resolve="CliqueBuilder" />
                 <node concept="2ShNRf" id="_tf6vzI5QT" role="37wK5m">
                   <node concept="Tc6Ow" id="_tf6vzI5QU" role="2ShVmc">
                     <node concept="37vLTw" id="_tf6vzI5QV" role="HW$Y0">
@@ -987,7 +987,7 @@
                                   <ref role="3cqZAo" node="6E5fMGvfKQY" resolve="it" />
                                 </node>
                                 <node concept="liA8E" id="_tf6vzI5RE" role="2OqNvi">
-                                  <ref role="37wK5l" to="fqlx:_tf6vySXzF" resolve="allNamespaces" />
+                                  <ref role="37wK5l" to="pxw9:_tf6vySXzF" resolve="allNamespaces" />
                                 </node>
                               </node>
                             </node>
@@ -1266,15 +1266,15 @@
               <property role="TrG5h" value="acs" />
               <node concept="3vKaQO" id="2URzoKVns5h" role="1tU5fm">
                 <node concept="3uibUv" id="2URzoKVns5i" role="3O5elw">
-                  <ref role="3uigEE" to="fqlx:3KN3A4uUhmW" resolve="AspectClique" />
+                  <ref role="3uigEE" to="pxw9:3KN3A4uUhmW" resolve="AspectClique" />
                   <node concept="3uibUv" id="2URzoKVns5j" role="11_B2D">
                     <ref role="3uigEE" node="6nx4rRkXZmQ" resolve="MockLanguageAspect" />
                   </node>
                 </node>
               </node>
               <node concept="2YIFZM" id="5Zr$fBZmYMx" role="33vP2m">
-                <ref role="37wK5l" to="fqlx:3KN3A4uV0IR" resolve="discoverAspects" />
-                <ref role="1Pybhc" to="fqlx:6nx4rRkNE1x" resolve="CliqueBuilder" />
+                <ref role="37wK5l" to="pxw9:3KN3A4uV0IR" resolve="discoverAspects" />
+                <ref role="1Pybhc" to="pxw9:6nx4rRkNE1x" resolve="CliqueBuilder" />
                 <node concept="2ShNRf" id="2URzoKVns5l" role="37wK5m">
                   <node concept="Tc6Ow" id="2URzoKVns5m" role="2ShVmc">
                     <node concept="37vLTw" id="2URzoKVns5o" role="HW$Y0">
@@ -1359,7 +1359,7 @@
                                   <ref role="3cqZAo" node="6E5fMGvfKR0" resolve="it" />
                                 </node>
                                 <node concept="liA8E" id="2URzoKVns65" role="2OqNvi">
-                                  <ref role="37wK5l" to="fqlx:_tf6vySXzF" resolve="allNamespaces" />
+                                  <ref role="37wK5l" to="pxw9:_tf6vySXzF" resolve="allNamespaces" />
                                 </node>
                               </node>
                             </node>
@@ -1570,15 +1570,15 @@
               <property role="TrG5h" value="acs" />
               <node concept="3vKaQO" id="_tf6vyY$S9" role="1tU5fm">
                 <node concept="3uibUv" id="_tf6vyY$Sa" role="3O5elw">
-                  <ref role="3uigEE" to="fqlx:3KN3A4uUhmW" resolve="AspectClique" />
+                  <ref role="3uigEE" to="pxw9:3KN3A4uUhmW" resolve="AspectClique" />
                   <node concept="3uibUv" id="_tf6vyY$Sb" role="11_B2D">
                     <ref role="3uigEE" node="6nx4rRkXZmQ" resolve="MockLanguageAspect" />
                   </node>
                 </node>
               </node>
               <node concept="2YIFZM" id="5Zr$fBZmYMy" role="33vP2m">
-                <ref role="37wK5l" to="fqlx:3KN3A4uV0IR" resolve="discoverAspects" />
-                <ref role="1Pybhc" to="fqlx:6nx4rRkNE1x" resolve="CliqueBuilder" />
+                <ref role="37wK5l" to="pxw9:3KN3A4uV0IR" resolve="discoverAspects" />
+                <ref role="1Pybhc" to="pxw9:6nx4rRkNE1x" resolve="CliqueBuilder" />
                 <node concept="2ShNRf" id="_tf6vyY$Sd" role="37wK5m">
                   <node concept="Tc6Ow" id="_tf6vyY$Se" role="2ShVmc">
                     <node concept="37vLTw" id="_tf6vyY_yj" role="HW$Y0">
@@ -1666,7 +1666,7 @@
                                   <ref role="3cqZAo" node="6E5fMGvfKR2" resolve="it" />
                                 </node>
                                 <node concept="liA8E" id="_tf6vzr80w" role="2OqNvi">
-                                  <ref role="37wK5l" to="fqlx:_tf6vySXzF" resolve="allNamespaces" />
+                                  <ref role="37wK5l" to="pxw9:_tf6vySXzF" resolve="allNamespaces" />
                                 </node>
                               </node>
                             </node>
@@ -1859,15 +1859,15 @@
               <property role="TrG5h" value="acs" />
               <node concept="3vKaQO" id="_tf6v$43_Z" role="1tU5fm">
                 <node concept="3uibUv" id="_tf6v$43A0" role="3O5elw">
-                  <ref role="3uigEE" to="fqlx:3KN3A4uUhmW" resolve="AspectClique" />
+                  <ref role="3uigEE" to="pxw9:3KN3A4uUhmW" resolve="AspectClique" />
                   <node concept="3uibUv" id="_tf6v$43A1" role="11_B2D">
                     <ref role="3uigEE" node="6nx4rRkXZmQ" resolve="MockLanguageAspect" />
                   </node>
                 </node>
               </node>
               <node concept="2YIFZM" id="5Zr$fBZmYMz" role="33vP2m">
-                <ref role="37wK5l" to="fqlx:3KN3A4uV0IR" resolve="discoverAspects" />
-                <ref role="1Pybhc" to="fqlx:6nx4rRkNE1x" resolve="CliqueBuilder" />
+                <ref role="37wK5l" to="pxw9:3KN3A4uV0IR" resolve="discoverAspects" />
+                <ref role="1Pybhc" to="pxw9:6nx4rRkNE1x" resolve="CliqueBuilder" />
                 <node concept="2ShNRf" id="_tf6v$43A3" role="37wK5m">
                   <node concept="Tc6Ow" id="_tf6v$43A4" role="2ShVmc">
                     <node concept="37vLTw" id="_tf6v$43A5" role="HW$Y0">
@@ -1949,7 +1949,7 @@
                                   <ref role="3cqZAo" node="6E5fMGvfKR4" resolve="it" />
                                 </node>
                                 <node concept="liA8E" id="_tf6v$43AO" role="2OqNvi">
-                                  <ref role="37wK5l" to="fqlx:_tf6vySXzF" resolve="allNamespaces" />
+                                  <ref role="37wK5l" to="pxw9:_tf6vySXzF" resolve="allNamespaces" />
                                 </node>
                               </node>
                             </node>
@@ -2055,15 +2055,15 @@
               <property role="TrG5h" value="acs" />
               <node concept="3vKaQO" id="_tf6vzrfY3" role="1tU5fm">
                 <node concept="3uibUv" id="_tf6vzrfY4" role="3O5elw">
-                  <ref role="3uigEE" to="fqlx:3KN3A4uUhmW" resolve="AspectClique" />
+                  <ref role="3uigEE" to="pxw9:3KN3A4uUhmW" resolve="AspectClique" />
                   <node concept="3uibUv" id="_tf6vzrfY5" role="11_B2D">
                     <ref role="3uigEE" node="6nx4rRkXZmQ" resolve="MockLanguageAspect" />
                   </node>
                 </node>
               </node>
               <node concept="2YIFZM" id="5Zr$fBZmYM$" role="33vP2m">
-                <ref role="37wK5l" to="fqlx:3KN3A4uV0IR" resolve="discoverAspects" />
-                <ref role="1Pybhc" to="fqlx:6nx4rRkNE1x" resolve="CliqueBuilder" />
+                <ref role="37wK5l" to="pxw9:3KN3A4uV0IR" resolve="discoverAspects" />
+                <ref role="1Pybhc" to="pxw9:6nx4rRkNE1x" resolve="CliqueBuilder" />
                 <node concept="2ShNRf" id="_tf6vzrfY7" role="37wK5m">
                   <node concept="Tc6Ow" id="_tf6vzrfY8" role="2ShVmc">
                     <node concept="37vLTw" id="_tf6vzrgrI" role="HW$Y0">
@@ -2136,7 +2136,7 @@
                                   <ref role="3cqZAo" node="6E5fMGvfKR6" resolve="it" />
                                 </node>
                                 <node concept="liA8E" id="_tf6vzrgBo" role="2OqNvi">
-                                  <ref role="37wK5l" to="fqlx:_tf6vySXzF" resolve="allNamespaces" />
+                                  <ref role="37wK5l" to="pxw9:_tf6vySXzF" resolve="allNamespaces" />
                                 </node>
                               </node>
                             </node>
@@ -2169,7 +2169,7 @@
                 <node concept="1uHKPH" id="_tf6vzrsfw" role="2OqNvi" />
               </node>
               <node concept="liA8E" id="_tf6vzrsYU" role="2OqNvi">
-                <ref role="37wK5l" to="fqlx:3KN3A4uUhpW" resolve="aspects" />
+                <ref role="37wK5l" to="pxw9:3KN3A4uUhpW" resolve="aspects" />
               </node>
             </node>
           </node>
@@ -2364,7 +2364,7 @@
     </node>
     <node concept="2tJIrI" id="6nx4rRkXZmx" role="jymVt" />
     <node concept="3uibUv" id="6nx4rRkXZlB" role="EKbjA">
-      <ref role="3uigEE" to="fqlx:NKt6ynom3d" resolve="AspectDiscoverable" />
+      <ref role="3uigEE" to="pxw9:NKt6ynom3d" resolve="AspectDiscoverable" />
       <node concept="3uibUv" id="6nx4rRkXZwZ" role="11_B2D">
         <ref role="3uigEE" node="6nx4rRkXZtd" resolve="MockLanguageRuntime" />
       </node>
diff --git a/coderules/solutions/jetbrains.mps.coderules.testhelper/jetbrains.mps.coderules.testhelper.msd b/coderules/solutions/jetbrains.mps.coderules.testhelper/jetbrains.mps.coderules.testhelper.msd
index 78593eef..e5091bdf 100644
--- a/coderules/solutions/jetbrains.mps.coderules.testhelper/jetbrains.mps.coderules.testhelper.msd
+++ b/coderules/solutions/jetbrains.mps.coderules.testhelper/jetbrains.mps.coderules.testhelper.msd
@@ -16,15 +16,11 @@
     <dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
     <dependency reexport="false">6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.coderules.typechecking)</dependency>
     <dependency reexport="false">26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)</dependency>
-    <dependency reexport="false">8585453e-6bfb-4d80-98de-b16074f1d86c(jetbrains.mps.lang.test)</dependency>
-    <dependency reexport="false">ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)</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">a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)</dependency>
     <dependency reexport="false">f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)</dependency>
     <dependency reexport="false">c4803b19-6d89-4a3b-bf82-390769514add(jetbrains.mps.lang.coderules)</dependency>
     <dependency reexport="false">7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)</dependency>
-    <dependency reexport="false">f113d56b-63e3-4120-a89c-2f5dcb8c6290(jetbrains.mps.coderules.runtime)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
@@ -52,9 +48,7 @@
     <module reference="fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)" version="0" />
     <module reference="83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)" version="0" />
     <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
-    <module reference="f61473f9-130f-42f6-b98d-6c438812c2f6(jetbrains.mps.baseLanguage.unitTest)" version="0" />
     <module reference="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c(jetbrains.mps.coderules)" version="0" />
-    <module reference="f113d56b-63e3-4120-a89c-2f5dcb8c6290(jetbrains.mps.coderules.runtime)" version="0" />
     <module reference="02473356-2f59-4de1-ba87-e88f9d606180(jetbrains.mps.coderules.testhelper)" version="0" />
     <module reference="6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.coderules.typechecking)" version="0" />
     <module reference="bfbdd672-7ff5-403f-af4f-16da5226f34c(jetbrains.mps.findUsages.runtime)" version="0" />
@@ -62,14 +56,12 @@
     <module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
     <module reference="c4803b19-6d89-4a3b-bf82-390769514add(jetbrains.mps.lang.coderules)" version="0" />
     <module reference="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" version="0" />
-    <module reference="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="f4ad079d-bc71-4ffb-9600-9328705cf998(jetbrains.mps.lang.descriptor)" version="0" />
     <module reference="446c26eb-2b7b-4bf0-9b35-f83fa582753e(jetbrains.mps.lang.modelapi)" version="0" />
     <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
     <module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="1" />
     <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
-    <module reference="8585453e-6bfb-4d80-98de-b16074f1d86c(jetbrains.mps.lang.test)" version="0" />
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" version="0" />
     <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
diff --git a/coderules/solutions/jetbrains.mps.coderules.testhelper/models/jetbrains.mps.coderules.testhelper.testutil.mps b/coderules/solutions/jetbrains.mps.coderules.testhelper/models/jetbrains.mps.coderules.testhelper.testutil.mps
index 4a0d6c81..5c2582cd 100644
--- a/coderules/solutions/jetbrains.mps.coderules.testhelper/models/jetbrains.mps.coderules.testhelper.testutil.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.testhelper/models/jetbrains.mps.coderules.testhelper.testutil.mps
@@ -16,10 +16,8 @@
   <imports>
     <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
     <import index="hano" ref="r:2b43b673-12f9-49ea-8e43-d0c7a401586a(jetbrains.mps.lang.coderules.eval)" />
-    <import index="fqlx" ref="r:2cc226a9-8a78-4010-b962-823343fd28ff(jetbrains.mps.lang.coderules.aspect)" />
     <import index="u46i" ref="r:c2760840-3210-4ad4-9e64-a2dfd53620e1(jetbrains.mps.lang.typechecking.aspect)" />
     <import index="tj24" ref="r:0fbbb63a-fd15-46e1-8136-78049f6d6e63(jetbrains.mps.coderules.typechecking.service)" />
-    <import index="i348" ref="r:42a15dec-83a9-4fe1-80d6-3bf898c512bd(jetbrains.mps.lang.coderules.template)" />
     <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
     <import index="av0y" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.program(jetbrains.mps.logic.reactor/)" />
@@ -29,15 +27,17 @@
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
     <import index="et5u" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.messages(MPS.Core/)" />
     <import index="82uw" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.function(JDK/)" />
-    <import index="cxk7" ref="r:daa544a7-0a5c-49c0-a54c-4c2a5b4868aa(jetbrains.mps.logic.predicate)" />
     <import index="ksgm" ref="r:6285678b-007f-4527-bcf5-6fd38ba8c969(jetbrains.mps.lang.coderules.program)" />
     <import index="2gg1" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.errors(MPS.Core/)" />
     <import index="d6hs" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.errors.item(MPS.Core/)" />
     <import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" />
-    <import index="psoy" ref="r:78313117-90ee-47a5-a91e-b5213df7f611(jetbrains.mps.coderules.runtime.result)" />
     <import index="wq2x" ref="r:83137295-aa87-45e8-b0c0-ede2adf2a396(jetbrains.mps.lang.coderules.structure)" />
     <import index="tpd4" ref="r:00000000-0000-4000-0000-011c895902b4(jetbrains.mps.lang.typesystem.structure)" />
     <import index="bj13" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.logical(jetbrains.mps.logic.reactor/)" />
+    <import index="xydz" ref="r:b198cb67-efdc-40c0-8817-11ab64523a5b(jetbrains.mps.lang.coderules.result)" />
+    <import index="pxw9" ref="r:e3417884-ba0a-4330-9cea-64f01ace2e9d(jetbrains.mps.lang.coderules.aspect)" />
+    <import index="ugy2" ref="r:57b2449f-b7c7-4941-bd75-9c594835f5cd(jetbrains.mps.lang.coderules.template)" />
+    <import index="tpfl" ref="r:97d6f79f-4a27-4a9b-9122-9bccfb5317c9(jetbrains.mps.lang.coderules.predicate)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -651,7 +651,7 @@
           <ref role="3uigEE" to="wyt6:~Class" resolve="Class" />
           <node concept="3qUE_q" id="3j46jeGMjwQ" role="11_B2D">
             <node concept="3uibUv" id="3j46jeGMkoj" role="3qUE_r">
-              <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
+              <ref role="3uigEE" to="ugy2:5EDW3XDYeWv" resolve="Query" />
             </node>
           </node>
         </node>
@@ -775,7 +775,7 @@
           <ref role="3uigEE" to="wyt6:~Class" resolve="Class" />
           <node concept="3qUE_q" id="3j46jeGMnwg" role="11_B2D">
             <node concept="3uibUv" id="3j46jeGMnwh" role="3qUE_r">
-              <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
+              <ref role="3uigEE" to="ugy2:5EDW3XDYeWv" resolve="Query" />
             </node>
           </node>
         </node>
@@ -855,7 +855,7 @@
           <ref role="3uigEE" to="wyt6:~Class" resolve="Class" />
           <node concept="3qUE_q" id="3j46jeGMs62" role="11_B2D">
             <node concept="3uibUv" id="3j46jeGMs63" role="3qUE_r">
-              <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
+              <ref role="3uigEE" to="ugy2:5EDW3XDYeWv" resolve="Query" />
             </node>
           </node>
         </node>
@@ -865,7 +865,7 @@
           <node concept="3cpWsn" id="WJTIIoJWGP" role="3cpWs9">
             <property role="TrG5h" value="ac" />
             <node concept="3uibUv" id="WJTIIoJWGQ" role="1tU5fm">
-              <ref role="3uigEE" to="fqlx:3KN3A4uUhmW" resolve="AspectClique" />
+              <ref role="3uigEE" to="pxw9:3KN3A4uUhmW" resolve="AspectClique" />
               <node concept="3uibUv" id="WJTIIoJWGR" role="11_B2D">
                 <ref role="3uigEE" to="u46i:7km57Pkjxf4" resolve="TypecheckingAspect" />
               </node>
@@ -880,7 +880,7 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="6dGwhn$Cj05" role="2OqNvi">
-                  <ref role="37wK5l" to="fqlx:9UUIHLNig1" resolve="allForRoot" />
+                  <ref role="37wK5l" to="pxw9:9UUIHLNig1" resolve="allForRoot" />
                   <node concept="37vLTw" id="6dGwhn$ClD_" role="37wK5m">
                     <ref role="3cqZAo" node="1XKnVQdrLs" resolve="unit" />
                   </node>
@@ -919,7 +919,7 @@
             <property role="TrG5h" value="queryTemplates" />
             <node concept="_YKpA" id="9UUIHJBNGD" role="1tU5fm">
               <node concept="3uibUv" id="9UUIHJBNGE" role="_ZDj9">
-                <ref role="3uigEE" to="i348:6OXbTD$iNPP" resolve="QueryTemplate" />
+                <ref role="3uigEE" to="ugy2:6OXbTD$iNPP" resolve="QueryTemplate" />
                 <node concept="3qTvmN" id="9UUIHJBQOE" role="11_B2D" />
               </node>
             </node>
@@ -971,7 +971,7 @@
               <ref role="3cqZAo" node="61G6TdBqAxt" resolve="macroProcessing" />
             </node>
             <node concept="liA8E" id="4LE1vMPefCy" role="2OqNvi">
-              <ref role="37wK5l" to="i348:7DvO2M9IiMh" resolve="putParameter" />
+              <ref role="37wK5l" to="ugy2:7DvO2M9IiMh" resolve="putParameter" />
               <node concept="10M0yZ" id="4LE1vMPeo6s" role="37wK5m">
                 <ref role="3cqZAo" to="tj24:4qGA5WCVux3" resolve="TYPES_COLLECTOR" />
                 <ref role="1PxDUh" to="tj24:4Z$O9mrQIzY" resolve="TypecheckingState" />
@@ -1189,7 +1189,7 @@
       <node concept="37vLTG" id="3j46jeGNPfC" role="3clF46">
         <property role="TrG5h" value="query" />
         <node concept="3uibUv" id="3j46jeGNQI8" role="1tU5fm">
-          <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
+          <ref role="3uigEE" to="ugy2:5EDW3XDYeWv" resolve="Query" />
         </node>
       </node>
       <node concept="3clFbS" id="4aLjyB0PyDq" role="3clF47">
@@ -1277,7 +1277,7 @@
       <node concept="37vLTG" id="3j46jeGNTuJ" role="3clF46">
         <property role="TrG5h" value="query" />
         <node concept="3uibUv" id="3j46jeGNTCl" role="1tU5fm">
-          <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
+          <ref role="3uigEE" to="ugy2:5EDW3XDYeWv" resolve="Query" />
         </node>
       </node>
       <node concept="37vLTG" id="6DQTzHxznqd" role="3clF46">
@@ -1340,7 +1340,7 @@
           <node concept="3cpWsn" id="6$7vuu2ujxR" role="3cpWs9">
             <property role="TrG5h" value="res" />
             <node concept="3uibUv" id="6$7vuu2ujxH" role="1tU5fm">
-              <ref role="3uigEE" to="psoy:7Oc59RSEjdb" resolve="Result" />
+              <ref role="3uigEE" to="xydz:7Oc59RSEjdb" resolve="Result" />
             </node>
             <node concept="1rXfSq" id="tyIfzC3A2R" role="33vP2m">
               <ref role="37wK5l" node="tyIfzC3x3f" resolve="produceProgram" />
@@ -1366,7 +1366,7 @@
                 <ref role="3cqZAo" node="6$7vuu2ujxR" resolve="res" />
               </node>
               <node concept="liA8E" id="tyIfzC2BXw" role="2OqNvi">
-                <ref role="37wK5l" to="psoy:7Oc59RS_hsj" resolve="isSuccessful" />
+                <ref role="37wK5l" to="xydz:7Oc59RS_hsj" resolve="isSuccessful" />
               </node>
             </node>
           </node>
@@ -1376,11 +1376,11 @@
           <node concept="3cpWsn" id="6QH_LDtbV6b" role="3cpWs9">
             <property role="TrG5h" value="res2" />
             <node concept="3uibUv" id="6QH_LDtbV6c" role="1tU5fm">
-              <ref role="3uigEE" to="psoy:7Oc59RSEjdb" resolve="Result" />
+              <ref role="3uigEE" to="xydz:7Oc59RSEjdb" resolve="Result" />
             </node>
             <node concept="2YIFZM" id="7TC1Xcd$6oN" role="33vP2m">
-              <ref role="37wK5l" to="psoy:7Oc59RSEjeq" resolve="OK" />
-              <ref role="1Pybhc" to="psoy:7Oc59RSEjdb" resolve="Result" />
+              <ref role="37wK5l" to="xydz:7Oc59RSEjeq" resolve="OK" />
+              <ref role="1Pybhc" to="xydz:7Oc59RSEjdb" resolve="Result" />
             </node>
           </node>
         </node>
@@ -1410,7 +1410,7 @@
                 <ref role="3cqZAo" node="6QH_LDtbV6b" resolve="res2" />
               </node>
               <node concept="liA8E" id="1CcQBrQs3tX" role="2OqNvi">
-                <ref role="37wK5l" to="psoy:7nkyKX7v7xb" resolve="and" />
+                <ref role="37wK5l" to="xydz:7nkyKX7v7xb" resolve="and" />
                 <node concept="2OqwBi" id="6QH_LDtbV6d" role="37wK5m">
                   <node concept="37vLTw" id="6QH_LDtbV6e" role="2Oq$k0">
                     <ref role="3cqZAo" node="tyIfzC1aZ5" resolve="evaluator" />
@@ -1456,7 +1456,7 @@
                       <ref role="3cqZAo" node="6QH_LDtbV6b" resolve="res2" />
                     </node>
                     <node concept="liA8E" id="2Qsys8chrq2" role="2OqNvi">
-                      <ref role="37wK5l" to="psoy:5X1yxJI3vjy" resolve="cause" />
+                      <ref role="37wK5l" to="xydz:5X1yxJI3vjy" resolve="cause" />
                     </node>
                   </node>
                 </node>
@@ -1469,7 +1469,7 @@
                 <ref role="3cqZAo" node="6QH_LDtbV6b" resolve="res2" />
               </node>
               <node concept="liA8E" id="2Qsys8chret" role="2OqNvi">
-                <ref role="37wK5l" to="psoy:7Oc59RS_hsj" resolve="isSuccessful" />
+                <ref role="37wK5l" to="xydz:7Oc59RS_hsj" resolve="isSuccessful" />
               </node>
             </node>
           </node>
@@ -1735,7 +1735,7 @@
       <node concept="37vLTG" id="3j46jeGMH3J" role="3clF46">
         <property role="TrG5h" value="query" />
         <node concept="3uibUv" id="3j46jeGMJ2F" role="1tU5fm">
-          <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
+          <ref role="3uigEE" to="ugy2:5EDW3XDYeWv" resolve="Query" />
         </node>
       </node>
       <node concept="37vLTG" id="6DQTzHxzws5" role="3clF46">
@@ -1901,7 +1901,7 @@
       </node>
       <node concept="3Tm1VV" id="tyIfzC3v$U" role="1B3o_S" />
       <node concept="3uibUv" id="tyIfzC3yja" role="3clF45">
-        <ref role="3uigEE" to="psoy:7Oc59RSEjdb" resolve="Result" />
+        <ref role="3uigEE" to="xydz:7Oc59RSEjdb" resolve="Result" />
       </node>
     </node>
     <node concept="2tJIrI" id="WJTIIoQH94" role="jymVt" />
@@ -1959,8 +1959,8 @@
         <node concept="3clFbF" id="3j46jeGSObf" role="3cqZAp">
           <node concept="37vLTI" id="3j46jeGSPfC" role="3clFbG">
             <node concept="2YIFZM" id="3j46jeGSPRU" role="37vLTx">
-              <ref role="37wK5l" to="psoy:7Oc59RSEjeq" resolve="OK" />
-              <ref role="1Pybhc" to="psoy:7Oc59RSEjdb" resolve="Result" />
+              <ref role="37wK5l" to="xydz:7Oc59RSEjeq" resolve="OK" />
+              <ref role="1Pybhc" to="xydz:7Oc59RSEjdb" resolve="Result" />
             </node>
             <node concept="2OqwBi" id="3j46jeGSOsm" role="37vLTJ">
               <node concept="Xjq3P" id="3j46jeGSObd" role="2Oq$k0" />
@@ -2060,7 +2060,7 @@
       </node>
       <node concept="3Tm1VV" id="3j46jeGSUR$" role="1B3o_S" />
       <node concept="3uibUv" id="3j46jeGSYUP" role="3clF45">
-        <ref role="3uigEE" to="psoy:7Oc59RSEjdb" resolve="Result" />
+        <ref role="3uigEE" to="xydz:7Oc59RSEjdb" resolve="Result" />
       </node>
     </node>
     <node concept="2tJIrI" id="WJTIIoQ8XW" role="jymVt" />
@@ -2317,11 +2317,11 @@
       <property role="TrG5h" value="evalResult" />
       <node concept="3Tm6S6" id="3j46jeGSCUT" role="1B3o_S" />
       <node concept="3uibUv" id="3j46jeGSF1F" role="1tU5fm">
-        <ref role="3uigEE" to="psoy:7Oc59RSEjdb" resolve="Result" />
+        <ref role="3uigEE" to="xydz:7Oc59RSEjdb" resolve="Result" />
       </node>
       <node concept="2YIFZM" id="3j46jeGSHx$" role="33vP2m">
-        <ref role="1Pybhc" to="psoy:7Oc59RSEjdb" resolve="Result" />
-        <ref role="37wK5l" to="psoy:7Oc59RSEjeq" resolve="OK" />
+        <ref role="1Pybhc" to="xydz:7Oc59RSEjdb" resolve="Result" />
+        <ref role="37wK5l" to="xydz:7Oc59RSEjeq" resolve="OK" />
       </node>
     </node>
     <node concept="2tJIrI" id="WJTIIoPcaO" role="jymVt" />
@@ -2666,8 +2666,8 @@
                 <ref role="3uigEE" to="2gg1:~MessageStatus" resolve="MessageStatus" />
               </node>
               <node concept="2YIFZM" id="61G6TdBzHQH" role="33vP2m">
-                <ref role="37wK5l" to="cxk7:3o9wrC3WoA4" resolve="severityToStatus" />
-                <ref role="1Pybhc" to="cxk7:61G6TdBsGY8" resolve="FeedbackUtil" />
+                <ref role="37wK5l" to="tpfl:3o9wrC3WoA4" resolve="severityToStatus" />
+                <ref role="1Pybhc" to="tpfl:61G6TdBsGY8" resolve="FeedbackUtil" />
                 <node concept="2OqwBi" id="1laj_RSBA2L" role="37wK5m">
                   <node concept="37vLTw" id="1laj_RSB_E8" role="2Oq$k0">
                     <ref role="3cqZAo" node="WJTIIp82_Y" resolve="feedback" />
@@ -4527,7 +4527,7 @@
                     <node concept="1eOMI4" id="3Pxu0s8fTYQ" role="2Oq$k0">
                       <node concept="10QFUN" id="3Pxu0s8fTYR" role="1eOMHV">
                         <node concept="3uibUv" id="3Pxu0s8fTYS" role="10QFUM">
-                          <ref role="3uigEE" to="i348:7nPD14OaO1O" resolve="RuleEx" />
+                          <ref role="3uigEE" to="ugy2:7nPD14OaO1O" resolve="RuleEx" />
                         </node>
                         <node concept="37vLTw" id="3Pxu0s8fTYT" role="10QFUP">
                           <ref role="3cqZAo" node="MSv3owey_W" resolve="rule" />
@@ -4535,7 +4535,7 @@
                       </node>
                     </node>
                     <node concept="liA8E" id="3Pxu0s8fTYU" role="2OqNvi">
-                      <ref role="37wK5l" to="i348:3Pxu0s8egWa" resolve="origin" />
+                      <ref role="37wK5l" to="ugy2:3Pxu0s8egWa" resolve="origin" />
                     </node>
                   </node>
                 </node>
@@ -4578,7 +4578,7 @@
             </node>
             <node concept="2ZW3vV" id="MSv3oweCBG" role="3clFbw">
               <node concept="3uibUv" id="MSv3oweCFD" role="2ZW6by">
-                <ref role="3uigEE" to="i348:7nPD14OaO1O" resolve="RuleEx" />
+                <ref role="3uigEE" to="ugy2:7nPD14OaO1O" resolve="RuleEx" />
               </node>
               <node concept="37vLTw" id="MSv3oweCup" role="2ZW6bz">
                 <ref role="3cqZAo" node="MSv3owey_W" resolve="rule" />
@@ -4975,7 +4975,7 @@
           <ref role="3uigEE" to="wyt6:~Class" resolve="Class" />
           <node concept="3qUE_q" id="3j46jeGN7$P" role="11_B2D">
             <node concept="3uibUv" id="3j46jeGN7Ev" role="3qUE_r">
-              <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
+              <ref role="3uigEE" to="ugy2:5EDW3XDYeWv" resolve="Query" />
             </node>
           </node>
         </node>
@@ -5626,7 +5626,7 @@
       <property role="TrG5h" value="query" />
       <node concept="3Tm6S6" id="3j46jeGNmpm" role="1B3o_S" />
       <node concept="3uibUv" id="3j46jeGNowz" role="1tU5fm">
-        <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
+        <ref role="3uigEE" to="ugy2:5EDW3XDYeWv" resolve="Query" />
       </node>
     </node>
     <node concept="312cEg" id="3j46jeGWT2_" role="jymVt">
@@ -6993,7 +6993,7 @@
       <node concept="37vLTG" id="3j46jeGThkM" role="3clF46">
         <property role="TrG5h" value="expectedResult" />
         <node concept="3uibUv" id="3j46jeGThkL" role="1tU5fm">
-          <ref role="3uigEE" to="psoy:7Oc59RSEjdb" resolve="Result" />
+          <ref role="3uigEE" to="xydz:7Oc59RSEjdb" resolve="Result" />
         </node>
       </node>
     </node>
@@ -7108,7 +7108,7 @@
       <node concept="37vLTG" id="3j46jeGTsrL" role="3clF46">
         <property role="TrG5h" value="expectedResult" />
         <node concept="3uibUv" id="3j46jeGTsrM" role="1tU5fm">
-          <ref role="3uigEE" to="psoy:7Oc59RSEjdb" resolve="Result" />
+          <ref role="3uigEE" to="xydz:7Oc59RSEjdb" resolve="Result" />
         </node>
       </node>
     </node>
@@ -9264,7 +9264,7 @@
                       <node concept="3cpWsn" id="6jc_YgcQ$4I" role="3cpWs9">
                         <property role="TrG5h" value="removedRule" />
                         <node concept="3uibUv" id="6jc_YgcQ$4J" role="1tU5fm">
-                          <ref role="3uigEE" to="i348:7nPD14OaO1O" resolve="RuleEx" />
+                          <ref role="3uigEE" to="ugy2:7nPD14OaO1O" resolve="RuleEx" />
                         </node>
                         <node concept="3EllGN" id="6jc_YgcPN1G" role="33vP2m">
                           <node concept="2GrUjf" id="6jc_YgcPNgl" role="3ElVtu">
@@ -9310,7 +9310,7 @@
                             <node concept="3Tqbb2" id="6jc_YgcRpxC" role="1tU5fm" />
                             <node concept="2OqwBi" id="6jc_YgcRpxE" role="33vP2m">
                               <node concept="liA8E" id="3Pxu0s8fC_6" role="2OqNvi">
-                                <ref role="37wK5l" to="i348:3Pxu0s8egWa" resolve="origin" />
+                                <ref role="37wK5l" to="ugy2:3Pxu0s8egWa" resolve="origin" />
                               </node>
                               <node concept="37vLTw" id="6jc_YgcRqAa" role="2Oq$k0">
                                 <ref role="3cqZAo" node="6jc_YgcQ$4I" resolve="removedRule" />
@@ -9356,7 +9356,7 @@
                             <ref role="3cqZAo" node="6jc_YgcQ$4I" resolve="removedRule" />
                           </node>
                           <node concept="liA8E" id="3Pxu0s8fBDQ" role="2OqNvi">
-                            <ref role="37wK5l" to="i348:3Pxu0s8egWa" resolve="origin" />
+                            <ref role="37wK5l" to="ugy2:3Pxu0s8egWa" resolve="origin" />
                           </node>
                         </node>
                       </node>
@@ -9432,12 +9432,12 @@
                       <node concept="3cpWsn" id="6jc_YgcRhD5" role="3cpWs9">
                         <property role="TrG5h" value="ruleEx" />
                         <node concept="3uibUv" id="6jc_YgcRhD6" role="1tU5fm">
-                          <ref role="3uigEE" to="i348:7nPD14OaO1O" resolve="RuleEx" />
+                          <ref role="3uigEE" to="ugy2:7nPD14OaO1O" resolve="RuleEx" />
                         </node>
                         <node concept="1eOMI4" id="6jc_YgcQDba" role="33vP2m">
                           <node concept="10QFUN" id="6jc_YgcQDb7" role="1eOMHV">
                             <node concept="3uibUv" id="6jc_YgcQDj9" role="10QFUM">
-                              <ref role="3uigEE" to="i348:7nPD14OaO1O" resolve="RuleEx" />
+                              <ref role="3uigEE" to="ugy2:7nPD14OaO1O" resolve="RuleEx" />
                             </node>
                             <node concept="2GrUjf" id="6jc_YgcQCM1" role="10QFUP">
                               <ref role="2Gs0qQ" node="6jc_YgcQ__C" resolve="addedRule" />
@@ -9483,7 +9483,7 @@
                                 <ref role="3cqZAo" node="6jc_YgcRhD5" resolve="ruleEx" />
                               </node>
                               <node concept="liA8E" id="3Pxu0s8f_uo" role="2OqNvi">
-                                <ref role="37wK5l" to="i348:3Pxu0s8egWa" resolve="origin" />
+                                <ref role="37wK5l" to="ugy2:3Pxu0s8egWa" resolve="origin" />
                               </node>
                             </node>
                           </node>
@@ -9526,7 +9526,7 @@
                             <ref role="3cqZAo" node="6jc_YgcRhD5" resolve="ruleEx" />
                           </node>
                           <node concept="liA8E" id="3Pxu0s8f$ya" role="2OqNvi">
-                            <ref role="37wK5l" to="i348:3Pxu0s8egWa" resolve="origin" />
+                            <ref role="37wK5l" to="ugy2:3Pxu0s8egWa" resolve="origin" />
                           </node>
                         </node>
                       </node>
@@ -9672,7 +9672,7 @@
                 <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
               </node>
               <node concept="3uibUv" id="6jc_YgcPBec" role="3rvSg0">
-                <ref role="3uigEE" to="i348:7nPD14OaO1O" resolve="RuleEx" />
+                <ref role="3uigEE" to="ugy2:7nPD14OaO1O" resolve="RuleEx" />
               </node>
             </node>
             <node concept="2ShNRf" id="6jc_YgcPCUu" role="33vP2m">
@@ -9681,7 +9681,7 @@
                   <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
                 </node>
                 <node concept="3uibUv" id="6jc_YgcPCUx" role="3rHtpV">
-                  <ref role="3uigEE" to="i348:7nPD14OaO1O" resolve="RuleEx" />
+                  <ref role="3uigEE" to="ugy2:7nPD14OaO1O" resolve="RuleEx" />
                 </node>
               </node>
             </node>
@@ -9700,7 +9700,7 @@
                 <node concept="1eOMI4" id="6jc_YgcPET$" role="37vLTx">
                   <node concept="10QFUN" id="6jc_YgcPET_" role="1eOMHV">
                     <node concept="3uibUv" id="6jc_YgcPETA" role="10QFUM">
-                      <ref role="3uigEE" to="i348:7nPD14OaO1O" resolve="RuleEx" />
+                      <ref role="3uigEE" to="ugy2:7nPD14OaO1O" resolve="RuleEx" />
                     </node>
                     <node concept="2GrUjf" id="6jc_YgcPETB" role="10QFUP">
                       <ref role="2Gs0qQ" node="6jc_YgcPETt" resolve="rule" />
@@ -9736,7 +9736,7 @@
           <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
         </node>
         <node concept="3uibUv" id="6jc_YgcP_aG" role="3rvSg0">
-          <ref role="3uigEE" to="i348:7nPD14OaO1O" resolve="RuleEx" />
+          <ref role="3uigEE" to="ugy2:7nPD14OaO1O" resolve="RuleEx" />
         </node>
       </node>
     </node>
@@ -9773,7 +9773,7 @@
                 <node concept="2ShNRf" id="6jc_YgcQStK" role="37vLTx">
                   <node concept="Tc6Ow" id="6jc_YgcQSQm" role="2ShVmc">
                     <node concept="3uibUv" id="6jc_YgcQTnu" role="HW$YZ">
-                      <ref role="3uigEE" to="i348:7nPD14OaO1O" resolve="RuleEx" />
+                      <ref role="3uigEE" to="ugy2:7nPD14OaO1O" resolve="RuleEx" />
                     </node>
                   </node>
                 </node>
@@ -9803,7 +9803,7 @@
       <node concept="3Tm6S6" id="6jc_YgcQGQ2" role="1B3o_S" />
       <node concept="3vKaQO" id="6jc_YgcQLU7" role="3clF45">
         <node concept="3uibUv" id="6jc_YgcQNzV" role="3O5elw">
-          <ref role="3uigEE" to="i348:7nPD14OaO1O" resolve="RuleEx" />
+          <ref role="3uigEE" to="ugy2:7nPD14OaO1O" resolve="RuleEx" />
         </node>
       </node>
     </node>
@@ -9834,7 +9834,7 @@
                 <node concept="2ShNRf" id="6jc_YgcR0m$" role="37vLTx">
                   <node concept="Tc6Ow" id="6jc_YgcR0m_" role="2ShVmc">
                     <node concept="3uibUv" id="6jc_YgcR0mA" role="HW$YZ">
-                      <ref role="3uigEE" to="i348:7nPD14OaO1O" resolve="RuleEx" />
+                      <ref role="3uigEE" to="ugy2:7nPD14OaO1O" resolve="RuleEx" />
                     </node>
                   </node>
                 </node>
@@ -9864,7 +9864,7 @@
       <node concept="3Tm6S6" id="6jc_YgcR0mI" role="1B3o_S" />
       <node concept="3vKaQO" id="6jc_YgcR0mJ" role="3clF45">
         <node concept="3uibUv" id="6jc_YgcR0mK" role="3O5elw">
-          <ref role="3uigEE" to="i348:7nPD14OaO1O" resolve="RuleEx" />
+          <ref role="3uigEE" to="ugy2:7nPD14OaO1O" resolve="RuleEx" />
         </node>
       </node>
     </node>
@@ -9884,7 +9884,7 @@
           <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
         </node>
         <node concept="3uibUv" id="6jc_YgcSpME" role="3rvSg0">
-          <ref role="3uigEE" to="i348:7nPD14OaO1O" resolve="RuleEx" />
+          <ref role="3uigEE" to="ugy2:7nPD14OaO1O" resolve="RuleEx" />
         </node>
       </node>
       <node concept="2ShNRf" id="6jc_YgcSpMF" role="33vP2m">
@@ -9893,7 +9893,7 @@
             <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
           </node>
           <node concept="3uibUv" id="6jc_YgcSpMI" role="3rHtpV">
-            <ref role="3uigEE" to="i348:7nPD14OaO1O" resolve="RuleEx" />
+            <ref role="3uigEE" to="ugy2:7nPD14OaO1O" resolve="RuleEx" />
           </node>
         </node>
       </node>
@@ -9906,7 +9906,7 @@
           <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
         </node>
         <node concept="3uibUv" id="6jc_YgcVtsM" role="3rvSg0">
-          <ref role="3uigEE" to="i348:7nPD14OaO1O" resolve="RuleEx" />
+          <ref role="3uigEE" to="ugy2:7nPD14OaO1O" resolve="RuleEx" />
         </node>
       </node>
       <node concept="2ShNRf" id="6jc_YgcVtsN" role="33vP2m">
@@ -9915,7 +9915,7 @@
             <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
           </node>
           <node concept="3uibUv" id="6jc_YgcVtsQ" role="3rHtpV">
-            <ref role="3uigEE" to="i348:7nPD14OaO1O" resolve="RuleEx" />
+            <ref role="3uigEE" to="ugy2:7nPD14OaO1O" resolve="RuleEx" />
           </node>
         </node>
       </node>
@@ -9929,7 +9929,7 @@
           <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
         </node>
         <node concept="3uibUv" id="6jc_YgcP7PA" role="3rvSg0">
-          <ref role="3uigEE" to="i348:7nPD14OaO1O" resolve="RuleEx" />
+          <ref role="3uigEE" to="ugy2:7nPD14OaO1O" resolve="RuleEx" />
         </node>
       </node>
       <node concept="2ShNRf" id="6jc_YgcPcyq" role="33vP2m">
@@ -9938,7 +9938,7 @@
             <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
           </node>
           <node concept="3uibUv" id="6jc_YgcPcyt" role="3rHtpV">
-            <ref role="3uigEE" to="i348:7nPD14OaO1O" resolve="RuleEx" />
+            <ref role="3uigEE" to="ugy2:7nPD14OaO1O" resolve="RuleEx" />
           </node>
         </node>
       </node>
@@ -9951,7 +9951,7 @@
           <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
         </node>
         <node concept="3uibUv" id="6jc_YgcP7Lo" role="3rvSg0">
-          <ref role="3uigEE" to="i348:7nPD14OaO1O" resolve="RuleEx" />
+          <ref role="3uigEE" to="ugy2:7nPD14OaO1O" resolve="RuleEx" />
         </node>
       </node>
       <node concept="2ShNRf" id="6jc_YgcPabH" role="33vP2m">
@@ -9960,7 +9960,7 @@
             <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
           </node>
           <node concept="3uibUv" id="6jc_YgcPbDq" role="3rHtpV">
-            <ref role="3uigEE" to="i348:7nPD14OaO1O" resolve="RuleEx" />
+            <ref role="3uigEE" to="ugy2:7nPD14OaO1O" resolve="RuleEx" />
           </node>
         </node>
       </node>
@@ -9973,7 +9973,7 @@
         <node concept="3Tqbb2" id="6jc_YgcQruZ" role="3rvQeY" />
         <node concept="3vKaQO" id="6jc_YgcQtg9" role="3rvSg0">
           <node concept="3uibUv" id="6jc_YgcQtga" role="3O5elw">
-            <ref role="3uigEE" to="i348:7nPD14OaO1O" resolve="RuleEx" />
+            <ref role="3uigEE" to="ugy2:7nPD14OaO1O" resolve="RuleEx" />
           </node>
         </node>
       </node>
@@ -9982,7 +9982,7 @@
           <node concept="3Tqbb2" id="6jc_YgcQtr3" role="3rHrn6" />
           <node concept="3vKaQO" id="6jc_YgcQvcf" role="3rHtpV">
             <node concept="3uibUv" id="6jc_YgcQvcg" role="3O5elw">
-              <ref role="3uigEE" to="i348:7nPD14OaO1O" resolve="RuleEx" />
+              <ref role="3uigEE" to="ugy2:7nPD14OaO1O" resolve="RuleEx" />
             </node>
           </node>
         </node>
@@ -9995,7 +9995,7 @@
         <node concept="3Tqbb2" id="6jc_YgcQvjl" role="3rvQeY" />
         <node concept="3vKaQO" id="6jc_YgcQvjm" role="3rvSg0">
           <node concept="3uibUv" id="6jc_YgcQvjn" role="3O5elw">
-            <ref role="3uigEE" to="i348:7nPD14OaO1O" resolve="RuleEx" />
+            <ref role="3uigEE" to="ugy2:7nPD14OaO1O" resolve="RuleEx" />
           </node>
         </node>
       </node>
@@ -10004,7 +10004,7 @@
           <node concept="3Tqbb2" id="6jc_YgcQvjq" role="3rHrn6" />
           <node concept="3vKaQO" id="6jc_YgcQvjr" role="3rHtpV">
             <node concept="3uibUv" id="6jc_YgcQvjs" role="3O5elw">
-              <ref role="3uigEE" to="i348:7nPD14OaO1O" resolve="RuleEx" />
+              <ref role="3uigEE" to="ugy2:7nPD14OaO1O" resolve="RuleEx" />
             </node>
           </node>
         </node>
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking.test/jetbrains.mps.coderules.typechecking.test.msd b/coderules/solutions/jetbrains.mps.coderules.typechecking.test/jetbrains.mps.coderules.typechecking.test.msd
index 5458ae1f..b380a6c0 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking.test/jetbrains.mps.coderules.typechecking.test.msd
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking.test/jetbrains.mps.coderules.typechecking.test.msd
@@ -14,23 +14,16 @@
   <dependencies>
     <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
     <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</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">6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.coderules.typechecking)</dependency>
     <dependency reexport="false">f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)</dependency>
     <dependency reexport="false">f9bad4b1-59da-4f20-8feb-9f4cc4ad872e(jetbrains.mps.coderules.typechecking.testlang.sandbox)</dependency>
     <dependency reexport="false">3a1f0f04-b5e0-43be-884e-b856bfdeca21(jetbrains.mps.typechecking.testlang)</dependency>
     <dependency reexport="false">b189d6c6-9397-4d64-88af-1ac73760a4f5(jetbrains.mps.logic.test)</dependency>
-    <dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
     <dependency reexport="true">26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)</dependency>
-    <dependency reexport="false">c4803b19-6d89-4a3b-bf82-390769514add(jetbrains.mps.lang.coderules)</dependency>
-    <dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
-    <dependency reexport="false">f113d56b-63e3-4120-a89c-2f5dcb8c6290(jetbrains.mps.coderules.runtime)</dependency>
-    <dependency reexport="false">7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)</dependency>
     <dependency reexport="false">f97d84b2-8bad-4fdd-8ede-da17b3eacf4c(jetbrains.mps.coderules)</dependency>
     <dependency reexport="false">bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)</dependency>
-    <dependency reexport="false">8585453e-6bfb-4d80-98de-b16074f1d86c(jetbrains.mps.lang.test)</dependency>
-    <dependency reexport="false">02473356-2f59-4de1-ba87-e88f9d606180(jetbrains.mps.coderules.testhelper)</dependency>
+    <dependency reexport="false">a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
@@ -62,36 +55,15 @@
     <module reference="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" version="0" />
     <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
     <module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
-    <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
-    <module reference="443f4c36-fcf5-4eb6-9500-8d06ed259e3e(jetbrains.mps.baseLanguage.classifiers)" version="0" />
-    <module reference="fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)" version="0" />
-    <module reference="83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)" version="0" />
-    <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
-    <module reference="f61473f9-130f-42f6-b98d-6c438812c2f6(jetbrains.mps.baseLanguage.unitTest)" version="0" />
     <module reference="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c(jetbrains.mps.coderules)" version="0" />
-    <module reference="f113d56b-63e3-4120-a89c-2f5dcb8c6290(jetbrains.mps.coderules.runtime)" version="0" />
-    <module reference="02473356-2f59-4de1-ba87-e88f9d606180(jetbrains.mps.coderules.testhelper)" version="0" />
     <module reference="6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.coderules.typechecking)" version="0" />
     <module reference="c9670c16-a215-41fb-8784-04b14329799d(jetbrains.mps.coderules.typechecking.test)" version="0" />
     <module reference="f9bad4b1-59da-4f20-8feb-9f4cc4ad872e(jetbrains.mps.coderules.typechecking.testlang.sandbox)" version="0" />
     <module reference="35e2a720-13d8-4eda-88d3-ff9d78d5a3ae(jetbrains.mps.coderules.typechecking.ui)" version="0" />
     <module reference="bfbdd672-7ff5-403f-af4f-16da5226f34c(jetbrains.mps.findUsages.runtime)" version="0" />
-    <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
-    <module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
-    <module reference="c4803b19-6d89-4a3b-bf82-390769514add(jetbrains.mps.lang.coderules)" version="0" />
     <module reference="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" version="0" />
-    <module reference="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
-    <module reference="f4ad079d-bc71-4ffb-9600-9328705cf998(jetbrains.mps.lang.descriptor)" version="0" />
-    <module reference="446c26eb-2b7b-4bf0-9b35-f83fa582753e(jetbrains.mps.lang.modelapi)" version="0" />
-    <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
-    <module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="1" />
-    <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
-    <module reference="8585453e-6bfb-4d80-98de-b16074f1d86c(jetbrains.mps.lang.test)" version="0" />
-    <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" version="0" />
-    <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
-    <module reference="35320f26-77cb-4c55-be9f-a97a27770af1(jetbrains.mps.logic)" 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="b189d6c6-9397-4d64-88af-1ac73760a4f5(jetbrains.mps.logic.test)" version="0" />
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.scheduling@tests.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.scheduling@tests.mps
index 6f758088..0c15fa8b 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.scheduling@tests.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.scheduling@tests.mps
@@ -14,7 +14,6 @@
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
     <import index="5zyv" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.concurrent(JDK/)" />
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
-    <import index="tj24" ref="r:0fbbb63a-fd15-46e1-8136-78049f6d6e63(jetbrains.mps.coderules.typechecking.service)" />
     <import index="unkn" ref="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c/java:io.reactivex(jetbrains.mps.coderules/)" />
     <import index="f4yq" ref="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c/java:hu.akarnokd.rxjava2.swing(jetbrains.mps.coderules/)" />
     <import index="m4y7" ref="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c/java:io.reactivex.schedulers(jetbrains.mps.coderules/)" />
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking@tests.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking@tests.mps
index a1aca652..6a5d1af2 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking@tests.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking@tests.mps
@@ -24,25 +24,21 @@
     <import index="hano" ref="r:2b43b673-12f9-49ea-8e43-d0c7a401586a(jetbrains.mps.lang.coderules.eval)" />
     <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
     <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
-    <import index="fqlx" ref="r:2cc226a9-8a78-4010-b962-823343fd28ff(jetbrains.mps.lang.coderules.aspect)" />
     <import index="tj24" ref="r:0fbbb63a-fd15-46e1-8136-78049f6d6e63(jetbrains.mps.coderules.typechecking.service)" />
-    <import index="qox2" ref="r:7ff0776c-aea4-4df2-88a3-2efb6b568dc3(jetbrains.mps.coderules.typechecking.plugin)" />
-    <import index="i348" ref="r:42a15dec-83a9-4fe1-80d6-3bf898c512bd(jetbrains.mps.lang.coderules.template)" />
     <import index="u46i" ref="r:c2760840-3210-4ad4-9e64-a2dfd53620e1(jetbrains.mps.lang.typechecking.aspect)" />
     <import index="sppd" ref="r:0e60ac07-77c3-4d5c-b40d-73e8fd128592(jetbrains.mps.coderules.typechecking.testlang.sandbox.test)" />
     <import index="qulx" ref="r:ec0979fb-ae37-4823-9eaa-8550d9f5c6fd(jetbrains.mps.typechecking.testlang.structure)" />
-    <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.dataform)" />
     <import index="mqqo" ref="r:82cec6f7-ddec-440c-961c-1c598267be42(jetbrains.mps.logic.test.unification)" />
     <import index="bj13" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.logical(jetbrains.mps.logic.reactor/)" />
-    <import index="oy3s" ref="r:a6030cee-34eb-4503-b1bf-015fe5cd8c1a(jetbrains.mps.logic.unification)" />
     <import index="yt73" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.unification(jetbrains.mps.logic.reactor/)" />
     <import index="et5u" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.messages(MPS.Core/)" />
-    <import index="w7la" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.evaluation(jetbrains.mps.logic.reactor/)" />
     <import index="82uw" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.function(JDK/)" />
-    <import index="31yc" ref="r:0c18ff61-1cb9-4ff0-a899-c949ad03f97c(jetbrains.mps.coderules.plugin)" />
     <import index="ksgm" ref="r:6285678b-007f-4527-bcf5-6fd38ba8c969(jetbrains.mps.lang.coderules.program)" />
-    <import index="psoy" ref="r:78313117-90ee-47a5-a91e-b5213df7f611(jetbrains.mps.coderules.runtime.result)" />
-    <import index="2gg1" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.errors(MPS.Core/)" />
+    <import index="xydz" ref="r:b198cb67-efdc-40c0-8817-11ab64523a5b(jetbrains.mps.lang.coderules.result)" />
+    <import index="pxw9" ref="r:e3417884-ba0a-4330-9cea-64f01ace2e9d(jetbrains.mps.lang.coderules.aspect)" />
+    <import index="ugy2" ref="r:57b2449f-b7c7-4941-bd75-9c594835f5cd(jetbrains.mps.lang.coderules.template)" />
+    <import index="cof4" ref="r:0a9d1d47-250c-4f98-8962-b65edf8b0721(jetbrains.mps.logic.dataform)" />
+    <import index="uwx2" ref="r:76101703-3fc5-4e76-aa48-9728dde91f7b(jetbrains.mps.logic.unification)" />
     <import index="guwi" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.io(JDK/)" implicit="true" />
   </imports>
   <registry>
@@ -680,18 +676,18 @@
         <node concept="17QB3L" id="6N2bvv_ux$u" role="1tU5fm" />
       </node>
       <node concept="3uibUv" id="6N2bvv_ux$v" role="3clF45">
-        <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+        <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
       </node>
       <node concept="3Tmbuc" id="6SwZmzBzvhS" role="1B3o_S" />
       <node concept="3clFbS" id="6N2bvv_ux$x" role="3clF47">
         <node concept="3clFbF" id="6N2bvv_ux$y" role="3cqZAp">
           <node concept="10QFUN" id="6N2bvv_ux$z" role="3clFbG">
             <node concept="3uibUv" id="6N2bvv_ux$$" role="10QFUM">
-              <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+              <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
             </node>
             <node concept="2YIFZM" id="3gNap3fNlJl" role="10QFUP">
-              <ref role="37wK5l" to="oy3s:4TCblo5YI1H" resolve="asDataForm" />
-              <ref role="1Pybhc" to="oy3s:677NV565N1x" resolve="LogicalUtil" />
+              <ref role="37wK5l" to="uwx2:4TCblo5YI1H" resolve="asDataForm" />
+              <ref role="1Pybhc" to="uwx2:677NV565N1x" resolve="LogicalUtil" />
               <node concept="2YIFZM" id="YbzkzLdcYi" role="37wK5m">
                 <ref role="37wK5l" to="bj13:~LogicalKt.namedLogical(java.lang.String)" resolve="namedLogical" />
                 <ref role="1Pybhc" to="bj13:~LogicalKt" resolve="LogicalKt" />
@@ -724,7 +720,7 @@
               <node concept="1eOMI4" id="390NiL162Ks" role="2Oq$k0">
                 <node concept="10QFUN" id="390NiL162Kt" role="1eOMHV">
                   <node concept="3uibUv" id="390NiL162Ku" role="10QFUM">
-                    <ref role="3uigEE" to="oy3s:4TCblo5MJ1m" resolve="LogicalDataForm" />
+                    <ref role="3uigEE" to="uwx2:4TCblo5MJ1m" resolve="LogicalDataForm" />
                     <node concept="3uibUv" id="390NiL162Kv" role="11_B2D">
                       <ref role="3uigEE" to="yt73:~Term" resolve="Term" />
                     </node>
@@ -735,7 +731,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="390NiL162Kx" role="2OqNvi">
-                <ref role="37wK5l" to="oy3s:4TCblo5MS1o" resolve="logical" />
+                <ref role="37wK5l" to="uwx2:4TCblo5MS1o" resolve="logical" />
               </node>
             </node>
             <node concept="3uibUv" id="390NiL162LH" role="10QFUM">
@@ -750,7 +746,7 @@
       <node concept="37vLTG" id="390NiL15T4p" role="3clF46">
         <property role="TrG5h" value="v" />
         <node concept="3uibUv" id="390NiL15T4o" role="1tU5fm">
-          <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+          <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
         </node>
       </node>
     </node>
@@ -823,7 +819,7 @@
             <node concept="3cpWsn" id="3HJTsBn443w" role="3cpWs9">
               <property role="TrG5h" value="orig" />
               <node concept="3uibUv" id="3HJTsBn443x" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="3HJTsBn443y" role="33vP2m">
                 <node concept="1oi5UN" id="3HJTsBn443z" role="1oi0x0">
@@ -852,7 +848,7 @@
             <node concept="3cpWsn" id="2dF51l15793" role="3cpWs9">
               <property role="TrG5h" value="ptn" />
               <node concept="3uibUv" id="2dF51l15794" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="2dF51l157_h" role="33vP2m">
                 <node concept="1oi5XN" id="2dF51l157_n" role="1oi0x0">
@@ -866,7 +862,7 @@
             <node concept="3cpWsn" id="3HJTsBn443b" role="3cpWs9">
               <property role="TrG5h" value="x" />
               <node concept="3uibUv" id="3HJTsBn443c" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="3HJTsBn443d" role="33vP2m">
                 <ref role="37wK5l" node="6N2bvv_ux$s" resolve="termvar" />
@@ -880,7 +876,7 @@
             <node concept="3cpWsn" id="3HJTsBn443g" role="3cpWs9">
               <property role="TrG5h" value="expect" />
               <node concept="3uibUv" id="3HJTsBn443h" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="3HJTsBn443i" role="33vP2m">
                 <node concept="1oi5UN" id="3HJTsBn443j" role="1oi0x0">
@@ -972,7 +968,7 @@
           <node concept="3vwNmj" id="2dF51l1598n" role="3cqZAp">
             <node concept="2ZW3vV" id="2dF51l159$w" role="3vwVQn">
               <node concept="3uibUv" id="2dF51l159$T" role="2ZW6by">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="37vLTw" id="2dF51l159oy" role="2ZW6bz">
                 <ref role="3cqZAo" node="2dF51l158Lj" resolve="subst" />
@@ -1006,7 +1002,7 @@
             <node concept="3cpWsn" id="2dF51l16O2v" role="3cpWs9">
               <property role="TrG5h" value="orig" />
               <node concept="3uibUv" id="2dF51l16O2w" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="2dF51l16O2x" role="33vP2m">
                 <node concept="1oi5UN" id="2dF51l16O2y" role="1oi0x0">
@@ -1041,7 +1037,7 @@
             <node concept="3cpWsn" id="2dF51l16O2E" role="3cpWs9">
               <property role="TrG5h" value="ptn" />
               <node concept="3uibUv" id="2dF51l16O2F" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="2dF51l16O2G" role="33vP2m">
                 <node concept="1oi5UN" id="2dF51l16OXz" role="1oi0x0">
@@ -1066,7 +1062,7 @@
             <node concept="3cpWsn" id="2dF51l16O2K" role="3cpWs9">
               <property role="TrG5h" value="x" />
               <node concept="3uibUv" id="2dF51l16O2L" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="2dF51l16O2M" role="33vP2m">
                 <ref role="37wK5l" node="6N2bvv_ux$s" resolve="termvar" />
@@ -1080,7 +1076,7 @@
             <node concept="3cpWsn" id="2dF51l16O2P" role="3cpWs9">
               <property role="TrG5h" value="expect" />
               <node concept="3uibUv" id="2dF51l16O2Q" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="2dF51l16O2R" role="33vP2m">
                 <node concept="1oi5UN" id="2dF51l16O2S" role="1oi0x0">
@@ -1166,7 +1162,7 @@
           <node concept="3vwNmj" id="2dF51l16O3o" role="3cqZAp">
             <node concept="2ZW3vV" id="2dF51l16O3p" role="3vwVQn">
               <node concept="3uibUv" id="2dF51l16O3q" role="2ZW6by">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="37vLTw" id="2dF51l16O3r" role="2ZW6bz">
                 <ref role="3cqZAo" node="2dF51l16O3g" resolve="subst" />
@@ -1200,7 +1196,7 @@
             <node concept="3cpWsn" id="2dF51l195XT" role="3cpWs9">
               <property role="TrG5h" value="orig" />
               <node concept="3uibUv" id="2dF51l195XU" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="2dF51l195XV" role="33vP2m">
                 <node concept="1oi5UN" id="2dF51l195XW" role="1oi0x0">
@@ -1251,7 +1247,7 @@
             <node concept="3cpWsn" id="2dF51l195Y6" role="3cpWs9">
               <property role="TrG5h" value="ptn" />
               <node concept="3uibUv" id="2dF51l195Y7" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="2dF51l195Y8" role="33vP2m">
                 <node concept="1oi5UN" id="2dF51l195Y9" role="1oi0x0">
@@ -1281,7 +1277,7 @@
             <node concept="3cpWsn" id="2dF51l1971a" role="3cpWs9">
               <property role="TrG5h" value="repl" />
               <node concept="3uibUv" id="2dF51l1971b" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="2dF51l1971c" role="33vP2m">
                 <node concept="1oi5UN" id="2dF51l1971d" role="1oi0x0">
@@ -1306,7 +1302,7 @@
             <node concept="3cpWsn" id="2dF51l1981l" role="3cpWs9">
               <property role="TrG5h" value="expect" />
               <node concept="3uibUv" id="2dF51l1981m" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="2dF51l1981n" role="33vP2m">
                 <node concept="1oi5UN" id="2dF51l1981o" role="1oi0x0">
@@ -1409,7 +1405,7 @@
           <node concept="3vwNmj" id="2dF51l195YQ" role="3cqZAp">
             <node concept="2ZW3vV" id="2dF51l195YR" role="3vwVQn">
               <node concept="3uibUv" id="2dF51l195YS" role="2ZW6by">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="37vLTw" id="2dF51l195YT" role="2ZW6bz">
                 <ref role="3cqZAo" node="2dF51l195YI" resolve="subst" />
@@ -1443,7 +1439,7 @@
             <node concept="3cpWsn" id="2dF51l1cRsd" role="3cpWs9">
               <property role="TrG5h" value="x" />
               <node concept="3uibUv" id="2dF51l1cRse" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="2dF51l1cRsf" role="33vP2m">
                 <ref role="37wK5l" node="6N2bvv_ux$s" resolve="termvar" />
@@ -1457,7 +1453,7 @@
             <node concept="3cpWsn" id="2dF51l1d$S6" role="3cpWs9">
               <property role="TrG5h" value="foo1" />
               <node concept="3uibUv" id="2dF51l1d$S7" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="2dF51l1dBcf" role="33vP2m">
                 <node concept="1oi5UN" id="2dF51l1dBcl" role="1oi0x0">
@@ -1475,7 +1471,7 @@
             <node concept="3cpWsn" id="2dF51l1cNcz" role="3cpWs9">
               <property role="TrG5h" value="orig" />
               <node concept="3uibUv" id="2dF51l1cNc$" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="2dF51l1cNc_" role="33vP2m">
                 <node concept="1oi5UN" id="2dF51l1cNcA" role="1oi0x0">
@@ -1525,7 +1521,7 @@
             <node concept="3cpWsn" id="2dF51l1dG8z" role="3cpWs9">
               <property role="TrG5h" value="y" />
               <node concept="3uibUv" id="2dF51l1dG8$" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="2dF51l1dG8_" role="33vP2m">
                 <ref role="37wK5l" node="6N2bvv_ux$s" resolve="termvar" />
@@ -1539,7 +1535,7 @@
             <node concept="3cpWsn" id="2dF51l1dEVg" role="3cpWs9">
               <property role="TrG5h" value="foo2" />
               <node concept="3uibUv" id="2dF51l1dEVh" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="2dF51l1dEVi" role="33vP2m">
                 <node concept="1oi5UN" id="2dF51l1dEVj" role="1oi0x0">
@@ -1557,7 +1553,7 @@
             <node concept="3cpWsn" id="2dF51l1cNcR" role="3cpWs9">
               <property role="TrG5h" value="ptn" />
               <node concept="3uibUv" id="2dF51l1cNcS" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="2dF51l1cNcT" role="33vP2m">
                 <node concept="1oi5UN" id="2dF51l1cNcU" role="1oi0x0">
@@ -1586,7 +1582,7 @@
             <node concept="3cpWsn" id="2dF51l1cNd3" role="3cpWs9">
               <property role="TrG5h" value="repl" />
               <node concept="3uibUv" id="2dF51l1cNd4" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="2dF51l1cNd5" role="33vP2m">
                 <node concept="1oi5UN" id="2dF51l1cNd6" role="1oi0x0">
@@ -1611,7 +1607,7 @@
             <node concept="3cpWsn" id="2dF51l1cNdd" role="3cpWs9">
               <property role="TrG5h" value="expect" />
               <node concept="3uibUv" id="2dF51l1cNde" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="2dF51l1cNdf" role="33vP2m">
                 <node concept="1oi5UN" id="2dF51l1cNdg" role="1oi0x0">
@@ -1734,16 +1730,16 @@
                   <node concept="3uibUv" id="2dF51l1dp$Q" role="10QFUM">
                     <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                     <node concept="3uibUv" id="2dF51l1drx0" role="11_B2D">
-                      <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                      <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                     </node>
                   </node>
                   <node concept="2OqwBi" id="2dF51l1dp$j" role="10QFUP">
                     <node concept="1eOMI4" id="2dF51l1dp$k" role="2Oq$k0">
                       <node concept="10QFUN" id="2dF51l1dp$l" role="1eOMHV">
                         <node concept="3uibUv" id="2dF51l1dp$m" role="10QFUM">
-                          <ref role="3uigEE" to="oy3s:4TCblo5MJ1m" resolve="LogicalDataForm" />
+                          <ref role="3uigEE" to="uwx2:4TCblo5MJ1m" resolve="LogicalDataForm" />
                           <node concept="3uibUv" id="2dF51l1dp$n" role="11_B2D">
-                            <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                            <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                           </node>
                         </node>
                         <node concept="37vLTw" id="2dF51l1dp$o" role="10QFUP">
@@ -1752,7 +1748,7 @@
                       </node>
                     </node>
                     <node concept="liA8E" id="2dF51l1dp$p" role="2OqNvi">
-                      <ref role="37wK5l" to="oy3s:4TCblo5MS1o" resolve="logical" />
+                      <ref role="37wK5l" to="uwx2:4TCblo5MS1o" resolve="logical" />
                     </node>
                   </node>
                 </node>
@@ -1814,16 +1810,16 @@
                   <node concept="3uibUv" id="2dF51l1dNCr" role="10QFUM">
                     <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
                     <node concept="3uibUv" id="2dF51l1dNCs" role="11_B2D">
-                      <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                      <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                     </node>
                   </node>
                   <node concept="2OqwBi" id="2dF51l1dNCt" role="10QFUP">
                     <node concept="1eOMI4" id="2dF51l1dNCu" role="2Oq$k0">
                       <node concept="10QFUN" id="2dF51l1dNCv" role="1eOMHV">
                         <node concept="3uibUv" id="2dF51l1dNCw" role="10QFUM">
-                          <ref role="3uigEE" to="oy3s:4TCblo5MJ1m" resolve="LogicalDataForm" />
+                          <ref role="3uigEE" to="uwx2:4TCblo5MJ1m" resolve="LogicalDataForm" />
                           <node concept="3uibUv" id="2dF51l1dNCx" role="11_B2D">
-                            <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                            <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                           </node>
                         </node>
                         <node concept="37vLTw" id="2dF51l1dNFG" role="10QFUP">
@@ -1832,7 +1828,7 @@
                       </node>
                     </node>
                     <node concept="liA8E" id="2dF51l1dNCz" role="2OqNvi">
-                      <ref role="37wK5l" to="oy3s:4TCblo5MS1o" resolve="logical" />
+                      <ref role="37wK5l" to="uwx2:4TCblo5MS1o" resolve="logical" />
                     </node>
                   </node>
                 </node>
@@ -1873,7 +1869,7 @@
           <node concept="3vwNmj" id="2dF51l1d4MI" role="3cqZAp">
             <node concept="2ZW3vV" id="2dF51l1d4MJ" role="3vwVQn">
               <node concept="3uibUv" id="2dF51l1d4MK" role="2ZW6by">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="37vLTw" id="2dF51l1d5Uy" role="2ZW6bz">
                 <ref role="3cqZAo" node="2dF51l1d4MN" resolve="subst3" />
@@ -1907,7 +1903,7 @@
             <node concept="3cpWsn" id="2dF51l14XE4" role="3cpWs9">
               <property role="TrG5h" value="x" />
               <node concept="3uibUv" id="2dF51l14XE5" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="2dF51l14XE6" role="33vP2m">
                 <ref role="37wK5l" node="6N2bvv_ux$s" resolve="termvar" />
@@ -1921,7 +1917,7 @@
             <node concept="3cpWsn" id="2dF51l14XE9" role="3cpWs9">
               <property role="TrG5h" value="orig" />
               <node concept="3uibUv" id="2dF51l14XEa" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="2dF51l14XEb" role="33vP2m">
                 <node concept="1oi5UN" id="2dF51l14XEc" role="1oi0x0">
@@ -1955,7 +1951,7 @@
             <node concept="3cpWsn" id="2dF51l15WBA" role="3cpWs9">
               <property role="TrG5h" value="ptn" />
               <node concept="3uibUv" id="2dF51l15WBB" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="37vLTw" id="2dF51l15WCI" role="33vP2m">
                 <ref role="3cqZAo" node="2dF51l14XE4" resolve="x" />
@@ -1967,7 +1963,7 @@
             <node concept="3cpWsn" id="2dF51l15RNn" role="3cpWs9">
               <property role="TrG5h" value="y" />
               <node concept="3uibUv" id="2dF51l15RNo" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="2dF51l15RNp" role="33vP2m">
                 <ref role="37wK5l" node="6N2bvv_ux$s" resolve="termvar" />
@@ -1981,7 +1977,7 @@
             <node concept="3cpWsn" id="2dF51l14XEm" role="3cpWs9">
               <property role="TrG5h" value="expect" />
               <node concept="3uibUv" id="2dF51l14XEn" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="2dF51l14XEo" role="33vP2m">
                 <node concept="1oi5UN" id="2dF51l14XEp" role="1oi0x0">
@@ -2073,7 +2069,7 @@
           <node concept="3vwNmj" id="2dF51l15YMD" role="3cqZAp">
             <node concept="2ZW3vV" id="2dF51l15YME" role="3vwVQn">
               <node concept="3uibUv" id="2dF51l15YMF" role="2ZW6by">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="37vLTw" id="2dF51l15YMG" role="2ZW6bz">
                 <ref role="3cqZAo" node="2dF51l15YMx" resolve="subst" />
@@ -2107,7 +2103,7 @@
             <node concept="3cpWsn" id="6SwZmzBziam" role="3cpWs9">
               <property role="TrG5h" value="X" />
               <node concept="3uibUv" id="6SwZmzBziaj" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="6SwZmzBzian" role="33vP2m">
                 <ref role="37wK5l" node="6N2bvv_ux$s" resolve="termvar" />
@@ -2121,7 +2117,7 @@
             <node concept="3cpWsn" id="6SwZmzBzjBZ" role="3cpWs9">
               <property role="TrG5h" value="Y" />
               <node concept="3uibUv" id="6SwZmzBzjBX" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="6SwZmzBzjC0" role="33vP2m">
                 <ref role="37wK5l" node="6N2bvv_ux$s" resolve="termvar" />
@@ -2152,7 +2148,7 @@
             <node concept="3cpWsn" id="6SwZmzBzBck" role="3cpWs9">
               <property role="TrG5h" value="origin" />
               <node concept="3uibUv" id="6SwZmzBzD9v" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="6SwZmzBzBcl" role="33vP2m">
                 <node concept="1oi5UN" id="6SwZmzBzBcm" role="1oi0x0">
@@ -2227,7 +2223,7 @@
             <node concept="3cpWsn" id="6SwZmzB$bUK" role="3cpWs9">
               <property role="TrG5h" value="Z" />
               <node concept="3uibUv" id="6SwZmzB$bUH" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="6SwZmzB$bUL" role="33vP2m">
                 <ref role="37wK5l" node="6N2bvv_ux$s" resolve="termvar" />
@@ -2241,7 +2237,7 @@
             <node concept="3cpWsn" id="6SwZmzB$e8f" role="3cpWs9">
               <property role="TrG5h" value="expect" />
               <node concept="3uibUv" id="6SwZmzB$e8g" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="6SwZmzB$e8h" role="33vP2m">
                 <node concept="1oi5UN" id="6SwZmzB$e8i" role="1oi0x0">
@@ -2345,7 +2341,7 @@
             <node concept="3cpWsn" id="6SwZmzBGFuu" role="3cpWs9">
               <property role="TrG5h" value="X" />
               <node concept="3uibUv" id="6SwZmzBGFuv" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="6SwZmzBGFuw" role="33vP2m">
                 <ref role="37wK5l" node="6N2bvv_ux$s" resolve="termvar" />
@@ -2359,7 +2355,7 @@
             <node concept="3cpWsn" id="6SwZmzBGFuz" role="3cpWs9">
               <property role="TrG5h" value="Y" />
               <node concept="3uibUv" id="6SwZmzBGFu$" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="6SwZmzBGFu_" role="33vP2m">
                 <ref role="37wK5l" node="6N2bvv_ux$s" resolve="termvar" />
@@ -2390,7 +2386,7 @@
             <node concept="3cpWsn" id="6SwZmzBGFuX" role="3cpWs9">
               <property role="TrG5h" value="origin" />
               <node concept="3uibUv" id="6SwZmzBGFuY" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="6SwZmzBGFuZ" role="33vP2m">
                 <node concept="1oi5UN" id="6SwZmzBGFv0" role="1oi0x0">
@@ -2487,7 +2483,7 @@
             <node concept="3cpWsn" id="6SwZmzBGXRs" role="3cpWs9">
               <property role="TrG5h" value="pattern1" />
               <node concept="3uibUv" id="6SwZmzBGYA8" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="6SwZmzBGXRt" role="33vP2m">
                 <node concept="1oi5UN" id="6SwZmzBGXRu" role="1oi0x0">
@@ -2515,7 +2511,7 @@
             <node concept="3cpWsn" id="6SwZmzBHlpa" role="3cpWs9">
               <property role="TrG5h" value="pattern2" />
               <node concept="3uibUv" id="6SwZmzBHlpb" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="6SwZmzBHlpc" role="33vP2m">
                 <node concept="1oi5UN" id="6SwZmzBHlpd" role="1oi0x0">
@@ -2544,7 +2540,7 @@
             <node concept="3cpWsn" id="6SwZmzBGFvd" role="3cpWs9">
               <property role="TrG5h" value="Z" />
               <node concept="3uibUv" id="6SwZmzBGFve" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="6SwZmzBGFvf" role="33vP2m">
                 <ref role="37wK5l" node="6N2bvv_ux$s" resolve="termvar" />
@@ -2558,7 +2554,7 @@
             <node concept="3cpWsn" id="6SwZmzBGFvi" role="3cpWs9">
               <property role="TrG5h" value="expect" />
               <node concept="3uibUv" id="6SwZmzBGFvj" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="6SwZmzBGFvk" role="33vP2m">
                 <node concept="1oi5UN" id="6SwZmzBGFvl" role="1oi0x0">
@@ -3190,7 +3186,7 @@
                   <property role="TrG5h" value="acs" />
                   <node concept="3vKaQO" id="3KN3A4v4PGr" role="1tU5fm">
                     <node concept="3uibUv" id="3KN3A4v4PGy" role="3O5elw">
-                      <ref role="3uigEE" to="fqlx:3KN3A4uUhmW" resolve="AspectClique" />
+                      <ref role="3uigEE" to="pxw9:3KN3A4uUhmW" resolve="AspectClique" />
                       <node concept="3uibUv" id="3KN3A4v4PGz" role="11_B2D">
                         <ref role="3uigEE" to="u46i:7km57Pkjxf4" resolve="TypecheckingAspect" />
                       </node>
@@ -3205,7 +3201,7 @@
                       </node>
                     </node>
                     <node concept="liA8E" id="IFW4V2EpHM" role="2OqNvi">
-                      <ref role="37wK5l" to="fqlx:NKt6ynoYr0" resolve="allForModel" />
+                      <ref role="37wK5l" to="pxw9:NKt6ynoYr0" resolve="allForModel" />
                       <node concept="2OqwBi" id="3KN3A4v4Q8V" role="37wK5m">
                         <node concept="37vLTw" id="3KN3A4v4Q8W" role="2Oq$k0">
                           <ref role="3cqZAo" node="7mB3viLf32I" resolve="demo" />
@@ -3260,7 +3256,7 @@
                 <node concept="3cpWsn" id="3KN3A4vAiqQ" role="3cpWs9">
                   <property role="TrG5h" value="ac" />
                   <node concept="3uibUv" id="3KN3A4vAigj" role="1tU5fm">
-                    <ref role="3uigEE" to="fqlx:3KN3A4uUhmW" resolve="AspectClique" />
+                    <ref role="3uigEE" to="pxw9:3KN3A4uUhmW" resolve="AspectClique" />
                     <node concept="3uibUv" id="3KN3A4vAigm" role="11_B2D">
                       <ref role="3uigEE" to="u46i:7km57Pkjxf4" resolve="TypecheckingAspect" />
                     </node>
@@ -3280,7 +3276,7 @@
                                     <ref role="3cqZAo" node="6E5fMGvfKRI" resolve="it" />
                                   </node>
                                   <node concept="liA8E" id="37zP$quALOp" role="2OqNvi">
-                                    <ref role="37wK5l" to="fqlx:3KN3A4uUhpW" resolve="aspects" />
+                                    <ref role="37wK5l" to="pxw9:3KN3A4uUhpW" resolve="aspects" />
                                   </node>
                                 </node>
                                 <node concept="34oBXx" id="37zP$quANfg" role="2OqNvi" />
@@ -3417,7 +3413,7 @@
                   <property role="TrG5h" value="queryTemplates" />
                   <node concept="_YKpA" id="9UUIHJASIe" role="1tU5fm">
                     <node concept="3uibUv" id="9UUIHJASIf" role="_ZDj9">
-                      <ref role="3uigEE" to="i348:6OXbTD$iNPP" resolve="QueryTemplate" />
+                      <ref role="3uigEE" to="ugy2:6OXbTD$iNPP" resolve="QueryTemplate" />
                       <node concept="3qTvmN" id="9UUIHJBX4N" role="11_B2D" />
                     </node>
                   </node>
@@ -3528,7 +3524,7 @@
                     <ref role="3cqZAo" node="61G6TdBqDRk" resolve="macroProcessing" />
                   </node>
                   <node concept="liA8E" id="4LE1vMPb0OL" role="2OqNvi">
-                    <ref role="37wK5l" to="i348:7DvO2M9IiMh" resolve="putParameter" />
+                    <ref role="37wK5l" to="ugy2:7DvO2M9IiMh" resolve="putParameter" />
                     <node concept="10M0yZ" id="4LE1vMPb34s" role="37wK5m">
                       <ref role="3cqZAo" to="tj24:4qGA5WCVux3" resolve="TYPES_COLLECTOR" />
                       <ref role="1PxDUh" to="tj24:4Z$O9mrQIzY" resolve="TypecheckingState" />
@@ -3599,7 +3595,7 @@
                 <node concept="3cpWsn" id="6$7vuu2ujxR" role="3cpWs9">
                   <property role="TrG5h" value="res" />
                   <node concept="3uibUv" id="6$7vuu2ujxH" role="1tU5fm">
-                    <ref role="3uigEE" to="psoy:7Oc59RSEjdb" resolve="Result" />
+                    <ref role="3uigEE" to="xydz:7Oc59RSEjdb" resolve="Result" />
                   </node>
                   <node concept="2OqwBi" id="6$7vuu2ujxS" role="33vP2m">
                     <node concept="37vLTw" id="6$7vuu2ujxT" role="2Oq$k0">
@@ -3653,7 +3649,7 @@
                     <ref role="3cqZAo" node="6$7vuu2ujxR" resolve="res" />
                   </node>
                   <node concept="liA8E" id="6$7vuu2usrG" role="2OqNvi">
-                    <ref role="37wK5l" to="psoy:7Oc59RS_hsj" resolve="isSuccessful" />
+                    <ref role="37wK5l" to="xydz:7Oc59RS_hsj" resolve="isSuccessful" />
                   </node>
                 </node>
               </node>
@@ -3695,11 +3691,11 @@
                 <node concept="3cpWsn" id="6QH_LDtbV6b" role="3cpWs9">
                   <property role="TrG5h" value="res2" />
                   <node concept="3uibUv" id="6QH_LDtbV6c" role="1tU5fm">
-                    <ref role="3uigEE" to="psoy:7Oc59RSEjdb" resolve="Result" />
+                    <ref role="3uigEE" to="xydz:7Oc59RSEjdb" resolve="Result" />
                   </node>
                   <node concept="2YIFZM" id="7TC1Xcd$6oA" role="33vP2m">
-                    <ref role="37wK5l" to="psoy:7Oc59RSEjeq" resolve="OK" />
-                    <ref role="1Pybhc" to="psoy:7Oc59RSEjdb" resolve="Result" />
+                    <ref role="37wK5l" to="xydz:7Oc59RSEjeq" resolve="OK" />
+                    <ref role="1Pybhc" to="xydz:7Oc59RSEjdb" resolve="Result" />
                   </node>
                 </node>
               </node>
@@ -3713,7 +3709,7 @@
                       <ref role="3cqZAo" node="6QH_LDtbV6b" resolve="res2" />
                     </node>
                     <node concept="liA8E" id="1CcQBrQs3tX" role="2OqNvi">
-                      <ref role="37wK5l" to="psoy:7nkyKX7v7xb" resolve="and" />
+                      <ref role="37wK5l" to="xydz:7nkyKX7v7xb" resolve="and" />
                       <node concept="2OqwBi" id="6QH_LDtbV6d" role="37wK5m">
                         <node concept="37vLTw" id="6QH_LDtbV6e" role="2Oq$k0">
                           <ref role="3cqZAo" node="6QH_LDtbV5Q" resolve="evaluator" />
@@ -3745,7 +3741,7 @@
                     <ref role="3cqZAo" node="6QH_LDtbV6b" resolve="res2" />
                   </node>
                   <node concept="liA8E" id="6$7vuu2ukRI" role="2OqNvi">
-                    <ref role="37wK5l" to="psoy:7Oc59RS_hsj" resolve="isSuccessful" />
+                    <ref role="37wK5l" to="xydz:7Oc59RS_hsj" resolve="isSuccessful" />
                   </node>
                 </node>
               </node>
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking/jetbrains.mps.coderules.typechecking.msd b/coderules/solutions/jetbrains.mps.coderules.typechecking/jetbrains.mps.coderules.typechecking.msd
index 3c02e387..ab8c7f3e 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking/jetbrains.mps.coderules.typechecking.msd
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking/jetbrains.mps.coderules.typechecking.msd
@@ -13,7 +13,6 @@
   <dependencies>
     <dependency reexport="true">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
     <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
-    <dependency reexport="true">a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)</dependency>
     <dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
     <dependency reexport="false">742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
@@ -22,9 +21,7 @@
     <dependency reexport="false">0b80a2e8-f9f1-47b3-823f-56eb115bca42(jetbrains.mps.typechecking.annotation)</dependency>
     <dependency reexport="false">7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)</dependency>
     <dependency reexport="false">49808fad-9d41-4b96-83fa-9231640f6b2b(JUnit)</dependency>
-    <dependency reexport="false">ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)</dependency>
     <dependency reexport="false">26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)</dependency>
-    <dependency reexport="false">f113d56b-63e3-4120-a89c-2f5dcb8c6290(jetbrains.mps.coderules.runtime)</dependency>
     <dependency reexport="false">4d5d9aa1-7b71-4888-9100-1b793e5328a6(jetbrains.mps.coderules.ui)</dependency>
     <dependency reexport="false">a1250a4d-c090-42c3-ad7c-d298a3357dd4(jetbrains.mps.make.runtime)</dependency>
     <dependency reexport="false">019b622b-0aef-4dd3-86d0-4eef01f3f6bb(jetbrains.mps.ide)</dependency>
@@ -32,6 +29,7 @@
     <dependency reexport="true">bfbdd672-7ff5-403f-af4f-16da5226f34c(jetbrains.mps.findUsages.runtime)</dependency>
     <dependency reexport="false">498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)</dependency>
     <dependency reexport="false">3a8d80d2-32d9-f1f2-4443-6a1111e12ef3(MPS.Boot)</dependency>
+    <dependency reexport="false">bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
@@ -47,11 +45,9 @@
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
-    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
     <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
-    <language slang="l:0b80a2e8-f9f1-47b3-823f-56eb115bca42:jetbrains.mps.typechecking.annotation" version="0" />
   </languageVersions>
   <dependencyVersions>
     <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
@@ -70,7 +66,6 @@
     <module reference="83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)" version="0" />
     <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
     <module reference="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c(jetbrains.mps.coderules)" version="0" />
-    <module reference="f113d56b-63e3-4120-a89c-2f5dcb8c6290(jetbrains.mps.coderules.runtime)" version="0" />
     <module reference="6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.coderules.typechecking)" version="0" />
     <module reference="4d5d9aa1-7b71-4888-9100-1b793e5328a6(jetbrains.mps.coderules.ui)" version="0" />
     <module reference="bfbdd672-7ff5-403f-af4f-16da5226f34c(jetbrains.mps.findUsages.runtime)" version="0" />
@@ -79,7 +74,6 @@
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
     <module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
     <module reference="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" version="0" />
-    <module reference="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="446c26eb-2b7b-4bf0-9b35-f83fa582753e(jetbrains.mps.lang.modelapi)" version="0" />
     <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
@@ -89,7 +83,6 @@
     <module reference="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" version="0" />
     <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" 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="a1250a4d-c090-42c3-ad7c-d298a3357dd4(jetbrains.mps.make.runtime)" version="0" />
     <module reference="da80355b-a098-4248-9ec8-70d10dd7e9af(jetbrains.mps.reporting.runtime)" version="0" />
     <module reference="0b80a2e8-f9f1-47b3-823f-56eb115bca42(jetbrains.mps.typechecking.annotation)" version="0" />
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.plugin.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.plugin.mps
index 760bab73..e4ab0be9 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.plugin.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.plugin.mps
@@ -4,19 +4,15 @@
   <languages>
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="-1" />
-    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="-1" />
     <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="-1" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="-1" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="-1" />
-    <use id="774bf8a0-62e5-41e1-af63-f4812e60e48b" name="jetbrains.mps.baseLanguage.checkedDots" version="-1" />
     <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
-    <use id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples" version="0" />
     <use id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers" version="0" />
     <use id="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text" version="0" />
     <use id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core" version="2" />
-    <use id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources" version="2" />
   </languages>
   <imports>
     <import index="z1c3" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project(MPS.Core/)" />
@@ -36,7 +32,6 @@
     <import index="82uw" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.function(JDK/)" />
     <import index="d6hs" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.errors.item(MPS.Core/)" />
     <import index="u46i" ref="r:c2760840-3210-4ad4-9e64-a2dfd53620e1(jetbrains.mps.lang.typechecking.aspect)" />
-    <import index="fqlx" ref="r:2cc226a9-8a78-4010-b962-823343fd28ff(jetbrains.mps.lang.coderules.aspect)" />
     <import index="vndm" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel.language(MPS.Core/)" />
     <import index="z60i" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt(JDK/)" />
     <import index="4nm9" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.project(MPS.IDEA/)" />
@@ -48,7 +43,6 @@
     <import index="3qmy" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.classloading(MPS.Core/)" />
     <import index="j8aq" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.module(MPS.Core/)" />
     <import index="yyf4" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.util(MPS.OpenAPI/)" />
-    <import index="i348" ref="r:42a15dec-83a9-4fe1-80d6-3bf898c512bd(jetbrains.mps.lang.coderules.template)" />
     <import index="exr9" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.nodeEditor(MPS.Editor/)" />
     <import index="unkn" ref="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c/java:io.reactivex(jetbrains.mps.coderules/)" />
     <import index="av0y" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.program(jetbrains.mps.logic.reactor/)" />
@@ -69,7 +63,6 @@
     <import index="gspm" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.ui.popup(MPS.IDEA/)" />
     <import index="jkm4" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.ui(MPS.IDEA/)" />
     <import index="ksgm" ref="r:6285678b-007f-4527-bcf5-6fd38ba8c969(jetbrains.mps.lang.coderules.program)" />
-    <import index="psoy" ref="r:78313117-90ee-47a5-a91e-b5213df7f611(jetbrains.mps.coderules.runtime.result)" />
     <import index="57ty" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide.messages(MPS.Platform/)" />
     <import index="1m72" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.components(MPS.IDEA/)" />
     <import index="b2d5" ref="r:1a2b3027-99d2-4946-917b-f185130ac75d(jetbrains.mps.ide.findusages.findalgorithm.finders)" />
@@ -79,6 +72,9 @@
     <import index="ngmn" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.ide.findusages.view(MPS.Core/)" />
     <import index="tprs" ref="r:00000000-0000-4000-0000-011c895904a4(jetbrains.mps.ide.actions)" />
     <import index="28m1" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.time(JDK/)" />
+    <import index="xydz" ref="r:b198cb67-efdc-40c0-8817-11ab64523a5b(jetbrains.mps.lang.coderules.result)" />
+    <import index="pxw9" ref="r:e3417884-ba0a-4330-9cea-64f01ace2e9d(jetbrains.mps.lang.coderules.aspect)" />
+    <import index="ugy2" ref="r:57b2449f-b7c7-4941-bd75-9c594835f5cd(jetbrains.mps.lang.coderules.template)" />
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" implicit="true" />
   </imports>
   <registry>
@@ -928,7 +924,7 @@
           <node concept="3cpWsn" id="3KN3A4uZFCZ" role="3cpWs9">
             <property role="TrG5h" value="discoverable" />
             <node concept="3uibUv" id="3KN3A4uZFjJ" role="1tU5fm">
-              <ref role="3uigEE" to="fqlx:NKt6ynom3d" resolve="AspectDiscoverable" />
+              <ref role="3uigEE" to="pxw9:NKt6ynom3d" resolve="AspectDiscoverable" />
               <node concept="3uibUv" id="6nx4rRkXlnq" role="11_B2D">
                 <ref role="3uigEE" to="vndm:~LanguageRuntime" resolve="LanguageRuntime" />
               </node>
@@ -937,8 +933,8 @@
               </node>
             </node>
             <node concept="2YIFZM" id="3KN3A4uZFD0" role="33vP2m">
-              <ref role="37wK5l" to="fqlx:78H58oefoaA" resolve="discoverable" />
-              <ref role="1Pybhc" to="fqlx:NKt6yp1COZ" resolve="AbstractCoderulesAspect" />
+              <ref role="37wK5l" to="pxw9:78H58oefoaA" resolve="discoverable" />
+              <ref role="1Pybhc" to="pxw9:NKt6yp1COZ" resolve="AbstractCoderulesAspect" />
               <node concept="3VsKOn" id="3KN3A4uZFD1" role="37wK5m">
                 <ref role="3VsUkX" to="u46i:7km57Pkjxf4" resolve="TypecheckingAspect" />
               </node>
@@ -949,8 +945,8 @@
         <node concept="3clFbF" id="IFW4V30XBv" role="3cqZAp">
           <node concept="2OqwBi" id="IFW4V31Fzl" role="3clFbG">
             <node concept="2YIFZM" id="IFW4V318L6" role="2Oq$k0">
-              <ref role="37wK5l" to="fqlx:78H58oefSjC" resolve="lookup" />
-              <ref role="1Pybhc" to="fqlx:NKt6ynorWQ" resolve="AspectLookup" />
+              <ref role="37wK5l" to="pxw9:78H58oefSjC" resolve="lookup" />
+              <ref role="1Pybhc" to="pxw9:NKt6ynorWQ" resolve="AspectLookup" />
               <node concept="37vLTw" id="IFW4V31qd3" role="37wK5m">
                 <ref role="3cqZAo" node="7e$2hwbn9qa" resolve="repository" />
               </node>
@@ -959,7 +955,7 @@
               </node>
             </node>
             <node concept="liA8E" id="IFW4V31ObN" role="2OqNvi">
-              <ref role="37wK5l" to="fqlx:9UUIHLLQnW" resolve="allForSingleNode" />
+              <ref role="37wK5l" to="pxw9:9UUIHLLQnW" resolve="allForSingleNode" />
               <node concept="37vLTw" id="9UUIHLO7_y" role="37wK5m">
                 <ref role="3cqZAo" node="5BwsbZJDRzG" resolve="src" />
               </node>
@@ -972,7 +968,7 @@
             <property role="TrG5h" value="srcCliques" />
             <node concept="3vKaQO" id="IFW4V339UR" role="1tU5fm">
               <node concept="3uibUv" id="IFW4V339UT" role="3O5elw">
-                <ref role="3uigEE" to="fqlx:3KN3A4uUhmW" resolve="AspectClique" />
+                <ref role="3uigEE" to="pxw9:3KN3A4uUhmW" resolve="AspectClique" />
                 <node concept="3uibUv" id="IFW4V339UU" role="11_B2D">
                   <ref role="3uigEE" to="u46i:7km57Pkjxf4" resolve="TypecheckingAspect" />
                 </node>
@@ -980,8 +976,8 @@
             </node>
             <node concept="2OqwBi" id="IFW4V331HO" role="33vP2m">
               <node concept="2YIFZM" id="IFW4V331HP" role="2Oq$k0">
-                <ref role="37wK5l" to="fqlx:78H58oefSjC" resolve="lookup" />
-                <ref role="1Pybhc" to="fqlx:NKt6ynorWQ" resolve="AspectLookup" />
+                <ref role="37wK5l" to="pxw9:78H58oefSjC" resolve="lookup" />
+                <ref role="1Pybhc" to="pxw9:NKt6ynorWQ" resolve="AspectLookup" />
                 <node concept="37vLTw" id="IFW4V331HQ" role="37wK5m">
                   <ref role="3cqZAo" node="7e$2hwbn9qa" resolve="repository" />
                 </node>
@@ -990,7 +986,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="IFW4V331HS" role="2OqNvi">
-                <ref role="37wK5l" to="fqlx:9UUIHLLQnW" resolve="allForSingleNode" />
+                <ref role="37wK5l" to="pxw9:9UUIHLLQnW" resolve="allForSingleNode" />
                 <node concept="37vLTw" id="9UUIHLOvZQ" role="37wK5m">
                   <ref role="3cqZAo" node="5BwsbZJDRzG" resolve="src" />
                 </node>
@@ -1004,7 +1000,7 @@
             <property role="TrG5h" value="trgCliques" />
             <node concept="3vKaQO" id="IFW4V33x8P" role="1tU5fm">
               <node concept="3uibUv" id="IFW4V33x8Q" role="3O5elw">
-                <ref role="3uigEE" to="fqlx:3KN3A4uUhmW" resolve="AspectClique" />
+                <ref role="3uigEE" to="pxw9:3KN3A4uUhmW" resolve="AspectClique" />
                 <node concept="3uibUv" id="IFW4V33x8R" role="11_B2D">
                   <ref role="3uigEE" to="u46i:7km57Pkjxf4" resolve="TypecheckingAspect" />
                 </node>
@@ -1019,8 +1015,8 @@
               <node concept="37vLTI" id="IFW4V39a9r" role="3clFbG">
                 <node concept="2OqwBi" id="IFW4V39a9s" role="37vLTx">
                   <node concept="2YIFZM" id="IFW4V39a9t" role="2Oq$k0">
-                    <ref role="37wK5l" to="fqlx:78H58oefSjC" resolve="lookup" />
-                    <ref role="1Pybhc" to="fqlx:NKt6ynorWQ" resolve="AspectLookup" />
+                    <ref role="37wK5l" to="pxw9:78H58oefSjC" resolve="lookup" />
+                    <ref role="1Pybhc" to="pxw9:NKt6ynorWQ" resolve="AspectLookup" />
                     <node concept="37vLTw" id="IFW4V39a9u" role="37wK5m">
                       <ref role="3cqZAo" node="7e$2hwbn9qa" resolve="repository" />
                     </node>
@@ -1029,7 +1025,7 @@
                     </node>
                   </node>
                   <node concept="liA8E" id="IFW4V39a9w" role="2OqNvi">
-                    <ref role="37wK5l" to="fqlx:9UUIHLLQnW" resolve="allForSingleNode" />
+                    <ref role="37wK5l" to="pxw9:9UUIHLLQnW" resolve="allForSingleNode" />
                     <node concept="37vLTw" id="9UUIHLOR8O" role="37wK5m">
                       <ref role="3cqZAo" node="5BwsbZJDRzJ" resolve="trg" />
                     </node>
@@ -1073,8 +1069,8 @@
                 <node concept="37vLTI" id="IFW4V38lQi" role="3clFbG">
                   <node concept="2OqwBi" id="IFW4V33x8S" role="37vLTx">
                     <node concept="2YIFZM" id="IFW4V33x8T" role="2Oq$k0">
-                      <ref role="37wK5l" to="fqlx:78H58oefSjC" resolve="lookup" />
-                      <ref role="1Pybhc" to="fqlx:NKt6ynorWQ" resolve="AspectLookup" />
+                      <ref role="37wK5l" to="pxw9:78H58oefSjC" resolve="lookup" />
+                      <ref role="1Pybhc" to="pxw9:NKt6ynorWQ" resolve="AspectLookup" />
                       <node concept="37vLTw" id="IFW4V33x8U" role="37wK5m">
                         <ref role="3cqZAo" node="7e$2hwbn9qa" resolve="repository" />
                       </node>
@@ -1083,7 +1079,7 @@
                       </node>
                     </node>
                     <node concept="liA8E" id="IFW4V33x8W" role="2OqNvi">
-                      <ref role="37wK5l" to="fqlx:9UUIHLLQnW" resolve="allForSingleNode" />
+                      <ref role="37wK5l" to="pxw9:9UUIHLLQnW" resolve="allForSingleNode" />
                       <node concept="2OqwBi" id="IFW4V34L$g" role="37wK5m">
                         <node concept="1eOMI4" id="IFW4V35i5m" role="2Oq$k0">
                           <node concept="10QFUN" id="IFW4V35i5l" role="1eOMHV">
@@ -1167,7 +1163,7 @@
                             <ref role="3cqZAo" node="6E5fMGvfKSm" resolve="it" />
                           </node>
                           <node concept="liA8E" id="51ek2rRUDCo" role="2OqNvi">
-                            <ref role="37wK5l" to="fqlx:4ekZiHe4j$O" resolve="isEmpty" />
+                            <ref role="37wK5l" to="pxw9:4ekZiHe4j$O" resolve="isEmpty" />
                           </node>
                         </node>
                       </node>
@@ -1203,7 +1199,7 @@
                                 <ref role="3cqZAo" node="6E5fMGvfKSo" resolve="it" />
                               </node>
                               <node concept="liA8E" id="51ek2rRUQut" role="2OqNvi">
-                                <ref role="37wK5l" to="fqlx:4ekZiHe4j$O" resolve="isEmpty" />
+                                <ref role="37wK5l" to="pxw9:4ekZiHe4j$O" resolve="isEmpty" />
                               </node>
                             </node>
                           </node>
@@ -1239,7 +1235,7 @@
                           <ref role="3cqZAo" node="6E5fMGvfKSq" resolve="it" />
                         </node>
                         <node concept="liA8E" id="51ek2rR52s8" role="2OqNvi">
-                          <ref role="37wK5l" to="fqlx:4ekZiHe4j$O" resolve="isEmpty" />
+                          <ref role="37wK5l" to="pxw9:4ekZiHe4j$O" resolve="isEmpty" />
                         </node>
                       </node>
                     </node>
@@ -2976,7 +2972,7 @@
         <node concept="37vLTG" id="6v6oK28WUJW" role="3clF46">
           <property role="TrG5h" value="query" />
           <node concept="3uibUv" id="6v6oK28X2T8" role="1tU5fm">
-            <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
+            <ref role="3uigEE" to="ugy2:5EDW3XDYeWv" resolve="Query" />
           </node>
         </node>
         <node concept="37vLTG" id="6v6oK28Y4WE" role="3clF46">
@@ -5432,7 +5428,7 @@
             <property role="TrG5h" value="acs" />
             <node concept="3vKaQO" id="7WKNeR8ULhW" role="1tU5fm">
               <node concept="3uibUv" id="3KN3A4v4O7l" role="3O5elw">
-                <ref role="3uigEE" to="fqlx:3KN3A4uUhmW" resolve="AspectClique" />
+                <ref role="3uigEE" to="pxw9:3KN3A4uUhmW" resolve="AspectClique" />
                 <node concept="3uibUv" id="3KN3A4v4O$I" role="11_B2D">
                   <ref role="3uigEE" to="u46i:7km57Pkjxf4" resolve="TypecheckingAspect" />
                 </node>
@@ -5452,7 +5448,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="IFW4V2ExUQ" role="2OqNvi">
-                <ref role="37wK5l" to="fqlx:9UUIHLLQnW" resolve="allForSingleNode" />
+                <ref role="37wK5l" to="pxw9:9UUIHLLQnW" resolve="allForSingleNode" />
                 <node concept="37vLTw" id="7WKNeR8ULi4" role="37wK5m">
                   <ref role="3cqZAo" node="6hqFpWnfbDy" resolve="containingRoot" />
                 </node>
@@ -5584,7 +5580,7 @@
       <node concept="37vLTG" id="5EDW3XEpvo4" role="3clF46">
         <property role="TrG5h" value="query" />
         <node concept="3uibUv" id="5EDW3XEpvC1" role="1tU5fm">
-          <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
+          <ref role="3uigEE" to="ugy2:5EDW3XDYeWv" resolve="Query" />
         </node>
       </node>
       <node concept="37vLTG" id="7WKNeR8SP2H" role="3clF46">
@@ -6494,7 +6490,7 @@
         <node concept="37vLTG" id="5EDW3XEpavu" role="3clF46">
           <property role="TrG5h" value="query" />
           <node concept="3uibUv" id="5EDW3XEpaP1" role="1tU5fm">
-            <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
+            <ref role="3uigEE" to="ugy2:5EDW3XDYeWv" resolve="Query" />
           </node>
         </node>
         <node concept="37vLTG" id="7WKNeR8SQxl" role="3clF46">
@@ -6591,7 +6587,7 @@
             <node concept="3cpWsn" id="3KN3A4vDf1G" role="3cpWs9">
               <property role="TrG5h" value="aspectLookup" />
               <node concept="3uibUv" id="3KN3A4vCI3a" role="1tU5fm">
-                <ref role="3uigEE" to="fqlx:NKt6ynorWQ" resolve="AspectLookup" />
+                <ref role="3uigEE" to="pxw9:NKt6ynorWQ" resolve="AspectLookup" />
                 <node concept="3uibUv" id="3KN3A4vCI3d" role="11_B2D">
                   <ref role="3uigEE" to="u46i:7km57Pkjxf4" resolve="TypecheckingAspect" />
                 </node>
@@ -6635,7 +6631,7 @@
               <property role="TrG5h" value="allForNodes" />
               <node concept="3vKaQO" id="5Zr$fBYGhAY" role="1tU5fm">
                 <node concept="3uibUv" id="5Zr$fBYGhB5" role="3O5elw">
-                  <ref role="3uigEE" to="fqlx:3KN3A4uUhmW" resolve="AspectClique" />
+                  <ref role="3uigEE" to="pxw9:3KN3A4uUhmW" resolve="AspectClique" />
                   <node concept="3uibUv" id="5Zr$fBYGhB6" role="11_B2D">
                     <ref role="3uigEE" to="u46i:7km57Pkjxf4" resolve="TypecheckingAspect" />
                   </node>
@@ -6646,7 +6642,7 @@
                   <ref role="3cqZAo" node="3KN3A4vDf1G" resolve="aspectLookup" />
                 </node>
                 <node concept="liA8E" id="5Zr$fBYGiGI" role="2OqNvi">
-                  <ref role="37wK5l" to="fqlx:7mB3viLmii2" resolve="allForNodes" />
+                  <ref role="37wK5l" to="pxw9:7mB3viLmii2" resolve="allForNodes" />
                   <node concept="37vLTw" id="5Zr$fBYGiGJ" role="37wK5m">
                     <ref role="3cqZAo" node="6hqFpWnfpcc" resolve="nodes" />
                   </node>
@@ -6658,7 +6654,7 @@
             <node concept="3cpWsn" id="3KN3A4vDlEh" role="3cpWs9">
               <property role="TrG5h" value="clique" />
               <node concept="3uibUv" id="3KN3A4vDl$Q" role="1tU5fm">
-                <ref role="3uigEE" to="fqlx:3KN3A4uUhmW" resolve="AspectClique" />
+                <ref role="3uigEE" to="pxw9:3KN3A4uUhmW" resolve="AspectClique" />
                 <node concept="3uibUv" id="3KN3A4vDl$R" role="11_B2D">
                   <ref role="3uigEE" to="u46i:7km57Pkjxf4" resolve="TypecheckingAspect" />
                 </node>
@@ -6720,7 +6716,7 @@
                   <ref role="3cqZAo" node="3KN3A4vDlEh" resolve="clique" />
                 </node>
                 <node concept="liA8E" id="1PN9XOG$7Tw" role="2OqNvi">
-                  <ref role="37wK5l" to="fqlx:4ekZiHe4j$O" resolve="isEmpty" />
+                  <ref role="37wK5l" to="pxw9:4ekZiHe4j$O" resolve="isEmpty" />
                 </node>
               </node>
             </node>
@@ -6791,7 +6787,7 @@
                 <ref role="3cqZAo" node="61G6TdBDyzL" resolve="macroProcessing" />
               </node>
               <node concept="liA8E" id="4qGA5WCXTPI" role="2OqNvi">
-                <ref role="37wK5l" to="i348:7DvO2M9IiMh" resolve="putParameter" />
+                <ref role="37wK5l" to="ugy2:7DvO2M9IiMh" resolve="putParameter" />
                 <node concept="10M0yZ" id="4qGA5WCY0e0" role="37wK5m">
                   <ref role="3cqZAo" to="tj24:4qGA5WCVux3" resolve="TYPES_COLLECTOR" />
                   <ref role="1PxDUh" to="tj24:4Z$O9mrQIzY" resolve="TypecheckingState" />
@@ -6926,7 +6922,7 @@
                           <node concept="37vLTG" id="3MwxBzG61na" role="3clF46">
                             <property role="TrG5h" value="result" />
                             <node concept="3uibUv" id="3MwxBzG61nb" role="1tU5fm">
-                              <ref role="3uigEE" to="psoy:7Oc59RSEjdb" resolve="Result" />
+                              <ref role="3uigEE" to="xydz:7Oc59RSEjdb" resolve="Result" />
                             </node>
                           </node>
                           <node concept="3cqZAl" id="3MwxBzG61nc" role="3clF45" />
@@ -6961,7 +6957,7 @@
                                           <ref role="3cqZAo" node="3MwxBzG61na" resolve="result" />
                                         </node>
                                         <node concept="liA8E" id="6cGbuqOdylK" role="2OqNvi">
-                                          <ref role="37wK5l" to="psoy:7Oc59RS_hsj" resolve="isSuccessful" />
+                                          <ref role="37wK5l" to="xydz:7Oc59RS_hsj" resolve="isSuccessful" />
                                         </node>
                                       </node>
                                     </node>
@@ -6978,7 +6974,7 @@
                                         <ref role="3cqZAo" node="3MwxBzG61na" resolve="result" />
                                       </node>
                                       <node concept="liA8E" id="6cGbuqOoZ0e" role="2OqNvi">
-                                        <ref role="37wK5l" to="psoy:5X1yxJI3vjy" resolve="cause" />
+                                        <ref role="37wK5l" to="xydz:5X1yxJI3vjy" resolve="cause" />
                                       </node>
                                     </node>
                                   </node>
@@ -7000,7 +6996,7 @@
                                             <ref role="3cqZAo" node="3MwxBzG61na" resolve="result" />
                                           </node>
                                           <node concept="liA8E" id="4qGA5WE49Cg" role="2OqNvi">
-                                            <ref role="37wK5l" to="psoy:7Oc59RSJr0t" resolve="toString" />
+                                            <ref role="37wK5l" to="xydz:7Oc59RSJr0t" resolve="toString" />
                                           </node>
                                         </node>
                                       </node>
@@ -7043,7 +7039,7 @@
                                       <ref role="3cqZAo" node="3MwxBzG61na" resolve="result" />
                                     </node>
                                     <node concept="liA8E" id="6cGbuqOmV81" role="2OqNvi">
-                                      <ref role="37wK5l" to="psoy:6cGbuqOk51p" resolve="clearCause" />
+                                      <ref role="37wK5l" to="xydz:6cGbuqOk51p" resolve="clearCause" />
                                     </node>
                                   </node>
                                 </node>
@@ -7055,7 +7051,7 @@
                                     <ref role="3cqZAo" node="3MwxBzG61na" resolve="result" />
                                   </node>
                                   <node concept="liA8E" id="6cGbuqOdvzy" role="2OqNvi">
-                                    <ref role="37wK5l" to="psoy:5X1yxJI3vjy" resolve="cause" />
+                                    <ref role="37wK5l" to="xydz:5X1yxJI3vjy" resolve="cause" />
                                   </node>
                                 </node>
                               </node>
@@ -7085,7 +7081,7 @@
                                                 <ref role="3cqZAo" node="3MwxBzG61na" resolve="result" />
                                               </node>
                                               <node concept="liA8E" id="3MwxBzG5YFa" role="2OqNvi">
-                                                <ref role="37wK5l" to="psoy:2gw7OvgCNSM" resolve="hasErrors" />
+                                                <ref role="37wK5l" to="xydz:2gw7OvgCNSM" resolve="hasErrors" />
                                               </node>
                                             </node>
                                             <node concept="10M0yZ" id="3MwxBzG5Zes" role="3K4E3e">
@@ -7103,7 +7099,7 @@
                                             <ref role="3cqZAo" node="3MwxBzG61na" resolve="result" />
                                           </node>
                                           <node concept="liA8E" id="3MwxBzG5Xyj" role="2OqNvi">
-                                            <ref role="37wK5l" to="psoy:7Oc59RS_hsj" resolve="isSuccessful" />
+                                            <ref role="37wK5l" to="xydz:7Oc59RS_hsj" resolve="isSuccessful" />
                                           </node>
                                         </node>
                                         <node concept="10M0yZ" id="3MwxBzG5ZpH" role="3K4GZi">
@@ -7582,7 +7578,7 @@
         <property role="TrG5h" value="query" />
         <node concept="3Tm6S6" id="7WKNeR9fm7c" role="1B3o_S" />
         <node concept="3uibUv" id="5EDW3XEpb$m" role="1tU5fm">
-          <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
+          <ref role="3uigEE" to="ugy2:5EDW3XDYeWv" resolve="Query" />
         </node>
       </node>
     </node>
@@ -8446,7 +8442,7 @@
             <property role="TrG5h" value="allForModel" />
             <node concept="3vKaQO" id="3KN3A4v4yPq" role="1tU5fm">
               <node concept="3uibUv" id="3KN3A4v4yPx" role="3O5elw">
-                <ref role="3uigEE" to="fqlx:3KN3A4uUhmW" resolve="AspectClique" />
+                <ref role="3uigEE" to="pxw9:3KN3A4uUhmW" resolve="AspectClique" />
                 <node concept="3uibUv" id="3KN3A4v4yPy" role="11_B2D">
                   <ref role="3uigEE" to="u46i:7km57Pkjxf4" resolve="TypecheckingAspect" />
                 </node>
@@ -8469,7 +8465,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="IFW4V2EsEi" role="2OqNvi">
-                <ref role="37wK5l" to="fqlx:9UUIHLLQnW" resolve="allForSingleNode" />
+                <ref role="37wK5l" to="pxw9:9UUIHLLQnW" resolve="allForSingleNode" />
                 <node concept="37vLTw" id="3KN3A4v4yZX" role="37wK5m">
                   <ref role="3cqZAo" node="3YJ7yg2LDWz" resolve="containingRoot" />
                 </node>
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps
index b15a9020..50515ec1 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps
@@ -12,7 +12,6 @@
     <use id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples" version="0" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
     <use id="774bf8a0-62e5-41e1-af63-f4812e60e48b" name="jetbrains.mps.baseLanguage.checkedDots" version="0" />
-    <use id="0b80a2e8-f9f1-47b3-823f-56eb115bca42" name="jetbrains.mps.typechecking.annotation" version="0" />
     <use id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core" version="2" />
     <use id="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text" version="0" />
   </languages>
@@ -37,23 +36,23 @@
     <import index="hano" ref="r:2b43b673-12f9-49ea-8e43-d0c7a401586a(jetbrains.mps.lang.coderules.eval)" />
     <import index="u46i" ref="r:c2760840-3210-4ad4-9e64-a2dfd53620e1(jetbrains.mps.lang.typechecking.aspect)" />
     <import index="w1kc" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel(MPS.Core/)" />
-    <import index="i348" ref="r:42a15dec-83a9-4fe1-80d6-3bf898c512bd(jetbrains.mps.lang.coderules.template)" />
     <import index="5zyv" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.concurrent(JDK/)" />
     <import index="mhfm" ref="3f233e7f-b8a6-46d2-a57f-795d56775243/java:org.jetbrains.annotations(Annotations/)" />
     <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" />
     <import index="82uw" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.function(JDK/)" />
     <import index="bj13" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.logical(jetbrains.mps.logic.reactor/)" />
-    <import index="fqlx" ref="r:2cc226a9-8a78-4010-b962-823343fd28ff(jetbrains.mps.lang.coderules.aspect)" />
     <import index="av0y" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.program(jetbrains.mps.logic.reactor/)" />
     <import index="31yc" ref="r:0c18ff61-1cb9-4ff0-a899-c949ad03f97c(jetbrains.mps.coderules.plugin)" />
     <import index="et5u" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.messages(MPS.Core/)" />
     <import index="ksgm" ref="r:6285678b-007f-4527-bcf5-6fd38ba8c969(jetbrains.mps.lang.coderules.program)" />
     <import index="mpcv" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang.ref(JDK/)" />
-    <import index="psoy" ref="r:78313117-90ee-47a5-a91e-b5213df7f611(jetbrains.mps.coderules.runtime.result)" />
-    <import index="cxk7" ref="r:daa544a7-0a5c-49c0-a54c-4c2a5b4868aa(jetbrains.mps.logic.predicate)" />
     <import index="bid0" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.util(jetbrains.mps.logic.reactor/)" />
     <import index="rfhd" ref="3a8d80d2-32d9-f1f2-4443-6a1111e12ef3/java:com.intellij.openapi.util.registry(MPS.Boot/)" />
     <import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" />
+    <import index="xydz" ref="r:b198cb67-efdc-40c0-8817-11ab64523a5b(jetbrains.mps.lang.coderules.result)" />
+    <import index="pxw9" ref="r:e3417884-ba0a-4330-9cea-64f01ace2e9d(jetbrains.mps.lang.coderules.aspect)" />
+    <import index="ugy2" ref="r:57b2449f-b7c7-4941-bd75-9c594835f5cd(jetbrains.mps.lang.coderules.template)" />
+    <import index="tpfl" ref="r:97d6f79f-4a27-4a9b-9122-9bccfb5317c9(jetbrains.mps.lang.coderules.predicate)" />
   </imports>
   <registry>
     <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples">
@@ -6393,18 +6392,18 @@
       <node concept="3uibUv" id="6PWFJfG61KG" role="1tU5fm">
         <ref role="3uigEE" node="7i3KM7g1Lm1" resolve="CachedData.DataFlavour" />
         <node concept="3uibUv" id="6PWFJfG6l1o" role="11_B2D">
-          <ref role="3uigEE" to="i348:6PWFJfG5LMK" resolve="Memo" />
+          <ref role="3uigEE" to="ugy2:6PWFJfG5LMK" resolve="Memo" />
         </node>
       </node>
       <node concept="2ShNRf" id="6PWFJfG61KI" role="33vP2m">
         <node concept="1pGfFk" id="6PWFJfG61KJ" role="2ShVmc">
           <ref role="37wK5l" node="7i3KM7g1T3X" resolve="CachedData.DataFlavour" />
           <node concept="3uibUv" id="6PWFJfG6ofG" role="1pMfVU">
-            <ref role="3uigEE" to="i348:6PWFJfG5LMK" resolve="Memo" />
+            <ref role="3uigEE" to="ugy2:6PWFJfG5LMK" resolve="Memo" />
           </node>
           <node concept="2OqwBi" id="6PWFJfG61KL" role="37wK5m">
             <node concept="3VsKOn" id="6PWFJfG61KM" role="2Oq$k0">
-              <ref role="3VsUkX" to="i348:6PWFJfG5LMK" resolve="Memo" />
+              <ref role="3VsUkX" to="ugy2:6PWFJfG5LMK" resolve="Memo" />
             </node>
             <node concept="liA8E" id="6PWFJfG61KN" role="2OqNvi">
               <ref role="37wK5l" to="wyt6:~Class.getName()" resolve="getName" />
@@ -7249,7 +7248,7 @@
       <node concept="16euLQ" id="1C_jAsqgCma" role="16eVyc">
         <property role="TrG5h" value="Q" />
         <node concept="3uibUv" id="1C_jAsqgEc3" role="3ztrMU">
-          <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
+          <ref role="3uigEE" to="ugy2:5EDW3XDYeWv" resolve="Query" />
         </node>
       </node>
       <node concept="16euLQ" id="1C_jAsqgF1W" role="16eVyc">
@@ -7732,7 +7731,7 @@
       <node concept="16euLQ" id="6v6oK28O7mM" role="16eVyc">
         <property role="TrG5h" value="Q" />
         <node concept="3uibUv" id="6v6oK28O8LM" role="3ztrMU">
-          <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
+          <ref role="3uigEE" to="ugy2:5EDW3XDYeWv" resolve="Query" />
         </node>
       </node>
     </node>
@@ -10990,7 +10989,7 @@
       <node concept="37vLTG" id="5EDW3XEtX7J" role="3clF46">
         <property role="TrG5h" value="query" />
         <node concept="3uibUv" id="5EDW3XEtXqI" role="1tU5fm">
-          <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
+          <ref role="3uigEE" to="ugy2:5EDW3XDYeWv" resolve="Query" />
         </node>
       </node>
       <node concept="3cqZAl" id="7i3KM7gApvw" role="3clF45" />
@@ -12155,7 +12154,7 @@
       <node concept="2tJIrI" id="5EDW3XDZzWC" role="jymVt" />
       <node concept="3Tm6S6" id="6v6oK24grNx" role="1B3o_S" />
       <node concept="3uibUv" id="5EDW3XDZzK9" role="EKbjA">
-        <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
+        <ref role="3uigEE" to="ugy2:5EDW3XDYeWv" resolve="Query" />
       </node>
       <node concept="3clFb_" id="5EDW3XDZzXV" role="jymVt">
         <property role="TrG5h" value="fqName" />
@@ -12223,7 +12222,7 @@
           <ref role="3uigEE" to="wyt6:~Class" resolve="Class" />
           <node concept="3qUE_q" id="5EDW3XE$sRh" role="11_B2D">
             <node concept="3uibUv" id="5EDW3XE$sRi" role="3qUE_r">
-              <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
+              <ref role="3uigEE" to="ugy2:5EDW3XDYeWv" resolve="Query" />
             </node>
           </node>
         </node>
@@ -12270,7 +12269,7 @@
           <ref role="3uigEE" to="wyt6:~Class" resolve="Class" />
           <node concept="3qUE_q" id="1T5MAgP$afc" role="11_B2D">
             <node concept="3uibUv" id="1T5MAgP$afd" role="3qUE_r">
-              <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
+              <ref role="3uigEE" to="ugy2:5EDW3XDYeWv" resolve="Query" />
             </node>
           </node>
         </node>
@@ -12317,7 +12316,7 @@
           <ref role="3uigEE" to="wyt6:~Class" resolve="Class" />
           <node concept="3qUE_q" id="5EDW3XE$vkR" role="11_B2D">
             <node concept="3uibUv" id="5EDW3XE$vkS" role="3qUE_r">
-              <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
+              <ref role="3uigEE" to="ugy2:5EDW3XDYeWv" resolve="Query" />
             </node>
           </node>
         </node>
@@ -12357,7 +12356,7 @@
           <ref role="3uigEE" to="wyt6:~Class" resolve="Class" />
           <node concept="3qUE_q" id="5EDW3XE$q0W" role="11_B2D">
             <node concept="3uibUv" id="5EDW3XE$q0X" role="3qUE_r">
-              <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
+              <ref role="3uigEE" to="ugy2:5EDW3XDYeWv" resolve="Query" />
             </node>
           </node>
         </node>
@@ -12440,7 +12439,7 @@
     <node concept="2tJIrI" id="6v6oK24LHhV" role="jymVt" />
     <node concept="3Tm1VV" id="5EDW3XDYNPs" role="1B3o_S" />
     <node concept="3uibUv" id="5EDW3XDYNRG" role="3HQHJm">
-      <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
+      <ref role="3uigEE" to="ugy2:5EDW3XDYeWv" resolve="Query" />
     </node>
   </node>
   <node concept="3HP615" id="5EDW3XDYNS7">
@@ -12470,7 +12469,7 @@
     <node concept="2tJIrI" id="5EDW3XDYOgk" role="jymVt" />
     <node concept="3Tm1VV" id="5EDW3XDYNS8" role="1B3o_S" />
     <node concept="3uibUv" id="5EDW3XDYNTf" role="3HQHJm">
-      <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
+      <ref role="3uigEE" to="ugy2:5EDW3XDYeWv" resolve="Query" />
     </node>
   </node>
   <node concept="3HP615" id="5EDW3XDYNTS">
@@ -12517,7 +12516,7 @@
     <node concept="2tJIrI" id="5EDW3XDYNVS" role="jymVt" />
     <node concept="3Tm1VV" id="5EDW3XDYNTT" role="1B3o_S" />
     <node concept="3uibUv" id="5EDW3XDYNVf" role="3HQHJm">
-      <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
+      <ref role="3uigEE" to="ugy2:5EDW3XDYeWv" resolve="Query" />
     </node>
   </node>
   <node concept="312cEu" id="61G6TdCqpnb">
@@ -12542,7 +12541,7 @@
       <node concept="2tJIrI" id="5HVB6JRKdQN" role="jymVt" />
       <node concept="3Tm1VV" id="5HVB6JRkwKq" role="1B3o_S" />
       <node concept="3uibUv" id="5HVB6JRkPve" role="EKbjA">
-        <ref role="3uigEE" to="i348:6PWFJfG5LMK" resolve="Memo" />
+        <ref role="3uigEE" to="ugy2:6PWFJfG5LMK" resolve="Memo" />
       </node>
       <node concept="3clFb_" id="5HVB6JRkPLX" role="jymVt">
         <property role="TrG5h" value="getOrSetValue" />
@@ -12766,7 +12765,7 @@
             <ref role="3uigEE" node="1z4$59iohfJ" resolve="Request" />
             <node concept="3qUE_q" id="6v6oK24CBup" role="11_B2D">
               <node concept="3uibUv" id="6v6oK24CGZy" role="3qUE_r">
-                <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
+                <ref role="3uigEE" to="ugy2:5EDW3XDYeWv" resolve="Query" />
               </node>
             </node>
             <node concept="3qTvmN" id="1z4$59itkuO" role="11_B2D" />
@@ -12838,7 +12837,7 @@
         <node concept="37vLTG" id="6PWFJfG8SUx" role="3clF46">
           <property role="TrG5h" value="aspectClique" />
           <node concept="3uibUv" id="6PWFJfG8YmM" role="1tU5fm">
-            <ref role="3uigEE" to="fqlx:3KN3A4uUhmW" resolve="AspectClique" />
+            <ref role="3uigEE" to="pxw9:3KN3A4uUhmW" resolve="AspectClique" />
             <node concept="3qTvmN" id="6PWFJfG908o" role="11_B2D" />
           </node>
         </node>
@@ -12919,8 +12918,8 @@
                               <node concept="1pGfFk" id="61G6TdB_yx$" role="2ShVmc">
                                 <ref role="37wK5l" node="1FOQehwow5Q" resolve="TypecheckingReportItem" />
                                 <node concept="2YIFZM" id="61G6TdB_yx_" role="37wK5m">
-                                  <ref role="1Pybhc" to="cxk7:61G6TdBsGY8" resolve="FeedbackUtil" />
-                                  <ref role="37wK5l" to="cxk7:3o9wrC3WoA4" resolve="severityToStatus" />
+                                  <ref role="1Pybhc" to="tpfl:61G6TdBsGY8" resolve="FeedbackUtil" />
+                                  <ref role="37wK5l" to="tpfl:3o9wrC3WoA4" resolve="severityToStatus" />
                                   <node concept="2OqwBi" id="61G6TdB_yxA" role="37wK5m">
                                     <node concept="37vLTw" id="61G6TdB_yxB" role="2Oq$k0">
                                       <ref role="3cqZAo" node="3Pxu0s8yb1f" resolve="feedback" />
@@ -12933,14 +12932,14 @@
                                 <node concept="2OqwBi" id="61G6TdB_yxD" role="37wK5m">
                                   <node concept="0kSF2" id="61G6TdB_yxE" role="2Oq$k0">
                                     <node concept="3uibUv" id="61G6TdB_yxF" role="0kSFW">
-                                      <ref role="3uigEE" to="cxk7:4ekZiHddiXo" resolve="FeedbackOrigin" />
+                                      <ref role="3uigEE" to="tpfl:4ekZiHddiXo" resolve="FeedbackOrigin" />
                                     </node>
                                     <node concept="37vLTw" id="61G6TdB_yxG" role="0kSFX">
                                       <ref role="3cqZAo" node="61G6TdB_yxq" resolve="details" />
                                     </node>
                                   </node>
                                   <node concept="liA8E" id="61G6TdB_yxH" role="2OqNvi">
-                                    <ref role="37wK5l" to="cxk7:4ekZiHddjeb" resolve="getTarget" />
+                                    <ref role="37wK5l" to="tpfl:4ekZiHddjeb" resolve="getTarget" />
                                   </node>
                                 </node>
                                 <node concept="2OqwBi" id="61G6TdB_yxI" role="37wK5m">
@@ -12954,14 +12953,14 @@
                                 <node concept="2OqwBi" id="61G6TdB_yxL" role="37wK5m">
                                   <node concept="0kSF2" id="61G6TdB_yxM" role="2Oq$k0">
                                     <node concept="3uibUv" id="61G6TdB_yxN" role="0kSFW">
-                                      <ref role="3uigEE" to="cxk7:4ekZiHddiXo" resolve="FeedbackOrigin" />
+                                      <ref role="3uigEE" to="tpfl:4ekZiHddiXo" resolve="FeedbackOrigin" />
                                     </node>
                                     <node concept="37vLTw" id="61G6TdB_yxO" role="0kSFX">
                                       <ref role="3cqZAo" node="61G6TdB_yxq" resolve="details" />
                                     </node>
                                   </node>
                                   <node concept="liA8E" id="61G6TdBFRUv" role="2OqNvi">
-                                    <ref role="37wK5l" to="cxk7:4ekZiHddjyV" resolve="getTemplate" />
+                                    <ref role="37wK5l" to="tpfl:4ekZiHddjyV" resolve="getTemplate" />
                                   </node>
                                 </node>
                                 <node concept="37vLTw" id="3Pxu0s8zxEF" role="37wK5m">
@@ -12989,10 +12988,10 @@
         <node concept="37vLTG" id="3OUB6BBxLji" role="3clF46">
           <property role="TrG5h" value="aspectClique" />
           <node concept="3uibUv" id="3OUB6BBxOJr" role="1tU5fm">
-            <ref role="3uigEE" to="fqlx:3KN3A4uUhmW" resolve="AspectClique" />
+            <ref role="3uigEE" to="pxw9:3KN3A4uUhmW" resolve="AspectClique" />
             <node concept="3qUE_q" id="zL5ZaNEKBr" role="11_B2D">
               <node concept="3uibUv" id="zL5ZaNELwc" role="3qUE_r">
-                <ref role="3uigEE" to="fqlx:NKt6yomNZE" resolve="CoderulesAspect" />
+                <ref role="3uigEE" to="pxw9:NKt6yomNZE" resolve="CoderulesAspect" />
               </node>
             </node>
           </node>
@@ -13044,10 +13043,10 @@
         <node concept="37vLTG" id="7i3KM7gIUOR" role="3clF46">
           <property role="TrG5h" value="aspectClique" />
           <node concept="3uibUv" id="7i3KM7gIVm_" role="1tU5fm">
-            <ref role="3uigEE" to="fqlx:3KN3A4uUhmW" resolve="AspectClique" />
+            <ref role="3uigEE" to="pxw9:3KN3A4uUhmW" resolve="AspectClique" />
             <node concept="3qUE_q" id="1LBj9w_TASS" role="11_B2D">
               <node concept="3uibUv" id="1LBj9w_TBJp" role="3qUE_r">
-                <ref role="3uigEE" to="fqlx:NKt6yomNZE" resolve="CoderulesAspect" />
+                <ref role="3uigEE" to="pxw9:NKt6yomNZE" resolve="CoderulesAspect" />
               </node>
             </node>
           </node>
@@ -13063,7 +13062,7 @@
         <node concept="37vLTG" id="5EDW3XErpy6" role="3clF46">
           <property role="TrG5h" value="query" />
           <node concept="3uibUv" id="5EDW3XErpy7" role="1tU5fm">
-            <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
+            <ref role="3uigEE" to="ugy2:5EDW3XDYeWv" resolve="Query" />
           </node>
         </node>
         <node concept="3uibUv" id="7i3KM7gISJ2" role="3clF45">
@@ -13080,10 +13079,10 @@
         <node concept="37vLTG" id="7i3KM7gMF1J" role="3clF46">
           <property role="TrG5h" value="aspectClique" />
           <node concept="3uibUv" id="7i3KM7gMJmt" role="1tU5fm">
-            <ref role="3uigEE" to="fqlx:3KN3A4uUhmW" resolve="AspectClique" />
+            <ref role="3uigEE" to="pxw9:3KN3A4uUhmW" resolve="AspectClique" />
             <node concept="3qUE_q" id="zL5ZaNFH2T" role="11_B2D">
               <node concept="3uibUv" id="zL5ZaNFHse" role="3qUE_r">
-                <ref role="3uigEE" to="fqlx:NKt6yomNZE" resolve="CoderulesAspect" />
+                <ref role="3uigEE" to="pxw9:NKt6yomNZE" resolve="CoderulesAspect" />
               </node>
             </node>
           </node>
@@ -13100,7 +13099,7 @@
         <node concept="37vLTG" id="5Qx6_65qoI9" role="3clF46">
           <property role="TrG5h" value="aspectClique" />
           <node concept="3uibUv" id="3OUB6BBvTWf" role="1tU5fm">
-            <ref role="3uigEE" to="fqlx:3KN3A4uUhmW" resolve="AspectClique" />
+            <ref role="3uigEE" to="pxw9:3KN3A4uUhmW" resolve="AspectClique" />
             <node concept="3qTvmN" id="3OUB6BBwyEH" role="11_B2D" />
           </node>
         </node>
@@ -13512,7 +13511,7 @@
           <ref role="3uigEE" node="1z4$59iohfJ" resolve="Request" />
           <node concept="3qUE_q" id="6v6oK24CgA2" role="11_B2D">
             <node concept="3uibUv" id="6v6oK24CpXF" role="3qUE_r">
-              <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
+              <ref role="3uigEE" to="ugy2:5EDW3XDYeWv" resolve="Query" />
             </node>
           </node>
           <node concept="3qTvmN" id="1z4$59itqip" role="11_B2D" />
@@ -13552,7 +13551,7 @@
             <ref role="3uigEE" node="1z4$59iohfJ" resolve="Request" />
             <node concept="3qUE_q" id="6v6oK24CK3L" role="11_B2D">
               <node concept="3uibUv" id="6v6oK24CKIW" role="3qUE_r">
-                <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
+                <ref role="3uigEE" to="ugy2:5EDW3XDYeWv" resolve="Query" />
               </node>
             </node>
             <node concept="3qTvmN" id="4XsNDZYbHNR" role="11_B2D" />
@@ -13597,10 +13596,10 @@
         <node concept="37vLTG" id="4XsNDZYbBO8" role="3clF46">
           <property role="TrG5h" value="aspectClique" />
           <node concept="3uibUv" id="4XsNDZYbBO9" role="1tU5fm">
-            <ref role="3uigEE" to="fqlx:3KN3A4uUhmW" resolve="AspectClique" />
+            <ref role="3uigEE" to="pxw9:3KN3A4uUhmW" resolve="AspectClique" />
             <node concept="3qUE_q" id="4XsNDZYbBOa" role="11_B2D">
               <node concept="3uibUv" id="4XsNDZYbBOb" role="3qUE_r">
-                <ref role="3uigEE" to="fqlx:NKt6yomNZE" resolve="CoderulesAspect" />
+                <ref role="3uigEE" to="pxw9:NKt6yomNZE" resolve="CoderulesAspect" />
               </node>
             </node>
           </node>
@@ -13616,7 +13615,7 @@
         <node concept="37vLTG" id="4XsNDZYbBOg" role="3clF46">
           <property role="TrG5h" value="query" />
           <node concept="3uibUv" id="4XsNDZYbBOh" role="1tU5fm">
-            <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
+            <ref role="3uigEE" to="ugy2:5EDW3XDYeWv" resolve="Query" />
           </node>
         </node>
         <node concept="3uibUv" id="4XsNDZYbBOi" role="3clF45">
@@ -13691,10 +13690,10 @@
         <node concept="37vLTG" id="4XsNDZYbBOr" role="3clF46">
           <property role="TrG5h" value="aspectClique" />
           <node concept="3uibUv" id="4XsNDZYbBOs" role="1tU5fm">
-            <ref role="3uigEE" to="fqlx:3KN3A4uUhmW" resolve="AspectClique" />
+            <ref role="3uigEE" to="pxw9:3KN3A4uUhmW" resolve="AspectClique" />
             <node concept="3qUE_q" id="4XsNDZYbBOt" role="11_B2D">
               <node concept="3uibUv" id="4XsNDZYbBOu" role="3qUE_r">
-                <ref role="3uigEE" to="fqlx:NKt6yomNZE" resolve="CoderulesAspect" />
+                <ref role="3uigEE" to="pxw9:NKt6yomNZE" resolve="CoderulesAspect" />
               </node>
             </node>
           </node>
@@ -13718,7 +13717,7 @@
         <node concept="37vLTG" id="4XsNDZYgMfm" role="3clF46">
           <property role="TrG5h" value="aspectClique" />
           <node concept="3uibUv" id="4XsNDZYgMfn" role="1tU5fm">
-            <ref role="3uigEE" to="fqlx:3KN3A4uUhmW" resolve="AspectClique" />
+            <ref role="3uigEE" to="pxw9:3KN3A4uUhmW" resolve="AspectClique" />
             <node concept="3qTvmN" id="4XsNDZYgMfo" role="11_B2D" />
           </node>
         </node>
@@ -13748,7 +13747,7 @@
                       <node concept="3cpWsn" id="6v6oK25vILy" role="3cpWs9">
                         <property role="TrG5h" value="query" />
                         <node concept="3uibUv" id="6v6oK25vILz" role="1tU5fm">
-                          <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
+                          <ref role="3uigEE" to="ugy2:5EDW3XDYeWv" resolve="Query" />
                         </node>
                         <node concept="2OqwBi" id="6v6oK25vIL$" role="33vP2m">
                           <node concept="37vLTw" id="6v6oK25vIL_" role="2Oq$k0">
@@ -13896,7 +13895,7 @@
                               <ref role="3cqZAo" node="6E5fMGvfKSc" resolve="it" />
                             </node>
                             <node concept="liA8E" id="4XsNDZYkoPM" role="2OqNvi">
-                              <ref role="37wK5l" to="i348:62MNP_kY8lD" resolve="getTemplateRef" />
+                              <ref role="37wK5l" to="ugy2:62MNP_kY8lD" resolve="getTemplateRef" />
                             </node>
                           </node>
                         </node>
@@ -13927,14 +13926,14 @@
         <node concept="3Tm6S6" id="4XsNDZYiHb_" role="1B3o_S" />
         <node concept="_YKpA" id="4XsNDZYiMYr" role="1tU5fm">
           <node concept="3uibUv" id="4XsNDZYiP3k" role="_ZDj9">
-            <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstractRuleTemplate" />
+            <ref role="3uigEE" to="ugy2:1ffsG7bUbCM" resolve="AbstractRuleTemplate" />
             <node concept="3qTvmN" id="4XsNDZYiPoq" role="11_B2D" />
           </node>
         </node>
         <node concept="2ShNRf" id="4XsNDZYiPRO" role="33vP2m">
           <node concept="Tc6Ow" id="4XsNDZYiPQB" role="2ShVmc">
             <node concept="3uibUv" id="4XsNDZYiPQC" role="HW$YZ">
-              <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstractRuleTemplate" />
+              <ref role="3uigEE" to="ugy2:1ffsG7bUbCM" resolve="AbstractRuleTemplate" />
               <node concept="3qTvmN" id="4XsNDZYiPQD" role="11_B2D" />
             </node>
           </node>
@@ -13952,7 +13951,7 @@
             <ref role="3uigEE" node="1z4$59iohfJ" resolve="Request" />
             <node concept="3qUE_q" id="6v6oK24CO8Q" role="11_B2D">
               <node concept="3uibUv" id="6v6oK24CPo9" role="3qUE_r">
-                <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
+                <ref role="3uigEE" to="ugy2:5EDW3XDYeWv" resolve="Query" />
               </node>
             </node>
             <node concept="3qTvmN" id="1z4$59iAiaj" role="11_B2D" />
@@ -14031,7 +14030,7 @@
         <node concept="37vLTG" id="3OUB6BBwZY5" role="3clF46">
           <property role="TrG5h" value="aspectClique" />
           <node concept="3uibUv" id="3OUB6BBx5dW" role="1tU5fm">
-            <ref role="3uigEE" to="fqlx:3KN3A4uUhmW" resolve="AspectClique" />
+            <ref role="3uigEE" to="pxw9:3KN3A4uUhmW" resolve="AspectClique" />
             <node concept="3qTvmN" id="3OUB6BBx6yb" role="11_B2D" />
           </node>
         </node>
@@ -14049,7 +14048,7 @@
                     <ref role="3cqZAo" node="3OUB6BBwZY5" resolve="aspectClique" />
                   </node>
                   <node concept="liA8E" id="565UPcqrQYt" role="2OqNvi">
-                    <ref role="37wK5l" to="fqlx:5MNibEMUCXK" resolve="uniqueKey" />
+                    <ref role="37wK5l" to="pxw9:5MNibEMUCXK" resolve="uniqueKey" />
                   </node>
                 </node>
               </node>
@@ -14070,7 +14069,7 @@
         <node concept="37vLTG" id="6PWFJfG90Zx" role="3clF46">
           <property role="TrG5h" value="aspectClique" />
           <node concept="3uibUv" id="6PWFJfG90Zy" role="1tU5fm">
-            <ref role="3uigEE" to="fqlx:3KN3A4uUhmW" resolve="AspectClique" />
+            <ref role="3uigEE" to="pxw9:3KN3A4uUhmW" resolve="AspectClique" />
             <node concept="3qTvmN" id="6PWFJfG90Zz" role="11_B2D" />
           </node>
         </node>
@@ -14136,7 +14135,7 @@
                 <ref role="3cqZAo" node="4qGA5WCY5qC" resolve="macroProcessing" />
               </node>
               <node concept="liA8E" id="4qGA5WCY_0O" role="2OqNvi">
-                <ref role="37wK5l" to="i348:7DvO2M9IiMh" resolve="putParameter" />
+                <ref role="37wK5l" to="ugy2:7DvO2M9IiMh" resolve="putParameter" />
                 <node concept="10M0yZ" id="4qGA5WCYVsB" role="37wK5m">
                   <ref role="3cqZAo" node="4qGA5WCVux3" resolve="TYPES_COLLECTOR" />
                   <ref role="1PxDUh" node="4Z$O9mrQIzY" resolve="TypecheckingState" />
@@ -14163,10 +14162,10 @@
         <node concept="37vLTG" id="3OUB6BBaXxO" role="3clF46">
           <property role="TrG5h" value="aspectClique" />
           <node concept="3uibUv" id="3OUB6BBaXxP" role="1tU5fm">
-            <ref role="3uigEE" to="fqlx:3KN3A4uUhmW" resolve="AspectClique" />
+            <ref role="3uigEE" to="pxw9:3KN3A4uUhmW" resolve="AspectClique" />
             <node concept="3qUE_q" id="1LBj9w_TC_F" role="11_B2D">
               <node concept="3uibUv" id="1LBj9w_TDuF" role="3qUE_r">
-                <ref role="3uigEE" to="fqlx:NKt6yomNZE" resolve="CoderulesAspect" />
+                <ref role="3uigEE" to="pxw9:NKt6yomNZE" resolve="CoderulesAspect" />
               </node>
             </node>
           </node>
@@ -14182,7 +14181,7 @@
         <node concept="37vLTG" id="3OUB6BBaXxV" role="3clF46">
           <property role="TrG5h" value="query" />
           <node concept="3uibUv" id="3OUB6BBaXxW" role="1tU5fm">
-            <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
+            <ref role="3uigEE" to="ugy2:5EDW3XDYeWv" resolve="Query" />
           </node>
         </node>
         <node concept="3uibUv" id="3OUB6BBaXxX" role="3clF45">
@@ -14284,10 +14283,10 @@
         <node concept="37vLTG" id="3OUB6BB83$_" role="3clF46">
           <property role="TrG5h" value="aspectClique" />
           <node concept="3uibUv" id="3OUB6BB83$A" role="1tU5fm">
-            <ref role="3uigEE" to="fqlx:3KN3A4uUhmW" resolve="AspectClique" />
+            <ref role="3uigEE" to="pxw9:3KN3A4uUhmW" resolve="AspectClique" />
             <node concept="3qUE_q" id="zL5ZaNG8e7" role="11_B2D">
               <node concept="3uibUv" id="zL5ZaNG9bs" role="3qUE_r">
-                <ref role="3uigEE" to="fqlx:NKt6yomNZE" resolve="CoderulesAspect" />
+                <ref role="3uigEE" to="pxw9:NKt6yomNZE" resolve="CoderulesAspect" />
               </node>
             </node>
           </node>
@@ -14318,7 +14317,7 @@
         <node concept="37vLTG" id="3OUB6BB8G5p" role="3clF46">
           <property role="TrG5h" value="aspectClique" />
           <node concept="3uibUv" id="3OUB6BBvVMK" role="1tU5fm">
-            <ref role="3uigEE" to="fqlx:3KN3A4uUhmW" resolve="AspectClique" />
+            <ref role="3uigEE" to="pxw9:3KN3A4uUhmW" resolve="AspectClique" />
             <node concept="3qTvmN" id="3OUB6BBwBqh" role="11_B2D" />
           </node>
         </node>
@@ -14491,7 +14490,7 @@
             <ref role="3uigEE" node="1z4$59iohfJ" resolve="Request" />
             <node concept="3qUE_q" id="6v6oK24CWIw" role="11_B2D">
               <node concept="3uibUv" id="6v6oK24CX_N" role="3qUE_r">
-                <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
+                <ref role="3uigEE" to="ugy2:5EDW3XDYeWv" resolve="Query" />
               </node>
             </node>
             <node concept="3qTvmN" id="1z4$59iAEAT" role="11_B2D" />
@@ -14584,10 +14583,10 @@
         <node concept="37vLTG" id="6nFpYlusyqe" role="3clF46">
           <property role="TrG5h" value="aspectClique" />
           <node concept="3uibUv" id="6nFpYlusyqf" role="1tU5fm">
-            <ref role="3uigEE" to="fqlx:3KN3A4uUhmW" resolve="AspectClique" />
+            <ref role="3uigEE" to="pxw9:3KN3A4uUhmW" resolve="AspectClique" />
             <node concept="3qUE_q" id="1LBj9w_TEHO" role="11_B2D">
               <node concept="3uibUv" id="1LBj9w_TFh4" role="3qUE_r">
-                <ref role="3uigEE" to="fqlx:NKt6yomNZE" resolve="CoderulesAspect" />
+                <ref role="3uigEE" to="pxw9:NKt6yomNZE" resolve="CoderulesAspect" />
               </node>
             </node>
           </node>
@@ -14603,7 +14602,7 @@
         <node concept="37vLTG" id="5EDW3XEtHL1" role="3clF46">
           <property role="TrG5h" value="query" />
           <node concept="3uibUv" id="5EDW3XEtLaI" role="1tU5fm">
-            <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
+            <ref role="3uigEE" to="ugy2:5EDW3XDYeWv" resolve="Query" />
           </node>
         </node>
         <node concept="3uibUv" id="6nFpYlusyqo" role="3clF45">
@@ -14816,7 +14815,7 @@
         <node concept="37vLTG" id="5Qx6_65s9rq" role="3clF46">
           <property role="TrG5h" value="aspectClique" />
           <node concept="3uibUv" id="3OUB6BBw8Th" role="1tU5fm">
-            <ref role="3uigEE" to="fqlx:3KN3A4uUhmW" resolve="AspectClique" />
+            <ref role="3uigEE" to="pxw9:3KN3A4uUhmW" resolve="AspectClique" />
             <node concept="3qTvmN" id="3OUB6BBwD$L" role="11_B2D" />
           </node>
         </node>
@@ -15132,7 +15131,7 @@
           <ref role="3uigEE" node="1z4$59iohfJ" resolve="Request" />
           <node concept="3qUE_q" id="6v6oK24A0OT" role="11_B2D">
             <node concept="3uibUv" id="6v6oK24A13z" role="3qUE_r">
-              <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
+              <ref role="3uigEE" to="ugy2:5EDW3XDYeWv" resolve="Query" />
             </node>
           </node>
           <node concept="3qTvmN" id="1z4$59iB0$B" role="11_B2D" />
@@ -15347,7 +15346,7 @@
                                   </node>
                                 </node>
                                 <node concept="liA8E" id="6cGbuqO7y_$" role="2OqNvi">
-                                  <ref role="37wK5l" to="psoy:5X1yxJI3E6N" resolve="allCauses" />
+                                  <ref role="37wK5l" to="xydz:5X1yxJI3E6N" resolve="allCauses" />
                                 </node>
                               </node>
                               <node concept="1uHKPH" id="6cGbuqO7A_g" role="2OqNvi" />
@@ -15392,7 +15391,7 @@
                       </node>
                     </node>
                     <node concept="liA8E" id="5ygLqKORd3A" role="2OqNvi">
-                      <ref role="37wK5l" to="psoy:2gw7OvgCNSM" resolve="hasErrors" />
+                      <ref role="37wK5l" to="xydz:2gw7OvgCNSM" resolve="hasErrors" />
                     </node>
                   </node>
                 </node>
@@ -16249,7 +16248,7 @@
         <ref role="3uigEE" node="1z4$59iohfJ" resolve="Request" />
         <node concept="3qUE_q" id="6v6oK24_VpK" role="11_B2D">
           <node concept="3uibUv" id="6v6oK24_WSw" role="3qUE_r">
-            <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
+            <ref role="3uigEE" to="ugy2:5EDW3XDYeWv" resolve="Query" />
           </node>
         </node>
         <node concept="3qTvmN" id="1z4$59iB3jC" role="11_B2D" />
@@ -16637,7 +16636,7 @@
               </node>
             </node>
             <node concept="liA8E" id="6v6oK27AlzA" role="2OqNvi">
-              <ref role="37wK5l" to="fqlx:7mB3viLmii2" resolve="allForNodes" />
+              <ref role="37wK5l" to="pxw9:7mB3viLmii2" resolve="allForNodes" />
               <node concept="1rXfSq" id="6v6oK27AlzB" role="37wK5m">
                 <ref role="37wK5l" node="6v6oK23TvH_" resolve="nodes" />
               </node>
@@ -16647,7 +16646,7 @@
       </node>
       <node concept="A3Dl8" id="6v6oK22GzOh" role="3clF45">
         <node concept="3uibUv" id="6v6oK22GzOi" role="A3Ik2">
-          <ref role="3uigEE" to="fqlx:3KN3A4uUhmW" resolve="AspectClique" />
+          <ref role="3uigEE" to="pxw9:3KN3A4uUhmW" resolve="AspectClique" />
           <node concept="3uibUv" id="6v6oK22GzOj" role="11_B2D">
             <ref role="3uigEE" to="u46i:7km57Pkjxf4" resolve="TypecheckingAspect" />
           </node>
@@ -16673,7 +16672,7 @@
         </node>
       </node>
       <node concept="3uibUv" id="6v6oK22HMxA" role="3clF45">
-        <ref role="3uigEE" to="fqlx:NKt6ynorWQ" resolve="AspectLookup" />
+        <ref role="3uigEE" to="pxw9:NKt6ynorWQ" resolve="AspectLookup" />
         <node concept="3uibUv" id="6v6oK22LnoG" role="11_B2D">
           <ref role="3uigEE" to="u46i:7km57Pkjxf4" resolve="TypecheckingAspect" />
         </node>
@@ -16828,7 +16827,7 @@
                   <ref role="3cqZAo" node="6v6oK26xzhq" resolve="aspectClique" />
                 </node>
                 <node concept="liA8E" id="6v6oK26xzgw" role="2OqNvi">
-                  <ref role="37wK5l" to="fqlx:4ekZiHe4j$O" resolve="isEmpty" />
+                  <ref role="37wK5l" to="pxw9:4ekZiHe4j$O" resolve="isEmpty" />
                 </node>
               </node>
             </node>
@@ -16965,7 +16964,7 @@
           <node concept="3cpWsn" id="6v6oK26xzhq" role="1Duv9x">
             <property role="TrG5h" value="aspectClique" />
             <node concept="3uibUv" id="6v6oK26xzhr" role="1tU5fm">
-              <ref role="3uigEE" to="fqlx:3KN3A4uUhmW" resolve="AspectClique" />
+              <ref role="3uigEE" to="pxw9:3KN3A4uUhmW" resolve="AspectClique" />
               <node concept="3uibUv" id="6v6oK26xzhs" role="11_B2D">
                 <ref role="3uigEE" to="u46i:7km57Pkjxf4" resolve="TypecheckingAspect" />
               </node>
@@ -16996,7 +16995,7 @@
         <property role="TrG5h" value="acs" />
         <node concept="A3Dl8" id="6v6oK27XMIp" role="1tU5fm">
           <node concept="3uibUv" id="6v6oK27XMIq" role="A3Ik2">
-            <ref role="3uigEE" to="fqlx:3KN3A4uUhmW" resolve="AspectClique" />
+            <ref role="3uigEE" to="pxw9:3KN3A4uUhmW" resolve="AspectClique" />
             <node concept="3uibUv" id="6v6oK27XMIr" role="11_B2D">
               <ref role="3uigEE" to="u46i:7km57Pkjxf4" resolve="TypecheckingAspect" />
             </node>
@@ -17037,7 +17036,7 @@
     <node concept="16euLQ" id="6v6oK24xFz5" role="16eVyc">
       <property role="TrG5h" value="Q" />
       <node concept="3uibUv" id="6v6oK24y5zh" role="3ztrMU">
-        <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
+        <ref role="3uigEE" to="ugy2:5EDW3XDYeWv" resolve="Query" />
       </node>
     </node>
     <node concept="16euLQ" id="1z4$59iqk5$" role="16eVyc">
@@ -17733,7 +17732,7 @@
       <node concept="3Tmbuc" id="6v6oK22INMf" role="1B3o_S" />
       <node concept="A3Dl8" id="6v6oK22INMh" role="3clF45">
         <node concept="3uibUv" id="6v6oK22INMi" role="A3Ik2">
-          <ref role="3uigEE" to="fqlx:3KN3A4uUhmW" resolve="AspectClique" />
+          <ref role="3uigEE" to="pxw9:3KN3A4uUhmW" resolve="AspectClique" />
           <node concept="3uibUv" id="6v6oK22INMj" role="11_B2D">
             <ref role="3uigEE" to="u46i:7km57Pkjxf4" resolve="TypecheckingAspect" />
           </node>
@@ -17820,7 +17819,7 @@
               </node>
             </node>
             <node concept="liA8E" id="6v6oK22JNn3" role="2OqNvi">
-              <ref role="37wK5l" to="fqlx:9UUIHLNig1" resolve="allForRoot" />
+              <ref role="37wK5l" to="pxw9:9UUIHLNig1" resolve="allForRoot" />
               <node concept="2OqwBi" id="6v6oK22KB6s" role="37wK5m">
                 <node concept="2OqwBi" id="6v6oK24T5$d" role="2Oq$k0">
                   <node concept="1rXfSq" id="6v6oK24T0An" role="2Oq$k0">
@@ -18200,7 +18199,7 @@
       <node concept="3Tmbuc" id="6v6oK22QWVS" role="1B3o_S" />
       <node concept="A3Dl8" id="6v6oK22QWVU" role="3clF45">
         <node concept="3uibUv" id="6v6oK22QWVV" role="A3Ik2">
-          <ref role="3uigEE" to="fqlx:3KN3A4uUhmW" resolve="AspectClique" />
+          <ref role="3uigEE" to="pxw9:3KN3A4uUhmW" resolve="AspectClique" />
           <node concept="3uibUv" id="6v6oK22QWVW" role="11_B2D">
             <ref role="3uigEE" to="u46i:7km57Pkjxf4" resolve="TypecheckingAspect" />
           </node>
@@ -18216,7 +18215,7 @@
               </node>
             </node>
             <node concept="liA8E" id="6v6oK22RQr4" role="2OqNvi">
-              <ref role="37wK5l" to="fqlx:9UUIHLNig1" resolve="allForRoot" />
+              <ref role="37wK5l" to="pxw9:9UUIHLNig1" resolve="allForRoot" />
               <node concept="2OqwBi" id="6v6oK22RQr5" role="37wK5m">
                 <node concept="2OqwBi" id="6v6oK24VDAg" role="2Oq$k0">
                   <node concept="1rXfSq" id="6v6oK24VzCE" role="2Oq$k0">
@@ -20510,7 +20509,7 @@
     <node concept="16euLQ" id="6v6oK28Op7I" role="16eVyc">
       <property role="TrG5h" value="Q" />
       <node concept="3uibUv" id="6v6oK28Op9d" role="3ztrMU">
-        <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
+        <ref role="3uigEE" to="ugy2:5EDW3XDYeWv" resolve="Query" />
       </node>
     </node>
     <node concept="3clFb_" id="6v6oK28OrCR" role="jymVt">
diff --git a/coderules/solutions/jetbrains.mps.coderules.ui/jetbrains.mps.coderules.ui.msd b/coderules/solutions/jetbrains.mps.coderules.ui/jetbrains.mps.coderules.ui.msd
index f72ab659..c60879ba 100644
--- a/coderules/solutions/jetbrains.mps.coderules.ui/jetbrains.mps.coderules.ui.msd
+++ b/coderules/solutions/jetbrains.mps.coderules.ui/jetbrains.mps.coderules.ui.msd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <solution name="jetbrains.mps.coderules.ui" uuid="4d5d9aa1-7b71-4888-9100-1b793e5328a6" moduleVersion="0">
   <models>
-    <modelRoot type="default" contentPath="${module}">
+    <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
     </modelRoot>
   </models>
@@ -16,10 +16,11 @@
     <dependency reexport="true">f97d84b2-8bad-4fdd-8ede-da17b3eacf4c(jetbrains.mps.coderules)</dependency>
     <dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
     <dependency reexport="true">26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)</dependency>
-    <dependency reexport="true">a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)</dependency>
     <dependency reexport="true">498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)</dependency>
     <dependency reexport="true">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
+    <dependency reexport="false">bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)</dependency>
+    <dependency reexport="false">a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
@@ -49,10 +50,8 @@
     <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
     <module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
     <module reference="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c(jetbrains.mps.coderules)" version="0" />
-    <module reference="f113d56b-63e3-4120-a89c-2f5dcb8c6290(jetbrains.mps.coderules.runtime)" version="0" />
     <module reference="4d5d9aa1-7b71-4888-9100-1b793e5328a6(jetbrains.mps.coderules.ui)" version="0" />
     <module reference="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" version="0" />
-    <module reference="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" 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" />
diff --git a/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps b/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps
index fda355e1..db9927e1 100644
--- a/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps
@@ -52,8 +52,6 @@
     <import index="mhfm" ref="3f233e7f-b8a6-46d2-a57f-795d56775243/java:org.jetbrains.annotations(Annotations/)" />
     <import index="g1qu" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.util.ui(MPS.IDEA/)" />
     <import index="bj13" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.logical(jetbrains.mps.logic.reactor/)" />
-    <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.dataform)" />
-    <import index="oy3s" ref="r:a6030cee-34eb-4503-b1bf-015fe5cd8c1a(jetbrains.mps.logic.unification)" />
     <import index="6rp1" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:com.github.andrewoma.dexx.collection(jetbrains.mps.logic.reactor/)" />
     <import index="bid0" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.util(jetbrains.mps.logic.reactor/)" />
     <import index="gsia" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:javax.swing.event(JDK/)" />
@@ -84,7 +82,6 @@
     <import index="iljd" ref="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c/java:io.reactivex.plugins(jetbrains.mps.coderules/)" />
     <import index="5tvg" ref="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c/java:io.reactivex.disposables(jetbrains.mps.coderules/)" />
     <import index="m4y7" ref="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c/java:io.reactivex.schedulers(jetbrains.mps.coderules/)" />
-    <import index="i348" ref="r:42a15dec-83a9-4fe1-80d6-3bf898c512bd(jetbrains.mps.lang.coderules.template)" />
     <import index="v7ux" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.ui.content(MPS.IDEA/)" />
     <import index="jkny" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.wm(MPS.IDEA/)" />
     <import index="v23q" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi(MPS.IDEA/)" />
@@ -106,6 +103,9 @@
     <import index="ze1i" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel.runtime(MPS.Core/)" />
     <import index="j8aq" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.module(MPS.Core/)" />
     <import index="82uw" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.function(JDK/)" />
+    <import index="ugy2" ref="r:57b2449f-b7c7-4941-bd75-9c594835f5cd(jetbrains.mps.lang.coderules.template)" />
+    <import index="cof4" ref="r:0a9d1d47-250c-4f98-8962-b65edf8b0721(jetbrains.mps.logic.dataform)" />
+    <import index="uwx2" ref="r:76101703-3fc5-4e76-aa48-9728dde91f7b(jetbrains.mps.logic.unification)" />
     <import index="2sud" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.ui.treeStructure(MPS.IDEA/)" implicit="true" />
     <import index="tprs" ref="r:00000000-0000-4000-0000-011c895904a4(jetbrains.mps.ide.actions)" implicit="true" />
   </imports>
@@ -20778,7 +20778,7 @@
         <node concept="37vLTG" id="6QkkSolKGTF" role="3clF46">
           <property role="TrG5h" value="ruleEx" />
           <node concept="3uibUv" id="6QkkSolKHsd" role="1tU5fm">
-            <ref role="3uigEE" to="i348:7nPD14OaO1O" resolve="RuleEx" />
+            <ref role="3uigEE" to="ugy2:7nPD14OaO1O" resolve="RuleEx" />
           </node>
         </node>
         <node concept="3uibUv" id="6QkkSolKEFf" role="3clF45">
@@ -20810,7 +20810,7 @@
                           <ref role="3cqZAo" node="6QkkSolKGTF" resolve="ruleEx" />
                         </node>
                         <node concept="liA8E" id="3Pxu0s8gDPG" role="2OqNvi">
-                          <ref role="37wK5l" to="i348:3Pxu0s8egWa" resolve="origin" />
+                          <ref role="37wK5l" to="ugy2:3Pxu0s8egWa" resolve="origin" />
                         </node>
                       </node>
                       <node concept="3uibUv" id="3Pxu0s8gQKZ" role="10QFUM">
@@ -20959,7 +20959,7 @@
         <node concept="37vLTG" id="6QkkSolM4Dr" role="3clF46">
           <property role="TrG5h" value="ruleEx" />
           <node concept="3uibUv" id="6QkkSolM4Ds" role="1tU5fm">
-            <ref role="3uigEE" to="i348:7nPD14OaO1O" resolve="RuleEx" />
+            <ref role="3uigEE" to="ugy2:7nPD14OaO1O" resolve="RuleEx" />
           </node>
         </node>
         <node concept="37vLTG" id="6QkkSolLWBQ" role="3clF46">
@@ -21002,7 +21002,7 @@
                   <ref role="3cqZAo" node="6QkkSolM4Dr" resolve="ruleEx" />
                 </node>
                 <node concept="liA8E" id="6QkkSolM31a" role="2OqNvi">
-                  <ref role="37wK5l" to="i348:7nPD14Ob4lt" resolve="templateRef" />
+                  <ref role="37wK5l" to="ugy2:7nPD14Ob4lt" resolve="templateRef" />
                 </node>
               </node>
             </node>
@@ -21630,12 +21630,12 @@
                       <node concept="3cpWsn" id="7pxta7vksdr" role="3cpWs9">
                         <property role="TrG5h" value="val" />
                         <node concept="3uibUv" id="7pxta7vksds" role="1tU5fm">
-                          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                          <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                         </node>
                         <node concept="1eOMI4" id="7pxta7vkvzJ" role="33vP2m">
                           <node concept="10QFUN" id="7pxta7vkvzG" role="1eOMHV">
                             <node concept="3uibUv" id="7pxta7vkvzL" role="10QFUM">
-                              <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                              <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                             </node>
                             <node concept="37vLTw" id="7pxta7vkvEd" role="10QFUP">
                               <ref role="3cqZAo" node="7pxta7vkvE6" resolve="value" />
@@ -21695,7 +21695,7 @@
                   </node>
                   <node concept="2ZW3vV" id="7pxta7vkv3O" role="3eO9$A">
                     <node concept="3uibUv" id="7pxta7vkvk3" role="2ZW6by">
-                      <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                      <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                     </node>
                     <node concept="37vLTw" id="7pxta7vkvEe" role="2ZW6bz">
                       <ref role="3cqZAo" node="7pxta7vkvE6" resolve="value" />
@@ -21757,7 +21757,7 @@
             <node concept="3eNFk2" id="3sb6Qlve16O" role="3eNLev">
               <node concept="2ZW3vV" id="3sb6Qlve16P" role="3eO9$A">
                 <node concept="3uibUv" id="3sb6Qlve16Q" role="2ZW6by">
-                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                  <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                 </node>
                 <node concept="37vLTw" id="3sb6Qlve16R" role="2ZW6bz">
                   <ref role="3cqZAo" node="3sb6Qlve15D" resolve="arg" />
@@ -22115,7 +22115,7 @@
         <node concept="37vLTG" id="19fWAfxmoFA" role="3clF46">
           <property role="TrG5h" value="dataFormPrintable" />
           <node concept="3uibUv" id="19fWAfxnC_h" role="1tU5fm">
-            <ref role="3uigEE" to="6exd:19fWAfxiNy0" resolve="DataFormPrintable" />
+            <ref role="3uigEE" to="cof4:19fWAfxiNy0" resolve="DataFormPrintable" />
           </node>
         </node>
         <node concept="17QB3L" id="2tI9bOlavJq" role="3clF45" />
@@ -22140,7 +22140,7 @@
                 <ref role="3cqZAo" node="19fWAfxmoFA" resolve="dataFormPrintable" />
               </node>
               <node concept="liA8E" id="19fWAfxnI0y" role="2OqNvi">
-                <ref role="37wK5l" to="6exd:19fWAfxiOqh" resolve="printObject" />
+                <ref role="37wK5l" to="cof4:19fWAfxiOqh" resolve="printObject" />
                 <node concept="37vLTw" id="19fWAfxoDL0" role="37wK5m">
                   <ref role="3cqZAo" node="2tI9bOlayJK" resolve="value" />
                 </node>
@@ -23455,11 +23455,11 @@
             <node concept="3cpWsn" id="6RFuZEC715N" role="3cpWs9">
               <property role="TrG5h" value="ruleEx" />
               <node concept="3uibUv" id="6RFuZEC715O" role="1tU5fm">
-                <ref role="3uigEE" to="i348:7nPD14OaO1O" resolve="RuleEx" />
+                <ref role="3uigEE" to="ugy2:7nPD14OaO1O" resolve="RuleEx" />
               </node>
               <node concept="10QFUN" id="6RFuZEC71Wq" role="33vP2m">
                 <node concept="3uibUv" id="6RFuZEC71Wm" role="10QFUM">
-                  <ref role="3uigEE" to="i348:7nPD14OaO1O" resolve="RuleEx" />
+                  <ref role="3uigEE" to="ugy2:7nPD14OaO1O" resolve="RuleEx" />
                 </node>
                 <node concept="2OqwBi" id="6RFuZEC71Wn" role="10QFUP">
                   <node concept="1LFfDK" id="6bBjpI83UpJ" role="2Oq$k0">
@@ -23490,7 +23490,7 @@
                   <ref role="3cqZAo" node="6RFuZEC715N" resolve="ruleEx" />
                 </node>
                 <node concept="liA8E" id="3Pxu0s8g7uE" role="2OqNvi">
-                  <ref role="37wK5l" to="i348:3Pxu0s8egWa" resolve="origin" />
+                  <ref role="37wK5l" to="ugy2:3Pxu0s8egWa" resolve="origin" />
                 </node>
               </node>
             </node>
@@ -23900,11 +23900,11 @@
             <node concept="3cpWsn" id="2T1p0CFILaZ" role="3cpWs9">
               <property role="TrG5h" value="ruleEx" />
               <node concept="3uibUv" id="2T1p0CFILb0" role="1tU5fm">
-                <ref role="3uigEE" to="i348:7nPD14OaO1O" resolve="RuleEx" />
+                <ref role="3uigEE" to="ugy2:7nPD14OaO1O" resolve="RuleEx" />
               </node>
               <node concept="10QFUN" id="2T1p0CFILb1" role="33vP2m">
                 <node concept="3uibUv" id="2T1p0CFILb2" role="10QFUM">
-                  <ref role="3uigEE" to="i348:7nPD14OaO1O" resolve="RuleEx" />
+                  <ref role="3uigEE" to="ugy2:7nPD14OaO1O" resolve="RuleEx" />
                 </node>
                 <node concept="2EnYce" id="2T1p0CFILb3" role="10QFUP">
                   <node concept="1LFfDK" id="2T1p0CFILb4" role="2Oq$k0">
diff --git a/coderules/solutions/jetbrains.mps.coderules/jetbrains.mps.coderules.msd b/coderules/solutions/jetbrains.mps.coderules/jetbrains.mps.coderules.msd
index 3a6556ac..b738a514 100644
--- a/coderules/solutions/jetbrains.mps.coderules/jetbrains.mps.coderules.msd
+++ b/coderules/solutions/jetbrains.mps.coderules/jetbrains.mps.coderules.msd
@@ -25,8 +25,9 @@
     <dependency reexport="false">498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)</dependency>
-    <dependency reexport="true">f113d56b-63e3-4120-a89c-2f5dcb8c6290(jetbrains.mps.coderules.runtime)</dependency>
     <dependency reexport="false">6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.coderules.typechecking)</dependency>
+    <dependency reexport="false">bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)</dependency>
+    <dependency reexport="false">a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
@@ -56,11 +57,9 @@
     <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
     <module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
     <module reference="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c(jetbrains.mps.coderules)" version="0" />
-    <module reference="f113d56b-63e3-4120-a89c-2f5dcb8c6290(jetbrains.mps.coderules.runtime)" version="0" />
     <module reference="6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.coderules.typechecking)" version="0" />
     <module reference="bfbdd672-7ff5-403f-af4f-16da5226f34c(jetbrains.mps.findUsages.runtime)" version="0" />
     <module reference="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" version="0" />
-    <module reference="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" version="0" />
     <module reference="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" version="0" />
diff --git a/coderules/solutions/jetbrains.mps.coderules/models/jetbrains.mps.coderules.mps b/coderules/solutions/jetbrains.mps.coderules/models/jetbrains.mps.coderules.mps
index b0098786..a47f252e 100644
--- a/coderules/solutions/jetbrains.mps.coderules/models/jetbrains.mps.coderules.mps
+++ b/coderules/solutions/jetbrains.mps.coderules/models/jetbrains.mps.coderules.mps
@@ -8,8 +8,8 @@
     <import index="ze1i" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel.runtime(MPS.Core/)" />
     <import index="wyuk" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.components(MPS.Core/)" />
     <import index="tj24" ref="r:0fbbb63a-fd15-46e1-8136-78049f6d6e63(jetbrains.mps.coderules.typechecking.service)" />
-    <import index="fqlx" ref="r:2cc226a9-8a78-4010-b962-823343fd28ff(jetbrains.mps.lang.coderules.aspect)" />
     <import index="w7la" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.evaluation(jetbrains.mps.logic.reactor/)" />
+    <import index="pxw9" ref="r:e3417884-ba0a-4330-9cea-64f01ace2e9d(jetbrains.mps.lang.coderules.aspect)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
   </imports>
   <registry>
@@ -130,8 +130,8 @@
         </node>
         <node concept="3clFbF" id="IFW4V2uR84" role="3cqZAp">
           <node concept="2YIFZM" id="IFW4V2uR85" role="3clFbG">
-            <ref role="1Pybhc" to="fqlx:IFW4V2uswu" resolve="AspectLookup.AspectLookupCoordinator" />
-            <ref role="37wK5l" to="fqlx:IFW4V2uAhM" resolve="init" />
+            <ref role="1Pybhc" to="pxw9:IFW4V2uswu" resolve="AspectLookup.AspectLookupCoordinator" />
+            <ref role="37wK5l" to="pxw9:IFW4V2uAhM" resolve="init" />
           </node>
         </node>
       </node>
@@ -153,8 +153,8 @@
         </node>
         <node concept="3clFbF" id="IFW4V2uRwY" role="3cqZAp">
           <node concept="2YIFZM" id="IFW4V2uRy4" role="3clFbG">
-            <ref role="37wK5l" to="fqlx:IFW4V2uCEF" resolve="dispose" />
-            <ref role="1Pybhc" to="fqlx:IFW4V2uswu" resolve="AspectLookup.AspectLookupCoordinator" />
+            <ref role="37wK5l" to="pxw9:IFW4V2uCEF" resolve="dispose" />
+            <ref role="1Pybhc" to="pxw9:IFW4V2uswu" resolve="AspectLookup.AspectLookupCoordinator" />
           </node>
         </node>
       </node>
diff --git a/coderules/solutions/jetbrains.mps.coderules/models/plugin.mps b/coderules/solutions/jetbrains.mps.coderules/models/plugin.mps
index 355dbc18..af14c3c8 100644
--- a/coderules/solutions/jetbrains.mps.coderules/models/plugin.mps
+++ b/coderules/solutions/jetbrains.mps.coderules/models/plugin.mps
@@ -25,11 +25,11 @@
     <import index="w7la" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.evaluation(jetbrains.mps.logic.reactor/)" />
     <import index="av0y" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.program(jetbrains.mps.logic.reactor/)" />
     <import index="bj13" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.logical(jetbrains.mps.logic.reactor/)" />
-    <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.dataform)" />
-    <import index="oy3s" ref="r:a6030cee-34eb-4503-b1bf-015fe5cd8c1a(jetbrains.mps.logic.unification)" />
     <import index="6rp1" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:com.github.andrewoma.dexx.collection(jetbrains.mps.logic.reactor/)" />
     <import index="bid0" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.util(jetbrains.mps.logic.reactor/)" />
     <import index="1yqb" ref="r:bd76f794-cfad-45dd-9c1c-e3203d1c5c7a(jetbrains.mps.coderules.service)" />
+    <import index="cof4" ref="r:0a9d1d47-250c-4f98-8962-b65edf8b0721(jetbrains.mps.logic.dataform)" />
+    <import index="uwx2" ref="r:76101703-3fc5-4e76-aa48-9728dde91f7b(jetbrains.mps.logic.unification)" />
     <import index="unkn" ref="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c/java:io.reactivex(jetbrains.mps.coderules/)" implicit="true" />
   </imports>
   <registry>
@@ -4616,14 +4616,14 @@
         <node concept="3clFbF" id="19wqdqOqn3d" role="3cqZAp">
           <node concept="2OqwBi" id="19wqdqOqn_0" role="3clFbG">
             <node concept="2YIFZM" id="19wqdqOqn3f" role="2Oq$k0">
-              <ref role="1Pybhc" to="6exd:3OPtF02T8yx" resolve="Mappers" />
-              <ref role="37wK5l" to="6exd:5s497VqteR6" resolve="mapper" />
+              <ref role="1Pybhc" to="cof4:3OPtF02T8yx" resolve="Mappers" />
+              <ref role="37wK5l" to="cof4:5s497VqteR6" resolve="mapper" />
               <node concept="1rXfSq" id="19wqdqOqL8c" role="37wK5m">
                 <ref role="37wK5l" node="19wqdqOqsJ5" resolve="treeformSnapshotDelegate" />
               </node>
             </node>
             <node concept="liA8E" id="19wqdqOqo88" role="2OqNvi">
-              <ref role="37wK5l" to="6exd:3OPtF02TgQt" resolve="map" />
+              <ref role="37wK5l" to="cof4:3OPtF02TgQt" resolve="map" />
               <node concept="37vLTw" id="19wqdqOqot8" role="37wK5m">
                 <ref role="3cqZAo" node="3mz2_dYbXuJ" resolve="original" />
               </node>
@@ -4634,11 +4634,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="6exd:1bm7a6EXvsP" resolve="DataForm" />
+          <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
         </node>
       </node>
       <node concept="3uibUv" id="3mz2_dYbYkL" role="3clF45">
-        <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+        <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
       </node>
       <node concept="3Tmbuc" id="19wqdqOq0dS" role="1B3o_S" />
     </node>
@@ -4789,7 +4789,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="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="37vLTw" id="3mz2_dYaDDm" role="2ZW6bz">
                 <ref role="3cqZAo" node="3mz2_dYaCcM" resolve="arg" />
@@ -4806,7 +4806,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="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                          <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                         </node>
                         <node concept="37vLTw" id="3mz2_dYbZMM" role="10QFUP">
                           <ref role="3cqZAo" node="3mz2_dYaCcM" resolve="arg" />
@@ -4877,7 +4877,7 @@
     <node concept="3clFb_" id="19wqdqOqsJ5" role="jymVt">
       <property role="TrG5h" value="treeformSnapshotDelegate" />
       <node concept="3uibUv" id="19wqdqOqINy" role="3clF45">
-        <ref role="3uigEE" to="6exd:3OPtF031GQe" resolve="Mappers.MapDelegate" />
+        <ref role="3uigEE" to="cof4:3OPtF031GQe" resolve="Mappers.MapDelegate" />
       </node>
       <node concept="3Tmbuc" id="19wqdqOqvyp" role="1B3o_S" />
       <node concept="3clFbS" id="19wqdqOqsJ9" role="3clF47">
@@ -4887,7 +4887,7 @@
               <node concept="1Y3b0j" id="19wqdqOqxs7" role="YeSDq">
                 <property role="2bfB8j" value="true" />
                 <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
-                <ref role="1Y3XeK" to="6exd:3OPtF031GQe" resolve="Mappers.MapDelegate" />
+                <ref role="1Y3XeK" to="cof4:3OPtF031GQe" resolve="Mappers.MapDelegate" />
                 <node concept="2tJIrI" id="19wqdqOqxs8" role="jymVt" />
                 <node concept="3Tm1VV" id="19wqdqOqxs9" role="1B3o_S" />
                 <node concept="3clFb_" id="19wqdqOqxsa" role="jymVt">
@@ -4896,7 +4896,7 @@
                   <node concept="37vLTG" id="19wqdqOqxsb" role="3clF46">
                     <property role="TrG5h" value="tf" />
                     <node concept="3uibUv" id="19wqdqOqxsc" role="1tU5fm">
-                      <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                      <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                     </node>
                   </node>
                   <node concept="10P_77" id="19wqdqOqxsd" role="3clF45" />
@@ -4953,7 +4953,7 @@
                         <node concept="3cpWs6" id="19wqdqOqxsk" role="3cqZAp">
                           <node concept="2ZW3vV" id="19wqdqOqxsl" role="3cqZAk">
                             <node concept="3uibUv" id="3gNap3frqGV" role="2ZW6by">
-                              <ref role="3uigEE" to="oy3s:4TCblo5MJ1m" resolve="LogicalDataForm" />
+                              <ref role="3uigEE" to="uwx2:4TCblo5MJ1m" resolve="LogicalDataForm" />
                             </node>
                             <node concept="37vLTw" id="19wqdqOqxsn" role="2ZW6bz">
                               <ref role="3cqZAo" node="19wqdqOqxsb" resolve="tf" />
@@ -4964,7 +4964,7 @@
                       </node>
                       <node concept="2ZW3vV" id="19wqdqOqxsp" role="3clFbw">
                         <node concept="3uibUv" id="19wqdqOqxsq" role="2ZW6by">
-                          <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+                          <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
                         </node>
                         <node concept="37vLTw" id="19wqdqOqxsr" role="2ZW6bz">
                           <ref role="3cqZAo" node="19wqdqOqxsb" resolve="tf" />
@@ -4985,18 +4985,18 @@
                   <node concept="37vLTG" id="19wqdqOqxsw" role="3clF46">
                     <property role="TrG5h" value="tf" />
                     <node concept="3uibUv" id="19wqdqOqxsx" role="1tU5fm">
-                      <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                      <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                     </node>
                   </node>
                   <node concept="37vLTG" id="19wqdqOqxsy" role="3clF46">
                     <property role="TrG5h" value="fallback" />
                     <node concept="3uibUv" id="19wqdqOqxsz" role="1tU5fm">
-                      <ref role="3uigEE" to="6exd:3OPtF02TdNT" resolve="DataForm.Mapper" />
+                      <ref role="3uigEE" to="cof4:3OPtF02TdNT" resolve="DataForm.Mapper" />
                     </node>
                   </node>
                   <node concept="3Tm1VV" id="19wqdqOqxs$" role="1B3o_S" />
                   <node concept="3uibUv" id="19wqdqOqxs_" role="3clF45">
-                    <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                    <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                   </node>
                   <node concept="3clFbS" id="19wqdqOqxsA" role="3clF47">
                     <node concept="3clFbJ" id="19wqdqOqxsB" role="3cqZAp">
@@ -5007,14 +5007,14 @@
                             <node concept="3uibUv" id="19wqdqOqxsF" role="1tU5fm">
                               <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
                               <node concept="3uibUv" id="19wqdqOqxsG" role="11_B2D">
-                                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                               </node>
                             </node>
                             <node concept="10QFUN" id="19wqdqOqxsH" role="33vP2m">
                               <node concept="3uibUv" id="19wqdqOqxsI" role="10QFUM">
                                 <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
                                 <node concept="3uibUv" id="19wqdqOqxsJ" role="11_B2D">
-                                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                                  <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                                 </node>
                               </node>
                               <node concept="2OqwBi" id="19wqdqOqxsK" role="10QFUP">
@@ -5024,15 +5024,15 @@
                                       <ref role="3cqZAo" node="19wqdqOqxsw" resolve="tf" />
                                     </node>
                                     <node concept="3uibUv" id="3gNap3frrmL" role="10QFUM">
-                                      <ref role="3uigEE" to="oy3s:4TCblo5MJ1m" resolve="LogicalDataForm" />
+                                      <ref role="3uigEE" to="uwx2:4TCblo5MJ1m" resolve="LogicalDataForm" />
                                       <node concept="3uibUv" id="3gNap3frrQb" role="11_B2D">
-                                        <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                                        <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                                       </node>
                                     </node>
                                   </node>
                                 </node>
                                 <node concept="liA8E" id="19wqdqOqxsP" role="2OqNvi">
-                                  <ref role="37wK5l" to="oy3s:4TCblo5MS1o" resolve="logical" />
+                                  <ref role="37wK5l" to="uwx2:4TCblo5MS1o" resolve="logical" />
                                 </node>
                               </node>
                             </node>
@@ -5041,7 +5041,7 @@
                         <node concept="3cpWs6" id="19wqdqOqxsQ" role="3cqZAp">
                           <node concept="2ShNRf" id="19wqdqOqxsR" role="3cqZAk">
                             <node concept="1pGfFk" id="19wqdqOqxsS" role="2ShVmc">
-                              <ref role="37wK5l" to="oy3s:4TCblo5ML4I" resolve="LogicalDataForm" />
+                              <ref role="37wK5l" to="uwx2:4TCblo5ML4I" resolve="LogicalDataForm" />
                               <node concept="1rXfSq" id="19wqdqOqxsT" role="37wK5m">
                                 <ref role="37wK5l" node="19wqdqOpSqM" resolve="logicalSnapshot" />
                                 <node concept="37vLTw" id="19wqdqOqxsU" role="37wK5m">
@@ -5055,7 +5055,7 @@
                       </node>
                       <node concept="2ZW3vV" id="19wqdqOqxsW" role="3clFbw">
                         <node concept="3uibUv" id="3gNap3frr1Q" role="2ZW6by">
-                          <ref role="3uigEE" to="oy3s:4TCblo5MJ1m" resolve="LogicalDataForm" />
+                          <ref role="3uigEE" to="uwx2:4TCblo5MJ1m" resolve="LogicalDataForm" />
                         </node>
                         <node concept="37vLTw" id="19wqdqOqxsY" role="2ZW6bz">
                           <ref role="3cqZAo" node="19wqdqOqxsw" resolve="tf" />
@@ -5069,7 +5069,7 @@
                                 <ref role="3cqZAo" node="19wqdqOqxsw" resolve="tf" />
                               </node>
                               <node concept="liA8E" id="19wqdqOqxt4" role="2OqNvi">
-                                <ref role="37wK5l" to="6exd:3OPtF02Tjpr" resolve="mapRecursively" />
+                                <ref role="37wK5l" to="cof4:3OPtF02Tjpr" resolve="mapRecursively" />
                                 <node concept="37vLTw" id="19wqdqOqxt5" role="37wK5m">
                                   <ref role="3cqZAo" node="19wqdqOqxsy" resolve="fallback" />
                                 </node>
diff --git a/coderules/solutions/jetbrains.mps.coderules/models/service.mps b/coderules/solutions/jetbrains.mps.coderules/models/service.mps
index 46c66e6e..58d6af4a 100644
--- a/coderules/solutions/jetbrains.mps.coderules/models/service.mps
+++ b/coderules/solutions/jetbrains.mps.coderules/models/service.mps
@@ -18,7 +18,6 @@
     <import index="hano" ref="r:2b43b673-12f9-49ea-8e43-d0c7a401586a(jetbrains.mps.lang.coderules.eval)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
     <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
-    <import index="i348" ref="r:42a15dec-83a9-4fe1-80d6-3bf898c512bd(jetbrains.mps.lang.coderules.template)" />
     <import index="av0y" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.program(jetbrains.mps.logic.reactor/)" />
     <import index="unkn" ref="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c/java:io.reactivex(jetbrains.mps.coderules/)" />
     <import index="18ew" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.util(MPS.Core/)" />
@@ -28,21 +27,22 @@
     <import index="dxuu" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:javax.swing(JDK/)" />
     <import index="f4yq" ref="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c/java:hu.akarnokd.rxjava2.swing(jetbrains.mps.coderules/)" />
     <import index="e0w6" ref="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c/java:io.reactivex.observers(jetbrains.mps.coderules/)" />
-    <import index="fqlx" ref="r:2cc226a9-8a78-4010-b962-823343fd28ff(jetbrains.mps.lang.coderules.aspect)" />
     <import index="d6hs" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.errors.item(MPS.Core/)" />
     <import index="31yc" ref="r:0c18ff61-1cb9-4ff0-a899-c949ad03f97c(jetbrains.mps.coderules.plugin)" />
     <import index="et5u" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.messages(MPS.Core/)" />
     <import index="2gg1" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.errors(MPS.Core/)" />
     <import index="ksgm" ref="r:6285678b-007f-4527-bcf5-6fd38ba8c969(jetbrains.mps.lang.coderules.program)" />
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
-    <import index="lehm" ref="r:464fcc95-fddb-47d1-b620-592cbf6b8bf2(jetbrains.mps.coderules.runtime.memoizer)" />
-    <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.dataform)" />
-    <import index="psoy" ref="r:78313117-90ee-47a5-a91e-b5213df7f611(jetbrains.mps.coderules.runtime.result)" />
     <import index="82uw" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.function(JDK/)" />
-    <import index="cxk7" ref="r:daa544a7-0a5c-49c0-a54c-4c2a5b4868aa(jetbrains.mps.logic.predicate)" />
     <import index="bj13" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.logical(jetbrains.mps.logic.reactor/)" />
     <import index="bid0" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.util(jetbrains.mps.logic.reactor/)" />
     <import index="tj24" ref="r:0fbbb63a-fd15-46e1-8136-78049f6d6e63(jetbrains.mps.coderules.typechecking.service)" />
+    <import index="xydz" ref="r:b198cb67-efdc-40c0-8817-11ab64523a5b(jetbrains.mps.lang.coderules.result)" />
+    <import index="pxw9" ref="r:e3417884-ba0a-4330-9cea-64f01ace2e9d(jetbrains.mps.lang.coderules.aspect)" />
+    <import index="ugy2" ref="r:57b2449f-b7c7-4941-bd75-9c594835f5cd(jetbrains.mps.lang.coderules.template)" />
+    <import index="tpfl" ref="r:97d6f79f-4a27-4a9b-9122-9bccfb5317c9(jetbrains.mps.lang.coderules.predicate)" />
+    <import index="aedp" ref="r:969c74a0-af0a-4247-9dda-0da7708b8c0d(jetbrains.mps.lang.coderules.memoizer)" />
+    <import index="cof4" ref="r:0a9d1d47-250c-4f98-8962-b65edf8b0721(jetbrains.mps.logic.dataform)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -632,7 +632,7 @@
       <node concept="37vLTG" id="1imVejVB$Aj" role="3clF46">
         <property role="TrG5h" value="query" />
         <node concept="3uibUv" id="1imVejVB$Ak" role="1tU5fm">
-          <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
+          <ref role="3uigEE" to="ugy2:5EDW3XDYeWv" resolve="Query" />
         </node>
       </node>
     </node>
@@ -681,11 +681,11 @@
                   <node concept="3cpWsn" id="Hg6Enc4WaS" role="3cpWs9">
                     <property role="TrG5h" value="result" />
                     <node concept="2YIFZM" id="7TC1Xcd$6o$" role="33vP2m">
-                      <ref role="37wK5l" to="psoy:7Oc59RSEjeq" resolve="OK" />
-                      <ref role="1Pybhc" to="psoy:7Oc59RSEjdb" resolve="Result" />
+                      <ref role="37wK5l" to="xydz:7Oc59RSEjeq" resolve="OK" />
+                      <ref role="1Pybhc" to="xydz:7Oc59RSEjdb" resolve="Result" />
                     </node>
                     <node concept="3uibUv" id="Hg6Enc4WaU" role="1tU5fm">
-                      <ref role="3uigEE" to="psoy:7Oc59RSEjdb" resolve="Result" />
+                      <ref role="3uigEE" to="xydz:7Oc59RSEjdb" resolve="Result" />
                     </node>
                   </node>
                 </node>
@@ -986,7 +986,7 @@
                               <ref role="3cqZAo" node="Hg6Enc4WaS" resolve="result" />
                             </node>
                             <node concept="liA8E" id="6cGbuqO6rVq" role="2OqNvi">
-                              <ref role="37wK5l" to="psoy:5X1yxJI3E6N" resolve="allCauses" />
+                              <ref role="37wK5l" to="xydz:5X1yxJI3E6N" resolve="allCauses" />
                             </node>
                           </node>
                           <node concept="1uHKPH" id="6cGbuqO6vEY" role="2OqNvi" />
@@ -1025,7 +1025,7 @@
                       <ref role="3cqZAo" node="Hg6Enc4WaS" resolve="result" />
                     </node>
                     <node concept="liA8E" id="2gw7OvgDf0k" role="2OqNvi">
-                      <ref role="37wK5l" to="psoy:2gw7OvgCNSM" resolve="hasErrors" />
+                      <ref role="37wK5l" to="xydz:2gw7OvgCNSM" resolve="hasErrors" />
                     </node>
                   </node>
                 </node>
@@ -1140,7 +1140,7 @@
       <node concept="3Tmbuc" id="6nFpYluVWHE" role="1B3o_S" />
       <node concept="_YKpA" id="9UUIHJBCe$" role="3clF45">
         <node concept="3uibUv" id="9UUIHJBCe_" role="_ZDj9">
-          <ref role="3uigEE" to="i348:6OXbTD$iNPP" resolve="QueryTemplate" />
+          <ref role="3uigEE" to="ugy2:6OXbTD$iNPP" resolve="QueryTemplate" />
           <node concept="3qTvmN" id="9UUIHJBE_U" role="11_B2D" />
         </node>
       </node>
@@ -1171,7 +1171,7 @@
                       <ref role="3cqZAo" node="5EDW3XEoAmV" resolve="query" />
                     </node>
                     <node concept="liA8E" id="5EDW3XE$ye$" role="2OqNvi">
-                      <ref role="37wK5l" to="i348:5EDW3XE$mhS" resolve="type" />
+                      <ref role="37wK5l" to="ugy2:5EDW3XE$mhS" resolve="type" />
                     </node>
                   </node>
                 </node>
@@ -1230,13 +1230,13 @@
       <property role="TrG5h" value="query" />
       <node concept="3Tm6S6" id="5EDW3XEoAmW" role="1B3o_S" />
       <node concept="3uibUv" id="5EDW3XEoBY1" role="1tU5fm">
-        <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
+        <ref role="3uigEE" to="ugy2:5EDW3XDYeWv" resolve="Query" />
       </node>
     </node>
     <node concept="16euLQ" id="3KN3A4vA$Xq" role="16eVyc">
       <property role="TrG5h" value="T" />
       <node concept="3uibUv" id="3KN3A4vABPQ" role="3ztrMU">
-        <ref role="3uigEE" to="fqlx:NKt6yomNZE" resolve="CoderulesAspect" />
+        <ref role="3uigEE" to="pxw9:NKt6yomNZE" resolve="CoderulesAspect" />
       </node>
     </node>
   </node>
@@ -1824,10 +1824,10 @@
                             <node concept="3clFbS" id="7WKNeR9yo$x" role="3clF47">
                               <node concept="3clFbF" id="5wYq9r5UPWr" role="3cqZAp">
                                 <node concept="2YIFZM" id="5wYq9r5VEk8" role="3clFbG">
-                                  <ref role="1Pybhc" to="lehm:2tjs8VC0K0m" resolve="Memoizer" />
-                                  <ref role="37wK5l" to="lehm:2tjs8VC2_Fr" resolve="set" />
+                                  <ref role="1Pybhc" to="aedp:2tjs8VC0K0m" resolve="Memoizer" />
+                                  <ref role="37wK5l" to="aedp:2tjs8VC2_Fr" resolve="set" />
                                   <node concept="3VsKOn" id="5wYq9r5VGg$" role="37wK5m">
-                                    <ref role="3VsUkX" to="6exd:19fWAfxiNy0" resolve="DataFormPrintable" />
+                                    <ref role="3VsUkX" to="cof4:19fWAfxiNy0" resolve="DataFormPrintable" />
                                   </node>
                                   <node concept="2ShNRf" id="5wYq9r5VHZ5" role="37wK5m">
                                     <node concept="1pGfFk" id="5wYq9r5VJJ0" role="2ShVmc">
@@ -1954,8 +1954,8 @@
                                     <node concept="1rXfSq" id="55xYlrm9qw3" role="3clFbG">
                                       <ref role="37wK5l" node="55xYlrm9EfU" resolve="addReportItem" />
                                       <node concept="2YIFZM" id="55xYlrm9qw4" role="37wK5m">
-                                        <ref role="1Pybhc" to="cxk7:61G6TdBsGY8" resolve="FeedbackUtil" />
-                                        <ref role="37wK5l" to="cxk7:3o9wrC3WoA4" resolve="severityToStatus" />
+                                        <ref role="1Pybhc" to="tpfl:61G6TdBsGY8" resolve="FeedbackUtil" />
+                                        <ref role="37wK5l" to="tpfl:3o9wrC3WoA4" resolve="severityToStatus" />
                                         <node concept="2OqwBi" id="55xYlrm9qw5" role="37wK5m">
                                           <node concept="37vLTw" id="55xYlrm9qw6" role="2Oq$k0">
                                             <ref role="3cqZAo" node="55xYlrm9afc" resolve="feedback" />
@@ -2013,11 +2013,11 @@
                   <node concept="3cpWsn" id="Hg6Enc7CPS" role="3cpWs9">
                     <property role="TrG5h" value="result" />
                     <node concept="3uibUv" id="Hg6Enc7CPT" role="1tU5fm">
-                      <ref role="3uigEE" to="psoy:7Oc59RSEjdb" resolve="Result" />
+                      <ref role="3uigEE" to="xydz:7Oc59RSEjdb" resolve="Result" />
                     </node>
                     <node concept="2YIFZM" id="17DrR$SKrKQ" role="33vP2m">
-                      <ref role="37wK5l" to="psoy:3VwM5b5YDoi" resolve="SKIP" />
-                      <ref role="1Pybhc" to="psoy:7Oc59RSEjdb" resolve="Result" />
+                      <ref role="37wK5l" to="xydz:3VwM5b5YDoi" resolve="SKIP" />
+                      <ref role="1Pybhc" to="xydz:7Oc59RSEjdb" resolve="Result" />
                     </node>
                   </node>
                 </node>
@@ -2105,7 +2105,7 @@
                               <ref role="3cqZAo" node="Hg6Enc7CPS" resolve="result" />
                             </node>
                             <node concept="liA8E" id="Hg6Enc7CQi" role="2OqNvi">
-                              <ref role="37wK5l" to="psoy:7nkyKX7v7xb" resolve="and" />
+                              <ref role="37wK5l" to="xydz:7nkyKX7v7xb" resolve="and" />
                               <node concept="2OqwBi" id="Hg6Enc7CQj" role="37wK5m">
                                 <node concept="37vLTw" id="Hg6Enc7CQk" role="2Oq$k0">
                                   <ref role="3cqZAo" node="Hg6Enc7CPL" resolve="progEval" />
@@ -2164,7 +2164,7 @@
                             <ref role="3cqZAo" node="Hg6Enc7CPS" resolve="result" />
                           </node>
                           <node concept="liA8E" id="Hg6Enc7CQt" role="2OqNvi">
-                            <ref role="37wK5l" to="psoy:7Oc59RS_hsj" resolve="isSuccessful" />
+                            <ref role="37wK5l" to="xydz:7Oc59RS_hsj" resolve="isSuccessful" />
                           </node>
                         </node>
                         <node concept="3clFbS" id="7WKNeR9zVo8" role="3clFbx">
@@ -2250,7 +2250,7 @@
                                       <ref role="3cqZAo" node="Hg6Enc7CPS" resolve="result" />
                                     </node>
                                     <node concept="liA8E" id="3lXUvG08Cgd" role="2OqNvi">
-                                      <ref role="37wK5l" to="psoy:5X1yxJI3vjy" resolve="cause" />
+                                      <ref role="37wK5l" to="xydz:5X1yxJI3vjy" resolve="cause" />
                                     </node>
                                   </node>
                                 </node>
@@ -3970,7 +3970,7 @@
         <node concept="37vLTG" id="3MwxBzG5Ec6" role="3clF46">
           <property role="TrG5h" value="result" />
           <node concept="3uibUv" id="3MwxBzG5Ezk" role="1tU5fm">
-            <ref role="3uigEE" to="psoy:7Oc59RSEjdb" resolve="Result" />
+            <ref role="3uigEE" to="xydz:7Oc59RSEjdb" resolve="Result" />
           </node>
         </node>
         <node concept="3cqZAl" id="3MwxBzG5CRt" role="3clF45" />
@@ -4038,7 +4038,7 @@
       <node concept="37vLTG" id="5MNibEMWpZg" role="3clF46">
         <property role="TrG5h" value="aspectClique" />
         <node concept="3uibUv" id="5MNibEMWqg0" role="1tU5fm">
-          <ref role="3uigEE" to="fqlx:3KN3A4uUhmW" resolve="AspectClique" />
+          <ref role="3uigEE" to="pxw9:3KN3A4uUhmW" resolve="AspectClique" />
         </node>
       </node>
       <node concept="37vLTG" id="3F6vMxqaA9K" role="3clF46">
@@ -4099,7 +4099,7 @@
                     <node concept="37vLTG" id="3MwxBzG5HQu" role="3clF46">
                       <property role="TrG5h" value="result" />
                       <node concept="3uibUv" id="3MwxBzG5HQv" role="1tU5fm">
-                        <ref role="3uigEE" to="psoy:7Oc59RSEjdb" resolve="Result" />
+                        <ref role="3uigEE" to="xydz:7Oc59RSEjdb" resolve="Result" />
                       </node>
                     </node>
                     <node concept="3cqZAl" id="3MwxBzG5HQw" role="3clF45" />
@@ -4112,7 +4112,7 @@
                               <ref role="3cqZAo" node="3MwxBzG5HQu" resolve="result" />
                             </node>
                             <node concept="liA8E" id="3MwxBzG5JxP" role="2OqNvi">
-                              <ref role="37wK5l" to="psoy:7Oc59RS_hsj" resolve="isSuccessful" />
+                              <ref role="37wK5l" to="xydz:7Oc59RS_hsj" resolve="isSuccessful" />
                             </node>
                           </node>
                         </node>
@@ -4168,7 +4168,7 @@
       <node concept="37vLTG" id="5MNibEMWPAR" role="3clF46">
         <property role="TrG5h" value="aspectClique" />
         <node concept="3uibUv" id="5MNibEMWPV4" role="1tU5fm">
-          <ref role="3uigEE" to="fqlx:3KN3A4uUhmW" resolve="AspectClique" />
+          <ref role="3uigEE" to="pxw9:3KN3A4uUhmW" resolve="AspectClique" />
         </node>
       </node>
       <node concept="37vLTG" id="443LGHBiDFh" role="3clF46">
@@ -4185,7 +4185,7 @@
     <node concept="3clFb_" id="5MNibEMX5V_" role="jymVt">
       <property role="TrG5h" value="aspectClique" />
       <node concept="3uibUv" id="5MNibEMX9c2" role="3clF45">
-        <ref role="3uigEE" to="fqlx:3KN3A4uUhmW" resolve="AspectClique" />
+        <ref role="3uigEE" to="pxw9:3KN3A4uUhmW" resolve="AspectClique" />
       </node>
       <node concept="3Tm1VV" id="5MNibEMX5VC" role="1B3o_S" />
       <node concept="3clFbS" id="5MNibEMX5VD" role="3clF47">
@@ -4288,11 +4288,11 @@
                           <node concept="3cpWsn" id="6cGbuqO3EkS" role="3cpWs9">
                             <property role="TrG5h" value="fail" />
                             <node concept="3uibUv" id="6cGbuqO3AIZ" role="1tU5fm">
-                              <ref role="3uigEE" to="psoy:7Oc59RSEjdb" resolve="Result" />
+                              <ref role="3uigEE" to="xydz:7Oc59RSEjdb" resolve="Result" />
                             </node>
                             <node concept="2YIFZM" id="6cGbuqO3EkT" role="33vP2m">
-                              <ref role="37wK5l" to="psoy:5X1yxJHYPm2" resolve="FAIL" />
-                              <ref role="1Pybhc" to="psoy:7Oc59RSEjdb" resolve="Result" />
+                              <ref role="37wK5l" to="xydz:5X1yxJHYPm2" resolve="FAIL" />
+                              <ref role="1Pybhc" to="xydz:7Oc59RSEjdb" resolve="Result" />
                               <node concept="37vLTw" id="6cGbuqO3EkU" role="37wK5m">
                                 <ref role="3cqZAo" node="Hg6EncPqlI" resolve="thr" />
                               </node>
@@ -4425,11 +4425,11 @@
                           <node concept="3cpWsn" id="1PN9XOHtpN0" role="3cpWs9">
                             <property role="TrG5h" value="fail" />
                             <node concept="3uibUv" id="1PN9XOHtpN1" role="1tU5fm">
-                              <ref role="3uigEE" to="psoy:7Oc59RSEjdb" resolve="Result" />
+                              <ref role="3uigEE" to="xydz:7Oc59RSEjdb" resolve="Result" />
                             </node>
                             <node concept="2YIFZM" id="1PN9XOHtpN2" role="33vP2m">
-                              <ref role="37wK5l" to="psoy:5X1yxJHYPm2" resolve="FAIL" />
-                              <ref role="1Pybhc" to="psoy:7Oc59RSEjdb" resolve="Result" />
+                              <ref role="37wK5l" to="xydz:5X1yxJHYPm2" resolve="FAIL" />
+                              <ref role="1Pybhc" to="xydz:7Oc59RSEjdb" resolve="Result" />
                               <node concept="37vLTw" id="1PN9XOHtpN3" role="37wK5m">
                                 <ref role="3cqZAo" node="1PN9XOHtpMW" resolve="thr" />
                               </node>
@@ -4753,7 +4753,7 @@
                       <node concept="3cpWsn" id="3MwxBzGdXlj" role="3cpWs9">
                         <property role="TrG5h" value="result" />
                         <node concept="3uibUv" id="3MwxBzGdIwq" role="1tU5fm">
-                          <ref role="3uigEE" to="psoy:7Oc59RSEjdb" resolve="Result" />
+                          <ref role="3uigEE" to="xydz:7Oc59RSEjdb" resolve="Result" />
                         </node>
                         <node concept="2OqwBi" id="Q_4x90gZo4" role="33vP2m">
                           <node concept="37vLTw" id="Q_4x90gZo5" role="2Oq$k0">
@@ -4782,7 +4782,7 @@
                                     <ref role="3cqZAo" node="3MwxBzGdXlj" resolve="result" />
                                   </node>
                                   <node concept="liA8E" id="Q_4x90k2dm" role="2OqNvi">
-                                    <ref role="37wK5l" to="psoy:5X1yxJI3vjy" resolve="cause" />
+                                    <ref role="37wK5l" to="xydz:5X1yxJI3vjy" resolve="cause" />
                                   </node>
                                 </node>
                               </node>
@@ -4796,7 +4796,7 @@
                               <ref role="3cqZAo" node="3MwxBzGdXlj" resolve="result" />
                             </node>
                             <node concept="liA8E" id="Q_4x90jUbM" role="2OqNvi">
-                              <ref role="37wK5l" to="psoy:7Oc59RS_hsj" resolve="isSuccessful" />
+                              <ref role="37wK5l" to="xydz:7Oc59RS_hsj" resolve="isSuccessful" />
                             </node>
                           </node>
                         </node>
@@ -4887,8 +4887,8 @@
                         <ref role="3cqZAo" node="3bpBM3Q8EKT" resolve="lastTimestamp" />
                       </node>
                       <node concept="2YIFZM" id="3MwxBzG7l5I" role="37wK5m">
-                        <ref role="37wK5l" to="psoy:5X1yxJHYPm2" resolve="FAIL" />
-                        <ref role="1Pybhc" to="psoy:7Oc59RSEjdb" resolve="Result" />
+                        <ref role="37wK5l" to="xydz:5X1yxJHYPm2" resolve="FAIL" />
+                        <ref role="1Pybhc" to="xydz:7Oc59RSEjdb" resolve="Result" />
                         <node concept="37vLTw" id="3MwxBzG7lUH" role="37wK5m">
                           <ref role="3cqZAo" node="6kREIVkftXC" resolve="t" />
                         </node>
@@ -4911,8 +4911,8 @@
                           </node>
                         </node>
                         <node concept="2YIFZM" id="3MwxBzGbxNm" role="37wK5m">
-                          <ref role="37wK5l" to="psoy:5X1yxJHYPm2" resolve="FAIL" />
-                          <ref role="1Pybhc" to="psoy:7Oc59RSEjdb" resolve="Result" />
+                          <ref role="37wK5l" to="xydz:5X1yxJHYPm2" resolve="FAIL" />
+                          <ref role="1Pybhc" to="xydz:7Oc59RSEjdb" resolve="Result" />
                           <node concept="37vLTw" id="3MwxBzGbxNn" role="37wK5m">
                             <ref role="3cqZAo" node="6kREIVkftXC" resolve="t" />
                           </node>
@@ -5028,7 +5028,7 @@
                 </node>
                 <node concept="2OqwBi" id="6cGbuqOjfJj" role="3K4Cdx">
                   <node concept="liA8E" id="6cGbuqOjfJk" role="2OqNvi">
-                    <ref role="37wK5l" to="psoy:7Oc59RS_hsj" resolve="isSuccessful" />
+                    <ref role="37wK5l" to="xydz:7Oc59RS_hsj" resolve="isSuccessful" />
                   </node>
                   <node concept="37vLTw" id="6cGbuqOjfJl" role="2Oq$k0">
                     <ref role="3cqZAo" node="3MwxBzGc9Sa" resolve="result" />
@@ -5040,7 +5040,7 @@
                       <node concept="10Nm6u" id="6cGbuqOq9SY" role="3uHU7w" />
                       <node concept="2OqwBi" id="6cGbuqOjfJo" role="3uHU7B">
                         <node concept="liA8E" id="6cGbuqOjfJp" role="2OqNvi">
-                          <ref role="37wK5l" to="psoy:5X1yxJI3vjy" resolve="cause" />
+                          <ref role="37wK5l" to="xydz:5X1yxJI3vjy" resolve="cause" />
                         </node>
                         <node concept="37vLTw" id="6cGbuqOjfJq" role="2Oq$k0">
                           <ref role="3cqZAo" node="3MwxBzGc9Sa" resolve="result" />
@@ -5097,7 +5097,7 @@
                           <ref role="3cqZAo" node="3MwxBzGc9Sa" resolve="result" />
                         </node>
                         <node concept="liA8E" id="6cGbuqOlIr8" role="2OqNvi">
-                          <ref role="37wK5l" to="psoy:5X1yxJI3E6N" resolve="allCauses" />
+                          <ref role="37wK5l" to="xydz:5X1yxJI3E6N" resolve="allCauses" />
                         </node>
                       </node>
                       <node concept="34oBXx" id="6cGbuqOlPcl" role="2OqNvi" />
@@ -5115,7 +5115,7 @@
               <ref role="3cqZAo" node="3MwxBzGc9Sa" resolve="result" />
             </node>
             <node concept="liA8E" id="6cGbuqOleZW" role="2OqNvi">
-              <ref role="37wK5l" to="psoy:2gw7OvgCNSM" resolve="hasErrors" />
+              <ref role="37wK5l" to="xydz:2gw7OvgCNSM" resolve="hasErrors" />
             </node>
           </node>
         </node>
@@ -5161,7 +5161,7 @@
                             <ref role="3cqZAo" node="3MwxBzGc9Sa" resolve="result" />
                           </node>
                           <node concept="liA8E" id="3MwxBzGaVls" role="2OqNvi">
-                            <ref role="37wK5l" to="psoy:5X1yxJI3E6N" resolve="allCauses" />
+                            <ref role="37wK5l" to="xydz:5X1yxJI3E6N" resolve="allCauses" />
                           </node>
                         </node>
                         <node concept="1uHKPH" id="6cGbuqOejVC" role="2OqNvi" />
@@ -5182,7 +5182,7 @@
                 <ref role="3cqZAo" node="3MwxBzGc9Sa" resolve="result" />
               </node>
               <node concept="liA8E" id="3MwxBzGaVlx" role="2OqNvi">
-                <ref role="37wK5l" to="psoy:2gw7OvgCNSM" resolve="hasErrors" />
+                <ref role="37wK5l" to="xydz:2gw7OvgCNSM" resolve="hasErrors" />
               </node>
             </node>
           </node>
@@ -5199,7 +5199,7 @@
       <node concept="37vLTG" id="3MwxBzGc9Sa" role="3clF46">
         <property role="TrG5h" value="result" />
         <node concept="3uibUv" id="3MwxBzGc9Sb" role="1tU5fm">
-          <ref role="3uigEE" to="psoy:7Oc59RSEjdb" resolve="Result" />
+          <ref role="3uigEE" to="xydz:7Oc59RSEjdb" resolve="Result" />
         </node>
       </node>
     </node>
@@ -5298,7 +5298,7 @@
       <property role="TrG5h" value="aspectClique" />
       <node concept="3Tm6S6" id="5MNibEMWqii" role="1B3o_S" />
       <node concept="3uibUv" id="5MNibEMWqik" role="1tU5fm">
-        <ref role="3uigEE" to="fqlx:3KN3A4uUhmW" resolve="AspectClique" />
+        <ref role="3uigEE" to="pxw9:3KN3A4uUhmW" resolve="AspectClique" />
       </node>
     </node>
   </node>
@@ -5402,8 +5402,8 @@
                 <node concept="ANE8D" id="6BMBBPCTpqq" role="2OqNvi" />
               </node>
               <node concept="2YIFZM" id="7TC1XcdTuKs" role="37wK5m">
-                <ref role="37wK5l" to="psoy:7Oc59RSEjeq" resolve="OK" />
-                <ref role="1Pybhc" to="psoy:7Oc59RSEjdb" resolve="Result" />
+                <ref role="37wK5l" to="xydz:7Oc59RSEjeq" resolve="OK" />
+                <ref role="1Pybhc" to="xydz:7Oc59RSEjdb" resolve="Result" />
               </node>
             </node>
           </node>
@@ -5465,7 +5465,7 @@
       <node concept="37vLTG" id="7TC1XcdTzFw" role="3clF46">
         <property role="TrG5h" value="result" />
         <node concept="3uibUv" id="7TC1XcdT$DO" role="1tU5fm">
-          <ref role="3uigEE" to="psoy:7Oc59RSEjdb" resolve="Result" />
+          <ref role="3uigEE" to="xydz:7Oc59RSEjdb" resolve="Result" />
         </node>
       </node>
       <node concept="37vLTG" id="7TC1XcdTw_9" role="3clF46">
@@ -5499,8 +5499,8 @@
                 <node concept="ANE8D" id="6BMBBPCUL2M" role="2OqNvi" />
               </node>
               <node concept="2YIFZM" id="7TC1XcdTw0B" role="37wK5m">
-                <ref role="37wK5l" to="psoy:7Oc59RSEjeq" resolve="OK" />
-                <ref role="1Pybhc" to="psoy:7Oc59RSEjdb" resolve="Result" />
+                <ref role="37wK5l" to="xydz:7Oc59RSEjeq" resolve="OK" />
+                <ref role="1Pybhc" to="xydz:7Oc59RSEjdb" resolve="Result" />
               </node>
             </node>
           </node>
@@ -5554,7 +5554,7 @@
       <node concept="37vLTG" id="7TC1XcdTD_t" role="3clF46">
         <property role="TrG5h" value="result" />
         <node concept="3uibUv" id="7TC1XcdTEq0" role="1tU5fm">
-          <ref role="3uigEE" to="psoy:7Oc59RSEjdb" resolve="Result" />
+          <ref role="3uigEE" to="xydz:7Oc59RSEjdb" resolve="Result" />
         </node>
       </node>
       <node concept="37vLTG" id="7TC1XcdTACs" role="3clF46">
@@ -5595,7 +5595,7 @@
     <node concept="3clFb_" id="7TC1XcdSe_i" role="jymVt">
       <property role="TrG5h" value="result" />
       <node concept="3uibUv" id="7TC1XcdSjhG" role="3clF45">
-        <ref role="3uigEE" to="psoy:7Oc59RSEjdb" resolve="Result" />
+        <ref role="3uigEE" to="xydz:7Oc59RSEjdb" resolve="Result" />
       </node>
       <node concept="3Tm1VV" id="7TC1XcdSe_l" role="1B3o_S" />
       <node concept="3clFbS" id="7TC1XcdSe_m" role="3clF47" />
@@ -6136,14 +6136,14 @@
       <node concept="3clFb_" id="7TC1XcdSoVC" role="jymVt">
         <property role="TrG5h" value="result" />
         <node concept="3uibUv" id="7TC1XcdSoVD" role="3clF45">
-          <ref role="3uigEE" to="psoy:7Oc59RSEjdb" resolve="Result" />
+          <ref role="3uigEE" to="xydz:7Oc59RSEjdb" resolve="Result" />
         </node>
         <node concept="3Tm1VV" id="7TC1XcdSoVE" role="1B3o_S" />
         <node concept="3clFbS" id="7TC1XcdSoVG" role="3clF47">
           <node concept="3clFbF" id="7TC1XcdSqL1" role="3cqZAp">
             <node concept="2YIFZM" id="7TC1XcdSqTP" role="3clFbG">
-              <ref role="37wK5l" to="psoy:7Oc59RSEjeq" resolve="OK" />
-              <ref role="1Pybhc" to="psoy:7Oc59RSEjdb" resolve="Result" />
+              <ref role="37wK5l" to="xydz:7Oc59RSEjeq" resolve="OK" />
+              <ref role="1Pybhc" to="xydz:7Oc59RSEjdb" resolve="Result" />
             </node>
           </node>
         </node>
@@ -6377,7 +6377,7 @@
         <node concept="37vLTG" id="7TC1XcdSDWR" role="3clF46">
           <property role="TrG5h" value="result" />
           <node concept="3uibUv" id="7TC1XcdSFlR" role="1tU5fm">
-            <ref role="3uigEE" to="psoy:7Oc59RSEjdb" resolve="Result" />
+            <ref role="3uigEE" to="xydz:7Oc59RSEjdb" resolve="Result" />
           </node>
         </node>
         <node concept="3cqZAl" id="6BMBBPCSWZ$" role="3clF45" />
@@ -6428,7 +6428,7 @@
       <node concept="3clFb_" id="7TC1XcdSunX" role="jymVt">
         <property role="TrG5h" value="result" />
         <node concept="3uibUv" id="7TC1XcdSunY" role="3clF45">
-          <ref role="3uigEE" to="psoy:7Oc59RSEjdb" resolve="Result" />
+          <ref role="3uigEE" to="xydz:7Oc59RSEjdb" resolve="Result" />
         </node>
         <node concept="3Tm1VV" id="7TC1XcdSunZ" role="1B3o_S" />
         <node concept="3clFbS" id="7TC1XcdSuo2" role="3clF47">
@@ -6542,7 +6542,7 @@
                 <ref role="3cqZAo" node="7TC1XcdSIgj" resolve="result" />
               </node>
               <node concept="liA8E" id="51ek2rQDMa3" role="2OqNvi">
-                <ref role="37wK5l" to="psoy:7Oc59RS_hsj" resolve="isSuccessful" />
+                <ref role="37wK5l" to="xydz:7Oc59RS_hsj" resolve="isSuccessful" />
               </node>
             </node>
             <node concept="3clFbS" id="51ek2rQDKPM" role="3clFbx">
@@ -6940,7 +6940,7 @@
         <property role="TrG5h" value="result" />
         <node concept="3Tm6S6" id="7TC1XcdSIgk" role="1B3o_S" />
         <node concept="3uibUv" id="7TC1XcdSIgm" role="1tU5fm">
-          <ref role="3uigEE" to="psoy:7Oc59RSEjdb" resolve="Result" />
+          <ref role="3uigEE" to="xydz:7Oc59RSEjdb" resolve="Result" />
         </node>
       </node>
     </node>
@@ -7008,7 +7008,7 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="7TC1XcdSVzA" role="2OqNvi">
-                  <ref role="37wK5l" to="psoy:7nkyKX7v7xb" resolve="and" />
+                  <ref role="37wK5l" to="xydz:7nkyKX7v7xb" resolve="and" />
                   <node concept="2OqwBi" id="7TC1XcdSVzB" role="37wK5m">
                     <node concept="37vLTw" id="7TC1XcdSVzC" role="2Oq$k0">
                       <ref role="3cqZAo" node="2daneBOXKMg" resolve="right" />
@@ -7048,7 +7048,7 @@
       <node concept="3clFb_" id="7TC1XcdSxz9" role="jymVt">
         <property role="TrG5h" value="result" />
         <node concept="3uibUv" id="7TC1XcdSxza" role="3clF45">
-          <ref role="3uigEE" to="psoy:7Oc59RSEjdb" resolve="Result" />
+          <ref role="3uigEE" to="xydz:7Oc59RSEjdb" resolve="Result" />
         </node>
         <node concept="3Tm1VV" id="7TC1XcdSxzb" role="1B3o_S" />
         <node concept="3clFbS" id="7TC1XcdSxzd" role="3clF47">
@@ -7087,7 +7087,7 @@
                 <ref role="3cqZAo" node="7TC1XcdSVzf" resolve="result" />
               </node>
               <node concept="liA8E" id="51ek2rQEo36" role="2OqNvi">
-                <ref role="37wK5l" to="psoy:7Oc59RS_hsj" resolve="isSuccessful" />
+                <ref role="37wK5l" to="xydz:7Oc59RS_hsj" resolve="isSuccessful" />
               </node>
             </node>
             <node concept="3clFbS" id="51ek2rQEn0f" role="3clFbx">
@@ -7447,7 +7447,7 @@
         <property role="TrG5h" value="result" />
         <node concept="3Tm6S6" id="7TC1XcdSVzd" role="1B3o_S" />
         <node concept="3uibUv" id="7TC1XcdSVze" role="1tU5fm">
-          <ref role="3uigEE" to="psoy:7Oc59RSEjdb" resolve="Result" />
+          <ref role="3uigEE" to="xydz:7Oc59RSEjdb" resolve="Result" />
         </node>
       </node>
       <node concept="312cEg" id="3bpBM3PGrNM" role="jymVt">
@@ -8492,11 +8492,11 @@
                 <node concept="3clFbS" id="19fWAfxek_O" role="3clFbx">
                   <node concept="3clFbF" id="19fWAfxjp5w" role="3cqZAp">
                     <node concept="1rXfSq" id="19fWAfxjp5u" role="3clFbG">
-                      <ref role="37wK5l" to="6exd:19fWAfxiPGk" resolve="printDataForm" />
+                      <ref role="37wK5l" to="cof4:19fWAfxiPGk" resolve="printDataForm" />
                       <node concept="1eOMI4" id="19fWAfxemyN" role="37wK5m">
                         <node concept="10QFUN" id="19fWAfxemyO" role="1eOMHV">
                           <node concept="3uibUv" id="19fWAfxemyP" role="10QFUM">
-                            <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                            <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                           </node>
                           <node concept="37vLTw" id="19fWAfxemyQ" role="10QFUP">
                             <ref role="3cqZAo" node="7pxta7vkvE6" resolve="value" />
@@ -8512,7 +8512,7 @@
                 </node>
                 <node concept="2ZW3vV" id="19fWAfxekUF" role="3clFbw">
                   <node concept="3uibUv" id="19fWAfxel03" role="2ZW6by">
-                    <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                    <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                   </node>
                   <node concept="37vLTw" id="19fWAfxekIM" role="2ZW6bz">
                     <ref role="3cqZAo" node="7pxta7vkvE6" resolve="value" />
@@ -8522,11 +8522,11 @@
                   <node concept="3clFbS" id="19fWAfxeq3H" role="3eOfB_">
                     <node concept="3clFbF" id="19fWAfxjq42" role="3cqZAp">
                       <node concept="1rXfSq" id="19fWAfxjq43" role="3clFbG">
-                        <ref role="37wK5l" to="6exd:19fWAfxiPGk" resolve="printDataForm" />
+                        <ref role="37wK5l" to="cof4:19fWAfxiPGk" resolve="printDataForm" />
                         <node concept="1eOMI4" id="19fWAfxjq44" role="37wK5m">
                           <node concept="10QFUN" id="19fWAfxjq45" role="1eOMHV">
                             <node concept="3uibUv" id="19fWAfxjq46" role="10QFUM">
-                              <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                              <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                             </node>
                             <node concept="37vLTw" id="19fWAfxjq47" role="10QFUP">
                               <ref role="3cqZAo" node="7pxta7vkvE6" resolve="value" />
@@ -8719,7 +8719,7 @@
           <node concept="3eNFk2" id="19fWAfxeRTh" role="3eNLev">
             <node concept="2ZW3vV" id="19fWAfxeSOn" role="3eO9$A">
               <node concept="3uibUv" id="19fWAfxeSYG" role="2ZW6by">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="37vLTw" id="19fWAfxeSzx" role="2ZW6bz">
                 <ref role="3cqZAo" node="19fWAfxefNs" resolve="obj" />
@@ -8728,11 +8728,11 @@
             <node concept="3clFbS" id="19fWAfxeRTj" role="3eOfB_">
               <node concept="3clFbF" id="19fWAfxocw1" role="3cqZAp">
                 <node concept="1rXfSq" id="19fWAfxocvZ" role="3clFbG">
-                  <ref role="37wK5l" to="6exd:19fWAfxiPGk" resolve="printDataForm" />
+                  <ref role="37wK5l" to="cof4:19fWAfxiPGk" resolve="printDataForm" />
                   <node concept="1eOMI4" id="19fWAfxeT0Q" role="37wK5m">
                     <node concept="10QFUN" id="19fWAfxeT0R" role="1eOMHV">
                       <node concept="3uibUv" id="19fWAfxeT0S" role="10QFUM">
-                        <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                        <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                       </node>
                       <node concept="37vLTw" id="19fWAfxeTtd" role="10QFUP">
                         <ref role="3cqZAo" node="19fWAfxefNs" resolve="obj" />
@@ -9105,7 +9105,7 @@
       <node concept="3clFbT" id="19fWAfxnrwQ" role="33vP2m" />
     </node>
     <node concept="3uibUv" id="19fWAfxiTZy" role="1zkMxy">
-      <ref role="3uigEE" to="6exd:19fWAfxiNy0" resolve="DataFormPrintable" />
+      <ref role="3uigEE" to="cof4:19fWAfxiNy0" resolve="DataFormPrintable" />
     </node>
   </node>
 </model>
diff --git a/coderules/solutions/jetbrains.mps.lang.coderules.template/jetbrains.mps.lang.coderules.template.msd b/coderules/solutions/jetbrains.mps.lang.coderules.template/jetbrains.mps.lang.coderules.template.msd
index d70f54a1..2b650d7f 100644
--- a/coderules/solutions/jetbrains.mps.lang.coderules.template/jetbrains.mps.lang.coderules.template.msd
+++ b/coderules/solutions/jetbrains.mps.lang.coderules.template/jetbrains.mps.lang.coderules.template.msd
@@ -10,39 +10,9 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <dependencies>
-    <dependency reexport="true">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
-    <dependency reexport="true">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="true">bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)</dependency>
-    <dependency reexport="false">f113d56b-63e3-4120-a89c-2f5dcb8c6290(jetbrains.mps.coderules.runtime)</dependency>
-    <dependency reexport="false">3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)</dependency>
-  </dependencies>
-  <languageVersions>
-    <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
-    <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
-    <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
-    <language slang="l:daafa647-f1f7-4b0b-b096-69cd7c8408c0:jetbrains.mps.baseLanguage.regexp" version="0" />
-    <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
-    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
-    <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
-    <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
-    <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="13" />
-  </languageVersions>
+  <languageVersions />
   <dependencyVersions>
-    <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
-    <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
-    <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
-    <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
-    <module reference="f113d56b-63e3-4120-a89c-2f5dcb8c6290(jetbrains.mps.coderules.runtime)" version="0" />
     <module reference="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" 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/coderules/solutions/jetbrains.mps.lang.typechecking.runtime/jetbrains.mps.lang.typechecking.runtime.msd b/coderules/solutions/jetbrains.mps.lang.typechecking.runtime/jetbrains.mps.lang.typechecking.runtime.msd
index e5176863..988dbbba 100644
--- a/coderules/solutions/jetbrains.mps.lang.typechecking.runtime/jetbrains.mps.lang.typechecking.runtime.msd
+++ b/coderules/solutions/jetbrains.mps.lang.typechecking.runtime/jetbrains.mps.lang.typechecking.runtime.msd
@@ -12,8 +12,9 @@
   </facets>
   <dependencies>
     <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
-    <dependency reexport="true">ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)</dependency>
     <dependency reexport="false">a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)</dependency>
+    <dependency reexport="false">26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)</dependency>
+    <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
@@ -31,7 +32,7 @@
     <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
     <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
     <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
-    <module reference="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" version="0" />
+    <module reference="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" version="0" />
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
     <module reference="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" version="0" />
     <module reference="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" version="0" />
diff --git a/coderules/solutions/jetbrains.mps.lang.typechecking.runtime/models/jetbrains.mps.lang.typechecking.aspect.mps b/coderules/solutions/jetbrains.mps.lang.typechecking.runtime/models/jetbrains.mps.lang.typechecking.aspect.mps
index eefa2861..48eea005 100644
--- a/coderules/solutions/jetbrains.mps.lang.typechecking.runtime/models/jetbrains.mps.lang.typechecking.aspect.mps
+++ b/coderules/solutions/jetbrains.mps.lang.typechecking.runtime/models/jetbrains.mps.lang.typechecking.aspect.mps
@@ -10,12 +10,11 @@
   <imports>
     <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" />
     <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
-    <import index="fqlx" ref="r:2cc226a9-8a78-4010-b962-823343fd28ff(jetbrains.mps.lang.coderules.aspect)" />
-    <import index="vndm" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel.language(MPS.Core/)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
-    <import index="i348" ref="r:42a15dec-83a9-4fe1-80d6-3bf898c512bd(jetbrains.mps.lang.coderules.template)" />
     <import index="i5cy" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.concurrent.atomic(JDK/)" />
     <import index="ze1i" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel.runtime(MPS.Core/)" />
+    <import index="pxw9" ref="r:e3417884-ba0a-4330-9cea-64f01ace2e9d(jetbrains.mps.lang.coderules.aspect)" />
+    <import index="ugy2" ref="r:57b2449f-b7c7-4941-bd75-9c594835f5cd(jetbrains.mps.lang.coderules.template)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -101,7 +100,7 @@
       </node>
       <node concept="3Tm1VV" id="78H58oeCBjF" role="1B3o_S" />
       <node concept="3uibUv" id="78H58oeCAQU" role="3clF45">
-        <ref role="3uigEE" to="fqlx:NKt6ynorWQ" resolve="AspectLookup" />
+        <ref role="3uigEE" to="pxw9:NKt6ynorWQ" resolve="AspectLookup" />
         <node concept="3uibUv" id="78H58oeCAQV" role="11_B2D">
           <ref role="3uigEE" node="7km57Pkjxf4" resolve="TypecheckingAspect" />
         </node>
@@ -109,14 +108,14 @@
       <node concept="3clFbS" id="78H58oeCAOe" role="3clF47">
         <node concept="3cpWs6" id="3KN3A4v4kbC" role="3cqZAp">
           <node concept="2YIFZM" id="3KN3A4v4kbD" role="3cqZAk">
-            <ref role="37wK5l" to="fqlx:78H58oefSjC" resolve="lookup" />
-            <ref role="1Pybhc" to="fqlx:NKt6ynorWQ" resolve="AspectLookup" />
+            <ref role="37wK5l" to="pxw9:78H58oefSjC" resolve="lookup" />
+            <ref role="1Pybhc" to="pxw9:NKt6ynorWQ" resolve="AspectLookup" />
             <node concept="37vLTw" id="IFW4V2tCCQ" role="37wK5m">
               <ref role="3cqZAo" node="IFW4V2s0Zk" resolve="repository" />
             </node>
             <node concept="2YIFZM" id="3KN3A4v4kbE" role="37wK5m">
-              <ref role="37wK5l" to="fqlx:78H58oefoaA" resolve="discoverable" />
-              <ref role="1Pybhc" to="fqlx:NKt6yp1COZ" resolve="AbstractCoderulesAspect" />
+              <ref role="37wK5l" to="pxw9:78H58oefoaA" resolve="discoverable" />
+              <ref role="1Pybhc" to="pxw9:NKt6yp1COZ" resolve="AbstractCoderulesAspect" />
               <node concept="3VsKOn" id="3KN3A4v4kbF" role="37wK5m">
                 <ref role="3VsUkX" node="7km57Pkjxf4" resolve="TypecheckingAspect" />
               </node>
@@ -128,7 +127,7 @@
     <node concept="2tJIrI" id="IFW4V2EC2j" role="jymVt" />
     <node concept="3Tm1VV" id="7km57Pkjxf5" role="1B3o_S" />
     <node concept="3uibUv" id="NKt6yomOJv" role="EKbjA">
-      <ref role="3uigEE" to="fqlx:NKt6yomNZE" resolve="CoderulesAspect" />
+      <ref role="3uigEE" to="pxw9:NKt6yomNZE" resolve="CoderulesAspect" />
     </node>
     <node concept="3uibUv" id="7km57PkjxgV" role="EKbjA">
       <ref role="3uigEE" to="ze1i:~ILanguageAspect" resolve="ILanguageAspect" />
@@ -146,7 +145,7 @@
       </node>
     </node>
     <node concept="3uibUv" id="NKt6yp1DsV" role="1zkMxy">
-      <ref role="3uigEE" to="fqlx:NKt6yp1COZ" resolve="AbstractCoderulesAspect" />
+      <ref role="3uigEE" to="pxw9:NKt6yp1COZ" resolve="AbstractCoderulesAspect" />
     </node>
   </node>
 </model>
diff --git a/coderules/solutions/jetbrains.mps.logic.test/jetbrains.mps.logic.test.msd b/coderules/solutions/jetbrains.mps.logic.test/jetbrains.mps.logic.test.msd
index 66cb22b0..c40528d6 100644
--- a/coderules/solutions/jetbrains.mps.logic.test/jetbrains.mps.logic.test.msd
+++ b/coderules/solutions/jetbrains.mps.logic.test/jetbrains.mps.logic.test.msd
@@ -13,10 +13,12 @@
     </facet>
   </facets>
   <dependencies>
-    <dependency reexport="true">a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">49808fad-9d41-4b96-83fa-9231640f6b2b(JUnit)</dependency>
+    <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
     <dependency reexport="false">26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)</dependency>
+    <dependency reexport="false">bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)</dependency>
+    <dependency reexport="false">a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
@@ -43,7 +45,6 @@
     <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
     <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
     <module reference="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" version="0" />
-    <module reference="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" 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="b189d6c6-9397-4d64-88af-1ac73760a4f5(jetbrains.mps.logic.test)" version="0" />
diff --git a/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/logical@tests.mps b/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/logical@tests.mps
index fd3192af..11b24356 100644
--- a/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/logical@tests.mps
+++ b/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/logical@tests.mps
@@ -14,11 +14,11 @@
     <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="bj13" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.logical(jetbrains.mps.logic.reactor/)" />
-    <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.dataform)" />
-    <import index="jpi6" ref="r:4c913df4-f2d5-43f7-af56-6bccd35aeb11(jetbrains.mps.lang.coderules.terms)" />
     <import index="yt73" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.unification(jetbrains.mps.logic.reactor/)" />
     <import index="mhfm" ref="3f233e7f-b8a6-46d2-a57f-795d56775243/java:org.jetbrains.annotations(Annotations/)" />
-    <import index="oy3s" ref="r:a6030cee-34eb-4503-b1bf-015fe5cd8c1a(jetbrains.mps.logic.unification)" />
+    <import index="hh42" ref="r:75494708-a5bf-40c3-8a06-1176e662985f(jetbrains.mps.lang.coderules.terms)" />
+    <import index="cof4" ref="r:0a9d1d47-250c-4f98-8962-b65edf8b0721(jetbrains.mps.logic.dataform)" />
+    <import index="uwx2" ref="r:76101703-3fc5-4e76-aa48-9728dde91f7b(jetbrains.mps.logic.unification)" />
   </imports>
   <registry>
     <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples">
@@ -333,7 +333,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="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="2ev$9JFBKEz" role="33vP2m">
                 <node concept="1oi5UN" id="2ev$9JFBKE$" role="1oi0x0" />
@@ -375,8 +375,8 @@
                       <ref role="3cqZAo" node="2ev$9JFBKEx" resolve="tf" />
                     </node>
                     <node concept="Rm8GO" id="1LBj9wB6k11" role="37wK5m">
-                      <ref role="Rm8GQ" to="6exd:2q_78a95hAO" resolve="STOP" />
-                      <ref role="1Px2BO" to="6exd:2q_78a95hAL" resolve="Action" />
+                      <ref role="Rm8GQ" to="cof4:2q_78a95hAO" resolve="STOP" />
+                      <ref role="1Px2BO" to="cof4:2q_78a95hAL" resolve="Action" />
                     </node>
                   </node>
                 </node>
@@ -388,14 +388,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="6exd:47nvOnTQN6Q" resolve="DataFormWalk" />
+                  <ref role="37wK5l" to="cof4:47nvOnTQN6Q" resolve="DataFormWalk" />
                   <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="6exd:1hOy_Afq63K" resolve="walk" />
+                <ref role="37wK5l" to="cof4:1hOy_Afq63K" resolve="walk" />
                 <node concept="37vLTw" id="2ev$9JFBLgX" role="37wK5m">
                   <ref role="3cqZAo" node="2ev$9JFBKEx" resolve="tf" />
                 </node>
@@ -447,7 +447,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="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="2ev$9JFE10R" role="33vP2m">
                 <node concept="1oi5Wm" id="2ev$9JFE11a" role="1oi0x0">
@@ -463,11 +463,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="6exd:5JQSuNswOXL" resolve="TermNode" />
+                <ref role="3uigEE" to="cof4:5JQSuNswOXL" resolve="TermNode" />
               </node>
               <node concept="10QFUN" id="6MYr6JxshYq" role="33vP2m">
                 <node concept="3uibUv" id="6MYr6JxshYj" role="10QFUM">
-                  <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="TermNode" />
+                  <ref role="3uigEE" to="cof4:5JQSuNswOXL" resolve="TermNode" />
                 </node>
                 <node concept="1oi1Uc" id="6MYr6JxshYk" role="10QFUP">
                   <node concept="1oi5UN" id="6MYr6JxshYl" role="1oi0x0">
@@ -522,8 +522,8 @@
                       <ref role="3cqZAo" node="2ev$9JFDTTZ" resolve="cn" />
                     </node>
                     <node concept="Rm8GO" id="1LBj9wB7NnJ" role="37wK5m">
-                      <ref role="Rm8GQ" to="6exd:2q_78a95hAM" resolve="WALK" />
-                      <ref role="1Px2BO" to="6exd:2q_78a95hAL" resolve="Action" />
+                      <ref role="Rm8GQ" to="cof4:2q_78a95hAM" resolve="WALK" />
+                      <ref role="1Px2BO" to="cof4:2q_78a95hAL" resolve="Action" />
                     </node>
                   </node>
                 </node>
@@ -551,8 +551,8 @@
                       <ref role="3cqZAo" node="2ev$9JFE0Mu" resolve="val" />
                     </node>
                     <node concept="Rm8GO" id="1LBj9wB83o0" role="37wK5m">
-                      <ref role="Rm8GQ" to="6exd:2q_78a95hAO" resolve="STOP" />
-                      <ref role="1Px2BO" to="6exd:2q_78a95hAL" resolve="Action" />
+                      <ref role="Rm8GQ" to="cof4:2q_78a95hAO" resolve="STOP" />
+                      <ref role="1Px2BO" to="cof4:2q_78a95hAL" resolve="Action" />
                     </node>
                   </node>
                 </node>
@@ -564,14 +564,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="6exd:47nvOnTQN6Q" resolve="DataFormWalk" />
+                  <ref role="37wK5l" to="cof4:47nvOnTQN6Q" resolve="DataFormWalk" />
                   <node concept="37vLTw" id="1LBj9wB86n4" role="37wK5m">
                     <ref role="3cqZAo" node="1LBj9wB7I4r" resolve="mock" />
                   </node>
                 </node>
               </node>
               <node concept="liA8E" id="2ev$9JFDVCu" role="2OqNvi">
-                <ref role="37wK5l" to="6exd:1hOy_Afq63K" resolve="walk" />
+                <ref role="37wK5l" to="cof4:1hOy_Afq63K" resolve="walk" />
                 <node concept="37vLTw" id="2ev$9JFDVCw" role="37wK5m">
                   <ref role="3cqZAo" node="2ev$9JFDTTZ" resolve="cn" />
                 </node>
@@ -624,7 +624,7 @@
             <node concept="3cpWsn" id="4WeLqVx4wLH" role="3cpWs9">
               <property role="TrG5h" value="val" />
               <node concept="3uibUv" id="4WeLqVx4wLI" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="4WeLqVx4wLJ" role="33vP2m">
                 <node concept="1oi5Wm" id="4WeLqVx4wLK" role="1oi0x0">
@@ -640,7 +640,7 @@
             <node concept="3cpWsn" id="4WeLqVxaCyT" role="3cpWs9">
               <property role="TrG5h" value="tf" />
               <node concept="3uibUv" id="4WeLqVxaCyU" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="4WeLqVxaCyV" role="33vP2m">
                 <node concept="1oi5UN" id="4WeLqVxaCyW" role="1oi0x0" />
@@ -651,12 +651,12 @@
             <node concept="3cpWsn" id="4WeLqVx6Rhs" role="3cpWs9">
               <property role="TrG5h" value="v" />
               <node concept="3uibUv" id="4WeLqVx6Rht" role="1tU5fm">
-                <ref role="3uigEE" to="oy3s:4TCblo5MJ1m" resolve="LogicalDataForm" />
+                <ref role="3uigEE" to="uwx2:4TCblo5MJ1m" resolve="LogicalDataForm" />
               </node>
               <node concept="2ShNRf" id="4WeLqVx6Rhu" role="33vP2m">
                 <node concept="1pGfFk" id="4WeLqVx6Rhv" role="2ShVmc">
                   <property role="373rjd" value="true" />
-                  <ref role="37wK5l" to="oy3s:4TCblo5ML4I" resolve="LogicalDataForm" />
+                  <ref role="37wK5l" to="uwx2:4TCblo5ML4I" resolve="LogicalDataForm" />
                   <node concept="2YIFZM" id="4WeLqVx6Rhw" role="37wK5m">
                     <ref role="37wK5l" to="bj13:~LogicalKt.newLogical(java.lang.Object)" resolve="newLogical" />
                     <ref role="1Pybhc" to="bj13:~LogicalKt" resolve="LogicalKt" />
@@ -672,11 +672,11 @@
             <node concept="3cpWsn" id="4WeLqVx6Rhz" role="3cpWs9">
               <property role="TrG5h" value="cn" />
               <node concept="3uibUv" id="4WeLqVx6Rh$" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="TermNode" />
+                <ref role="3uigEE" to="cof4:5JQSuNswOXL" resolve="TermNode" />
               </node>
               <node concept="10QFUN" id="4WeLqVx6Rh_" role="33vP2m">
                 <node concept="3uibUv" id="4WeLqVx6RhA" role="10QFUM">
-                  <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="TermNode" />
+                  <ref role="3uigEE" to="cof4:5JQSuNswOXL" resolve="TermNode" />
                 </node>
                 <node concept="1oi1Uc" id="4WeLqVx6RhB" role="10QFUP">
                   <node concept="1oi5UN" id="4WeLqVx6RhC" role="1oi0x0">
@@ -741,8 +741,8 @@
                       <ref role="3cqZAo" node="4WeLqVx6Rhz" resolve="cn" />
                     </node>
                     <node concept="Rm8GO" id="4WeLqVx4wMc" role="37wK5m">
-                      <ref role="Rm8GQ" to="6exd:2q_78a95hAM" resolve="WALK" />
-                      <ref role="1Px2BO" to="6exd:2q_78a95hAL" resolve="Action" />
+                      <ref role="Rm8GQ" to="cof4:2q_78a95hAM" resolve="WALK" />
+                      <ref role="1Px2BO" to="cof4:2q_78a95hAL" resolve="Action" />
                     </node>
                   </node>
                 </node>
@@ -770,8 +770,8 @@
                       <ref role="3cqZAo" node="4WeLqVx4wLH" resolve="val" />
                     </node>
                     <node concept="Rm8GO" id="4WeLqVxa4Fg" role="37wK5m">
-                      <ref role="Rm8GQ" to="6exd:2q_78a95hAN" resolve="CONTINUE" />
-                      <ref role="1Px2BO" to="6exd:2q_78a95hAL" resolve="Action" />
+                      <ref role="Rm8GQ" to="cof4:2q_78a95hAN" resolve="CONTINUE" />
+                      <ref role="1Px2BO" to="cof4:2q_78a95hAL" resolve="Action" />
                     </node>
                   </node>
                 </node>
@@ -796,11 +796,11 @@
                   <node concept="liA8E" id="4WeLqVxaZek" role="2OqNvi">
                     <ref role="37wK5l" node="1LBj9wB4RIc" resolve="any" />
                     <node concept="3VsKOn" id="4WeLqVxb83R" role="37wK5m">
-                      <ref role="3VsUkX" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                      <ref role="3VsUkX" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                     </node>
                     <node concept="Rm8GO" id="4WeLqVxarVP" role="37wK5m">
-                      <ref role="Rm8GQ" to="6exd:2q_78a95hAM" resolve="WALK" />
-                      <ref role="1Px2BO" to="6exd:2q_78a95hAL" resolve="Action" />
+                      <ref role="Rm8GQ" to="cof4:2q_78a95hAM" resolve="WALK" />
+                      <ref role="1Px2BO" to="cof4:2q_78a95hAL" resolve="Action" />
                     </node>
                   </node>
                 </node>
@@ -825,11 +825,11 @@
                   <node concept="liA8E" id="4WeLqVxahjT" role="2OqNvi">
                     <ref role="37wK5l" node="1LBj9wB4RIc" resolve="any" />
                     <node concept="3VsKOn" id="4WeLqVxbJMV" role="37wK5m">
-                      <ref role="3VsUkX" to="6exd:uNmovXiEd4" resolve="Variable" />
+                      <ref role="3VsUkX" to="cof4:uNmovXiEd4" resolve="Variable" />
                     </node>
                     <node concept="Rm8GO" id="4WeLqVxbMgg" role="37wK5m">
-                      <ref role="Rm8GQ" to="6exd:2q_78a95hAM" resolve="WALK" />
-                      <ref role="1Px2BO" to="6exd:2q_78a95hAL" resolve="Action" />
+                      <ref role="Rm8GQ" to="cof4:2q_78a95hAM" resolve="WALK" />
+                      <ref role="1Px2BO" to="cof4:2q_78a95hAL" resolve="Action" />
                     </node>
                   </node>
                 </node>
@@ -857,8 +857,8 @@
                       <ref role="3cqZAo" node="4WeLqVxaCyT" resolve="tf" />
                     </node>
                     <node concept="Rm8GO" id="4WeLqVxc9Jm" role="37wK5m">
-                      <ref role="Rm8GQ" to="6exd:2q_78a95hAO" resolve="STOP" />
-                      <ref role="1Px2BO" to="6exd:2q_78a95hAL" resolve="Action" />
+                      <ref role="Rm8GQ" to="cof4:2q_78a95hAO" resolve="STOP" />
+                      <ref role="1Px2BO" to="cof4:2q_78a95hAL" resolve="Action" />
                     </node>
                   </node>
                 </node>
@@ -870,7 +870,7 @@
             <node concept="2OqwBi" id="4WeLqVx4wMp" role="3clFbG">
               <node concept="2ShNRf" id="4WeLqVx4wMq" role="2Oq$k0">
                 <node concept="1pGfFk" id="4WeLqVx4wMr" role="2ShVmc">
-                  <ref role="37wK5l" to="6exd:4WeLqVxOSvl" resolve="DataFormWalk" />
+                  <ref role="37wK5l" to="cof4:4WeLqVxOSvl" resolve="DataFormWalk" />
                   <node concept="37vLTw" id="4WeLqVx4wMs" role="37wK5m">
                     <ref role="3cqZAo" node="4WeLqVx4wLZ" resolve="mock" />
                   </node>
@@ -880,7 +880,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="4WeLqVx4wMt" role="2OqNvi">
-                <ref role="37wK5l" to="6exd:1hOy_Afq63K" resolve="walk" />
+                <ref role="37wK5l" to="cof4:1hOy_Afq63K" resolve="walk" />
                 <node concept="37vLTw" id="4WeLqVx4wMu" role="37wK5m">
                   <ref role="3cqZAo" node="4WeLqVx6Rhz" resolve="cn" />
                 </node>
@@ -933,7 +933,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="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="2ev$9JFFwjN" role="33vP2m">
                 <node concept="1oi5Wm" id="2ev$9JFFwk6" role="1oi0x0">
@@ -949,11 +949,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="6exd:5JQSuNswOXL" resolve="TermNode" />
+                <ref role="3uigEE" to="cof4:5JQSuNswOXL" resolve="TermNode" />
               </node>
               <node concept="10QFUN" id="6MYr6JxshUH" role="33vP2m">
                 <node concept="3uibUv" id="6MYr6JxshUA" role="10QFUM">
-                  <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="TermNode" />
+                  <ref role="3uigEE" to="cof4:5JQSuNswOXL" resolve="TermNode" />
                 </node>
                 <node concept="1oi1Uc" id="6MYr6JxshUB" role="10QFUP">
                   <node concept="1oi5UN" id="6MYr6JxshUC" role="1oi0x0">
@@ -977,11 +977,11 @@
             <node concept="3cpWsn" id="2ev$9JFG2bt" role="3cpWs9">
               <property role="TrG5h" value="role" />
               <node concept="3uibUv" id="6YPNC4Of2_q" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:6YPNC4NYnau" resolve="ChildRole" />
+                <ref role="3uigEE" to="cof4:6YPNC4NYnau" resolve="ChildRole" />
               </node>
               <node concept="10QFUN" id="6MYr6JxshL0" role="33vP2m">
                 <node concept="3uibUv" id="6YPNC4Of2zX" role="10QFUM">
-                  <ref role="3uigEE" to="6exd:6YPNC4NYnau" resolve="ChildRole" />
+                  <ref role="3uigEE" to="cof4:6YPNC4NYnau" resolve="ChildRole" />
                 </node>
                 <node concept="1oi1Uc" id="6MYr6JxshKV" role="10QFUP">
                   <node concept="1oi5ST" id="6MYr6JxshKW" role="1oi0x0">
@@ -1002,11 +1002,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="6exd:5JQSuNswOXL" resolve="TermNode" />
+                <ref role="3uigEE" to="cof4:5JQSuNswOXL" resolve="TermNode" />
               </node>
               <node concept="10QFUN" id="6MYr6JxshIN" role="33vP2m">
                 <node concept="3uibUv" id="6MYr6JxshIG" role="10QFUM">
-                  <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="TermNode" />
+                  <ref role="3uigEE" to="cof4:5JQSuNswOXL" resolve="TermNode" />
                 </node>
                 <node concept="1oi1Uc" id="6MYr6JxshIH" role="10QFUP">
                   <node concept="1oi5UN" id="6MYr6JxshII" role="1oi0x0">
@@ -1059,8 +1059,8 @@
                       <ref role="3cqZAo" node="2ev$9JFFqmv" resolve="cn" />
                     </node>
                     <node concept="Rm8GO" id="1LBj9wB8uSv" role="37wK5m">
-                      <ref role="1Px2BO" to="6exd:2q_78a95hAL" resolve="Action" />
-                      <ref role="Rm8GQ" to="6exd:2q_78a95hAM" resolve="WALK" />
+                      <ref role="1Px2BO" to="cof4:2q_78a95hAL" resolve="Action" />
+                      <ref role="Rm8GQ" to="cof4:2q_78a95hAM" resolve="WALK" />
                     </node>
                   </node>
                 </node>
@@ -1088,8 +1088,8 @@
                       <ref role="3cqZAo" node="2ev$9JFG2bt" resolve="role" />
                     </node>
                     <node concept="Rm8GO" id="1LBj9wB8yWk" role="37wK5m">
-                      <ref role="Rm8GQ" to="6exd:2q_78a95hAM" resolve="WALK" />
-                      <ref role="1Px2BO" to="6exd:2q_78a95hAL" resolve="Action" />
+                      <ref role="Rm8GQ" to="cof4:2q_78a95hAM" resolve="WALK" />
+                      <ref role="1Px2BO" to="cof4:2q_78a95hAL" resolve="Action" />
                     </node>
                   </node>
                 </node>
@@ -1117,8 +1117,8 @@
                       <ref role="3cqZAo" node="2ev$9JFFqmp" resolve="child" />
                     </node>
                     <node concept="Rm8GO" id="1LBj9wBa5yh" role="37wK5m">
-                      <ref role="1Px2BO" to="6exd:2q_78a95hAL" resolve="Action" />
-                      <ref role="Rm8GQ" to="6exd:2q_78a95hAM" resolve="WALK" />
+                      <ref role="1Px2BO" to="cof4:2q_78a95hAL" resolve="Action" />
+                      <ref role="Rm8GQ" to="cof4:2q_78a95hAM" resolve="WALK" />
                     </node>
                   </node>
                 </node>
@@ -1146,8 +1146,8 @@
                       <ref role="3cqZAo" node="2ev$9JFFvPD" resolve="val" />
                     </node>
                     <node concept="Rm8GO" id="1LBj9wBa8g7" role="37wK5m">
-                      <ref role="Rm8GQ" to="6exd:2q_78a95hAN" resolve="CONTINUE" />
-                      <ref role="1Px2BO" to="6exd:2q_78a95hAL" resolve="Action" />
+                      <ref role="Rm8GQ" to="cof4:2q_78a95hAN" resolve="CONTINUE" />
+                      <ref role="1Px2BO" to="cof4:2q_78a95hAL" resolve="Action" />
                     </node>
                   </node>
                 </node>
@@ -1175,7 +1175,7 @@
                   <node concept="liA8E" id="1LBj9wBa8Ev" role="2OqNvi">
                     <ref role="37wK5l" node="1LBj9wB4RIc" resolve="any" />
                     <node concept="3VsKOn" id="1LBj9wBbWuG" role="37wK5m">
-                      <ref role="3VsUkX" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                      <ref role="3VsUkX" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                     </node>
                     <node concept="10Nm6u" id="1LBj9wBahHi" role="37wK5m" />
                   </node>
@@ -1188,14 +1188,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="6exd:47nvOnTQN6Q" resolve="DataFormWalk" />
+                  <ref role="37wK5l" to="cof4:47nvOnTQN6Q" resolve="DataFormWalk" />
                   <node concept="37vLTw" id="1LBj9wBavOM" role="37wK5m">
                     <ref role="3cqZAo" node="1LBj9wB8uSi" resolve="mock" />
                   </node>
                 </node>
               </node>
               <node concept="liA8E" id="2ev$9JFFqn9" role="2OqNvi">
-                <ref role="37wK5l" to="6exd:1hOy_Afq63K" resolve="walk" />
+                <ref role="37wK5l" to="cof4:1hOy_Afq63K" resolve="walk" />
                 <node concept="37vLTw" id="2ev$9JFFqnb" role="37wK5m">
                   <ref role="3cqZAo" node="2ev$9JFFqmv" resolve="cn" />
                 </node>
@@ -1224,14 +1224,14 @@
             <node concept="3cpWsn" id="6MYr6Jxs3nk" role="3cpWs9">
               <property role="TrG5h" value="val" />
               <node concept="3uibUv" id="6MYr6Jxsf3D" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:2xQ7eRAD2dj" resolve="Value" />
+                <ref role="3uigEE" to="cof4: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="6exd:2xQ7eRAD2dj" resolve="Value" />
+                  <ref role="3uigEE" to="cof4:2xQ7eRAD2dj" resolve="Value" />
                   <node concept="3uibUv" id="6MYr6Jxsf9G" role="11_B2D">
                     <ref role="3uigEE" to="wyt6:~String" resolve="String" />
                   </node>
@@ -1279,8 +1279,8 @@
                       <ref role="3cqZAo" node="6MYr6Jxs3nk" resolve="val" />
                     </node>
                     <node concept="Rm8GO" id="1LBj9wBex1m" role="37wK5m">
-                      <ref role="Rm8GQ" to="6exd:2q_78a95hAM" resolve="WALK" />
-                      <ref role="1Px2BO" to="6exd:2q_78a95hAL" resolve="Action" />
+                      <ref role="Rm8GQ" to="cof4:2q_78a95hAM" resolve="WALK" />
+                      <ref role="1Px2BO" to="cof4:2q_78a95hAL" resolve="Action" />
                     </node>
                   </node>
                 </node>
@@ -1292,14 +1292,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="6exd:47nvOnTQN6Q" resolve="DataFormWalk" />
+                  <ref role="37wK5l" to="cof4:47nvOnTQN6Q" resolve="DataFormWalk" />
                   <node concept="37vLTw" id="1LBj9wBeAcg" role="37wK5m">
                     <ref role="3cqZAo" node="1LBj9wBex19" resolve="mock" />
                   </node>
                 </node>
               </node>
               <node concept="liA8E" id="6MYr6Jxs3oh" role="2OqNvi">
-                <ref role="37wK5l" to="6exd:1hOy_Afq63K" resolve="walk" />
+                <ref role="37wK5l" to="cof4:1hOy_Afq63K" resolve="walk" />
                 <node concept="37vLTw" id="6MYr6Jxs4zm" role="37wK5m">
                   <ref role="3cqZAo" node="6MYr6Jxs3nk" resolve="val" />
                 </node>
@@ -1352,11 +1352,11 @@
             <node concept="3cpWsn" id="5YVX0wIjZEX" role="3cpWs9">
               <property role="TrG5h" value="first" />
               <node concept="3uibUv" id="6MYr6Jxsln8" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="TermNode" />
+                <ref role="3uigEE" to="cof4:5JQSuNswOXL" resolve="TermNode" />
               </node>
               <node concept="10QFUN" id="6MYr6JxsloV" role="33vP2m">
                 <node concept="3uibUv" id="6MYr6JxsloO" role="10QFUM">
-                  <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="TermNode" />
+                  <ref role="3uigEE" to="cof4:5JQSuNswOXL" resolve="TermNode" />
                 </node>
                 <node concept="1oi1Uc" id="6MYr6JxsloP" role="10QFUP">
                   <node concept="1oi5UN" id="6MYr6JxsloQ" role="1oi0x0">
@@ -1381,11 +1381,11 @@
             <node concept="3cpWsn" id="5YVX0wIk0aR" role="3cpWs9">
               <property role="TrG5h" value="second" />
               <node concept="3uibUv" id="6MYr6Jxslqr" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="TermNode" />
+                <ref role="3uigEE" to="cof4:5JQSuNswOXL" resolve="TermNode" />
               </node>
               <node concept="10QFUN" id="6MYr6JxsluC" role="33vP2m">
                 <node concept="3uibUv" id="6MYr6Jxslux" role="10QFUM">
-                  <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="TermNode" />
+                  <ref role="3uigEE" to="cof4:5JQSuNswOXL" resolve="TermNode" />
                 </node>
                 <node concept="1oi1Uc" id="6MYr6Jxsluy" role="10QFUP">
                   <node concept="1oi5UN" id="6MYr6Jxsluz" role="1oi0x0">
@@ -1410,11 +1410,11 @@
             <node concept="3cpWsn" id="5YVX0wIk0rD" role="3cpWs9">
               <property role="TrG5h" value="third" />
               <node concept="3uibUv" id="6MYr6Jxslwq" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="TermNode" />
+                <ref role="3uigEE" to="cof4:5JQSuNswOXL" resolve="TermNode" />
               </node>
               <node concept="10QFUN" id="6MYr6Jxslyd" role="33vP2m">
                 <node concept="3uibUv" id="6MYr6Jxsly6" role="10QFUM">
-                  <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="TermNode" />
+                  <ref role="3uigEE" to="cof4:5JQSuNswOXL" resolve="TermNode" />
                 </node>
                 <node concept="1oi1Uc" id="6MYr6Jxsly7" role="10QFUP">
                   <node concept="1oi5UN" id="6MYr6Jxsly8" role="1oi0x0">
@@ -1440,7 +1440,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="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="3t7_2FgLsIG" role="33vP2m">
                 <node concept="KCUsM" id="5YVX0wIlrxs" role="1oi0x0">
@@ -1514,7 +1514,7 @@
             <node concept="3cpWsn" id="7t5VLKGALW_" role="3cpWs9">
               <property role="TrG5h" value="toWalk" />
               <node concept="3uibUv" id="7t5VLKGALWA" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="7t5VLKGALWB" role="33vP2m">
                 <node concept="1oi5ST" id="1fvYCPAk_wZ" role="1oi0x0">
@@ -1562,11 +1562,11 @@
                   <node concept="liA8E" id="1LBj9wBaXG6" role="2OqNvi">
                     <ref role="37wK5l" node="1LBj9wB4RIc" resolve="any" />
                     <node concept="3VsKOn" id="1LBj9wBbU4k" role="37wK5m">
-                      <ref role="3VsUkX" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                      <ref role="3VsUkX" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                     </node>
                     <node concept="Rm8GO" id="1LBj9wBaXG8" role="37wK5m">
-                      <ref role="1Px2BO" to="6exd:2q_78a95hAL" resolve="Action" />
-                      <ref role="Rm8GQ" to="6exd:2q_78a95hAM" resolve="WALK" />
+                      <ref role="1Px2BO" to="cof4:2q_78a95hAL" resolve="Action" />
+                      <ref role="Rm8GQ" to="cof4:2q_78a95hAM" resolve="WALK" />
                     </node>
                   </node>
                 </node>
@@ -1591,11 +1591,11 @@
                   <node concept="liA8E" id="1LBj9wBcdqz" role="2OqNvi">
                     <ref role="37wK5l" node="1LBj9wB4RIc" resolve="any" />
                     <node concept="3VsKOn" id="1LBj9wBcp6C" role="37wK5m">
-                      <ref role="3VsUkX" to="6exd:3OPtF03lco4" resolve="ListNode" />
+                      <ref role="3VsUkX" to="cof4:3OPtF03lco4" resolve="ListNode" />
                     </node>
                     <node concept="Rm8GO" id="1LBj9wBcdq_" role="37wK5m">
-                      <ref role="1Px2BO" to="6exd:2q_78a95hAL" resolve="Action" />
-                      <ref role="Rm8GQ" to="6exd:2q_78a95hAM" resolve="WALK" />
+                      <ref role="1Px2BO" to="cof4:2q_78a95hAL" resolve="Action" />
+                      <ref role="Rm8GQ" to="cof4:2q_78a95hAM" resolve="WALK" />
                     </node>
                   </node>
                 </node>
@@ -1620,11 +1620,11 @@
                   <node concept="liA8E" id="1LBj9wBc4A3" role="2OqNvi">
                     <ref role="37wK5l" node="1LBj9wB4RIc" resolve="any" />
                     <node concept="3VsKOn" id="1LBj9wBc4A4" role="37wK5m">
-                      <ref role="3VsUkX" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                      <ref role="3VsUkX" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                     </node>
                     <node concept="Rm8GO" id="1LBj9wBc4A5" role="37wK5m">
-                      <ref role="1Px2BO" to="6exd:2q_78a95hAL" resolve="Action" />
-                      <ref role="Rm8GQ" to="6exd:2q_78a95hAM" resolve="WALK" />
+                      <ref role="1Px2BO" to="cof4:2q_78a95hAL" resolve="Action" />
+                      <ref role="Rm8GQ" to="cof4:2q_78a95hAM" resolve="WALK" />
                     </node>
                   </node>
                 </node>
@@ -1649,11 +1649,11 @@
                   <node concept="liA8E" id="1LBj9wBbmE9" role="2OqNvi">
                     <ref role="37wK5l" node="1LBj9wB4RIc" resolve="any" />
                     <node concept="3VsKOn" id="1LBj9wBcKst" role="37wK5m">
-                      <ref role="3VsUkX" to="6exd:3OPtF03lco4" resolve="ListNode" />
+                      <ref role="3VsUkX" to="cof4:3OPtF03lco4" resolve="ListNode" />
                     </node>
                     <node concept="Rm8GO" id="1LBj9wBbmEb" role="37wK5m">
-                      <ref role="1Px2BO" to="6exd:2q_78a95hAL" resolve="Action" />
-                      <ref role="Rm8GQ" to="6exd:2q_78a95hAM" resolve="WALK" />
+                      <ref role="1Px2BO" to="cof4:2q_78a95hAL" resolve="Action" />
+                      <ref role="Rm8GQ" to="cof4:2q_78a95hAM" resolve="WALK" />
                     </node>
                   </node>
                 </node>
@@ -1681,8 +1681,8 @@
                       <ref role="3cqZAo" node="5YVX0wIjZEX" resolve="first" />
                     </node>
                     <node concept="Rm8GO" id="1LBj9wBcSxP" role="37wK5m">
-                      <ref role="Rm8GQ" to="6exd:2q_78a95hAN" resolve="CONTINUE" />
-                      <ref role="1Px2BO" to="6exd:2q_78a95hAL" resolve="Action" />
+                      <ref role="Rm8GQ" to="cof4:2q_78a95hAN" resolve="CONTINUE" />
+                      <ref role="1Px2BO" to="cof4:2q_78a95hAL" resolve="Action" />
                     </node>
                   </node>
                 </node>
@@ -1710,8 +1710,8 @@
                       <ref role="3cqZAo" node="5YVX0wIk0aR" resolve="second" />
                     </node>
                     <node concept="Rm8GO" id="1LBj9wBcSWr" role="37wK5m">
-                      <ref role="Rm8GQ" to="6exd:2q_78a95hAN" resolve="CONTINUE" />
-                      <ref role="1Px2BO" to="6exd:2q_78a95hAL" resolve="Action" />
+                      <ref role="Rm8GQ" to="cof4:2q_78a95hAN" resolve="CONTINUE" />
+                      <ref role="1Px2BO" to="cof4:2q_78a95hAL" resolve="Action" />
                     </node>
                   </node>
                 </node>
@@ -1739,8 +1739,8 @@
                       <ref role="3cqZAo" node="5YVX0wIk0rD" resolve="third" />
                     </node>
                     <node concept="Rm8GO" id="1LBj9wBcTPk" role="37wK5m">
-                      <ref role="Rm8GQ" to="6exd:2q_78a95hAN" resolve="CONTINUE" />
-                      <ref role="1Px2BO" to="6exd:2q_78a95hAL" resolve="Action" />
+                      <ref role="Rm8GQ" to="cof4:2q_78a95hAN" resolve="CONTINUE" />
+                      <ref role="1Px2BO" to="cof4:2q_78a95hAL" resolve="Action" />
                     </node>
                   </node>
                 </node>
@@ -1768,7 +1768,7 @@
                   <node concept="liA8E" id="1LBj9wBd1xx" role="2OqNvi">
                     <ref role="37wK5l" node="1LBj9wB4RIc" resolve="any" />
                     <node concept="3VsKOn" id="1LBj9wBd1xy" role="37wK5m">
-                      <ref role="3VsUkX" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                      <ref role="3VsUkX" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                     </node>
                     <node concept="10Nm6u" id="1LBj9wBd1xz" role="37wK5m" />
                   </node>
@@ -1781,14 +1781,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="6exd:47nvOnTQN6Q" resolve="DataFormWalk" />
+                  <ref role="37wK5l" to="cof4:47nvOnTQN6Q" resolve="DataFormWalk" />
                   <node concept="37vLTw" id="1LBj9wBb8BF" role="37wK5m">
                     <ref role="3cqZAo" node="1LBj9wBaXFV" resolve="mock" />
                   </node>
                 </node>
               </node>
               <node concept="liA8E" id="5YVX0wIjRTy" role="2OqNvi">
-                <ref role="37wK5l" to="6exd:1hOy_Afq63K" resolve="walk" />
+                <ref role="37wK5l" to="cof4:1hOy_Afq63K" resolve="walk" />
                 <node concept="37vLTw" id="5YVX0wIk2jv" role="37wK5m">
                   <ref role="3cqZAo" node="7t5VLKGALW_" resolve="toWalk" />
                 </node>
@@ -1817,11 +1817,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="6exd:5JQSuNswOXL" resolve="TermNode" />
+                <ref role="3uigEE" to="cof4:5JQSuNswOXL" resolve="TermNode" />
               </node>
               <node concept="10QFUN" id="6MYr6JxsnOq" role="33vP2m">
                 <node concept="3uibUv" id="6MYr6JxsnOj" role="10QFUM">
-                  <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="TermNode" />
+                  <ref role="3uigEE" to="cof4:5JQSuNswOXL" resolve="TermNode" />
                 </node>
                 <node concept="1oi1Uc" id="6MYr6JxsnOk" role="10QFUP">
                   <node concept="1oi5UN" id="6MYr6JxsnOl" role="1oi0x0">
@@ -1846,11 +1846,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="6exd:5JQSuNswOXL" resolve="TermNode" />
+                <ref role="3uigEE" to="cof4:5JQSuNswOXL" resolve="TermNode" />
               </node>
               <node concept="10QFUN" id="6MYr6JxsnRQ" role="33vP2m">
                 <node concept="3uibUv" id="6MYr6JxsnRJ" role="10QFUM">
-                  <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="TermNode" />
+                  <ref role="3uigEE" to="cof4:5JQSuNswOXL" resolve="TermNode" />
                 </node>
                 <node concept="1oi1Uc" id="6MYr6JxsnRK" role="10QFUP">
                   <node concept="1oi5UN" id="6MYr6JxsnRL" role="1oi0x0">
@@ -1875,11 +1875,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="6exd:5JQSuNswOXL" resolve="TermNode" />
+                <ref role="3uigEE" to="cof4:5JQSuNswOXL" resolve="TermNode" />
               </node>
               <node concept="10QFUN" id="6MYr6JxsnVj" role="33vP2m">
                 <node concept="3uibUv" id="6MYr6JxsnVc" role="10QFUM">
-                  <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="TermNode" />
+                  <ref role="3uigEE" to="cof4:5JQSuNswOXL" resolve="TermNode" />
                 </node>
                 <node concept="1oi1Uc" id="6MYr6JxsnVd" role="10QFUP">
                   <node concept="1oi5UN" id="6MYr6JxsnVe" role="1oi0x0">
@@ -1905,7 +1905,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="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="3t7_2Fg_2r8" role="33vP2m">
                 <node concept="KCUsM" id="3t7_2Fg_2s4" role="1oi0x0">
@@ -1938,7 +1938,7 @@
             <node concept="3cpWsn" id="3t7_2Fg_0xQ" role="3cpWs9">
               <property role="TrG5h" value="toWalk" />
               <node concept="3uibUv" id="6YPNC4OXOab" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:6YPNC4OECgm" resolve="ListRole" />
+                <ref role="3uigEE" to="cof4:6YPNC4OECgm" resolve="ListRole" />
               </node>
               <node concept="1oi1Uc" id="3t7_2Fg_0xS" role="33vP2m">
                 <node concept="1oi5ST" id="1fvYCPAk_x0" role="1oi0x0">
@@ -1989,8 +1989,8 @@
                       <ref role="3cqZAo" node="3t7_2Fg_0xQ" resolve="toWalk" />
                     </node>
                     <node concept="Rm8GO" id="1LBj9wBeRrb" role="37wK5m">
-                      <ref role="Rm8GQ" to="6exd:2q_78a95hAM" resolve="WALK" />
-                      <ref role="1Px2BO" to="6exd:2q_78a95hAL" resolve="Action" />
+                      <ref role="Rm8GQ" to="cof4:2q_78a95hAM" resolve="WALK" />
+                      <ref role="1Px2BO" to="cof4:2q_78a95hAL" resolve="Action" />
                     </node>
                   </node>
                 </node>
@@ -2018,8 +2018,8 @@
                       <ref role="3cqZAo" node="3t7_2Fg_0vn" resolve="list" />
                     </node>
                     <node concept="Rm8GO" id="1LBj9wBeYoQ" role="37wK5m">
-                      <ref role="Rm8GQ" to="6exd:2q_78a95hAM" resolve="WALK" />
-                      <ref role="1Px2BO" to="6exd:2q_78a95hAL" resolve="Action" />
+                      <ref role="Rm8GQ" to="cof4:2q_78a95hAM" resolve="WALK" />
+                      <ref role="1Px2BO" to="cof4:2q_78a95hAL" resolve="Action" />
                     </node>
                   </node>
                 </node>
@@ -2047,8 +2047,8 @@
                       <ref role="3cqZAo" node="3t7_2Fg_0sP" resolve="first" />
                     </node>
                     <node concept="Rm8GO" id="1LBj9wBf0Kh" role="37wK5m">
-                      <ref role="Rm8GQ" to="6exd:2q_78a95hAM" resolve="WALK" />
-                      <ref role="1Px2BO" to="6exd:2q_78a95hAL" resolve="Action" />
+                      <ref role="Rm8GQ" to="cof4:2q_78a95hAM" resolve="WALK" />
+                      <ref role="1Px2BO" to="cof4:2q_78a95hAL" resolve="Action" />
                     </node>
                   </node>
                 </node>
@@ -2076,11 +2076,11 @@
                   <node concept="liA8E" id="1LBj9wBf3qp" role="2OqNvi">
                     <ref role="37wK5l" node="1LBj9wB4RIc" resolve="any" />
                     <node concept="3VsKOn" id="1LBj9wBf7tu" role="37wK5m">
-                      <ref role="3VsUkX" to="6exd:1msb0mq99GH" resolve="ValueRole" />
+                      <ref role="3VsUkX" to="cof4:1msb0mq99GH" resolve="ValueRole" />
                     </node>
                     <node concept="Rm8GO" id="1LBj9wBfEUM" role="37wK5m">
-                      <ref role="Rm8GQ" to="6exd:2q_78a95hAN" resolve="CONTINUE" />
-                      <ref role="1Px2BO" to="6exd:2q_78a95hAL" resolve="Action" />
+                      <ref role="Rm8GQ" to="cof4:2q_78a95hAN" resolve="CONTINUE" />
+                      <ref role="1Px2BO" to="cof4:2q_78a95hAL" resolve="Action" />
                     </node>
                   </node>
                 </node>
@@ -2105,7 +2105,7 @@
                   <node concept="liA8E" id="1LBj9wBf9Dx" role="2OqNvi">
                     <ref role="37wK5l" node="1LBj9wB4RIc" resolve="any" />
                     <node concept="3VsKOn" id="1LBj9wBf9Dy" role="37wK5m">
-                      <ref role="3VsUkX" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                      <ref role="3VsUkX" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                     </node>
                     <node concept="10Nm6u" id="1LBj9wBf9Dz" role="37wK5m" />
                   </node>
@@ -2134,8 +2134,8 @@
                       <ref role="3cqZAo" node="3t7_2Fg_0sY" resolve="second" />
                     </node>
                     <node concept="Rm8GO" id="1LBj9wBfcDY" role="37wK5m">
-                      <ref role="Rm8GQ" to="6exd:2q_78a95hAM" resolve="WALK" />
-                      <ref role="1Px2BO" to="6exd:2q_78a95hAL" resolve="Action" />
+                      <ref role="Rm8GQ" to="cof4:2q_78a95hAM" resolve="WALK" />
+                      <ref role="1Px2BO" to="cof4:2q_78a95hAL" resolve="Action" />
                     </node>
                   </node>
                 </node>
@@ -2163,11 +2163,11 @@
                   <node concept="liA8E" id="1LBj9wBfhp_" role="2OqNvi">
                     <ref role="37wK5l" node="1LBj9wB4RIc" resolve="any" />
                     <node concept="3VsKOn" id="1LBj9wBfhpA" role="37wK5m">
-                      <ref role="3VsUkX" to="6exd:1msb0mq99GH" resolve="ValueRole" />
+                      <ref role="3VsUkX" to="cof4:1msb0mq99GH" resolve="ValueRole" />
                     </node>
                     <node concept="Rm8GO" id="1LBj9wBfDNZ" role="37wK5m">
-                      <ref role="Rm8GQ" to="6exd:2q_78a95hAN" resolve="CONTINUE" />
-                      <ref role="1Px2BO" to="6exd:2q_78a95hAL" resolve="Action" />
+                      <ref role="Rm8GQ" to="cof4:2q_78a95hAN" resolve="CONTINUE" />
+                      <ref role="1Px2BO" to="cof4:2q_78a95hAL" resolve="Action" />
                     </node>
                   </node>
                 </node>
@@ -2192,7 +2192,7 @@
                   <node concept="liA8E" id="1LBj9wBfl$$" role="2OqNvi">
                     <ref role="37wK5l" node="1LBj9wB4RIc" resolve="any" />
                     <node concept="3VsKOn" id="1LBj9wBfl$_" role="37wK5m">
-                      <ref role="3VsUkX" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                      <ref role="3VsUkX" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                     </node>
                     <node concept="10Nm6u" id="1LBj9wBfl$A" role="37wK5m" />
                   </node>
@@ -2221,8 +2221,8 @@
                       <ref role="3cqZAo" node="3t7_2Fg_0t7" resolve="third" />
                     </node>
                     <node concept="Rm8GO" id="1LBj9wBfpSI" role="37wK5m">
-                      <ref role="Rm8GQ" to="6exd:2q_78a95hAM" resolve="WALK" />
-                      <ref role="1Px2BO" to="6exd:2q_78a95hAL" resolve="Action" />
+                      <ref role="Rm8GQ" to="cof4:2q_78a95hAM" resolve="WALK" />
+                      <ref role="1Px2BO" to="cof4:2q_78a95hAL" resolve="Action" />
                     </node>
                   </node>
                 </node>
@@ -2250,11 +2250,11 @@
                   <node concept="liA8E" id="1LBj9wBfv4m" role="2OqNvi">
                     <ref role="37wK5l" node="1LBj9wB4RIc" resolve="any" />
                     <node concept="3VsKOn" id="1LBj9wBfv4n" role="37wK5m">
-                      <ref role="3VsUkX" to="6exd:1msb0mq99GH" resolve="ValueRole" />
+                      <ref role="3VsUkX" to="cof4:1msb0mq99GH" resolve="ValueRole" />
                     </node>
                     <node concept="Rm8GO" id="1LBj9wBfGvm" role="37wK5m">
-                      <ref role="Rm8GQ" to="6exd:2q_78a95hAN" resolve="CONTINUE" />
-                      <ref role="1Px2BO" to="6exd:2q_78a95hAL" resolve="Action" />
+                      <ref role="Rm8GQ" to="cof4:2q_78a95hAN" resolve="CONTINUE" />
+                      <ref role="1Px2BO" to="cof4:2q_78a95hAL" resolve="Action" />
                     </node>
                   </node>
                 </node>
@@ -2282,7 +2282,7 @@
                   <node concept="liA8E" id="1LBj9wBfyQM" role="2OqNvi">
                     <ref role="37wK5l" node="1LBj9wB4RIc" resolve="any" />
                     <node concept="3VsKOn" id="1LBj9wBfyQN" role="37wK5m">
-                      <ref role="3VsUkX" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                      <ref role="3VsUkX" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                     </node>
                     <node concept="10Nm6u" id="1LBj9wBfyQO" role="37wK5m" />
                   </node>
@@ -2295,14 +2295,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="6exd:47nvOnTQN6Q" resolve="DataFormWalk" />
+                  <ref role="37wK5l" to="cof4:47nvOnTQN6Q" resolve="DataFormWalk" />
                   <node concept="37vLTw" id="1LBj9wBfMAk" role="37wK5m">
                     <ref role="3cqZAo" node="1LBj9wBeRqY" resolve="mock" />
                   </node>
                 </node>
               </node>
               <node concept="liA8E" id="3t7_2Fg_0Um" role="2OqNvi">
-                <ref role="37wK5l" to="6exd:1hOy_Afq63K" resolve="walk" />
+                <ref role="37wK5l" to="cof4:1hOy_Afq63K" resolve="walk" />
                 <node concept="37vLTw" id="3t7_2Fg_0Un" role="37wK5m">
                   <ref role="3cqZAo" node="3t7_2Fg_0xQ" resolve="toWalk" />
                 </node>
@@ -2336,7 +2336,7 @@
       <node concept="3uibUv" id="2DKqMqOqkb3" role="3clF45">
         <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
         <node concept="3uibUv" id="2DKqMqOquKp" role="11_B2D">
-          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+          <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
         </node>
       </node>
       <node concept="3Tm1VV" id="2DKqMqOqk7n" role="1B3o_S" />
@@ -2347,7 +2347,7 @@
             <ref role="1Pybhc" to="bj13:~LogicalKt" resolve="LogicalKt" />
             <node concept="10QFUN" id="YbzkzLjzs_" role="37wK5m">
               <node concept="3uibUv" id="YbzkzLjzsA" role="10QFUM">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="10Nm6u" id="YbzkzLjzsB" role="10QFUP" />
             </node>
@@ -2365,13 +2365,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="6exd:1bm7a6EXvsP" resolve="DataForm" />
+          <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
         </node>
       </node>
       <node concept="3uibUv" id="2DKqMqOq_PE" role="3clF45">
         <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
         <node concept="3uibUv" id="2DKqMqOq_PF" role="11_B2D">
-          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+          <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
         </node>
       </node>
       <node concept="3Tm1VV" id="2DKqMqOq_PG" role="1B3o_S" />
@@ -2382,7 +2382,7 @@
             <node concept="3uibUv" id="YbzkzLjZPM" role="1tU5fm">
               <ref role="3uigEE" to="bj13:~MutableLogical" resolve="MutableLogical" />
               <node concept="3uibUv" id="YbzkzLjZPP" role="11_B2D">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
             </node>
             <node concept="2YIFZM" id="YbzkzLjZPT" role="33vP2m">
@@ -2392,7 +2392,7 @@
                 <ref role="3cqZAo" node="2DKqMqOq_P$" resolve="name" />
               </node>
               <node concept="3uibUv" id="YbzkzLjZPV" role="3PaCim">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
             </node>
           </node>
@@ -2430,7 +2430,7 @@
               <node concept="3uibUv" id="2DKqMqOqvLI" role="1tU5fm">
                 <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
                 <node concept="3uibUv" id="2DKqMqOqvLL" role="11_B2D">
-                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                  <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                 </node>
               </node>
               <node concept="1rXfSq" id="2DKqMqOqvLR" role="33vP2m">
@@ -2447,7 +2447,7 @@
               <node concept="3uibUv" id="2DKqMqOqw8y" role="1tU5fm">
                 <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
                 <node concept="3uibUv" id="2DKqMqOqw8_" role="11_B2D">
-                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                  <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                 </node>
               </node>
               <node concept="1rXfSq" id="2DKqMqOqw8N" role="33vP2m">
@@ -2464,7 +2464,7 @@
               <node concept="3uibUv" id="2DKqMqOqzLb" role="1tU5fm">
                 <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
                 <node concept="3uibUv" id="2DKqMqOqzLc" role="11_B2D">
-                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                  <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                 </node>
               </node>
               <node concept="1rXfSq" id="2DKqMqOqzLd" role="33vP2m">
@@ -2535,7 +2535,7 @@
               <node concept="3uibUv" id="2DKqMqOqEKD" role="1tU5fm">
                 <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
                 <node concept="3uibUv" id="2DKqMqOqEKG" role="11_B2D">
-                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                  <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                 </node>
               </node>
               <node concept="1rXfSq" id="2DKqMqOqEKL" role="33vP2m">
@@ -2562,7 +2562,7 @@
               <node concept="3uibUv" id="2DKqMqOqEOa" role="1tU5fm">
                 <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
                 <node concept="3uibUv" id="2DKqMqOqEOb" role="11_B2D">
-                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                  <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                 </node>
               </node>
               <node concept="1rXfSq" id="2DKqMqOqEOc" role="33vP2m">
@@ -2589,7 +2589,7 @@
               <node concept="3uibUv" id="2DKqMqOqFhf" role="1tU5fm">
                 <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
                 <node concept="3uibUv" id="2DKqMqOqFhg" role="11_B2D">
-                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                  <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                 </node>
               </node>
               <node concept="1rXfSq" id="2DKqMqOqFhh" role="33vP2m">
@@ -2616,7 +2616,7 @@
               <node concept="3uibUv" id="5kEUewdxWdZ" role="1tU5fm">
                 <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
                 <node concept="3uibUv" id="5kEUewdxWe2" role="11_B2D">
-                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                  <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                 </node>
               </node>
               <node concept="1rXfSq" id="5kEUewdxWe6" role="33vP2m">
@@ -2633,7 +2633,7 @@
               <node concept="3uibUv" id="5kEUewdy0lV" role="1tU5fm">
                 <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
                 <node concept="3uibUv" id="5kEUewdy0lW" role="11_B2D">
-                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                  <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                 </node>
               </node>
               <node concept="1rXfSq" id="5kEUewdy0lX" role="33vP2m">
@@ -2862,13 +2862,13 @@
       <node concept="37vLTG" id="6yEjedm6GJE" role="3clF46">
         <property role="TrG5h" value="tf" />
         <node concept="3uibUv" id="6yEjedm6GNi" role="1tU5fm">
-          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+          <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
         </node>
       </node>
       <node concept="3uibUv" id="6yEjedm6GEk" role="3clF45">
         <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
         <node concept="3uibUv" id="6yEjedm6GEG" role="11_B2D">
-          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+          <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
         </node>
       </node>
       <node concept="3Tm6S6" id="6yEjedm6GE4" role="1B3o_S" />
@@ -2898,7 +2898,7 @@
               <node concept="3uibUv" id="6yEjedm6PY7" role="1tU5fm">
                 <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
                 <node concept="3uibUv" id="6yEjedm6PYa" role="11_B2D">
-                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                  <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                 </node>
               </node>
               <node concept="1rXfSq" id="6yEjedm6PYd" role="33vP2m">
@@ -2921,7 +2921,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="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="dfChU1g_c_" role="33vP2m">
                 <node concept="1oi5UN" id="dfChU1g_d$" role="1oi0x0">
@@ -2945,7 +2945,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="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="dfChU1g_fI" role="33vP2m">
                 <node concept="1oi5UN" id="dfChU1g_fJ" role="1oi0x0">
@@ -2966,8 +2966,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="6exd:6HT7BWBOXr$" resolve="ground" />
-              <ref role="1Pybhc" to="6exd:6HT7BWBOXme" resolve="DataFormUtil" />
+              <ref role="37wK5l" to="cof4:6HT7BWBOXr$" resolve="ground" />
+              <ref role="1Pybhc" to="cof4:6HT7BWBOXme" resolve="DataFormUtil" />
               <node concept="37vLTw" id="6HT7BWBPqG2" role="37wK5m">
                 <ref role="3cqZAo" node="dfChU1g_fG" resolve="b" />
               </node>
@@ -2990,7 +2990,7 @@
               <node concept="3uibUv" id="6yEjedm6Hob" role="1tU5fm">
                 <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
                 <node concept="3uibUv" id="6yEjedm6Hoe" role="11_B2D">
-                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                  <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                 </node>
               </node>
               <node concept="1rXfSq" id="6yEjedm6Hoh" role="33vP2m">
@@ -3015,7 +3015,7 @@
               <node concept="3uibUv" id="6yEjedm6QBT" role="1tU5fm">
                 <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
                 <node concept="3uibUv" id="6yEjedm6QBW" role="11_B2D">
-                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                  <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                 </node>
               </node>
               <node concept="1rXfSq" id="6yEjedm6QC4" role="33vP2m">
@@ -3048,7 +3048,7 @@
             <node concept="3cpWsn" id="1jo82tq3J3P" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="1jo82tq3J3Q" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="1jo82tq3J3R" role="33vP2m">
                 <node concept="1oi5UN" id="1jo82tq3J3S" role="1oi0x0">
@@ -3089,7 +3089,7 @@
             <node concept="3cpWsn" id="1jo82tq3J3Z" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="1jo82tq3J40" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="1jo82tq3J41" role="33vP2m">
                 <node concept="1oi5UN" id="1jo82tq3J42" role="1oi0x0">
@@ -3116,8 +3116,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="6exd:6HT7BWBOXr$" resolve="ground" />
-              <ref role="1Pybhc" to="6exd:6HT7BWBOXme" resolve="DataFormUtil" />
+              <ref role="37wK5l" to="cof4:6HT7BWBOXr$" resolve="ground" />
+              <ref role="1Pybhc" to="cof4:6HT7BWBOXme" resolve="DataFormUtil" />
               <node concept="37vLTw" id="1jo82tq3J4a" role="37wK5m">
                 <ref role="3cqZAo" node="1jo82tq3J3Z" resolve="b" />
               </node>
@@ -3140,7 +3140,7 @@
               <node concept="3uibUv" id="6yEjedm6IgL" role="1tU5fm">
                 <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
                 <node concept="3uibUv" id="6yEjedm6IgO" role="11_B2D">
-                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                  <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                 </node>
               </node>
               <node concept="1rXfSq" id="6yEjedm6IgS" role="33vP2m">
@@ -3163,7 +3163,7 @@
             <node concept="3cpWsn" id="1OShD0HAz3X" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="1OShD0HAz3Y" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0HAz3Z" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0HAz40" role="1oi0x0">
@@ -3197,7 +3197,7 @@
             <node concept="3cpWsn" id="1OShD0HAz47" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="1OShD0HAz48" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0HAz49" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0HAz4a" role="1oi0x0">
@@ -3231,8 +3231,8 @@
               <ref role="3cqZAo" node="1OShD0HAz3X" resolve="a" />
             </node>
             <node concept="2YIFZM" id="6HT7BWBPrIq" role="3tpDZA">
-              <ref role="37wK5l" to="6exd:6HT7BWBOXr$" resolve="ground" />
-              <ref role="1Pybhc" to="6exd:6HT7BWBOXme" resolve="DataFormUtil" />
+              <ref role="37wK5l" to="cof4:6HT7BWBOXr$" resolve="ground" />
+              <ref role="1Pybhc" to="cof4:6HT7BWBOXme" resolve="DataFormUtil" />
               <node concept="37vLTw" id="6HT7BWBPrIr" role="37wK5m">
                 <ref role="3cqZAo" node="1OShD0HAz47" resolve="b" />
               </node>
@@ -3252,7 +3252,7 @@
               <node concept="3uibUv" id="6yEjedm6JaG" role="1tU5fm">
                 <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
                 <node concept="3uibUv" id="6yEjedm6JaJ" role="11_B2D">
-                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                  <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                 </node>
               </node>
               <node concept="1rXfSq" id="6yEjedm6JaN" role="33vP2m">
@@ -3285,7 +3285,7 @@
             <node concept="3cpWsn" id="1OShD0HRNoP" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="1OShD0HRNoQ" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0HRNoR" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0HRNoS" role="1oi0x0">
@@ -3319,7 +3319,7 @@
             <node concept="3cpWsn" id="1OShD0HRNp2" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="1OShD0HRNp3" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0HRNp4" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0HRNp5" role="1oi0x0">
@@ -3343,8 +3343,8 @@
               <ref role="3cqZAo" node="1OShD0HRNoP" resolve="a" />
             </node>
             <node concept="2YIFZM" id="6HT7BWBSfTf" role="3tpDZA">
-              <ref role="37wK5l" to="6exd:6HT7BWBOXr$" resolve="ground" />
-              <ref role="1Pybhc" to="6exd:6HT7BWBOXme" resolve="DataFormUtil" />
+              <ref role="37wK5l" to="cof4:6HT7BWBOXr$" resolve="ground" />
+              <ref role="1Pybhc" to="cof4:6HT7BWBOXme" resolve="DataFormUtil" />
               <node concept="37vLTw" id="6HT7BWBSfTg" role="37wK5m">
                 <ref role="3cqZAo" node="1OShD0HRNp2" resolve="b" />
               </node>
@@ -3364,7 +3364,7 @@
               <node concept="3uibUv" id="6yEjedm6JUY" role="1tU5fm">
                 <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
                 <node concept="3uibUv" id="6yEjedm6JV1" role="11_B2D">
-                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                  <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                 </node>
               </node>
               <node concept="1rXfSq" id="6yEjedm6JV4" role="33vP2m">
@@ -3380,7 +3380,7 @@
             <node concept="3cpWsn" id="1OShD0Ifj4$" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="1OShD0Ifj4_" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0Ifj4A" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0Ifj4B" role="1oi0x0">
@@ -3397,7 +3397,7 @@
             <node concept="3cpWsn" id="1OShD0Ifj4M" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="1OShD0Ifj4N" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0Ifj4O" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0Ifj4P" role="1oi0x0">
@@ -3421,8 +3421,8 @@
               <ref role="3cqZAo" node="1OShD0Ifj4$" resolve="a" />
             </node>
             <node concept="2YIFZM" id="6HT7BWBPrJ8" role="3tpDZA">
-              <ref role="37wK5l" to="6exd:6HT7BWBOXr$" resolve="ground" />
-              <ref role="1Pybhc" to="6exd:6HT7BWBOXme" resolve="DataFormUtil" />
+              <ref role="37wK5l" to="cof4:6HT7BWBOXr$" resolve="ground" />
+              <ref role="1Pybhc" to="cof4:6HT7BWBOXme" resolve="DataFormUtil" />
               <node concept="37vLTw" id="6HT7BWBPrJ9" role="37wK5m">
                 <ref role="3cqZAo" node="1OShD0Ifj4M" resolve="b" />
               </node>
@@ -3442,7 +3442,7 @@
               <node concept="3uibUv" id="6yEjedm6Ktu" role="1tU5fm">
                 <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
                 <node concept="3uibUv" id="6yEjedm6Ktx" role="11_B2D">
-                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                  <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                 </node>
               </node>
               <node concept="1rXfSq" id="6yEjedm6Kt_" role="33vP2m">
@@ -3462,7 +3462,7 @@
             <node concept="3cpWsn" id="dfChU1yMlk" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="dfChU1yMll" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="dfChU1yMlm" role="33vP2m">
                 <node concept="1oi5UN" id="dfChU1yMln" role="1oi0x0">
@@ -3487,7 +3487,7 @@
             <node concept="3cpWsn" id="dfChU1yMlu" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="dfChU1yMlv" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="dfChU1yMlw" role="33vP2m">
                 <node concept="1oi5UN" id="dfChU1yMlx" role="1oi0x0">
@@ -3515,8 +3515,8 @@
               <ref role="3cqZAo" node="dfChU1yMlk" resolve="a" />
             </node>
             <node concept="2YIFZM" id="6HT7BWBPrJv" role="3tpDZA">
-              <ref role="37wK5l" to="6exd:6HT7BWBOXr$" resolve="ground" />
-              <ref role="1Pybhc" to="6exd:6HT7BWBOXme" resolve="DataFormUtil" />
+              <ref role="37wK5l" to="cof4:6HT7BWBOXr$" resolve="ground" />
+              <ref role="1Pybhc" to="cof4:6HT7BWBOXme" resolve="DataFormUtil" />
               <node concept="37vLTw" id="6HT7BWBPrJw" role="37wK5m">
                 <ref role="3cqZAo" node="dfChU1yMlu" resolve="b" />
               </node>
@@ -3536,7 +3536,7 @@
               <node concept="3uibUv" id="6yEjedm6L2s" role="1tU5fm">
                 <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
                 <node concept="3uibUv" id="6yEjedm6L2v" role="11_B2D">
-                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                  <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                 </node>
               </node>
               <node concept="1rXfSq" id="6yEjedm6L2y" role="33vP2m">
@@ -3554,7 +3554,7 @@
             <node concept="3cpWsn" id="dfChU1DQLv" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="dfChU1DQLw" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="dfChU1DQLx" role="33vP2m">
                 <node concept="1oi5UN" id="dfChU1DQLy" role="1oi0x0">
@@ -3571,7 +3571,7 @@
             <node concept="3cpWsn" id="dfChU1DQLB" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="dfChU1DQLC" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="dfChU1DQLD" role="33vP2m">
                 <node concept="1oi5UN" id="dfChU1DQLE" role="1oi0x0">
@@ -3593,8 +3593,8 @@
               <ref role="3cqZAo" node="dfChU1DQLv" resolve="a" />
             </node>
             <node concept="2YIFZM" id="6HT7BWBPrJQ" role="3tpDZA">
-              <ref role="37wK5l" to="6exd:6HT7BWBOXr$" resolve="ground" />
-              <ref role="1Pybhc" to="6exd:6HT7BWBOXme" resolve="DataFormUtil" />
+              <ref role="37wK5l" to="cof4:6HT7BWBOXr$" resolve="ground" />
+              <ref role="1Pybhc" to="cof4:6HT7BWBOXme" resolve="DataFormUtil" />
               <node concept="37vLTw" id="6HT7BWBPrJR" role="37wK5m">
                 <ref role="3cqZAo" node="dfChU1DQLB" resolve="b" />
               </node>
@@ -3612,14 +3612,14 @@
             <node concept="3cpWsn" id="6MYr6Jy87gQ" role="3cpWs9">
               <property role="TrG5h" value="val" />
               <node concept="3uibUv" id="6MYr6Jy87k_" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:2xQ7eRAD2dj" resolve="Value" />
+                <ref role="3uigEE" to="cof4: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="6exd:2xQ7eRAD2dj" resolve="Value" />
+                  <ref role="3uigEE" to="cof4:2xQ7eRAD2dj" resolve="Value" />
                   <node concept="3uibUv" id="6MYr6Jy87oW" role="11_B2D">
                     <ref role="3uigEE" to="wyt6:~String" resolve="String" />
                   </node>
@@ -3637,11 +3637,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="6exd:5JQSuNswOXL" resolve="TermNode" />
+                <ref role="3uigEE" to="cof4:5JQSuNswOXL" resolve="TermNode" />
               </node>
               <node concept="10QFUN" id="6MYr6Jy86gm" role="33vP2m">
                 <node concept="3uibUv" id="6MYr6Jy86hI" role="10QFUM">
-                  <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="TermNode" />
+                  <ref role="3uigEE" to="cof4:5JQSuNswOXL" resolve="TermNode" />
                 </node>
                 <node concept="1oi1Uc" id="6MYr6Jy86gg" role="10QFUP">
                   <node concept="1oi5UN" id="6MYr6Jy86gh" role="1oi0x0">
@@ -3667,11 +3667,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="6exd:5JQSuNswOXL" resolve="TermNode" />
+                <ref role="3uigEE" to="cof4:5JQSuNswOXL" resolve="TermNode" />
               </node>
               <node concept="10QFUN" id="6MYr6Jy86js" role="33vP2m">
                 <node concept="3uibUv" id="6MYr6Jy86jj" role="10QFUM">
-                  <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="TermNode" />
+                  <ref role="3uigEE" to="cof4:5JQSuNswOXL" resolve="TermNode" />
                 </node>
                 <node concept="1oi1Uc" id="6MYr6Jy86jk" role="10QFUP">
                   <node concept="1oi5UN" id="6MYr6Jy86jl" role="1oi0x0">
@@ -3702,8 +3702,8 @@
               <ref role="3cqZAo" node="2S_ORi38Qgq" resolve="a" />
             </node>
             <node concept="2YIFZM" id="6HT7BWBPrKd" role="3tpDZA">
-              <ref role="37wK5l" to="6exd:6HT7BWBOXr$" resolve="ground" />
-              <ref role="1Pybhc" to="6exd:6HT7BWBOXme" resolve="DataFormUtil" />
+              <ref role="37wK5l" to="cof4:6HT7BWBOXr$" resolve="ground" />
+              <ref role="1Pybhc" to="cof4:6HT7BWBOXme" resolve="DataFormUtil" />
               <node concept="37vLTw" id="6HT7BWBPrKe" role="37wK5m">
                 <ref role="3cqZAo" node="2S_ORi38Qg$" resolve="b" />
               </node>
@@ -3727,7 +3727,7 @@
             <node concept="3cpWsn" id="1mP5b6jPriH" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="1mP5b6jPriF" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="1mP5b6jPriI" role="33vP2m">
                 <node concept="1oi5UN" id="1mP5b6jPriJ" role="1oi0x0" />
@@ -3739,7 +3739,7 @@
             <node concept="3cpWsn" id="1mP5b6jPrpZ" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="1mP5b6jPrq0" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="1mP5b6jPrq1" role="33vP2m">
                 <node concept="1oi5UN" id="1mP5b6jPrq2" role="1oi0x0" />
@@ -3767,7 +3767,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="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="1mP5b6jQ$dN" role="33vP2m">
                 <node concept="1oi5UN" id="1mP5b6jQ$dO" role="1oi0x0">
@@ -3786,7 +3786,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="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="1mP5b6jQ$dU" role="33vP2m">
                 <node concept="1oi5UN" id="1mP5b6jQ$dV" role="1oi0x0">
@@ -3862,7 +3862,7 @@
             <node concept="3cpWsn" id="kTK1BfwUiK" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="kTK1BfwUiL" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="kTK1BfwUiM" role="33vP2m">
                 <node concept="1oi5UN" id="kTK1BfwUiN" role="1oi0x0">
@@ -3885,7 +3885,7 @@
             <node concept="3cpWsn" id="kTK1BfwUiS" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="kTK1BfwUiT" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="kTK1BfwUiU" role="33vP2m">
                 <node concept="1oi5UN" id="kTK1BfwUiV" role="1oi0x0">
@@ -3938,7 +3938,7 @@
             <node concept="3cpWsn" id="1mP5b6jQNlb" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="1mP5b6jQNlc" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="1mP5b6jQNld" role="33vP2m">
                 <node concept="1oi5UN" id="1mP5b6jQNle" role="1oi0x0">
@@ -3962,7 +3962,7 @@
             <node concept="3cpWsn" id="1mP5b6jQNli" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="1mP5b6jQNlj" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="1mP5b6jQNlk" role="33vP2m">
                 <node concept="1oi5UN" id="1mP5b6jQNll" role="1oi0x0">
@@ -4002,7 +4002,7 @@
             <node concept="3cpWsn" id="1mP5b6jQND6" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="1mP5b6jQND7" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="1mP5b6jQND8" role="33vP2m">
                 <node concept="1oi5UN" id="1mP5b6jQND9" role="1oi0x0">
@@ -4036,7 +4036,7 @@
             <node concept="3cpWsn" id="1mP5b6jQNDj" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="1mP5b6jQNDk" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="1mP5b6jQNDl" role="33vP2m">
                 <node concept="1oi5UN" id="1mP5b6jQNDm" role="1oi0x0">
@@ -4086,7 +4086,7 @@
             <node concept="3cpWsn" id="1OShD0HUxWm" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="1OShD0HUxWn" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0HUxWo" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0HUxWp" role="1oi0x0">
@@ -4120,7 +4120,7 @@
             <node concept="3cpWsn" id="1OShD0HUxWz" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="1OShD0HUxW$" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0HUxW_" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0HUxWA" role="1oi0x0">
@@ -4170,7 +4170,7 @@
             <node concept="3cpWsn" id="1mP5b6jQOBl" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="1mP5b6jQOBm" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="1mP5b6jQOBn" role="33vP2m">
                 <node concept="1oi5UN" id="1mP5b6jQOBo" role="1oi0x0">
@@ -4187,7 +4187,7 @@
             <node concept="3cpWsn" id="1mP5b6jQOBB" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="1mP5b6jQOBC" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="1mP5b6jQOBD" role="33vP2m">
                 <node concept="1oi5UN" id="1mP5b6jQOBE" role="1oi0x0">
@@ -4220,7 +4220,7 @@
             <node concept="3cpWsn" id="1OShD0HUzFH" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="1OShD0HUzFI" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0HUzFJ" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0HUzFK" role="1oi0x0">
@@ -4237,7 +4237,7 @@
             <node concept="3cpWsn" id="1OShD0HUzFO" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="1OShD0HUzFP" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0HUzFQ" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0HUzFR" role="1oi0x0">
@@ -4277,7 +4277,7 @@
                 <node concept="3cpWsn" id="5wYq9r5qRUE" role="3cpWs9">
                   <property role="TrG5h" value="term" />
                   <node concept="3uibUv" id="5wYq9r5qRUF" role="1tU5fm">
-                    <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                    <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                   </node>
                   <node concept="1oi1Uc" id="5wYq9r5qRUG" role="33vP2m">
                     <node concept="1oi5UN" id="5wYq9r5qRUH" role="1oi0x0">
@@ -4302,8 +4302,8 @@
                   <property role="Xl_RC" value="('ClassifierType' 'Object')" />
                 </node>
                 <node concept="2YIFZM" id="19fWAfxPNU1" role="3tpDZA">
-                  <ref role="37wK5l" to="6exd:1G9MbtSGvMe" resolve="print" />
-                  <ref role="1Pybhc" to="6exd:1G9MbtSGvLs" resolve="DataFormPrinter" />
+                  <ref role="37wK5l" to="cof4:1G9MbtSGvMe" resolve="print" />
+                  <ref role="1Pybhc" to="cof4:1G9MbtSGvLs" resolve="DataFormPrinter" />
                   <node concept="37vLTw" id="19fWAfxPNU2" role="37wK5m">
                     <ref role="3cqZAo" node="5wYq9r5qRUE" resolve="term" />
                   </node>
@@ -4317,8 +4317,8 @@
                     <property role="Xl_RC" value="(concept='ClassifierType' classifier='Object')" />
                   </node>
                   <node concept="2YIFZM" id="5wYq9r5vLy2" role="3tpDZA">
-                    <ref role="37wK5l" to="6exd:1G9MbtSGvMe" resolve="print" />
-                    <ref role="1Pybhc" to="6exd:1G9MbtSGvLs" resolve="DataFormPrinter" />
+                    <ref role="37wK5l" to="cof4:1G9MbtSGvMe" resolve="print" />
+                    <ref role="1Pybhc" to="cof4:1G9MbtSGvLs" resolve="DataFormPrinter" />
                     <node concept="37vLTw" id="5wYq9r5vLy3" role="37wK5m">
                       <ref role="3cqZAo" node="5wYq9r5qRUE" resolve="term" />
                     </node>
@@ -4334,7 +4334,7 @@
                 <node concept="3cpWsn" id="5wYq9r5vL_C" role="3cpWs9">
                   <property role="TrG5h" value="term" />
                   <node concept="3uibUv" id="5wYq9r5vL_D" role="1tU5fm">
-                    <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                    <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                   </node>
                   <node concept="1oi1Uc" id="5wYq9r5vL_E" role="33vP2m">
                     <node concept="1oi5UN" id="5wYq9r5vL_F" role="1oi0x0">
@@ -4370,8 +4370,8 @@
                   <property role="Xl_RC" value="('ClassifierType' 'List' ('Type'))" />
                 </node>
                 <node concept="2YIFZM" id="19fWAfxPV_M" role="3tpDZA">
-                  <ref role="37wK5l" to="6exd:1G9MbtSGvMe" resolve="print" />
-                  <ref role="1Pybhc" to="6exd:1G9MbtSGvLs" resolve="DataFormPrinter" />
+                  <ref role="37wK5l" to="cof4:1G9MbtSGvMe" resolve="print" />
+                  <ref role="1Pybhc" to="cof4:1G9MbtSGvLs" resolve="DataFormPrinter" />
                   <node concept="37vLTw" id="19fWAfxPV_N" role="37wK5m">
                     <ref role="3cqZAo" node="5wYq9r5vL_C" resolve="term" />
                   </node>
@@ -4385,8 +4385,8 @@
                     <property role="Xl_RC" value="(concept='ClassifierType' classifier='List' parameter:(concept='Type'))" />
                   </node>
                   <node concept="2YIFZM" id="5wYq9r5vL__" role="3tpDZA">
-                    <ref role="37wK5l" to="6exd:1G9MbtSGvMe" resolve="print" />
-                    <ref role="1Pybhc" to="6exd:1G9MbtSGvLs" resolve="DataFormPrinter" />
+                    <ref role="37wK5l" to="cof4:1G9MbtSGvMe" resolve="print" />
+                    <ref role="1Pybhc" to="cof4:1G9MbtSGvLs" resolve="DataFormPrinter" />
                     <node concept="37vLTw" id="5wYq9r5$jRU" role="37wK5m">
                       <ref role="3cqZAo" node="5wYq9r5vL_C" resolve="term" />
                     </node>
@@ -4402,7 +4402,7 @@
                 <node concept="3cpWsn" id="5wYq9r5$dPL" role="3cpWs9">
                   <property role="TrG5h" value="term" />
                   <node concept="3uibUv" id="5wYq9r5$dPM" role="1tU5fm">
-                    <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                    <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                   </node>
                   <node concept="1oi1Uc" id="5wYq9r5$dPN" role="33vP2m">
                     <node concept="1oi5UN" id="5wYq9r5$dPO" role="1oi0x0">
@@ -4448,8 +4448,8 @@
                   <property role="Xl_RC" value="('ClassifierType' 'Pair' [('Type1'), ('Type2')])" />
                 </node>
                 <node concept="2YIFZM" id="19fWAfxQ3c9" role="3tpDZA">
-                  <ref role="37wK5l" to="6exd:1G9MbtSGvMe" resolve="print" />
-                  <ref role="1Pybhc" to="6exd:1G9MbtSGvLs" resolve="DataFormPrinter" />
+                  <ref role="37wK5l" to="cof4:1G9MbtSGvMe" resolve="print" />
+                  <ref role="1Pybhc" to="cof4:1G9MbtSGvLs" resolve="DataFormPrinter" />
                   <node concept="37vLTw" id="19fWAfxQ3ca" role="37wK5m">
                     <ref role="3cqZAo" node="5wYq9r5$dPL" resolve="term" />
                   </node>
@@ -4463,8 +4463,8 @@
                     <property role="Xl_RC" value="(concept='ClassifierType' classifier='Pair' parameters:[(concept='Type1'), (concept='Type2')])" />
                   </node>
                   <node concept="2YIFZM" id="5wYq9r5$dPI" role="3tpDZA">
-                    <ref role="37wK5l" to="6exd:1G9MbtSGvMe" resolve="print" />
-                    <ref role="1Pybhc" to="6exd:1G9MbtSGvLs" resolve="DataFormPrinter" />
+                    <ref role="37wK5l" to="cof4:1G9MbtSGvMe" resolve="print" />
+                    <ref role="1Pybhc" to="cof4:1G9MbtSGvLs" resolve="DataFormPrinter" />
                     <node concept="37vLTw" id="5wYq9r5$jTm" role="37wK5m">
                       <ref role="3cqZAo" node="5wYq9r5$dPL" resolve="term" />
                     </node>
@@ -4486,11 +4486,11 @@
                 <node concept="3cpWsn" id="1RYTbd6El3Z" role="3cpWs9">
                   <property role="TrG5h" value="typeterm" />
                   <node concept="3uibUv" id="1RYTbd6El40" role="1tU5fm">
-                    <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                    <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                   </node>
                   <node concept="2YIFZM" id="1RYTbd6Emj_" role="33vP2m">
-                    <ref role="37wK5l" to="jpi6:1RYTbd6Ek9q" resolve="createClosedTerm" />
-                    <ref role="1Pybhc" to="jpi6:1RYTbd6oE5l" resolve="TermUtil" />
+                    <ref role="37wK5l" to="hh42:1RYTbd6Ek9q" resolve="createClosedTerm" />
+                    <ref role="1Pybhc" to="hh42:1RYTbd6oE5l" resolve="TermUtil" />
                     <node concept="Xl_RD" id="1RYTbd6Emly" role="37wK5m">
                       <property role="Xl_RC" value="boolean" />
                     </node>
@@ -4502,8 +4502,8 @@
                   <property role="Xl_RC" value="boolean()" />
                 </node>
                 <node concept="2YIFZM" id="5wYq9r5_SGR" role="3tpDZA">
-                  <ref role="37wK5l" to="6exd:1G9MbtSGvMe" resolve="print" />
-                  <ref role="1Pybhc" to="6exd:1G9MbtSGvLs" resolve="DataFormPrinter" />
+                  <ref role="37wK5l" to="cof4:1G9MbtSGvMe" resolve="print" />
+                  <ref role="1Pybhc" to="cof4:1G9MbtSGvLs" resolve="DataFormPrinter" />
                   <node concept="37vLTw" id="1RYTbd6Emsx" role="37wK5m">
                     <ref role="3cqZAo" node="1RYTbd6El3Z" resolve="typeterm" />
                   </node>
@@ -4518,11 +4518,11 @@
                 <node concept="3cpWsn" id="1RYTbd6EmtI" role="3cpWs9">
                   <property role="TrG5h" value="typeterm" />
                   <node concept="3uibUv" id="1RYTbd6EmtJ" role="1tU5fm">
-                    <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                    <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                   </node>
                   <node concept="2YIFZM" id="1RYTbd6Em$W" role="33vP2m">
-                    <ref role="37wK5l" to="jpi6:1RYTbd6Ek9q" resolve="createClosedTerm" />
-                    <ref role="1Pybhc" to="jpi6:1RYTbd6oE5l" resolve="TermUtil" />
+                    <ref role="37wK5l" to="hh42:1RYTbd6Ek9q" resolve="createClosedTerm" />
+                    <ref role="1Pybhc" to="hh42:1RYTbd6oE5l" resolve="TermUtil" />
                     <node concept="Xl_RD" id="1RYTbd6Em_D" role="37wK5m">
                       <property role="Xl_RC" value="classifier" />
                     </node>
@@ -4542,8 +4542,8 @@
                   <property role="Xl_RC" value="classifier('Object')" />
                 </node>
                 <node concept="2YIFZM" id="19fWAfxQdrq" role="3tpDZA">
-                  <ref role="37wK5l" to="6exd:1G9MbtSGvMe" resolve="print" />
-                  <ref role="1Pybhc" to="6exd:1G9MbtSGvLs" resolve="DataFormPrinter" />
+                  <ref role="37wK5l" to="cof4:1G9MbtSGvMe" resolve="print" />
+                  <ref role="1Pybhc" to="cof4:1G9MbtSGvLs" resolve="DataFormPrinter" />
                   <node concept="37vLTw" id="19fWAfxQdrr" role="37wK5m">
                     <ref role="3cqZAo" node="1RYTbd6EmtI" resolve="typeterm" />
                   </node>
@@ -4557,8 +4557,8 @@
                     <property role="Xl_RC" value="classifier(classifier='Object')" />
                   </node>
                   <node concept="2YIFZM" id="5wYq9r5Av4P" role="3tpDZA">
-                    <ref role="37wK5l" to="6exd:1G9MbtSGvMe" resolve="print" />
-                    <ref role="1Pybhc" to="6exd:1G9MbtSGvLs" resolve="DataFormPrinter" />
+                    <ref role="37wK5l" to="cof4:1G9MbtSGvMe" resolve="print" />
+                    <ref role="1Pybhc" to="cof4:1G9MbtSGvLs" resolve="DataFormPrinter" />
                     <node concept="37vLTw" id="1RYTbd6EmSg" role="37wK5m">
                       <ref role="3cqZAo" node="1RYTbd6EmtI" resolve="typeterm" />
                     </node>
@@ -4574,11 +4574,11 @@
                 <node concept="3cpWsn" id="1RYTbd6EmTt" role="3cpWs9">
                   <property role="TrG5h" value="typeterm" />
                   <node concept="3uibUv" id="1RYTbd6EmTu" role="1tU5fm">
-                    <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                    <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                   </node>
                   <node concept="2YIFZM" id="1RYTbd6En0a" role="33vP2m">
-                    <ref role="1Pybhc" to="jpi6:1RYTbd6oE5l" resolve="TermUtil" />
-                    <ref role="37wK5l" to="jpi6:1RYTbd6Ek9q" resolve="createClosedTerm" />
+                    <ref role="1Pybhc" to="hh42:1RYTbd6oE5l" resolve="TermUtil" />
+                    <ref role="37wK5l" to="hh42:1RYTbd6Ek9q" resolve="createClosedTerm" />
                     <node concept="Xl_RD" id="1RYTbd6En0b" role="37wK5m">
                       <property role="Xl_RC" value="classifier" />
                     </node>
@@ -4597,8 +4597,8 @@
                           <node concept="1oi5UN" id="1RYTbd6Hg84" role="KCVpo">
                             <node concept="22Ky0T" id="1RYTbd6Hg9p" role="lGtFl">
                               <node concept="2YIFZM" id="1RYTbd6Hg9r" role="22Ky0K">
-                                <ref role="37wK5l" to="jpi6:1RYTbd6Ek9q" resolve="createClosedTerm" />
-                                <ref role="1Pybhc" to="jpi6:1RYTbd6oE5l" resolve="TermUtil" />
+                                <ref role="37wK5l" to="hh42:1RYTbd6Ek9q" resolve="createClosedTerm" />
+                                <ref role="1Pybhc" to="hh42:1RYTbd6oE5l" resolve="TermUtil" />
                                 <node concept="Xl_RD" id="1RYTbd6Hg9s" role="37wK5m">
                                   <property role="Xl_RC" value="classifier" />
                                 </node>
@@ -4624,8 +4624,8 @@
                   <property role="Xl_RC" value="classifier('List' [classifier('String')])" />
                 </node>
                 <node concept="2YIFZM" id="19fWAfxQwhB" role="3tpDZA">
-                  <ref role="37wK5l" to="6exd:1G9MbtSGvMe" resolve="print" />
-                  <ref role="1Pybhc" to="6exd:1G9MbtSGvLs" resolve="DataFormPrinter" />
+                  <ref role="37wK5l" to="cof4:1G9MbtSGvMe" resolve="print" />
+                  <ref role="1Pybhc" to="cof4:1G9MbtSGvLs" resolve="DataFormPrinter" />
                   <node concept="37vLTw" id="19fWAfxQwhC" role="37wK5m">
                     <ref role="3cqZAo" node="1RYTbd6EmTt" resolve="typeterm" />
                   </node>
@@ -4639,8 +4639,8 @@
                     <property role="Xl_RC" value="classifier(classifier='List' parameters:[classifier(classifier='String')])" />
                   </node>
                   <node concept="2YIFZM" id="5wYq9r5Azwo" role="3tpDZA">
-                    <ref role="37wK5l" to="6exd:1G9MbtSGvMe" resolve="print" />
-                    <ref role="1Pybhc" to="6exd:1G9MbtSGvLs" resolve="DataFormPrinter" />
+                    <ref role="37wK5l" to="cof4:1G9MbtSGvMe" resolve="print" />
+                    <ref role="1Pybhc" to="cof4:1G9MbtSGvLs" resolve="DataFormPrinter" />
                     <node concept="37vLTw" id="1RYTbd6Enl9" role="37wK5m">
                       <ref role="3cqZAo" node="1RYTbd6EmTt" resolve="typeterm" />
                     </node>
@@ -4662,14 +4662,14 @@
                 <node concept="3cpWsn" id="1RYTbd6Eumc" role="3cpWs9">
                   <property role="TrG5h" value="typeterm" />
                   <node concept="3uibUv" id="1RYTbd6Eumd" role="1tU5fm">
-                    <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                    <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                   </node>
                   <node concept="2YIFZM" id="1RYTbd6EutK" role="33vP2m">
-                    <ref role="37wK5l" to="jpi6:1RYTbd6E3Mh" resolve="createSpecTerm" />
-                    <ref role="1Pybhc" to="jpi6:1RYTbd6oE5l" resolve="TermUtil" />
+                    <ref role="37wK5l" to="hh42:1RYTbd6E3Mh" resolve="createSpecTerm" />
+                    <ref role="1Pybhc" to="hh42:1RYTbd6oE5l" resolve="TermUtil" />
                     <node concept="2YIFZM" id="1RYTbd6Eu$1" role="37wK5m">
-                      <ref role="37wK5l" to="jpi6:1RYTbd6Ek9q" resolve="createClosedTerm" />
-                      <ref role="1Pybhc" to="jpi6:1RYTbd6oE5l" resolve="TermUtil" />
+                      <ref role="37wK5l" to="hh42:1RYTbd6Ek9q" resolve="createClosedTerm" />
+                      <ref role="1Pybhc" to="hh42:1RYTbd6oE5l" resolve="TermUtil" />
                       <node concept="Xl_RD" id="1RYTbd6EuDl" role="37wK5m">
                         <property role="Xl_RC" value="boolean" />
                       </node>
@@ -4685,8 +4685,8 @@
                   <property role="Xl_RC" value="boolean()" />
                 </node>
                 <node concept="2YIFZM" id="6Dg__VJ4oUo" role="3tpDZA">
-                  <ref role="37wK5l" to="6exd:1G9MbtSGvMe" resolve="print" />
-                  <ref role="1Pybhc" to="6exd:1G9MbtSGvLs" resolve="DataFormPrinter" />
+                  <ref role="37wK5l" to="cof4:1G9MbtSGvMe" resolve="print" />
+                  <ref role="1Pybhc" to="cof4:1G9MbtSGvLs" resolve="DataFormPrinter" />
                   <node concept="37vLTw" id="1RYTbd6EuK1" role="37wK5m">
                     <ref role="3cqZAo" node="1RYTbd6Eumc" resolve="typeterm" />
                   </node>
@@ -4701,14 +4701,14 @@
                 <node concept="3cpWsn" id="1RYTbd6EuLe" role="3cpWs9">
                   <property role="TrG5h" value="typeterm" />
                   <node concept="3uibUv" id="1RYTbd6EuLf" role="1tU5fm">
-                    <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                    <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                   </node>
                   <node concept="2YIFZM" id="1RYTbd6EuVV" role="33vP2m">
-                    <ref role="37wK5l" to="jpi6:1RYTbd6E3Mh" resolve="createSpecTerm" />
-                    <ref role="1Pybhc" to="jpi6:1RYTbd6oE5l" resolve="TermUtil" />
+                    <ref role="37wK5l" to="hh42:1RYTbd6E3Mh" resolve="createSpecTerm" />
+                    <ref role="1Pybhc" to="hh42:1RYTbd6oE5l" resolve="TermUtil" />
                     <node concept="2YIFZM" id="1RYTbd6Ev2T" role="37wK5m">
-                      <ref role="37wK5l" to="jpi6:1RYTbd6Ek9q" resolve="createClosedTerm" />
-                      <ref role="1Pybhc" to="jpi6:1RYTbd6oE5l" resolve="TermUtil" />
+                      <ref role="37wK5l" to="hh42:1RYTbd6Ek9q" resolve="createClosedTerm" />
+                      <ref role="1Pybhc" to="hh42:1RYTbd6oE5l" resolve="TermUtil" />
                       <node concept="Xl_RD" id="1RYTbd6Ev4l" role="37wK5m">
                         <property role="Xl_RC" value="classifier" />
                       </node>
@@ -4738,8 +4738,8 @@
                   <property role="Xl_RC" value="classifier('Object' [])" />
                 </node>
                 <node concept="2YIFZM" id="19fWAfxQC2Q" role="3tpDZA">
-                  <ref role="37wK5l" to="6exd:1G9MbtSGvMe" resolve="print" />
-                  <ref role="1Pybhc" to="6exd:1G9MbtSGvLs" resolve="DataFormPrinter" />
+                  <ref role="37wK5l" to="cof4:1G9MbtSGvMe" resolve="print" />
+                  <ref role="1Pybhc" to="cof4:1G9MbtSGvLs" resolve="DataFormPrinter" />
                   <node concept="37vLTw" id="19fWAfxQC2R" role="37wK5m">
                     <ref role="3cqZAo" node="1RYTbd6EuLe" resolve="typeterm" />
                   </node>
@@ -4753,8 +4753,8 @@
                     <property role="Xl_RC" value="classifier(classifier='Object')" />
                   </node>
                   <node concept="2YIFZM" id="6Dg__VJ9y15" role="3tpDZA">
-                    <ref role="37wK5l" to="6exd:1G9MbtSGvMe" resolve="print" />
-                    <ref role="1Pybhc" to="6exd:1G9MbtSGvLs" resolve="DataFormPrinter" />
+                    <ref role="37wK5l" to="cof4:1G9MbtSGvMe" resolve="print" />
+                    <ref role="1Pybhc" to="cof4:1G9MbtSGvLs" resolve="DataFormPrinter" />
                     <node concept="37vLTw" id="1RYTbd6EvBn" role="37wK5m">
                       <ref role="3cqZAo" node="1RYTbd6EuLe" resolve="typeterm" />
                     </node>
@@ -4770,17 +4770,17 @@
                 <node concept="3cpWsn" id="1RYTbd6EL09" role="3cpWs9">
                   <property role="TrG5h" value="typeTerm" />
                   <node concept="3uibUv" id="1RYTbd6EL0a" role="1tU5fm">
-                    <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                    <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                   </node>
                   <node concept="2YIFZM" id="1RYTbd6ELhI" role="33vP2m">
-                    <ref role="37wK5l" to="jpi6:1RYTbd6E3Mh" resolve="createSpecTerm" />
-                    <ref role="1Pybhc" to="jpi6:1RYTbd6oE5l" resolve="TermUtil" />
+                    <ref role="37wK5l" to="hh42:1RYTbd6E3Mh" resolve="createSpecTerm" />
+                    <ref role="1Pybhc" to="hh42:1RYTbd6oE5l" resolve="TermUtil" />
                     <node concept="2YIFZM" id="1RYTbd6ELuo" role="37wK5m">
-                      <ref role="1Pybhc" to="jpi6:1RYTbd6oE5l" resolve="TermUtil" />
-                      <ref role="37wK5l" to="jpi6:1RYTbd6E3Mh" resolve="createSpecTerm" />
+                      <ref role="1Pybhc" to="hh42:1RYTbd6oE5l" resolve="TermUtil" />
+                      <ref role="37wK5l" to="hh42:1RYTbd6E3Mh" resolve="createSpecTerm" />
                       <node concept="2YIFZM" id="1RYTbd6ELw2" role="37wK5m">
-                        <ref role="37wK5l" to="jpi6:1RYTbd6Ek9q" resolve="createClosedTerm" />
-                        <ref role="1Pybhc" to="jpi6:1RYTbd6oE5l" resolve="TermUtil" />
+                        <ref role="37wK5l" to="hh42:1RYTbd6Ek9q" resolve="createClosedTerm" />
+                        <ref role="1Pybhc" to="hh42:1RYTbd6oE5l" resolve="TermUtil" />
                         <node concept="Xl_RD" id="1RYTbd6ELw3" role="37wK5m">
                           <property role="Xl_RC" value="list" />
                         </node>
@@ -4807,8 +4807,8 @@
                           <node concept="1oi5UN" id="1RYTbd6EMPB" role="KCVpo">
                             <node concept="22Ky0T" id="1RYTbd6EMRH" role="lGtFl">
                               <node concept="2YIFZM" id="1RYTbd6EMzF" role="22Ky0K">
-                                <ref role="37wK5l" to="jpi6:1RYTbd6Ek9q" resolve="createClosedTerm" />
-                                <ref role="1Pybhc" to="jpi6:1RYTbd6oE5l" resolve="TermUtil" />
+                                <ref role="37wK5l" to="hh42:1RYTbd6Ek9q" resolve="createClosedTerm" />
+                                <ref role="1Pybhc" to="hh42:1RYTbd6oE5l" resolve="TermUtil" />
                                 <node concept="Xl_RD" id="1RYTbd6EMzG" role="37wK5m">
                                   <property role="Xl_RC" value="classifier" />
                                 </node>
@@ -4835,8 +4835,8 @@
                   <property role="Xl_RC" value="list('List' [classifier('String')])" />
                 </node>
                 <node concept="2YIFZM" id="19fWAfxQJ$T" role="3tpDZA">
-                  <ref role="1Pybhc" to="6exd:1G9MbtSGvLs" resolve="DataFormPrinter" />
-                  <ref role="37wK5l" to="6exd:1G9MbtSGvMe" resolve="print" />
+                  <ref role="1Pybhc" to="cof4:1G9MbtSGvLs" resolve="DataFormPrinter" />
+                  <ref role="37wK5l" to="cof4:1G9MbtSGvMe" resolve="print" />
                   <node concept="37vLTw" id="19fWAfxQJ$U" role="37wK5m">
                     <ref role="3cqZAo" node="1RYTbd6EL09" resolve="typeTerm" />
                   </node>
@@ -4850,8 +4850,8 @@
                     <property role="Xl_RC" value="list(parameter:[classifier(classifier='String')] classifier='List')" />
                   </node>
                   <node concept="2YIFZM" id="6Dg__VJ4oUZ" role="3tpDZA">
-                    <ref role="1Pybhc" to="6exd:1G9MbtSGvLs" resolve="DataFormPrinter" />
-                    <ref role="37wK5l" to="6exd:1G9MbtSGvMe" resolve="print" />
+                    <ref role="1Pybhc" to="cof4:1G9MbtSGvLs" resolve="DataFormPrinter" />
+                    <ref role="37wK5l" to="cof4:1G9MbtSGvMe" resolve="print" />
                     <node concept="37vLTw" id="1RYTbd6ENfr" role="37wK5m">
                       <ref role="3cqZAo" node="1RYTbd6EL09" resolve="typeTerm" />
                     </node>
@@ -4875,7 +4875,7 @@
         <property role="TrG5h" value="T" />
       </node>
       <node concept="3uibUv" id="1LBj9wB47iy" role="EKbjA">
-        <ref role="3uigEE" to="6exd:104EUzFOARB" resolve="DataForm.Visitor" />
+        <ref role="3uigEE" to="cof4:104EUzFOARB" resolve="DataForm.Visitor" />
         <node concept="16syzq" id="1LBj9wB47AI" role="11_B2D">
           <ref role="16sUi3" node="1LBj9wB46ZN" resolve="T" />
         </node>
@@ -4885,7 +4885,7 @@
         <node concept="37vLTG" id="1LBj9wB47CJ" role="3clF46">
           <property role="TrG5h" value="node" />
           <node concept="3uibUv" id="1LBj9wB47CK" role="1tU5fm">
-            <ref role="3uigEE" to="6exd:1msb0mq9ID4" resolve="DataNode" />
+            <ref role="3uigEE" to="cof4:1msb0mq9ID4" resolve="DataNode" />
           </node>
         </node>
         <node concept="16syzq" id="1LBj9wB47CO" role="3clF45">
@@ -4919,7 +4919,7 @@
         <node concept="37vLTG" id="1LBj9wB47CV" role="3clF46">
           <property role="TrG5h" value="termNode" />
           <node concept="3uibUv" id="1LBj9wB47CW" role="1tU5fm">
-            <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="TermNode" />
+            <ref role="3uigEE" to="cof4:5JQSuNswOXL" resolve="TermNode" />
           </node>
         </node>
         <node concept="3clFbS" id="1LBj9wB47CY" role="3clF47">
@@ -4945,7 +4945,7 @@
         <node concept="37vLTG" id="1LBj9wB47D1" role="3clF46">
           <property role="TrG5h" value="roleNode" />
           <node concept="3uibUv" id="1LBj9wB47D2" role="1tU5fm">
-            <ref role="3uigEE" to="6exd:6YPNC4ODVle" resolve="RoleNode" />
+            <ref role="3uigEE" to="cof4:6YPNC4ODVle" resolve="RoleNode" />
           </node>
         </node>
         <node concept="16syzq" id="1LBj9wB47D6" role="3clF45">
@@ -4975,7 +4975,7 @@
         <node concept="37vLTG" id="1LBj9wB47Da" role="3clF46">
           <property role="TrG5h" value="childRole" />
           <node concept="3uibUv" id="1LBj9wB47Db" role="1tU5fm">
-            <ref role="3uigEE" to="6exd:6YPNC4NYnau" resolve="ChildRole" />
+            <ref role="3uigEE" to="cof4:6YPNC4NYnau" resolve="ChildRole" />
           </node>
         </node>
         <node concept="16syzq" id="1LBj9wB47Df" role="3clF45">
@@ -5005,7 +5005,7 @@
         <node concept="37vLTG" id="1LBj9wB47Dj" role="3clF46">
           <property role="TrG5h" value="listRole" />
           <node concept="3uibUv" id="1LBj9wB47Dk" role="1tU5fm">
-            <ref role="3uigEE" to="6exd:6YPNC4OECgm" resolve="ListRole" />
+            <ref role="3uigEE" to="cof4:6YPNC4OECgm" resolve="ListRole" />
           </node>
         </node>
         <node concept="16syzq" id="1LBj9wB47Do" role="3clF45">
@@ -5035,7 +5035,7 @@
         <node concept="37vLTG" id="1LBj9wB47Ds" role="3clF46">
           <property role="TrG5h" value="valueRole" />
           <node concept="3uibUv" id="1LBj9wB47Dt" role="1tU5fm">
-            <ref role="3uigEE" to="6exd:1msb0mq99GH" resolve="ValueRole" />
+            <ref role="3uigEE" to="cof4:1msb0mq99GH" resolve="ValueRole" />
             <node concept="16syzq" id="1LBj9wB47Du" role="11_B2D">
               <ref role="16sUi3" node="1LBj9wB47Dy" resolve="V" />
             </node>
@@ -5075,7 +5075,7 @@
         <node concept="37vLTG" id="1LBj9wB47DE" role="3clF46">
           <property role="TrG5h" value="list" />
           <node concept="3uibUv" id="1LBj9wB47DF" role="1tU5fm">
-            <ref role="3uigEE" to="6exd:3OPtF03lco4" resolve="ListNode" />
+            <ref role="3uigEE" to="cof4:3OPtF03lco4" resolve="ListNode" />
           </node>
         </node>
         <node concept="3clFbS" id="1LBj9wB47DH" role="3clF47">
@@ -5101,7 +5101,7 @@
         <node concept="37vLTG" id="1LBj9wB47DK" role="3clF46">
           <property role="TrG5h" value="value" />
           <node concept="3uibUv" id="1LBj9wB47DL" role="1tU5fm">
-            <ref role="3uigEE" to="6exd:2xQ7eRAD2dj" resolve="Value" />
+            <ref role="3uigEE" to="cof4:2xQ7eRAD2dj" resolve="Value" />
             <node concept="16syzq" id="1LBj9wB47DM" role="11_B2D">
               <ref role="16sUi3" node="1LBj9wB47DQ" resolve="V" />
             </node>
@@ -5137,7 +5137,7 @@
         <node concept="37vLTG" id="1LBj9wB47DV" role="3clF46">
           <property role="TrG5h" value="variable" />
           <node concept="3uibUv" id="1LBj9wB47DW" role="1tU5fm">
-            <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+            <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
           </node>
         </node>
         <node concept="16syzq" id="1LBj9wB47E0" role="3clF45">
@@ -5165,7 +5165,7 @@
       <node concept="3uibUv" id="1LBj9wB5JOQ" role="1zkMxy">
         <ref role="3uigEE" node="1LBj9wB4h8R" resolve="Mockonut.InteractionPlan" />
         <node concept="3uibUv" id="1LBj9wB5OFR" role="11_B2D">
-          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+          <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
         </node>
         <node concept="16syzq" id="1LBj9wB5Qb_" role="11_B2D">
           <ref role="16sUi3" node="1LBj9wB46ZN" resolve="T" />
@@ -5198,12 +5198,12 @@
       <node concept="2tJIrI" id="1LBj9wB41Ld" role="jymVt" />
       <node concept="3Tm1VV" id="1LBj9wB3W0g" role="1B3o_S" />
       <node concept="3uibUv" id="1LBj9wB3YEh" role="EKbjA">
-        <ref role="3uigEE" to="6exd:3JgCwkqiP3h" resolve="DataFormWalk.Walker" />
+        <ref role="3uigEE" to="cof4:3JgCwkqiP3h" resolve="DataFormWalk.Walker" />
       </node>
       <node concept="3uibUv" id="1LBj9wB4aEN" role="1zkMxy">
         <ref role="3uigEE" node="1LBj9wB46Fo" resolve="Mockery.MockVisitor" />
         <node concept="3uibUv" id="1LBj9wB4bei" role="11_B2D">
-          <ref role="3uigEE" to="6exd:2q_78a95hAL" resolve="Action" />
+          <ref role="3uigEE" to="cof4:2q_78a95hAL" resolve="Action" />
         </node>
       </node>
     </node>
@@ -6041,7 +6041,7 @@
       <property role="TrG5h" value="MockFreeVar" />
       <node concept="3Tm1VV" id="7lmP5gAk_9c" role="1B3o_S" />
       <node concept="3uibUv" id="7lmP5gAk_jl" role="1zkMxy">
-        <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+        <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
       </node>
       <node concept="3clFb_" id="7lmP5gAk_qn" role="jymVt">
         <property role="TrG5h" value="isWildcard" />
@@ -6136,21 +6136,21 @@
       <property role="TrG5h" value="MockNonfreeVar" />
       <node concept="3Tm1VV" id="7lmP5gAl85e" role="1B3o_S" />
       <node concept="3uibUv" id="7lmP5gAl85f" role="1zkMxy">
-        <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+        <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
       </node>
       <node concept="312cEg" id="7lmP5gAldyp" role="jymVt">
         <property role="TrG5h" value="term" />
         <property role="3TUv4t" value="true" />
         <node concept="3Tm6S6" id="7lmP5gAldyq" role="1B3o_S" />
         <node concept="3uibUv" id="7lmP5gAldys" role="1tU5fm">
-          <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="TermNode" />
+          <ref role="3uigEE" to="cof4:5JQSuNswOXL" resolve="TermNode" />
         </node>
       </node>
       <node concept="3clFbW" id="7lmP5gAlcAK" role="jymVt">
         <node concept="37vLTG" id="7lmP5gAld1Z" role="3clF46">
           <property role="TrG5h" value="term" />
           <node concept="3uibUv" id="7lmP5gAldpU" role="1tU5fm">
-            <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="TermNode" />
+            <ref role="3uigEE" to="cof4:5JQSuNswOXL" resolve="TermNode" />
           </node>
         </node>
         <node concept="3cqZAl" id="7lmP5gAlcAM" role="3clF45" />
@@ -6196,7 +6196,7 @@
                 <ref role="3cqZAo" node="7lmP5gAldyp" resolve="term" />
               </node>
               <node concept="liA8E" id="7lmP5gAllOn" role="2OqNvi">
-                <ref role="37wK5l" to="6exd:5BGv8yzwj1c" resolve="variablesCount" />
+                <ref role="37wK5l" to="cof4:5BGv8yzwj1c" resolve="variablesCount" />
               </node>
             </node>
           </node>
@@ -6272,13 +6272,13 @@
       <property role="TrG5h" value="MockMutableVar" />
       <node concept="3Tm1VV" id="7lmP5gAlF1y" role="1B3o_S" />
       <node concept="3uibUv" id="7lmP5gAlF1z" role="1zkMxy">
-        <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+        <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
       </node>
       <node concept="312cEg" id="7lmP5gAlF1$" role="jymVt">
         <property role="TrG5h" value="term" />
         <node concept="3Tm6S6" id="7lmP5gAlF1_" role="1B3o_S" />
         <node concept="3uibUv" id="7lmP5gAlF1A" role="1tU5fm">
-          <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="TermNode" />
+          <ref role="3uigEE" to="cof4:5JQSuNswOXL" resolve="TermNode" />
         </node>
         <node concept="10Nm6u" id="7lmP5gAlIKi" role="33vP2m" />
       </node>
@@ -6294,7 +6294,7 @@
         <node concept="37vLTG" id="7lmP5gAlLVm" role="3clF46">
           <property role="TrG5h" value="term" />
           <node concept="3uibUv" id="7lmP5gAlMq5" role="1tU5fm">
-            <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="TermNode" />
+            <ref role="3uigEE" to="cof4:5JQSuNswOXL" resolve="TermNode" />
           </node>
         </node>
         <node concept="3cqZAl" id="7lmP5gAlKX9" role="3clF45" />
@@ -6349,7 +6349,7 @@
                   <ref role="3cqZAo" node="7lmP5gAlF1$" resolve="term" />
                 </node>
                 <node concept="liA8E" id="7lmP5gAlUB9" role="2OqNvi">
-                  <ref role="37wK5l" to="6exd:5BGv8yzwj1c" resolve="variablesCount" />
+                  <ref role="37wK5l" to="cof4:5BGv8yzwj1c" resolve="variablesCount" />
                 </node>
               </node>
             </node>
@@ -6450,7 +6450,7 @@
             <node concept="3cpWsn" id="7lmP5gAiRRJ" role="3cpWs9">
               <property role="TrG5h" value="term" />
               <node concept="3uibUv" id="7lmP5gAiRRK" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="7lmP5gAiRRL" role="33vP2m">
                 <node concept="1oi5UN" id="7lmP5gAiRRM" role="1oi0x0">
@@ -6473,8 +6473,8 @@
           <node concept="3vwNmj" id="7lmP5gAiUBK" role="3cqZAp">
             <node concept="2OqwBi" id="7lmP5gAiVnr" role="3vwVQn">
               <node concept="2YIFZM" id="7lmP5gAiUEC" role="2Oq$k0">
-                <ref role="37wK5l" to="6exd:7lmP5gAhuVX" resolve="freeVariables" />
-                <ref role="1Pybhc" to="6exd:7lmP5gAhjKr" resolve="FreeVariablesFinder" />
+                <ref role="37wK5l" to="cof4:7lmP5gAhuVX" resolve="freeVariables" />
+                <ref role="1Pybhc" to="cof4:7lmP5gAhjKr" resolve="FreeVariablesFinder" />
                 <node concept="37vLTw" id="7lmP5gAiUGu" role="37wK5m">
                   <ref role="3cqZAo" node="7lmP5gAiRRJ" resolve="term" />
                 </node>
@@ -6496,7 +6496,7 @@
                       <ref role="3cqZAo" node="7lmP5gAiRRJ" resolve="term" />
                     </node>
                     <node concept="3uibUv" id="7lmP5gAlte9" role="10QFUM">
-                      <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="TermNode" />
+                      <ref role="3uigEE" to="cof4:5JQSuNswOXL" resolve="TermNode" />
                     </node>
                   </node>
                 </node>
@@ -6506,8 +6506,8 @@
           <node concept="3vwNmj" id="7lmP5gAlsZB" role="3cqZAp">
             <node concept="2OqwBi" id="7lmP5gAlsZC" role="3vwVQn">
               <node concept="2YIFZM" id="7lmP5gAlsZD" role="2Oq$k0">
-                <ref role="1Pybhc" to="6exd:7lmP5gAhjKr" resolve="FreeVariablesFinder" />
-                <ref role="37wK5l" to="6exd:7lmP5gAhuVX" resolve="freeVariables" />
+                <ref role="1Pybhc" to="cof4:7lmP5gAhjKr" resolve="FreeVariablesFinder" />
+                <ref role="37wK5l" to="cof4:7lmP5gAhuVX" resolve="freeVariables" />
                 <node concept="37vLTw" id="7lmP5gAlt3J" role="37wK5m">
                   <ref role="3cqZAo" node="7lmP5gAlsCW" resolve="nfv" />
                 </node>
@@ -6541,8 +6541,8 @@
             </node>
             <node concept="2OqwBi" id="7lmP5gAl1oI" role="3tpDZA">
               <node concept="2YIFZM" id="7lmP5gAl0GJ" role="2Oq$k0">
-                <ref role="1Pybhc" to="6exd:7lmP5gAhjKr" resolve="FreeVariablesFinder" />
-                <ref role="37wK5l" to="6exd:7lmP5gAhuVX" resolve="freeVariables" />
+                <ref role="1Pybhc" to="cof4:7lmP5gAhjKr" resolve="FreeVariablesFinder" />
+                <ref role="37wK5l" to="cof4:7lmP5gAhuVX" resolve="freeVariables" />
                 <node concept="37vLTw" id="7lmP5gAl0GK" role="37wK5m">
                   <ref role="3cqZAo" node="7lmP5gAkTLa" resolve="fv" />
                 </node>
@@ -6554,7 +6554,7 @@
             <node concept="3cpWsn" id="7lmP5gAlzD8" role="3cpWs9">
               <property role="TrG5h" value="term" />
               <node concept="3uibUv" id="7lmP5gAlzD9" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="7lmP5gAlzDa" role="33vP2m">
                 <node concept="1oi5UN" id="7lmP5gAlzDb" role="1oi0x0">
@@ -6590,8 +6590,8 @@
             </node>
             <node concept="2OqwBi" id="7lmP5gAl$m3" role="3tpDZA">
               <node concept="2YIFZM" id="7lmP5gAl$m4" role="2Oq$k0">
-                <ref role="1Pybhc" to="6exd:7lmP5gAhjKr" resolve="FreeVariablesFinder" />
-                <ref role="37wK5l" to="6exd:7lmP5gAhuVX" resolve="freeVariables" />
+                <ref role="1Pybhc" to="cof4:7lmP5gAhjKr" resolve="FreeVariablesFinder" />
+                <ref role="37wK5l" to="cof4:7lmP5gAhuVX" resolve="freeVariables" />
                 <node concept="37vLTw" id="7lmP5gAl$$F" role="37wK5m">
                   <ref role="3cqZAo" node="7lmP5gAlzD8" resolve="term" />
                 </node>
@@ -6625,8 +6625,8 @@
             </node>
             <node concept="2OqwBi" id="7lmP5gAm78v" role="3tpDZA">
               <node concept="2YIFZM" id="7lmP5gAm78w" role="2Oq$k0">
-                <ref role="1Pybhc" to="6exd:7lmP5gAhjKr" resolve="FreeVariablesFinder" />
-                <ref role="37wK5l" to="6exd:7lmP5gAhuVX" resolve="freeVariables" />
+                <ref role="1Pybhc" to="cof4:7lmP5gAhjKr" resolve="FreeVariablesFinder" />
+                <ref role="37wK5l" to="cof4:7lmP5gAhuVX" resolve="freeVariables" />
                 <node concept="37vLTw" id="7lmP5gAm7ee" role="37wK5m">
                   <ref role="3cqZAo" node="7lmP5gAm6LZ" resolve="mv" />
                 </node>
@@ -6638,7 +6638,7 @@
             <node concept="3cpWsn" id="7lmP5gAm5D8" role="3cpWs9">
               <property role="TrG5h" value="term" />
               <node concept="3uibUv" id="7lmP5gAm5D9" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="7lmP5gAm5Da" role="33vP2m">
                 <node concept="1oi5UN" id="7lmP5gAm5Db" role="1oi0x0">
@@ -6674,8 +6674,8 @@
             </node>
             <node concept="2OqwBi" id="7lmP5gAm7s8" role="3tpDZA">
               <node concept="2YIFZM" id="7lmP5gAm7s9" role="2Oq$k0">
-                <ref role="1Pybhc" to="6exd:7lmP5gAhjKr" resolve="FreeVariablesFinder" />
-                <ref role="37wK5l" to="6exd:7lmP5gAhuVX" resolve="freeVariables" />
+                <ref role="1Pybhc" to="cof4:7lmP5gAhjKr" resolve="FreeVariablesFinder" />
+                <ref role="37wK5l" to="cof4:7lmP5gAhuVX" resolve="freeVariables" />
                 <node concept="37vLTw" id="7lmP5gAm7sa" role="37wK5m">
                   <ref role="3cqZAo" node="7lmP5gAm5D8" resolve="term" />
                 </node>
@@ -6687,7 +6687,7 @@
             <node concept="3cpWsn" id="7lmP5gAm8vL" role="3cpWs9">
               <property role="TrG5h" value="term2" />
               <node concept="3uibUv" id="7lmP5gAm8vM" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="7lmP5gAm8vN" role="33vP2m">
                 <node concept="1oi5UN" id="7lmP5gAm8vO" role="1oi0x0">
@@ -6719,7 +6719,7 @@
                     <ref role="3cqZAo" node="7lmP5gAm8vL" resolve="term2" />
                   </node>
                   <node concept="3uibUv" id="7lmP5gAmag8" role="10QFUM">
-                    <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="TermNode" />
+                    <ref role="3uigEE" to="cof4:5JQSuNswOXL" resolve="TermNode" />
                   </node>
                 </node>
               </node>
@@ -6728,8 +6728,8 @@
           <node concept="3vwNmj" id="7lmP5gAmazt" role="3cqZAp">
             <node concept="2OqwBi" id="7lmP5gAmazu" role="3vwVQn">
               <node concept="2YIFZM" id="7lmP5gAmazv" role="2Oq$k0">
-                <ref role="37wK5l" to="6exd:7lmP5gAhuVX" resolve="freeVariables" />
-                <ref role="1Pybhc" to="6exd:7lmP5gAhjKr" resolve="FreeVariablesFinder" />
+                <ref role="37wK5l" to="cof4:7lmP5gAhuVX" resolve="freeVariables" />
+                <ref role="1Pybhc" to="cof4:7lmP5gAhjKr" resolve="FreeVariablesFinder" />
                 <node concept="37vLTw" id="7lmP5gAmazw" role="37wK5m">
                   <ref role="3cqZAo" node="7lmP5gAm5D8" resolve="term" />
                 </node>
@@ -6740,8 +6740,8 @@
           <node concept="3vwNmj" id="7lmP5gAmaTu" role="3cqZAp">
             <node concept="2OqwBi" id="7lmP5gAmaTv" role="3vwVQn">
               <node concept="2YIFZM" id="7lmP5gAmaTw" role="2Oq$k0">
-                <ref role="37wK5l" to="6exd:7lmP5gAhuVX" resolve="freeVariables" />
-                <ref role="1Pybhc" to="6exd:7lmP5gAhjKr" resolve="FreeVariablesFinder" />
+                <ref role="37wK5l" to="cof4:7lmP5gAhuVX" resolve="freeVariables" />
+                <ref role="1Pybhc" to="cof4:7lmP5gAhjKr" resolve="FreeVariablesFinder" />
                 <node concept="37vLTw" id="7lmP5gAmb44" role="37wK5m">
                   <ref role="3cqZAo" node="7lmP5gAm6LZ" resolve="mv" />
                 </node>
diff --git a/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification.mps b/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification.mps
index 33470112..97a8f4c4 100644
--- a/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification.mps
+++ b/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification.mps
@@ -13,8 +13,8 @@
     <import index="w7la" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.evaluation(jetbrains.mps.logic.reactor/)" />
     <import index="av0y" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.program(jetbrains.mps.logic.reactor/)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
-    <import index="cxk7" ref="r:daa544a7-0a5c-49c0-a54c-4c2a5b4868aa(jetbrains.mps.logic.predicate)" />
-    <import index="oy3s" ref="r:a6030cee-34eb-4503-b1bf-015fe5cd8c1a(jetbrains.mps.logic.unification)" />
+    <import index="tpfl" ref="r:97d6f79f-4a27-4a9b-9122-9bccfb5317c9(jetbrains.mps.lang.coderules.predicate)" />
+    <import index="uwx2" ref="r:76101703-3fc5-4e76-aa48-9728dde91f7b(jetbrains.mps.logic.unification)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -601,7 +601,7 @@
       <node concept="3clFbS" id="6yEjedm5XWA" role="3clF47">
         <node concept="3clFbF" id="6yEjedm6hex" role="3cqZAp">
           <node concept="1rXfSq" id="6yEjedm6hew" role="3clFbG">
-            <ref role="37wK5l" to="cxk7:2UGjFq4lTDy" resolve="doAsk" />
+            <ref role="37wK5l" to="tpfl:2UGjFq4lTDy" resolve="doAsk" />
             <node concept="37vLTw" id="6yEjedm6hnq" role="37wK5m">
               <ref role="3cqZAo" node="6yEjedm5Zmw" resolve="a" />
             </node>
@@ -637,7 +637,7 @@
               <ref role="3uigEE" to="w7la:~Solver$Result" resolve="Solver.Result" />
             </node>
             <node concept="1rXfSq" id="2gPa6JHHhmk" role="33vP2m">
-              <ref role="37wK5l" to="cxk7:2UGjFq4mbmq" resolve="doTell" />
+              <ref role="37wK5l" to="tpfl:2UGjFq4mbmq" resolve="doTell" />
               <node concept="37vLTw" id="2gPa6JHHhml" role="37wK5m">
                 <ref role="3cqZAo" node="6yEjedm623g" resolve="a" />
               </node>
@@ -692,7 +692,7 @@
     </node>
     <node concept="3Tm1VV" id="6yEjedm5WkF" role="1B3o_S" />
     <node concept="3uibUv" id="7lt0LtQwpQM" role="1zkMxy">
-      <ref role="3uigEE" to="cxk7:6GYQG_Spvw5" resolve="UnificationPredicate.UnificationSolver" />
+      <ref role="3uigEE" to="tpfl:6GYQG_Spvw5" resolve="UnificationPredicate.UnificationSolver" />
     </node>
   </node>
   <node concept="312cEu" id="6yEjedm8s$A">
@@ -717,7 +717,7 @@
       <node concept="3clFbS" id="6N2bvv_uxfx" role="3clF47">
         <node concept="3clFbF" id="6N2bvv_uxi6" role="3cqZAp">
           <node concept="1rXfSq" id="6N2bvv_uxi5" role="3clFbG">
-            <ref role="37wK5l" to="cxk7:2UGjFq4lB$H" resolve="doAsk" />
+            <ref role="37wK5l" to="tpfl:2UGjFq4lB$H" resolve="doAsk" />
             <node concept="37vLTw" id="6N2bvv_uxmD" role="37wK5m">
               <ref role="3cqZAo" node="6N2bvv_uxfQ" resolve="a" />
             </node>
@@ -753,7 +753,7 @@
               <ref role="3uigEE" to="w7la:~Solver$Result" resolve="Solver.Result" />
             </node>
             <node concept="1rXfSq" id="2gPa6JHyWM2" role="33vP2m">
-              <ref role="37wK5l" to="cxk7:2UGjFq4lGBW" resolve="doTell" />
+              <ref role="37wK5l" to="tpfl:2UGjFq4lGBW" resolve="doTell" />
               <node concept="37vLTw" id="2gPa6JHyWM3" role="37wK5m">
                 <ref role="3cqZAo" node="6yEjedm8tDF" resolve="a" />
               </node>
@@ -797,7 +797,7 @@
     <node concept="2tJIrI" id="6yEjedm8sYi" role="jymVt" />
     <node concept="3Tm1VV" id="6yEjedm8s$B" role="1B3o_S" />
     <node concept="3uibUv" id="7lt0LtQw8s8" role="1zkMxy">
-      <ref role="3uigEE" to="cxk7:3HJTsBn4ogZ" resolve="EqualsPredicate.EqualsSolver" />
+      <ref role="3uigEE" to="tpfl:3HJTsBn4ogZ" resolve="EqualsPredicate.EqualsSolver" />
     </node>
   </node>
   <node concept="312cEu" id="60zk4o6U2na">
diff --git a/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification@tests.mps b/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification@tests.mps
index c11fa935..1e6a53bc 100644
--- a/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification@tests.mps
+++ b/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification@tests.mps
@@ -15,9 +15,9 @@
     <import index="bj13" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.logical(jetbrains.mps.logic.reactor/)" />
     <import index="w7la" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.evaluation(jetbrains.mps.logic.reactor/)" />
     <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.unification)" />
-    <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.dataform)" />
     <import index="u132" ref="49808fad-9d41-4b96-83fa-9231640f6b2b/java:junit.framework(JUnit/)" />
+    <import index="cof4" ref="r:0a9d1d47-250c-4f98-8962-b65edf8b0721(jetbrains.mps.logic.dataform)" />
+    <import index="uwx2" ref="r:76101703-3fc5-4e76-aa48-9728dde91f7b(jetbrains.mps.logic.unification)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -440,7 +440,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="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="fHk0tWuK3B" role="33vP2m">
                 <node concept="1oi5UN" id="fHk0tWuK7X" role="1oi0x0" />
@@ -451,7 +451,7 @@
             <node concept="3cpWsn" id="fHk0tWuKa4" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="fHk0tWuKa5" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="fHk0tWuKa6" role="33vP2m">
                 <node concept="1oi5UN" id="fHk0tWuKa7" role="1oi0x0" />
@@ -487,7 +487,7 @@
             <node concept="3cpWsn" id="21Zu7ABuiLB" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="21Zu7ABuiLC" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="21Zu7ABuiLD" role="33vP2m">
                 <node concept="1oi5UN" id="21Zu7ABuiLE" role="1oi0x0">
@@ -505,7 +505,7 @@
             <node concept="3cpWsn" id="21Zu7ABuiLH" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="21Zu7ABuiLI" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="21Zu7ABuiLJ" role="33vP2m">
                 <node concept="1oi5UN" id="21Zu7ABun6y" role="1oi0x0">
@@ -548,7 +548,7 @@
             <node concept="3cpWsn" id="53iOybEHDaF" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="53iOybEHDaG" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="53iOybEHDaH" role="33vP2m">
                 <node concept="1oi5UN" id="53iOybEHDaI" role="1oi0x0">
@@ -566,7 +566,7 @@
             <node concept="3cpWsn" id="53iOybEHDaM" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="53iOybEHDaN" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="53iOybEHDaO" role="33vP2m">
                 <node concept="1oi5UN" id="53iOybEHDaP" role="1oi0x0">
@@ -636,7 +636,7 @@
             <node concept="3cpWsn" id="1POzLwzcFGL" role="3cpWs9">
               <property role="TrG5h" value="x" />
               <node concept="3uibUv" id="1POzLwzcFGM" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="1POzLwzcFGN" role="33vP2m">
                 <ref role="37wK5l" node="1POzLwzc6NC" resolve="termvar" />
@@ -650,7 +650,7 @@
             <node concept="3cpWsn" id="1POzLwzcFGQ" role="3cpWs9">
               <property role="TrG5h" value="y" />
               <node concept="3uibUv" id="1POzLwzcFGR" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="1POzLwzcFGS" role="33vP2m">
                 <ref role="37wK5l" node="1POzLwzc6NC" resolve="termvar" />
@@ -664,7 +664,7 @@
             <node concept="3cpWsn" id="1POzLwzcFGV" role="3cpWs9">
               <property role="TrG5h" value="z" />
               <node concept="3uibUv" id="1POzLwzcFGW" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="1POzLwzcFGX" role="33vP2m">
                 <ref role="37wK5l" node="1POzLwzc6NC" resolve="termvar" />
@@ -679,7 +679,7 @@
             <node concept="3cpWsn" id="6ROTXv9E9er" role="3cpWs9">
               <property role="TrG5h" value="t" />
               <node concept="3uibUv" id="6ROTXv9E9es" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="6ROTXv9E9et" role="33vP2m">
                 <node concept="1oi5UN" id="6ROTXv9E9eu" role="1oi0x0">
@@ -808,7 +808,7 @@
             <node concept="3cpWsn" id="1POzLwzd6Ed" role="3cpWs9">
               <property role="TrG5h" value="x" />
               <node concept="3uibUv" id="1POzLwzd6Ee" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="1POzLwzd6Ef" role="33vP2m">
                 <ref role="37wK5l" node="1POzLwzc6NC" resolve="termvar" />
@@ -822,7 +822,7 @@
             <node concept="3cpWsn" id="1POzLwzd6Ei" role="3cpWs9">
               <property role="TrG5h" value="y" />
               <node concept="3uibUv" id="1POzLwzd6Ej" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="1POzLwzd6Ek" role="33vP2m">
                 <ref role="37wK5l" node="1POzLwzc6NC" resolve="termvar" />
@@ -836,7 +836,7 @@
             <node concept="3cpWsn" id="1POzLwzd6En" role="3cpWs9">
               <property role="TrG5h" value="z" />
               <node concept="3uibUv" id="1POzLwzd6Eo" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="1POzLwzd6Ep" role="33vP2m">
                 <ref role="37wK5l" node="1POzLwzc6NC" resolve="termvar" />
@@ -850,7 +850,7 @@
             <node concept="3cpWsn" id="1POzLwzd6Es" role="3cpWs9">
               <property role="TrG5h" value="w" />
               <node concept="3uibUv" id="1POzLwzd6Et" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="1POzLwzd6Eu" role="33vP2m">
                 <ref role="37wK5l" node="1POzLwzc6NC" resolve="termvar" />
@@ -864,7 +864,7 @@
             <node concept="3cpWsn" id="1POzLwzd6Ex" role="3cpWs9">
               <property role="TrG5h" value="foo" />
               <node concept="3uibUv" id="1POzLwzd6Ey" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="1POzLwzd6Ez" role="33vP2m">
                 <node concept="1oi5UN" id="1POzLwzd6E$" role="1oi0x0">
@@ -1020,7 +1020,7 @@
             <node concept="3cpWsn" id="3gNap3g8Gbc" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="3gNap3g8Gbd" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="3gNap3g8Gbe" role="33vP2m">
                 <node concept="1oi5UN" id="3gNap3g8Gbf" role="1oi0x0">
@@ -1051,7 +1051,7 @@
             <node concept="3cpWsn" id="3gNap3g8Gbj" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="3gNap3g8Gbk" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="3gNap3g8Gbl" role="33vP2m">
                 <node concept="1oi5UN" id="3gNap3g8Gbm" role="1oi0x0">
@@ -1100,7 +1100,7 @@
             <node concept="3cpWsn" id="3gNap3g8JUc" role="3cpWs9">
               <property role="TrG5h" value="x" />
               <node concept="3uibUv" id="3gNap3g8JU9" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="3gNap3g8JUd" role="33vP2m">
                 <ref role="37wK5l" node="1POzLwzc6Np" resolve="stringvar" />
@@ -1139,7 +1139,7 @@
             <node concept="3cpWsn" id="3gNap3g8JK9" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="3gNap3g8JKa" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="3gNap3g8JKb" role="33vP2m">
                 <node concept="1oi5UN" id="3gNap3g8JKc" role="1oi0x0">
@@ -1167,7 +1167,7 @@
             <node concept="3cpWsn" id="3gNap3g8JKl" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="3gNap3g8JKm" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="3gNap3g8JKn" role="33vP2m">
                 <node concept="1oi5UN" id="3gNap3g8JKo" role="1oi0x0">
@@ -1191,7 +1191,7 @@
             <node concept="3cpWsn" id="3gNap3g94O9" role="3cpWs9">
               <property role="TrG5h" value="c" />
               <node concept="3uibUv" id="3gNap3g94Oa" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="3gNap3g94Ob" role="33vP2m">
                 <node concept="1oi5UN" id="3gNap3g94Oc" role="1oi0x0">
@@ -1256,7 +1256,7 @@
             <node concept="3cpWsn" id="21Zu7ABunhN" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="21Zu7ABunhO" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="21Zu7ABunhP" role="33vP2m">
                 <node concept="1oi5UN" id="21Zu7ABunhQ" role="1oi0x0">
@@ -1289,7 +1289,7 @@
             <node concept="3cpWsn" id="21Zu7ABunhW" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="21Zu7ABunhX" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="21Zu7ABunhY" role="33vP2m">
                 <node concept="1oi5UN" id="21Zu7ABunhZ" role="1oi0x0">
@@ -1370,7 +1370,7 @@
             <node concept="3cpWsn" id="21Zu7ABupTt" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="21Zu7ABupTu" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="21Zu7ABupTv" role="33vP2m">
                 <node concept="1oi5UN" id="21Zu7ABupTw" role="1oi0x0">
@@ -1401,7 +1401,7 @@
             <node concept="3cpWsn" id="21Zu7ABupTD" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="21Zu7ABupTE" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="21Zu7ABupTF" role="33vP2m">
                 <node concept="1oi5UN" id="21Zu7ABupTG" role="1oi0x0">
@@ -1459,7 +1459,7 @@
             <node concept="3cpWsn" id="5EQJq4zHerY" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="5EQJq4zHerZ" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="5EQJq4zHeOb" role="33vP2m">
                 <ref role="37wK5l" node="1POzLwzc6NC" resolve="termvar" />
@@ -1473,7 +1473,7 @@
             <node concept="3cpWsn" id="5EQJq4zHg6g" role="3cpWs9">
               <property role="TrG5h" value="wrapping" />
               <node concept="3uibUv" id="5EQJq4zHg6h" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="5EQJq4zHg6i" role="33vP2m">
                 <node concept="1oi5UN" id="5EQJq4zHg6j" role="1oi0x0">
@@ -1524,7 +1524,7 @@
             <node concept="3cpWsn" id="5EQJq4zHh1u" role="3cpWs9">
               <property role="TrG5h" value="w" />
               <node concept="3uibUv" id="5EQJq4zHh1v" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="5EQJq4zHh1w" role="33vP2m">
                 <ref role="37wK5l" node="1POzLwzc6NC" resolve="termvar" />
@@ -1575,7 +1575,7 @@
             <node concept="3cpWsn" id="5EQJq4zHfQq" role="3cpWs9">
               <property role="TrG5h" value="pair" />
               <node concept="3uibUv" id="5EQJq4zHfQr" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="5EQJq4zHfQs" role="33vP2m">
                 <node concept="1oi5UN" id="5EQJq4zHfQt" role="1oi0x0">
@@ -1647,7 +1647,7 @@
             <node concept="3cpWsn" id="1OShD0I0umo" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="1OShD0I0ump" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0I0umq" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0I0umr" role="1oi0x0">
@@ -1686,7 +1686,7 @@
             <node concept="3cpWsn" id="1OShD0I0umz" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="1OShD0I0um$" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0I0um_" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0I0umA" role="1oi0x0">
@@ -1742,7 +1742,7 @@
             <node concept="3cpWsn" id="1OShD0I168P" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="1OShD0I168Q" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0I168R" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0I168S" role="1oi0x0">
@@ -1781,7 +1781,7 @@
             <node concept="3cpWsn" id="1OShD0I16sw" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="1OShD0I16sx" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0I16sy" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0I16sz" role="1oi0x0">
@@ -1847,7 +1847,7 @@
             <node concept="3cpWsn" id="1OShD0I1vD7" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="1OShD0I1vD8" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0I1vD9" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0I1vDa" role="1oi0x0">
@@ -1886,7 +1886,7 @@
             <node concept="3cpWsn" id="3zXFZnUACf_" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="3zXFZnUACfA" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="3zXFZnUACfB" role="33vP2m">
                 <node concept="1oi5UN" id="3zXFZnUACfC" role="1oi0x0">
@@ -1957,7 +1957,7 @@
             <node concept="3cpWsn" id="1OShD0If5uE" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="1OShD0If5uF" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0If5uG" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0If5uH" role="1oi0x0">
@@ -1979,7 +1979,7 @@
             <node concept="3cpWsn" id="1OShD0If5uT" role="3cpWs9">
               <property role="TrG5h" value="b1" />
               <node concept="3uibUv" id="1OShD0If5uU" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0If5uV" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0If5uW" role="1oi0x0">
@@ -2003,7 +2003,7 @@
             <node concept="3cpWsn" id="68ncUim6KYE" role="3cpWs9">
               <property role="TrG5h" value="b2" />
               <node concept="3uibUv" id="68ncUim6KYF" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="68ncUim6KYG" role="33vP2m">
                 <node concept="1oi5UN" id="68ncUim6KYH" role="1oi0x0">
@@ -2067,7 +2067,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="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="5_6ImQYXLIQ" role="33vP2m">
                 <node concept="1oi5UN" id="5_6ImQYXLIR" role="1oi0x0">
@@ -2085,7 +2085,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="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="5_6ImQYXLKy" role="33vP2m">
                 <node concept="1oi5UN" id="5_6ImQYXLKz" role="1oi0x0">
@@ -2103,7 +2103,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="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="5_6ImQYXLLK" role="33vP2m">
                 <node concept="1oi5UN" id="5_6ImQYXLLL" role="1oi0x0">
@@ -2121,7 +2121,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="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="5_6ImQYXLG3" role="33vP2m">
                 <node concept="1oi5ST" id="1fvYCPAk_xu" role="1oi0x0">
@@ -2158,7 +2158,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="6exd:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="5_6ImQYXM2X" role="33vP2m">
                 <ref role="37wK5l" node="1POzLwzc6NC" resolve="termvar" />
@@ -2172,7 +2172,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="6exd:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="5_6ImQYXM88" role="33vP2m">
                 <ref role="37wK5l" node="1POzLwzc6NR" resolve="listVar" />
@@ -2186,7 +2186,7 @@
             <node concept="3cpWsn" id="3zXFZnUEJSH" role="3cpWs9">
               <property role="TrG5h" value="list2" />
               <node concept="3uibUv" id="3zXFZnUEJSI" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="3zXFZnUEJSJ" role="33vP2m">
                 <node concept="1oi5ST" id="3zXFZnUEKk7" role="1oi0x0">
@@ -2249,7 +2249,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="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="5_6ImQYY0qX" role="33vP2m">
                 <node concept="KCUsM" id="5_6ImQYY0qY" role="1oi0x0">
@@ -2260,7 +2260,7 @@
                           <ref role="3cqZAo" node="5_6ImQYXLKw" resolve="bar" />
                         </node>
                         <node concept="liA8E" id="4p5Sefk5CPN" role="2OqNvi">
-                          <ref role="37wK5l" to="6exd:1bm7a6EXvNI" resolve="copyRecursively" />
+                          <ref role="37wK5l" to="cof4:1bm7a6EXvNI" resolve="copyRecursively" />
                         </node>
                       </node>
                     </node>
@@ -2272,7 +2272,7 @@
                           <ref role="3cqZAo" node="5_6ImQYXLLI" resolve="bazz" />
                         </node>
                         <node concept="liA8E" id="4p5Sefk5DsU" role="2OqNvi">
-                          <ref role="37wK5l" to="6exd:1bm7a6EXvNI" resolve="copyRecursively" />
+                          <ref role="37wK5l" to="cof4:1bm7a6EXvNI" resolve="copyRecursively" />
                         </node>
                       </node>
                     </node>
@@ -2308,7 +2308,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="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="5_6ImQYY3rh" role="33vP2m">
                 <node concept="1oi5UN" id="5_6ImQYY3ri" role="1oi0x0">
@@ -2326,7 +2326,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="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="5_6ImQYY3rA" role="33vP2m">
                 <node concept="1oi5ST" id="1fvYCPAk_xv" role="1oi0x0">
@@ -2349,7 +2349,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="6exd:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="5_6ImQYY3rQ" role="33vP2m">
                 <ref role="37wK5l" node="1POzLwzc6NC" resolve="termvar" />
@@ -2363,7 +2363,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="6exd:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="5_6ImQYY3rV" role="33vP2m">
                 <ref role="37wK5l" node="1POzLwzc6NR" resolve="listVar" />
@@ -2377,7 +2377,7 @@
             <node concept="3cpWsn" id="3zXFZnUEMwX" role="3cpWs9">
               <property role="TrG5h" value="list2" />
               <node concept="3uibUv" id="3zXFZnUEMwY" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="3zXFZnUEMwZ" role="33vP2m">
                 <node concept="1oi5ST" id="3zXFZnUEMx0" role="1oi0x0">
@@ -2440,7 +2440,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="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="5_6ImQYY3sq" role="33vP2m">
                 <node concept="KCUsM" id="5_6ImQYY3sr" role="1oi0x0" />
@@ -2474,7 +2474,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="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="5_6ImQYY68k" role="33vP2m">
                 <node concept="1oi5ST" id="1fvYCPAk_xw" role="1oi0x0">
@@ -2489,7 +2489,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="6exd:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="5_6ImQYY68u" role="33vP2m">
                 <ref role="37wK5l" node="1POzLwzc6NC" resolve="termvar" />
@@ -2503,7 +2503,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="6exd:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="5_6ImQYY68z" role="33vP2m">
                 <ref role="37wK5l" node="1POzLwzc6NC" resolve="termvar" />
@@ -2517,7 +2517,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="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="5_6ImQYY68C" role="33vP2m">
                 <node concept="1oi5ST" id="1fvYCPAk_xx" role="1oi0x0">
@@ -2611,7 +2611,7 @@
             <node concept="3cpWsn" id="1OShD0IfHOE" role="3cpWs9">
               <property role="TrG5h" value="x" />
               <node concept="3uibUv" id="1OShD0IfHOC" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="1OShD0IfHOF" role="33vP2m">
                 <ref role="37wK5l" node="1POzLwzc6NC" resolve="termvar" />
@@ -2625,7 +2625,7 @@
             <node concept="3cpWsn" id="1OShD0IfuGw" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="1OShD0IfuGx" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0IfuGy" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0IfuGz" role="1oi0x0">
@@ -2653,7 +2653,7 @@
             <node concept="3cpWsn" id="1OShD0IfHTY" role="3cpWs9">
               <property role="TrG5h" value="y" />
               <node concept="3uibUv" id="1OShD0IfHTV" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="1OShD0IfHTZ" role="33vP2m">
                 <ref role="37wK5l" node="1POzLwzc6NC" resolve="termvar" />
@@ -2667,7 +2667,7 @@
             <node concept="3cpWsn" id="1OShD0IfuGF" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="1OShD0IfuGG" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0IfuGH" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0IfuGI" role="1oi0x0">
@@ -2743,7 +2743,7 @@
             <node concept="3cpWsn" id="1POzLwzdeKl" role="3cpWs9">
               <property role="TrG5h" value="x" />
               <node concept="3uibUv" id="1POzLwzdeKm" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="1POzLwzdeKn" role="33vP2m">
                 <ref role="37wK5l" node="1POzLwzc6NC" resolve="termvar" />
@@ -2757,7 +2757,7 @@
             <node concept="3cpWsn" id="1POzLwzdeKq" role="3cpWs9">
               <property role="TrG5h" value="y" />
               <node concept="3uibUv" id="1POzLwzdeKr" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="1POzLwzdeKs" role="33vP2m">
                 <ref role="37wK5l" node="1POzLwzc6NC" resolve="termvar" />
@@ -2771,7 +2771,7 @@
             <node concept="3cpWsn" id="1POzLwzdeKv" role="3cpWs9">
               <property role="TrG5h" value="z" />
               <node concept="3uibUv" id="1POzLwzdeKw" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="1POzLwzdeKx" role="33vP2m">
                 <ref role="37wK5l" node="1POzLwzc6NC" resolve="termvar" />
@@ -2786,7 +2786,7 @@
             <node concept="3cpWsn" id="1POzLwzdeK_" role="3cpWs9">
               <property role="TrG5h" value="t" />
               <node concept="3uibUv" id="1POzLwzdeKA" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="1POzLwzdeKB" role="33vP2m">
                 <node concept="1oi5UN" id="1POzLwzdeKC" role="1oi0x0">
@@ -2925,7 +2925,7 @@
             <node concept="3cpWsn" id="1POzLwyU_xu" role="3cpWs9">
               <property role="TrG5h" value="x" />
               <node concept="3uibUv" id="1POzLwyU_xv" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="1POzLwyU_xw" role="33vP2m">
                 <ref role="37wK5l" node="1POzLwzc6NC" resolve="termvar" />
@@ -2939,7 +2939,7 @@
             <node concept="3cpWsn" id="1POzLwyUDdb" role="3cpWs9">
               <property role="TrG5h" value="y" />
               <node concept="3uibUv" id="1POzLwyUDdc" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="1POzLwyUDdd" role="33vP2m">
                 <ref role="37wK5l" node="1POzLwzc6NC" resolve="termvar" />
@@ -2953,7 +2953,7 @@
             <node concept="3cpWsn" id="1POzLwyUDXy" role="3cpWs9">
               <property role="TrG5h" value="z" />
               <node concept="3uibUv" id="1POzLwyUDXz" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="1POzLwyUDX$" role="33vP2m">
                 <ref role="37wK5l" node="1POzLwzc6NC" resolve="termvar" />
@@ -2967,7 +2967,7 @@
             <node concept="3cpWsn" id="1POzLwyUT0E" role="3cpWs9">
               <property role="TrG5h" value="w" />
               <node concept="3uibUv" id="1POzLwyUT0F" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="1POzLwyUT0G" role="33vP2m">
                 <ref role="37wK5l" node="1POzLwzc6NC" resolve="termvar" />
@@ -2981,7 +2981,7 @@
             <node concept="3cpWsn" id="1POzLwyU_xz" role="3cpWs9">
               <property role="TrG5h" value="foo" />
               <node concept="3uibUv" id="1POzLwyU_x$" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="1POzLwyU_x_" role="33vP2m">
                 <node concept="1oi5UN" id="1POzLwyU_xA" role="1oi0x0">
@@ -3157,7 +3157,7 @@
             <node concept="3cpWsn" id="3gNap3g822S" role="3cpWs9">
               <property role="TrG5h" value="x" />
               <node concept="3uibUv" id="3gNap3g822T" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="3gNap3g822U" role="33vP2m">
                 <ref role="37wK5l" node="1POzLwzc6Np" resolve="stringvar" />
@@ -3171,7 +3171,7 @@
             <node concept="3cpWsn" id="3gNap3g822X" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="3gNap3g822Y" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="3gNap3g822Z" role="33vP2m">
                 <node concept="1oi5UN" id="3gNap3g8230" role="1oi0x0">
@@ -3199,7 +3199,7 @@
             <node concept="3cpWsn" id="3gNap3g8238" role="3cpWs9">
               <property role="TrG5h" value="y" />
               <node concept="3uibUv" id="3gNap3g8239" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="3gNap3g823a" role="33vP2m">
                 <ref role="37wK5l" node="1POzLwzc6Np" resolve="stringvar" />
@@ -3213,7 +3213,7 @@
             <node concept="3cpWsn" id="3gNap3g823d" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="3gNap3g823e" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="3gNap3g823f" role="33vP2m">
                 <node concept="1oi5UN" id="3gNap3g823g" role="1oi0x0">
@@ -3289,7 +3289,7 @@
             <node concept="3cpWsn" id="kTK1BfxL5d" role="3cpWs9">
               <property role="TrG5h" value="x" />
               <node concept="3uibUv" id="kTK1BfxL5e" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="kTK1BfxL5f" role="33vP2m">
                 <ref role="37wK5l" node="1POzLwzc6NC" resolve="termvar" />
@@ -3345,7 +3345,7 @@
             <node concept="3cpWsn" id="kTK1BfxL5i" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="kTK1BfxL5j" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="kTK1BfxL5k" role="33vP2m">
                 <node concept="1oi5UN" id="kTK1BfxL5l" role="1oi0x0">
@@ -3389,7 +3389,7 @@
             <node concept="3cpWsn" id="kTK1BfxL5t" role="3cpWs9">
               <property role="TrG5h" value="y" />
               <node concept="3uibUv" id="kTK1BfxL5u" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="kTK1BfxL5v" role="33vP2m">
                 <ref role="37wK5l" node="1POzLwzc6NC" resolve="termvar" />
@@ -3403,7 +3403,7 @@
             <node concept="3cpWsn" id="kTK1BfxL5y" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="kTK1BfxL5z" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="kTK1BfxL5$" role="33vP2m">
                 <node concept="1oi5UN" id="kTK1BfxL5_" role="1oi0x0">
@@ -3509,7 +3509,7 @@
             <node concept="3cpWsn" id="3HJTsBn443b" role="3cpWs9">
               <property role="TrG5h" value="x" />
               <node concept="3uibUv" id="3HJTsBn443c" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="3HJTsBn443d" role="33vP2m">
                 <ref role="37wK5l" node="1POzLwzc6NC" resolve="termvar" />
@@ -3523,7 +3523,7 @@
             <node concept="3cpWsn" id="3HJTsBn443g" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="3HJTsBn443h" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="3HJTsBn443i" role="33vP2m">
                 <node concept="1oi5UN" id="3HJTsBn443j" role="1oi0x0">
@@ -3557,7 +3557,7 @@
             <node concept="3cpWsn" id="3HJTsBn443w" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="3HJTsBn443x" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="3HJTsBn443y" role="33vP2m">
                 <node concept="1oi5UN" id="3HJTsBn443z" role="1oi0x0">
@@ -3634,7 +3634,7 @@
             <node concept="3cpWsn" id="3gNap3g8end" role="3cpWs9">
               <property role="TrG5h" value="x" />
               <node concept="3uibUv" id="3gNap3g8ene" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="3gNap3g8enf" role="33vP2m">
                 <ref role="37wK5l" node="1POzLwzc6Np" resolve="stringvar" />
@@ -3648,7 +3648,7 @@
             <node concept="3cpWsn" id="3gNap3g8eni" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="3gNap3g8enj" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="3gNap3g8enk" role="33vP2m">
                 <node concept="1oi5UN" id="3gNap3g8enl" role="1oi0x0">
@@ -3682,7 +3682,7 @@
             <node concept="3cpWsn" id="3gNap3g8env" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="3gNap3g8enw" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="3gNap3g8enx" role="33vP2m">
                 <node concept="1oi5UN" id="3gNap3g8eny" role="1oi0x0">
@@ -3757,7 +3757,7 @@
             <node concept="3cpWsn" id="3gNap3g8i5r" role="3cpWs9">
               <property role="TrG5h" value="x" />
               <node concept="3uibUv" id="3gNap3g8i5s" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="3gNap3g8i5t" role="33vP2m">
                 <ref role="37wK5l" node="1POzLwzc6Np" resolve="stringvar" />
@@ -3796,7 +3796,7 @@
             <node concept="3cpWsn" id="3gNap3g8i5w" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="3gNap3g8i5x" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="3gNap3g8i5y" role="33vP2m">
                 <node concept="1oi5UN" id="3gNap3g8i5z" role="1oi0x0">
@@ -3830,7 +3830,7 @@
             <node concept="3cpWsn" id="3gNap3g8i5H" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="3gNap3g8i5I" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="3gNap3g8i5J" role="33vP2m">
                 <node concept="1oi5UN" id="3gNap3g8i5K" role="1oi0x0">
@@ -3859,7 +3859,7 @@
             <node concept="3cpWsn" id="3gNap3g8sBq" role="3cpWs9">
               <property role="TrG5h" value="c" />
               <node concept="3uibUv" id="3gNap3g8sBr" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="3gNap3g8sBs" role="33vP2m">
                 <node concept="1oi5UN" id="3gNap3g8sBt" role="1oi0x0">
@@ -3934,7 +3934,7 @@
             <node concept="3cpWsn" id="kTK1BfyxOv" role="3cpWs9">
               <property role="TrG5h" value="x" />
               <node concept="3uibUv" id="kTK1BfyxOw" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="kTK1BfyxOx" role="33vP2m">
                 <ref role="37wK5l" node="1POzLwzc6NC" resolve="termvar" />
@@ -3948,7 +3948,7 @@
             <node concept="3cpWsn" id="kTK1BfyxO$" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="kTK1BfyxO_" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="kTK1BfyxOA" role="33vP2m">
                 <node concept="1oi5UN" id="kTK1BfyxOB" role="1oi0x0">
@@ -3982,7 +3982,7 @@
             <node concept="3cpWsn" id="kTK1BfyxOL" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="kTK1BfyxOM" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="kTK1BfyxON" role="33vP2m">
                 <node concept="1oi5UN" id="kTK1BfyxOO" role="1oi0x0">
@@ -4059,7 +4059,7 @@
             <node concept="3cpWsn" id="4XqG8ivynhL" role="3cpWs9">
               <property role="TrG5h" value="x" />
               <node concept="3uibUv" id="4XqG8ivynhM" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="4XqG8ivynhN" role="33vP2m">
                 <ref role="37wK5l" node="1POzLwzc6NC" resolve="termvar" />
@@ -4073,7 +4073,7 @@
             <node concept="3cpWsn" id="4XqG8ivynhQ" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="4XqG8ivynhR" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="4XqG8ivynhS" role="33vP2m">
                 <node concept="1oi5UN" id="4XqG8ivynhT" role="1oi0x0">
@@ -4107,7 +4107,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="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="4XqG8ivy$Mg" role="33vP2m">
                 <node concept="1oi5UN" id="4XqG8ivy$Mh" role="1oi0x0">
@@ -4155,7 +4155,7 @@
             <node concept="3cpWsn" id="4XqG8ivyni3" role="3cpWs9">
               <property role="TrG5h" value="c" />
               <node concept="3uibUv" id="4XqG8ivyni4" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="4XqG8ivyni5" role="33vP2m">
                 <node concept="1oi5UN" id="4XqG8ivyni6" role="1oi0x0">
@@ -4178,7 +4178,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="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="4XqG8ivy_$K" role="33vP2m">
                 <node concept="1oi5UN" id="4XqG8ivy_$L" role="1oi0x0">
@@ -4319,7 +4319,7 @@
             <node concept="3cpWsn" id="1OShD0IfNC5" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="1OShD0IfNC6" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0IfNC7" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0IfNC8" role="1oi0x0">
@@ -4348,7 +4348,7 @@
             <node concept="3cpWsn" id="1OShD0IfO6H" role="3cpWs9">
               <property role="TrG5h" value="x" />
               <node concept="3uibUv" id="1OShD0IfO6F" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="1OShD0IfO6I" role="33vP2m">
                 <ref role="37wK5l" node="1POzLwzc6NC" resolve="termvar" />
@@ -4362,7 +4362,7 @@
             <node concept="3cpWsn" id="1OShD0IfNCg" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="1OShD0IfNCh" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0IfNCi" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0IfNCj" role="1oi0x0">
@@ -4390,7 +4390,7 @@
             <node concept="3cpWsn" id="1OShD0IfP49" role="3cpWs9">
               <property role="TrG5h" value="y" />
               <node concept="3uibUv" id="1OShD0IfP4a" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="1OShD0IfP4b" role="33vP2m">
                 <ref role="37wK5l" node="1POzLwzc6NC" resolve="termvar" />
@@ -4404,7 +4404,7 @@
             <node concept="3cpWsn" id="1OShD0IfOZy" role="3cpWs9">
               <property role="TrG5h" value="c" />
               <node concept="3uibUv" id="1OShD0IfOZz" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0IfOZ$" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0IfOZ_" role="1oi0x0">
@@ -4554,7 +4554,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="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0IfO_h" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0IfO_k" role="1oi0x0">
@@ -4572,7 +4572,7 @@
             <node concept="3cpWsn" id="1OShD0IfOGV" role="3cpWs9">
               <property role="TrG5h" value="t" />
               <node concept="3uibUv" id="1OShD0IfOGW" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0IfOGX" role="33vP2m">
                 <node concept="1oi5UN" id="677NV56wbOC" role="1oi0x0">
@@ -4614,7 +4614,7 @@
             <node concept="3cpWsn" id="4XqG8ivylQZ" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="4XqG8ivylR0" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="4XqG8ivylR1" role="33vP2m">
                 <node concept="1oi5UN" id="4XqG8ivylR2" role="1oi0x0">
@@ -4643,7 +4643,7 @@
             <node concept="3cpWsn" id="4XqG8ivylRa" role="3cpWs9">
               <property role="TrG5h" value="x" />
               <node concept="3uibUv" id="4XqG8ivylRb" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="4XqG8ivylRc" role="33vP2m">
                 <ref role="37wK5l" node="1POzLwzc6NC" resolve="termvar" />
@@ -4657,7 +4657,7 @@
             <node concept="3cpWsn" id="4XqG8ivylRf" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="4XqG8ivylRg" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="4XqG8ivylRh" role="33vP2m">
                 <node concept="1oi5UN" id="4XqG8ivylRi" role="1oi0x0">
@@ -4686,7 +4686,7 @@
             <node concept="3cpWsn" id="4XqG8ivylRq" role="3cpWs9">
               <property role="TrG5h" value="y" />
               <node concept="3uibUv" id="4XqG8ivylRr" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="4XqG8ivylRs" role="33vP2m">
                 <ref role="37wK5l" node="1POzLwzc6NC" resolve="termvar" />
@@ -4700,7 +4700,7 @@
             <node concept="3cpWsn" id="4XqG8ivylRv" role="3cpWs9">
               <property role="TrG5h" value="c" />
               <node concept="3uibUv" id="4XqG8ivylRw" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="4XqG8ivylRx" role="33vP2m">
                 <node concept="1oi5UN" id="4XqG8ivylRy" role="1oi0x0">
@@ -4850,7 +4850,7 @@
             <node concept="3cpWsn" id="4XqG8ivylS2" role="3cpWs9">
               <property role="TrG5h" value="s" />
               <node concept="3uibUv" id="4XqG8ivylS3" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="4XqG8ivylS4" role="33vP2m">
                 <node concept="1oi5UN" id="4XqG8ivylS5" role="1oi0x0">
@@ -4868,7 +4868,7 @@
             <node concept="3cpWsn" id="4XqG8ivylS9" role="3cpWs9">
               <property role="TrG5h" value="t" />
               <node concept="3uibUv" id="4XqG8ivylSa" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="4XqG8ivylSb" role="33vP2m">
                 <node concept="1oi5UN" id="4XqG8ivylSc" role="1oi0x0">
@@ -4910,7 +4910,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="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0IfW$$" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0IfW$_" role="1oi0x0">
@@ -4949,7 +4949,7 @@
             <node concept="3cpWsn" id="1OShD0IfXUS" role="3cpWs9">
               <property role="TrG5h" value="x" />
               <node concept="3uibUv" id="1OShD0IfXUQ" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="1OShD0IfXUT" role="33vP2m">
                 <ref role="37wK5l" node="1POzLwzc6NC" resolve="termvar" />
@@ -4963,7 +4963,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="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0IfW$N" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0IfW$O" role="1oi0x0">
@@ -5042,7 +5042,7 @@
             <node concept="3cpWsn" id="1OShD0IfYmM" role="3cpWs9">
               <property role="TrG5h" value="s" />
               <node concept="3uibUv" id="1OShD0IfYmN" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0IfYmO" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0IfYt5" role="1oi0x0">
@@ -5060,7 +5060,7 @@
             <node concept="3cpWsn" id="1OShD0IfYmT" role="3cpWs9">
               <property role="TrG5h" value="t" />
               <node concept="3uibUv" id="1OShD0IfYmU" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0IfYmV" role="33vP2m">
                 <node concept="1oi5UN" id="677NV56wbOu" role="1oi0x0">
@@ -5102,7 +5102,7 @@
             <node concept="3cpWsn" id="1OShD0IgkRu" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="1OShD0IgkRv" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0IgkRw" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0IgkRx" role="1oi0x0">
@@ -5149,7 +5149,7 @@
             <node concept="3cpWsn" id="1OShD0IgkRH" role="3cpWs9">
               <property role="TrG5h" value="x" />
               <node concept="3uibUv" id="1OShD0IgkRI" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="1OShD0IgkRJ" role="33vP2m">
                 <ref role="37wK5l" node="1POzLwzc6NC" resolve="termvar" />
@@ -5163,7 +5163,7 @@
             <node concept="3cpWsn" id="1OShD0IglCA" role="3cpWs9">
               <property role="TrG5h" value="y" />
               <node concept="3uibUv" id="1OShD0IglCB" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="1OShD0IglCC" role="33vP2m">
                 <ref role="37wK5l" node="1POzLwzc6NC" resolve="termvar" />
@@ -5177,7 +5177,7 @@
             <node concept="3cpWsn" id="1OShD0IgkRM" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="1OShD0IgkRN" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0IgkRO" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0IgkRP" role="1oi0x0">
@@ -5342,7 +5342,7 @@
             <node concept="3cpWsn" id="1OShD0Ig2i$" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="1OShD0Ig2i_" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0Ig2iA" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0Ig2iB" role="1oi0x0">
@@ -5397,7 +5397,7 @@
             <node concept="3cpWsn" id="1OShD0Ig2iN" role="3cpWs9">
               <property role="TrG5h" value="x" />
               <node concept="3uibUv" id="1OShD0Ig2iO" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="1OShD0Ig2iP" role="33vP2m">
                 <ref role="37wK5l" node="1POzLwzc6Oj" resolve="wildcard" />
@@ -5411,7 +5411,7 @@
             <node concept="3cpWsn" id="1OShD0Ig2iS" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="1OShD0Ig2iT" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0Ig2iU" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0Ig2iV" role="1oi0x0">
@@ -5566,7 +5566,7 @@
             <node concept="3cpWsn" id="1OShD0Ig9w4" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="1OShD0Ig9w5" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0Ig9w6" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0Ig9w7" role="1oi0x0">
@@ -5605,7 +5605,7 @@
             <node concept="3cpWsn" id="1OShD0IgaBV" role="3cpWs9">
               <property role="TrG5h" value="x" />
               <node concept="3uibUv" id="1OShD0IgaBT" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="1OShD0IgaBW" role="33vP2m">
                 <ref role="37wK5l" node="1POzLwzc6O6" resolve="wildcard" />
@@ -5616,7 +5616,7 @@
             <node concept="3cpWsn" id="1OShD0Ig9wj" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="1OShD0Ig9wk" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0Ig9wl" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0Ig9wm" role="1oi0x0">
@@ -5754,7 +5754,7 @@
             <node concept="3cpWsn" id="1OShD0Igi9l" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="1OShD0Igi9m" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="1OShD0Igi9n" role="33vP2m">
                 <node concept="1oi5UN" id="1OShD0Igi9o" role="1oi0x0">
@@ -5776,7 +5776,7 @@
             <node concept="3cpWsn" id="1OShD0IgiMd" role="3cpWs9">
               <property role="TrG5h" value="x" />
               <node concept="3uibUv" id="1OShD0IgiMa" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="1OShD0IgiMe" role="33vP2m">
                 <ref role="37wK5l" node="1POzLwzc6O6" resolve="wildcard" />
@@ -5790,7 +5790,7 @@
               <node concept="3cpWsn" id="1OShD0Igi9u" role="3cpWs9">
                 <property role="TrG5h" value="b1" />
                 <node concept="3uibUv" id="1OShD0Igi9v" role="1tU5fm">
-                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                  <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                 </node>
                 <node concept="1oi1Uc" id="1OShD0Igi9w" role="33vP2m">
                   <node concept="1oi5UN" id="1OShD0Igi9x" role="1oi0x0">
@@ -5821,7 +5821,7 @@
             <node concept="3cpWsn" id="68ncUima8Nj" role="3cpWs9">
               <property role="TrG5h" value="b2" />
               <node concept="3uibUv" id="68ncUima8Nk" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="68ncUima8Nl" role="33vP2m">
                 <node concept="1oi5UN" id="68ncUima8Nm" role="1oi0x0">
@@ -5943,7 +5943,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="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="4$OyT8ISnwh" role="33vP2m">
                 <node concept="KCUsM" id="4$OyT8ISw5n" role="1oi0x0">
@@ -5987,7 +5987,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="6exd:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="4$OyT8ISnwz" role="33vP2m">
                 <ref role="37wK5l" node="1POzLwzc6NC" resolve="termvar" />
@@ -6001,7 +6001,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="6exd:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="4$OyT8ISnwC" role="33vP2m">
                 <ref role="37wK5l" node="1POzLwzc6NR" resolve="listVar" />
@@ -6015,7 +6015,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="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="4$OyT8ISEPc" role="33vP2m">
                 <node concept="1Pxxm1" id="7L5omgek1ot" role="1oi0x0">
@@ -6160,7 +6160,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="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="4$OyT8ITVL8" role="33vP2m">
                 <node concept="KCUsM" id="4$OyT8ITVL9" role="1oi0x0">
@@ -6204,7 +6204,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="6exd:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="4$OyT8ITVLq" role="33vP2m">
                 <ref role="37wK5l" node="1POzLwzc6NR" resolve="listVar" />
@@ -6218,7 +6218,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="6exd:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="4$OyT8IUcum" role="33vP2m">
                 <ref role="37wK5l" node="1POzLwzc6NR" resolve="listVar" />
@@ -6232,7 +6232,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="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="4$OyT8ITVLv" role="33vP2m">
                 <node concept="1Pxxm1" id="7L5omgek1ou" role="1oi0x0">
@@ -6258,7 +6258,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="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="4$OyT8IUeDv" role="33vP2m">
                 <node concept="1Pxxm1" id="7L5omgek1ov" role="1oi0x0">
@@ -6427,18 +6427,18 @@
         <node concept="17QB3L" id="3K_0akS$LQm" role="1tU5fm" />
       </node>
       <node concept="3uibUv" id="3K_0akS$LQn" role="3clF45">
-        <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+        <ref role="3uigEE" to="cof4: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="6exd:uNmovXiEd4" resolve="Variable" />
+              <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
             </node>
             <node concept="2YIFZM" id="3gNap3fNlJt" role="10QFUP">
-              <ref role="37wK5l" to="oy3s:4TCblo5YI1H" resolve="asDataForm" />
-              <ref role="1Pybhc" to="oy3s:677NV565N1x" resolve="LogicalUtil" />
+              <ref role="37wK5l" to="uwx2:4TCblo5YI1H" resolve="asDataForm" />
+              <ref role="1Pybhc" to="uwx2:677NV565N1x" resolve="LogicalUtil" />
               <node concept="2YIFZM" id="YbzkzLheK2" role="37wK5m">
                 <ref role="1Pybhc" to="bj13:~LogicalKt" resolve="LogicalKt" />
                 <ref role="37wK5l" to="bj13:~LogicalKt.namedLogical(java.lang.String)" resolve="namedLogical" />
@@ -6460,7 +6460,7 @@
       <node concept="3uibUv" id="6yEjedm86Fb" role="3clF45">
         <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
         <node concept="3uibUv" id="6yEjedm887F" role="11_B2D">
-          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+          <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
         </node>
       </node>
       <node concept="3Tm1VV" id="3K_0akS$NEd" role="1B3o_S" />
@@ -6473,7 +6473,7 @@
               <ref role="3cqZAo" node="3K_0akS$NJK" resolve="name" />
             </node>
             <node concept="3uibUv" id="YbzkzLh$SD" role="3PaCim">
-              <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+              <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
             </node>
           </node>
         </node>
@@ -6489,7 +6489,7 @@
       <node concept="3uibUv" id="6yEjedm8Fwr" role="3clF45">
         <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
         <node concept="3uibUv" id="6yEjedm8Fws" role="11_B2D">
-          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+          <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
         </node>
       </node>
       <node concept="3Tm1VV" id="6yEjedm8Fwt" role="1B3o_S" />
@@ -6509,7 +6509,7 @@
         <node concept="3uibUv" id="6yEjedm8H9p" role="1tU5fm">
           <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
           <node concept="3uibUv" id="6yEjedm8Hc_" role="11_B2D">
-            <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+            <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
           </node>
         </node>
       </node>
@@ -6528,7 +6528,7 @@
               <node concept="3uibUv" id="6yEjedm8aLn" role="1tU5fm">
                 <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
                 <node concept="3uibUv" id="6yEjedm8bg7" role="11_B2D">
-                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                  <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                 </node>
               </node>
               <node concept="1rXfSq" id="3K_0akS$NRs" role="33vP2m">
@@ -6551,7 +6551,7 @@
               <node concept="3uibUv" id="6yEjedm8btC" role="1tU5fm">
                 <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
                 <node concept="3uibUv" id="6yEjedm8btD" role="11_B2D">
-                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                  <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                 </node>
               </node>
             </node>
@@ -6561,7 +6561,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="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="3K_0akS_eyc" role="33vP2m">
                 <node concept="1oi5UN" id="3K_0akS_eyd" role="1oi0x0">
@@ -6615,7 +6615,7 @@
               <node concept="3uibUv" id="6yEjedm8iQc" role="1tU5fm">
                 <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
                 <node concept="3uibUv" id="6yEjedm8jdG" role="11_B2D">
-                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                  <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                 </node>
               </node>
               <node concept="1rXfSq" id="3K_0akS$OxM" role="33vP2m">
@@ -6627,7 +6627,7 @@
                       <property role="Xl_RC" value="w1" />
                     </node>
                     <node concept="3VsKOn" id="6yEjedm8P1G" role="37wK5m">
-                      <ref role="3VsUkX" to="6exd:5JQSuNswOXL" resolve="TermNode" />
+                      <ref role="3VsUkX" to="cof4:5JQSuNswOXL" resolve="TermNode" />
                     </node>
                   </node>
                 </node>
@@ -6664,7 +6664,7 @@
               <node concept="3uibUv" id="6yEjedm8lL4" role="1tU5fm">
                 <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
                 <node concept="3uibUv" id="6yEjedm8lL5" role="11_B2D">
-                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                  <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                 </node>
               </node>
             </node>
@@ -6674,7 +6674,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="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="3K_0akS_6Q8" role="33vP2m">
                 <node concept="1oi5UN" id="3K_0akS_6Q9" role="1oi0x0">
@@ -6721,7 +6721,7 @@
             <node concept="3cpWsn" id="6HT7BWBPd0T" role="3cpWs9">
               <property role="TrG5h" value="value" />
               <node concept="3uibUv" id="6HT7BWBPd0L" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="2OqwBi" id="6HT7BWBPd0U" role="33vP2m">
                 <node concept="2OqwBi" id="6HT7BWBPd0V" role="2Oq$k0">
@@ -6741,8 +6741,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="6exd:6HT7BWBOXr$" resolve="ground" />
-                <ref role="1Pybhc" to="6exd:6HT7BWBOXme" resolve="DataFormUtil" />
+                <ref role="37wK5l" to="cof4:6HT7BWBOXr$" resolve="ground" />
+                <ref role="1Pybhc" to="cof4:6HT7BWBOXme" resolve="DataFormUtil" />
                 <node concept="37vLTw" id="6HT7BWBPf1b" role="37wK5m">
                   <ref role="3cqZAo" node="6HT7BWBPd0T" resolve="value" />
                 </node>
@@ -6808,7 +6808,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="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="2OqwBi" id="3t7_2FgLmht" role="33vP2m">
                 <node concept="2OqwBi" id="3t7_2FgLmhu" role="2Oq$k0">
@@ -6816,7 +6816,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="6exd:1msb0mq9ID4" resolve="DataNode" />
+                          <ref role="3uigEE" to="cof4:1msb0mq9ID4" resolve="DataNode" />
                         </node>
                         <node concept="37vLTw" id="3t7_2FgLmhz" role="10QFUP">
                           <ref role="3cqZAo" node="5YIOneOTrto" resolve="next" />
@@ -6824,7 +6824,7 @@
                       </node>
                     </node>
                     <node concept="liA8E" id="3t7_2FgLmh$" role="2OqNvi">
-                      <ref role="37wK5l" to="6exd:5JQSuNswjSg" resolve="arguments" />
+                      <ref role="37wK5l" to="cof4:5JQSuNswjSg" resolve="arguments" />
                     </node>
                   </node>
                   <node concept="liA8E" id="3t7_2FgLmh_" role="2OqNvi">
@@ -6840,14 +6840,14 @@
           <node concept="3vlDli" id="3t7_2FgLjnc" role="3cqZAp">
             <node concept="2OqwBi" id="3t7_2FgLjnd" role="3tpDZB">
               <node concept="liA8E" id="4p5Sefk5Fku" role="2OqNvi">
-                <ref role="37wK5l" to="6exd:1bm7a6EXvNI" resolve="copyRecursively" />
+                <ref role="37wK5l" to="cof4:1bm7a6EXvNI" resolve="copyRecursively" />
               </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="6exd:3OPtF03lco4" resolve="ListNode" />
+                        <ref role="3uigEE" to="cof4:3OPtF03lco4" resolve="ListNode" />
                       </node>
                       <node concept="37vLTw" id="3t7_2FgLnIG" role="10QFUP">
                         <ref role="3cqZAo" node="3t7_2FgLmhr" resolve="list" />
@@ -6855,7 +6855,7 @@
                     </node>
                   </node>
                   <node concept="liA8E" id="3t7_2FgLjni" role="2OqNvi">
-                    <ref role="37wK5l" to="6exd:5YIOneOT0Zn" resolve="contents" />
+                    <ref role="37wK5l" to="cof4:5YIOneOT0Zn" resolve="contents" />
                   </node>
                 </node>
                 <node concept="liA8E" id="3t7_2FgLjnj" role="2OqNvi">
@@ -6890,7 +6890,7 @@
               <node concept="3uibUv" id="6yEjedm8o1P" role="1tU5fm">
                 <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
                 <node concept="3uibUv" id="6yEjedm8o1Q" role="11_B2D">
-                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                  <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                 </node>
               </node>
             </node>
@@ -6907,7 +6907,7 @@
               <node concept="3uibUv" id="6yEjedm8oFj" role="1tU5fm">
                 <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
                 <node concept="3uibUv" id="6yEjedm8oFk" role="11_B2D">
-                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                  <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                 </node>
               </node>
             </node>
@@ -6917,7 +6917,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="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="3K_0akS_pCM" role="33vP2m">
                 <node concept="1oi5UN" id="3K_0akS_pCN" role="1oi0x0">
@@ -6959,7 +6959,7 @@
                       <property role="Xl_RC" value="w1" />
                     </node>
                     <node concept="3VsKOn" id="6yEjedm8Oi0" role="37wK5m">
-                      <ref role="3VsUkX" to="6exd:5JQSuNswOXL" resolve="TermNode" />
+                      <ref role="3VsUkX" to="cof4:5JQSuNswOXL" resolve="TermNode" />
                     </node>
                   </node>
                 </node>
@@ -6967,7 +6967,7 @@
               <node concept="3uibUv" id="6yEjedm8$6V" role="1tU5fm">
                 <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
                 <node concept="3uibUv" id="6yEjedm8$6W" role="11_B2D">
-                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                  <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                 </node>
               </node>
             </node>
@@ -7002,7 +7002,7 @@
               <node concept="3uibUv" id="6yEjedm8pey" role="1tU5fm">
                 <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
                 <node concept="3uibUv" id="6yEjedm8pez" role="11_B2D">
-                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                  <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                 </node>
               </node>
             </node>
@@ -7012,7 +7012,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="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="3K_0akS_pDq" role="33vP2m">
                 <node concept="1oi5UN" id="3K_0akS_pDr" role="1oi0x0">
@@ -7077,7 +7077,7 @@
             <node concept="3cpWsn" id="6HT7BWBPhwM" role="3cpWs9">
               <property role="TrG5h" value="value" />
               <node concept="3uibUv" id="6HT7BWBPhwJ" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="2OqwBi" id="6HT7BWBPhwN" role="33vP2m">
                 <node concept="2OqwBi" id="6HT7BWBPhwO" role="2Oq$k0">
@@ -7097,8 +7097,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="6exd:6HT7BWBOXr$" resolve="ground" />
-                <ref role="1Pybhc" to="6exd:6HT7BWBOXme" resolve="DataFormUtil" />
+                <ref role="37wK5l" to="cof4:6HT7BWBOXr$" resolve="ground" />
+                <ref role="1Pybhc" to="cof4:6HT7BWBOXme" resolve="DataFormUtil" />
                 <node concept="37vLTw" id="6HT7BWBPj4j" role="37wK5m">
                   <ref role="3cqZAo" node="6HT7BWBPhwM" resolve="value" />
                 </node>
@@ -7164,7 +7164,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="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="2OqwBi" id="3t7_2FgLnZA" role="33vP2m">
                 <node concept="2OqwBi" id="3t7_2FgLnZB" role="2Oq$k0">
@@ -7172,7 +7172,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="6exd:1msb0mq9ID4" resolve="DataNode" />
+                          <ref role="3uigEE" to="cof4:1msb0mq9ID4" resolve="DataNode" />
                         </node>
                         <node concept="37vLTw" id="3t7_2FgLnZG" role="10QFUP">
                           <ref role="3cqZAo" node="5YIOneOTmzN" resolve="next" />
@@ -7180,7 +7180,7 @@
                       </node>
                     </node>
                     <node concept="liA8E" id="3t7_2FgLnZH" role="2OqNvi">
-                      <ref role="37wK5l" to="6exd:5JQSuNswjSg" resolve="arguments" />
+                      <ref role="37wK5l" to="cof4:5JQSuNswjSg" resolve="arguments" />
                     </node>
                   </node>
                   <node concept="liA8E" id="3t7_2FgLnZI" role="2OqNvi">
@@ -7196,14 +7196,14 @@
           <node concept="3vlDli" id="3t7_2FgLav2" role="3cqZAp">
             <node concept="2OqwBi" id="3t7_2FgLav3" role="3tpDZB">
               <node concept="liA8E" id="4p5Sefk5FxR" role="2OqNvi">
-                <ref role="37wK5l" to="6exd:1bm7a6EXvNI" resolve="copyRecursively" />
+                <ref role="37wK5l" to="cof4:1bm7a6EXvNI" resolve="copyRecursively" />
               </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="6exd:3OPtF03lco4" resolve="ListNode" />
+                        <ref role="3uigEE" to="cof4:3OPtF03lco4" resolve="ListNode" />
                       </node>
                       <node concept="37vLTw" id="3t7_2FgLoIl" role="10QFUP">
                         <ref role="3cqZAo" node="3t7_2FgLnZ$" resolve="list" />
@@ -7211,7 +7211,7 @@
                     </node>
                   </node>
                   <node concept="liA8E" id="3t7_2FgLgmc" role="2OqNvi">
-                    <ref role="37wK5l" to="6exd:5YIOneOT0Zn" resolve="contents" />
+                    <ref role="37wK5l" to="cof4:5YIOneOT0Zn" resolve="contents" />
                   </node>
                 </node>
                 <node concept="liA8E" id="3t7_2FgLgwS" role="2OqNvi">
@@ -7305,15 +7305,15 @@
         <node concept="17QB3L" id="390NiL14kVG" role="1tU5fm" />
       </node>
       <node concept="3uibUv" id="390NiL14kVH" role="3clF45">
-        <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+        <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
       </node>
       <node concept="3Tmbuc" id="390NiL14DQq" role="1B3o_S" />
       <node concept="3clFbS" id="390NiL14kVJ" role="3clF47">
         <node concept="3clFbF" id="390NiL14kVK" role="3cqZAp">
           <node concept="10QFUN" id="4U$Q3dKgFf0" role="3clFbG">
             <node concept="2YIFZM" id="4U$Q3dKgFeU" role="10QFUP">
-              <ref role="37wK5l" to="oy3s:4TCblo5YI1H" resolve="asDataForm" />
-              <ref role="1Pybhc" to="oy3s:677NV565N1x" resolve="LogicalUtil" />
+              <ref role="37wK5l" to="uwx2:4TCblo5YI1H" resolve="asDataForm" />
+              <ref role="1Pybhc" to="uwx2:677NV565N1x" resolve="LogicalUtil" />
               <node concept="2YIFZM" id="4U$Q3dKgFeV" role="37wK5m">
                 <ref role="1Pybhc" to="bj13:~LogicalKt" resolve="LogicalKt" />
                 <ref role="37wK5l" to="bj13:~LogicalKt.logical(jetbrains.mps.logic.reactor.logical.MetaLogical)" resolve="logical" />
@@ -7324,14 +7324,14 @@
                       <ref role="3cqZAo" node="390NiL14kVF" resolve="name" />
                     </node>
                     <node concept="3VsKOn" id="4U$Q3dKgFeZ" role="37wK5m">
-                      <ref role="3VsUkX" to="6exd:5JQSuNswOXL" resolve="TermNode" />
+                      <ref role="3VsUkX" to="cof4:5JQSuNswOXL" resolve="TermNode" />
                     </node>
                   </node>
                 </node>
               </node>
             </node>
             <node concept="3uibUv" id="4U$Q3dKgFu6" role="10QFUM">
-              <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+              <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
             </node>
           </node>
         </node>
@@ -7345,15 +7345,15 @@
         <node concept="17QB3L" id="6SwZmzBDszg" role="1tU5fm" />
       </node>
       <node concept="3uibUv" id="6SwZmzBDszh" role="3clF45">
-        <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+        <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
       </node>
       <node concept="3Tmbuc" id="6SwZmzBDvSa" role="1B3o_S" />
       <node concept="3clFbS" id="6SwZmzBDszj" role="3clF47">
         <node concept="3clFbF" id="6SwZmzBDszk" role="3cqZAp">
           <node concept="10QFUN" id="4U$Q3dKgOOt" role="3clFbG">
             <node concept="2YIFZM" id="4U$Q3dKgOOn" role="10QFUP">
-              <ref role="1Pybhc" to="oy3s:677NV565N1x" resolve="LogicalUtil" />
-              <ref role="37wK5l" to="oy3s:3gNap3fZcVn" resolve="asValue" />
+              <ref role="1Pybhc" to="uwx2:677NV565N1x" resolve="LogicalUtil" />
+              <ref role="37wK5l" to="uwx2:3gNap3fZcVn" resolve="asValue" />
               <node concept="2YIFZM" id="4U$Q3dKgOOo" role="37wK5m">
                 <ref role="37wK5l" to="bj13:~LogicalKt.logical(jetbrains.mps.logic.reactor.logical.MetaLogical)" resolve="logical" />
                 <ref role="1Pybhc" to="bj13:~LogicalKt" resolve="LogicalKt" />
@@ -7371,7 +7371,7 @@
               </node>
             </node>
             <node concept="3uibUv" id="4U$Q3dKgP7F" role="10QFUM">
-              <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+              <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
             </node>
           </node>
         </node>
@@ -7394,7 +7394,7 @@
               <node concept="1eOMI4" id="390NiL162Ks" role="2Oq$k0">
                 <node concept="10QFUN" id="390NiL162Kt" role="1eOMHV">
                   <node concept="3uibUv" id="390NiL162Ku" role="10QFUM">
-                    <ref role="3uigEE" to="oy3s:4TCblo5MJ1m" resolve="LogicalDataForm" />
+                    <ref role="3uigEE" to="uwx2:4TCblo5MJ1m" resolve="LogicalDataForm" />
                     <node concept="3uibUv" id="390NiL162Kv" role="11_B2D">
                       <ref role="3uigEE" to="yt73:~Term" resolve="Term" />
                     </node>
@@ -7405,7 +7405,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="390NiL162Kx" role="2OqNvi">
-                <ref role="37wK5l" to="oy3s:4TCblo5MS1o" resolve="logical" />
+                <ref role="37wK5l" to="uwx2:4TCblo5MS1o" resolve="logical" />
               </node>
             </node>
             <node concept="3uibUv" id="390NiL162LH" role="10QFUM">
@@ -7420,7 +7420,7 @@
       <node concept="37vLTG" id="390NiL15T4p" role="3clF46">
         <property role="TrG5h" value="v" />
         <node concept="3uibUv" id="390NiL15T4o" role="1tU5fm">
-          <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+          <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
         </node>
       </node>
     </node>
@@ -7430,7 +7430,7 @@
       <node concept="37vLTG" id="6SwZmzBDxe0" role="3clF46">
         <property role="TrG5h" value="var" />
         <node concept="3uibUv" id="6SwZmzBDxe1" role="1tU5fm">
-          <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+          <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
         </node>
       </node>
       <node concept="3uibUv" id="6SwZmzBDAqC" role="3clF45">
@@ -7450,7 +7450,7 @@
                     <ref role="3cqZAo" node="6SwZmzBDxe0" resolve="var" />
                   </node>
                   <node concept="3uibUv" id="6SwZmzBDDNJ" role="10QFUM">
-                    <ref role="3uigEE" to="oy3s:3gNap3fN2hw" resolve="LogicalValue" />
+                    <ref role="3uigEE" to="uwx2:3gNap3fN2hw" resolve="LogicalValue" />
                     <node concept="3uibUv" id="6SwZmzBDDNK" role="11_B2D">
                       <ref role="3uigEE" to="wyt6:~String" resolve="String" />
                     </node>
@@ -7458,7 +7458,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="6SwZmzBDDNL" role="2OqNvi">
-                <ref role="37wK5l" to="oy3s:3gNap3fN7SD" resolve="logical" />
+                <ref role="37wK5l" to="uwx2:3gNap3fN7SD" resolve="logical" />
               </node>
             </node>
             <node concept="3uibUv" id="6SwZmzBDE9Z" role="10QFUM">
@@ -7696,7 +7696,7 @@
             <node concept="3cpWsn" id="390NiL14e7C" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="390NiL14e7D" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="390NiL14e7E" role="33vP2m">
                 <node concept="1oi5UN" id="390NiL14e7F" role="1oi0x0" />
@@ -7707,7 +7707,7 @@
             <node concept="3cpWsn" id="390NiL14e7H" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="390NiL14e7I" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="390NiL14e7J" role="33vP2m">
                 <node concept="1oi5UN" id="390NiL14e7K" role="1oi0x0" />
@@ -7742,7 +7742,7 @@
             <node concept="3cpWsn" id="390NiL14kY7" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="390NiL14kY8" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="390NiL14kY9" role="33vP2m">
                 <node concept="1oi5UN" id="390NiL14kYa" role="1oi0x0">
@@ -7760,7 +7760,7 @@
             <node concept="3cpWsn" id="390NiL14kYe" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="390NiL14kYf" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="390NiL14kYg" role="33vP2m">
                 <node concept="1oi5UN" id="390NiL14kYh" role="1oi0x0">
@@ -7802,7 +7802,7 @@
             <node concept="3cpWsn" id="390NiL14uZA" role="3cpWs9">
               <property role="TrG5h" value="X" />
               <node concept="3uibUv" id="390NiL14uZz" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="390NiL14uZB" role="33vP2m">
                 <ref role="37wK5l" node="390NiL14kVE" resolve="termvar" />
@@ -7816,7 +7816,7 @@
             <node concept="3cpWsn" id="390NiL14v0v" role="3cpWs9">
               <property role="TrG5h" value="Y" />
               <node concept="3uibUv" id="390NiL14v0w" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="390NiL14v0x" role="33vP2m">
                 <ref role="37wK5l" node="390NiL14kVE" resolve="termvar" />
@@ -7830,7 +7830,7 @@
             <node concept="3cpWsn" id="6SwZmzBDIQk" role="3cpWs9">
               <property role="TrG5h" value="U" />
               <node concept="3uibUv" id="6SwZmzBDIQi" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="6SwZmzBDIQl" role="33vP2m">
                 <ref role="37wK5l" node="6SwZmzBDsze" resolve="stringvar" />
@@ -7844,7 +7844,7 @@
             <node concept="3cpWsn" id="6SwZmzBDJqG" role="3cpWs9">
               <property role="TrG5h" value="V" />
               <node concept="3uibUv" id="6SwZmzBDJqH" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="6SwZmzBDJqI" role="33vP2m">
                 <ref role="37wK5l" node="6SwZmzBDsze" resolve="stringvar" />
@@ -7892,7 +7892,7 @@
             <node concept="3cpWsn" id="390NiL14rc_" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="390NiL14rcA" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="390NiL14rcB" role="33vP2m">
                 <node concept="1oi5UN" id="390NiL14rcC" role="1oi0x0">
@@ -7920,7 +7920,7 @@
             <node concept="3cpWsn" id="390NiL14rcG" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="390NiL14rcH" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="390NiL14rcI" role="33vP2m">
                 <node concept="1oi5UN" id="390NiL14rcJ" role="1oi0x0">
@@ -7948,7 +7948,7 @@
             <node concept="3cpWsn" id="390NiL14uYx" role="3cpWs9">
               <property role="TrG5h" value="c" />
               <node concept="3uibUv" id="390NiL14uYy" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="390NiL14uYz" role="33vP2m">
                 <node concept="1oi5UN" id="390NiL14uY$" role="1oi0x0">
@@ -7976,7 +7976,7 @@
             <node concept="3cpWsn" id="6SwZmzBDG32" role="3cpWs9">
               <property role="TrG5h" value="d" />
               <node concept="3uibUv" id="6SwZmzBDG33" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="6SwZmzBDG34" role="33vP2m">
                 <node concept="1oi5UN" id="6SwZmzBDG35" role="1oi0x0">
@@ -8008,7 +8008,7 @@
             <node concept="3cpWsn" id="6SwZmzBDKsk" role="3cpWs9">
               <property role="TrG5h" value="e" />
               <node concept="3uibUv" id="6SwZmzBDKsl" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="6SwZmzBDKsm" role="33vP2m">
                 <node concept="1oi5UN" id="6SwZmzBDKsn" role="1oi0x0">
@@ -8280,7 +8280,7 @@
             <node concept="3cpWsn" id="390NiL15R$A" role="3cpWs9">
               <property role="TrG5h" value="X" />
               <node concept="3uibUv" id="390NiL15R$B" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="390NiL15R$C" role="33vP2m">
                 <ref role="37wK5l" node="390NiL14kVE" resolve="termvar" />
@@ -8294,7 +8294,7 @@
             <node concept="3cpWsn" id="390NiL15R$F" role="3cpWs9">
               <property role="TrG5h" value="Y" />
               <node concept="3uibUv" id="390NiL15R$G" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="390NiL15R$H" role="33vP2m">
                 <ref role="37wK5l" node="390NiL14kVE" resolve="termvar" />
@@ -8308,7 +8308,7 @@
             <node concept="3cpWsn" id="6SwZmzBE7OJ" role="3cpWs9">
               <property role="TrG5h" value="U" />
               <node concept="3uibUv" id="6SwZmzBE7OK" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="6SwZmzBE7OL" role="33vP2m">
                 <ref role="37wK5l" node="6SwZmzBDsze" resolve="stringvar" />
@@ -8322,7 +8322,7 @@
             <node concept="3cpWsn" id="6SwZmzBE7OO" role="3cpWs9">
               <property role="TrG5h" value="V" />
               <node concept="3uibUv" id="6SwZmzBE7OP" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="6SwZmzBE7OQ" role="33vP2m">
                 <ref role="37wK5l" node="6SwZmzBDsze" resolve="stringvar" />
@@ -8337,7 +8337,7 @@
             <node concept="3cpWsn" id="390NiL15R$K" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="390NiL15R$L" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="390NiL15R$M" role="33vP2m">
                 <node concept="1oi5UN" id="390NiL15R$N" role="1oi0x0">
@@ -8365,7 +8365,7 @@
             <node concept="3cpWsn" id="390NiL15R$V" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="390NiL15R$W" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="390NiL15R$X" role="33vP2m">
                 <node concept="1oi5UN" id="390NiL15R$Y" role="1oi0x0">
@@ -8393,7 +8393,7 @@
             <node concept="3cpWsn" id="390NiL15R_6" role="3cpWs9">
               <property role="TrG5h" value="c" />
               <node concept="3uibUv" id="390NiL15R_7" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="390NiL15R_8" role="33vP2m">
                 <node concept="1oi5UN" id="390NiL15R_9" role="1oi0x0">
@@ -8422,7 +8422,7 @@
             <node concept="3cpWsn" id="390NiL166hb" role="3cpWs9">
               <property role="TrG5h" value="d" />
               <node concept="3uibUv" id="390NiL166hc" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="390NiL166hd" role="33vP2m">
                 <node concept="1oi5UN" id="390NiL166he" role="1oi0x0">
@@ -8451,7 +8451,7 @@
             <node concept="3cpWsn" id="6SwZmzBE8nz" role="3cpWs9">
               <property role="TrG5h" value="e" />
               <node concept="3uibUv" id="6SwZmzBE8n$" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="6SwZmzBE8n_" role="33vP2m">
                 <node concept="1oi5UN" id="6SwZmzBE8nA" role="1oi0x0">
@@ -8484,7 +8484,7 @@
             <node concept="3cpWsn" id="6SwZmzBE8no" role="3cpWs9">
               <property role="TrG5h" value="f" />
               <node concept="3uibUv" id="6SwZmzBE8np" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="6SwZmzBE8nq" role="33vP2m">
                 <node concept="1oi5UN" id="6SwZmzBE8nr" role="1oi0x0">
@@ -8846,7 +8846,7 @@
             <node concept="3cpWsn" id="6SwZmzBAPa_" role="3cpWs9">
               <property role="TrG5h" value="X" />
               <node concept="3uibUv" id="6SwZmzBAPaz" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="6SwZmzBAPaA" role="33vP2m">
                 <ref role="37wK5l" node="390NiL14kVE" resolve="termvar" />
@@ -8860,7 +8860,7 @@
             <node concept="3cpWsn" id="6SwZmzBAPmd" role="3cpWs9">
               <property role="TrG5h" value="Y" />
               <node concept="3uibUv" id="6SwZmzBAPma" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="6SwZmzBAPme" role="33vP2m">
                 <ref role="37wK5l" node="390NiL14kVE" resolve="termvar" />
@@ -8875,7 +8875,7 @@
             <node concept="3cpWsn" id="390NiL16Ozh" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="390NiL16Ozi" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="390NiL16Ozj" role="33vP2m">
                 <node concept="1oi5UN" id="390NiL16Ozk" role="1oi0x0">
@@ -8905,7 +8905,7 @@
             <node concept="3cpWsn" id="390NiL16Ozu" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="390NiL16Ozv" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="390NiL16Ozw" role="33vP2m">
                 <node concept="1oi5UN" id="390NiL16Ozx" role="1oi0x0">
@@ -9027,7 +9027,7 @@
             <node concept="3cpWsn" id="390NiL16Wax" role="3cpWs9">
               <property role="TrG5h" value="X" />
               <node concept="3uibUv" id="390NiL16Wav" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="390NiL16Way" role="33vP2m">
                 <ref role="37wK5l" node="390NiL14kVE" resolve="termvar" />
@@ -9042,7 +9042,7 @@
             <node concept="3cpWsn" id="390NiL16ST7" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="390NiL16ST8" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="390NiL16ST9" role="33vP2m">
                 <node concept="1oi5UN" id="390NiL16STa" role="1oi0x0">
@@ -9073,7 +9073,7 @@
             <node concept="3cpWsn" id="390NiL16STj" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="390NiL16STk" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="390NiL16STl" role="33vP2m">
                 <node concept="1oi5UN" id="390NiL16STm" role="1oi0x0">
@@ -9255,15 +9255,15 @@
         <node concept="17QB3L" id="390NiL15h0O" role="1tU5fm" />
       </node>
       <node concept="3uibUv" id="390NiL15h0P" role="3clF45">
-        <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+        <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
       </node>
       <node concept="3Tmbuc" id="390NiL15h0Q" role="1B3o_S" />
       <node concept="3clFbS" id="390NiL15h0R" role="3clF47">
         <node concept="3clFbF" id="YbzkzLiRad" role="3cqZAp">
           <node concept="10QFUN" id="4U$Q3dKgIjh" role="3clFbG">
             <node concept="2YIFZM" id="4U$Q3dKgIjb" role="10QFUP">
-              <ref role="37wK5l" to="oy3s:4TCblo5YI1H" resolve="asDataForm" />
-              <ref role="1Pybhc" to="oy3s:677NV565N1x" resolve="LogicalUtil" />
+              <ref role="37wK5l" to="uwx2:4TCblo5YI1H" resolve="asDataForm" />
+              <ref role="1Pybhc" to="uwx2:677NV565N1x" resolve="LogicalUtil" />
               <node concept="2YIFZM" id="4U$Q3dKgIjc" role="37wK5m">
                 <ref role="37wK5l" to="bj13:~LogicalKt.logical(jetbrains.mps.logic.reactor.logical.MetaLogical)" resolve="logical" />
                 <ref role="1Pybhc" to="bj13:~LogicalKt" resolve="LogicalKt" />
@@ -9274,14 +9274,14 @@
                       <ref role="3cqZAo" node="390NiL15h0N" resolve="name" />
                     </node>
                     <node concept="3VsKOn" id="4U$Q3dKgIjg" role="37wK5m">
-                      <ref role="3VsUkX" to="6exd:5JQSuNswOXL" resolve="TermNode" />
+                      <ref role="3VsUkX" to="cof4:5JQSuNswOXL" resolve="TermNode" />
                     </node>
                   </node>
                 </node>
               </node>
             </node>
             <node concept="3uibUv" id="4U$Q3dKgIyn" role="10QFUM">
-              <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+              <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
             </node>
           </node>
         </node>
@@ -9295,15 +9295,15 @@
         <node concept="17QB3L" id="6SwZmzBExYH" role="1tU5fm" />
       </node>
       <node concept="3uibUv" id="6SwZmzBExYI" role="3clF45">
-        <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+        <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
       </node>
       <node concept="3Tmbuc" id="6SwZmzBExYJ" role="1B3o_S" />
       <node concept="3clFbS" id="6SwZmzBExYK" role="3clF47">
         <node concept="3clFbF" id="YbzkzLj0Bc" role="3cqZAp">
           <node concept="10QFUN" id="4U$Q3dKgQcS" role="3clFbG">
             <node concept="2YIFZM" id="4U$Q3dKgQcM" role="10QFUP">
-              <ref role="37wK5l" to="oy3s:3gNap3fZcVn" resolve="asValue" />
-              <ref role="1Pybhc" to="oy3s:677NV565N1x" resolve="LogicalUtil" />
+              <ref role="37wK5l" to="uwx2:3gNap3fZcVn" resolve="asValue" />
+              <ref role="1Pybhc" to="uwx2:677NV565N1x" resolve="LogicalUtil" />
               <node concept="2YIFZM" id="4U$Q3dKgQcN" role="37wK5m">
                 <ref role="1Pybhc" to="bj13:~LogicalKt" resolve="LogicalKt" />
                 <ref role="37wK5l" to="bj13:~LogicalKt.logical(jetbrains.mps.logic.reactor.logical.MetaLogical)" resolve="logical" />
@@ -9321,7 +9321,7 @@
               </node>
             </node>
             <node concept="3uibUv" id="4U$Q3dKgQw6" role="10QFUM">
-              <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+              <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
             </node>
           </node>
         </node>
@@ -9344,7 +9344,7 @@
               <node concept="1eOMI4" id="390NiL16pUn" role="2Oq$k0">
                 <node concept="10QFUN" id="390NiL16pUo" role="1eOMHV">
                   <node concept="3uibUv" id="390NiL16pUp" role="10QFUM">
-                    <ref role="3uigEE" to="oy3s:4TCblo5MJ1m" resolve="LogicalDataForm" />
+                    <ref role="3uigEE" to="uwx2:4TCblo5MJ1m" resolve="LogicalDataForm" />
                     <node concept="3uibUv" id="390NiL16pUq" role="11_B2D">
                       <ref role="3uigEE" to="yt73:~Term" resolve="Term" />
                     </node>
@@ -9355,7 +9355,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="390NiL16pUs" role="2OqNvi">
-                <ref role="37wK5l" to="oy3s:4TCblo5MS1o" resolve="logical" />
+                <ref role="37wK5l" to="uwx2:4TCblo5MS1o" resolve="logical" />
               </node>
             </node>
             <node concept="3uibUv" id="390NiL16pUt" role="10QFUM">
@@ -9370,7 +9370,7 @@
       <node concept="37vLTG" id="390NiL16pUv" role="3clF46">
         <property role="TrG5h" value="v" />
         <node concept="3uibUv" id="390NiL16pUw" role="1tU5fm">
-          <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+          <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
         </node>
       </node>
     </node>
@@ -9380,7 +9380,7 @@
       <node concept="37vLTG" id="6SwZmzBEAPp" role="3clF46">
         <property role="TrG5h" value="var" />
         <node concept="3uibUv" id="6SwZmzBEAPq" role="1tU5fm">
-          <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+          <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
         </node>
       </node>
       <node concept="3uibUv" id="6SwZmzBEAPr" role="3clF45">
@@ -9400,7 +9400,7 @@
                     <ref role="3cqZAo" node="6SwZmzBEAPp" resolve="var" />
                   </node>
                   <node concept="3uibUv" id="6SwZmzBEAP_" role="10QFUM">
-                    <ref role="3uigEE" to="oy3s:3gNap3fN2hw" resolve="LogicalValue" />
+                    <ref role="3uigEE" to="uwx2:3gNap3fN2hw" resolve="LogicalValue" />
                     <node concept="3uibUv" id="6SwZmzBEAPA" role="11_B2D">
                       <ref role="3uigEE" to="wyt6:~String" resolve="String" />
                     </node>
@@ -9408,7 +9408,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="6SwZmzBEAPB" role="2OqNvi">
-                <ref role="37wK5l" to="oy3s:3gNap3fN7SD" resolve="logical" />
+                <ref role="37wK5l" to="uwx2:3gNap3fN7SD" resolve="logical" />
               </node>
             </node>
             <node concept="3uibUv" id="6SwZmzBEAPC" role="10QFUM">
@@ -9697,7 +9697,7 @@
             <node concept="3cpWsn" id="390NiL14Hj1" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="390NiL14Hj2" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="390NiL14Hj3" role="33vP2m">
                 <node concept="1oi5UN" id="390NiL14Hj4" role="1oi0x0" />
@@ -9708,7 +9708,7 @@
             <node concept="3cpWsn" id="390NiL14Hj6" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="390NiL14Hj7" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="390NiL14Hj8" role="33vP2m">
                 <node concept="1oi5UN" id="390NiL14Hj9" role="1oi0x0" />
@@ -9743,7 +9743,7 @@
             <node concept="3cpWsn" id="390NiL14Hjn" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="390NiL14Hjo" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="390NiL14Hjp" role="33vP2m">
                 <node concept="1oi5UN" id="390NiL14Hjq" role="1oi0x0">
@@ -9761,7 +9761,7 @@
             <node concept="3cpWsn" id="390NiL14Hju" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="390NiL14Hjv" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="390NiL14Hjw" role="33vP2m">
                 <node concept="1oi5UN" id="390NiL14Hjx" role="1oi0x0">
@@ -9803,7 +9803,7 @@
             <node concept="3cpWsn" id="390NiL14HjL" role="3cpWs9">
               <property role="TrG5h" value="X" />
               <node concept="3uibUv" id="390NiL14HjM" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="390NiL14HjN" role="33vP2m">
                 <ref role="37wK5l" node="390NiL15h0M" resolve="termvar" />
@@ -9817,7 +9817,7 @@
             <node concept="3cpWsn" id="390NiL14HjQ" role="3cpWs9">
               <property role="TrG5h" value="Y" />
               <node concept="3uibUv" id="390NiL14HjR" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="390NiL14HjS" role="33vP2m">
                 <ref role="37wK5l" node="390NiL15h0M" resolve="termvar" />
@@ -9831,7 +9831,7 @@
             <node concept="3cpWsn" id="6SwZmzBEKNv" role="3cpWs9">
               <property role="TrG5h" value="U" />
               <node concept="3uibUv" id="6SwZmzBEKNw" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="6SwZmzBEKNx" role="33vP2m">
                 <ref role="37wK5l" node="6SwZmzBExYF" resolve="stringvar" />
@@ -9845,7 +9845,7 @@
             <node concept="3cpWsn" id="6SwZmzBEKN$" role="3cpWs9">
               <property role="TrG5h" value="V" />
               <node concept="3uibUv" id="6SwZmzBEKN_" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="6SwZmzBEKNA" role="33vP2m">
                 <ref role="37wK5l" node="6SwZmzBExYF" resolve="stringvar" />
@@ -9903,7 +9903,7 @@
             <node concept="3cpWsn" id="390NiL14HjV" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="390NiL14HjW" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="390NiL14HjX" role="33vP2m">
                 <node concept="1oi5UN" id="390NiL14HjY" role="1oi0x0">
@@ -9931,7 +9931,7 @@
             <node concept="3cpWsn" id="390NiL14Hk6" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="390NiL14Hk7" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="390NiL14Hk8" role="33vP2m">
                 <node concept="1oi5UN" id="390NiL14Hk9" role="1oi0x0">
@@ -9959,7 +9959,7 @@
             <node concept="3cpWsn" id="390NiL14Hkh" role="3cpWs9">
               <property role="TrG5h" value="c" />
               <node concept="3uibUv" id="390NiL14Hki" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="390NiL14Hkj" role="33vP2m">
                 <node concept="1oi5UN" id="390NiL14Hkk" role="1oi0x0">
@@ -9987,7 +9987,7 @@
             <node concept="3cpWsn" id="6SwZmzBEMC1" role="3cpWs9">
               <property role="TrG5h" value="d" />
               <node concept="3uibUv" id="6SwZmzBEMC2" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="6SwZmzBEMC3" role="33vP2m">
                 <node concept="1oi5UN" id="6SwZmzBEMC4" role="1oi0x0">
@@ -10019,7 +10019,7 @@
             <node concept="3cpWsn" id="6SwZmzBEMCe" role="3cpWs9">
               <property role="TrG5h" value="f" />
               <node concept="3uibUv" id="6SwZmzBEMCf" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="6SwZmzBEMCg" role="33vP2m">
                 <node concept="1oi5UN" id="6SwZmzBEMCh" role="1oi0x0">
@@ -10301,7 +10301,7 @@
             <node concept="3cpWsn" id="390NiL16dR3" role="3cpWs9">
               <property role="TrG5h" value="X" />
               <node concept="3uibUv" id="390NiL16dR4" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="390NiL16dR5" role="33vP2m">
                 <ref role="37wK5l" node="390NiL15h0M" resolve="termvar" />
@@ -10315,7 +10315,7 @@
             <node concept="3cpWsn" id="390NiL16dR8" role="3cpWs9">
               <property role="TrG5h" value="Y" />
               <node concept="3uibUv" id="390NiL16dR9" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="390NiL16dRa" role="33vP2m">
                 <ref role="37wK5l" node="390NiL15h0M" resolve="termvar" />
@@ -10329,7 +10329,7 @@
             <node concept="3cpWsn" id="6SwZmzBFt1l" role="3cpWs9">
               <property role="TrG5h" value="U" />
               <node concept="3uibUv" id="6SwZmzBFt1m" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="6SwZmzBFt1n" role="33vP2m">
                 <ref role="37wK5l" node="6SwZmzBExYF" resolve="stringvar" />
@@ -10343,7 +10343,7 @@
             <node concept="3cpWsn" id="6SwZmzBFt1q" role="3cpWs9">
               <property role="TrG5h" value="V" />
               <node concept="3uibUv" id="6SwZmzBFt1r" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="6SwZmzBFt1s" role="33vP2m">
                 <ref role="37wK5l" node="6SwZmzBExYF" resolve="stringvar" />
@@ -10358,7 +10358,7 @@
             <node concept="3cpWsn" id="390NiL16dRd" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="390NiL16dRe" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="390NiL16dRf" role="33vP2m">
                 <node concept="1oi5UN" id="390NiL16dRg" role="1oi0x0">
@@ -10386,7 +10386,7 @@
             <node concept="3cpWsn" id="390NiL16dRo" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="390NiL16dRp" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="390NiL16dRq" role="33vP2m">
                 <node concept="1oi5UN" id="390NiL16dRr" role="1oi0x0">
@@ -10414,7 +10414,7 @@
             <node concept="3cpWsn" id="390NiL16dRz" role="3cpWs9">
               <property role="TrG5h" value="c" />
               <node concept="3uibUv" id="390NiL16dR$" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="390NiL16dR_" role="33vP2m">
                 <node concept="1oi5UN" id="390NiL16dRA" role="1oi0x0">
@@ -10443,7 +10443,7 @@
             <node concept="3cpWsn" id="390NiL16dRI" role="3cpWs9">
               <property role="TrG5h" value="d" />
               <node concept="3uibUv" id="390NiL16dRJ" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="390NiL16dRK" role="33vP2m">
                 <node concept="1oi5UN" id="390NiL16dRL" role="1oi0x0">
@@ -10472,7 +10472,7 @@
             <node concept="3cpWsn" id="6SwZmzBFuPq" role="3cpWs9">
               <property role="TrG5h" value="f" />
               <node concept="3uibUv" id="6SwZmzBFuPr" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="6SwZmzBFuPs" role="33vP2m">
                 <node concept="1oi5UN" id="6SwZmzBFuPt" role="1oi0x0">
@@ -10505,7 +10505,7 @@
             <node concept="3cpWsn" id="6SwZmzBFuPB" role="3cpWs9">
               <property role="TrG5h" value="g" />
               <node concept="3uibUv" id="6SwZmzBFuPC" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="6SwZmzBFuPD" role="33vP2m">
                 <node concept="1oi5UN" id="6SwZmzBFuPE" role="1oi0x0">
@@ -10897,7 +10897,7 @@
             <node concept="3cpWsn" id="6SwZmzBB2N$" role="3cpWs9">
               <property role="TrG5h" value="X" />
               <node concept="3uibUv" id="6SwZmzBB2Ny" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="6SwZmzBB2N_" role="33vP2m">
                 <ref role="37wK5l" node="390NiL15h0M" resolve="termvar" />
@@ -10911,7 +10911,7 @@
             <node concept="3cpWsn" id="6SwZmzBB39W" role="3cpWs9">
               <property role="TrG5h" value="Y" />
               <node concept="3uibUv" id="6SwZmzBB39T" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="6SwZmzBB39X" role="33vP2m">
                 <ref role="37wK5l" node="390NiL15h0M" resolve="termvar" />
@@ -10926,7 +10926,7 @@
             <node concept="3cpWsn" id="390NiL171dC" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="390NiL171dD" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="390NiL171dE" role="33vP2m">
                 <node concept="1oi5UN" id="390NiL171dF" role="1oi0x0">
@@ -10956,7 +10956,7 @@
             <node concept="3cpWsn" id="390NiL171dP" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="390NiL171dQ" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="390NiL171dR" role="33vP2m">
                 <node concept="1oi5UN" id="390NiL171dS" role="1oi0x0">
@@ -11052,7 +11052,7 @@
             <node concept="3cpWsn" id="390NiL171ed" role="3cpWs9">
               <property role="TrG5h" value="X" />
               <node concept="3uibUv" id="390NiL171ee" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+                <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
               </node>
               <node concept="1rXfSq" id="390NiL171ef" role="33vP2m">
                 <ref role="37wK5l" node="390NiL15h0M" resolve="termvar" />
@@ -11067,7 +11067,7 @@
             <node concept="3cpWsn" id="390NiL171ej" role="3cpWs9">
               <property role="TrG5h" value="a" />
               <node concept="3uibUv" id="390NiL171ek" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="390NiL171el" role="33vP2m">
                 <node concept="1oi5UN" id="390NiL171em" role="1oi0x0">
@@ -11098,7 +11098,7 @@
             <node concept="3cpWsn" id="390NiL171ev" role="3cpWs9">
               <property role="TrG5h" value="b" />
               <node concept="3uibUv" id="390NiL171ew" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="390NiL171ex" role="33vP2m">
                 <node concept="1oi5UN" id="390NiL171ey" role="1oi0x0">
@@ -11254,15 +11254,15 @@
         <node concept="17QB3L" id="1POzLwzc6Nr" role="1tU5fm" />
       </node>
       <node concept="3uibUv" id="1POzLwzc6Ns" role="3clF45">
-        <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+        <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
       </node>
       <node concept="3Tmbuc" id="1POzLwzc8YX" role="1B3o_S" />
       <node concept="3clFbS" id="1POzLwzc6Nu" role="3clF47">
         <node concept="3clFbF" id="1POzLwzc6Nv" role="3cqZAp">
           <node concept="10QFUN" id="4U$Q3dKgR5i" role="3clFbG">
             <node concept="2YIFZM" id="4U$Q3dKgR5c" role="10QFUP">
-              <ref role="1Pybhc" to="oy3s:677NV565N1x" resolve="LogicalUtil" />
-              <ref role="37wK5l" to="oy3s:3gNap3fZcVn" resolve="asValue" />
+              <ref role="1Pybhc" to="uwx2:677NV565N1x" resolve="LogicalUtil" />
+              <ref role="37wK5l" to="uwx2:3gNap3fZcVn" resolve="asValue" />
               <node concept="2YIFZM" id="4U$Q3dKgR5d" role="37wK5m">
                 <ref role="37wK5l" to="bj13:~LogicalKt.logical(jetbrains.mps.logic.reactor.logical.MetaLogical)" resolve="logical" />
                 <ref role="1Pybhc" to="bj13:~LogicalKt" resolve="LogicalKt" />
@@ -11280,7 +11280,7 @@
               </node>
             </node>
             <node concept="3uibUv" id="4U$Q3dKgRfo" role="10QFUM">
-              <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+              <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
             </node>
           </node>
         </node>
@@ -11294,15 +11294,15 @@
         <node concept="17QB3L" id="1POzLwzc6NE" role="1tU5fm" />
       </node>
       <node concept="3uibUv" id="1POzLwzc6NF" role="3clF45">
-        <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+        <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
       </node>
       <node concept="3Tmbuc" id="1POzLwzc9rA" role="1B3o_S" />
       <node concept="3clFbS" id="1POzLwzc6NH" role="3clF47">
         <node concept="3clFbF" id="1POzLwzc6NI" role="3cqZAp">
           <node concept="10QFUN" id="4U$Q3dKgIQ6" role="3clFbG">
             <node concept="2YIFZM" id="4U$Q3dKgIQ0" role="10QFUP">
-              <ref role="37wK5l" to="oy3s:4TCblo5YI1H" resolve="asDataForm" />
-              <ref role="1Pybhc" to="oy3s:677NV565N1x" resolve="LogicalUtil" />
+              <ref role="37wK5l" to="uwx2:4TCblo5YI1H" resolve="asDataForm" />
+              <ref role="1Pybhc" to="uwx2:677NV565N1x" resolve="LogicalUtil" />
               <node concept="2YIFZM" id="4U$Q3dKgIQ1" role="37wK5m">
                 <ref role="1Pybhc" to="bj13:~LogicalKt" resolve="LogicalKt" />
                 <ref role="37wK5l" to="bj13:~LogicalKt.logical(jetbrains.mps.logic.reactor.logical.MetaLogical)" resolve="logical" />
@@ -11313,14 +11313,14 @@
                       <ref role="3cqZAo" node="1POzLwzc6ND" resolve="name" />
                     </node>
                     <node concept="3VsKOn" id="4U$Q3dKgIQ5" role="37wK5m">
-                      <ref role="3VsUkX" to="6exd:5JQSuNswOXL" resolve="TermNode" />
+                      <ref role="3VsUkX" to="cof4:5JQSuNswOXL" resolve="TermNode" />
                     </node>
                   </node>
                 </node>
               </node>
             </node>
             <node concept="3uibUv" id="4U$Q3dKgIZa" role="10QFUM">
-              <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+              <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
             </node>
           </node>
         </node>
@@ -11334,15 +11334,15 @@
         <node concept="17QB3L" id="1POzLwzc6NT" role="1tU5fm" />
       </node>
       <node concept="3uibUv" id="1POzLwzc6NU" role="3clF45">
-        <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+        <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
       </node>
       <node concept="3Tmbuc" id="1POzLwzc9NF" role="1B3o_S" />
       <node concept="3clFbS" id="1POzLwzc6NW" role="3clF47">
         <node concept="3clFbF" id="1POzLwzc6NX" role="3cqZAp">
           <node concept="10QFUN" id="4U$Q3dKgJ30" role="3clFbG">
             <node concept="2YIFZM" id="4U$Q3dKgJ2U" role="10QFUP">
-              <ref role="37wK5l" to="oy3s:4TCblo5YI1H" resolve="asDataForm" />
-              <ref role="1Pybhc" to="oy3s:677NV565N1x" resolve="LogicalUtil" />
+              <ref role="37wK5l" to="uwx2:4TCblo5YI1H" resolve="asDataForm" />
+              <ref role="1Pybhc" to="uwx2:677NV565N1x" resolve="LogicalUtil" />
               <node concept="2YIFZM" id="4U$Q3dKgJ2V" role="37wK5m">
                 <ref role="1Pybhc" to="bj13:~LogicalKt" resolve="LogicalKt" />
                 <ref role="37wK5l" to="bj13:~LogicalKt.logical(jetbrains.mps.logic.reactor.logical.MetaLogical)" resolve="logical" />
@@ -11353,14 +11353,14 @@
                       <ref role="3cqZAo" node="1POzLwzc6NS" resolve="name" />
                     </node>
                     <node concept="3VsKOn" id="4U$Q3dKgJ2Z" role="37wK5m">
-                      <ref role="3VsUkX" to="6exd:3OPtF03lco4" resolve="ListNode" />
+                      <ref role="3VsUkX" to="cof4:3OPtF03lco4" resolve="ListNode" />
                     </node>
                   </node>
                 </node>
               </node>
             </node>
             <node concept="3uibUv" id="4U$Q3dKgJgc" role="10QFUM">
-              <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+              <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
             </node>
           </node>
         </node>
@@ -11370,15 +11370,15 @@
     <node concept="3clFb_" id="1POzLwzc6O6" role="jymVt">
       <property role="TrG5h" value="wildcard" />
       <node concept="3uibUv" id="1POzLwzc6O7" role="3clF45">
-        <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+        <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
       </node>
       <node concept="3Tmbuc" id="1POzLwzcabK" role="1B3o_S" />
       <node concept="3clFbS" id="1POzLwzc6O9" role="3clF47">
         <node concept="3clFbF" id="1POzLwzc6Oa" role="3cqZAp">
           <node concept="10QFUN" id="4U$Q3dKgJk2" role="3clFbG">
             <node concept="2YIFZM" id="4U$Q3dKgJjX" role="10QFUP">
-              <ref role="37wK5l" to="oy3s:4TCblo5YI1H" resolve="asDataForm" />
-              <ref role="1Pybhc" to="oy3s:677NV565N1x" resolve="LogicalUtil" />
+              <ref role="37wK5l" to="uwx2:4TCblo5YI1H" resolve="asDataForm" />
+              <ref role="1Pybhc" to="uwx2:677NV565N1x" resolve="LogicalUtil" />
               <node concept="2YIFZM" id="4U$Q3dKgJjY" role="37wK5m">
                 <ref role="1Pybhc" to="bj13:~LogicalKt" resolve="LogicalKt" />
                 <ref role="37wK5l" to="bj13:~LogicalKt.logical(jetbrains.mps.logic.reactor.logical.MetaLogical)" resolve="logical" />
@@ -11386,14 +11386,14 @@
                   <node concept="1pGfFk" id="4U$Q3dKgJk0" role="2ShVmc">
                     <ref role="37wK5l" to="bj13:~MetaLogical.&lt;init&gt;(java.lang.Class)" resolve="MetaLogical" />
                     <node concept="3VsKOn" id="4U$Q3dKgJk1" role="37wK5m">
-                      <ref role="3VsUkX" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                      <ref role="3VsUkX" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                     </node>
                   </node>
                 </node>
               </node>
             </node>
             <node concept="3uibUv" id="4U$Q3dKgJxk" role="10QFUM">
-              <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+              <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
             </node>
           </node>
         </node>
@@ -11403,15 +11403,15 @@
     <node concept="3clFb_" id="1POzLwzc6Oj" role="jymVt">
       <property role="TrG5h" value="wildcard" />
       <node concept="3uibUv" id="1POzLwzc6Ok" role="3clF45">
-        <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+        <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
       </node>
       <node concept="3Tmbuc" id="1POzLwzca_V" role="1B3o_S" />
       <node concept="3clFbS" id="1POzLwzc6Om" role="3clF47">
         <node concept="3clFbF" id="1POzLwzc6On" role="3cqZAp">
           <node concept="10QFUN" id="4U$Q3dKgK$2" role="3clFbG">
             <node concept="2YIFZM" id="4U$Q3dKgKzX" role="10QFUP">
-              <ref role="37wK5l" to="oy3s:4TCblo5YI1H" resolve="asDataForm" />
-              <ref role="1Pybhc" to="oy3s:677NV565N1x" resolve="LogicalUtil" />
+              <ref role="37wK5l" to="uwx2:4TCblo5YI1H" resolve="asDataForm" />
+              <ref role="1Pybhc" to="uwx2:677NV565N1x" resolve="LogicalUtil" />
               <node concept="2YIFZM" id="4U$Q3dKgKzY" role="37wK5m">
                 <ref role="1Pybhc" to="bj13:~LogicalKt" resolve="LogicalKt" />
                 <ref role="37wK5l" to="bj13:~LogicalKt.logical(jetbrains.mps.logic.reactor.logical.MetaLogical)" resolve="logical" />
@@ -11419,14 +11419,14 @@
                   <node concept="1pGfFk" id="4U$Q3dKgK$0" role="2ShVmc">
                     <ref role="37wK5l" to="bj13:~MetaLogical.&lt;init&gt;(java.lang.Class)" resolve="MetaLogical" />
                     <node concept="3VsKOn" id="4U$Q3dKgK$1" role="37wK5m">
-                      <ref role="3VsUkX" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                      <ref role="3VsUkX" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                     </node>
                   </node>
                 </node>
               </node>
             </node>
             <node concept="3uibUv" id="4U$Q3dKgKQw" role="10QFUM">
-              <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+              <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
             </node>
           </node>
         </node>
@@ -11442,7 +11442,7 @@
       <node concept="37vLTG" id="1POzLwzc6Oy" role="3clF46">
         <property role="TrG5h" value="var" />
         <node concept="3uibUv" id="1POzLwzc6Oz" role="1tU5fm">
-          <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+          <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
         </node>
       </node>
       <node concept="3uibUv" id="1POzLwzc6O$" role="3clF45">
@@ -11462,7 +11462,7 @@
                     <ref role="3cqZAo" node="1POzLwzc6Oy" resolve="var" />
                   </node>
                   <node concept="3uibUv" id="1POzLwzcOll" role="10QFUM">
-                    <ref role="3uigEE" to="oy3s:4TCblo5MJ1m" resolve="LogicalDataForm" />
+                    <ref role="3uigEE" to="uwx2:4TCblo5MJ1m" resolve="LogicalDataForm" />
                     <node concept="3uibUv" id="1POzLwzcWhw" role="11_B2D">
                       <ref role="3uigEE" to="yt73:~Term" resolve="Term" />
                     </node>
@@ -11470,7 +11470,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="1POzLwzcOln" role="2OqNvi">
-                <ref role="37wK5l" to="oy3s:4TCblo5MS1o" resolve="logical" />
+                <ref role="37wK5l" to="uwx2:4TCblo5MS1o" resolve="logical" />
               </node>
             </node>
             <node concept="3uibUv" id="1POzLwzcOAS" role="10QFUM">
@@ -11489,7 +11489,7 @@
       <node concept="37vLTG" id="1POzLwzc6OM" role="3clF46">
         <property role="TrG5h" value="var" />
         <node concept="3uibUv" id="1POzLwzc6ON" role="1tU5fm">
-          <ref role="3uigEE" to="6exd:uNmovXiEd4" resolve="Variable" />
+          <ref role="3uigEE" to="cof4:uNmovXiEd4" resolve="Variable" />
         </node>
       </node>
       <node concept="3uibUv" id="1POzLwzc6OO" role="3clF45">
@@ -11506,13 +11506,13 @@
                   <ref role="3cqZAo" node="1POzLwzc6OM" resolve="var" />
                 </node>
                 <node concept="3uibUv" id="1POzLwzc6OX" role="10QFUM">
-                  <ref role="3uigEE" to="oy3s:3gNap3fN2hw" resolve="LogicalValue" />
+                  <ref role="3uigEE" to="uwx2:3gNap3fN2hw" resolve="LogicalValue" />
                   <node concept="3qTvmN" id="1POzLwzc6OY" role="11_B2D" />
                 </node>
               </node>
             </node>
             <node concept="liA8E" id="1POzLwzc6OZ" role="2OqNvi">
-              <ref role="37wK5l" to="oy3s:3gNap3fN7SD" resolve="logical" />
+              <ref role="37wK5l" to="uwx2:3gNap3fN7SD" resolve="logical" />
             </node>
           </node>
         </node>
diff --git a/samples/fitch/build.xml b/samples/fitch/build.xml
index 9ceffdc4..ad934447 100644
--- a/samples/fitch/build.xml
+++ b/samples/fitch/build.xml
@@ -71,7 +71,6 @@
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" kind="rt" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" kind="rt" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="rt" />
-          <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" kind="rt" />
           <module ref="8e98f4e2-decf-4e97-bf80-9109e8b759ee(jetbrains.mps.lang.constraints.rules.runtime)" kind="rt" />
           <module ref="258bd2f6-0d02-411d-86b2-5a5ea083e6d2(jetbrains.mps.lang.editor.table.runtime)" kind="rt" />
           <module ref="9e9ef4e2-decf-4e97-bf80-9109e8b759bb(jetbrains.mps.lang.feedback.api)" kind="rt" />
@@ -83,15 +82,13 @@
           <module ref="3330376f-82a0-45ed-ae50-a320ee8b0b63(jetbrains.mps.lang.script.rt)" kind="rt" />
           <module ref="31f56055-9d30-42b3-a2b1-fb3f554d7075(jetbrains.mps.lang.smodel.query.runtime)" kind="rt" />
           <module ref="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" kind="rt" />
-          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="rt" />
           <module ref="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" kind="rt" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
           <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" kind="cl" />
-          <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" kind="cl" />
           <module ref="6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.coderules.typechecking)" kind="cl" />
           <module ref="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" kind="cl" />
           <module ref="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" kind="cl" />
-          <module ref="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462(jetbrains.mps.lang.typechecking)" kind="cl" />
+          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="cl" />
         </dependencies>
         <uses>
           <language id="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" />
@@ -255,7 +252,6 @@
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" kind="rt" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" kind="rt" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="rt" />
-          <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" kind="rt" />
           <module ref="8e98f4e2-decf-4e97-bf80-9109e8b759ee(jetbrains.mps.lang.constraints.rules.runtime)" kind="rt" />
           <module ref="9e9ef4e2-decf-4e97-bf80-9109e8b759bb(jetbrains.mps.lang.feedback.api)" kind="rt" />
           <module ref="3f98f4e2-decf-4e97-bf80-9109e8b759ab(jetbrains.mps.lang.feedback.problem.rt)" kind="rt" />
@@ -265,7 +261,6 @@
           <module ref="3330376f-82a0-45ed-ae50-a320ee8b0b63(jetbrains.mps.lang.script.rt)" kind="rt" />
           <module ref="31f56055-9d30-42b3-a2b1-fb3f554d7075(jetbrains.mps.lang.smodel.query.runtime)" kind="rt" />
           <module ref="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" kind="rt" />
-          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="rt" />
           <module ref="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" kind="rt" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
           <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" kind="cl" />
@@ -433,7 +428,6 @@
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" kind="rt" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" kind="rt" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="rt" />
-          <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" kind="rt" />
           <module ref="8e98f4e2-decf-4e97-bf80-9109e8b759ee(jetbrains.mps.lang.constraints.rules.runtime)" kind="rt" />
           <module ref="9e9ef4e2-decf-4e97-bf80-9109e8b759bb(jetbrains.mps.lang.feedback.api)" kind="rt" />
           <module ref="3f98f4e2-decf-4e97-bf80-9109e8b759ab(jetbrains.mps.lang.feedback.problem.rt)" kind="rt" />
@@ -443,7 +437,6 @@
           <module ref="3330376f-82a0-45ed-ae50-a320ee8b0b63(jetbrains.mps.lang.script.rt)" kind="rt" />
           <module ref="31f56055-9d30-42b3-a2b1-fb3f554d7075(jetbrains.mps.lang.smodel.query.runtime)" kind="rt" />
           <module ref="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" kind="rt" />
-          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="rt" />
           <module ref="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" kind="rt" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
           <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" kind="cl" />
@@ -613,7 +606,6 @@
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" kind="rt" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" kind="rt" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="rt" />
-          <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" kind="rt" />
           <module ref="8e98f4e2-decf-4e97-bf80-9109e8b759ee(jetbrains.mps.lang.constraints.rules.runtime)" kind="rt" />
           <module ref="9e9ef4e2-decf-4e97-bf80-9109e8b759bb(jetbrains.mps.lang.feedback.api)" kind="rt" />
           <module ref="3f98f4e2-decf-4e97-bf80-9109e8b759ab(jetbrains.mps.lang.feedback.problem.rt)" kind="rt" />
@@ -623,7 +615,6 @@
           <module ref="3330376f-82a0-45ed-ae50-a320ee8b0b63(jetbrains.mps.lang.script.rt)" kind="rt" />
           <module ref="31f56055-9d30-42b3-a2b1-fb3f554d7075(jetbrains.mps.lang.smodel.query.runtime)" kind="rt" />
           <module ref="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" kind="rt" />
-          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="rt" />
           <module ref="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" kind="rt" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
           <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" kind="cl" />
@@ -946,35 +937,18 @@
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
         <fileset file="${artifacts.mps}/lib/trove.jar" />
         <fileset file="${artifacts.mps}/languages/runtimes/jetbrains.mps.analyzers.runtime.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.regexp.runtime.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.runtime.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.typechecking.jar" />
         <fileset file="${artifacts.mps}/languages/runtimes/jetbrains.mps.dataFlow.runtime.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.aspect.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.runtime.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.template.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.aspects.jar" />
         <fileset file="${artifacts.mps}/plugins/mps-core/languages/languageDesign/jetbrains.mps.lang.editor.table.runtime.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.modelapi.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
         <fileset file="${artifacts.mps}/languages/runtimes/jetbrains.mps.lang.smodel.query.runtime.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.typechecking.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.typechecking.runtime.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.types.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.util.order.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.reactor.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.runtime.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="reactive-streams-1.0.0.final.jar" />
@@ -1110,13 +1084,11 @@
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.regexp.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.runtime.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.typechecking.jar" />
         <fileset file="${artifacts.mps}/languages/runtimes/jetbrains.mps.dataFlow.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.aspect.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.runtime.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.template.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.aspects.jar" />
@@ -1268,13 +1240,11 @@
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.regexp.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.runtime.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.typechecking.jar" />
         <fileset file="${artifacts.mps}/languages/runtimes/jetbrains.mps.dataFlow.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.aspect.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.runtime.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.template.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.aspects.jar" />
@@ -1426,13 +1396,11 @@
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.runtime.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.typechecking.jar" />
         <fileset file="${artifacts.mps}/languages/runtimes/jetbrains.mps.dataFlow.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.aspect.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.runtime.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.template.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.aspects.jar" />
@@ -1589,24 +1557,17 @@
         <fileset file="${artifacts.mps}/plugins/mps-testing/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.jar" />
         <fileset file="${artifacts.mps}/plugins/mps-testing/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.runtime.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.runtime.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.typechecking.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.runtime.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.template.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.jar" />
         <fileset file="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.matcher.jar" />
         <fileset file="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.typechecking.runtime.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.reactor.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.runtime.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="reactive-streams-1.0.0.final.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="rxjava-2.2.18.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="rxjava2-swing-0.3.7.jar" />
-        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="collection-0.7.jar" />
-        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="trove4j-3.0.3.jar" />
-        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="conreactor-core-0.9.18.jar" />
         <fileset dir="${artifacts.mps}/plugins/mps-junit5/lib" includes="apiguardian-api-1.1.2.jar" />
         <fileset dir="${artifacts.mps}/plugins/mps-junit5/lib" includes="junit-jupiter-api-5.9.3.jar" />
         <fileset dir="${artifacts.mps}/plugins/mps-junit5/lib" includes="junit-jupiter-engine-5.9.3.jar" />
diff --git a/samples/fitch/languages/samples.fitch.firstOrderLogic/models/types.mps b/samples/fitch/languages/samples.fitch.firstOrderLogic/models/types.mps
index 924ff264..e47e556b 100644
--- a/samples/fitch/languages/samples.fitch.firstOrderLogic/models/types.mps
+++ b/samples/fitch/languages/samples.fitch.firstOrderLogic/models/types.mps
@@ -4,7 +4,6 @@
   <languages>
     <use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="25" />
     <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="13" />
-    <use id="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462" name="jetbrains.mps.lang.typechecking" version="1" />
     <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
     <devkit ref="888618cf-7697-4adc-80cd-8c6ea3486ef7(jetbrains.mps.devkit.aspect.types)" />
   </languages>
diff --git a/samples/fitch/languages/samples.fitch.firstOrderLogic/samples.fitch.firstOrderLogic.mpl b/samples/fitch/languages/samples.fitch.firstOrderLogic/samples.fitch.firstOrderLogic.mpl
index 6f1c1282..82e9c2fb 100644
--- a/samples/fitch/languages/samples.fitch.firstOrderLogic/samples.fitch.firstOrderLogic.mpl
+++ b/samples/fitch/languages/samples.fitch.firstOrderLogic/samples.fitch.firstOrderLogic.mpl
@@ -125,7 +125,6 @@
     <module reference="83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)" version="0" />
     <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
     <module reference="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c(jetbrains.mps.coderules)" version="0" />
-    <module reference="f113d56b-63e3-4120-a89c-2f5dcb8c6290(jetbrains.mps.coderules.runtime)" version="0" />
     <module reference="6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.coderules.typechecking)" version="0" />
     <module reference="bfbdd672-7ff5-403f-af4f-16da5226f34c(jetbrains.mps.findUsages.runtime)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
@@ -133,7 +132,6 @@
     <module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
     <module reference="c4803b19-6d89-4a3b-bf82-390769514add(jetbrains.mps.lang.coderules)" version="0" />
     <module reference="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" version="0" />
-    <module reference="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="f4ad079d-bc71-4ffb-9600-9328705cf998(jetbrains.mps.lang.descriptor)" version="0" />
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
@@ -147,8 +145,6 @@
     <module reference="afc17aaf-3a3d-4d69-a38d-db90d5e858c6(jetbrains.mps.lang.types)" version="0" />
     <module reference="c9d137c4-3259-44f8-80ff-33ab2b506ee4(jetbrains.mps.lang.util.order)" version="0" />
     <module reference="35320f26-77cb-4c55-be9f-a97a27770af1(jetbrains.mps.logic)" 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="da80355b-a098-4248-9ec8-70d10dd7e9af(jetbrains.mps.reporting.runtime)" version="0" />
     <module reference="06b7c5c7-e359-4f4b-a581-5d0c9323af39(samples.fitch)" version="1" />
     <module reference="ddb01c98-e78e-4c79-b11a-aeba193668d4(samples.fitch.firstOrderLogic)" version="0" />
diff --git a/samples/fitch/languages/samples.fitch.herbrandLogic/models/types.mps b/samples/fitch/languages/samples.fitch.herbrandLogic/models/types.mps
index 86d828cd..666bcf00 100644
--- a/samples/fitch/languages/samples.fitch.herbrandLogic/models/types.mps
+++ b/samples/fitch/languages/samples.fitch.herbrandLogic/models/types.mps
@@ -6,7 +6,6 @@
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
     <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="13" />
-    <use id="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462" name="jetbrains.mps.lang.typechecking" version="1" />
     <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
     <devkit ref="888618cf-7697-4adc-80cd-8c6ea3486ef7(jetbrains.mps.devkit.aspect.types)" />
   </languages>
diff --git a/samples/fitch/languages/samples.fitch.herbrandLogic/samples.fitch.herbrandLogic.mpl b/samples/fitch/languages/samples.fitch.herbrandLogic/samples.fitch.herbrandLogic.mpl
index 8f18058b..35339015 100644
--- a/samples/fitch/languages/samples.fitch.herbrandLogic/samples.fitch.herbrandLogic.mpl
+++ b/samples/fitch/languages/samples.fitch.herbrandLogic/samples.fitch.herbrandLogic.mpl
@@ -127,7 +127,6 @@
     <module reference="daafa647-f1f7-4b0b-b096-69cd7c8408c0(jetbrains.mps.baseLanguage.regexp)" version="0" />
     <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
     <module reference="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c(jetbrains.mps.coderules)" version="0" />
-    <module reference="f113d56b-63e3-4120-a89c-2f5dcb8c6290(jetbrains.mps.coderules.runtime)" version="0" />
     <module reference="6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.coderules.typechecking)" version="0" />
     <module reference="bfbdd672-7ff5-403f-af4f-16da5226f34c(jetbrains.mps.findUsages.runtime)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
@@ -135,7 +134,6 @@
     <module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
     <module reference="c4803b19-6d89-4a3b-bf82-390769514add(jetbrains.mps.lang.coderules)" version="0" />
     <module reference="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" version="0" />
-    <module reference="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="f4ad079d-bc71-4ffb-9600-9328705cf998(jetbrains.mps.lang.descriptor)" version="0" />
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
@@ -149,8 +147,6 @@
     <module reference="afc17aaf-3a3d-4d69-a38d-db90d5e858c6(jetbrains.mps.lang.types)" version="0" />
     <module reference="c9d137c4-3259-44f8-80ff-33ab2b506ee4(jetbrains.mps.lang.util.order)" version="0" />
     <module reference="35320f26-77cb-4c55-be9f-a97a27770af1(jetbrains.mps.logic)" 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="da80355b-a098-4248-9ec8-70d10dd7e9af(jetbrains.mps.reporting.runtime)" version="0" />
     <module reference="06b7c5c7-e359-4f4b-a581-5d0c9323af39(samples.fitch)" version="1" />
     <module reference="748b3ba1-2791-4ee8-b985-a5598baa7112(samples.fitch.herbrandLogic)" version="0" />
diff --git a/samples/fitch/languages/samples.fitch.propositionalLogic/models/types.mps b/samples/fitch/languages/samples.fitch.propositionalLogic/models/types.mps
index e25cc2e2..bcdd864c 100644
--- a/samples/fitch/languages/samples.fitch.propositionalLogic/models/types.mps
+++ b/samples/fitch/languages/samples.fitch.propositionalLogic/models/types.mps
@@ -7,7 +7,6 @@
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="13" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
-    <use id="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462" name="jetbrains.mps.lang.typechecking" version="1" />
     <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
     <devkit ref="888618cf-7697-4adc-80cd-8c6ea3486ef7(jetbrains.mps.devkit.aspect.types)" />
   </languages>
diff --git a/samples/fitch/languages/samples.fitch.propositionalLogic/samples.fitch.propositionalLogic.mpl b/samples/fitch/languages/samples.fitch.propositionalLogic/samples.fitch.propositionalLogic.mpl
index cda7e694..8b4b2688 100644
--- a/samples/fitch/languages/samples.fitch.propositionalLogic/samples.fitch.propositionalLogic.mpl
+++ b/samples/fitch/languages/samples.fitch.propositionalLogic/samples.fitch.propositionalLogic.mpl
@@ -125,7 +125,6 @@
     <module reference="daafa647-f1f7-4b0b-b096-69cd7c8408c0(jetbrains.mps.baseLanguage.regexp)" version="0" />
     <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
     <module reference="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c(jetbrains.mps.coderules)" version="0" />
-    <module reference="f113d56b-63e3-4120-a89c-2f5dcb8c6290(jetbrains.mps.coderules.runtime)" version="0" />
     <module reference="6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.coderules.typechecking)" version="0" />
     <module reference="bfbdd672-7ff5-403f-af4f-16da5226f34c(jetbrains.mps.findUsages.runtime)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
@@ -133,7 +132,6 @@
     <module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
     <module reference="c4803b19-6d89-4a3b-bf82-390769514add(jetbrains.mps.lang.coderules)" version="0" />
     <module reference="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" version="0" />
-    <module reference="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="f4ad079d-bc71-4ffb-9600-9328705cf998(jetbrains.mps.lang.descriptor)" version="0" />
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
@@ -147,8 +145,6 @@
     <module reference="afc17aaf-3a3d-4d69-a38d-db90d5e858c6(jetbrains.mps.lang.types)" version="0" />
     <module reference="c9d137c4-3259-44f8-80ff-33ab2b506ee4(jetbrains.mps.lang.util.order)" version="0" />
     <module reference="35320f26-77cb-4c55-be9f-a97a27770af1(jetbrains.mps.logic)" 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="da80355b-a098-4248-9ec8-70d10dd7e9af(jetbrains.mps.reporting.runtime)" version="0" />
     <module reference="06b7c5c7-e359-4f4b-a581-5d0c9323af39(samples.fitch)" version="1" />
     <module reference="ec79e64d-4cbb-4f6c-b7b7-108dd125aba6(samples.fitch.propositionalLogic)" version="0" />
diff --git a/samples/fitch/languages/samples.fitch/models/types.mps b/samples/fitch/languages/samples.fitch/models/types.mps
index 9c4fccff..8a1cd269 100644
--- a/samples/fitch/languages/samples.fitch/models/types.mps
+++ b/samples/fitch/languages/samples.fitch/models/types.mps
@@ -10,7 +10,6 @@
   </languages>
   <imports>
     <import index="jfgh" ref="r:2003997c-f9a6-418f-99d4-03e1285a3e13(samples.fitch.structure)" />
-    <import index="tj24" ref="r:0fbbb63a-fd15-46e1-8136-78049f6d6e63(jetbrains.mps.coderules.typechecking.service)" />
     <import index="82uw" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.function(JDK/)" />
   </imports>
   <registry>
diff --git a/samples/fitch/languages/samples.fitch/samples.fitch.mpl b/samples/fitch/languages/samples.fitch/samples.fitch.mpl
index 19f7c5d0..7e6b8d87 100644
--- a/samples/fitch/languages/samples.fitch/samples.fitch.mpl
+++ b/samples/fitch/languages/samples.fitch/samples.fitch.mpl
@@ -55,11 +55,10 @@
     </generator>
   </generators>
   <dependencies>
-    <dependency reexport="false">6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.coderules.typechecking)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)</dependency>
-    <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
-    <dependency reexport="false">4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462(jetbrains.mps.lang.typechecking)</dependency>
+    <dependency reexport="false">a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)</dependency>
+    <dependency reexport="false">6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.coderules.typechecking)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
@@ -122,33 +121,14 @@
     <module reference="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" version="0" />
     <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
     <module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
-    <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
-    <module reference="fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)" version="0" />
-    <module reference="83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)" version="0" />
-    <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
     <module reference="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c(jetbrains.mps.coderules)" version="0" />
-    <module reference="f113d56b-63e3-4120-a89c-2f5dcb8c6290(jetbrains.mps.coderules.runtime)" version="0" />
     <module reference="6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.coderules.typechecking)" version="0" />
     <module reference="bfbdd672-7ff5-403f-af4f-16da5226f34c(jetbrains.mps.findUsages.runtime)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
-    <module reference="f159adf4-3c93-40f9-9c5a-1f245a8697af(jetbrains.mps.lang.aspect)" version="0" />
-    <module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
-    <module reference="c4803b19-6d89-4a3b-bf82-390769514add(jetbrains.mps.lang.coderules)" version="0" />
     <module reference="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" version="0" />
-    <module reference="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
-    <module reference="f4ad079d-bc71-4ffb-9600-9328705cf998(jetbrains.mps.lang.descriptor)" version="0" />
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
-    <module reference="446c26eb-2b7b-4bf0-9b35-f83fa582753e(jetbrains.mps.lang.modelapi)" version="0" />
-    <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
-    <module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="1" />
-    <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="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462(jetbrains.mps.lang.typechecking)" version="0" />
     <module reference="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" version="0" />
-    <module reference="afc17aaf-3a3d-4d69-a38d-db90d5e858c6(jetbrains.mps.lang.types)" version="0" />
-    <module reference="c9d137c4-3259-44f8-80ff-33ab2b506ee4(jetbrains.mps.lang.util.order)" version="0" />
-    <module reference="35320f26-77cb-4c55-be9f-a97a27770af1(jetbrains.mps.logic)" 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="da80355b-a098-4248-9ec8-70d10dd7e9af(jetbrains.mps.reporting.runtime)" version="0" />
diff --git a/samples/fitch/solutions/samples.fitch.build/models/samples.fitch.build.mps b/samples/fitch/solutions/samples.fitch.build/models/samples.fitch.build.mps
index 7013cbc1..7ac56f1f 100644
--- a/samples/fitch/solutions/samples.fitch.build/models/samples.fitch.build.mps
+++ b/samples/fitch/solutions/samples.fitch.build/models/samples.fitch.build.mps
@@ -191,16 +191,6 @@
             <ref role="3bR37D" to="ffeo:7Kfy9QB6LfQ" resolve="jetbrains.mps.kernel" />
           </node>
         </node>
-        <node concept="1SiIV0" id="2Bpms61P1HA" role="3bR37C">
-          <node concept="3bR9La" id="2Bpms61P1HB" role="1SiIV1">
-            <ref role="3bR37D" to="ffeo:1H905DlDUSw" resolve="MPS.OpenAPI" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="2Bpms61Pcok" role="3bR37C">
-          <node concept="3bR9La" id="2Bpms61Pcol" role="1SiIV1">
-            <ref role="3bR37D" to="zqd8:NKt6ynvPIP" resolve="jetbrains.mps.lang.typechecking" />
-          </node>
-        </node>
         <node concept="3rtmxn" id="7L5omges4XA" role="3bR31x">
           <node concept="3LXTmp" id="7L5omges4XB" role="3rtmxm">
             <node concept="3qWCbU" id="7L5omges4XC" role="3LXTna">
@@ -238,8 +228,13 @@
             </node>
           </node>
         </node>
-        <node concept="1SiIV0" id="2CPBoDB7hk4" role="3bR37C">
-          <node concept="3bR9La" id="2CPBoDB7hk5" role="1SiIV1">
+        <node concept="1SiIV0" id="74$3PKnBSeu" role="3bR37C">
+          <node concept="3bR9La" id="74$3PKnBSev" role="1SiIV1">
+            <ref role="3bR37D" to="zqd8:74$3PKm_L$v" resolve="jetbrains.mps.logic.runtime" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="74$3PKnDhyp" role="3bR37C">
+          <node concept="3bR9La" id="74$3PKnDhyq" role="1SiIV1">
             <ref role="3bR37D" to="zqd8:2CPBoDB0Mtg" resolve="jetbrains.mps.coderules.typechecking" />
           </node>
         </node>
diff --git a/samples/lambdacalc/build.xml b/samples/lambdacalc/build.xml
index 6ca6d612..fe9104b2 100644
--- a/samples/lambdacalc/build.xml
+++ b/samples/lambdacalc/build.xml
@@ -71,7 +71,6 @@
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" kind="rt" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" kind="rt" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="rt" />
-          <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" kind="rt" />
           <module ref="8e98f4e2-decf-4e97-bf80-9109e8b759ee(jetbrains.mps.lang.constraints.rules.runtime)" kind="rt" />
           <module ref="9e9ef4e2-decf-4e97-bf80-9109e8b759bb(jetbrains.mps.lang.feedback.api)" kind="rt" />
           <module ref="3f98f4e2-decf-4e97-bf80-9109e8b759ab(jetbrains.mps.lang.feedback.problem.rt)" kind="rt" />
@@ -81,13 +80,9 @@
           <module ref="3330376f-82a0-45ed-ae50-a320ee8b0b63(jetbrains.mps.lang.script.rt)" kind="rt" />
           <module ref="31f56055-9d30-42b3-a2b1-fb3f554d7075(jetbrains.mps.lang.smodel.query.runtime)" kind="rt" />
           <module ref="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" kind="rt" />
-          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="rt" />
           <module ref="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" kind="rt" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
           <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" kind="cl" />
-          <module ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" kind="cl" />
-          <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" kind="cl" />
-          <module ref="f113d56b-63e3-4120-a89c-2f5dcb8c6290(jetbrains.mps.coderules.runtime)" kind="cl" />
           <module ref="6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.coderules.typechecking)" kind="cl" />
           <module ref="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" kind="cl" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="cl" />
@@ -360,11 +355,9 @@
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.regexp.runtime.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.runtime.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.typechecking.jar" />
         <fileset file="${artifacts.mps}/languages/runtimes/jetbrains.mps.dataFlow.runtime.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.runtime.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.template.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.aspects.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
@@ -446,26 +439,19 @@
         <fileset file="${artifacts.mps}/plugins/mps-testing/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.jar" />
         <fileset file="${artifacts.mps}/plugins/mps-testing/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.runtime.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.runtime.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.testhelper.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.typechecking.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.typechecking.test.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.runtime.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.template.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.jar" />
         <fileset file="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.matcher.jar" />
         <fileset file="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.typechecking.runtime.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.reactor.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.runtime.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="reactive-streams-1.0.0.final.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="rxjava-2.2.18.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="rxjava2-swing-0.3.7.jar" />
-        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="collection-0.7.jar" />
-        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="trove4j-3.0.3.jar" />
-        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="conreactor-core-0.9.18.jar" />
         <fileset dir="${artifacts.mps}/plugins/mps-junit5/lib" includes="apiguardian-api-1.1.2.jar" />
         <fileset dir="${artifacts.mps}/plugins/mps-junit5/lib" includes="junit-jupiter-api-5.9.3.jar" />
         <fileset dir="${artifacts.mps}/plugins/mps-junit5/lib" includes="junit-jupiter-engine-5.9.3.jar" />
diff --git a/samples/lambdacalc/languages/samples.lambdacalc/models/types.mps b/samples/lambdacalc/languages/samples.lambdacalc/models/types.mps
index 0c7521cc..84dc2dfc 100644
--- a/samples/lambdacalc/languages/samples.lambdacalc/models/types.mps
+++ b/samples/lambdacalc/languages/samples.lambdacalc/models/types.mps
@@ -16,13 +16,10 @@
   </languages>
   <imports>
     <import index="8tt8" ref="r:e74c1bfc-387b-4b4b-abee-2eb77ee510ec(samples.lambdacalc.structure)" />
-    <import index="hano" ref="r:2b43b673-12f9-49ea-8e43-d0c7a401586a(jetbrains.mps.lang.coderules.eval)" />
     <import index="bj13" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.logical(jetbrains.mps.logic.reactor/)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
-    <import index="1g4i" ref="r:102178da-67ba-49f6-ba73-eb29fa352fe7(jetbrains.mps.coderules.typechecking)" />
-    <import index="tj24" ref="r:0fbbb63a-fd15-46e1-8136-78049f6d6e63(jetbrains.mps.coderules.typechecking.service)" />
     <import index="82uw" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.function(JDK/)" />
-    <import index="lehm" ref="r:464fcc95-fddb-47d1-b620-592cbf6b8bf2(jetbrains.mps.coderules.runtime.memoizer)" />
+    <import index="aedp" ref="r:969c74a0-af0a-4247-9dda-0da7708b8c0d(jetbrains.mps.lang.coderules.memoizer)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
   </imports>
   <registry>
@@ -2615,8 +2612,8 @@
         <node concept="3clFbS" id="6EwjVjWt1yH" role="3clF47">
           <node concept="3clFbF" id="6EwjVjWt1M_" role="3cqZAp">
             <node concept="2YIFZM" id="5wYq9r5EDbM" role="3clFbG">
-              <ref role="37wK5l" to="lehm:2tjs8VC2Blb" resolve="getOrPut" />
-              <ref role="1Pybhc" to="lehm:2tjs8VC0K0m" resolve="Memoizer" />
+              <ref role="37wK5l" to="aedp:2tjs8VC2Blb" resolve="getOrPut" />
+              <ref role="1Pybhc" to="aedp:2tjs8VC0K0m" resolve="Memoizer" />
               <node concept="3VsKOn" id="6EwjVjWt2cm" role="37wK5m">
                 <ref role="3VsUkX" node="6EwjVjWt1pM" resolve="VarNames.Keeper" />
               </node>
diff --git a/samples/lambdacalc/languages/samples.lambdacalc/samples.lambdacalc.mpl b/samples/lambdacalc/languages/samples.lambdacalc/samples.lambdacalc.mpl
index d45be40c..40967fc6 100644
--- a/samples/lambdacalc/languages/samples.lambdacalc/samples.lambdacalc.mpl
+++ b/samples/lambdacalc/languages/samples.lambdacalc/samples.lambdacalc.mpl
@@ -12,15 +12,12 @@
   </facets>
   <accessoryModels />
   <dependencies>
-    <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
     <dependency reexport="false">26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
-    <dependency reexport="false">a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)</dependency>
     <dependency reexport="false">2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)</dependency>
-    <dependency reexport="false">498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)</dependency>
     <dependency reexport="false">bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)</dependency>
+    <dependency reexport="false">a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)</dependency>
     <dependency reexport="false">6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.coderules.typechecking)</dependency>
-    <dependency reexport="false">f113d56b-63e3-4120-a89c-2f5dcb8c6290(jetbrains.mps.coderules.runtime)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
@@ -84,12 +81,10 @@
     <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
     <module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
     <module reference="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c(jetbrains.mps.coderules)" version="0" />
-    <module reference="f113d56b-63e3-4120-a89c-2f5dcb8c6290(jetbrains.mps.coderules.runtime)" version="0" />
     <module reference="6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.coderules.typechecking)" version="0" />
     <module reference="bfbdd672-7ff5-403f-af4f-16da5226f34c(jetbrains.mps.findUsages.runtime)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
     <module reference="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" version="0" />
-    <module reference="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
     <module reference="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" version="0" />
diff --git a/samples/lambdacalc/solutions/samples.lambdacalc.build/models/samples.lamdacalc.build.mps b/samples/lambdacalc/solutions/samples.lambdacalc.build/models/samples.lamdacalc.build.mps
index 105e00e8..3cbd56c8 100644
--- a/samples/lambdacalc/solutions/samples.lambdacalc.build/models/samples.lamdacalc.build.mps
+++ b/samples/lambdacalc/solutions/samples.lambdacalc.build/models/samples.lamdacalc.build.mps
@@ -149,11 +149,6 @@
             </node>
           </node>
         </node>
-        <node concept="1SiIV0" id="7E7FS_VaVAC" role="3bR37C">
-          <node concept="3bR9La" id="7E7FS_VaVAD" role="1SiIV1">
-            <ref role="3bR37D" to="ffeo:1H905DlDUSw" resolve="MPS.OpenAPI" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="7E7FS_VaVAE" role="3bR37C">
           <node concept="3bR9La" id="7E7FS_VaVAF" role="1SiIV1">
             <ref role="3bR37D" to="zqd8:7BVjoXzUxee" resolve="jetbrains.mps.lang.coderules.runtime" />
@@ -169,16 +164,6 @@
             <ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
           </node>
         </node>
-        <node concept="1SiIV0" id="7E7FS_VaVAK" role="3bR37C">
-          <node concept="3bR9La" id="7E7FS_VaVAL" role="1SiIV1">
-            <ref role="3bR37D" to="zqd8:7BVjoXzUx$V" resolve="jetbrains.mps.logic.runtime" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="7E7FS_VaVAM" role="3bR37C">
-          <node concept="3bR9La" id="7E7FS_VaVAN" role="1SiIV1">
-            <ref role="3bR37D" to="ffeo:1ia2VB5guYy" resolve="MPS.IDEA" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="7E7FS_VaVAO" role="3bR37C">
           <node concept="3bR9La" id="7E7FS_VaVAP" role="1SiIV1">
             <ref role="3bR37D" to="ffeo:7Kfy9QB6LfQ" resolve="jetbrains.mps.kernel" />
@@ -221,13 +206,13 @@
             </node>
           </node>
         </node>
-        <node concept="1SiIV0" id="5wYq9r5EEtL" role="3bR37C">
-          <node concept="3bR9La" id="5wYq9r5EEtM" role="1SiIV1">
-            <ref role="3bR37D" to="zqd8:5wYq9r5EBDN" resolve="jetbrains.mps.coderules.runtime" />
+        <node concept="1SiIV0" id="74$3PKnEfbB" role="3bR37C">
+          <node concept="3bR9La" id="74$3PKnEfbC" role="1SiIV1">
+            <ref role="3bR37D" to="zqd8:74$3PKm_L$v" resolve="jetbrains.mps.logic.runtime" />
           </node>
         </node>
-        <node concept="1SiIV0" id="2CPBoDB7ht9" role="3bR37C">
-          <node concept="3bR9La" id="2CPBoDB7hta" role="1SiIV1">
+        <node concept="1SiIV0" id="1A8VbiT3_VG" role="3bR37C">
+          <node concept="3bR9La" id="1A8VbiT3_VH" role="1SiIV1">
             <ref role="3bR37D" to="zqd8:2CPBoDB0Mtg" resolve="jetbrains.mps.coderules.typechecking" />
           </node>
         </node>
diff --git a/samples/mpscore/build.xml b/samples/mpscore/build.xml
index 64da6302..9ae9f615 100644
--- a/samples/mpscore/build.xml
+++ b/samples/mpscore/build.xml
@@ -74,7 +74,6 @@
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" kind="rt" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" kind="rt" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="rt" />
-          <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" kind="rt" />
           <module ref="8e98f4e2-decf-4e97-bf80-9109e8b759ee(jetbrains.mps.lang.constraints.rules.runtime)" kind="rt" />
           <module ref="9e9ef4e2-decf-4e97-bf80-9109e8b759bb(jetbrains.mps.lang.feedback.api)" kind="rt" />
           <module ref="3f98f4e2-decf-4e97-bf80-9109e8b759ab(jetbrains.mps.lang.feedback.problem.rt)" kind="rt" />
@@ -84,7 +83,6 @@
           <module ref="3330376f-82a0-45ed-ae50-a320ee8b0b63(jetbrains.mps.lang.script.rt)" kind="rt" />
           <module ref="31f56055-9d30-42b3-a2b1-fb3f554d7075(jetbrains.mps.lang.smodel.query.runtime)" kind="rt" />
           <module ref="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" kind="rt" />
-          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="rt" />
           <module ref="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" kind="rt" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
           <module ref="0fda14cc-a416-4c81-869a-2175d8b3325d(jetbrains.mps.baseLanguageExt)" kind="cl" />
@@ -249,7 +247,6 @@
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" kind="rt" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" kind="rt" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="rt" />
-          <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" kind="rt" />
           <module ref="8e98f4e2-decf-4e97-bf80-9109e8b759ee(jetbrains.mps.lang.constraints.rules.runtime)" kind="rt" />
           <module ref="9e9ef4e2-decf-4e97-bf80-9109e8b759bb(jetbrains.mps.lang.feedback.api)" kind="rt" />
           <module ref="3f98f4e2-decf-4e97-bf80-9109e8b759ab(jetbrains.mps.lang.feedback.problem.rt)" kind="rt" />
@@ -259,7 +256,6 @@
           <module ref="3330376f-82a0-45ed-ae50-a320ee8b0b63(jetbrains.mps.lang.script.rt)" kind="rt" />
           <module ref="31f56055-9d30-42b3-a2b1-fb3f554d7075(jetbrains.mps.lang.smodel.query.runtime)" kind="rt" />
           <module ref="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" kind="rt" />
-          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="rt" />
           <module ref="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" kind="rt" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
           <module ref="0fda14cc-a416-4c81-869a-2175d8b3325d(jetbrains.mps.baseLanguageExt)" kind="cl" />
@@ -425,7 +421,6 @@
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" kind="rt" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" kind="rt" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="rt" />
-          <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" kind="rt" />
           <module ref="8e98f4e2-decf-4e97-bf80-9109e8b759ee(jetbrains.mps.lang.constraints.rules.runtime)" kind="rt" />
           <module ref="9e9ef4e2-decf-4e97-bf80-9109e8b759bb(jetbrains.mps.lang.feedback.api)" kind="rt" />
           <module ref="3f98f4e2-decf-4e97-bf80-9109e8b759ab(jetbrains.mps.lang.feedback.problem.rt)" kind="rt" />
@@ -435,7 +430,6 @@
           <module ref="3330376f-82a0-45ed-ae50-a320ee8b0b63(jetbrains.mps.lang.script.rt)" kind="rt" />
           <module ref="31f56055-9d30-42b3-a2b1-fb3f554d7075(jetbrains.mps.lang.smodel.query.runtime)" kind="rt" />
           <module ref="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" kind="rt" />
-          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="rt" />
           <module ref="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" kind="rt" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
           <module ref="88dcbb14-19c3-4776-8f81-33611ca4d87c(jetbrains.mps.baseLanguage.sequence)" kind="cl" />
@@ -599,7 +593,6 @@
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" kind="rt" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" kind="rt" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="rt" />
-          <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" kind="rt" />
           <module ref="8e98f4e2-decf-4e97-bf80-9109e8b759ee(jetbrains.mps.lang.constraints.rules.runtime)" kind="rt" />
           <module ref="9e9ef4e2-decf-4e97-bf80-9109e8b759bb(jetbrains.mps.lang.feedback.api)" kind="rt" />
           <module ref="3f98f4e2-decf-4e97-bf80-9109e8b759ab(jetbrains.mps.lang.feedback.problem.rt)" kind="rt" />
@@ -609,7 +602,6 @@
           <module ref="3330376f-82a0-45ed-ae50-a320ee8b0b63(jetbrains.mps.lang.script.rt)" kind="rt" />
           <module ref="31f56055-9d30-42b3-a2b1-fb3f554d7075(jetbrains.mps.lang.smodel.query.runtime)" kind="rt" />
           <module ref="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" kind="rt" />
-          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="rt" />
           <module ref="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" kind="rt" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
           <module ref="215c4c45-ba99-49f5-9ab7-4b6901a63cfd(MPS.Generator)" kind="cl" />
@@ -778,7 +770,6 @@
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" kind="rt" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" kind="rt" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="rt" />
-          <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" kind="rt" />
           <module ref="8e98f4e2-decf-4e97-bf80-9109e8b759ee(jetbrains.mps.lang.constraints.rules.runtime)" kind="rt" />
           <module ref="9e9ef4e2-decf-4e97-bf80-9109e8b759bb(jetbrains.mps.lang.feedback.api)" kind="rt" />
           <module ref="3f98f4e2-decf-4e97-bf80-9109e8b759ab(jetbrains.mps.lang.feedback.problem.rt)" kind="rt" />
@@ -788,7 +779,6 @@
           <module ref="3330376f-82a0-45ed-ae50-a320ee8b0b63(jetbrains.mps.lang.script.rt)" kind="rt" />
           <module ref="31f56055-9d30-42b3-a2b1-fb3f554d7075(jetbrains.mps.lang.smodel.query.runtime)" kind="rt" />
           <module ref="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" kind="rt" />
-          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="rt" />
           <module ref="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" kind="rt" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
           <module ref="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" kind="cl" />
@@ -957,7 +947,6 @@
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" kind="rt" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" kind="rt" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="rt" />
-          <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" kind="rt" />
           <module ref="8e98f4e2-decf-4e97-bf80-9109e8b759ee(jetbrains.mps.lang.constraints.rules.runtime)" kind="rt" />
           <module ref="9e9ef4e2-decf-4e97-bf80-9109e8b759bb(jetbrains.mps.lang.feedback.api)" kind="rt" />
           <module ref="3f98f4e2-decf-4e97-bf80-9109e8b759ab(jetbrains.mps.lang.feedback.problem.rt)" kind="rt" />
@@ -967,7 +956,6 @@
           <module ref="3330376f-82a0-45ed-ae50-a320ee8b0b63(jetbrains.mps.lang.script.rt)" kind="rt" />
           <module ref="31f56055-9d30-42b3-a2b1-fb3f554d7075(jetbrains.mps.lang.smodel.query.runtime)" kind="rt" />
           <module ref="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" kind="rt" />
-          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="rt" />
           <module ref="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" kind="rt" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
           <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" kind="cl" />
@@ -1138,7 +1126,6 @@
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" kind="rt" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" kind="rt" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="rt" />
-          <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" kind="rt" />
           <module ref="8e98f4e2-decf-4e97-bf80-9109e8b759ee(jetbrains.mps.lang.constraints.rules.runtime)" kind="rt" />
           <module ref="9e9ef4e2-decf-4e97-bf80-9109e8b759bb(jetbrains.mps.lang.feedback.api)" kind="rt" />
           <module ref="3f98f4e2-decf-4e97-bf80-9109e8b759ab(jetbrains.mps.lang.feedback.problem.rt)" kind="rt" />
@@ -1148,7 +1135,6 @@
           <module ref="3330376f-82a0-45ed-ae50-a320ee8b0b63(jetbrains.mps.lang.script.rt)" kind="rt" />
           <module ref="31f56055-9d30-42b3-a2b1-fb3f554d7075(jetbrains.mps.lang.smodel.query.runtime)" kind="rt" />
           <module ref="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" kind="rt" />
-          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="rt" />
           <module ref="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" kind="rt" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
           <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" kind="cl" />
@@ -1320,7 +1306,6 @@
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" kind="rt" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" kind="rt" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="rt" />
-          <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" kind="rt" />
           <module ref="8e98f4e2-decf-4e97-bf80-9109e8b759ee(jetbrains.mps.lang.constraints.rules.runtime)" kind="rt" />
           <module ref="9e9ef4e2-decf-4e97-bf80-9109e8b759bb(jetbrains.mps.lang.feedback.api)" kind="rt" />
           <module ref="3f98f4e2-decf-4e97-bf80-9109e8b759ab(jetbrains.mps.lang.feedback.problem.rt)" kind="rt" />
@@ -1330,7 +1315,6 @@
           <module ref="3330376f-82a0-45ed-ae50-a320ee8b0b63(jetbrains.mps.lang.script.rt)" kind="rt" />
           <module ref="31f56055-9d30-42b3-a2b1-fb3f554d7075(jetbrains.mps.lang.smodel.query.runtime)" kind="rt" />
           <module ref="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" kind="rt" />
-          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="rt" />
           <module ref="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" kind="rt" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
           <module ref="0fda14cc-a416-4c81-869a-2175d8b3325d(jetbrains.mps.baseLanguageExt)" kind="cl" />
@@ -1494,7 +1478,6 @@
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" kind="rt" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" kind="rt" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="rt" />
-          <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" kind="rt" />
           <module ref="8e98f4e2-decf-4e97-bf80-9109e8b759ee(jetbrains.mps.lang.constraints.rules.runtime)" kind="rt" />
           <module ref="9e9ef4e2-decf-4e97-bf80-9109e8b759bb(jetbrains.mps.lang.feedback.api)" kind="rt" />
           <module ref="3f98f4e2-decf-4e97-bf80-9109e8b759ab(jetbrains.mps.lang.feedback.problem.rt)" kind="rt" />
@@ -1504,7 +1487,6 @@
           <module ref="3330376f-82a0-45ed-ae50-a320ee8b0b63(jetbrains.mps.lang.script.rt)" kind="rt" />
           <module ref="31f56055-9d30-42b3-a2b1-fb3f554d7075(jetbrains.mps.lang.smodel.query.runtime)" kind="rt" />
           <module ref="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" kind="rt" />
-          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="rt" />
           <module ref="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" kind="rt" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
           <module ref="0fda14cc-a416-4c81-869a-2175d8b3325d(jetbrains.mps.baseLanguageExt)" kind="cl" />
@@ -1669,7 +1651,6 @@
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" kind="rt" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" kind="rt" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="rt" />
-          <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" kind="rt" />
           <module ref="8e98f4e2-decf-4e97-bf80-9109e8b759ee(jetbrains.mps.lang.constraints.rules.runtime)" kind="rt" />
           <module ref="9e9ef4e2-decf-4e97-bf80-9109e8b759bb(jetbrains.mps.lang.feedback.api)" kind="rt" />
           <module ref="3f98f4e2-decf-4e97-bf80-9109e8b759ab(jetbrains.mps.lang.feedback.problem.rt)" kind="rt" />
@@ -1679,7 +1660,6 @@
           <module ref="3330376f-82a0-45ed-ae50-a320ee8b0b63(jetbrains.mps.lang.script.rt)" kind="rt" />
           <module ref="31f56055-9d30-42b3-a2b1-fb3f554d7075(jetbrains.mps.lang.smodel.query.runtime)" kind="rt" />
           <module ref="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" kind="rt" />
-          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="rt" />
           <module ref="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" kind="rt" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
           <module ref="0fda14cc-a416-4c81-869a-2175d8b3325d(jetbrains.mps.baseLanguageExt)" kind="cl" />
@@ -1842,7 +1822,6 @@
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" kind="rt" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" kind="rt" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="rt" />
-          <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" kind="rt" />
           <module ref="8e98f4e2-decf-4e97-bf80-9109e8b759ee(jetbrains.mps.lang.constraints.rules.runtime)" kind="rt" />
           <module ref="9e9ef4e2-decf-4e97-bf80-9109e8b759bb(jetbrains.mps.lang.feedback.api)" kind="rt" />
           <module ref="3f98f4e2-decf-4e97-bf80-9109e8b759ab(jetbrains.mps.lang.feedback.problem.rt)" kind="rt" />
@@ -1852,7 +1831,6 @@
           <module ref="3330376f-82a0-45ed-ae50-a320ee8b0b63(jetbrains.mps.lang.script.rt)" kind="rt" />
           <module ref="31f56055-9d30-42b3-a2b1-fb3f554d7075(jetbrains.mps.lang.smodel.query.runtime)" kind="rt" />
           <module ref="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" kind="rt" />
-          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="rt" />
           <module ref="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" kind="rt" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
           <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" kind="cl" />
@@ -1860,14 +1838,13 @@
           <module ref="c1f5ad88-21f4-4e0e-927c-48b1ca0c2334(jetbrains.mps.baseLanguage.collectionsExt)" kind="cl" />
           <module ref="88dcbb14-19c3-4776-8f81-33611ca4d87c(jetbrains.mps.baseLanguage.sequence)" kind="cl" />
           <module ref="0fda14cc-a416-4c81-869a-2175d8b3325d(jetbrains.mps.baseLanguageExt)" kind="cl" />
-          <module ref="f113d56b-63e3-4120-a89c-2f5dcb8c6290(jetbrains.mps.coderules.runtime)" kind="cl" />
           <module ref="af65afd8-f0dd-4942-87d9-63a55f2a9db1(jetbrains.mps.lang.behavior)" kind="cl" />
-          <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="cl" />
           <module ref="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" kind="cl" />
           <module ref="446c26eb-2b7b-4bf0-9b35-f83fa582753e(jetbrains.mps.lang.modelapi)" kind="cl" />
           <module ref="86ef8290-12bb-4ca7-947f-093788f263a9(jetbrains.mps.lang.project)" kind="cl" />
           <module ref="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" kind="cl" />
           <module ref="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" kind="cl" />
+          <module ref="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" kind="cl" />
         </dependencies>
         <uses>
           <language id="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" />
@@ -2028,7 +2005,6 @@
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" kind="rt" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" kind="rt" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="rt" />
-          <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" kind="rt" />
           <module ref="8e98f4e2-decf-4e97-bf80-9109e8b759ee(jetbrains.mps.lang.constraints.rules.runtime)" kind="rt" />
           <module ref="9e9ef4e2-decf-4e97-bf80-9109e8b759bb(jetbrains.mps.lang.feedback.api)" kind="rt" />
           <module ref="3f98f4e2-decf-4e97-bf80-9109e8b759ab(jetbrains.mps.lang.feedback.problem.rt)" kind="rt" />
@@ -2038,7 +2014,6 @@
           <module ref="3330376f-82a0-45ed-ae50-a320ee8b0b63(jetbrains.mps.lang.script.rt)" kind="rt" />
           <module ref="31f56055-9d30-42b3-a2b1-fb3f554d7075(jetbrains.mps.lang.smodel.query.runtime)" kind="rt" />
           <module ref="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" kind="rt" />
-          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="rt" />
           <module ref="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" kind="rt" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
           <module ref="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" kind="cl" />
@@ -2209,7 +2184,6 @@
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" kind="rt" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" kind="rt" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="rt" />
-          <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" kind="rt" />
           <module ref="8e98f4e2-decf-4e97-bf80-9109e8b759ee(jetbrains.mps.lang.constraints.rules.runtime)" kind="rt" />
           <module ref="9e9ef4e2-decf-4e97-bf80-9109e8b759bb(jetbrains.mps.lang.feedback.api)" kind="rt" />
           <module ref="3f98f4e2-decf-4e97-bf80-9109e8b759ab(jetbrains.mps.lang.feedback.problem.rt)" kind="rt" />
@@ -2219,7 +2193,6 @@
           <module ref="3330376f-82a0-45ed-ae50-a320ee8b0b63(jetbrains.mps.lang.script.rt)" kind="rt" />
           <module ref="31f56055-9d30-42b3-a2b1-fb3f554d7075(jetbrains.mps.lang.smodel.query.runtime)" kind="rt" />
           <module ref="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" kind="rt" />
-          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="rt" />
           <module ref="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" kind="rt" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
           <module ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)" kind="cl" />
@@ -2387,7 +2360,6 @@
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" kind="rt" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" kind="rt" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="rt" />
-          <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" kind="rt" />
           <module ref="8e98f4e2-decf-4e97-bf80-9109e8b759ee(jetbrains.mps.lang.constraints.rules.runtime)" kind="rt" />
           <module ref="9e9ef4e2-decf-4e97-bf80-9109e8b759bb(jetbrains.mps.lang.feedback.api)" kind="rt" />
           <module ref="3f98f4e2-decf-4e97-bf80-9109e8b759ab(jetbrains.mps.lang.feedback.problem.rt)" kind="rt" />
@@ -2397,7 +2369,6 @@
           <module ref="3330376f-82a0-45ed-ae50-a320ee8b0b63(jetbrains.mps.lang.script.rt)" kind="rt" />
           <module ref="31f56055-9d30-42b3-a2b1-fb3f554d7075(jetbrains.mps.lang.smodel.query.runtime)" kind="rt" />
           <module ref="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" kind="rt" />
-          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="rt" />
           <module ref="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" kind="rt" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
           <module ref="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" kind="cl" />
@@ -2568,7 +2539,6 @@
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" kind="rt" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" kind="rt" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="rt" />
-          <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" kind="rt" />
           <module ref="8e98f4e2-decf-4e97-bf80-9109e8b759ee(jetbrains.mps.lang.constraints.rules.runtime)" kind="rt" />
           <module ref="9e9ef4e2-decf-4e97-bf80-9109e8b759bb(jetbrains.mps.lang.feedback.api)" kind="rt" />
           <module ref="3f98f4e2-decf-4e97-bf80-9109e8b759ab(jetbrains.mps.lang.feedback.problem.rt)" kind="rt" />
@@ -2578,7 +2548,6 @@
           <module ref="3330376f-82a0-45ed-ae50-a320ee8b0b63(jetbrains.mps.lang.script.rt)" kind="rt" />
           <module ref="31f56055-9d30-42b3-a2b1-fb3f554d7075(jetbrains.mps.lang.smodel.query.runtime)" kind="rt" />
           <module ref="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" kind="rt" />
-          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="rt" />
           <module ref="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" kind="rt" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
           <module ref="ed6d7656-532c-4bc2-81d1-af945aeb8280(jetbrains.mps.baseLanguage.blTypes)" kind="cl" />
@@ -2742,7 +2711,6 @@
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" kind="rt" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" kind="rt" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="rt" />
-          <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" kind="rt" />
           <module ref="8e98f4e2-decf-4e97-bf80-9109e8b759ee(jetbrains.mps.lang.constraints.rules.runtime)" kind="rt" />
           <module ref="9e9ef4e2-decf-4e97-bf80-9109e8b759bb(jetbrains.mps.lang.feedback.api)" kind="rt" />
           <module ref="3f98f4e2-decf-4e97-bf80-9109e8b759ab(jetbrains.mps.lang.feedback.problem.rt)" kind="rt" />
@@ -2752,7 +2720,6 @@
           <module ref="3330376f-82a0-45ed-ae50-a320ee8b0b63(jetbrains.mps.lang.script.rt)" kind="rt" />
           <module ref="31f56055-9d30-42b3-a2b1-fb3f554d7075(jetbrains.mps.lang.smodel.query.runtime)" kind="rt" />
           <module ref="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" kind="rt" />
-          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="rt" />
           <module ref="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" kind="rt" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
           <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" kind="cl" />
@@ -2918,7 +2885,6 @@
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" kind="rt" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" kind="rt" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="rt" />
-          <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" kind="rt" />
           <module ref="8e98f4e2-decf-4e97-bf80-9109e8b759ee(jetbrains.mps.lang.constraints.rules.runtime)" kind="rt" />
           <module ref="9e9ef4e2-decf-4e97-bf80-9109e8b759bb(jetbrains.mps.lang.feedback.api)" kind="rt" />
           <module ref="3f98f4e2-decf-4e97-bf80-9109e8b759ab(jetbrains.mps.lang.feedback.problem.rt)" kind="rt" />
@@ -2928,7 +2894,6 @@
           <module ref="3330376f-82a0-45ed-ae50-a320ee8b0b63(jetbrains.mps.lang.script.rt)" kind="rt" />
           <module ref="31f56055-9d30-42b3-a2b1-fb3f554d7075(jetbrains.mps.lang.smodel.query.runtime)" kind="rt" />
           <module ref="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" kind="rt" />
-          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="rt" />
           <module ref="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" kind="rt" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
           <module ref="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" kind="cl" />
@@ -3097,7 +3062,6 @@
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" kind="rt" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" kind="rt" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="rt" />
-          <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" kind="rt" />
           <module ref="8e98f4e2-decf-4e97-bf80-9109e8b759ee(jetbrains.mps.lang.constraints.rules.runtime)" kind="rt" />
           <module ref="9e9ef4e2-decf-4e97-bf80-9109e8b759bb(jetbrains.mps.lang.feedback.api)" kind="rt" />
           <module ref="3f98f4e2-decf-4e97-bf80-9109e8b759ab(jetbrains.mps.lang.feedback.problem.rt)" kind="rt" />
@@ -3107,7 +3071,6 @@
           <module ref="3330376f-82a0-45ed-ae50-a320ee8b0b63(jetbrains.mps.lang.script.rt)" kind="rt" />
           <module ref="31f56055-9d30-42b3-a2b1-fb3f554d7075(jetbrains.mps.lang.smodel.query.runtime)" kind="rt" />
           <module ref="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" kind="rt" />
-          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="rt" />
           <module ref="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" kind="rt" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
           <module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" kind="cl" />
@@ -3276,7 +3239,6 @@
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" kind="rt" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" kind="rt" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="rt" />
-          <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" kind="rt" />
           <module ref="8e98f4e2-decf-4e97-bf80-9109e8b759ee(jetbrains.mps.lang.constraints.rules.runtime)" kind="rt" />
           <module ref="9e9ef4e2-decf-4e97-bf80-9109e8b759bb(jetbrains.mps.lang.feedback.api)" kind="rt" />
           <module ref="3f98f4e2-decf-4e97-bf80-9109e8b759ab(jetbrains.mps.lang.feedback.problem.rt)" kind="rt" />
@@ -3286,7 +3248,6 @@
           <module ref="3330376f-82a0-45ed-ae50-a320ee8b0b63(jetbrains.mps.lang.script.rt)" kind="rt" />
           <module ref="31f56055-9d30-42b3-a2b1-fb3f554d7075(jetbrains.mps.lang.smodel.query.runtime)" kind="rt" />
           <module ref="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" kind="rt" />
-          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="rt" />
           <module ref="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" kind="rt" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
           <module ref="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" kind="cl" />
@@ -3437,8 +3398,10 @@
           <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" kind="rt" />
           <module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" kind="rt" />
           <module ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)" kind="rt" />
+          <module ref="215c4c45-ba99-49f5-9ab7-4b6901a63cfd(MPS.Generator)" kind="rt" />
           <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" kind="rt" />
           <module ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" kind="rt" />
+          <module ref="7124e466-fc92-4803-a656-d7a6b7eb3910(MPS.TextGen)" kind="rt" />
           <module ref="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" kind="rt" />
           <module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" kind="rt" />
           <module ref="af19274f-5f89-42dd-8f3c-c9932448f7f2(jetbrains.mps.analyzers.runtime)" kind="rt" />
@@ -3446,29 +3409,23 @@
           <module ref="52b81ac7-93fd-4e9e-b972-4995882da6d4(jetbrains.mps.baseLanguage.references.runtime)" kind="rt" />
           <module ref="d44dab97-aaac-44cb-9745-8a14db674c03(jetbrains.mps.baseLanguage.tuples.runtime)" kind="rt" />
           <module ref="2af156ab-65c1-4a62-bd0d-ea734f71eab6(jetbrains.mps.dataFlow.runtime)" kind="rt" />
+          <module ref="34e84b8f-afa8-4364-abcd-a279fddddbe7(jetbrains.mps.editor.runtime)" kind="rt" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" kind="rt" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" kind="rt" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="rt" />
-          <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" kind="rt" />
           <module ref="8e98f4e2-decf-4e97-bf80-9109e8b759ee(jetbrains.mps.lang.constraints.rules.runtime)" kind="rt" />
           <module ref="9e9ef4e2-decf-4e97-bf80-9109e8b759bb(jetbrains.mps.lang.feedback.api)" kind="rt" />
           <module ref="3f98f4e2-decf-4e97-bf80-9109e8b759ab(jetbrains.mps.lang.feedback.problem.rt)" kind="rt" />
           <module ref="0a98f3e2-decf-4e97-bf80-9109eccc59bb(jetbrains.mps.lang.feedback.problem.rules)" kind="rt" />
           <module ref="9abaaae2-decf-4e97-bf80-9109e8b759cc(jetbrains.mps.lang.messages.api)" kind="rt" />
           <module ref="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" kind="rt" />
+          <module ref="3330376f-82a0-45ed-ae50-a320ee8b0b63(jetbrains.mps.lang.script.rt)" kind="rt" />
           <module ref="31f56055-9d30-42b3-a2b1-fb3f554d7075(jetbrains.mps.lang.smodel.query.runtime)" kind="rt" />
-          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="rt" />
+          <module ref="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" kind="rt" />
+          <module ref="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" kind="rt" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
-          <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" kind="cl" />
-          <module ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" kind="cl" />
           <module ref="f2801650-65d5-424e-bb1b-463a8781b786(jetbrains.mps.baseLanguage.javadoc)" kind="cl" />
-          <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="cl" />
-          <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" kind="cl" />
           <module ref="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" kind="cl" />
-          <module ref="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462(jetbrains.mps.lang.typechecking)" kind="cl" />
-          <module ref="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" kind="cl" />
-          <module ref="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" kind="cl" />
-          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="cl" />
         </dependencies>
         <uses>
           <language id="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" />
@@ -3502,18 +3459,28 @@
           <language id="l:033598a4-76a9-47e1-ac89-a300c0fceab8:jetbrains.mps.lang.feedback.problem" />
           <language id="l:db2a46c2-ebec-4b6c-b6c2-f9b55b9b6f8a:jetbrains.mps.lang.feedback.problem.failingRule" />
           <language id="l:517077fd-e44f-4338-a475-1d29781dfdb8:jetbrains.mps.lang.feedback.skeleton" />
+          <language id="l:64d34fcd-ad02-4e73-aff8-a581124c2e30:jetbrains.mps.lang.findUsages" />
+          <language id="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" />
+          <language id="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" />
+          <language id="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" />
           <language id="l:ad93155d-79b2-4759-b10c-55123e763903:jetbrains.mps.lang.messages" />
           <language id="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" />
           <language id="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" />
+          <language id="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" />
           <language id="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" />
           <language id="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" />
           <language id="l:d8f591ec-4d86-4af2-9f92-a9e93c803ffa:jetbrains.mps.lang.scopes" />
+          <language id="l:0eddeefa-c2d6-4437-bc2c-de50fd4ce470:jetbrains.mps.lang.script" />
           <language id="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" />
           <language id="l:69b8a993-9b87-4d96-bf0c-3559f4bb0c63:jetbrains.mps.lang.slanguage" />
           <language id="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" />
           <language id="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" />
           <language id="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" />
+          <language id="l:b83431fe-5c8f-40bc-8a36-65e25f4dd253:jetbrains.mps.lang.textGen" />
+          <language id="l:4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462:jetbrains.mps.lang.typechecking" />
+          <language id="l:afc17aaf-3a3d-4d69-a38d-db90d5e858c6:jetbrains.mps.lang.types" />
           <language id="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" />
+          <language id="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" />
         </uses>
         <classpath>
           <entry path="." />
@@ -3562,7 +3529,6 @@
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" kind="rt" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" kind="rt" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="rt" />
-          <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" kind="rt" />
           <module ref="8e98f4e2-decf-4e97-bf80-9109e8b759ee(jetbrains.mps.lang.constraints.rules.runtime)" kind="rt" />
           <module ref="9e9ef4e2-decf-4e97-bf80-9109e8b759bb(jetbrains.mps.lang.feedback.api)" kind="rt" />
           <module ref="3f98f4e2-decf-4e97-bf80-9109e8b759ab(jetbrains.mps.lang.feedback.problem.rt)" kind="rt" />
@@ -3572,7 +3538,6 @@
           <module ref="3330376f-82a0-45ed-ae50-a320ee8b0b63(jetbrains.mps.lang.script.rt)" kind="rt" />
           <module ref="31f56055-9d30-42b3-a2b1-fb3f554d7075(jetbrains.mps.lang.smodel.query.runtime)" kind="rt" />
           <module ref="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" kind="rt" />
-          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="rt" />
           <module ref="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" kind="rt" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
           <module ref="2405a196-e75d-462c-938b-ae8e3fac20aa(jetbrains.mps.baseLanguage.kotlinRefs)" kind="cl" />
@@ -3737,7 +3702,6 @@
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" kind="rt" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" kind="rt" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="rt" />
-          <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" kind="rt" />
           <module ref="8e98f4e2-decf-4e97-bf80-9109e8b759ee(jetbrains.mps.lang.constraints.rules.runtime)" kind="rt" />
           <module ref="9e9ef4e2-decf-4e97-bf80-9109e8b759bb(jetbrains.mps.lang.feedback.api)" kind="rt" />
           <module ref="3f98f4e2-decf-4e97-bf80-9109e8b759ab(jetbrains.mps.lang.feedback.problem.rt)" kind="rt" />
@@ -3747,7 +3711,6 @@
           <module ref="3330376f-82a0-45ed-ae50-a320ee8b0b63(jetbrains.mps.lang.script.rt)" kind="rt" />
           <module ref="31f56055-9d30-42b3-a2b1-fb3f554d7075(jetbrains.mps.lang.smodel.query.runtime)" kind="rt" />
           <module ref="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" kind="rt" />
-          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="rt" />
           <module ref="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" kind="rt" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
           <module ref="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" kind="cl" />
@@ -3912,7 +3875,6 @@
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" kind="rt" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" kind="rt" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="rt" />
-          <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" kind="rt" />
           <module ref="8e98f4e2-decf-4e97-bf80-9109e8b759ee(jetbrains.mps.lang.constraints.rules.runtime)" kind="rt" />
           <module ref="9e9ef4e2-decf-4e97-bf80-9109e8b759bb(jetbrains.mps.lang.feedback.api)" kind="rt" />
           <module ref="3f98f4e2-decf-4e97-bf80-9109e8b759ab(jetbrains.mps.lang.feedback.problem.rt)" kind="rt" />
@@ -3922,7 +3884,6 @@
           <module ref="3330376f-82a0-45ed-ae50-a320ee8b0b63(jetbrains.mps.lang.script.rt)" kind="rt" />
           <module ref="31f56055-9d30-42b3-a2b1-fb3f554d7075(jetbrains.mps.lang.smodel.query.runtime)" kind="rt" />
           <module ref="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" kind="rt" />
-          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="rt" />
           <module ref="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" kind="rt" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
           <module ref="0fda14cc-a416-4c81-869a-2175d8b3325d(jetbrains.mps.baseLanguageExt)" kind="cl" />
@@ -4087,7 +4048,6 @@
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" kind="rt" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" kind="rt" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="rt" />
-          <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" kind="rt" />
           <module ref="8e98f4e2-decf-4e97-bf80-9109e8b759ee(jetbrains.mps.lang.constraints.rules.runtime)" kind="rt" />
           <module ref="9e9ef4e2-decf-4e97-bf80-9109e8b759bb(jetbrains.mps.lang.feedback.api)" kind="rt" />
           <module ref="3f98f4e2-decf-4e97-bf80-9109e8b759ab(jetbrains.mps.lang.feedback.problem.rt)" kind="rt" />
@@ -4097,7 +4057,6 @@
           <module ref="3330376f-82a0-45ed-ae50-a320ee8b0b63(jetbrains.mps.lang.script.rt)" kind="rt" />
           <module ref="31f56055-9d30-42b3-a2b1-fb3f554d7075(jetbrains.mps.lang.smodel.query.runtime)" kind="rt" />
           <module ref="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" kind="rt" />
-          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="rt" />
           <module ref="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" kind="rt" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
           <module ref="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" kind="cl" />
@@ -4266,7 +4225,6 @@
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" kind="rt" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" kind="rt" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="rt" />
-          <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" kind="rt" />
           <module ref="8e98f4e2-decf-4e97-bf80-9109e8b759ee(jetbrains.mps.lang.constraints.rules.runtime)" kind="rt" />
           <module ref="9e9ef4e2-decf-4e97-bf80-9109e8b759bb(jetbrains.mps.lang.feedback.api)" kind="rt" />
           <module ref="3f98f4e2-decf-4e97-bf80-9109e8b759ab(jetbrains.mps.lang.feedback.problem.rt)" kind="rt" />
@@ -4276,7 +4234,6 @@
           <module ref="3330376f-82a0-45ed-ae50-a320ee8b0b63(jetbrains.mps.lang.script.rt)" kind="rt" />
           <module ref="31f56055-9d30-42b3-a2b1-fb3f554d7075(jetbrains.mps.lang.smodel.query.runtime)" kind="rt" />
           <module ref="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" kind="rt" />
-          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="rt" />
           <module ref="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" kind="rt" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
           <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" kind="cl" />
@@ -4284,13 +4241,10 @@
           <module ref="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" kind="cl" />
           <module ref="ed6d7656-532c-4bc2-81d1-af945aeb8280(jetbrains.mps.baseLanguage.blTypes)" kind="cl" />
           <module ref="a0c108f0-1637-416e-a249-3effbaa4c998(jetbrains.mps.baseLanguage.search)" kind="cl" />
-          <module ref="c7d01124-66d5-486d-8b50-7fdccb60b839(jetbrains.mps.baseLanguage.util)" kind="cl" />
-          <module ref="f113d56b-63e3-4120-a89c-2f5dcb8c6290(jetbrains.mps.coderules.runtime)" kind="cl" />
           <module ref="6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.coderules.typechecking)" kind="cl" />
+          <module ref="c4803b19-6d89-4a3b-bf82-390769514add(jetbrains.mps.lang.coderules)" kind="cl" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="cl" />
-          <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" kind="cl" />
           <module ref="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" kind="cl" />
-          <module ref="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462(jetbrains.mps.lang.typechecking)" kind="cl" />
           <module ref="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" kind="cl" />
           <module ref="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" kind="cl" />
           <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="cl" />
@@ -4398,7 +4352,6 @@
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" kind="rt" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" kind="rt" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="rt" />
-          <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" kind="rt" />
           <module ref="8e98f4e2-decf-4e97-bf80-9109e8b759ee(jetbrains.mps.lang.constraints.rules.runtime)" kind="rt" />
           <module ref="9e9ef4e2-decf-4e97-bf80-9109e8b759bb(jetbrains.mps.lang.feedback.api)" kind="rt" />
           <module ref="3f98f4e2-decf-4e97-bf80-9109e8b759ab(jetbrains.mps.lang.feedback.problem.rt)" kind="rt" />
@@ -4408,11 +4361,11 @@
           <module ref="3330376f-82a0-45ed-ae50-a320ee8b0b63(jetbrains.mps.lang.script.rt)" kind="rt" />
           <module ref="31f56055-9d30-42b3-a2b1-fb3f554d7075(jetbrains.mps.lang.smodel.query.runtime)" kind="rt" />
           <module ref="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" kind="rt" />
-          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="rt" />
           <module ref="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" kind="rt" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
           <module ref="0fda14cc-a416-4c81-869a-2175d8b3325d(jetbrains.mps.baseLanguageExt)" kind="cl" />
           <module ref="df345b11-b8c7-4213-ac66-48d2a9b75d88(jetbrains.mps.baseLanguageInternal)" kind="cl" />
+          <module ref="6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.coderules.typechecking)" kind="cl" />
           <module ref="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" kind="cl" />
         </dependencies>
         <uses>
@@ -4573,7 +4526,6 @@
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" kind="rt" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" kind="rt" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="rt" />
-          <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" kind="rt" />
           <module ref="8e98f4e2-decf-4e97-bf80-9109e8b759ee(jetbrains.mps.lang.constraints.rules.runtime)" kind="rt" />
           <module ref="9e9ef4e2-decf-4e97-bf80-9109e8b759bb(jetbrains.mps.lang.feedback.api)" kind="rt" />
           <module ref="3f98f4e2-decf-4e97-bf80-9109e8b759ab(jetbrains.mps.lang.feedback.problem.rt)" kind="rt" />
@@ -4583,14 +4535,16 @@
           <module ref="3330376f-82a0-45ed-ae50-a320ee8b0b63(jetbrains.mps.lang.script.rt)" kind="rt" />
           <module ref="31f56055-9d30-42b3-a2b1-fb3f554d7075(jetbrains.mps.lang.smodel.query.runtime)" kind="rt" />
           <module ref="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" kind="rt" />
-          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="rt" />
           <module ref="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" kind="rt" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
           <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" kind="cl" />
           <module ref="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" kind="cl" />
           <module ref="0fda14cc-a416-4c81-869a-2175d8b3325d(jetbrains.mps.baseLanguageExt)" kind="cl" />
+          <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="cl" />
           <module ref="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" kind="cl" />
           <module ref="35320f26-77cb-4c55-be9f-a97a27770af1(jetbrains.mps.logic)" kind="cl" />
+          <module ref="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" kind="cl" />
+          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="cl" />
         </dependencies>
         <uses>
           <language id="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" />
@@ -4751,7 +4705,6 @@
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" kind="rt" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" kind="rt" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="rt" />
-          <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" kind="rt" />
           <module ref="8e98f4e2-decf-4e97-bf80-9109e8b759ee(jetbrains.mps.lang.constraints.rules.runtime)" kind="rt" />
           <module ref="9e9ef4e2-decf-4e97-bf80-9109e8b759bb(jetbrains.mps.lang.feedback.api)" kind="rt" />
           <module ref="3f98f4e2-decf-4e97-bf80-9109e8b759ab(jetbrains.mps.lang.feedback.problem.rt)" kind="rt" />
@@ -4761,16 +4714,18 @@
           <module ref="3330376f-82a0-45ed-ae50-a320ee8b0b63(jetbrains.mps.lang.script.rt)" kind="rt" />
           <module ref="31f56055-9d30-42b3-a2b1-fb3f554d7075(jetbrains.mps.lang.smodel.query.runtime)" kind="rt" />
           <module ref="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" kind="rt" />
-          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="rt" />
           <module ref="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" kind="rt" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
           <module ref="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" kind="cl" />
           <module ref="88dcbb14-19c3-4776-8f81-33611ca4d87c(jetbrains.mps.baseLanguage.sequence)" kind="cl" />
           <module ref="0fda14cc-a416-4c81-869a-2175d8b3325d(jetbrains.mps.baseLanguageExt)" kind="cl" />
           <module ref="c4803b19-6d89-4a3b-bf82-390769514add(jetbrains.mps.lang.coderules)" kind="cl" />
+          <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="cl" />
           <module ref="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" kind="cl" />
           <module ref="65e59b42-e7f3-45ec-8692-6c7829780afe(jetbrains.mps.lang.smodelExt)" kind="cl" />
           <module ref="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" kind="cl" />
+          <module ref="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" kind="cl" />
+          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="cl" />
           <module ref="ad4d7d30-3da5-4d56-8273-c9d815b12234(jetbrains.mps.logicExt)" kind="cl" />
         </dependencies>
         <uses>
@@ -4930,7 +4885,6 @@
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" kind="rt" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" kind="rt" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="rt" />
-          <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" kind="rt" />
           <module ref="8e98f4e2-decf-4e97-bf80-9109e8b759ee(jetbrains.mps.lang.constraints.rules.runtime)" kind="rt" />
           <module ref="9e9ef4e2-decf-4e97-bf80-9109e8b759bb(jetbrains.mps.lang.feedback.api)" kind="rt" />
           <module ref="3f98f4e2-decf-4e97-bf80-9109e8b759ab(jetbrains.mps.lang.feedback.problem.rt)" kind="rt" />
@@ -4940,7 +4894,6 @@
           <module ref="3330376f-82a0-45ed-ae50-a320ee8b0b63(jetbrains.mps.lang.script.rt)" kind="rt" />
           <module ref="31f56055-9d30-42b3-a2b1-fb3f554d7075(jetbrains.mps.lang.smodel.query.runtime)" kind="rt" />
           <module ref="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" kind="rt" />
-          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="rt" />
           <module ref="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" kind="rt" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
           <module ref="0fda14cc-a416-4c81-869a-2175d8b3325d(jetbrains.mps.baseLanguageExt)" kind="cl" />
@@ -5161,7 +5114,6 @@
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" kind="rt" />
           <module ref="e55e6749-03cb-4ea7-9695-2322bab791c1(jetbrains.mps.lang.test.matcher)" kind="rt" />
           <module ref="707c4fde-f79a-44b5-b3d7-b5cef8844ccf(jetbrains.mps.lang.test.runtime)" kind="rt" />
-          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="rt" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
           <module ref="63b449db-0918-4a4a-a891-2c430ab133e4(org.junit.junit5)" kind="rt" />
           <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" kind="cl" />
@@ -5169,12 +5121,9 @@
           <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" kind="cl" />
           <module ref="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" kind="cl" />
           <module ref="0fda14cc-a416-4c81-869a-2175d8b3325d(jetbrains.mps.baseLanguageExt)" kind="cl" />
-          <module ref="df345b11-b8c7-4213-ac66-48d2a9b75d88(jetbrains.mps.baseLanguageInternal)" kind="cl" />
-          <module ref="f113d56b-63e3-4120-a89c-2f5dcb8c6290(jetbrains.mps.coderules.runtime)" kind="cl" />
           <module ref="02473356-2f59-4de1-ba87-e88f9d606180(jetbrains.mps.coderules.testhelper)" kind="cl" />
           <module ref="6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.coderules.typechecking)" kind="cl" />
           <module ref="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" kind="cl" />
-          <module ref="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" kind="cl" />
           <module ref="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" kind="cl" />
           <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="cl" />
           <module ref="3ddddf69-9ff0-426b-9365-51ae7356fb82(typechecking.samples.baseLanguage)" kind="cl" />
@@ -5369,9 +5318,9 @@
           <module ref="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" kind="rt" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" kind="rt" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" kind="rt" />
+          <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="rt" />
           <module ref="e55e6749-03cb-4ea7-9695-2322bab791c1(jetbrains.mps.lang.test.matcher)" kind="rt" />
           <module ref="707c4fde-f79a-44b5-b3d7-b5cef8844ccf(jetbrains.mps.lang.test.runtime)" kind="rt" />
-          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="rt" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
           <module ref="63b449db-0918-4a4a-a891-2c430ab133e4(org.junit.junit5)" kind="rt" />
           <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" kind="cl" />
@@ -5382,7 +5331,6 @@
           <module ref="6b3888c1-9802-44d8-8baf-f8e6c33ed689(jetbrains.mps.kotlin)" kind="cl" />
           <module ref="9e4ff22b-60f1-43ef-a50b-f9f0fcec22e0(jetbrains.mps.kotlin.javaRefs)" kind="cl" />
           <module ref="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" kind="cl" />
-          <module ref="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" kind="cl" />
           <module ref="65e59b42-e7f3-45ec-8692-6c7829780afe(jetbrains.mps.lang.smodelExt)" kind="cl" />
           <module ref="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" kind="cl" />
           <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="cl" />
@@ -5392,6 +5340,7 @@
           <language id="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" />
           <language id="l:f61473f9-130f-42f6-b98d-6c438812c2f6:jetbrains.mps.baseLanguage.unitTest" />
           <language id="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" />
+          <language id="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" />
           <language id="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" />
           <language id="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" />
           <language id="l:65e59b42-e7f3-45ec-8692-6c7829780afe:jetbrains.mps.lang.smodelExt" />
@@ -5606,7 +5555,6 @@
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" kind="rt" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" kind="rt" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="rt" />
-          <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" kind="rt" />
           <module ref="8e98f4e2-decf-4e97-bf80-9109e8b759ee(jetbrains.mps.lang.constraints.rules.runtime)" kind="rt" />
           <module ref="9e9ef4e2-decf-4e97-bf80-9109e8b759bb(jetbrains.mps.lang.feedback.api)" kind="rt" />
           <module ref="3f98f4e2-decf-4e97-bf80-9109e8b759ab(jetbrains.mps.lang.feedback.problem.rt)" kind="rt" />
@@ -5616,7 +5564,6 @@
           <module ref="3330376f-82a0-45ed-ae50-a320ee8b0b63(jetbrains.mps.lang.script.rt)" kind="rt" />
           <module ref="31f56055-9d30-42b3-a2b1-fb3f554d7075(jetbrains.mps.lang.smodel.query.runtime)" kind="rt" />
           <module ref="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" kind="rt" />
-          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="rt" />
           <module ref="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" kind="rt" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
           <module ref="0fda14cc-a416-4c81-869a-2175d8b3325d(jetbrains.mps.baseLanguageExt)" kind="cl" />
@@ -5781,7 +5728,6 @@
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" kind="rt" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" kind="rt" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="rt" />
-          <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" kind="rt" />
           <module ref="8e98f4e2-decf-4e97-bf80-9109e8b759ee(jetbrains.mps.lang.constraints.rules.runtime)" kind="rt" />
           <module ref="9e9ef4e2-decf-4e97-bf80-9109e8b759bb(jetbrains.mps.lang.feedback.api)" kind="rt" />
           <module ref="3f98f4e2-decf-4e97-bf80-9109e8b759ab(jetbrains.mps.lang.feedback.problem.rt)" kind="rt" />
@@ -5791,7 +5737,6 @@
           <module ref="3330376f-82a0-45ed-ae50-a320ee8b0b63(jetbrains.mps.lang.script.rt)" kind="rt" />
           <module ref="31f56055-9d30-42b3-a2b1-fb3f554d7075(jetbrains.mps.lang.smodel.query.runtime)" kind="rt" />
           <module ref="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" kind="rt" />
-          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="rt" />
           <module ref="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" kind="rt" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
           <module ref="0fda14cc-a416-4c81-869a-2175d8b3325d(jetbrains.mps.baseLanguageExt)" kind="cl" />
@@ -5957,7 +5902,6 @@
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" kind="rt" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" kind="rt" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="rt" />
-          <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" kind="rt" />
           <module ref="8e98f4e2-decf-4e97-bf80-9109e8b759ee(jetbrains.mps.lang.constraints.rules.runtime)" kind="rt" />
           <module ref="9e9ef4e2-decf-4e97-bf80-9109e8b759bb(jetbrains.mps.lang.feedback.api)" kind="rt" />
           <module ref="3f98f4e2-decf-4e97-bf80-9109e8b759ab(jetbrains.mps.lang.feedback.problem.rt)" kind="rt" />
@@ -5967,7 +5911,6 @@
           <module ref="3330376f-82a0-45ed-ae50-a320ee8b0b63(jetbrains.mps.lang.script.rt)" kind="rt" />
           <module ref="31f56055-9d30-42b3-a2b1-fb3f554d7075(jetbrains.mps.lang.smodel.query.runtime)" kind="rt" />
           <module ref="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" kind="rt" />
-          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="rt" />
           <module ref="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" kind="rt" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
           <module ref="88dcbb14-19c3-4776-8f81-33611ca4d87c(jetbrains.mps.baseLanguage.sequence)" kind="cl" />
@@ -6131,7 +6074,6 @@
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" kind="rt" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" kind="rt" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="rt" />
-          <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" kind="rt" />
           <module ref="8e98f4e2-decf-4e97-bf80-9109e8b759ee(jetbrains.mps.lang.constraints.rules.runtime)" kind="rt" />
           <module ref="9e9ef4e2-decf-4e97-bf80-9109e8b759bb(jetbrains.mps.lang.feedback.api)" kind="rt" />
           <module ref="3f98f4e2-decf-4e97-bf80-9109e8b759ab(jetbrains.mps.lang.feedback.problem.rt)" kind="rt" />
@@ -6141,7 +6083,6 @@
           <module ref="3330376f-82a0-45ed-ae50-a320ee8b0b63(jetbrains.mps.lang.script.rt)" kind="rt" />
           <module ref="31f56055-9d30-42b3-a2b1-fb3f554d7075(jetbrains.mps.lang.smodel.query.runtime)" kind="rt" />
           <module ref="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" kind="rt" />
-          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="rt" />
           <module ref="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" kind="rt" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
           <module ref="215c4c45-ba99-49f5-9ab7-4b6901a63cfd(MPS.Generator)" kind="cl" />
@@ -6310,7 +6251,6 @@
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" kind="rt" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" kind="rt" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="rt" />
-          <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" kind="rt" />
           <module ref="8e98f4e2-decf-4e97-bf80-9109e8b759ee(jetbrains.mps.lang.constraints.rules.runtime)" kind="rt" />
           <module ref="9e9ef4e2-decf-4e97-bf80-9109e8b759bb(jetbrains.mps.lang.feedback.api)" kind="rt" />
           <module ref="3f98f4e2-decf-4e97-bf80-9109e8b759ab(jetbrains.mps.lang.feedback.problem.rt)" kind="rt" />
@@ -6320,7 +6260,6 @@
           <module ref="3330376f-82a0-45ed-ae50-a320ee8b0b63(jetbrains.mps.lang.script.rt)" kind="rt" />
           <module ref="31f56055-9d30-42b3-a2b1-fb3f554d7075(jetbrains.mps.lang.smodel.query.runtime)" kind="rt" />
           <module ref="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" kind="rt" />
-          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="rt" />
           <module ref="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" kind="rt" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
           <module ref="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" kind="cl" />
@@ -6489,7 +6428,6 @@
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" kind="rt" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" kind="rt" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="rt" />
-          <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" kind="rt" />
           <module ref="8e98f4e2-decf-4e97-bf80-9109e8b759ee(jetbrains.mps.lang.constraints.rules.runtime)" kind="rt" />
           <module ref="9e9ef4e2-decf-4e97-bf80-9109e8b759bb(jetbrains.mps.lang.feedback.api)" kind="rt" />
           <module ref="3f98f4e2-decf-4e97-bf80-9109e8b759ab(jetbrains.mps.lang.feedback.problem.rt)" kind="rt" />
@@ -6499,7 +6437,6 @@
           <module ref="3330376f-82a0-45ed-ae50-a320ee8b0b63(jetbrains.mps.lang.script.rt)" kind="rt" />
           <module ref="31f56055-9d30-42b3-a2b1-fb3f554d7075(jetbrains.mps.lang.smodel.query.runtime)" kind="rt" />
           <module ref="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" kind="rt" />
-          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="rt" />
           <module ref="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" kind="rt" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
           <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" kind="cl" />
@@ -6670,7 +6607,6 @@
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" kind="rt" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" kind="rt" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="rt" />
-          <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" kind="rt" />
           <module ref="8e98f4e2-decf-4e97-bf80-9109e8b759ee(jetbrains.mps.lang.constraints.rules.runtime)" kind="rt" />
           <module ref="9e9ef4e2-decf-4e97-bf80-9109e8b759bb(jetbrains.mps.lang.feedback.api)" kind="rt" />
           <module ref="3f98f4e2-decf-4e97-bf80-9109e8b759ab(jetbrains.mps.lang.feedback.problem.rt)" kind="rt" />
@@ -6680,7 +6616,6 @@
           <module ref="3330376f-82a0-45ed-ae50-a320ee8b0b63(jetbrains.mps.lang.script.rt)" kind="rt" />
           <module ref="31f56055-9d30-42b3-a2b1-fb3f554d7075(jetbrains.mps.lang.smodel.query.runtime)" kind="rt" />
           <module ref="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" kind="rt" />
-          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="rt" />
           <module ref="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" kind="rt" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
           <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" kind="cl" />
@@ -6852,7 +6787,6 @@
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" kind="rt" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" kind="rt" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="rt" />
-          <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" kind="rt" />
           <module ref="8e98f4e2-decf-4e97-bf80-9109e8b759ee(jetbrains.mps.lang.constraints.rules.runtime)" kind="rt" />
           <module ref="9e9ef4e2-decf-4e97-bf80-9109e8b759bb(jetbrains.mps.lang.feedback.api)" kind="rt" />
           <module ref="3f98f4e2-decf-4e97-bf80-9109e8b759ab(jetbrains.mps.lang.feedback.problem.rt)" kind="rt" />
@@ -6862,7 +6796,6 @@
           <module ref="3330376f-82a0-45ed-ae50-a320ee8b0b63(jetbrains.mps.lang.script.rt)" kind="rt" />
           <module ref="31f56055-9d30-42b3-a2b1-fb3f554d7075(jetbrains.mps.lang.smodel.query.runtime)" kind="rt" />
           <module ref="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" kind="rt" />
-          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="rt" />
           <module ref="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" kind="rt" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
           <module ref="0fda14cc-a416-4c81-869a-2175d8b3325d(jetbrains.mps.baseLanguageExt)" kind="cl" />
@@ -7026,7 +6959,6 @@
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" kind="rt" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" kind="rt" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="rt" />
-          <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" kind="rt" />
           <module ref="8e98f4e2-decf-4e97-bf80-9109e8b759ee(jetbrains.mps.lang.constraints.rules.runtime)" kind="rt" />
           <module ref="9e9ef4e2-decf-4e97-bf80-9109e8b759bb(jetbrains.mps.lang.feedback.api)" kind="rt" />
           <module ref="3f98f4e2-decf-4e97-bf80-9109e8b759ab(jetbrains.mps.lang.feedback.problem.rt)" kind="rt" />
@@ -7036,7 +6968,6 @@
           <module ref="3330376f-82a0-45ed-ae50-a320ee8b0b63(jetbrains.mps.lang.script.rt)" kind="rt" />
           <module ref="31f56055-9d30-42b3-a2b1-fb3f554d7075(jetbrains.mps.lang.smodel.query.runtime)" kind="rt" />
           <module ref="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" kind="rt" />
-          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="rt" />
           <module ref="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" kind="rt" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
           <module ref="0fda14cc-a416-4c81-869a-2175d8b3325d(jetbrains.mps.baseLanguageExt)" kind="cl" />
@@ -7201,7 +7132,6 @@
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" kind="rt" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" kind="rt" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="rt" />
-          <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" kind="rt" />
           <module ref="8e98f4e2-decf-4e97-bf80-9109e8b759ee(jetbrains.mps.lang.constraints.rules.runtime)" kind="rt" />
           <module ref="9e9ef4e2-decf-4e97-bf80-9109e8b759bb(jetbrains.mps.lang.feedback.api)" kind="rt" />
           <module ref="3f98f4e2-decf-4e97-bf80-9109e8b759ab(jetbrains.mps.lang.feedback.problem.rt)" kind="rt" />
@@ -7211,7 +7141,6 @@
           <module ref="3330376f-82a0-45ed-ae50-a320ee8b0b63(jetbrains.mps.lang.script.rt)" kind="rt" />
           <module ref="31f56055-9d30-42b3-a2b1-fb3f554d7075(jetbrains.mps.lang.smodel.query.runtime)" kind="rt" />
           <module ref="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" kind="rt" />
-          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="rt" />
           <module ref="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" kind="rt" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
           <module ref="0fda14cc-a416-4c81-869a-2175d8b3325d(jetbrains.mps.baseLanguageExt)" kind="cl" />
@@ -7374,7 +7303,6 @@
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" kind="rt" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" kind="rt" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="rt" />
-          <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" kind="rt" />
           <module ref="8e98f4e2-decf-4e97-bf80-9109e8b759ee(jetbrains.mps.lang.constraints.rules.runtime)" kind="rt" />
           <module ref="9e9ef4e2-decf-4e97-bf80-9109e8b759bb(jetbrains.mps.lang.feedback.api)" kind="rt" />
           <module ref="3f98f4e2-decf-4e97-bf80-9109e8b759ab(jetbrains.mps.lang.feedback.problem.rt)" kind="rt" />
@@ -7384,7 +7312,6 @@
           <module ref="3330376f-82a0-45ed-ae50-a320ee8b0b63(jetbrains.mps.lang.script.rt)" kind="rt" />
           <module ref="31f56055-9d30-42b3-a2b1-fb3f554d7075(jetbrains.mps.lang.smodel.query.runtime)" kind="rt" />
           <module ref="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" kind="rt" />
-          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="rt" />
           <module ref="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" kind="rt" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
           <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" kind="cl" />
@@ -7392,14 +7319,13 @@
           <module ref="c1f5ad88-21f4-4e0e-927c-48b1ca0c2334(jetbrains.mps.baseLanguage.collectionsExt)" kind="cl" />
           <module ref="88dcbb14-19c3-4776-8f81-33611ca4d87c(jetbrains.mps.baseLanguage.sequence)" kind="cl" />
           <module ref="0fda14cc-a416-4c81-869a-2175d8b3325d(jetbrains.mps.baseLanguageExt)" kind="cl" />
-          <module ref="f113d56b-63e3-4120-a89c-2f5dcb8c6290(jetbrains.mps.coderules.runtime)" kind="cl" />
           <module ref="af65afd8-f0dd-4942-87d9-63a55f2a9db1(jetbrains.mps.lang.behavior)" kind="cl" />
-          <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="cl" />
           <module ref="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" kind="cl" />
           <module ref="446c26eb-2b7b-4bf0-9b35-f83fa582753e(jetbrains.mps.lang.modelapi)" kind="cl" />
           <module ref="86ef8290-12bb-4ca7-947f-093788f263a9(jetbrains.mps.lang.project)" kind="cl" />
           <module ref="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" kind="cl" />
           <module ref="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" kind="cl" />
+          <module ref="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" kind="cl" />
         </dependencies>
         <uses>
           <language id="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" />
@@ -7560,7 +7486,6 @@
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" kind="rt" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" kind="rt" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="rt" />
-          <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" kind="rt" />
           <module ref="8e98f4e2-decf-4e97-bf80-9109e8b759ee(jetbrains.mps.lang.constraints.rules.runtime)" kind="rt" />
           <module ref="9e9ef4e2-decf-4e97-bf80-9109e8b759bb(jetbrains.mps.lang.feedback.api)" kind="rt" />
           <module ref="3f98f4e2-decf-4e97-bf80-9109e8b759ab(jetbrains.mps.lang.feedback.problem.rt)" kind="rt" />
@@ -7570,7 +7495,6 @@
           <module ref="3330376f-82a0-45ed-ae50-a320ee8b0b63(jetbrains.mps.lang.script.rt)" kind="rt" />
           <module ref="31f56055-9d30-42b3-a2b1-fb3f554d7075(jetbrains.mps.lang.smodel.query.runtime)" kind="rt" />
           <module ref="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" kind="rt" />
-          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="rt" />
           <module ref="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" kind="rt" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
           <module ref="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" kind="cl" />
@@ -7741,7 +7665,6 @@
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" kind="rt" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" kind="rt" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="rt" />
-          <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" kind="rt" />
           <module ref="8e98f4e2-decf-4e97-bf80-9109e8b759ee(jetbrains.mps.lang.constraints.rules.runtime)" kind="rt" />
           <module ref="9e9ef4e2-decf-4e97-bf80-9109e8b759bb(jetbrains.mps.lang.feedback.api)" kind="rt" />
           <module ref="3f98f4e2-decf-4e97-bf80-9109e8b759ab(jetbrains.mps.lang.feedback.problem.rt)" kind="rt" />
@@ -7751,7 +7674,6 @@
           <module ref="3330376f-82a0-45ed-ae50-a320ee8b0b63(jetbrains.mps.lang.script.rt)" kind="rt" />
           <module ref="31f56055-9d30-42b3-a2b1-fb3f554d7075(jetbrains.mps.lang.smodel.query.runtime)" kind="rt" />
           <module ref="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" kind="rt" />
-          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="rt" />
           <module ref="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" kind="rt" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
           <module ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)" kind="cl" />
@@ -7919,7 +7841,6 @@
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" kind="rt" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" kind="rt" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="rt" />
-          <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" kind="rt" />
           <module ref="8e98f4e2-decf-4e97-bf80-9109e8b759ee(jetbrains.mps.lang.constraints.rules.runtime)" kind="rt" />
           <module ref="9e9ef4e2-decf-4e97-bf80-9109e8b759bb(jetbrains.mps.lang.feedback.api)" kind="rt" />
           <module ref="3f98f4e2-decf-4e97-bf80-9109e8b759ab(jetbrains.mps.lang.feedback.problem.rt)" kind="rt" />
@@ -7929,7 +7850,6 @@
           <module ref="3330376f-82a0-45ed-ae50-a320ee8b0b63(jetbrains.mps.lang.script.rt)" kind="rt" />
           <module ref="31f56055-9d30-42b3-a2b1-fb3f554d7075(jetbrains.mps.lang.smodel.query.runtime)" kind="rt" />
           <module ref="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" kind="rt" />
-          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="rt" />
           <module ref="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" kind="rt" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
           <module ref="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" kind="cl" />
@@ -8100,7 +8020,6 @@
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" kind="rt" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" kind="rt" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="rt" />
-          <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" kind="rt" />
           <module ref="8e98f4e2-decf-4e97-bf80-9109e8b759ee(jetbrains.mps.lang.constraints.rules.runtime)" kind="rt" />
           <module ref="9e9ef4e2-decf-4e97-bf80-9109e8b759bb(jetbrains.mps.lang.feedback.api)" kind="rt" />
           <module ref="3f98f4e2-decf-4e97-bf80-9109e8b759ab(jetbrains.mps.lang.feedback.problem.rt)" kind="rt" />
@@ -8110,7 +8029,6 @@
           <module ref="3330376f-82a0-45ed-ae50-a320ee8b0b63(jetbrains.mps.lang.script.rt)" kind="rt" />
           <module ref="31f56055-9d30-42b3-a2b1-fb3f554d7075(jetbrains.mps.lang.smodel.query.runtime)" kind="rt" />
           <module ref="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" kind="rt" />
-          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="rt" />
           <module ref="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" kind="rt" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
           <module ref="ed6d7656-532c-4bc2-81d1-af945aeb8280(jetbrains.mps.baseLanguage.blTypes)" kind="cl" />
@@ -8274,7 +8192,6 @@
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" kind="rt" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" kind="rt" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="rt" />
-          <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" kind="rt" />
           <module ref="8e98f4e2-decf-4e97-bf80-9109e8b759ee(jetbrains.mps.lang.constraints.rules.runtime)" kind="rt" />
           <module ref="9e9ef4e2-decf-4e97-bf80-9109e8b759bb(jetbrains.mps.lang.feedback.api)" kind="rt" />
           <module ref="3f98f4e2-decf-4e97-bf80-9109e8b759ab(jetbrains.mps.lang.feedback.problem.rt)" kind="rt" />
@@ -8284,7 +8201,6 @@
           <module ref="3330376f-82a0-45ed-ae50-a320ee8b0b63(jetbrains.mps.lang.script.rt)" kind="rt" />
           <module ref="31f56055-9d30-42b3-a2b1-fb3f554d7075(jetbrains.mps.lang.smodel.query.runtime)" kind="rt" />
           <module ref="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" kind="rt" />
-          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="rt" />
           <module ref="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" kind="rt" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
           <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" kind="cl" />
@@ -8450,7 +8366,6 @@
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" kind="rt" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" kind="rt" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="rt" />
-          <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" kind="rt" />
           <module ref="8e98f4e2-decf-4e97-bf80-9109e8b759ee(jetbrains.mps.lang.constraints.rules.runtime)" kind="rt" />
           <module ref="9e9ef4e2-decf-4e97-bf80-9109e8b759bb(jetbrains.mps.lang.feedback.api)" kind="rt" />
           <module ref="3f98f4e2-decf-4e97-bf80-9109e8b759ab(jetbrains.mps.lang.feedback.problem.rt)" kind="rt" />
@@ -8460,7 +8375,6 @@
           <module ref="3330376f-82a0-45ed-ae50-a320ee8b0b63(jetbrains.mps.lang.script.rt)" kind="rt" />
           <module ref="31f56055-9d30-42b3-a2b1-fb3f554d7075(jetbrains.mps.lang.smodel.query.runtime)" kind="rt" />
           <module ref="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" kind="rt" />
-          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="rt" />
           <module ref="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" kind="rt" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
           <module ref="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" kind="cl" />
@@ -8629,7 +8543,6 @@
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" kind="rt" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" kind="rt" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="rt" />
-          <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" kind="rt" />
           <module ref="8e98f4e2-decf-4e97-bf80-9109e8b759ee(jetbrains.mps.lang.constraints.rules.runtime)" kind="rt" />
           <module ref="9e9ef4e2-decf-4e97-bf80-9109e8b759bb(jetbrains.mps.lang.feedback.api)" kind="rt" />
           <module ref="3f98f4e2-decf-4e97-bf80-9109e8b759ab(jetbrains.mps.lang.feedback.problem.rt)" kind="rt" />
@@ -8639,7 +8552,6 @@
           <module ref="3330376f-82a0-45ed-ae50-a320ee8b0b63(jetbrains.mps.lang.script.rt)" kind="rt" />
           <module ref="31f56055-9d30-42b3-a2b1-fb3f554d7075(jetbrains.mps.lang.smodel.query.runtime)" kind="rt" />
           <module ref="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" kind="rt" />
-          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="rt" />
           <module ref="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" kind="rt" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
           <module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" kind="cl" />
@@ -8808,7 +8720,6 @@
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" kind="rt" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" kind="rt" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="rt" />
-          <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" kind="rt" />
           <module ref="8e98f4e2-decf-4e97-bf80-9109e8b759ee(jetbrains.mps.lang.constraints.rules.runtime)" kind="rt" />
           <module ref="9e9ef4e2-decf-4e97-bf80-9109e8b759bb(jetbrains.mps.lang.feedback.api)" kind="rt" />
           <module ref="3f98f4e2-decf-4e97-bf80-9109e8b759ab(jetbrains.mps.lang.feedback.problem.rt)" kind="rt" />
@@ -8818,7 +8729,6 @@
           <module ref="3330376f-82a0-45ed-ae50-a320ee8b0b63(jetbrains.mps.lang.script.rt)" kind="rt" />
           <module ref="31f56055-9d30-42b3-a2b1-fb3f554d7075(jetbrains.mps.lang.smodel.query.runtime)" kind="rt" />
           <module ref="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" kind="rt" />
-          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="rt" />
           <module ref="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" kind="rt" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
           <module ref="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" kind="cl" />
@@ -8969,8 +8879,10 @@
           <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" kind="rt" />
           <module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" kind="rt" />
           <module ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)" kind="rt" />
+          <module ref="215c4c45-ba99-49f5-9ab7-4b6901a63cfd(MPS.Generator)" kind="rt" />
           <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" kind="rt" />
           <module ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" kind="rt" />
+          <module ref="7124e466-fc92-4803-a656-d7a6b7eb3910(MPS.TextGen)" kind="rt" />
           <module ref="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" kind="rt" />
           <module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" kind="rt" />
           <module ref="af19274f-5f89-42dd-8f3c-c9932448f7f2(jetbrains.mps.analyzers.runtime)" kind="rt" />
@@ -8978,29 +8890,23 @@
           <module ref="52b81ac7-93fd-4e9e-b972-4995882da6d4(jetbrains.mps.baseLanguage.references.runtime)" kind="rt" />
           <module ref="d44dab97-aaac-44cb-9745-8a14db674c03(jetbrains.mps.baseLanguage.tuples.runtime)" kind="rt" />
           <module ref="2af156ab-65c1-4a62-bd0d-ea734f71eab6(jetbrains.mps.dataFlow.runtime)" kind="rt" />
+          <module ref="34e84b8f-afa8-4364-abcd-a279fddddbe7(jetbrains.mps.editor.runtime)" kind="rt" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" kind="rt" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" kind="rt" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="rt" />
-          <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" kind="rt" />
           <module ref="8e98f4e2-decf-4e97-bf80-9109e8b759ee(jetbrains.mps.lang.constraints.rules.runtime)" kind="rt" />
           <module ref="9e9ef4e2-decf-4e97-bf80-9109e8b759bb(jetbrains.mps.lang.feedback.api)" kind="rt" />
           <module ref="3f98f4e2-decf-4e97-bf80-9109e8b759ab(jetbrains.mps.lang.feedback.problem.rt)" kind="rt" />
           <module ref="0a98f3e2-decf-4e97-bf80-9109eccc59bb(jetbrains.mps.lang.feedback.problem.rules)" kind="rt" />
           <module ref="9abaaae2-decf-4e97-bf80-9109e8b759cc(jetbrains.mps.lang.messages.api)" kind="rt" />
           <module ref="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" kind="rt" />
+          <module ref="3330376f-82a0-45ed-ae50-a320ee8b0b63(jetbrains.mps.lang.script.rt)" kind="rt" />
           <module ref="31f56055-9d30-42b3-a2b1-fb3f554d7075(jetbrains.mps.lang.smodel.query.runtime)" kind="rt" />
-          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="rt" />
+          <module ref="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" kind="rt" />
+          <module ref="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" kind="rt" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
-          <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" kind="cl" />
-          <module ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" kind="cl" />
           <module ref="f2801650-65d5-424e-bb1b-463a8781b786(jetbrains.mps.baseLanguage.javadoc)" kind="cl" />
-          <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="cl" />
-          <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" kind="cl" />
           <module ref="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" kind="cl" />
-          <module ref="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462(jetbrains.mps.lang.typechecking)" kind="cl" />
-          <module ref="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" kind="cl" />
-          <module ref="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" kind="cl" />
-          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="cl" />
         </dependencies>
         <uses>
           <language id="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" />
@@ -9034,18 +8940,28 @@
           <language id="l:033598a4-76a9-47e1-ac89-a300c0fceab8:jetbrains.mps.lang.feedback.problem" />
           <language id="l:db2a46c2-ebec-4b6c-b6c2-f9b55b9b6f8a:jetbrains.mps.lang.feedback.problem.failingRule" />
           <language id="l:517077fd-e44f-4338-a475-1d29781dfdb8:jetbrains.mps.lang.feedback.skeleton" />
+          <language id="l:64d34fcd-ad02-4e73-aff8-a581124c2e30:jetbrains.mps.lang.findUsages" />
+          <language id="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" />
+          <language id="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" />
+          <language id="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" />
           <language id="l:ad93155d-79b2-4759-b10c-55123e763903:jetbrains.mps.lang.messages" />
           <language id="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" />
           <language id="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" />
+          <language id="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" />
           <language id="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" />
           <language id="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" />
           <language id="l:d8f591ec-4d86-4af2-9f92-a9e93c803ffa:jetbrains.mps.lang.scopes" />
+          <language id="l:0eddeefa-c2d6-4437-bc2c-de50fd4ce470:jetbrains.mps.lang.script" />
           <language id="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" />
           <language id="l:69b8a993-9b87-4d96-bf0c-3559f4bb0c63:jetbrains.mps.lang.slanguage" />
           <language id="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" />
           <language id="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" />
           <language id="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" />
+          <language id="l:b83431fe-5c8f-40bc-8a36-65e25f4dd253:jetbrains.mps.lang.textGen" />
+          <language id="l:4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462:jetbrains.mps.lang.typechecking" />
+          <language id="l:afc17aaf-3a3d-4d69-a38d-db90d5e858c6:jetbrains.mps.lang.types" />
           <language id="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" />
+          <language id="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" />
         </uses>
         <classpath>
           <entry path="." />
@@ -9094,7 +9010,6 @@
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" kind="rt" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" kind="rt" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="rt" />
-          <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" kind="rt" />
           <module ref="8e98f4e2-decf-4e97-bf80-9109e8b759ee(jetbrains.mps.lang.constraints.rules.runtime)" kind="rt" />
           <module ref="9e9ef4e2-decf-4e97-bf80-9109e8b759bb(jetbrains.mps.lang.feedback.api)" kind="rt" />
           <module ref="3f98f4e2-decf-4e97-bf80-9109e8b759ab(jetbrains.mps.lang.feedback.problem.rt)" kind="rt" />
@@ -9104,7 +9019,6 @@
           <module ref="3330376f-82a0-45ed-ae50-a320ee8b0b63(jetbrains.mps.lang.script.rt)" kind="rt" />
           <module ref="31f56055-9d30-42b3-a2b1-fb3f554d7075(jetbrains.mps.lang.smodel.query.runtime)" kind="rt" />
           <module ref="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" kind="rt" />
-          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="rt" />
           <module ref="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" kind="rt" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
           <module ref="2405a196-e75d-462c-938b-ae8e3fac20aa(jetbrains.mps.baseLanguage.kotlinRefs)" kind="cl" />
@@ -9269,7 +9183,6 @@
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" kind="rt" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" kind="rt" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="rt" />
-          <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" kind="rt" />
           <module ref="8e98f4e2-decf-4e97-bf80-9109e8b759ee(jetbrains.mps.lang.constraints.rules.runtime)" kind="rt" />
           <module ref="9e9ef4e2-decf-4e97-bf80-9109e8b759bb(jetbrains.mps.lang.feedback.api)" kind="rt" />
           <module ref="3f98f4e2-decf-4e97-bf80-9109e8b759ab(jetbrains.mps.lang.feedback.problem.rt)" kind="rt" />
@@ -9279,7 +9192,6 @@
           <module ref="3330376f-82a0-45ed-ae50-a320ee8b0b63(jetbrains.mps.lang.script.rt)" kind="rt" />
           <module ref="31f56055-9d30-42b3-a2b1-fb3f554d7075(jetbrains.mps.lang.smodel.query.runtime)" kind="rt" />
           <module ref="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" kind="rt" />
-          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="rt" />
           <module ref="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" kind="rt" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
           <module ref="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" kind="cl" />
@@ -9444,7 +9356,6 @@
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" kind="rt" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" kind="rt" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="rt" />
-          <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" kind="rt" />
           <module ref="8e98f4e2-decf-4e97-bf80-9109e8b759ee(jetbrains.mps.lang.constraints.rules.runtime)" kind="rt" />
           <module ref="9e9ef4e2-decf-4e97-bf80-9109e8b759bb(jetbrains.mps.lang.feedback.api)" kind="rt" />
           <module ref="3f98f4e2-decf-4e97-bf80-9109e8b759ab(jetbrains.mps.lang.feedback.problem.rt)" kind="rt" />
@@ -9454,7 +9365,6 @@
           <module ref="3330376f-82a0-45ed-ae50-a320ee8b0b63(jetbrains.mps.lang.script.rt)" kind="rt" />
           <module ref="31f56055-9d30-42b3-a2b1-fb3f554d7075(jetbrains.mps.lang.smodel.query.runtime)" kind="rt" />
           <module ref="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" kind="rt" />
-          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="rt" />
           <module ref="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" kind="rt" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
           <module ref="0fda14cc-a416-4c81-869a-2175d8b3325d(jetbrains.mps.baseLanguageExt)" kind="cl" />
@@ -9619,7 +9529,6 @@
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" kind="rt" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" kind="rt" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="rt" />
-          <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" kind="rt" />
           <module ref="8e98f4e2-decf-4e97-bf80-9109e8b759ee(jetbrains.mps.lang.constraints.rules.runtime)" kind="rt" />
           <module ref="9e9ef4e2-decf-4e97-bf80-9109e8b759bb(jetbrains.mps.lang.feedback.api)" kind="rt" />
           <module ref="3f98f4e2-decf-4e97-bf80-9109e8b759ab(jetbrains.mps.lang.feedback.problem.rt)" kind="rt" />
@@ -9629,7 +9538,6 @@
           <module ref="3330376f-82a0-45ed-ae50-a320ee8b0b63(jetbrains.mps.lang.script.rt)" kind="rt" />
           <module ref="31f56055-9d30-42b3-a2b1-fb3f554d7075(jetbrains.mps.lang.smodel.query.runtime)" kind="rt" />
           <module ref="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" kind="rt" />
-          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="rt" />
           <module ref="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" kind="rt" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
           <module ref="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" kind="cl" />
@@ -9798,7 +9706,6 @@
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" kind="rt" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" kind="rt" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="rt" />
-          <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" kind="rt" />
           <module ref="8e98f4e2-decf-4e97-bf80-9109e8b759ee(jetbrains.mps.lang.constraints.rules.runtime)" kind="rt" />
           <module ref="9e9ef4e2-decf-4e97-bf80-9109e8b759bb(jetbrains.mps.lang.feedback.api)" kind="rt" />
           <module ref="3f98f4e2-decf-4e97-bf80-9109e8b759ab(jetbrains.mps.lang.feedback.problem.rt)" kind="rt" />
@@ -9808,7 +9715,6 @@
           <module ref="3330376f-82a0-45ed-ae50-a320ee8b0b63(jetbrains.mps.lang.script.rt)" kind="rt" />
           <module ref="31f56055-9d30-42b3-a2b1-fb3f554d7075(jetbrains.mps.lang.smodel.query.runtime)" kind="rt" />
           <module ref="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" kind="rt" />
-          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="rt" />
           <module ref="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" kind="rt" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
           <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" kind="cl" />
@@ -9816,13 +9722,10 @@
           <module ref="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" kind="cl" />
           <module ref="ed6d7656-532c-4bc2-81d1-af945aeb8280(jetbrains.mps.baseLanguage.blTypes)" kind="cl" />
           <module ref="a0c108f0-1637-416e-a249-3effbaa4c998(jetbrains.mps.baseLanguage.search)" kind="cl" />
-          <module ref="c7d01124-66d5-486d-8b50-7fdccb60b839(jetbrains.mps.baseLanguage.util)" kind="cl" />
-          <module ref="f113d56b-63e3-4120-a89c-2f5dcb8c6290(jetbrains.mps.coderules.runtime)" kind="cl" />
           <module ref="6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.coderules.typechecking)" kind="cl" />
+          <module ref="c4803b19-6d89-4a3b-bf82-390769514add(jetbrains.mps.lang.coderules)" kind="cl" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="cl" />
-          <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" kind="cl" />
           <module ref="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" kind="cl" />
-          <module ref="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462(jetbrains.mps.lang.typechecking)" kind="cl" />
           <module ref="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" kind="cl" />
           <module ref="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" kind="cl" />
           <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="cl" />
@@ -9930,7 +9833,6 @@
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" kind="rt" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" kind="rt" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="rt" />
-          <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" kind="rt" />
           <module ref="8e98f4e2-decf-4e97-bf80-9109e8b759ee(jetbrains.mps.lang.constraints.rules.runtime)" kind="rt" />
           <module ref="9e9ef4e2-decf-4e97-bf80-9109e8b759bb(jetbrains.mps.lang.feedback.api)" kind="rt" />
           <module ref="3f98f4e2-decf-4e97-bf80-9109e8b759ab(jetbrains.mps.lang.feedback.problem.rt)" kind="rt" />
@@ -9940,11 +9842,11 @@
           <module ref="3330376f-82a0-45ed-ae50-a320ee8b0b63(jetbrains.mps.lang.script.rt)" kind="rt" />
           <module ref="31f56055-9d30-42b3-a2b1-fb3f554d7075(jetbrains.mps.lang.smodel.query.runtime)" kind="rt" />
           <module ref="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" kind="rt" />
-          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="rt" />
           <module ref="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" kind="rt" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
           <module ref="0fda14cc-a416-4c81-869a-2175d8b3325d(jetbrains.mps.baseLanguageExt)" kind="cl" />
           <module ref="df345b11-b8c7-4213-ac66-48d2a9b75d88(jetbrains.mps.baseLanguageInternal)" kind="cl" />
+          <module ref="6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.coderules.typechecking)" kind="cl" />
           <module ref="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" kind="cl" />
         </dependencies>
         <uses>
@@ -10105,7 +10007,6 @@
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" kind="rt" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" kind="rt" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="rt" />
-          <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" kind="rt" />
           <module ref="8e98f4e2-decf-4e97-bf80-9109e8b759ee(jetbrains.mps.lang.constraints.rules.runtime)" kind="rt" />
           <module ref="9e9ef4e2-decf-4e97-bf80-9109e8b759bb(jetbrains.mps.lang.feedback.api)" kind="rt" />
           <module ref="3f98f4e2-decf-4e97-bf80-9109e8b759ab(jetbrains.mps.lang.feedback.problem.rt)" kind="rt" />
@@ -10115,14 +10016,16 @@
           <module ref="3330376f-82a0-45ed-ae50-a320ee8b0b63(jetbrains.mps.lang.script.rt)" kind="rt" />
           <module ref="31f56055-9d30-42b3-a2b1-fb3f554d7075(jetbrains.mps.lang.smodel.query.runtime)" kind="rt" />
           <module ref="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" kind="rt" />
-          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="rt" />
           <module ref="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" kind="rt" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
           <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" kind="cl" />
           <module ref="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" kind="cl" />
           <module ref="0fda14cc-a416-4c81-869a-2175d8b3325d(jetbrains.mps.baseLanguageExt)" kind="cl" />
+          <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="cl" />
           <module ref="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" kind="cl" />
           <module ref="35320f26-77cb-4c55-be9f-a97a27770af1(jetbrains.mps.logic)" kind="cl" />
+          <module ref="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" kind="cl" />
+          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="cl" />
         </dependencies>
         <uses>
           <language id="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" />
@@ -10283,7 +10186,6 @@
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" kind="rt" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" kind="rt" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="rt" />
-          <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" kind="rt" />
           <module ref="8e98f4e2-decf-4e97-bf80-9109e8b759ee(jetbrains.mps.lang.constraints.rules.runtime)" kind="rt" />
           <module ref="9e9ef4e2-decf-4e97-bf80-9109e8b759bb(jetbrains.mps.lang.feedback.api)" kind="rt" />
           <module ref="3f98f4e2-decf-4e97-bf80-9109e8b759ab(jetbrains.mps.lang.feedback.problem.rt)" kind="rt" />
@@ -10293,16 +10195,18 @@
           <module ref="3330376f-82a0-45ed-ae50-a320ee8b0b63(jetbrains.mps.lang.script.rt)" kind="rt" />
           <module ref="31f56055-9d30-42b3-a2b1-fb3f554d7075(jetbrains.mps.lang.smodel.query.runtime)" kind="rt" />
           <module ref="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" kind="rt" />
-          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="rt" />
           <module ref="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" kind="rt" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
           <module ref="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" kind="cl" />
           <module ref="88dcbb14-19c3-4776-8f81-33611ca4d87c(jetbrains.mps.baseLanguage.sequence)" kind="cl" />
           <module ref="0fda14cc-a416-4c81-869a-2175d8b3325d(jetbrains.mps.baseLanguageExt)" kind="cl" />
           <module ref="c4803b19-6d89-4a3b-bf82-390769514add(jetbrains.mps.lang.coderules)" kind="cl" />
+          <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="cl" />
           <module ref="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" kind="cl" />
           <module ref="65e59b42-e7f3-45ec-8692-6c7829780afe(jetbrains.mps.lang.smodelExt)" kind="cl" />
           <module ref="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" kind="cl" />
+          <module ref="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" kind="cl" />
+          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="cl" />
           <module ref="ad4d7d30-3da5-4d56-8273-c9d815b12234(jetbrains.mps.logicExt)" kind="cl" />
         </dependencies>
         <uses>
@@ -10462,7 +10366,6 @@
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" kind="rt" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" kind="rt" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="rt" />
-          <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" kind="rt" />
           <module ref="8e98f4e2-decf-4e97-bf80-9109e8b759ee(jetbrains.mps.lang.constraints.rules.runtime)" kind="rt" />
           <module ref="9e9ef4e2-decf-4e97-bf80-9109e8b759bb(jetbrains.mps.lang.feedback.api)" kind="rt" />
           <module ref="3f98f4e2-decf-4e97-bf80-9109e8b759ab(jetbrains.mps.lang.feedback.problem.rt)" kind="rt" />
@@ -10472,7 +10375,6 @@
           <module ref="3330376f-82a0-45ed-ae50-a320ee8b0b63(jetbrains.mps.lang.script.rt)" kind="rt" />
           <module ref="31f56055-9d30-42b3-a2b1-fb3f554d7075(jetbrains.mps.lang.smodel.query.runtime)" kind="rt" />
           <module ref="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" kind="rt" />
-          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="rt" />
           <module ref="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" kind="rt" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
           <module ref="0fda14cc-a416-4c81-869a-2175d8b3325d(jetbrains.mps.baseLanguageExt)" kind="cl" />
@@ -10775,10 +10677,11 @@
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
+        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.jar" />
+        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.typechecking.jar" />
         <fileset file="${artifacts.mps}/languages/runtimes/jetbrains.mps.dataFlow.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.behavior.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.runtime.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.template.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.aspects.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.modelapi.jar" />
@@ -10790,6 +10693,9 @@
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.typechecking.runtime.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.reactor.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.runtime.jar" />
+        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="reactive-streams-1.0.0.final.jar" />
+        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="rxjava-2.2.18.jar" />
+        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="rxjava2-swing-0.3.7.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="collection-0.7.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="trove4j-3.0.3.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="conreactor-core-0.9.18.jar" />
@@ -10858,11 +10764,6 @@
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.behavior.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.reactor.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.runtime.jar" />
-        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="collection-0.7.jar" />
-        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="trove4j-3.0.3.jar" />
-        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="conreactor-core-0.9.18.jar" />
       </classpath>
     </javac>
     <copy todir="${build.tmp}/java/out/jetbrains.mps.lang.behaviorExt.generator">
@@ -10929,9 +10830,10 @@
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
+        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.jar" />
+        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.typechecking.jar" />
         <fileset file="${artifacts.mps}/languages/runtimes/jetbrains.mps.dataFlow.runtime.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.runtime.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.template.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.constraints.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.aspects.jar" />
@@ -10944,6 +10846,9 @@
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.typechecking.runtime.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.reactor.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.runtime.jar" />
+        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="reactive-streams-1.0.0.final.jar" />
+        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="rxjava-2.2.18.jar" />
+        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="rxjava2-swing-0.3.7.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="collection-0.7.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="trove4j-3.0.3.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="conreactor-core-0.9.18.jar" />
@@ -11013,11 +10918,6 @@
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.constraints.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.reactor.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.runtime.jar" />
-        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="collection-0.7.jar" />
-        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="trove4j-3.0.3.jar" />
-        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="conreactor-core-0.9.18.jar" />
       </classpath>
     </javac>
     <copy todir="${build.tmp}/java/out/jetbrains.mps.lang.constraintsExt#01">
@@ -11080,9 +10980,10 @@
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
+        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.jar" />
+        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.typechecking.jar" />
         <fileset file="${artifacts.mps}/languages/runtimes/jetbrains.mps.dataFlow.runtime.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.runtime.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.template.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.aspects.jar" />
         <fileset file="${artifacts.mps}/languages/util/jetbrains.mps.lang.extension.jar" />
@@ -11092,6 +10993,9 @@
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.typechecking.runtime.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.reactor.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.runtime.jar" />
+        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="reactive-streams-1.0.0.final.jar" />
+        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="rxjava-2.2.18.jar" />
+        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="rxjava2-swing-0.3.7.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="collection-0.7.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="trove4j-3.0.3.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="conreactor-core-0.9.18.jar" />
@@ -11160,11 +11064,6 @@
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mps}/languages/util/jetbrains.mps.lang.extension.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.reactor.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.runtime.jar" />
-        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="collection-0.7.jar" />
-        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="trove4j-3.0.3.jar" />
-        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="conreactor-core-0.9.18.jar" />
       </classpath>
     </javac>
     <copy todir="${build.tmp}/java/out/jetbrains.mps.lang.extensionExt.generator">
@@ -11230,9 +11129,10 @@
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
+        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.jar" />
+        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.typechecking.jar" />
         <fileset file="${artifacts.mps}/languages/runtimes/jetbrains.mps.dataFlow.runtime.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.runtime.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.template.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.aspects.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.generator.jar" />
@@ -11246,6 +11146,9 @@
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.typechecking.runtime.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.reactor.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.runtime.jar" />
+        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="reactive-streams-1.0.0.final.jar" />
+        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="rxjava-2.2.18.jar" />
+        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="rxjava2-swing-0.3.7.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="collection-0.7.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="trove4j-3.0.3.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="conreactor-core-0.9.18.jar" />
@@ -11315,11 +11218,6 @@
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.generator.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.generator.generationContext.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.reactor.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.runtime.jar" />
-        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="collection-0.7.jar" />
-        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="trove4j-3.0.3.jar" />
-        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="conreactor-core-0.9.18.jar" />
       </classpath>
     </javac>
     <copy todir="${build.tmp}/java/out/jetbrains.mps.lang.generator.generationContextExt#01">
@@ -11386,9 +11284,10 @@
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
+        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.jar" />
+        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.typechecking.jar" />
         <fileset file="${artifacts.mps}/languages/runtimes/jetbrains.mps.dataFlow.runtime.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.runtime.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.template.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.aspects.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.generator.jar" />
@@ -11401,6 +11300,9 @@
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.typechecking.runtime.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.reactor.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.runtime.jar" />
+        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="reactive-streams-1.0.0.final.jar" />
+        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="rxjava-2.2.18.jar" />
+        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="rxjava2-swing-0.3.7.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="collection-0.7.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="trove4j-3.0.3.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="conreactor-core-0.9.18.jar" />
@@ -11469,11 +11371,6 @@
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.generator.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.reactor.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.runtime.jar" />
-        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="collection-0.7.jar" />
-        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="trove4j-3.0.3.jar" />
-        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="conreactor-core-0.9.18.jar" />
       </classpath>
     </javac>
     <copy todir="${build.tmp}/java/out/jetbrains.mps.lang.generatorExt#01">
@@ -11540,9 +11437,10 @@
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
+        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.jar" />
+        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.typechecking.jar" />
         <fileset file="${artifacts.mps}/languages/runtimes/jetbrains.mps.dataFlow.runtime.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.runtime.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.template.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.aspects.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.modelapi.jar" />
@@ -11556,6 +11454,9 @@
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.typechecking.runtime.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.reactor.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.runtime.jar" />
+        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="reactive-streams-1.0.0.final.jar" />
+        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="rxjava-2.2.18.jar" />
+        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="rxjava2-swing-0.3.7.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="collection-0.7.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="trove4j-3.0.3.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="conreactor-core-0.9.18.jar" />
@@ -11625,11 +11526,6 @@
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.pattern.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.quotation.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.reactor.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.runtime.jar" />
-        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="collection-0.7.jar" />
-        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="trove4j-3.0.3.jar" />
-        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="conreactor-core-0.9.18.jar" />
       </classpath>
     </javac>
     <copy todir="${build.tmp}/java/out/jetbrains.mps.lang.patternExt.generator">
@@ -11700,9 +11596,10 @@
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
+        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.jar" />
+        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.typechecking.jar" />
         <fileset file="${artifacts.mps}/languages/runtimes/jetbrains.mps.dataFlow.runtime.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.runtime.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.template.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.aspects.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.modelapi.jar" />
@@ -11716,6 +11613,9 @@
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.typesystem.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.reactor.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.runtime.jar" />
+        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="reactive-streams-1.0.0.final.jar" />
+        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="rxjava-2.2.18.jar" />
+        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="rxjava2-swing-0.3.7.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="collection-0.7.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="trove4j-3.0.3.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="conreactor-core-0.9.18.jar" />
@@ -11784,11 +11684,6 @@
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.quotation.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.reactor.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.runtime.jar" />
-        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="collection-0.7.jar" />
-        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="trove4j-3.0.3.jar" />
-        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="conreactor-core-0.9.18.jar" />
       </classpath>
     </javac>
     <copy todir="${build.tmp}/java/out/jetbrains.mps.lang.quotationExt#01">
@@ -11851,9 +11746,10 @@
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
+        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.jar" />
+        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.typechecking.jar" />
         <fileset file="${artifacts.mps}/languages/runtimes/jetbrains.mps.dataFlow.runtime.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.runtime.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.template.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.aspects.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.jar" />
@@ -11863,6 +11759,9 @@
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.typechecking.runtime.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.reactor.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.runtime.jar" />
+        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="reactive-streams-1.0.0.final.jar" />
+        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="rxjava-2.2.18.jar" />
+        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="rxjava2-swing-0.3.7.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="collection-0.7.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="trove4j-3.0.3.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="conreactor-core-0.9.18.jar" />
@@ -11932,11 +11831,6 @@
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.reactor.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.runtime.jar" />
-        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="collection-0.7.jar" />
-        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="trove4j-3.0.3.jar" />
-        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="conreactor-core-0.9.18.jar" />
       </classpath>
     </javac>
     <copy todir="${build.tmp}/java/out/jetbrains.mps.lang.scopesExt.generator">
@@ -12002,9 +11896,10 @@
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
+        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.jar" />
+        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.typechecking.jar" />
         <fileset file="${artifacts.mps}/languages/runtimes/jetbrains.mps.dataFlow.runtime.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.runtime.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.template.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.aspects.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.modelapi.jar" />
@@ -12017,6 +11912,9 @@
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.typechecking.runtime.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.reactor.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.runtime.jar" />
+        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="reactive-streams-1.0.0.final.jar" />
+        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="rxjava-2.2.18.jar" />
+        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="rxjava2-swing-0.3.7.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="collection-0.7.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="trove4j-3.0.3.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="conreactor-core-0.9.18.jar" />
@@ -12085,11 +11983,6 @@
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.script.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.reactor.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.runtime.jar" />
-        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="collection-0.7.jar" />
-        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="trove4j-3.0.3.jar" />
-        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="conreactor-core-0.9.18.jar" />
       </classpath>
     </javac>
     <copy todir="${build.tmp}/java/out/jetbrains.mps.lang.scriptExt.generator">
@@ -12151,9 +12044,10 @@
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
+        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.jar" />
+        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.typechecking.jar" />
         <fileset file="${artifacts.mps}/languages/runtimes/jetbrains.mps.dataFlow.runtime.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.runtime.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.template.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.aspects.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
@@ -12163,6 +12057,9 @@
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.typechecking.runtime.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.reactor.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.runtime.jar" />
+        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="reactive-streams-1.0.0.final.jar" />
+        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="rxjava-2.2.18.jar" />
+        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="rxjava2-swing-0.3.7.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="collection-0.7.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="trove4j-3.0.3.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="conreactor-core-0.9.18.jar" />
@@ -12231,11 +12128,6 @@
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.sharedConcepts.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.reactor.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.runtime.jar" />
-        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="collection-0.7.jar" />
-        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="trove4j-3.0.3.jar" />
-        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="conreactor-core-0.9.18.jar" />
       </classpath>
     </javac>
     <copy todir="${build.tmp}/java/out/jetbrains.mps.lang.sharedConceptsExt.generator">
@@ -12304,11 +12196,11 @@
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.runtime.jar" />
+        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.jar" />
+        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.typechecking.jar" />
         <fileset file="${artifacts.mps}/languages/runtimes/jetbrains.mps.dataFlow.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.behavior.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.runtime.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.template.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.aspects.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.modelapi.jar" />
@@ -12321,6 +12213,9 @@
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.typechecking.runtime.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.reactor.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.runtime.jar" />
+        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="reactive-streams-1.0.0.final.jar" />
+        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="rxjava-2.2.18.jar" />
+        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="rxjava2-swing-0.3.7.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="collection-0.7.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="trove4j-3.0.3.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="conreactor-core-0.9.18.jar" />
@@ -12394,11 +12289,6 @@
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.reactor.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.runtime.jar" />
-        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="collection-0.7.jar" />
-        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="trove4j-3.0.3.jar" />
-        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="conreactor-core-0.9.18.jar" />
       </classpath>
     </javac>
     <copy todir="${build.tmp}/java/out/jetbrains.mps.lang.smodelExt#01">
@@ -12470,9 +12360,10 @@
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
+        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.jar" />
+        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.typechecking.jar" />
         <fileset file="${artifacts.mps}/languages/runtimes/jetbrains.mps.dataFlow.runtime.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.runtime.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.template.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.aspects.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.modelapi.jar" />
@@ -12486,6 +12377,9 @@
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.typesystem.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.reactor.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.runtime.jar" />
+        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="reactive-streams-1.0.0.final.jar" />
+        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="rxjava-2.2.18.jar" />
+        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="rxjava2-swing-0.3.7.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="collection-0.7.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="trove4j-3.0.3.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="conreactor-core-0.9.18.jar" />
@@ -12621,9 +12515,10 @@
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
         <fileset file="${artifacts.mps}/plugins/mps-testing/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.jar" />
+        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.jar" />
+        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.typechecking.jar" />
         <fileset file="${artifacts.mps}/languages/runtimes/jetbrains.mps.dataFlow.runtime.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.runtime.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.template.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.aspects.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.intentions.jar" />
@@ -12637,6 +12532,9 @@
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.typechecking.runtime.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.reactor.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.runtime.jar" />
+        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="reactive-streams-1.0.0.final.jar" />
+        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="rxjava-2.2.18.jar" />
+        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="rxjava2-swing-0.3.7.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="collection-0.7.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="trove4j-3.0.3.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="conreactor-core-0.9.18.jar" />
@@ -12776,9 +12674,10 @@
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
+        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.jar" />
+        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.typechecking.jar" />
         <fileset file="${artifacts.mps}/languages/runtimes/jetbrains.mps.dataFlow.runtime.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.runtime.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.template.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.aspects.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.modelapi.jar" />
@@ -12793,6 +12692,9 @@
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.typesystem.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.reactor.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.runtime.jar" />
+        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="reactive-streams-1.0.0.final.jar" />
+        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="rxjava-2.2.18.jar" />
+        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="rxjava2-swing-0.3.7.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="collection-0.7.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="trove4j-3.0.3.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="conreactor-core-0.9.18.jar" />
@@ -12868,11 +12770,6 @@
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.typesystem.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.reactor.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.runtime.jar" />
-        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="collection-0.7.jar" />
-        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="trove4j-3.0.3.jar" />
-        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="conreactor-core-0.9.18.jar" />
       </classpath>
     </javac>
     <copy todir="${build.tmp}/java/out/jetbrains.mps.lang.typesystemExt#01">
@@ -12933,9 +12830,10 @@
         <fileset file="${artifacts.mps}/languages/runtimes/jetbrains.mps.analyzers.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
+        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.jar" />
+        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.typechecking.jar" />
         <fileset file="${artifacts.mps}/languages/runtimes/jetbrains.mps.dataFlow.runtime.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.runtime.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.template.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.aspects.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
@@ -12943,6 +12841,9 @@
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.typechecking.runtime.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.reactor.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.runtime.jar" />
+        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="reactive-streams-1.0.0.final.jar" />
+        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="rxjava-2.2.18.jar" />
+        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="rxjava2-swing-0.3.7.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="collection-0.7.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="trove4j-3.0.3.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="conreactor-core-0.9.18.jar" />
@@ -13070,9 +12971,10 @@
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.classifiers.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
+        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.jar" />
+        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.typechecking.jar" />
         <fileset file="${artifacts.mps}/languages/runtimes/jetbrains.mps.dataFlow.runtime.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.runtime.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.template.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.aspects.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
@@ -13081,6 +12983,9 @@
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.typechecking.runtime.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.reactor.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.runtime.jar" />
+        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="reactive-streams-1.0.0.final.jar" />
+        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="rxjava-2.2.18.jar" />
+        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="rxjava2-swing-0.3.7.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="collection-0.7.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="trove4j-3.0.3.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="conreactor-core-0.9.18.jar" />
@@ -13149,11 +13054,6 @@
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.reactor.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.runtime.jar" />
-        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="collection-0.7.jar" />
-        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="trove4j-3.0.3.jar" />
-        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="conreactor-core-0.9.18.jar" />
       </classpath>
     </javac>
     <copy todir="${build.tmp}/java/out/jetbrains.mps.baseLanguage.classifiersExt.generator">
@@ -13219,9 +13119,10 @@
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
+        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.jar" />
+        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.typechecking.jar" />
         <fileset file="${artifacts.mps}/languages/runtimes/jetbrains.mps.dataFlow.runtime.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.runtime.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.template.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.aspects.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
@@ -13231,6 +13132,9 @@
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.reactor.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.runtime.jar" />
+        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="reactive-streams-1.0.0.final.jar" />
+        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="rxjava-2.2.18.jar" />
+        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="rxjava2-swing-0.3.7.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="collection-0.7.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="trove4j-3.0.3.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="conreactor-core-0.9.18.jar" />
@@ -13301,11 +13205,6 @@
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.reactor.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.runtime.jar" />
-        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="collection-0.7.jar" />
-        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="trove4j-3.0.3.jar" />
-        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="conreactor-core-0.9.18.jar" />
       </classpath>
     </javac>
     <copy todir="${build.tmp}/java/out/jetbrains.mps.baseLanguage.closuresExt#1312156863939371938">
@@ -13373,9 +13272,10 @@
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
+        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.jar" />
+        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.typechecking.jar" />
         <fileset file="${artifacts.mps}/languages/runtimes/jetbrains.mps.dataFlow.runtime.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.runtime.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.template.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.aspects.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
@@ -13384,6 +13284,9 @@
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.typechecking.runtime.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.reactor.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.runtime.jar" />
+        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="reactive-streams-1.0.0.final.jar" />
+        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="rxjava-2.2.18.jar" />
+        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="rxjava2-swing-0.3.7.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="collection-0.7.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="trove4j-3.0.3.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="conreactor-core-0.9.18.jar" />
@@ -13456,11 +13359,6 @@
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.reactor.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.runtime.jar" />
-        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="collection-0.7.jar" />
-        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="trove4j-3.0.3.jar" />
-        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="conreactor-core-0.9.18.jar" />
       </classpath>
     </javac>
     <copy todir="${build.tmp}/java/out/jetbrains.mps.baseLanguage.collectionsExt#01">
@@ -13524,9 +13422,10 @@
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
+        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.jar" />
+        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.typechecking.jar" />
         <fileset file="${artifacts.mps}/languages/runtimes/jetbrains.mps.dataFlow.runtime.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.runtime.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.template.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.aspects.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
@@ -13535,6 +13434,9 @@
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.typechecking.runtime.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.reactor.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.runtime.jar" />
+        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="reactive-streams-1.0.0.final.jar" />
+        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="rxjava-2.2.18.jar" />
+        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="rxjava2-swing-0.3.7.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="collection-0.7.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="trove4j-3.0.3.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="conreactor-core-0.9.18.jar" />
@@ -13602,11 +13504,6 @@
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.reactor.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.runtime.jar" />
-        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="collection-0.7.jar" />
-        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="trove4j-3.0.3.jar" />
-        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="conreactor-core-0.9.18.jar" />
       </classpath>
     </javac>
     <copy todir="${build.tmp}/java/out/jetbrains.mps.baseLanguage.function#01">
@@ -13642,10 +13539,12 @@
         <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-persistence.jar" />
         <fileset file="${artifacts.mps}/lib/mps-generator.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-persistence.jar" />
         <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
         <fileset file="${artifacts.mps}/lib/mps-project-check.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-textgen.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-scripts-rt.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/app.jar" />
         <fileset file="${artifacts.mps}/lib/app-client.jar" />
@@ -13663,33 +13562,22 @@
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
         <fileset file="${artifacts.mps}/lib/trove.jar" />
         <fileset file="${artifacts.mps}/languages/runtimes/jetbrains.mps.analyzers.runtime.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.javadoc.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
+        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.jar" />
+        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.typechecking.jar" />
         <fileset file="${artifacts.mps}/languages/runtimes/jetbrains.mps.dataFlow.runtime.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.aspect.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.runtime.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.template.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.aspects.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.modelapi.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
         <fileset file="${artifacts.mps}/languages/runtimes/jetbrains.mps.lang.smodel.query.runtime.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.typechecking.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.typechecking.runtime.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.types.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.util.order.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.reactor.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.runtime.jar" />
+        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="reactive-streams-1.0.0.final.jar" />
+        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="rxjava-2.2.18.jar" />
+        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="rxjava2-swing-0.3.7.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="collection-0.7.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="trove4j-3.0.3.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="conreactor-core-0.9.18.jar" />
@@ -13755,12 +13643,13 @@
         <fileset file="${artifacts.mps}/plugins/mps-kotlin/languages/kotlin/jetbrains.mps.baseLanguage.kotlinRefs.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
+        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.jar" />
+        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.typechecking.jar" />
         <fileset file="${artifacts.mps}/languages/runtimes/jetbrains.mps.dataFlow.runtime.jar" />
         <fileset file="${artifacts.mps}/plugins/mps-core/languages/util/jetbrains.mps.execution.util.jar" />
         <fileset file="${artifacts.mps}/plugins/mps-kotlin/languages/kotlin/jetbrains.mps.kotlin.jar" />
         <fileset file="${artifacts.mps}/plugins/mps-kotlin/languages/kotlin/jetbrains.mps.kotlin.baseLanguage.runtime.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.runtime.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.template.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.aspects.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
@@ -13770,6 +13659,9 @@
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.typechecking.runtime.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.reactor.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.runtime.jar" />
+        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="reactive-streams-1.0.0.final.jar" />
+        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="rxjava-2.2.18.jar" />
+        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="rxjava2-swing-0.3.7.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="collection-0.7.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="trove4j-3.0.3.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="conreactor-core-0.9.18.jar" />
@@ -13838,11 +13730,6 @@
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.reactor.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.runtime.jar" />
-        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="collection-0.7.jar" />
-        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="trove4j-3.0.3.jar" />
-        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="conreactor-core-0.9.18.jar" />
       </classpath>
     </javac>
     <copy todir="${build.tmp}/java/out/jetbrains.mps.baseLanguage.kotlinRefsExt.generator">
@@ -13909,9 +13796,10 @@
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.methodReferences.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
+        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.jar" />
+        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.typechecking.jar" />
         <fileset file="${artifacts.mps}/languages/runtimes/jetbrains.mps.dataFlow.runtime.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.runtime.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.template.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.aspects.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
@@ -13920,6 +13808,9 @@
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.typechecking.runtime.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.reactor.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.runtime.jar" />
+        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="reactive-streams-1.0.0.final.jar" />
+        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="rxjava-2.2.18.jar" />
+        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="rxjava2-swing-0.3.7.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="collection-0.7.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="trove4j-3.0.3.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="conreactor-core-0.9.18.jar" />
@@ -13992,11 +13883,6 @@
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.reactor.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.runtime.jar" />
-        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="collection-0.7.jar" />
-        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="trove4j-3.0.3.jar" />
-        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="conreactor-core-0.9.18.jar" />
       </classpath>
     </javac>
     <copy todir="${build.tmp}/java/out/jetbrains.mps.baseLanguage.methodReferencesExt.generator">
@@ -14061,11 +13947,12 @@
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
+        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.jar" />
+        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.typechecking.jar" />
         <fileset file="${artifacts.mps}/languages/runtimes/jetbrains.mps.dataFlow.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.aspect.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.runtime.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.template.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.aspects.jar" />
@@ -14082,6 +13969,9 @@
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.reactor.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.runtime.jar" />
+        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="reactive-streams-1.0.0.final.jar" />
+        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="rxjava-2.2.18.jar" />
+        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="rxjava2-swing-0.3.7.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="collection-0.7.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="trove4j-3.0.3.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="conreactor-core-0.9.18.jar" />
@@ -14149,11 +14039,6 @@
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.reactor.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.runtime.jar" />
-        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="collection-0.7.jar" />
-        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="trove4j-3.0.3.jar" />
-        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="conreactor-core-0.9.18.jar" />
       </classpath>
     </javac>
     <copy todir="${build.tmp}/java/out/jetbrains.mps.baseLanguage.sequence#01">
@@ -14220,9 +14105,10 @@
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.tuples.jar" />
+        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.jar" />
+        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.typechecking.jar" />
         <fileset file="${artifacts.mps}/languages/runtimes/jetbrains.mps.dataFlow.runtime.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.runtime.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.template.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.aspects.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.modelapi.jar" />
@@ -14236,6 +14122,9 @@
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.reactor.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.runtime.jar" />
+        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="reactive-streams-1.0.0.final.jar" />
+        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="rxjava-2.2.18.jar" />
+        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="rxjava2-swing-0.3.7.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="collection-0.7.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="trove4j-3.0.3.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="conreactor-core-0.9.18.jar" />
@@ -14304,11 +14193,6 @@
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.tuples.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.reactor.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.runtime.jar" />
-        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="collection-0.7.jar" />
-        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="trove4j-3.0.3.jar" />
-        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="conreactor-core-0.9.18.jar" />
       </classpath>
     </javac>
     <copy todir="${build.tmp}/java/out/jetbrains.mps.baseLanguage.tuplesExt#01">
@@ -14374,15 +14258,11 @@
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.util.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.runtime.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.typechecking.jar" />
         <fileset file="${artifacts.mps}/languages/runtimes/jetbrains.mps.dataFlow.runtime.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.aspect.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.runtime.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.template.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.aspects.jar" />
@@ -14392,11 +14272,8 @@
         <fileset file="${artifacts.mps}/languages/runtimes/jetbrains.mps.lang.smodel.query.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.typechecking.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.typechecking.runtime.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.types.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.typesystem.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.util.order.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.reactor.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.runtime.jar" />
@@ -14469,9 +14346,10 @@
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguageInternal.jar" />
+        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.jar" />
+        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.typechecking.jar" />
         <fileset file="${artifacts.mps}/languages/runtimes/jetbrains.mps.dataFlow.runtime.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.runtime.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.template.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.aspects.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
@@ -14480,6 +14358,9 @@
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.typechecking.runtime.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.reactor.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.runtime.jar" />
+        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="reactive-streams-1.0.0.final.jar" />
+        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="rxjava-2.2.18.jar" />
+        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="rxjava2-swing-0.3.7.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="collection-0.7.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="trove4j-3.0.3.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="conreactor-core-0.9.18.jar" />
@@ -14548,11 +14429,6 @@
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguageInternal.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.reactor.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.runtime.jar" />
-        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="collection-0.7.jar" />
-        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="trove4j-3.0.3.jar" />
-        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="conreactor-core-0.9.18.jar" />
       </classpath>
     </javac>
     <copy todir="${build.tmp}/java/out/jetbrains.mps.baseLanguageInternalExt#01">
@@ -14615,9 +14491,10 @@
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
+        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.jar" />
+        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.typechecking.jar" />
         <fileset file="${artifacts.mps}/languages/runtimes/jetbrains.mps.dataFlow.runtime.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.runtime.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.template.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.aspects.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
@@ -14627,6 +14504,9 @@
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.reactor.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.runtime.jar" />
+        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="reactive-streams-1.0.0.final.jar" />
+        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="rxjava-2.2.18.jar" />
+        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="rxjava2-swing-0.3.7.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="collection-0.7.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="trove4j-3.0.3.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="conreactor-core-0.9.18.jar" />
@@ -14761,10 +14641,11 @@
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
+        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.jar" />
+        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.typechecking.jar" />
         <fileset file="${artifacts.mps}/languages/runtimes/jetbrains.mps.dataFlow.runtime.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.runtime.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.template.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.aspects.jar" />
@@ -14778,6 +14659,9 @@
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.reactor.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.runtime.jar" />
+        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="reactive-streams-1.0.0.final.jar" />
+        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="rxjava-2.2.18.jar" />
+        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="rxjava2-swing-0.3.7.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="collection-0.7.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="trove4j-3.0.3.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="conreactor-core-0.9.18.jar" />
@@ -14918,11 +14802,12 @@
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
+        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.jar" />
+        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.typechecking.jar" />
         <fileset file="${artifacts.mps}/languages/runtimes/jetbrains.mps.dataFlow.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.aspect.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.runtime.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.template.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.aspects.jar" />
@@ -14939,6 +14824,9 @@
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.reactor.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.runtime.jar" />
+        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="reactive-streams-1.0.0.final.jar" />
+        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="rxjava-2.2.18.jar" />
+        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="rxjava2-swing-0.3.7.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="collection-0.7.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="trove4j-3.0.3.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="conreactor-core-0.9.18.jar" />
@@ -15089,11 +14977,9 @@
         <fileset file="${artifacts.mps}/plugins/mps-testing/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.jar" />
         <fileset file="${artifacts.mps}/plugins/mps-testing/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.runtime.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.runtime.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.typechecking.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.runtime.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.template.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.modelapi.jar" />
@@ -15108,7 +14994,6 @@
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.typesystem.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.reactor.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.runtime.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="reactive-streams-1.0.0.final.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="rxjava-2.2.18.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="rxjava2-swing-0.3.7.jar" />
@@ -15127,8 +15012,8 @@
         <fileset dir="${artifacts.mps}/plugins/mps-junit5/lib" includes="opentest4j-1.2.0.jar" />
         <fileset dir="${artifacts.mps}/plugins/mps-junit5/lib" includes="junit-platform-reporting-1.9.3.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguageInternal.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.testhelper.jar" />
+        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.runtime.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.baseLanguageExt" />
       </classpath>
     </javac>
@@ -15197,11 +15082,9 @@
         <fileset file="${artifacts.mps}/plugins/mps-testing/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.jar" />
         <fileset file="${artifacts.mps}/plugins/mps-testing/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.runtime.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.runtime.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.typechecking.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.runtime.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.template.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.modelapi.jar" />
@@ -15216,7 +15099,6 @@
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.typesystem.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.reactor.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.runtime.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="reactive-streams-1.0.0.final.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="rxjava-2.2.18.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="rxjava2-swing-0.3.7.jar" />
@@ -15300,30 +15182,20 @@
         <fileset file="${artifacts.mps}/lib/trove.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.classifiers.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
         <fileset file="${artifacts.mps}/plugins/mps-testing/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.jar" />
         <fileset file="${artifacts.mps}/plugins/mps-testing/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.runtime.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguageInternal.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.runtime.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.testhelper.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.typechecking.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.runtime.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.template.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.modelapi.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
         <fileset file="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.jar" />
         <fileset file="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.matcher.jar" />
         <fileset file="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.typechecking.runtime.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.typesystem.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.reactor.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.runtime.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="reactive-streams-1.0.0.final.jar" />
@@ -15419,24 +15291,17 @@
         <fileset file="${artifacts.mps}/plugins/mps-testing/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.jar" />
         <fileset file="${artifacts.mps}/plugins/mps-testing/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.runtime.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.runtime.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.typechecking.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.runtime.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.template.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.jar" />
         <fileset file="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.matcher.jar" />
         <fileset file="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.typechecking.runtime.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.reactor.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.runtime.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="reactive-streams-1.0.0.final.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="rxjava-2.2.18.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="rxjava2-swing-0.3.7.jar" />
-        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="collection-0.7.jar" />
-        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="trove4j-3.0.3.jar" />
-        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="conreactor-core-0.9.18.jar" />
         <fileset dir="${artifacts.mps}/plugins/mps-junit5/lib" includes="apiguardian-api-1.1.2.jar" />
         <fileset dir="${artifacts.mps}/plugins/mps-junit5/lib" includes="junit-jupiter-api-5.9.3.jar" />
         <fileset dir="${artifacts.mps}/plugins/mps-junit5/lib" includes="junit-jupiter-engine-5.9.3.jar" />
@@ -15523,25 +15388,18 @@
         <fileset file="${artifacts.mps}/plugins/mps-testing/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.jar" />
         <fileset file="${artifacts.mps}/plugins/mps-testing/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.runtime.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.runtime.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.testhelper.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.typechecking.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.runtime.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.template.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.jar" />
         <fileset file="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.matcher.jar" />
         <fileset file="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.typechecking.runtime.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.reactor.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.runtime.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="reactive-streams-1.0.0.final.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="rxjava-2.2.18.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="rxjava2-swing-0.3.7.jar" />
-        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="collection-0.7.jar" />
-        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="trove4j-3.0.3.jar" />
-        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="conreactor-core-0.9.18.jar" />
         <fileset dir="${artifacts.mps}/plugins/mps-junit5/lib" includes="apiguardian-api-1.1.2.jar" />
         <fileset dir="${artifacts.mps}/plugins/mps-junit5/lib" includes="junit-jupiter-api-5.9.3.jar" />
         <fileset dir="${artifacts.mps}/plugins/mps-junit5/lib" includes="junit-jupiter-engine-5.9.3.jar" />
@@ -15624,24 +15482,17 @@
         <fileset file="${artifacts.mps}/plugins/mps-testing/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.jar" />
         <fileset file="${artifacts.mps}/plugins/mps-testing/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.runtime.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.runtime.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.typechecking.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.runtime.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.template.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.jar" />
         <fileset file="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.matcher.jar" />
         <fileset file="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.typechecking.runtime.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.reactor.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.runtime.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="reactive-streams-1.0.0.final.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="rxjava-2.2.18.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="rxjava2-swing-0.3.7.jar" />
-        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="collection-0.7.jar" />
-        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="trove4j-3.0.3.jar" />
-        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="conreactor-core-0.9.18.jar" />
         <fileset dir="${artifacts.mps}/plugins/mps-junit5/lib" includes="apiguardian-api-1.1.2.jar" />
         <fileset dir="${artifacts.mps}/plugins/mps-junit5/lib" includes="junit-jupiter-api-5.9.3.jar" />
         <fileset dir="${artifacts.mps}/plugins/mps-junit5/lib" includes="junit-jupiter-engine-5.9.3.jar" />
@@ -15725,13 +15576,11 @@
         <fileset file="${artifacts.mps}/plugins/mps-testing/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.jar" />
         <fileset file="${artifacts.mps}/plugins/mps-testing/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.runtime.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.runtime.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.typechecking.jar" />
         <fileset file="${artifacts.mps}/plugins/mps-core/languages/util/jetbrains.mps.execution.util.jar" />
         <fileset file="${artifacts.mps}/plugins/mps-kotlin/languages/kotlin/jetbrains.mps.kotlin.jar" />
         <fileset file="${artifacts.mps}/plugins/mps-kotlin/languages/kotlin/jetbrains.mps.kotlin.javaRefs.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.runtime.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.template.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.modelapi.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
@@ -15823,24 +15672,17 @@
         <fileset file="${artifacts.mps}/plugins/mps-testing/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.jar" />
         <fileset file="${artifacts.mps}/plugins/mps-testing/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.runtime.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.runtime.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.typechecking.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.runtime.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.template.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.jar" />
         <fileset file="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.matcher.jar" />
         <fileset file="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.typechecking.runtime.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.reactor.jar" />
-        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.runtime.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="reactive-streams-1.0.0.final.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="rxjava-2.2.18.jar" />
         <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="rxjava2-swing-0.3.7.jar" />
-        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="collection-0.7.jar" />
-        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="trove4j-3.0.3.jar" />
-        <fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="conreactor-core-0.9.18.jar" />
         <fileset dir="${artifacts.mps}/plugins/mps-junit5/lib" includes="apiguardian-api-1.1.2.jar" />
         <fileset dir="${artifacts.mps}/plugins/mps-junit5/lib" includes="junit-jupiter-api-5.9.3.jar" />
         <fileset dir="${artifacts.mps}/plugins/mps-junit5/lib" includes="junit-jupiter-engine-5.9.3.jar" />
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.javadocExt/jetbrains.mps.baseLanguage.javadocExt.mpl b/samples/mpscore/languages/jetbrains.mps.baseLanguage.javadocExt/jetbrains.mps.baseLanguage.javadocExt.mpl
index 5f35d024..24ae64c0 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.javadocExt/jetbrains.mps.baseLanguage.javadocExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.javadocExt/jetbrains.mps.baseLanguage.javadocExt.mpl
@@ -11,25 +11,18 @@
     </facet>
   </facets>
   <accessoryModels />
-  <dependencies>
-    <dependency reexport="false">4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462(jetbrains.mps.lang.typechecking)</dependency>
-    <dependency reexport="false">a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)</dependency>
-    <dependency reexport="false">26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)</dependency>
-    <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
-    <dependency reexport="false">bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)</dependency>
-    <dependency reexport="false">ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)</dependency>
-    <dependency reexport="false">498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)</dependency>
-    <dependency reexport="false">f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)</dependency>
-  </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
+    <language slang="l:df345b11-b8c7-4213-ac66-48d2a9b75d88:jetbrains.mps.baseLanguageInternal" version="0" />
     <language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
+    <language slang="l:f159adf4-3c93-40f9-9c5a-1f245a8697af:jetbrains.mps.lang.aspect" version="2" />
     <language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="2" />
     <language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="25" />
     <language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="6" />
@@ -40,56 +33,44 @@
     <language slang="l:3ad5badc-1d9c-461c-b7b1-fa2fcd0a0ae7:jetbrains.mps.lang.context" version="0" />
     <language slang="l:ea3159bf-f48e-4720-bde2-86dba75f0d34:jetbrains.mps.lang.context.defs" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
+    <language slang="l:7fa12e9c-b949-4976-b4fa-19accbc320b4:jetbrains.mps.lang.dataFlow" version="1" />
     <language slang="l:f4ad079d-bc71-4ffb-9600-9328705cf998:jetbrains.mps.lang.descriptor" version="0" />
     <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="14" />
+    <language slang="l:64d34fcd-ad02-4e73-aff8-a581124c2e30:jetbrains.mps.lang.findUsages" version="0" />
+    <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="4" />
+    <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="2" />
+    <language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="1" />
     <language slang="l:ad93155d-79b2-4759-b10c-55123e763903:jetbrains.mps.lang.messages" version="0" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
+    <language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
     <language slang="l:d8f591ec-4d86-4af2-9f92-a9e93c803ffa:jetbrains.mps.lang.scopes" version="0" />
+    <language slang="l:0eddeefa-c2d6-4437-bc2c-de50fd4ce470:jetbrains.mps.lang.script" version="1" />
     <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
     <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="9" />
     <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
+    <language slang="l:b83431fe-5c8f-40bc-8a36-65e25f4dd253:jetbrains.mps.lang.textGen" version="1" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
+    <language slang="l:4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462:jetbrains.mps.lang.typechecking" version="1" />
+    <language slang="l:afc17aaf-3a3d-4d69-a38d-db90d5e858c6:jetbrains.mps.lang.types" version="0" />
     <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="5" />
+    <language slang="l:c9d137c4-3259-44f8-80ff-33ab2b506ee4:jetbrains.mps.lang.util.order" version="0" />
     <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="13" />
   </languageVersions>
   <dependencyVersions>
     <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
     <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
     <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="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
-    <module reference="fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)" version="0" />
-    <module reference="83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)" version="0" />
     <module reference="f2801650-65d5-424e-bb1b-463a8781b786(jetbrains.mps.baseLanguage.javadoc)" version="0" />
     <module reference="42d031fd-ccb3-45db-91ef-f9621eb0549e(jetbrains.mps.baseLanguage.javadocExt)" version="0" />
-    <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
-    <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
-    <module reference="f159adf4-3c93-40f9-9c5a-1f245a8697af(jetbrains.mps.lang.aspect)" version="0" />
-    <module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
-    <module reference="c4803b19-6d89-4a3b-bf82-390769514add(jetbrains.mps.lang.coderules)" version="0" />
-    <module reference="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" version="0" />
-    <module reference="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
-    <module reference="f4ad079d-bc71-4ffb-9600-9328705cf998(jetbrains.mps.lang.descriptor)" version="0" />
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
-    <module reference="446c26eb-2b7b-4bf0-9b35-f83fa582753e(jetbrains.mps.lang.modelapi)" version="0" />
-    <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
-    <module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="1" />
-    <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="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462(jetbrains.mps.lang.typechecking)" version="0" />
     <module reference="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" version="0" />
-    <module reference="afc17aaf-3a3d-4d69-a38d-db90d5e858c6(jetbrains.mps.lang.types)" version="0" />
-    <module reference="c9d137c4-3259-44f8-80ff-33ab2b506ee4(jetbrains.mps.lang.util.order)" version="0" />
-    <module reference="35320f26-77cb-4c55-be9f-a97a27770af1(jetbrains.mps.logic)" 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>
   <extendedLanguages>
     <extendedLanguage>f2801650-65d5-424e-bb1b-463a8781b786(jetbrains.mps.baseLanguage.javadoc)</extendedLanguage>
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.javadocExt/models/jetbrains.mps.baseLanguage.javadocExt.types.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguage.javadocExt/models/jetbrains.mps.baseLanguage.javadocExt.types.mps
index 0340afe9..bd3e5645 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.javadocExt/models/jetbrains.mps.baseLanguage.javadocExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.javadocExt/models/jetbrains.mps.baseLanguage.javadocExt.types.mps
@@ -5,6 +5,7 @@
     <use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="25" />
     <engage id="afc17aaf-3a3d-4d69-a38d-db90d5e858c6" name="jetbrains.mps.lang.types" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
+    <devkit ref="888618cf-7697-4adc-80cd-8c6ea3486ef7(jetbrains.mps.devkit.aspect.types)" />
   </languages>
   <imports />
   <registry>
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/jetbrains.mps.baseLanguageExt.mpl b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/jetbrains.mps.baseLanguageExt.mpl
index 7c2e560f..ffb67030 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/jetbrains.mps.baseLanguageExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/jetbrains.mps.baseLanguageExt.mpl
@@ -12,19 +12,16 @@
   </facets>
   <accessoryModels />
   <dependencies>
-    <dependency reexport="true">a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)</dependency>
     <dependency reexport="false">26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)</dependency>
-    <dependency reexport="false">ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)</dependency>
     <dependency reexport="false">6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.coderules.typechecking)</dependency>
     <dependency reexport="false">498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)</dependency>
-    <dependency reexport="false">4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462(jetbrains.mps.lang.typechecking)</dependency>
-    <dependency reexport="false">c7d01124-66d5-486d-8b50-7fdccb60b839(jetbrains.mps.baseLanguage.util)</dependency>
-    <dependency reexport="false">f113d56b-63e3-4120-a89c-2f5dcb8c6290(jetbrains.mps.coderules.runtime)</dependency>
     <dependency reexport="false">ed6d7656-532c-4bc2-81d1-af945aeb8280(jetbrains.mps.baseLanguage.blTypes)</dependency>
     <dependency reexport="false">a0c108f0-1637-416e-a249-3effbaa4c998(jetbrains.mps.baseLanguage.search)</dependency>
     <dependency reexport="false">7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)</dependency>
+    <dependency reexport="false">c4803b19-6d89-4a3b-bf82-390769514add(jetbrains.mps.lang.coderules)</dependency>
+    <dependency reexport="false">a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
@@ -90,18 +87,14 @@
     <module reference="83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)" version="0" />
     <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
     <module reference="a0c108f0-1637-416e-a249-3effbaa4c998(jetbrains.mps.baseLanguage.search)" version="0" />
-    <module reference="c7d01124-66d5-486d-8b50-7fdccb60b839(jetbrains.mps.baseLanguage.util)" version="0" />
     <module reference="0fda14cc-a416-4c81-869a-2175d8b3325d(jetbrains.mps.baseLanguageExt)" version="0" />
     <module reference="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c(jetbrains.mps.coderules)" version="0" />
-    <module reference="f113d56b-63e3-4120-a89c-2f5dcb8c6290(jetbrains.mps.coderules.runtime)" version="0" />
     <module reference="6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.coderules.typechecking)" version="0" />
     <module reference="bfbdd672-7ff5-403f-af4f-16da5226f34c(jetbrains.mps.findUsages.runtime)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
-    <module reference="f159adf4-3c93-40f9-9c5a-1f245a8697af(jetbrains.mps.lang.aspect)" version="0" />
     <module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
     <module reference="c4803b19-6d89-4a3b-bf82-390769514add(jetbrains.mps.lang.coderules)" version="0" />
     <module reference="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" version="0" />
-    <module reference="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="f4ad079d-bc71-4ffb-9600-9328705cf998(jetbrains.mps.lang.descriptor)" version="0" />
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
@@ -110,11 +103,8 @@
     <module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="1" />
     <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="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462(jetbrains.mps.lang.typechecking)" version="0" />
     <module reference="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" version="0" />
-    <module reference="afc17aaf-3a3d-4d69-a38d-db90d5e858c6(jetbrains.mps.lang.types)" version="0" />
     <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
-    <module reference="c9d137c4-3259-44f8-80ff-33ab2b506ee4(jetbrains.mps.lang.util.order)" version="0" />
     <module reference="35320f26-77cb-4c55-be9f-a97a27770af1(jetbrains.mps.logic)" 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" />
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps
index 9a5f6492..f0176bb4 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps
@@ -18,27 +18,19 @@
   <imports>
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
     <import index="tpek" ref="r:00000000-0000-4000-0000-011c895902c0(jetbrains.mps.baseLanguage.behavior)" />
-    <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
-    <import index="bj13" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.logical(jetbrains.mps.logic.reactor/)" />
-    <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.dataform)" />
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
     <import index="w7la" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.evaluation(jetbrains.mps.logic.reactor/)" />
-    <import index="cxk7" ref="r:daa544a7-0a5c-49c0-a54c-4c2a5b4868aa(jetbrains.mps.logic.predicate)" />
-    <import index="hano" ref="r:2b43b673-12f9-49ea-8e43-d0c7a401586a(jetbrains.mps.lang.coderules.eval)" />
     <import index="zdap" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.util.text(MPS.IDEA/)" />
     <import index="tj24" ref="r:0fbbb63a-fd15-46e1-8136-78049f6d6e63(jetbrains.mps.coderules.typechecking.service)" />
-    <import index="oy3s" ref="r:a6030cee-34eb-4503-b1bf-015fe5cd8c1a(jetbrains.mps.logic.unification)" />
-    <import index="82uw" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.function(JDK/)" />
     <import index="guwi" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.io(JDK/)" />
-    <import index="pz2c" ref="r:2a308ea0-c7e3-4fa5-a624-ad74ee5cfab5(jetbrains.mps.baseLanguage.util)" />
-    <import index="lehm" ref="r:464fcc95-fddb-47d1-b620-592cbf6b8bf2(jetbrains.mps.coderules.runtime.memoizer)" />
     <import index="tpdt" ref="r:00000000-0000-4000-0000-011c895902dd(jetbrains.mps.baseLanguage.blTypes.structure)" />
-    <import index="wq2x" ref="r:83137295-aa87-45e8-b0c0-ede2adf2a396(jetbrains.mps.lang.coderules.structure)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
-    <import index="jpi6" ref="r:4c913df4-f2d5-43f7-af56-6bccd35aeb11(jetbrains.mps.lang.coderules.terms)" />
     <import index="ntzd" ref="r:bf32fdbc-530f-4631-ba64-3e7b620ac47f(jetbrains.mps.baseLanguage.util)" />
     <import index="tpd4" ref="r:00000000-0000-4000-0000-011c895902b4(jetbrains.mps.lang.typesystem.structure)" />
+    <import index="tpfl" ref="r:97d6f79f-4a27-4a9b-9122-9bccfb5317c9(jetbrains.mps.lang.coderules.predicate)" />
+    <import index="hh42" ref="r:75494708-a5bf-40c3-8a06-1176e662985f(jetbrains.mps.lang.coderules.terms)" />
+    <import index="cof4" ref="r:0a9d1d47-250c-4f98-8962-b65edf8b0721(jetbrains.mps.logic.dataform)" />
     <import index="tp2c" ref="r:00000000-0000-4000-0000-011c89590338(jetbrains.mps.baseLanguage.closures.structure)" implicit="true" />
     <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" implicit="true" />
   </imports>
@@ -12764,12 +12756,12 @@
                   <node concept="3wWvb2" id="5RTKp1p_FVR" role="3I6s78">
                     <node concept="3fqX7Q" id="5RTKp1pCbe8" role="3wWo3s">
                       <node concept="2YIFZM" id="5RTKp1pCbea" role="3fr31v">
-                        <ref role="37wK5l" to="jpi6:1RYTbd7gud7" resolve="hasSpecification" />
-                        <ref role="1Pybhc" to="jpi6:1RYTbd6oE5l" resolve="TermUtil" />
+                        <ref role="37wK5l" to="hh42:1RYTbd7gud7" resolve="hasSpecification" />
+                        <ref role="1Pybhc" to="hh42:1RYTbd6oE5l" resolve="TermUtil" />
                         <node concept="1eOMI4" id="5RTKp1pCbeb" role="37wK5m">
                           <node concept="10QFUN" id="5RTKp1pCbec" role="1eOMHV">
                             <node concept="3uibUv" id="5RTKp1pCbed" role="10QFUM">
-                              <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="TermNode" />
+                              <ref role="3uigEE" to="cof4:5JQSuNswOXL" resolve="TermNode" />
                             </node>
                             <node concept="1Ft4W6" id="5RTKp1pCbee" role="10QFUP">
                               <node concept="a7P8L" id="5RTKp1pCbef" role="1FtiSR">
@@ -35261,11 +35253,11 @@
           <node concept="3cpWsn" id="7AMUQZVAYfc" role="3cpWs9">
             <property role="TrG5h" value="value" />
             <node concept="3uibUv" id="7AMUQZVAYfd" role="1tU5fm">
-              <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+              <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
             </node>
             <node concept="2YIFZM" id="7AMUQZVAYfe" role="33vP2m">
-              <ref role="37wK5l" to="6exd:6HT7BWBOXr$" resolve="ground" />
-              <ref role="1Pybhc" to="6exd:6HT7BWBOXme" resolve="DataFormUtil" />
+              <ref role="37wK5l" to="cof4:6HT7BWBOXr$" resolve="ground" />
+              <ref role="1Pybhc" to="cof4:6HT7BWBOXme" resolve="DataFormUtil" />
               <node concept="37vLTw" id="7AMUQZVAYff" role="37wK5m">
                 <ref role="3cqZAo" node="3KV3FXjZT2X" resolve="leftVal" />
               </node>
@@ -35279,7 +35271,7 @@
                 <node concept="1eOMI4" id="7AMUQZVveBP" role="2Oq$k0">
                   <node concept="10QFUN" id="7AMUQZVveBM" role="1eOMHV">
                     <node concept="3uibUv" id="7AMUQZVveBR" role="10QFUM">
-                      <ref role="3uigEE" to="6exd:3OPtF03lco4" resolve="ListNode" />
+                      <ref role="3uigEE" to="cof4:3OPtF03lco4" resolve="ListNode" />
                     </node>
                     <node concept="37vLTw" id="7AMUQZVveBS" role="10QFUP">
                       <ref role="3cqZAo" node="7AMUQZVAYfc" resolve="value" />
@@ -35287,14 +35279,14 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="7AMUQZVvfvF" role="2OqNvi">
-                  <ref role="37wK5l" to="6exd:5YIOneOT0Zn" resolve="contents" />
+                  <ref role="37wK5l" to="cof4:5YIOneOT0Zn" resolve="contents" />
                 </node>
               </node>
             </node>
           </node>
           <node concept="2ZW3vV" id="7AMUQZVvcWX" role="3clFbw">
             <node concept="3uibUv" id="7AMUQZVvdbD" role="2ZW6by">
-              <ref role="3uigEE" to="6exd:3OPtF03lco4" resolve="ListNode" />
+              <ref role="3uigEE" to="cof4:3OPtF03lco4" resolve="ListNode" />
             </node>
             <node concept="37vLTw" id="7AMUQZVvcw7" role="2ZW6bz">
               <ref role="3cqZAo" node="7AMUQZVAYfc" resolve="value" />
@@ -35315,14 +35307,14 @@
       <node concept="37vLTG" id="3KV3FXjZT2X" role="3clF46">
         <property role="TrG5h" value="leftVal" />
         <node concept="3uibUv" id="3KV3FXjZT2Y" role="1tU5fm">
-          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+          <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
         </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="6exd:1bm7a6EXvsP" resolve="DataForm" />
+            <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
           </node>
         </node>
       </node>
@@ -35343,12 +35335,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="6exd:1bm7a6EXvsP" resolve="DataForm" />
+            <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
           </node>
         </node>
       </node>
       <node concept="3uibUv" id="wfREvq9S73" role="3clF45">
-        <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+        <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
       </node>
       <node concept="3Tm1VV" id="3bgqfmmxev8" role="1B3o_S" />
       <node concept="3clFbS" id="5H6hZahoMlA" role="3clF47">
@@ -35357,7 +35349,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="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
             </node>
             <node concept="2ShNRf" id="5H6hZahszJb" role="33vP2m">
@@ -35373,7 +35365,7 @@
                   </node>
                 </node>
                 <node concept="3uibUv" id="5H6hZahszJh" role="3$_nBY">
-                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                  <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                 </node>
               </node>
             </node>
@@ -35433,8 +35425,8 @@
         </node>
         <node concept="3cpWs6" id="1qY0I4b_xCX" role="3cqZAp">
           <node concept="2YIFZM" id="1qY0I4b_yhh" role="3cqZAk">
-            <ref role="37wK5l" to="6exd:1OShD0HS45f" resolve="createList" />
-            <ref role="1Pybhc" to="6exd:3OPtF03lco4" resolve="ListNode" />
+            <ref role="37wK5l" to="cof4:1OShD0HS45f" resolve="createList" />
+            <ref role="1Pybhc" to="cof4:3OPtF03lco4" resolve="ListNode" />
             <node concept="37vLTw" id="1qY0I4b_yqF" role="37wK5m">
               <ref role="3cqZAo" node="5H6hZahszJ8" resolve="array" />
             </node>
@@ -35453,7 +35445,7 @@
               <ref role="3uigEE" to="33ny:~List" resolve="List" />
               <node concept="3qUE_q" id="4E290qPZ8gx" role="11_B2D">
                 <node concept="3uibUv" id="4E290qPZ8gy" role="3qUE_r">
-                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                  <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                 </node>
               </node>
             </node>
@@ -35524,12 +35516,12 @@
       </node>
       <node concept="3Tm1VV" id="4E290qPZ7B4" role="1B3o_S" />
       <node concept="3uibUv" id="4E290qPZ7RB" role="3clF45">
-        <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+        <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
       </node>
       <node concept="37vLTG" id="4E290qPZ889" role="3clF46">
         <property role="TrG5h" value="list" />
         <node concept="3uibUv" id="4E290qPZ888" role="1tU5fm">
-          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+          <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
         </node>
       </node>
       <node concept="37vLTG" id="4E290qPZ8aI" role="3clF46">
@@ -35560,7 +35552,7 @@
       <node concept="37vLTG" id="3DgB4rOx2cu" role="3clF46">
         <property role="TrG5h" value="list" />
         <node concept="3uibUv" id="3DgB4rOx2ct" role="1tU5fm">
-          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+          <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
         </node>
       </node>
     </node>
@@ -48651,7 +48643,7 @@
         <property role="TrG5h" value="iterateTerms" />
         <node concept="A3Dl8" id="4AOWlUn4lBX" role="3clF45">
           <node concept="3uibUv" id="4AOWlUn50EI" role="A3Ik2">
-            <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+            <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
           </node>
         </node>
         <node concept="3Tm1VV" id="4AOWlUn4jzv" role="1B3o_S" />
@@ -49008,7 +49000,7 @@
         <node concept="37vLTG" id="3bgqfmm0Xhx" role="3clF46">
           <property role="TrG5h" value="tpath" />
           <node concept="3uibUv" id="3bgqfmm10qG" role="1tU5fm">
-            <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+            <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
           </node>
         </node>
         <node concept="3cqZAl" id="3bgqfmm0H0z" role="3clF45" />
@@ -49018,11 +49010,11 @@
             <node concept="3cpWsn" id="3bgqfmm_iDZ" role="3cpWs9">
               <property role="TrG5h" value="value" />
               <node concept="3uibUv" id="3bgqfmm_iE0" role="1tU5fm">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="2YIFZM" id="3bgqfmm_iE1" role="33vP2m">
-                <ref role="37wK5l" to="6exd:6HT7BWBOXr$" resolve="ground" />
-                <ref role="1Pybhc" to="6exd:6HT7BWBOXme" resolve="DataFormUtil" />
+                <ref role="37wK5l" to="cof4:6HT7BWBOXr$" resolve="ground" />
+                <ref role="1Pybhc" to="cof4:6HT7BWBOXme" resolve="DataFormUtil" />
                 <node concept="37vLTw" id="3bgqfmm_iE2" role="37wK5m">
                   <ref role="3cqZAo" node="3bgqfmm0Xhx" resolve="tpath" />
                 </node>
@@ -49033,7 +49025,7 @@
             <node concept="3fqX7Q" id="3bgqfmm_iE4" role="3clFbw">
               <node concept="2ZW3vV" id="3bgqfmm_iE5" role="3fr31v">
                 <node concept="3uibUv" id="3bgqfmm_iE6" role="2ZW6by">
-                  <ref role="3uigEE" to="6exd:3OPtF03lco4" resolve="ListNode" />
+                  <ref role="3uigEE" to="cof4:3OPtF03lco4" resolve="ListNode" />
                 </node>
                 <node concept="37vLTw" id="3bgqfmm_iE7" role="2ZW6bz">
                   <ref role="3cqZAo" node="3bgqfmm_iDZ" resolve="value" />
@@ -49060,7 +49052,7 @@
               <node concept="3uibUv" id="3bgqfmm_kbd" role="1tU5fm">
                 <ref role="3uigEE" to="33ny:~List" resolve="List" />
                 <node concept="3uibUv" id="3bgqfmm_kbe" role="11_B2D">
-                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                  <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                 </node>
               </node>
               <node concept="10QFUN" id="3bgqfmm_kbf" role="33vP2m">
@@ -49068,7 +49060,7 @@
                   <node concept="1eOMI4" id="3bgqfmm_kbh" role="2Oq$k0">
                     <node concept="10QFUN" id="3bgqfmm_kbi" role="1eOMHV">
                       <node concept="3uibUv" id="3bgqfmm_kbj" role="10QFUM">
-                        <ref role="3uigEE" to="6exd:3OPtF03lco4" resolve="ListNode" />
+                        <ref role="3uigEE" to="cof4:3OPtF03lco4" resolve="ListNode" />
                       </node>
                       <node concept="37vLTw" id="3bgqfmm_kbk" role="10QFUP">
                         <ref role="3cqZAo" node="3bgqfmm0Xhx" resolve="tpath" />
@@ -49076,13 +49068,13 @@
                     </node>
                   </node>
                   <node concept="liA8E" id="3bgqfmm_kbl" role="2OqNvi">
-                    <ref role="37wK5l" to="6exd:5YIOneOT0Zn" resolve="contents" />
+                    <ref role="37wK5l" to="cof4:5YIOneOT0Zn" resolve="contents" />
                   </node>
                 </node>
                 <node concept="3uibUv" id="3bgqfmm_kbm" role="10QFUM">
                   <ref role="3uigEE" to="33ny:~List" resolve="List" />
                   <node concept="3uibUv" id="3bgqfmm_kbn" role="11_B2D">
-                    <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                    <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                   </node>
                 </node>
               </node>
@@ -49493,7 +49485,7 @@
           <property role="TrG5h" value="termPath" />
           <node concept="_YKpA" id="z9rjE$MqQN" role="1tU5fm">
             <node concept="3uibUv" id="z9rjE$MqQO" role="_ZDj9">
-              <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+              <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
             </node>
           </node>
         </node>
@@ -49533,7 +49525,7 @@
           <property role="TrG5h" value="termPath" />
           <node concept="_YKpA" id="z9rjE_e9xK" role="1tU5fm">
             <node concept="3uibUv" id="z9rjE_e9xL" role="_ZDj9">
-              <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+              <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
             </node>
           </node>
         </node>
@@ -49623,7 +49615,7 @@
                 <node concept="2ShNRf" id="4AOWlUmXyT1" role="37wK5m">
                   <node concept="Tc6Ow" id="4AOWlUmXyT2" role="2ShVmc">
                     <node concept="3uibUv" id="4AOWlUmXyT3" role="HW$YZ">
-                      <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                      <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                     </node>
                     <node concept="2OqwBi" id="4AOWlUmXyT4" role="I$8f6">
                       <node concept="37vLTw" id="4AOWlUmXyT5" role="2Oq$k0">
@@ -49687,7 +49679,7 @@
                 <node concept="2ShNRf" id="5OjpQKwlqTd" role="37wK5m">
                   <node concept="Tc6Ow" id="5OjpQKwlqTe" role="2ShVmc">
                     <node concept="3uibUv" id="5OjpQKwosrg" role="HW$YZ">
-                      <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                      <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                     </node>
                     <node concept="2OqwBi" id="5OjpQKwlqTg" role="I$8f6">
                       <node concept="37vLTw" id="5OjpQKwotlC" role="2Oq$k0">
@@ -49756,7 +49748,7 @@
         <property role="TrG5h" value="iterateTerms" />
         <node concept="A3Dl8" id="z9rjE$9cFt" role="3clF45">
           <node concept="3uibUv" id="z9rjE$9cFu" role="A3Ik2">
-            <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+            <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
           </node>
         </node>
         <node concept="3Tm1VV" id="z9rjE$9cFv" role="1B3o_S" />
@@ -49786,7 +49778,7 @@
         <node concept="3Tmbuc" id="3bgqfmm_JMG" role="1B3o_S" />
         <node concept="_YKpA" id="4JBuioG4hU$" role="1tU5fm">
           <node concept="3uibUv" id="4JBuioG4hWZ" role="_ZDj9">
-            <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+            <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
           </node>
         </node>
       </node>
@@ -50196,7 +50188,7 @@
         </node>
       </node>
       <node concept="3uibUv" id="3bgqfmmljvO" role="3clF45">
-        <ref role="3uigEE" to="6exd:3OPtF03lco4" resolve="ListNode" />
+        <ref role="3uigEE" to="cof4:3OPtF03lco4" resolve="ListNode" />
       </node>
       <node concept="3Tm1VV" id="3bgqfmmljvP" role="1B3o_S" />
       <node concept="3clFbS" id="3bgqfmmljvQ" role="3clF47">
@@ -50222,8 +50214,8 @@
         </node>
         <node concept="3cpWs6" id="4AOWlUn3Aym" role="3cqZAp">
           <node concept="2YIFZM" id="4AOWlUn3Ayn" role="3cqZAk">
-            <ref role="37wK5l" to="6exd:1OShD0HS45f" resolve="createList" />
-            <ref role="1Pybhc" to="6exd:3OPtF03lco4" resolve="ListNode" />
+            <ref role="37wK5l" to="cof4:1OShD0HS45f" resolve="createList" />
+            <ref role="1Pybhc" to="cof4:3OPtF03lco4" resolve="ListNode" />
             <node concept="2OqwBi" id="4AOWlUn4DyB" role="37wK5m">
               <node concept="2OqwBi" id="4AOWlUn4DyC" role="2Oq$k0">
                 <node concept="1eOMI4" id="4AOWlUn4DyD" role="2Oq$k0">
@@ -50624,7 +50616,7 @@
         </node>
       </node>
       <node concept="3uibUv" id="4JBuioGgDgE" role="3clF45">
-        <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+        <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
       </node>
       <node concept="3Tm1VV" id="4JBuioGg$$j" role="1B3o_S" />
       <node concept="3clFbS" id="4JBuioGg$$k" role="3clF47">
@@ -50682,13 +50674,13 @@
                           <property role="TrG5h" value="pair" />
                           <node concept="_YKpA" id="5OjpQKwmBOV" role="1tU5fm">
                             <node concept="3uibUv" id="5OjpQKwmBOW" role="_ZDj9">
-                              <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                              <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                             </node>
                           </node>
                           <node concept="2ShNRf" id="5OjpQKwmBOX" role="33vP2m">
                             <node concept="Tc6Ow" id="5OjpQKwmBOY" role="2ShVmc">
                               <node concept="3uibUv" id="5OjpQKwmBOZ" role="HW$YZ">
-                                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                               </node>
                               <node concept="2OqwBi" id="5OjpQKwmBP0" role="HW$Y0">
                                 <node concept="2OqwBi" id="4AOWlUn68te" role="2Oq$k0">
@@ -52091,7 +52083,7 @@
         <node concept="3clFbS" id="74XSvywgVYS" role="3clF47">
           <node concept="3clFbF" id="74XSvywgVYT" role="3cqZAp">
             <node concept="1rXfSq" id="74XSvywgVYU" role="3clFbG">
-              <ref role="37wK5l" to="cxk7:2UGjFq4lTDy" resolve="doAsk" />
+              <ref role="37wK5l" to="tpfl:2UGjFq4lTDy" resolve="doAsk" />
               <node concept="37vLTw" id="74XSvywgVYV" role="37wK5m">
                 <ref role="3cqZAo" node="74XSvywgVYM" resolve="left" />
               </node>
@@ -52104,7 +52096,7 @@
       </node>
       <node concept="3Tm1VV" id="4JBuioGxCqD" role="1B3o_S" />
       <node concept="3uibUv" id="74XSvywgVYZ" role="1zkMxy">
-        <ref role="3uigEE" to="cxk7:6GYQG_Spvw5" resolve="UnificationPredicate.UnificationSolver" />
+        <ref role="3uigEE" to="tpfl:6GYQG_Spvw5" resolve="UnificationPredicate.UnificationSolver" />
       </node>
       <node concept="3UR2Jj" id="4JBuioGxJxW" role="lGtFl">
         <node concept="TZ5HA" id="4JBuioGxJxX" role="TZ5H$">
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguageInternalExt/jetbrains.mps.baseLanguageInternalExt.mpl b/samples/mpscore/languages/jetbrains.mps.baseLanguageInternalExt/jetbrains.mps.baseLanguageInternalExt.mpl
index 5345f747..d40d5331 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguageInternalExt/jetbrains.mps.baseLanguageInternalExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguageInternalExt/jetbrains.mps.baseLanguageInternalExt.mpl
@@ -56,12 +56,13 @@
         <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
         <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" 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" />
       </dependencyVersions>
       <mapping-priorities />
     </generator>
   </generators>
+  <dependencies>
+    <dependency reexport="false">6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.coderules.typechecking)</dependency>
+  </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
@@ -116,14 +117,20 @@
     <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
     <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
     <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
+    <module reference="1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)" 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="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
     <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
     <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
     <module reference="0fda14cc-a416-4c81-869a-2175d8b3325d(jetbrains.mps.baseLanguageExt)" version="0" />
     <module reference="df345b11-b8c7-4213-ac66-48d2a9b75d88(jetbrains.mps.baseLanguageInternal)" version="0" />
     <module reference="e72b4123-cbc6-4276-9e2f-dfdf088efcbe(jetbrains.mps.baseLanguageInternalExt)" version="0" />
+    <module reference="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c(jetbrains.mps.coderules)" version="0" />
+    <module reference="6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.coderules.typechecking)" version="0" />
+    <module reference="bfbdd672-7ff5-403f-af4f-16da5226f34c(jetbrains.mps.findUsages.runtime)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
-    <module reference="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" version="0" />
+    <module reference="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.coderulesExt/jetbrains.mps.lang.coderulesExt.mpl b/samples/mpscore/languages/jetbrains.mps.lang.coderulesExt/jetbrains.mps.lang.coderulesExt.mpl
index 724eb784..f82c064b 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.coderulesExt/jetbrains.mps.lang.coderulesExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.lang.coderulesExt/jetbrains.mps.lang.coderulesExt.mpl
@@ -75,6 +75,9 @@
     <dependency reexport="false">88dcbb14-19c3-4776-8f81-33611ca4d87c(jetbrains.mps.baseLanguage.sequence)</dependency>
     <dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
     <dependency reexport="false">c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)</dependency>
+    <dependency reexport="false">26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)</dependency>
+    <dependency reexport="false">bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)</dependency>
+    <dependency reexport="false">a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
@@ -140,7 +143,7 @@
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
     <module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
     <module reference="c4803b19-6d89-4a3b-bf82-390769514add(jetbrains.mps.lang.coderules)" version="0" />
-    <module reference="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" version="0" />
+    <module reference="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" version="0" />
     <module reference="6a5b4bb9-0a56-4618-aa9a-7068c528ce90(jetbrains.mps.lang.coderulesExt)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="f4ad079d-bc71-4ffb-9600-9328705cf998(jetbrains.mps.lang.descriptor)" version="0" />
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.coderulesExt/models/jetbrains.mps.lang.coderulesExt.types.mps b/samples/mpscore/languages/jetbrains.mps.lang.coderulesExt/models/jetbrains.mps.lang.coderulesExt.types.mps
index be5d9879..abc8d0c6 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.coderulesExt/models/jetbrains.mps.lang.coderulesExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.lang.coderulesExt/models/jetbrains.mps.lang.coderulesExt.types.mps
@@ -11,7 +11,6 @@
     <import index="kqnc" ref="r:92b96158-68e6-4f53-a32b-36e2b456fe01(jetbrains.mps.baseLanguageExt.types)" />
     <import index="bj13" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.logical(jetbrains.mps.logic.reactor/)" />
     <import index="54p4" ref="r:4756f1c3-ee0d-4da9-817d-c7dad8ea74b8(jetbrains.mps.logicExt.types)" />
-    <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.dataform)" />
     <import index="jxwi" ref="r:6ecd2c91-8e0b-4c6a-878e-d699a7336100(jetbrains.mps.lang.smodelExt.types)" />
     <import index="yh6q" ref="r:14dbdd37-ab02-4407-8e3c-3308d6f4fbba(jetbrains.mps.baseLanguage.sequence.types)" />
     <import index="82uw" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.function(JDK/)" />
@@ -19,6 +18,7 @@
     <import index="wq2x" ref="r:83137295-aa87-45e8-b0c0-ede2adf2a396(jetbrains.mps.lang.coderules.structure)" />
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
     <import index="tpce" ref="r:00000000-0000-4000-0000-011c89590292(jetbrains.mps.lang.structure.structure)" />
+    <import index="cof4" ref="r:0a9d1d47-250c-4f98-8962-b65edf8b0721(jetbrains.mps.logic.dataform)" />
     <import index="x5bw" ref="r:15ea4f4e-2f41-4ce3-b7e4-a4e0737f0171(jetbrains.mps.lang.coderules.behavior)" implicit="true" />
   </imports>
   <registry>
@@ -3576,7 +3576,7 @@
                         <node concept="nsMwS" id="61G6TdCWQRD" role="ns1xD">
                           <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
                           <node concept="h$QuP" id="ZNYuguvgHH" role="iSaTp">
-                            <ref role="h$OrH" to="6exd:3OPtF03lco4" resolve="ListNode" />
+                            <ref role="h$OrH" to="cof4:3OPtF03lco4" resolve="ListNode" />
                           </node>
                         </node>
                       </node>
@@ -3659,7 +3659,7 @@
                         <node concept="nsMwS" id="7kXqzcTKrrY" role="ns1xD">
                           <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
                           <node concept="h$QuP" id="ZNYuguvgHI" role="iSaTp">
-                            <ref role="h$OrH" to="6exd:3OPtF03lco4" resolve="ListNode" />
+                            <ref role="h$OrH" to="cof4:3OPtF03lco4" resolve="ListNode" />
                           </node>
                         </node>
                       </node>
@@ -3736,7 +3736,7 @@
                         <node concept="nsMwS" id="61G6TdCWQQm" role="ns1xD">
                           <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
                           <node concept="h$QuP" id="ZNYuguvgHJ" role="iSaTp">
-                            <ref role="h$OrH" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                            <ref role="h$OrH" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                           </node>
                         </node>
                       </node>
@@ -3819,7 +3819,7 @@
                         <node concept="nsMwS" id="7kXqzcTKrwl" role="ns1xD">
                           <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
                           <node concept="h$QuP" id="ZNYuguvgHK" role="iSaTp">
-                            <ref role="h$OrH" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                            <ref role="h$OrH" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                           </node>
                         </node>
                       </node>
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.smodelExt/jetbrains.mps.lang.smodelExt.mpl b/samples/mpscore/languages/jetbrains.mps.lang.smodelExt/jetbrains.mps.lang.smodelExt.mpl
index 7f68077e..77946370 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.smodelExt/jetbrains.mps.lang.smodelExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.lang.smodelExt/jetbrains.mps.lang.smodelExt.mpl
@@ -70,15 +70,14 @@
   </generators>
   <dependencies>
     <dependency reexport="false">c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)</dependency>
-    <dependency reexport="false">26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)</dependency>
     <dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
     <dependency reexport="false">86ef8290-12bb-4ca7-947f-093788f263a9(jetbrains.mps.lang.project)</dependency>
     <dependency reexport="false">88dcbb14-19c3-4776-8f81-33611ca4d87c(jetbrains.mps.baseLanguage.sequence)</dependency>
     <dependency reexport="false">446c26eb-2b7b-4bf0-9b35-f83fa582753e(jetbrains.mps.lang.modelapi)</dependency>
     <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
     <dependency reexport="false">c1f5ad88-21f4-4e0e-927c-48b1ca0c2334(jetbrains.mps.baseLanguage.collectionsExt)</dependency>
-    <dependency reexport="false">f113d56b-63e3-4120-a89c-2f5dcb8c6290(jetbrains.mps.coderules.runtime)</dependency>
     <dependency reexport="false">af65afd8-f0dd-4942-87d9-63a55f2a9db1(jetbrains.mps.lang.behavior)</dependency>
+    <dependency reexport="false">bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
@@ -145,12 +144,9 @@
     <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
     <module reference="88dcbb14-19c3-4776-8f81-33611ca4d87c(jetbrains.mps.baseLanguage.sequence)" version="0" />
     <module reference="0fda14cc-a416-4c81-869a-2175d8b3325d(jetbrains.mps.baseLanguageExt)" version="0" />
-    <module reference="f113d56b-63e3-4120-a89c-2f5dcb8c6290(jetbrains.mps.coderules.runtime)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
     <module reference="af65afd8-f0dd-4942-87d9-63a55f2a9db1(jetbrains.mps.lang.behavior)" version="0" />
     <module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
-    <module reference="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" version="0" />
-    <module reference="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
     <module reference="446c26eb-2b7b-4bf0-9b35-f83fa582753e(jetbrains.mps.lang.modelapi)" version="0" />
@@ -162,7 +158,6 @@
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.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>
   <extendedLanguages>
     <extendedLanguage>7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)</extendedLanguage>
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.smodelExt/models/jetbrains.mps.lang.smodelExt.types.mps b/samples/mpscore/languages/jetbrains.mps.lang.smodelExt/models/jetbrains.mps.lang.smodelExt.types.mps
index a5a9b3d0..e55b86cd 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.smodelExt/models/jetbrains.mps.lang.smodelExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.lang.smodelExt/models/jetbrains.mps.lang.smodelExt.types.mps
@@ -16,7 +16,6 @@
     <import index="tpcn" ref="r:00000000-0000-4000-0000-011c8959028b(jetbrains.mps.lang.structure.behavior)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
     <import index="tpeu" ref="r:00000000-0000-4000-0000-011c895902fa(jetbrains.mps.lang.smodel.behavior)" />
-    <import index="hano" ref="r:2b43b673-12f9-49ea-8e43-d0c7a401586a(jetbrains.mps.lang.coderules.eval)" />
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
     <import index="hypd" ref="r:aa31e43e-9240-4f4d-b6db-5c1c9a86c59e(jetbrains.mps.lang.project.structure)" />
@@ -27,9 +26,7 @@
     <import index="xlb7" ref="r:cf42fd0a-68d2-493b-8b77-961658617704(jetbrains.mps.lang.modelapi.behavior)" />
     <import index="wi9y" ref="r:cca2ab69-9222-4f50-95ac-2249d9193ff6(jetbrains.mps.baseLanguage.collectionsExt.types)" />
     <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.dataform)" />
     <import index="w7la" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.evaluation(jetbrains.mps.logic.reactor/)" />
-    <import index="lehm" ref="r:464fcc95-fddb-47d1-b620-592cbf6b8bf2(jetbrains.mps.coderules.runtime.memoizer)" />
     <import index="1i04" ref="r:3270011d-8b2d-4938-8dff-d256a759e017(jetbrains.mps.lang.behavior.structure)" />
     <import index="csvn" ref="r:a91e42c5-728b-4866-86c4-d97454f4aee4(jetbrains.mps.lang.behavior.behavior)" />
     <import index="tpek" ref="r:00000000-0000-4000-0000-011c895902c0(jetbrains.mps.baseLanguage.behavior)" implicit="true" />
diff --git a/samples/mpscore/languages/jetbrains.mps.logicExt/jetbrains.mps.logicExt.mpl b/samples/mpscore/languages/jetbrains.mps.logicExt/jetbrains.mps.logicExt.mpl
index 2b93bf1a..dbd8bfa6 100644
--- a/samples/mpscore/languages/jetbrains.mps.logicExt/jetbrains.mps.logicExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.logicExt/jetbrains.mps.logicExt.mpl
@@ -63,6 +63,9 @@
     <dependency reexport="false">0fda14cc-a416-4c81-869a-2175d8b3325d(jetbrains.mps.baseLanguageExt)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
+    <dependency reexport="false">26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)</dependency>
+    <dependency reexport="false">bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)</dependency>
+    <dependency reexport="false">a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
@@ -123,7 +126,7 @@
     <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
     <module reference="0fda14cc-a416-4c81-869a-2175d8b3325d(jetbrains.mps.baseLanguageExt)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
-    <module reference="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" version="0" />
+    <module reference="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
diff --git a/samples/mpscore/languages/jetbrains.mps.logicExt/models/jetbrains.mps.logicExt.types.mps b/samples/mpscore/languages/jetbrains.mps.logicExt/models/jetbrains.mps.logicExt.types.mps
index f2c9c042..0e347569 100644
--- a/samples/mpscore/languages/jetbrains.mps.logicExt/models/jetbrains.mps.logicExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.logicExt/models/jetbrains.mps.logicExt.types.mps
@@ -15,11 +15,11 @@
   <imports>
     <import index="kqnc" ref="r:92b96158-68e6-4f53-a32b-36e2b456fe01(jetbrains.mps.baseLanguageExt.types)" />
     <import index="5j4j" ref="r:c8fb1c5e-8204-4904-a38f-678899d447c1(jetbrains.mps.logic.structure)" />
-    <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.dataform)" />
     <import index="bj13" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.logical(jetbrains.mps.logic.reactor/)" />
-    <import index="oy3s" ref="r:a6030cee-34eb-4503-b1bf-015fe5cd8c1a(jetbrains.mps.logic.unification)" />
     <import index="82uw" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.function(JDK/)" />
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
+    <import index="cof4" ref="r:0a9d1d47-250c-4f98-8962-b65edf8b0721(jetbrains.mps.logic.dataform)" />
+    <import index="uwx2" ref="r:76101703-3fc5-4e76-aa48-9728dde91f7b(jetbrains.mps.logic.unification)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
   </imports>
   <registry>
@@ -1430,7 +1430,7 @@
                                       <node concept="2OqwBi" id="3CulEO1ZTUi" role="1uXrr8">
                                         <node concept="2c44tf" id="3CulEO1ZTUj" role="2Oq$k0">
                                           <node concept="3uibUv" id="3CulEO1ZTUk" role="2c44tc">
-                                            <ref role="3uigEE" to="6exd:6YPNC4OECgm" resolve="ListRole" />
+                                            <ref role="3uigEE" to="cof4:6YPNC4OECgm" resolve="ListRole" />
                                           </node>
                                         </node>
                                         <node concept="3TrEf2" id="3CulEO1ZTUl" role="2OqNvi">
@@ -1455,7 +1455,7 @@
                                         <node concept="2OqwBi" id="3CulEO1ZTUm" role="1uXrr8">
                                           <node concept="2c44tf" id="3CulEO1ZTUn" role="2Oq$k0">
                                             <node concept="3uibUv" id="3CulEO1ZTUo" role="2c44tc">
-                                              <ref role="3uigEE" to="6exd:6YPNC4NYnau" resolve="ChildRole" />
+                                              <ref role="3uigEE" to="cof4:6YPNC4NYnau" resolve="ChildRole" />
                                             </node>
                                           </node>
                                           <node concept="3TrEf2" id="3CulEO1ZTUp" role="2OqNvi">
@@ -1499,7 +1499,7 @@
                                   <node concept="2OqwBi" id="3CulEO26nN8" role="1uXrr8">
                                     <node concept="2c44tf" id="3CulEO26nN9" role="2Oq$k0">
                                       <node concept="3uibUv" id="3CulEO26nNa" role="2c44tc">
-                                        <ref role="3uigEE" to="6exd:2xQ7eRAD2dj" resolve="Value" />
+                                        <ref role="3uigEE" to="cof4:2xQ7eRAD2dj" resolve="Value" />
                                       </node>
                                     </node>
                                     <node concept="3TrEf2" id="3CulEO26nNb" role="2OqNvi">
@@ -1540,7 +1540,7 @@
                                   <node concept="2OqwBi" id="3CulEO1ZTUu" role="1uXrr8">
                                     <node concept="2c44tf" id="3CulEO1ZTUv" role="2Oq$k0">
                                       <node concept="3uibUv" id="3CulEO1ZTUw" role="2c44tc">
-                                        <ref role="3uigEE" to="6exd:3OPtF03lco4" resolve="ListNode" />
+                                        <ref role="3uigEE" to="cof4:3OPtF03lco4" resolve="ListNode" />
                                       </node>
                                     </node>
                                     <node concept="3TrEf2" id="3CulEO1ZTUx" role="2OqNvi">
@@ -1581,7 +1581,7 @@
                                   <node concept="2OqwBi" id="3CulEO1ZTUy" role="1uXrr8">
                                     <node concept="2c44tf" id="3CulEO1ZTUz" role="2Oq$k0">
                                       <node concept="3uibUv" id="3CulEO1ZTU$" role="2c44tc">
-                                        <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                                        <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                                       </node>
                                     </node>
                                     <node concept="3TrEf2" id="3CulEO1ZTU_" role="2OqNvi">
@@ -1670,7 +1670,7 @@
                         <node concept="2OqwBi" id="3CulEO1ZTUA" role="1uXrr8">
                           <node concept="2c44tf" id="3CulEO1ZTUB" role="2Oq$k0">
                             <node concept="3uibUv" id="3CulEO1ZTUC" role="2c44tc">
-                              <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                              <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                             </node>
                           </node>
                           <node concept="3TrEf2" id="3CulEO1ZTUD" role="2OqNvi">
@@ -2104,7 +2104,7 @@
                         <node concept="nsMwS" id="3CulEO39Jhh" role="ns1xD">
                           <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
                           <node concept="h$QuP" id="ZNYuguvgIp" role="iSaTp">
-                            <ref role="h$OrH" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                            <ref role="h$OrH" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                           </node>
                         </node>
                       </node>
@@ -2182,7 +2182,7 @@
                       <node concept="nsMwS" id="7LI_gNMpYy2" role="ns1xD">
                         <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
                         <node concept="h$QuP" id="ZNYuguvgIr" role="iSaTp">
-                          <ref role="h$OrH" to="oy3s:1fvYCPC9rB6" resolve="MetaLogicalArray" />
+                          <ref role="h$OrH" to="uwx2:1fvYCPC9rB6" resolve="MetaLogicalArray" />
                         </node>
                       </node>
                     </node>
@@ -2366,7 +2366,7 @@
                         <node concept="nsMwS" id="61G6TdCWQQm" role="ns1xD">
                           <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
                           <node concept="h$QuP" id="ZNYuguvgIs" role="iSaTp">
-                            <ref role="h$OrH" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                            <ref role="h$OrH" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                           </node>
                         </node>
                       </node>
diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.methodReferencesExt.test/jetbrains.mps.baseLanguage.methodReferencesExt.test.msd b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.methodReferencesExt.test/jetbrains.mps.baseLanguage.methodReferencesExt.test.msd
index 10762e02..a8fbc36f 100644
--- a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.methodReferencesExt.test/jetbrains.mps.baseLanguage.methodReferencesExt.test.msd
+++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.methodReferencesExt.test/jetbrains.mps.baseLanguage.methodReferencesExt.test.msd
@@ -46,17 +46,13 @@
     <module reference="b1b27b0c-ed89-4239-bd69-1dd66ccfd0e1(jetbrains.mps.baseLanguage.methodReferencesExt.test)" version="0" />
     <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
     <module reference="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c(jetbrains.mps.coderules)" version="0" />
-    <module reference="f113d56b-63e3-4120-a89c-2f5dcb8c6290(jetbrains.mps.coderules.runtime)" version="0" />
     <module reference="6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.coderules.typechecking)" version="0" />
     <module reference="bfbdd672-7ff5-403f-af4f-16da5226f34c(jetbrains.mps.findUsages.runtime)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
     <module reference="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" version="0" />
-    <module reference="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.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/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/jetbrains.mps.baseLanguageExt.test.msd b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/jetbrains.mps.baseLanguageExt.test.msd
index f19a5100..8919fc7b 100644
--- a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/jetbrains.mps.baseLanguageExt.test.msd
+++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/jetbrains.mps.baseLanguageExt.test.msd
@@ -14,18 +14,15 @@
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
-    <dependency reexport="false">df345b11-b8c7-4213-ac66-48d2a9b75d88(jetbrains.mps.baseLanguageInternal)</dependency>
     <dependency reexport="false">0fda14cc-a416-4c81-869a-2175d8b3325d(jetbrains.mps.baseLanguageExt)</dependency>
     <dependency reexport="false">bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)</dependency>
-    <dependency reexport="false">a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)</dependency>
     <dependency reexport="false">3ddddf69-9ff0-426b-9365-51ae7356fb82(typechecking.samples.baseLanguage)</dependency>
     <dependency reexport="false">6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.coderules.typechecking)</dependency>
     <dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
-    <dependency reexport="false">7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)</dependency>
     <dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
     <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
-    <dependency reexport="false">f113d56b-63e3-4120-a89c-2f5dcb8c6290(jetbrains.mps.coderules.runtime)</dependency>
     <dependency reexport="false">02473356-2f59-4de1-ba87-e88f9d606180(jetbrains.mps.coderules.testhelper)</dependency>
+    <dependency reexport="false">a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
@@ -64,31 +61,19 @@
     <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
     <module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
     <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
-    <module reference="443f4c36-fcf5-4eb6-9500-8d06ed259e3e(jetbrains.mps.baseLanguage.classifiers)" version="0" />
-    <module reference="fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)" version="0" />
-    <module reference="83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)" version="0" />
     <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
     <module reference="0fda14cc-a416-4c81-869a-2175d8b3325d(jetbrains.mps.baseLanguageExt)" version="0" />
     <module reference="e44e7802-2e40-482b-9b1c-6d42660a6a11(jetbrains.mps.baseLanguageExt.test)" version="0" />
-    <module reference="df345b11-b8c7-4213-ac66-48d2a9b75d88(jetbrains.mps.baseLanguageInternal)" version="0" />
     <module reference="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c(jetbrains.mps.coderules)" version="0" />
-    <module reference="f113d56b-63e3-4120-a89c-2f5dcb8c6290(jetbrains.mps.coderules.runtime)" version="0" />
     <module reference="02473356-2f59-4de1-ba87-e88f9d606180(jetbrains.mps.coderules.testhelper)" version="0" />
     <module reference="6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.coderules.typechecking)" version="0" />
     <module reference="35e2a720-13d8-4eda-88d3-ff9d78d5a3ae(jetbrains.mps.coderules.typechecking.ui)" version="0" />
     <module reference="bfbdd672-7ff5-403f-af4f-16da5226f34c(jetbrains.mps.findUsages.runtime)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
-    <module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
     <module reference="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" version="0" />
-    <module reference="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
-    <module reference="446c26eb-2b7b-4bf0-9b35-f83fa582753e(jetbrains.mps.lang.modelapi)" version="0" />
-    <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
-    <module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="1" />
-    <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="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" version="0" />
-    <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" 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="da80355b-a098-4248-9ec8-70d10dd7e9af(jetbrains.mps.reporting.runtime)" version="0" />
diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.incremental@tests.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.incremental@tests.mps
index d14a43a3..85f08cca 100644
--- a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.incremental@tests.mps
+++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.incremental@tests.mps
@@ -19,13 +19,13 @@
   <imports>
     <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
     <import index="av0y" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.program(jetbrains.mps.logic.reactor/)" />
-    <import index="i348" ref="r:42a15dec-83a9-4fe1-80d6-3bf898c512bd(jetbrains.mps.lang.coderules.template)" />
     <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.dataform)" />
     <import index="guwi" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.io(JDK/)" />
     <import index="kqnc" ref="r:92b96158-68e6-4f53-a32b-36e2b456fe01(jetbrains.mps.baseLanguageExt.types)" />
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
     <import index="hmoe" ref="r:a07b09f7-cbf3-40d9-ae10-40da3926c5fa(jetbrains.mps.coderules.testhelper.testutil)" />
+    <import index="ugy2" ref="r:57b2449f-b7c7-4941-bd75-9c594835f5cd(jetbrains.mps.lang.coderules.template)" />
+    <import index="cof4" ref="r:0a9d1d47-250c-4f98-8962-b65edf8b0721(jetbrains.mps.logic.dataform)" />
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" implicit="true" />
     <import index="tpek" ref="r:00000000-0000-4000-0000-011c895902c0(jetbrains.mps.baseLanguage.behavior)" implicit="true" />
   </imports>
@@ -772,7 +772,7 @@
                         <node concept="1Wc70l" id="3FGJ5nvnLlA" role="3uHU7B">
                           <node concept="2ZW3vV" id="3FGJ5nvnzgt" role="3uHU7B">
                             <node concept="3uibUv" id="3FGJ5nvnzz3" role="2ZW6by">
-                              <ref role="3uigEE" to="i348:7nPD14OaO1O" resolve="RuleEx" />
+                              <ref role="3uigEE" to="ugy2:7nPD14OaO1O" resolve="RuleEx" />
                             </node>
                             <node concept="37vLTw" id="3FGJ5nvnyWB" role="2ZW6bz">
                               <ref role="3cqZAo" node="6E5fMGvfKVG" resolve="it" />
@@ -783,14 +783,14 @@
                             <node concept="2OqwBi" id="3FGJ5nvnLBa" role="3uHU7B">
                               <node concept="0kSF2" id="3FGJ5nvnLBb" role="2Oq$k0">
                                 <node concept="3uibUv" id="3FGJ5nvnLBc" role="0kSFW">
-                                  <ref role="3uigEE" to="i348:7nPD14OaO1O" resolve="RuleEx" />
+                                  <ref role="3uigEE" to="ugy2:7nPD14OaO1O" resolve="RuleEx" />
                                 </node>
                                 <node concept="37vLTw" id="3FGJ5nvnLBd" role="0kSFX">
                                   <ref role="3cqZAo" node="6E5fMGvfKVG" resolve="it" />
                                 </node>
                               </node>
                               <node concept="liA8E" id="3Pxu0s8fl0p" role="2OqNvi">
-                                <ref role="37wK5l" to="i348:3Pxu0s8egWa" resolve="origin" />
+                                <ref role="37wK5l" to="ugy2:3Pxu0s8egWa" resolve="origin" />
                               </node>
                             </node>
                           </node>
@@ -802,14 +802,14 @@
                           <node concept="2OqwBi" id="3FGJ5nvnBh9" role="3uHU7B">
                             <node concept="0kSF2" id="3FGJ5nvnAcC" role="2Oq$k0">
                               <node concept="3uibUv" id="3FGJ5nvnAtZ" role="0kSFW">
-                                <ref role="3uigEE" to="i348:7nPD14OaO1O" resolve="RuleEx" />
+                                <ref role="3uigEE" to="ugy2:7nPD14OaO1O" resolve="RuleEx" />
                               </node>
                               <node concept="37vLTw" id="3FGJ5nvn_U6" role="0kSFX">
                                 <ref role="3cqZAo" node="6E5fMGvfKVG" resolve="it" />
                               </node>
                             </node>
                             <node concept="liA8E" id="3Pxu0s8foMV" role="2OqNvi">
-                              <ref role="37wK5l" to="i348:3Pxu0s8egWa" resolve="origin" />
+                              <ref role="37wK5l" to="ugy2:3Pxu0s8egWa" resolve="origin" />
                             </node>
                           </node>
                         </node>
@@ -2411,7 +2411,7 @@
               <node concept="3eNFk2" id="4a1_91oIoZv" role="3eNLev">
                 <node concept="2ZW3vV" id="tc9pc3x1hJ" role="3eO9$A">
                   <node concept="3uibUv" id="tc9pc3x1hK" role="2ZW6by">
-                    <ref role="3uigEE" to="6exd:1msb0mq9ID4" resolve="DataNode" />
+                    <ref role="3uigEE" to="cof4:1msb0mq9ID4" resolve="DataNode" />
                   </node>
                   <node concept="2GrUjf" id="tc9pc3x1hL" role="2ZW6bz">
                     <ref role="2Gs0qQ" node="tc9pc3x1hD" resolve="arg" />
@@ -2423,7 +2423,7 @@
                       <node concept="1eOMI4" id="tc9pc3x1hP" role="2Oq$k0">
                         <node concept="10QFUN" id="tc9pc3x1hQ" role="1eOMHV">
                           <node concept="3uibUv" id="tc9pc3x1hR" role="10QFUM">
-                            <ref role="3uigEE" to="6exd:1msb0mq9ID4" resolve="DataNode" />
+                            <ref role="3uigEE" to="cof4:1msb0mq9ID4" resolve="DataNode" />
                           </node>
                           <node concept="2GrUjf" id="tc9pc3x1hS" role="10QFUP">
                             <ref role="2Gs0qQ" node="tc9pc3x1hD" resolve="arg" />
@@ -2431,7 +2431,7 @@
                         </node>
                       </node>
                       <node concept="liA8E" id="tc9pc3zcLj" role="2OqNvi">
-                        <ref role="37wK5l" to="6exd:104EUzFOBnD" resolve="acceptVisitor" />
+                        <ref role="37wK5l" to="cof4:104EUzFOBnD" resolve="acceptVisitor" />
                         <node concept="Xjq3P" id="tc9pc3zdj9" role="37wK5m" />
                       </node>
                     </node>
@@ -2499,7 +2499,7 @@
       <node concept="37vLTG" id="tc9pc3wRUe" role="3clF46">
         <property role="TrG5h" value="node" />
         <node concept="3uibUv" id="tc9pc3wRUf" role="1tU5fm">
-          <ref role="3uigEE" to="6exd:1msb0mq9ID4" resolve="DataNode" />
+          <ref role="3uigEE" to="cof4:1msb0mq9ID4" resolve="DataNode" />
         </node>
       </node>
       <node concept="3uibUv" id="4aLjyB0FINB" role="3clF45">
@@ -2516,7 +2516,7 @@
               <node concept="10QFUN" id="tc9pc3wRUo" role="1eOMHV">
                 <node concept="3vKaQO" id="tc9pc3wRUp" role="10QFUM">
                   <node concept="3uibUv" id="tc9pc3wRUq" role="3O5elw">
-                    <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                    <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                   </node>
                 </node>
                 <node concept="2OqwBi" id="tc9pc3wRUr" role="10QFUP">
@@ -2524,7 +2524,7 @@
                     <ref role="3cqZAo" node="tc9pc3wRUe" resolve="node" />
                   </node>
                   <node concept="liA8E" id="tc9pc3wRUt" role="2OqNvi">
-                    <ref role="37wK5l" to="6exd:5JQSuNswjSg" resolve="arguments" />
+                    <ref role="37wK5l" to="cof4:5JQSuNswjSg" resolve="arguments" />
                   </node>
                 </node>
               </node>
@@ -2538,7 +2538,7 @@
                         <ref role="3cqZAo" node="6E5fMGvfKVM" resolve="it" />
                       </node>
                       <node concept="liA8E" id="tc9pc3ze1P" role="2OqNvi">
-                        <ref role="37wK5l" to="6exd:104EUzFOBnD" resolve="acceptVisitor" />
+                        <ref role="37wK5l" to="cof4:104EUzFOBnD" resolve="acceptVisitor" />
                         <node concept="Xjq3P" id="tc9pc3ze8x" role="37wK5m" />
                       </node>
                     </node>
@@ -2562,7 +2562,7 @@
       <node concept="37vLTG" id="tc9pc3wRUG" role="3clF46">
         <property role="TrG5h" value="value" />
         <node concept="3uibUv" id="tc9pc3wRUH" role="1tU5fm">
-          <ref role="3uigEE" to="6exd:2xQ7eRAD2dj" resolve="Value" />
+          <ref role="3uigEE" to="cof4:2xQ7eRAD2dj" resolve="Value" />
           <node concept="16syzq" id="tc9pc3wRUI" role="11_B2D">
             <ref role="16sUi3" node="tc9pc3wRUL" resolve="V" />
           </node>
@@ -2587,7 +2587,7 @@
                 <ref role="3cqZAo" node="tc9pc3wRUG" resolve="value" />
               </node>
               <node concept="liA8E" id="tc9pc3y0bZ" role="2OqNvi">
-                <ref role="37wK5l" to="6exd:1msb0mq8QTt" resolve="symbol" />
+                <ref role="37wK5l" to="cof4:1msb0mq8QTt" resolve="symbol" />
               </node>
             </node>
             <node concept="3uibUv" id="tc9pc3y7v0" role="1tU5fm">
@@ -2728,7 +2728,7 @@
     </node>
     <node concept="2tJIrI" id="tc9pc3z7lL" role="jymVt" />
     <node concept="3uibUv" id="4WeLqVwUHoU" role="EKbjA">
-      <ref role="3uigEE" to="6exd:104EUzFOARB" resolve="DataForm.Visitor" />
+      <ref role="3uigEE" to="cof4:104EUzFOARB" resolve="DataForm.Visitor" />
       <node concept="3uibUv" id="4WeLqVwUJug" role="11_B2D">
         <ref role="3uigEE" to="wyt6:~Void" resolve="Void" />
       </node>
diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.types@tests.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.types@tests.mps
index 8bc15eb8..ad60c695 100644
--- a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.types@tests.mps
+++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.types@tests.mps
@@ -20,13 +20,13 @@
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
     <import index="kqnc" ref="r:92b96158-68e6-4f53-a32b-36e2b456fe01(jetbrains.mps.baseLanguageExt.types)" />
     <import index="guwi" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.io(JDK/)" />
-    <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.dataform)" />
     <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
     <import index="tj24" ref="r:0fbbb63a-fd15-46e1-8136-78049f6d6e63(jetbrains.mps.coderules.typechecking.service)" />
     <import index="tpek" ref="r:00000000-0000-4000-0000-011c895902c0(jetbrains.mps.baseLanguage.behavior)" />
     <import index="bs09" ref="r:28026be8-9bf8-4f54-9319-0ca8a6d1299d(typechecking.samples.baseLanguage.helloWorld)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
     <import index="z1c3" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project(MPS.Core/)" />
+    <import index="cof4" ref="r:0a9d1d47-250c-4f98-8962-b65edf8b0721(jetbrains.mps.logic.dataform)" />
     <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" implicit="true" />
   </imports>
   <registry>
@@ -1001,7 +1001,7 @@
         </node>
       </node>
       <node concept="3uibUv" id="rZZ6HVGvw" role="3clF45">
-        <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+        <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
       </node>
       <node concept="3clFbS" id="rZZ6HVExB" role="3clF47">
         <node concept="3clFbF" id="rZZ6HVHgw" role="3cqZAp">
@@ -1082,7 +1082,7 @@
                       <property role="TrG5h" value="terms" />
                       <node concept="A3Dl8" id="3bgqfmm8ioL" role="1tU5fm">
                         <node concept="3uibUv" id="3bgqfmm8ioM" role="A3Ik2">
-                          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                          <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                         </node>
                       </node>
                       <node concept="2OqwBi" id="3bgqfmm8ioN" role="33vP2m">
@@ -1129,8 +1129,8 @@
                           <ref role="3cqZAo" node="6E5fMGvfKVQ" resolve="p" />
                         </node>
                         <node concept="2YIFZM" id="3bgqfmm8osU" role="37wK5m">
-                          <ref role="1Pybhc" to="6exd:3OPtF03lco4" resolve="ListNode" />
-                          <ref role="37wK5l" to="6exd:1OShD0HS45f" resolve="createList" />
+                          <ref role="1Pybhc" to="cof4:3OPtF03lco4" resolve="ListNode" />
+                          <ref role="37wK5l" to="cof4:1OShD0HS45f" resolve="createList" />
                           <node concept="2OqwBi" id="3bgqfmm8osV" role="37wK5m">
                             <node concept="37vLTw" id="3bgqfmm8osW" role="2Oq$k0">
                               <ref role="3cqZAo" node="3bgqfmm8ioK" resolve="terms" />
@@ -1172,7 +1172,7 @@
         </node>
       </node>
       <node concept="3uibUv" id="rZZ6I0fA1" role="3clF45">
-        <ref role="3uigEE" to="6exd:3OPtF03lco4" resolve="ListNode" />
+        <ref role="3uigEE" to="cof4:3OPtF03lco4" resolve="ListNode" />
       </node>
       <node concept="3clFbS" id="rZZ6I0dI9" role="3clF47">
         <node concept="3cpWs8" id="rZZ6I0jyC" role="3cqZAp">
@@ -1180,7 +1180,7 @@
             <property role="TrG5h" value="path" />
             <node concept="10Q1$e" id="rZZ6I0jm3" role="1tU5fm">
               <node concept="3uibUv" id="rZZ6I0jm6" role="10Q1$1">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
             </node>
             <node concept="2OqwBi" id="rZZ6I0jyE" role="33vP2m">
@@ -1224,8 +1224,8 @@
         </node>
         <node concept="3clFbF" id="rZZ6I0jSs" role="3cqZAp">
           <node concept="2YIFZM" id="rZZ6I0jYz" role="3clFbG">
-            <ref role="37wK5l" to="6exd:1OShD0HS45f" resolve="createList" />
-            <ref role="1Pybhc" to="6exd:3OPtF03lco4" resolve="ListNode" />
+            <ref role="37wK5l" to="cof4:1OShD0HS45f" resolve="createList" />
+            <ref role="1Pybhc" to="cof4:3OPtF03lco4" resolve="ListNode" />
             <node concept="37vLTw" id="rZZ6I0k0f" role="37wK5m">
               <ref role="3cqZAo" node="rZZ6I0jyD" resolve="path" />
             </node>
@@ -1368,13 +1368,13 @@
       <node concept="37vLTG" id="4JBuioGxMqY" role="3clF46">
         <property role="TrG5h" value="expect" />
         <node concept="3uibUv" id="4JBuioGxMx7" role="1tU5fm">
-          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+          <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
         </node>
       </node>
       <node concept="37vLTG" id="4JBuioGxMLT" role="3clF46">
         <property role="TrG5h" value="actual" />
         <node concept="3uibUv" id="4JBuioGxMLU" role="1tU5fm">
-          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+          <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
         </node>
       </node>
       <node concept="3cqZAl" id="4JBuioGxPCd" role="3clF45" />
@@ -2298,7 +2298,7 @@
               <node concept="3cpWsn" id="rZZ6I22hQ" role="3cpWs9">
                 <property role="TrG5h" value="hpath" />
                 <node concept="3uibUv" id="rZZ6I1Jp$" role="1tU5fm">
-                  <ref role="3uigEE" to="6exd:3OPtF03lco4" resolve="ListNode" />
+                  <ref role="3uigEE" to="cof4:3OPtF03lco4" resolve="ListNode" />
                 </node>
                 <node concept="2OqwBi" id="4JBuioH7WxF" role="33vP2m">
                   <node concept="37vLTw" id="4JBuioH7WxG" role="2Oq$k0">
@@ -2453,7 +2453,7 @@
               <node concept="3cpWsn" id="rZZ6I22UW" role="3cpWs9">
                 <property role="TrG5h" value="hpath_I" />
                 <node concept="3uibUv" id="rZZ6I1nwv" role="1tU5fm">
-                  <ref role="3uigEE" to="6exd:3OPtF03lco4" resolve="ListNode" />
+                  <ref role="3uigEE" to="cof4:3OPtF03lco4" resolve="ListNode" />
                 </node>
                 <node concept="2OqwBi" id="4JBuioH852j" role="33vP2m">
                   <node concept="37vLTw" id="4JBuioH84QN" role="2Oq$k0">
@@ -2515,7 +2515,7 @@
                   </node>
                 </node>
                 <node concept="3uibUv" id="rZZ6I23lZ" role="1tU5fm">
-                  <ref role="3uigEE" to="6exd:3OPtF03lco4" resolve="ListNode" />
+                  <ref role="3uigEE" to="cof4:3OPtF03lco4" resolve="ListNode" />
                 </node>
               </node>
             </node>
@@ -2659,7 +2659,7 @@
                   </node>
                 </node>
                 <node concept="3uibUv" id="rZZ6I1nJc" role="1tU5fm">
-                  <ref role="3uigEE" to="6exd:3OPtF03lco4" resolve="ListNode" />
+                  <ref role="3uigEE" to="cof4:3OPtF03lco4" resolve="ListNode" />
                 </node>
               </node>
             </node>
@@ -2696,7 +2696,7 @@
               <node concept="3cpWsn" id="rZZ6I257b" role="3cpWs9">
                 <property role="TrG5h" value="hpath_J" />
                 <node concept="3uibUv" id="rZZ6I24FM" role="1tU5fm">
-                  <ref role="3uigEE" to="6exd:3OPtF03lco4" resolve="ListNode" />
+                  <ref role="3uigEE" to="cof4:3OPtF03lco4" resolve="ListNode" />
                 </node>
                 <node concept="2OqwBi" id="4JBuioH88B3" role="33vP2m">
                   <node concept="37vLTw" id="4JBuioH88zL" role="2Oq$k0">
@@ -2859,7 +2859,7 @@
               <node concept="3cpWsn" id="4JBuioGkMs1" role="3cpWs9">
                 <property role="TrG5h" value="lub" />
                 <node concept="3uibUv" id="4JBuioGkMkQ" role="1tU5fm">
-                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                  <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                 </node>
                 <node concept="2OqwBi" id="4JBuioGkMs2" role="33vP2m">
                   <node concept="37vLTw" id="4JBuioGsQzt" role="2Oq$k0">
@@ -2894,11 +2894,11 @@
               <node concept="3cpWsn" id="4JBuioGkP1l" role="3cpWs9">
                 <property role="TrG5h" value="expect" />
                 <node concept="3uibUv" id="4JBuioGkOVI" role="1tU5fm">
-                  <ref role="3uigEE" to="6exd:3OPtF03lco4" resolve="ListNode" />
+                  <ref role="3uigEE" to="cof4:3OPtF03lco4" resolve="ListNode" />
                 </node>
                 <node concept="2YIFZM" id="4JBuioGIH0e" role="33vP2m">
-                  <ref role="37wK5l" to="6exd:1OShD0HS45f" resolve="createList" />
-                  <ref role="1Pybhc" to="6exd:3OPtF03lco4" resolve="ListNode" />
+                  <ref role="37wK5l" to="cof4:1OShD0HS45f" resolve="createList" />
+                  <ref role="1Pybhc" to="cof4:3OPtF03lco4" resolve="ListNode" />
                   <node concept="2OqwBi" id="4JBuioGQ7hR" role="37wK5m">
                     <node concept="2WthIp" id="4JBuioGQ7hU" role="2Oq$k0" />
                     <node concept="2XshWL" id="4JBuioGQ7hW" role="2OqNvi">
@@ -3016,7 +3016,7 @@
               <node concept="3cpWsn" id="4JBuioGJJRH" role="3cpWs9">
                 <property role="TrG5h" value="lub" />
                 <node concept="3uibUv" id="4JBuioGJJRI" role="1tU5fm">
-                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                  <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                 </node>
                 <node concept="2OqwBi" id="4JBuioGJJRJ" role="33vP2m">
                   <node concept="37vLTw" id="4JBuioGJJRK" role="2Oq$k0">
@@ -3051,11 +3051,11 @@
               <node concept="3cpWsn" id="4JBuioGJJRY" role="3cpWs9">
                 <property role="TrG5h" value="expect" />
                 <node concept="3uibUv" id="4JBuioGJJRZ" role="1tU5fm">
-                  <ref role="3uigEE" to="6exd:3OPtF03lco4" resolve="ListNode" />
+                  <ref role="3uigEE" to="cof4:3OPtF03lco4" resolve="ListNode" />
                 </node>
                 <node concept="2YIFZM" id="4JBuioGJJS0" role="33vP2m">
-                  <ref role="37wK5l" to="6exd:1OShD0HS45f" resolve="createList" />
-                  <ref role="1Pybhc" to="6exd:3OPtF03lco4" resolve="ListNode" />
+                  <ref role="37wK5l" to="cof4:1OShD0HS45f" resolve="createList" />
+                  <ref role="1Pybhc" to="cof4:3OPtF03lco4" resolve="ListNode" />
                   <node concept="2OqwBi" id="4JBuioGQ7XE" role="37wK5m">
                     <node concept="2WthIp" id="4JBuioGQ7XH" role="2Oq$k0" />
                     <node concept="2XshWL" id="4JBuioGQ7XJ" role="2OqNvi">
@@ -3173,7 +3173,7 @@
               <node concept="3cpWsn" id="4JBuioGJ3bn" role="3cpWs9">
                 <property role="TrG5h" value="lub" />
                 <node concept="3uibUv" id="4JBuioGJ3bo" role="1tU5fm">
-                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                  <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                 </node>
                 <node concept="2OqwBi" id="4JBuioGJ3bp" role="33vP2m">
                   <node concept="37vLTw" id="4JBuioGJ3bq" role="2Oq$k0">
@@ -3208,11 +3208,11 @@
               <node concept="3cpWsn" id="4JBuioGJ3bC" role="3cpWs9">
                 <property role="TrG5h" value="expect" />
                 <node concept="3uibUv" id="4JBuioGJ3bD" role="1tU5fm">
-                  <ref role="3uigEE" to="6exd:3OPtF03lco4" resolve="ListNode" />
+                  <ref role="3uigEE" to="cof4:3OPtF03lco4" resolve="ListNode" />
                 </node>
                 <node concept="2YIFZM" id="4JBuioGJ3bE" role="33vP2m">
-                  <ref role="37wK5l" to="6exd:1OShD0HS45f" resolve="createList" />
-                  <ref role="1Pybhc" to="6exd:3OPtF03lco4" resolve="ListNode" />
+                  <ref role="37wK5l" to="cof4:1OShD0HS45f" resolve="createList" />
+                  <ref role="1Pybhc" to="cof4:3OPtF03lco4" resolve="ListNode" />
                   <node concept="2OqwBi" id="4JBuioGQ8WM" role="37wK5m">
                     <node concept="2WthIp" id="4JBuioGQ8WP" role="2Oq$k0" />
                     <node concept="2XshWL" id="4JBuioGQ8WR" role="2OqNvi">
@@ -3330,7 +3330,7 @@
               <node concept="3cpWsn" id="4JBuioGK6x2" role="3cpWs9">
                 <property role="TrG5h" value="lub" />
                 <node concept="3uibUv" id="4JBuioGK6x3" role="1tU5fm">
-                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                  <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                 </node>
                 <node concept="2OqwBi" id="4JBuioGK6x4" role="33vP2m">
                   <node concept="37vLTw" id="4JBuioGK6x5" role="2Oq$k0">
@@ -3365,11 +3365,11 @@
               <node concept="3cpWsn" id="4JBuioGK6xj" role="3cpWs9">
                 <property role="TrG5h" value="expect" />
                 <node concept="3uibUv" id="4JBuioGK6xk" role="1tU5fm">
-                  <ref role="3uigEE" to="6exd:3OPtF03lco4" resolve="ListNode" />
+                  <ref role="3uigEE" to="cof4:3OPtF03lco4" resolve="ListNode" />
                 </node>
                 <node concept="2YIFZM" id="4JBuioGK6xl" role="33vP2m">
-                  <ref role="37wK5l" to="6exd:1OShD0HS45f" resolve="createList" />
-                  <ref role="1Pybhc" to="6exd:3OPtF03lco4" resolve="ListNode" />
+                  <ref role="37wK5l" to="cof4:1OShD0HS45f" resolve="createList" />
+                  <ref role="1Pybhc" to="cof4:3OPtF03lco4" resolve="ListNode" />
                   <node concept="2OqwBi" id="4JBuioGQ9yZ" role="37wK5m">
                     <node concept="2WthIp" id="4JBuioGQ9z2" role="2Oq$k0" />
                     <node concept="2XshWL" id="4JBuioGQ9z4" role="2OqNvi">
@@ -3487,7 +3487,7 @@
               <node concept="3cpWsn" id="4JBuioGJ5nT" role="3cpWs9">
                 <property role="TrG5h" value="lub" />
                 <node concept="3uibUv" id="4JBuioGJ5nU" role="1tU5fm">
-                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                  <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                 </node>
                 <node concept="2OqwBi" id="4JBuioGJ5nV" role="33vP2m">
                   <node concept="37vLTw" id="4JBuioGJ5nW" role="2Oq$k0">
@@ -3522,11 +3522,11 @@
               <node concept="3cpWsn" id="4JBuioGJ5oa" role="3cpWs9">
                 <property role="TrG5h" value="expect" />
                 <node concept="3uibUv" id="4JBuioGJ5ob" role="1tU5fm">
-                  <ref role="3uigEE" to="6exd:3OPtF03lco4" resolve="ListNode" />
+                  <ref role="3uigEE" to="cof4:3OPtF03lco4" resolve="ListNode" />
                 </node>
                 <node concept="2YIFZM" id="4JBuioGJ5oc" role="33vP2m">
-                  <ref role="37wK5l" to="6exd:1OShD0HS45f" resolve="createList" />
-                  <ref role="1Pybhc" to="6exd:3OPtF03lco4" resolve="ListNode" />
+                  <ref role="37wK5l" to="cof4:1OShD0HS45f" resolve="createList" />
+                  <ref role="1Pybhc" to="cof4:3OPtF03lco4" resolve="ListNode" />
                   <node concept="2OqwBi" id="4JBuioGQafa" role="37wK5m">
                     <node concept="2WthIp" id="4JBuioGQafd" role="2Oq$k0" />
                     <node concept="2XshWL" id="4JBuioGQaff" role="2OqNvi">
@@ -3650,7 +3650,7 @@
               <node concept="3cpWsn" id="4JBuioGPDB5" role="3cpWs9">
                 <property role="TrG5h" value="lub" />
                 <node concept="3uibUv" id="4JBuioGPDB6" role="1tU5fm">
-                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                  <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                 </node>
                 <node concept="2OqwBi" id="4JBuioGPDB7" role="33vP2m">
                   <node concept="37vLTw" id="4JBuioGPDB8" role="2Oq$k0">
@@ -3685,11 +3685,11 @@
               <node concept="3cpWsn" id="4JBuioGPDBm" role="3cpWs9">
                 <property role="TrG5h" value="expect" />
                 <node concept="3uibUv" id="4JBuioGPDBn" role="1tU5fm">
-                  <ref role="3uigEE" to="6exd:3OPtF03lco4" resolve="ListNode" />
+                  <ref role="3uigEE" to="cof4:3OPtF03lco4" resolve="ListNode" />
                 </node>
                 <node concept="2YIFZM" id="4JBuioGPDBo" role="33vP2m">
-                  <ref role="37wK5l" to="6exd:1OShD0HS45f" resolve="createList" />
-                  <ref role="1Pybhc" to="6exd:3OPtF03lco4" resolve="ListNode" />
+                  <ref role="37wK5l" to="cof4:1OShD0HS45f" resolve="createList" />
+                  <ref role="1Pybhc" to="cof4:3OPtF03lco4" resolve="ListNode" />
                   <node concept="2OqwBi" id="4JBuioGQa$e" role="37wK5m">
                     <node concept="2WthIp" id="4JBuioGQa$h" role="2Oq$k0" />
                     <node concept="2XshWL" id="4JBuioGQa$j" role="2OqNvi">
@@ -3834,7 +3834,7 @@
               <node concept="3cpWsn" id="4JBuioGQTPw" role="3cpWs9">
                 <property role="TrG5h" value="lub" />
                 <node concept="3uibUv" id="4JBuioGQTPx" role="1tU5fm">
-                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                  <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                 </node>
                 <node concept="2OqwBi" id="4JBuioGQTPy" role="33vP2m">
                   <node concept="37vLTw" id="4JBuioGQTPz" role="2Oq$k0">
@@ -3869,11 +3869,11 @@
               <node concept="3cpWsn" id="4JBuioGQTPL" role="3cpWs9">
                 <property role="TrG5h" value="expect" />
                 <node concept="3uibUv" id="4JBuioGQTPM" role="1tU5fm">
-                  <ref role="3uigEE" to="6exd:3OPtF03lco4" resolve="ListNode" />
+                  <ref role="3uigEE" to="cof4:3OPtF03lco4" resolve="ListNode" />
                 </node>
                 <node concept="2YIFZM" id="4JBuioGQTPN" role="33vP2m">
-                  <ref role="37wK5l" to="6exd:1OShD0HS45f" resolve="createList" />
-                  <ref role="1Pybhc" to="6exd:3OPtF03lco4" resolve="ListNode" />
+                  <ref role="37wK5l" to="cof4:1OShD0HS45f" resolve="createList" />
+                  <ref role="1Pybhc" to="cof4:3OPtF03lco4" resolve="ListNode" />
                   <node concept="2OqwBi" id="4JBuioGQTPT" role="37wK5m">
                     <node concept="2WthIp" id="4JBuioGQTPU" role="2Oq$k0" />
                     <node concept="2XshWL" id="4JBuioGQTPV" role="2OqNvi">
@@ -4003,7 +4003,7 @@
               <node concept="3cpWsn" id="4JBuioGRGyG" role="3cpWs9">
                 <property role="TrG5h" value="lub" />
                 <node concept="3uibUv" id="4JBuioGRGyH" role="1tU5fm">
-                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                  <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                 </node>
                 <node concept="2OqwBi" id="4JBuioGRGyI" role="33vP2m">
                   <node concept="37vLTw" id="4JBuioGRGyJ" role="2Oq$k0">
@@ -4038,11 +4038,11 @@
               <node concept="3cpWsn" id="4JBuioGRGyX" role="3cpWs9">
                 <property role="TrG5h" value="expect" />
                 <node concept="3uibUv" id="4JBuioGRGyY" role="1tU5fm">
-                  <ref role="3uigEE" to="6exd:3OPtF03lco4" resolve="ListNode" />
+                  <ref role="3uigEE" to="cof4:3OPtF03lco4" resolve="ListNode" />
                 </node>
                 <node concept="2YIFZM" id="4JBuioGRGyZ" role="33vP2m">
-                  <ref role="37wK5l" to="6exd:1OShD0HS45f" resolve="createList" />
-                  <ref role="1Pybhc" to="6exd:3OPtF03lco4" resolve="ListNode" />
+                  <ref role="37wK5l" to="cof4:1OShD0HS45f" resolve="createList" />
+                  <ref role="1Pybhc" to="cof4:3OPtF03lco4" resolve="ListNode" />
                   <node concept="2OqwBi" id="4JBuioGRGz0" role="37wK5m">
                     <node concept="2WthIp" id="4JBuioGRGz1" role="2Oq$k0" />
                     <node concept="2XshWL" id="4JBuioGRGz2" role="2OqNvi">
@@ -4269,7 +4269,7 @@
         <node concept="3Tqbb2" id="4JBuioGUNfx" role="1tU5fm" />
       </node>
       <node concept="3uibUv" id="4JBuioGUNfy" role="3clF45">
-        <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+        <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
       </node>
       <node concept="3clFbS" id="4JBuioGUNfz" role="3clF47">
         <node concept="1_3QMa" id="3bgqfmmjBfj" role="3cqZAp">
@@ -4282,11 +4282,11 @@
                 <node concept="3cpWsn" id="4JBuioGVoKC" role="3cpWs9">
                   <property role="TrG5h" value="params" />
                   <node concept="3uibUv" id="4JBuioGVoti" role="1tU5fm">
-                    <ref role="3uigEE" to="6exd:3OPtF03lco4" resolve="ListNode" />
+                    <ref role="3uigEE" to="cof4:3OPtF03lco4" resolve="ListNode" />
                   </node>
                   <node concept="2YIFZM" id="4JBuioGVoKD" role="33vP2m">
-                    <ref role="37wK5l" to="6exd:1OShD0HS45f" resolve="createList" />
-                    <ref role="1Pybhc" to="6exd:3OPtF03lco4" resolve="ListNode" />
+                    <ref role="37wK5l" to="cof4:1OShD0HS45f" resolve="createList" />
+                    <ref role="1Pybhc" to="cof4:3OPtF03lco4" resolve="ListNode" />
                     <node concept="2OqwBi" id="4JBuioGVoKE" role="37wK5m">
                       <node concept="2OqwBi" id="4JBuioGVoKF" role="2Oq$k0">
                         <node concept="2OqwBi" id="4JBuioGVoKG" role="2Oq$k0">
@@ -4394,11 +4394,11 @@
                 <node concept="3cpWsn" id="3bgqfmmkfGJ" role="3cpWs9">
                   <property role="TrG5h" value="params2" />
                   <node concept="3uibUv" id="3bgqfmmkfGK" role="1tU5fm">
-                    <ref role="3uigEE" to="6exd:3OPtF03lco4" resolve="ListNode" />
+                    <ref role="3uigEE" to="cof4:3OPtF03lco4" resolve="ListNode" />
                   </node>
                   <node concept="2YIFZM" id="3bgqfmmkfGL" role="33vP2m">
-                    <ref role="37wK5l" to="6exd:1OShD0HS45f" resolve="createList" />
-                    <ref role="1Pybhc" to="6exd:3OPtF03lco4" resolve="ListNode" />
+                    <ref role="37wK5l" to="cof4:1OShD0HS45f" resolve="createList" />
+                    <ref role="1Pybhc" to="cof4:3OPtF03lco4" resolve="ListNode" />
                     <node concept="2OqwBi" id="3bgqfmmkfGV" role="37wK5m">
                       <node concept="2WthIp" id="3bgqfmmkfGW" role="2Oq$k0" />
                       <node concept="2XshWL" id="3bgqfmmkfGX" role="2OqNvi">
@@ -4454,11 +4454,11 @@
                 <node concept="3cpWsn" id="3bgqfmmko1C" role="3cpWs9">
                   <property role="TrG5h" value="params3" />
                   <node concept="3uibUv" id="3bgqfmmko1D" role="1tU5fm">
-                    <ref role="3uigEE" to="6exd:3OPtF03lco4" resolve="ListNode" />
+                    <ref role="3uigEE" to="cof4:3OPtF03lco4" resolve="ListNode" />
                   </node>
                   <node concept="2YIFZM" id="3bgqfmmko1E" role="33vP2m">
-                    <ref role="37wK5l" to="6exd:1OShD0HS45f" resolve="createList" />
-                    <ref role="1Pybhc" to="6exd:3OPtF03lco4" resolve="ListNode" />
+                    <ref role="37wK5l" to="cof4:1OShD0HS45f" resolve="createList" />
+                    <ref role="1Pybhc" to="cof4:3OPtF03lco4" resolve="ListNode" />
                     <node concept="2OqwBi" id="3bgqfmmko1F" role="37wK5m">
                       <node concept="2WthIp" id="3bgqfmmko1G" role="2Oq$k0" />
                       <node concept="2XshWL" id="3bgqfmmko1H" role="2OqNvi">
@@ -4582,7 +4582,7 @@
                       <property role="TrG5h" value="terms" />
                       <node concept="A3Dl8" id="3bgqfmm8r0d" role="1tU5fm">
                         <node concept="3uibUv" id="3bgqfmm8r0e" role="A3Ik2">
-                          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                          <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                         </node>
                       </node>
                       <node concept="2OqwBi" id="3bgqfmm8r0f" role="33vP2m">
@@ -4629,8 +4629,8 @@
                           <ref role="3cqZAo" node="6E5fMGvfKWg" resolve="p" />
                         </node>
                         <node concept="2YIFZM" id="3bgqfmm8r0w" role="37wK5m">
-                          <ref role="37wK5l" to="6exd:1OShD0HS45f" resolve="createList" />
-                          <ref role="1Pybhc" to="6exd:3OPtF03lco4" resolve="ListNode" />
+                          <ref role="37wK5l" to="cof4:1OShD0HS45f" resolve="createList" />
+                          <ref role="1Pybhc" to="cof4:3OPtF03lco4" resolve="ListNode" />
                           <node concept="2OqwBi" id="3bgqfmm8r0x" role="37wK5m">
                             <node concept="37vLTw" id="3bgqfmm8r0y" role="2Oq$k0">
                               <ref role="3cqZAo" node="3bgqfmm8r0c" resolve="terms" />
@@ -4672,7 +4672,7 @@
         </node>
       </node>
       <node concept="3uibUv" id="4JBuioGUJ2g" role="3clF45">
-        <ref role="3uigEE" to="6exd:3OPtF03lco4" resolve="ListNode" />
+        <ref role="3uigEE" to="cof4:3OPtF03lco4" resolve="ListNode" />
       </node>
       <node concept="3clFbS" id="4JBuioGUJ2h" role="3clF47">
         <node concept="3cpWs8" id="4JBuioGUJ2i" role="3cqZAp">
@@ -4680,7 +4680,7 @@
             <property role="TrG5h" value="path" />
             <node concept="10Q1$e" id="4JBuioGUJ2k" role="1tU5fm">
               <node concept="3uibUv" id="4JBuioGUJ2l" role="10Q1$1">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
               </node>
             </node>
             <node concept="2OqwBi" id="4JBuioGUJ2m" role="33vP2m">
@@ -4719,8 +4719,8 @@
         </node>
         <node concept="3clFbF" id="4JBuioGUJ2C" role="3cqZAp">
           <node concept="2YIFZM" id="4JBuioGUJ2D" role="3clFbG">
-            <ref role="37wK5l" to="6exd:1OShD0HS45f" resolve="createList" />
-            <ref role="1Pybhc" to="6exd:3OPtF03lco4" resolve="ListNode" />
+            <ref role="37wK5l" to="cof4:1OShD0HS45f" resolve="createList" />
+            <ref role="1Pybhc" to="cof4:3OPtF03lco4" resolve="ListNode" />
             <node concept="37vLTw" id="4JBuioGUJ2E" role="37wK5m">
               <ref role="3cqZAo" node="4JBuioGUJ2j" resolve="path" />
             </node>
@@ -4863,13 +4863,13 @@
       <node concept="37vLTG" id="4JBuioGU$80" role="3clF46">
         <property role="TrG5h" value="expect" />
         <node concept="3uibUv" id="4JBuioGU$81" role="1tU5fm">
-          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+          <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
         </node>
       </node>
       <node concept="37vLTG" id="4JBuioGU$82" role="3clF46">
         <property role="TrG5h" value="actual" />
         <node concept="3uibUv" id="4JBuioGU$83" role="1tU5fm">
-          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+          <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
         </node>
       </node>
       <node concept="3cqZAl" id="4JBuioGU$84" role="3clF45" />
@@ -5808,7 +5808,7 @@
               <node concept="3cpWsn" id="3bgqfmmj8FM" role="3cpWs9">
                 <property role="TrG5h" value="path" />
                 <node concept="3uibUv" id="3bgqfmmj8ET" role="1tU5fm">
-                  <ref role="3uigEE" to="6exd:3OPtF03lco4" resolve="ListNode" />
+                  <ref role="3uigEE" to="cof4:3OPtF03lco4" resolve="ListNode" />
                 </node>
                 <node concept="2OqwBi" id="3bgqfmmj8FN" role="33vP2m">
                   <node concept="37vLTw" id="3bgqfmmj8FO" role="2Oq$k0">
@@ -5830,11 +5830,11 @@
               <node concept="3cpWsn" id="3bgqfmmrAPp" role="3cpWs9">
                 <property role="TrG5h" value="expect" />
                 <node concept="3uibUv" id="3bgqfmmrAPa" role="1tU5fm">
-                  <ref role="3uigEE" to="6exd:3OPtF03lco4" resolve="ListNode" />
+                  <ref role="3uigEE" to="cof4:3OPtF03lco4" resolve="ListNode" />
                 </node>
                 <node concept="2YIFZM" id="3bgqfmmrAPq" role="33vP2m">
-                  <ref role="37wK5l" to="6exd:1OShD0HS45f" resolve="createList" />
-                  <ref role="1Pybhc" to="6exd:3OPtF03lco4" resolve="ListNode" />
+                  <ref role="37wK5l" to="cof4:1OShD0HS45f" resolve="createList" />
+                  <ref role="1Pybhc" to="cof4:3OPtF03lco4" resolve="ListNode" />
                   <node concept="2OqwBi" id="3bgqfmmrAPr" role="37wK5m">
                     <node concept="2WthIp" id="3bgqfmmrAPs" role="2Oq$k0" />
                     <node concept="2XshWL" id="3bgqfmmrAPt" role="2OqNvi">
@@ -6060,7 +6060,7 @@
               <node concept="3cpWsn" id="4JBuioGUyMR" role="3cpWs9">
                 <property role="TrG5h" value="lub" />
                 <node concept="3uibUv" id="4JBuioGUyMS" role="1tU5fm">
-                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                  <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                 </node>
                 <node concept="2OqwBi" id="4JBuioGUyMT" role="33vP2m">
                   <node concept="37vLTw" id="4JBuioGUyMU" role="2Oq$k0">
@@ -6153,7 +6153,7 @@
               <node concept="3cpWsn" id="4JBuioH011c" role="3cpWs9">
                 <property role="TrG5h" value="expectPath" />
                 <node concept="3uibUv" id="4JBuioH00lo" role="1tU5fm">
-                  <ref role="3uigEE" to="6exd:3OPtF03lco4" resolve="ListNode" />
+                  <ref role="3uigEE" to="cof4:3OPtF03lco4" resolve="ListNode" />
                 </node>
                 <node concept="2OqwBi" id="4JBuioH011d" role="33vP2m">
                   <node concept="2WthIp" id="4JBuioH011e" role="2Oq$k0" />
@@ -6175,8 +6175,8 @@
                 <node concept="2XshWL" id="4JBuioGUyNj" role="2OqNvi">
                   <ref role="2WH_rO" node="4JBuioGU$7Z" resolve="assertCanUnify" />
                   <node concept="2YIFZM" id="4JBuioGYM9b" role="2XxRq1">
-                    <ref role="1Pybhc" to="6exd:3OPtF03lco4" resolve="ListNode" />
-                    <ref role="37wK5l" to="6exd:1OShD0HS45f" resolve="createList" />
+                    <ref role="1Pybhc" to="cof4:3OPtF03lco4" resolve="ListNode" />
+                    <ref role="37wK5l" to="cof4:1OShD0HS45f" resolve="createList" />
                     <node concept="37vLTw" id="4JBuioH011i" role="37wK5m">
                       <ref role="3cqZAo" node="4JBuioH011c" resolve="expectPath" />
                     </node>
@@ -6302,7 +6302,7 @@
               <node concept="3cpWsn" id="4JBuioGZey5" role="3cpWs9">
                 <property role="TrG5h" value="lub" />
                 <node concept="3uibUv" id="4JBuioGZey6" role="1tU5fm">
-                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                  <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                 </node>
                 <node concept="2OqwBi" id="4JBuioGZey7" role="33vP2m">
                   <node concept="37vLTw" id="4JBuioGZey8" role="2Oq$k0">
@@ -6343,7 +6343,7 @@
               <node concept="3cpWsn" id="4JBuioGZSJi" role="3cpWs9">
                 <property role="TrG5h" value="expectPath1" />
                 <node concept="3uibUv" id="4JBuioGZtzh" role="1tU5fm">
-                  <ref role="3uigEE" to="6exd:3OPtF03lco4" resolve="ListNode" />
+                  <ref role="3uigEE" to="cof4:3OPtF03lco4" resolve="ListNode" />
                 </node>
                 <node concept="2OqwBi" id="4JBuioGZSJj" role="33vP2m">
                   <node concept="2WthIp" id="4JBuioGZSJk" role="2Oq$k0" />
@@ -6375,7 +6375,7 @@
               <node concept="3cpWsn" id="4JBuioGZZvA" role="3cpWs9">
                 <property role="TrG5h" value="expectPath2" />
                 <node concept="3uibUv" id="4JBuioGZZvB" role="1tU5fm">
-                  <ref role="3uigEE" to="6exd:3OPtF03lco4" resolve="ListNode" />
+                  <ref role="3uigEE" to="cof4:3OPtF03lco4" resolve="ListNode" />
                 </node>
                 <node concept="2OqwBi" id="4JBuioGZZvC" role="33vP2m">
                   <node concept="2WthIp" id="4JBuioGZZvD" role="2Oq$k0" />
@@ -6459,7 +6459,7 @@
               <node concept="3cpWsn" id="4JBuioGZUm2" role="3cpWs9">
                 <property role="TrG5h" value="expectPath3" />
                 <node concept="3uibUv" id="4JBuioGZUm3" role="1tU5fm">
-                  <ref role="3uigEE" to="6exd:3OPtF03lco4" resolve="ListNode" />
+                  <ref role="3uigEE" to="cof4:3OPtF03lco4" resolve="ListNode" />
                 </node>
                 <node concept="2OqwBi" id="4JBuioGZUm4" role="33vP2m">
                   <node concept="2WthIp" id="4JBuioGZUm5" role="2Oq$k0" />
@@ -6481,8 +6481,8 @@
                 <node concept="2XshWL" id="4JBuioGZeyI" role="2OqNvi">
                   <ref role="2WH_rO" node="4JBuioGU$7Z" resolve="assertCanUnify" />
                   <node concept="2YIFZM" id="4JBuioGZeyJ" role="2XxRq1">
-                    <ref role="1Pybhc" to="6exd:3OPtF03lco4" resolve="ListNode" />
-                    <ref role="37wK5l" to="6exd:1OShD0HS45f" resolve="createList" />
+                    <ref role="1Pybhc" to="cof4:3OPtF03lco4" resolve="ListNode" />
+                    <ref role="37wK5l" to="cof4:1OShD0HS45f" resolve="createList" />
                     <node concept="37vLTw" id="4JBuioH00TV" role="37wK5m">
                       <ref role="3cqZAo" node="4JBuioGZUm2" resolve="expectPath3" />
                     </node>
diff --git a/samples/mpscore/solutions/jetbrains.mps.lang.smodelExt/jetbrains.mps.lang.smodelExt.test.msd b/samples/mpscore/solutions/jetbrains.mps.lang.smodelExt/jetbrains.mps.lang.smodelExt.test.msd
index c53e8495..11b999ba 100644
--- a/samples/mpscore/solutions/jetbrains.mps.lang.smodelExt/jetbrains.mps.lang.smodelExt.test.msd
+++ b/samples/mpscore/solutions/jetbrains.mps.lang.smodelExt/jetbrains.mps.lang.smodelExt.test.msd
@@ -17,13 +17,12 @@
     <dependency reexport="false">65e59b42-e7f3-45ec-8692-6c7829780afe(jetbrains.mps.lang.smodelExt)</dependency>
     <dependency reexport="false">0fda14cc-a416-4c81-869a-2175d8b3325d(jetbrains.mps.baseLanguageExt)</dependency>
     <dependency reexport="false">c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)</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">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
     <dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
-    <dependency reexport="false">7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)</dependency>
     <dependency reexport="false">6b3888c1-9802-44d8-8baf-f8e6c33ed689(jetbrains.mps.kotlin)</dependency>
     <dependency reexport="false">9e4ff22b-60f1-43ef-a50b-f9f0fcec22e0(jetbrains.mps.kotlin.javaRefs)</dependency>
+    <dependency reexport="false">a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
@@ -36,7 +35,9 @@
     <language slang="l:f61473f9-130f-42f6-b98d-6c438812c2f6:jetbrains.mps.baseLanguage.unitTest" version="1" />
     <language slang="l:0fda14cc-a416-4c81-869a-2175d8b3325d:jetbrains.mps.baseLanguageExt" version="0" />
     <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
+    <language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="25" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
+    <language slang="l:f4ad079d-bc71-4ffb-9600-9328705cf998:jetbrains.mps.lang.descriptor" version="0" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
@@ -61,7 +62,6 @@
     <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
     <module reference="0fda14cc-a416-4c81-869a-2175d8b3325d(jetbrains.mps.baseLanguageExt)" version="0" />
     <module reference="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c(jetbrains.mps.coderules)" version="0" />
-    <module reference="f113d56b-63e3-4120-a89c-2f5dcb8c6290(jetbrains.mps.coderules.runtime)" version="0" />
     <module reference="6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.coderules.typechecking)" version="0" />
     <module reference="4caf0310-491e-41f5-8a9b-2006b3a94898(jetbrains.mps.execution.util)" version="0" />
     <module reference="bfbdd672-7ff5-403f-af4f-16da5226f34c(jetbrains.mps.findUsages.runtime)" version="0" />
@@ -70,7 +70,6 @@
     <module reference="9e4ff22b-60f1-43ef-a50b-f9f0fcec22e0(jetbrains.mps.kotlin.javaRefs)" version="1" />
     <module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
     <module reference="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" version="0" />
-    <module reference="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="446c26eb-2b7b-4bf0-9b35-f83fa582753e(jetbrains.mps.lang.modelapi)" version="0" />
     <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
diff --git a/samples/mpscore/solutions/jetbrains.mps.lang.smodelExt/models/jetbrains.mps.lang.smodelExt.test.code@tests.mps b/samples/mpscore/solutions/jetbrains.mps.lang.smodelExt/models/jetbrains.mps.lang.smodelExt.test.code@tests.mps
index 76d2316c..4dbcda13 100644
--- a/samples/mpscore/solutions/jetbrains.mps.lang.smodelExt/models/jetbrains.mps.lang.smodelExt.test.code@tests.mps
+++ b/samples/mpscore/solutions/jetbrains.mps.lang.smodelExt/models/jetbrains.mps.lang.smodelExt.test.code@tests.mps
@@ -15,7 +15,7 @@
     <import index="jxwi" ref="r:6ecd2c91-8e0b-4c6a-878e-d699a7336100(jetbrains.mps.lang.smodelExt.types)" />
     <import index="kqnc" ref="r:92b96158-68e6-4f53-a32b-36e2b456fe01(jetbrains.mps.baseLanguageExt.types)" />
     <import index="tpce" ref="r:00000000-0000-4000-0000-011c89590292(jetbrains.mps.lang.structure.structure)" />
-    <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.dataform)" />
+    <import index="cof4" ref="r:0a9d1d47-250c-4f98-8962-b65edf8b0721(jetbrains.mps.logic.dataform)" />
     <import index="z1c3" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project(MPS.Core/)" implicit="true" />
   </imports>
   <registry>
diff --git a/samples/mpscore/solutions/jetbrains.mps.lang.smodelExt/models/jetbrains.mps.lang.smodelExt.test.types@tests.mps b/samples/mpscore/solutions/jetbrains.mps.lang.smodelExt/models/jetbrains.mps.lang.smodelExt.test.types@tests.mps
index 4818e79f..01dea513 100644
--- a/samples/mpscore/solutions/jetbrains.mps.lang.smodelExt/models/jetbrains.mps.lang.smodelExt.test.types@tests.mps
+++ b/samples/mpscore/solutions/jetbrains.mps.lang.smodelExt/models/jetbrains.mps.lang.smodelExt.test.types@tests.mps
@@ -9,11 +9,11 @@
     <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="13" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
     <use id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation" version="5" />
+    <use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="25" />
   </languages>
   <imports>
     <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
-    <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.dataform)" />
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
     <import index="jxwi" ref="r:6ecd2c91-8e0b-4c6a-878e-d699a7336100(jetbrains.mps.lang.smodelExt.types)" />
     <import index="guwi" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.io(JDK/)" />
@@ -22,6 +22,7 @@
     <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
     <import index="tp25" ref="r:00000000-0000-4000-0000-011c89590301(jetbrains.mps.lang.smodel.structure)" />
+    <import index="cof4" ref="r:0a9d1d47-250c-4f98-8962-b65edf8b0721(jetbrains.mps.logic.dataform)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
   </imports>
   <registry>
@@ -352,7 +353,7 @@
           <node concept="3cpWsn" id="5OjpQKvZO1E" role="3cpWs9">
             <property role="TrG5h" value="lub" />
             <node concept="3uibUv" id="5OjpQKvZO0t" role="1tU5fm">
-              <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+              <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
             </node>
             <node concept="2OqwBi" id="5OjpQKvZO1F" role="33vP2m">
               <node concept="37vLTw" id="5OjpQKvZO1G" role="2Oq$k0">
@@ -386,7 +387,7 @@
           <node concept="3cpWsn" id="5OjpQKwimgB" role="3cpWs9">
             <property role="TrG5h" value="firstpair" />
             <node concept="3uibUv" id="5OjpQKwimgC" role="1tU5fm">
-              <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+              <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
             </node>
             <node concept="2OqwBi" id="5OjpQKwimgD" role="33vP2m">
               <node concept="2YIFZM" id="5OjpQKwimgE" role="2Oq$k0">
@@ -413,7 +414,7 @@
               <ref role="3uigEE" to="33ny:~List" resolve="List" />
               <node concept="3qUE_q" id="t7AM9FxVZf" role="11_B2D">
                 <node concept="3uibUv" id="t7AM9FxVZe" role="3qUE_r">
-                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                  <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                 </node>
               </node>
             </node>
@@ -502,7 +503,7 @@
         <node concept="3Tqbb2" id="4JBuioGUNfx" role="1tU5fm" />
       </node>
       <node concept="3uibUv" id="4JBuioGUNfy" role="3clF45">
-        <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+        <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
       </node>
       <node concept="3clFbS" id="4JBuioGUNfz" role="3clF47">
         <node concept="1_3QMa" id="3bgqfmmjBfj" role="3cqZAp">
@@ -623,7 +624,7 @@
                       <property role="TrG5h" value="terms" />
                       <node concept="A3Dl8" id="3bgqfmm8r0d" role="1tU5fm">
                         <node concept="3uibUv" id="3bgqfmm8r0e" role="A3Ik2">
-                          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                          <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
                         </node>
                       </node>
                       <node concept="2OqwBi" id="3bgqfmm8r0f" role="33vP2m">
@@ -670,8 +671,8 @@
                           <ref role="3cqZAo" node="6E5fMGvfKWu" resolve="p" />
                         </node>
                         <node concept="2YIFZM" id="3bgqfmm8r0w" role="37wK5m">
-                          <ref role="37wK5l" to="6exd:1OShD0HS45f" resolve="createList" />
-                          <ref role="1Pybhc" to="6exd:3OPtF03lco4" resolve="ListNode" />
+                          <ref role="37wK5l" to="cof4:1OShD0HS45f" resolve="createList" />
+                          <ref role="1Pybhc" to="cof4:3OPtF03lco4" resolve="ListNode" />
                           <node concept="2OqwBi" id="3bgqfmm8r0x" role="37wK5m">
                             <node concept="37vLTw" id="3bgqfmm8r0y" role="2Oq$k0">
                               <ref role="3cqZAo" node="3bgqfmm8r0c" resolve="terms" />
@@ -707,13 +708,13 @@
       <node concept="37vLTG" id="4JBuioGU$80" role="3clF46">
         <property role="TrG5h" value="expect" />
         <node concept="3uibUv" id="4JBuioGU$81" role="1tU5fm">
-          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+          <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
         </node>
       </node>
       <node concept="37vLTG" id="4JBuioGU$82" role="3clF46">
         <property role="TrG5h" value="actual" />
         <node concept="3uibUv" id="4JBuioGU$83" role="1tU5fm">
-          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+          <ref role="3uigEE" to="cof4:1bm7a6EXvsP" resolve="DataForm" />
         </node>
       </node>
       <node concept="3cqZAl" id="4JBuioGU$84" role="3clF45" />
diff --git a/samples/mpscore/solutions/samples.mpscore.build/models/samples.mpscore.build.mps b/samples/mpscore/solutions/samples.mpscore.build/models/samples.mpscore.build.mps
index 2b439a44..a6ed3cfe 100644
--- a/samples/mpscore/solutions/samples.mpscore.build/models/samples.mpscore.build.mps
+++ b/samples/mpscore/solutions/samples.mpscore.build/models/samples.mpscore.build.mps
@@ -1647,11 +1647,6 @@
             <ref role="3bR37D" to="ffeo:1H905DlDUSw" resolve="MPS.OpenAPI" />
           </node>
         </node>
-        <node concept="1SiIV0" id="6Dg__VJQ4a0" role="3bR37C">
-          <node concept="3bR9La" id="6Dg__VJQ4a1" role="1SiIV1">
-            <ref role="3bR37D" to="zqd8:7BVjoXzUxee" resolve="jetbrains.mps.lang.coderules.runtime" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="6Dg__VJQ4a2" role="3bR37C">
           <node concept="3bR9La" id="6Dg__VJQ4a3" role="1SiIV1">
             <ref role="3bR37D" node="4NtT$ZxGT_H" resolve="jetbrains.mps.baseLanguage.sequence" />
@@ -1682,11 +1677,6 @@
             <ref role="3bR37D" node="4NtT$ZxGTIW" resolve="jetbrains.mps.baseLanguage.collectionsExt" />
           </node>
         </node>
-        <node concept="1SiIV0" id="6Dg__VJQ4ae" role="3bR37C">
-          <node concept="3bR9La" id="6Dg__VJQ4af" role="1SiIV1">
-            <ref role="3bR37D" to="zqd8:5wYq9r5EBDN" resolve="jetbrains.mps.coderules.runtime" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="6Dg__VJQ4aq" role="3bR37C">
           <node concept="1Busua" id="6Dg__VJQ4ar" role="1SiIV1">
             <ref role="1Busuk" to="ffeo:7Kfy9QB6L9O" resolve="jetbrains.mps.lang.smodel" />
@@ -1712,6 +1702,11 @@
             <ref role="3bR37D" to="ffeo:7Kfy9QB6L4p" resolve="jetbrains.mps.lang.behavior" />
           </node>
         </node>
+        <node concept="1SiIV0" id="1FHgkSXfvlL" role="3bR37C">
+          <node concept="3bR9La" id="1FHgkSXfvlM" role="1SiIV1">
+            <ref role="3bR37D" to="zqd8:7BVjoXzUxoR" resolve="jetbrains.mps.logic.reactor" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="30mNApVhPPt" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -2562,11 +2557,6 @@
             </node>
           </node>
         </node>
-        <node concept="1SiIV0" id="3DveV8qz3RU" role="3bR37C">
-          <node concept="3bR9La" id="3DveV8qz3RV" role="1SiIV1">
-            <ref role="3bR37D" to="zqd8:NKt6ynvPIP" resolve="jetbrains.mps.lang.typechecking" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="3DveV8qz3RW" role="3bR37C">
           <node concept="1Busua" id="3DveV8qz3RX" role="1SiIV1">
             <ref role="1Busuk" to="ffeo:7Kfy9QB6L1S" resolve="jetbrains.mps.baseLanguage.javadoc" />
@@ -2587,41 +2577,6 @@
             </node>
           </node>
         </node>
-        <node concept="1SiIV0" id="1AiIZK4TVnf" role="3bR37C">
-          <node concept="3bR9La" id="1AiIZK4TVng" role="1SiIV1">
-            <ref role="3bR37D" to="zqd8:7BVjoXzUxee" resolve="jetbrains.mps.lang.coderules.runtime" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="1AiIZK4TVnh" role="3bR37C">
-          <node concept="3bR9La" id="1AiIZK4TVni" role="1SiIV1">
-            <ref role="3bR37D" to="zqd8:7BVjoXzUxoR" resolve="jetbrains.mps.logic.reactor" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="1AiIZK4TVnj" role="3bR37C">
-          <node concept="3bR9La" id="1AiIZK4TVnk" role="1SiIV1">
-            <ref role="3bR37D" to="zqd8:7BVjoXzUx$V" resolve="jetbrains.mps.logic.runtime" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="1AiIZK4TVnl" role="3bR37C">
-          <node concept="3bR9La" id="1AiIZK4TVnm" role="1SiIV1">
-            <ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="1AiIZK4TVnn" role="3bR37C">
-          <node concept="3bR9La" id="1AiIZK4TVno" role="1SiIV1">
-            <ref role="3bR37D" to="ffeo:1ia2VB5guYy" resolve="MPS.IDEA" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="1AiIZK4TVnp" role="3bR37C">
-          <node concept="3bR9La" id="1AiIZK4TVnq" role="1SiIV1">
-            <ref role="3bR37D" to="zqd8:7BVjoXzUx9d" resolve="jetbrains.mps.lang.coderules.template" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="7ynRPH4kk8F" role="3bR37C">
-          <node concept="3bR9La" id="7ynRPH4kk8G" role="1SiIV1">
-            <ref role="3bR37D" to="zqd8:NKt6yomVLS" resolve="jetbrains.mps.lang.typechecking.runtime" />
-          </node>
-        </node>
         <node concept="1BupzO" id="1GAclsBfDrY" role="3bR31x">
           <property role="3ZfqAx" value="models" />
           <property role="1Hdu6h" value="true" />
@@ -3050,22 +3005,11 @@
             <ref role="3bR37D" to="zqd8:7BVjoXzUxoR" resolve="jetbrains.mps.logic.reactor" />
           </node>
         </node>
-        <node concept="1SiIV0" id="69UmpDmJW2v" role="3bR37C">
-          <node concept="3bR9La" id="69UmpDmJW2w" role="1SiIV1">
-            <property role="3bR36h" value="true" />
-            <ref role="3bR37D" to="zqd8:7BVjoXzUx$V" resolve="jetbrains.mps.logic.runtime" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="69UmpDmJW2x" role="3bR37C">
           <node concept="3bR9La" id="69UmpDmJW2y" role="1SiIV1">
             <ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
           </node>
         </node>
-        <node concept="1SiIV0" id="69UmpDmJW2z" role="3bR37C">
-          <node concept="3bR9La" id="69UmpDmJW2$" role="1SiIV1">
-            <ref role="3bR37D" to="zqd8:7BVjoXzUx9d" resolve="jetbrains.mps.lang.coderules.template" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="69UmpDmJW2D" role="3bR37C">
           <node concept="1Busua" id="69UmpDmJW2E" role="1SiIV1">
             <ref role="1Busuk" to="ffeo:7Kfy9QB6KYb" resolve="jetbrains.mps.baseLanguage" />
@@ -3076,16 +3020,6 @@
             <ref role="3bR37D" to="ffeo:1ia2VB5guYy" resolve="MPS.IDEA" />
           </node>
         </node>
-        <node concept="1SiIV0" id="1mUB3w53Gjz" role="3bR37C">
-          <node concept="3bR9La" id="1mUB3w53Gj$" role="1SiIV1">
-            <ref role="3bR37D" to="zqd8:NKt6ynvPIP" resolve="jetbrains.mps.lang.typechecking" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="1GAclsBfDrD" role="3bR37C">
-          <node concept="3bR9La" id="1GAclsBfDrE" role="1SiIV1">
-            <ref role="3bR37D" to="ffeo:7Kfy9QB6KYK" resolve="jetbrains.mps.baseLanguage.util" />
-          </node>
-        </node>
         <node concept="1BupzO" id="1GAclsBfDrN" role="3bR31x">
           <property role="3ZfqAx" value="models" />
           <property role="1Hdu6h" value="true" />
@@ -3123,11 +3057,6 @@
             </node>
           </node>
         </node>
-        <node concept="1SiIV0" id="5wYq9r5EEul" role="3bR37C">
-          <node concept="3bR9La" id="5wYq9r5EEum" role="1SiIV1">
-            <ref role="3bR37D" to="zqd8:5wYq9r5EBDN" resolve="jetbrains.mps.coderules.runtime" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="51ek2rReQRE" role="3bR37C">
           <node concept="3bR9La" id="51ek2rReQRF" role="1SiIV1">
             <ref role="3bR37D" to="ffeo:7Kfy9QB6KZ6" resolve="jetbrains.mps.baseLanguage.blTypes" />
@@ -3148,6 +3077,16 @@
             <ref role="3bR37D" to="zqd8:2CPBoDB0Mtg" resolve="jetbrains.mps.coderules.typechecking" />
           </node>
         </node>
+        <node concept="1SiIV0" id="28ToRQo4PM2" role="3bR37C">
+          <node concept="3bR9La" id="28ToRQo4PM3" role="1SiIV1">
+            <ref role="3bR37D" to="zqd8:7BVjoXzUx6U" resolve="jetbrains.mps.lang.coderules" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="74$3PKmK4CK" role="3bR37C">
+          <node concept="3bR9La" id="74$3PKmK4CL" role="1SiIV1">
+            <ref role="3bR37D" to="zqd8:74$3PKm_L$v" resolve="jetbrains.mps.logic.runtime" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="7gMIJIxVu2L" role="2G$12L">
         <property role="TrG5h" value="jetbrains.mps.baseLanguageInternalExt" />
@@ -3240,6 +3179,11 @@
             <ref role="1Busuk" to="ffeo:7Kfy9QB6KZ0" resolve="jetbrains.mps.baseLanguageInternal" />
           </node>
         </node>
+        <node concept="1SiIV0" id="74$3PKnFcJa" role="3bR37C">
+          <node concept="3bR9La" id="74$3PKnFcJb" role="1SiIV1">
+            <ref role="3bR37D" to="zqd8:2CPBoDB0Mtg" resolve="jetbrains.mps.coderules.typechecking" />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="22LTRH" id="69UmpDmJWeu" role="1hWBAP">
@@ -3371,6 +3315,21 @@
             <ref role="3bR37D" to="ffeo:7Kfy9QB6KYb" resolve="jetbrains.mps.baseLanguage" />
           </node>
         </node>
+        <node concept="1SiIV0" id="1FHgkSXfvpZ" role="3bR37C">
+          <node concept="3bR9La" id="1FHgkSXfvq0" role="1SiIV1">
+            <ref role="3bR37D" to="zqd8:7BVjoXzUxee" resolve="jetbrains.mps.lang.coderules.runtime" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="1FHgkSXfvq1" role="3bR37C">
+          <node concept="3bR9La" id="1FHgkSXfvq2" role="1SiIV1">
+            <ref role="3bR37D" to="zqd8:7BVjoXzUxoR" resolve="jetbrains.mps.logic.reactor" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="74$3PKmK4Dc" role="3bR37C">
+          <node concept="3bR9La" id="74$3PKmK4Dd" role="1SiIV1">
+            <ref role="3bR37D" to="zqd8:74$3PKm_L$v" resolve="jetbrains.mps.logic.runtime" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="C1f6iDkSr$" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -3473,6 +3432,21 @@
             </node>
           </node>
         </node>
+        <node concept="1SiIV0" id="1FHgkSXfvql" role="3bR37C">
+          <node concept="3bR9La" id="1FHgkSXfvqm" role="1SiIV1">
+            <ref role="3bR37D" to="zqd8:7BVjoXzUxee" resolve="jetbrains.mps.lang.coderules.runtime" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="1FHgkSXfvqn" role="3bR37C">
+          <node concept="3bR9La" id="1FHgkSXfvqo" role="1SiIV1">
+            <ref role="3bR37D" to="zqd8:7BVjoXzUxoR" resolve="jetbrains.mps.logic.reactor" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="74$3PKmK4Dw" role="3bR37C">
+          <node concept="3bR9La" id="74$3PKmK4Dx" role="1SiIV1">
+            <ref role="3bR37D" to="zqd8:74$3PKm_L$v" resolve="jetbrains.mps.logic.runtime" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="3vih5251pFW" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -3695,16 +3669,6 @@
             <ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
           </node>
         </node>
-        <node concept="1SiIV0" id="69UmpDmJWb8" role="3bR37C">
-          <node concept="3bR9La" id="69UmpDmJWb9" role="1SiIV1">
-            <ref role="3bR37D" to="zqd8:7BVjoXzUx$V" resolve="jetbrains.mps.logic.runtime" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="69UmpDmJWba" role="3bR37C">
-          <node concept="3bR9La" id="69UmpDmJWbb" role="1SiIV1">
-            <ref role="3bR37D" to="ffeo:7Kfy9QB6KZ0" resolve="jetbrains.mps.baseLanguageInternal" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="69UmpDmJWbe" role="3bR37C">
           <node concept="3bR9La" id="69UmpDmJWbf" role="1SiIV1">
             <ref role="3bR37D" node="69UmpDmJW26" resolve="jetbrains.mps.baseLanguageExt" />
@@ -3720,11 +3684,6 @@
             <ref role="3bR37D" node="69UmpDmJW3w" resolve="typechecking.samples.baseLanguage" />
           </node>
         </node>
-        <node concept="1SiIV0" id="1TH_SRmm_ca" role="3bR37C">
-          <node concept="3bR9La" id="1TH_SRmm_cb" role="1SiIV1">
-            <ref role="3bR37D" to="ffeo:7Kfy9QB6Lc2" resolve="jetbrains.mps.lang.typesystem" />
-          </node>
-        </node>
         <node concept="1BupzO" id="1GAclsBfDs9" role="3bR31x">
           <property role="3ZfqAx" value="models" />
           <property role="1Hdu6h" value="true" />
@@ -3772,11 +3731,6 @@
             <ref role="3bR37D" to="ffeo:1TaHNgiIbIQ" resolve="MPS.Core" />
           </node>
         </node>
-        <node concept="1SiIV0" id="6tFa8SpSDbV" role="3bR37C">
-          <node concept="3bR9La" id="6tFa8SpSDbW" role="1SiIV1">
-            <ref role="3bR37D" to="zqd8:5wYq9r5EBDN" resolve="jetbrains.mps.coderules.runtime" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="4XsNDZX9sgj" role="3bR37C">
           <node concept="3bR9La" id="4XsNDZX9sgk" role="1SiIV1">
             <ref role="3bR37D" to="zqd8:4XsNDZX1tUA" resolve="jetbrains.mps.coderules.testhelper" />
@@ -3787,6 +3741,11 @@
             <ref role="3bR37D" to="zqd8:2CPBoDB0Mtg" resolve="jetbrains.mps.coderules.typechecking" />
           </node>
         </node>
+        <node concept="1SiIV0" id="74$3PKmK4Ee" role="3bR37C">
+          <node concept="3bR9La" id="74$3PKmK4Ef" role="1SiIV1">
+            <ref role="3bR37D" to="zqd8:74$3PKm_L$v" resolve="jetbrains.mps.logic.runtime" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtA" id="6$MmqWflz4E" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -4113,11 +4072,6 @@
             <ref role="3bR37D" to="ffeo:1H905DlDUSw" resolve="MPS.OpenAPI" />
           </node>
         </node>
-        <node concept="1SiIV0" id="6Dg__VJQ3ea" role="3bR37C">
-          <node concept="3bR9La" id="6Dg__VJQ3eb" role="1SiIV1">
-            <ref role="3bR37D" to="zqd8:7BVjoXzUx$V" resolve="jetbrains.mps.logic.runtime" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="6Dg__VJQ3ec" role="3bR37C">
           <node concept="3bR9La" id="6Dg__VJQ3ed" role="1SiIV1">
             <ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
@@ -4128,11 +4082,6 @@
             <ref role="3bR37D" to="ffeo:7Kfy9QB6KXW" resolve="jetbrains.mps.lang.core" />
           </node>
         </node>
-        <node concept="1SiIV0" id="6Dg__VJQ3eg" role="3bR37C">
-          <node concept="3bR9La" id="6Dg__VJQ3eh" role="1SiIV1">
-            <ref role="3bR37D" to="ffeo:7Kfy9QB6L9O" resolve="jetbrains.mps.lang.smodel" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="6Dg__VJQ3ei" role="3bR37C">
           <node concept="3bR9La" id="6Dg__VJQ3ej" role="1SiIV1">
             <ref role="3bR37D" node="69UmpDmJW26" resolve="jetbrains.mps.baseLanguageExt" />
@@ -4178,6 +4127,11 @@
             <ref role="3bR37D" to="ffeo:Ye$g8PO8TM" resolve="jetbrains.mps.kotlin.javaRefs" />
           </node>
         </node>
+        <node concept="1SiIV0" id="74$3PKmK4EK" role="3bR37C">
+          <node concept="3bR9La" id="74$3PKmK4EL" role="1SiIV1">
+            <ref role="3bR37D" to="zqd8:74$3PKm_L$v" resolve="jetbrains.mps.logic.runtime" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtA" id="4lgunKggOdS" role="2G$12L">
         <property role="BnDLt" value="true" />