diff --git a/.mps/modules.xml b/.mps/modules.xml
index b41f51b0..2e3f4a17 100644
--- a/.mps/modules.xml
+++ b/.mps/modules.xml
@@ -47,13 +47,13 @@
       <modulePath path="$PROJECT_DIR$/samples/mpscore/languages/jetbrains.mps.baseLanguage.tuplesExt/jetbrains.mps.baseLanguage.tuplesExt.mpl" folder="samples.mpscore.ext.baseLanguage" />
       <modulePath path="$PROJECT_DIR$/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/jetbrains.mps.baseLanguageExt.mpl" folder="samples.mpscore.ext.baseLanguage" />
       <modulePath path="$PROJECT_DIR$/samples/mpscore/languages/jetbrains.mps.baseLanguageInternalExt/jetbrains.mps.baseLanguageInternalExt.mpl" folder="samples.mpscore.ext.baseLanguage" />
-      <modulePath path="$PROJECT_DIR$/samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/jetbrains.mps.behaviorExt.mpl" folder="samples.mpscore.ext" />
+      <modulePath path="$PROJECT_DIR$/samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/jetbrains.mps.lang.behaviorExt.mpl" folder="samples.mpscore.ext" />
       <modulePath path="$PROJECT_DIR$/samples/mpscore/languages/jetbrains.mps.lang.coderulesExt/jetbrains.mps.lang.coderulesExt.mpl" folder="samples.mpscore.ext.coderulesExt" />
       <modulePath path="$PROJECT_DIR$/samples/mpscore/languages/jetbrains.mps.lang.constraintsExt/jetbrains.mps.lang.constraintsExt.mpl" folder="samples.mpscore.ext" />
       <modulePath path="$PROJECT_DIR$/samples/mpscore/languages/jetbrains.mps.lang.generator.generationContextExt/jetbrains.mps.lang.generator.generationContextExt.mpl" folder="samples.mpscore.ext" />
       <modulePath path="$PROJECT_DIR$/samples/mpscore/languages/jetbrains.mps.lang.generatorExt/jetbrains.mps.lang.generatorExt.mpl" folder="samples.mpscore.ext" />
       <modulePath path="$PROJECT_DIR$/samples/mpscore/languages/jetbrains.mps.lang.quotationExt/jetbrains.mps.lang.quotationExt.mpl" folder="samples.mpscore.ext" />
-      <modulePath path="$PROJECT_DIR$/samples/mpscore/languages/jetbrains.mps.lang.scriptExt/jetbrains.mps.lang.scriptExt.mpl" folder="" />
+      <modulePath path="$PROJECT_DIR$/samples/mpscore/languages/jetbrains.mps.lang.scriptExt/jetbrains.mps.lang.scriptExt.mpl" folder="samples.mpscore.ext" />
       <modulePath path="$PROJECT_DIR$/samples/mpscore/languages/jetbrains.mps.lang.smodelExt/jetbrains.mps.lang.smodelExt.mpl" folder="samples.mpscore.ext.smodel" />
       <modulePath path="$PROJECT_DIR$/samples/mpscore/languages/jetbrains.mps.lang.testExt/jetbrains.mps.lang.testExt.mpl" folder="samples.mpscore.ext" />
       <modulePath path="$PROJECT_DIR$/samples/mpscore/languages/jetbrains.mps.lang.typesystemExt/jetbrains.mps.lang.typesystemExt.mpl" folder="samples.mpscore.ext" />
diff --git a/samples/mpscore/.mps/modules.xml b/samples/mpscore/.mps/modules.xml
index 527ded68..952d8147 100644
--- a/samples/mpscore/.mps/modules.xml
+++ b/samples/mpscore/.mps/modules.xml
@@ -12,7 +12,7 @@
       <modulePath path="$PROJECT_DIR$/languages/jetbrains.mps.baseLanguage.tuplesExt/jetbrains.mps.baseLanguage.tuplesExt.mpl" folder="" />
       <modulePath path="$PROJECT_DIR$/languages/jetbrains.mps.baseLanguageExt/jetbrains.mps.baseLanguageExt.mpl" folder="" />
       <modulePath path="$PROJECT_DIR$/languages/jetbrains.mps.baseLanguageInternalExt/jetbrains.mps.baseLanguageInternalExt.mpl" folder="" />
-      <modulePath path="$PROJECT_DIR$/languages/jetbrains.mps.lang.behaviorExt/jetbrains.mps.behaviorExt.mpl" folder="" />
+      <modulePath path="$PROJECT_DIR$/languages/jetbrains.mps.lang.behaviorExt/jetbrains.mps.lang.behaviorExt.mpl" folder="" />
       <modulePath path="$PROJECT_DIR$/languages/jetbrains.mps.lang.coderulesExt/jetbrains.mps.lang.coderulesExt.mpl" folder="ext.coderules" />
       <modulePath path="$PROJECT_DIR$/languages/jetbrains.mps.lang.constraintsExt/jetbrains.mps.lang.constraintsExt.mpl" folder="" />
       <modulePath path="$PROJECT_DIR$/languages/jetbrains.mps.lang.generator.generationContextExt/jetbrains.mps.lang.generator.generationContextExt.mpl" folder="" />
diff --git a/samples/mpscore/build.xml b/samples/mpscore/build.xml
index e9d02c95..97d81235 100644
--- a/samples/mpscore/build.xml
+++ b/samples/mpscore/build.xml
@@ -2614,7 +2614,7 @@
     <delete dir="${build.layout}" />
   </target>
   
-  <target name="compileJava" depends="java.compile.jetbrains.mps.lang.smodelExt, java.compile.jetbrains.mps.lang.smodelExt#01, java.compile.jetbrains.mps.lang.smodel.queryExt, java.compile.jetbrains.mps.lang.smodel.queryExt.generator, java.compile.jetbrains.mps.lang.smodelExt.test, java.compile.jetbrains.mps.behaviorExt, java.compile.jetbrains.mps.behaviorExt.generator, java.compile.jetbrains.mps.lang.typesystemExt, java.compile.jetbrains.mps.lang.typesystemExt#01, java.compile.jetbrains.mps.lang.quotationExt, java.compile.jetbrains.mps.lang.quotationExt#01, java.compile.jetbrains.mps.lang.constraintsExt, java.compile.jetbrains.mps.lang.constraintsExt#01, java.compile.jetbrains.mps.lang.generatorExt, java.compile.jetbrains.mps.lang.generatorExt#01, java.compile.jetbrains.mps.lang.generator.generationContextExt, java.compile.jetbrains.mps.lang.generator.generationContextExt#01, java.compile.jetbrains.mps.lang.testExt, java.compile.jetbrains.mps.lang.testExt.generator, java.compile.jetbrains.mps.lang.scriptExt, java.compile.jetbrains.mps.lang.scriptExt.generator, java.compile.jetbrains.mps.baseLanguageExt, java.compile.jetbrains.mps.baseLanguageInternalExt, java.compile.jetbrains.mps.baseLanguageInternalExt#01, java.compile.jetbrains.mps.baseLanguage.blTypesExt, java.compile.jetbrains.mps.baseLanguage.blTypesExt#01, java.compile.jetbrains.mps.baseLanguage.javadocExt, java.compile.java.modules.cycle.1, java.compile.jetbrains.mps.baseLanguageExt.test, java.compile.typechecking.samples.baseLanguage, java.compile.jetbrains.mps.baseLanguage.tuplesExt, java.compile.jetbrains.mps.baseLanguage.tuplesExt#01, java.compile.jetbrains.mps.baseLanguage.tuplesExt.test, java.compile.jetbrains.mps.baseLanguage.sequence, java.compile.jetbrains.mps.baseLanguage.sequence#01, java.compile.jetbrains.mps.baseLanguage.function, java.compile.jetbrains.mps.baseLanguage.function#01, java.compile.jetbrains.mps.baseLanguage.collectionsExt, java.compile.jetbrains.mps.baseLanguage.collectionsExt#01, java.compile.jetbrains.mps.baseLanguage.collectionsExt.test, java.compile.jetbrains.mps.baseLanguage.closuresExt, java.compile.jetbrains.mps.baseLanguage.closuresExt#1312156863939371938, java.compile.jetbrains.mps.baseLanguage.closuresExt.test, java.compile.jetbrains.mps.logicExt, java.compile.jetbrains.mps.logicExt#01" />
+  <target name="compileJava" depends="java.compile.jetbrains.mps.lang.smodelExt, java.compile.jetbrains.mps.lang.smodelExt#01, java.compile.jetbrains.mps.lang.smodel.queryExt, java.compile.jetbrains.mps.lang.smodel.queryExt.generator, java.compile.jetbrains.mps.lang.smodelExt.test, java.compile.jetbrains.mps.lang.behaviorExt, java.compile.jetbrains.mps.lang.behaviorExt.generator, java.compile.jetbrains.mps.lang.typesystemExt, java.compile.jetbrains.mps.lang.typesystemExt#01, java.compile.jetbrains.mps.lang.quotationExt, java.compile.jetbrains.mps.lang.quotationExt#01, java.compile.jetbrains.mps.lang.constraintsExt, java.compile.jetbrains.mps.lang.constraintsExt#01, java.compile.jetbrains.mps.lang.generatorExt, java.compile.jetbrains.mps.lang.generatorExt#01, java.compile.jetbrains.mps.lang.generator.generationContextExt, java.compile.jetbrains.mps.lang.generator.generationContextExt#01, java.compile.jetbrains.mps.lang.testExt, java.compile.jetbrains.mps.lang.testExt.generator, java.compile.jetbrains.mps.lang.scriptExt, java.compile.jetbrains.mps.lang.scriptExt.generator, java.compile.jetbrains.mps.baseLanguageExt, java.compile.jetbrains.mps.baseLanguageInternalExt, java.compile.jetbrains.mps.baseLanguageInternalExt#01, java.compile.jetbrains.mps.baseLanguage.blTypesExt, java.compile.jetbrains.mps.baseLanguage.blTypesExt#01, java.compile.jetbrains.mps.baseLanguage.javadocExt, java.compile.java.modules.cycle.1, java.compile.jetbrains.mps.baseLanguageExt.test, java.compile.typechecking.samples.baseLanguage, java.compile.jetbrains.mps.baseLanguage.tuplesExt, java.compile.jetbrains.mps.baseLanguage.tuplesExt#01, java.compile.jetbrains.mps.baseLanguage.tuplesExt.test, java.compile.jetbrains.mps.baseLanguage.sequence, java.compile.jetbrains.mps.baseLanguage.sequence#01, java.compile.jetbrains.mps.baseLanguage.function, java.compile.jetbrains.mps.baseLanguage.function#01, java.compile.jetbrains.mps.baseLanguage.collectionsExt, java.compile.jetbrains.mps.baseLanguage.collectionsExt#01, java.compile.jetbrains.mps.baseLanguage.collectionsExt.test, java.compile.jetbrains.mps.baseLanguage.closuresExt, java.compile.jetbrains.mps.baseLanguage.closuresExt#1312156863939371938, java.compile.jetbrains.mps.baseLanguage.closuresExt.test, java.compile.jetbrains.mps.logicExt, java.compile.jetbrains.mps.logicExt#01" />
   
   <target name="processResources" />
   
@@ -2773,7 +2773,7 @@
         <module file="${basedir}/solutions/jetbrains.mps.baseLanguage.tuplesExt.test/jetbrains.mps.baseLanguage.tuplesExt.test.msd" />
         <module file="${basedir}/languages/jetbrains.mps.baseLanguageExt/jetbrains.mps.baseLanguageExt.mpl" />
         <module file="${basedir}/languages/jetbrains.mps.baseLanguageInternalExt/jetbrains.mps.baseLanguageInternalExt.mpl" />
-        <module file="${basedir}/languages/jetbrains.mps.lang.behaviorExt/jetbrains.mps.behaviorExt.mpl" />
+        <module file="${basedir}/languages/jetbrains.mps.lang.behaviorExt/jetbrains.mps.lang.behaviorExt.mpl" />
         <module file="${basedir}/languages/jetbrains.mps.lang.constraintsExt/jetbrains.mps.lang.constraintsExt.mpl" />
         <module file="${basedir}/languages/jetbrains.mps.lang.generator.generationContextExt/jetbrains.mps.lang.generator.generationContextExt.mpl" />
         <module file="${basedir}/languages/jetbrains.mps.lang.generatorExt/jetbrains.mps.lang.generatorExt.mpl" />
@@ -3147,10 +3147,10 @@
     </javac>
   </target>
   
-  <target name="java.compile.jetbrains.mps.behaviorExt" depends="java.compile.jetbrains.mps.baseLanguageExt, java.compile.jetbrains.mps.lang.smodelExt, fetchDependencies">
+  <target name="java.compile.jetbrains.mps.lang.behaviorExt" depends="java.compile.jetbrains.mps.baseLanguageExt, java.compile.jetbrains.mps.lang.smodelExt, fetchDependencies">
     <mkdir dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.lang.behaviorExt/source_gen" />
-    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.behaviorExt" />
-    <javac destdir="${build.tmp}/java/out/jetbrains.mps.behaviorExt" fork="true" encoding="utf8" includeantruntime="false" debug="true">
+    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.behaviorExt" />
+    <javac destdir="${build.tmp}/java/out/jetbrains.mps.lang.behaviorExt" fork="true" encoding="utf8" includeantruntime="false" debug="true">
       <compilerarg value="-Xlint:none" />
       <src>
         <path location="${mps.macro.mpscore_home}/languages/jetbrains.mps.lang.behaviorExt/source_gen" />
@@ -3215,10 +3215,10 @@
     </javac>
   </target>
   
-  <target name="java.compile.jetbrains.mps.behaviorExt.generator" depends="java.compile.jetbrains.mps.behaviorExt, fetchDependencies">
+  <target name="java.compile.jetbrains.mps.lang.behaviorExt.generator" depends="java.compile.jetbrains.mps.baseLanguageExt, java.compile.jetbrains.mps.lang.behaviorExt, fetchDependencies">
     <mkdir dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.lang.behaviorExt/generator/source_gen" />
-    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.behaviorExt.generator" />
-    <javac destdir="${build.tmp}/java/out/jetbrains.mps.behaviorExt.generator" fork="true" encoding="utf8" includeantruntime="false" debug="true">
+    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.behaviorExt.generator" />
+    <javac destdir="${build.tmp}/java/out/jetbrains.mps.lang.behaviorExt.generator" fork="true" encoding="utf8" includeantruntime="false" debug="true">
       <compilerarg value="-Xlint:none" />
       <src>
         <path location="${mps.macro.mpscore_home}/languages/jetbrains.mps.lang.behaviorExt/generator/source_gen" />
@@ -3230,9 +3230,7 @@
         <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-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-behavior-api.jar" />
         <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
@@ -3251,7 +3249,10 @@
         <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" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.behaviorExt" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.baseLanguageExt" />
+        <fileset file="${artifacts.mps}/lib/mps-feedback-api.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-messages-api.jar" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.behaviorExt" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset dir="${artifacts.mps}/lib" includes="*.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
@@ -3266,6 +3267,10 @@
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
+        <fileset file="${artifacts.coderules}/deploy/jetbrains.mps.logic.runtime.jar" />
+        <fileset dir="${artifacts.coderules}/deploy/lib" includes="collection-0.7.jar" />
+        <fileset dir="${artifacts.coderules}/deploy/lib" includes="trove4j-3.0.3.jar" />
+        <fileset dir="${artifacts.coderules}/deploy/lib" includes="conreactor-core-0.9.14.jar" />
       </classpath>
     </javac>
   </target>
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/generator/templates/jetbrains.mps.behaviorExt.generator.templates@generator.mps b/samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/generator/templates/jetbrains.mps.lang.behaviorExt.templates@generator.mps
similarity index 91%
rename from samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/generator/templates/jetbrains.mps.behaviorExt.generator.templates@generator.mps
rename to samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/generator/templates/jetbrains.mps.lang.behaviorExt.templates@generator.mps
index a62110bb..39a026c3 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/generator/templates/jetbrains.mps.behaviorExt.generator.templates@generator.mps
+++ b/samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/generator/templates/jetbrains.mps.lang.behaviorExt.templates@generator.mps
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:a97a15cd-4afc-467f-ab0c-5473077fcecf(jetbrains.mps.behaviorExt.generator.templates@generator)">
+<model ref="r:a97a15cd-4afc-467f-ab0c-5473077fcecf(jetbrains.mps.lang.behaviorExt.templates@generator)">
   <persistence version="9" />
   <languages>
     <devkit ref="a2eb3a43-fcc2-4200-80dc-c60110c4862d(jetbrains.mps.devkit.templates)" />
   </languages>
   <imports>
-    <import index="vwoa" ref="r:91cdb51e-443e-4719-9dd5-46b3df0d2b9e(jetbrains.mps.behaviorExt.structure)" />
+    <import index="vwoa" ref="r:91cdb51e-443e-4719-9dd5-46b3df0d2b9e(jetbrains.mps.lang.behaviorExt.structure)" />
   </imports>
   <registry>
     <language id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator">
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/jetbrains.mps.behaviorExt.mpl b/samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/jetbrains.mps.lang.behaviorExt.mpl
similarity index 92%
rename from samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/jetbrains.mps.behaviorExt.mpl
rename to samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/jetbrains.mps.lang.behaviorExt.mpl
index 0f0709e8..1ad21824 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/jetbrains.mps.behaviorExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/jetbrains.mps.lang.behaviorExt.mpl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<language namespace="jetbrains.mps.behaviorExt" uuid="e6d71378-a200-440d-aee2-16f93b792e86" languageVersion="0" moduleVersion="0">
+<language namespace="jetbrains.mps.lang.behaviorExt" uuid="e6d71378-a200-440d-aee2-16f93b792e86" languageVersion="0" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -12,7 +12,7 @@
   </facets>
   <accessoryModels />
   <generators>
-    <generator alias="main" namespace="jetbrains.mps.behaviorExt.generator" uuid="64feabf9-0bb2-49ae-800e-ae9bc7f04c9e">
+    <generator alias="main" namespace="jetbrains.mps.lang.behaviorExt.generator" uuid="64feabf9-0bb2-49ae-800e-ae9bc7f04c9e">
       <models>
         <modelRoot contentPath="${module}/generator" type="default">
           <sourceRoot location="templates" />
@@ -52,16 +52,19 @@
         <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
         <module reference="52b81ac7-93fd-4e9e-b972-4995882da6d4(jetbrains.mps.baseLanguage.references.runtime)" version="0" />
         <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
-        <module reference="e6d71378-a200-440d-aee2-16f93b792e86(jetbrains.mps.behaviorExt)" version="0" />
-        <module reference="64feabf9-0bb2-49ae-800e-ae9bc7f04c9e(jetbrains.mps.behaviorExt.generator)" 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="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="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" version="0" />
+        <module reference="e6d71378-a200-440d-aee2-16f93b792e86(jetbrains.mps.lang.behaviorExt)" version="0" />
+        <module reference="64feabf9-0bb2-49ae-800e-ae9bc7f04c9e(jetbrains.mps.lang.behaviorExt.generator)" version="0" />
         <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
         <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
         <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
         <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
+        <module reference="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" version="0" />
+        <module reference="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" version="0" />
         <module reference="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" version="0" />
       </dependencyVersions>
       <mapping-priorities />
@@ -69,7 +72,6 @@
   </generators>
   <sourcePath />
   <dependencies>
-    <dependency reexport="false">0fda14cc-a416-4c81-869a-2175d8b3325d(jetbrains.mps.baseLanguageExt)</dependency>
     <dependency reexport="false">65e59b42-e7f3-45ec-8692-6c7829780afe(jetbrains.mps.lang.smodelExt)</dependency>
   </dependencies>
   <languageVersions>
@@ -119,10 +121,10 @@
     <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="e6d71378-a200-440d-aee2-16f93b792e86(jetbrains.mps.behaviorExt)" 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="e6d71378-a200-440d-aee2-16f93b792e86(jetbrains.mps.lang.behaviorExt)" 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" />
@@ -135,6 +137,7 @@
     <module reference="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" version="0" />
   </dependencyVersions>
   <extendedLanguages>
+    <extendedLanguage>0fda14cc-a416-4c81-869a-2175d8b3325d(jetbrains.mps.baseLanguageExt)</extendedLanguage>
     <extendedLanguage>af65afd8-f0dd-4942-87d9-63a55f2a9db1(jetbrains.mps.lang.behavior)</extendedLanguage>
   </extendedLanguages>
 </language>
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/models/jetbrains.mps.behaviorExt.behavior.mps b/samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/models/jetbrains.mps.lang.behaviorExt.behavior.mps
similarity index 94%
rename from samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/models/jetbrains.mps.behaviorExt.behavior.mps
rename to samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/models/jetbrains.mps.lang.behaviorExt.behavior.mps
index 08f75b0e..6b7bdd22 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/models/jetbrains.mps.behaviorExt.behavior.mps
+++ b/samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/models/jetbrains.mps.lang.behaviorExt.behavior.mps
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:be1cb04e-3f0b-44cd-b157-3b7d9a720aa7(jetbrains.mps.behaviorExt.behavior)">
+<model ref="r:be1cb04e-3f0b-44cd-b157-3b7d9a720aa7(jetbrains.mps.lang.behaviorExt.behavior)">
   <persistence version="9" />
   <languages>
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="18" />
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/models/jetbrains.mps.behaviorExt.constraints.mps b/samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/models/jetbrains.mps.lang.behaviorExt.constraints.mps
similarity index 97%
rename from samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/models/jetbrains.mps.behaviorExt.constraints.mps
rename to samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/models/jetbrains.mps.lang.behaviorExt.constraints.mps
index 033ffb0e..0788e691 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/models/jetbrains.mps.behaviorExt.constraints.mps
+++ b/samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/models/jetbrains.mps.lang.behaviorExt.constraints.mps
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:126fce44-796e-4834-8574-ef8ad6794ffa(jetbrains.mps.behaviorExt.constraints)">
+<model ref="r:126fce44-796e-4834-8574-ef8ad6794ffa(jetbrains.mps.lang.behaviorExt.constraints)">
   <persistence version="9" />
   <languages>
     <use id="5dae8159-ab99-46bb-a40d-0cee30ee7018" name="jetbrains.mps.lang.constraints.rules.kinds" version="0" />
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/models/jetbrains.mps.behaviorExt.editor.mps b/samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/models/jetbrains.mps.lang.behaviorExt.editor.mps
similarity index 94%
rename from samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/models/jetbrains.mps.behaviorExt.editor.mps
rename to samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/models/jetbrains.mps.lang.behaviorExt.editor.mps
index f9c06414..442d20e5 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/models/jetbrains.mps.behaviorExt.editor.mps
+++ b/samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/models/jetbrains.mps.lang.behaviorExt.editor.mps
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:b7f435fa-0da1-415c-92ba-6c13be508894(jetbrains.mps.behaviorExt.editor)">
+<model ref="r:b7f435fa-0da1-415c-92ba-6c13be508894(jetbrains.mps.lang.behaviorExt.editor)">
   <persistence version="9" />
   <languages>
     <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="14" />
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/models/jetbrains.mps.behaviorExt.structure.mps b/samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/models/jetbrains.mps.lang.behaviorExt.structure.mps
similarity index 92%
rename from samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/models/jetbrains.mps.behaviorExt.structure.mps
rename to samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/models/jetbrains.mps.lang.behaviorExt.structure.mps
index 08c20d64..09d67656 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/models/jetbrains.mps.behaviorExt.structure.mps
+++ b/samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/models/jetbrains.mps.lang.behaviorExt.structure.mps
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:91cdb51e-443e-4719-9dd5-46b3df0d2b9e(jetbrains.mps.behaviorExt.structure)">
+<model ref="r:91cdb51e-443e-4719-9dd5-46b3df0d2b9e(jetbrains.mps.lang.behaviorExt.structure)">
   <persistence version="9" />
   <languages>
     <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="9" />
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/models/jetbrains.mps.behaviorExt.types.mps b/samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/models/jetbrains.mps.lang.behaviorExt.types.mps
similarity index 99%
rename from samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/models/jetbrains.mps.behaviorExt.types.mps
rename to samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/models/jetbrains.mps.lang.behaviorExt.types.mps
index 9fdea52f..f8d97a64 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/models/jetbrains.mps.behaviorExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/models/jetbrains.mps.lang.behaviorExt.types.mps
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:9468b2da-d680-4618-8620-b6908c569525(jetbrains.mps.behaviorExt.types)">
+<model ref="r:9468b2da-d680-4618-8620-b6908c569525(jetbrains.mps.lang.behaviorExt.types)">
   <persistence version="9" />
   <languages>
     <use id="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462" name="jetbrains.mps.lang.typechecking" version="0" />
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/models/jetbrains.mps.behaviorExt.typesystem.mps b/samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/models/jetbrains.mps.lang.behaviorExt.typesystem.mps
similarity index 92%
rename from samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/models/jetbrains.mps.behaviorExt.typesystem.mps
rename to samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/models/jetbrains.mps.lang.behaviorExt.typesystem.mps
index e021509f..f5743a0f 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/models/jetbrains.mps.behaviorExt.typesystem.mps
+++ b/samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/models/jetbrains.mps.lang.behaviorExt.typesystem.mps
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:27ff7ef9-a046-4b78-b4bd-c75e842f2d5d(jetbrains.mps.behaviorExt.typesystem)">
+<model ref="r:27ff7ef9-a046-4b78-b4bd-c75e842f2d5d(jetbrains.mps.lang.behaviorExt.typesystem)">
   <persistence version="9" />
   <languages>
     <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="5" />
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 f9c05cbd..6247e5dd 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
@@ -623,87 +623,87 @@
           </node>
         </node>
       </node>
-      <node concept="1E1JtD" id="1tzntNAm$ml" role="2G$12L">
+      <node concept="1E1JtD" id="51h1DIGwo4o" role="2G$12L">
         <property role="BnDLt" value="true" />
-        <property role="TrG5h" value="jetbrains.mps.behaviorExt" />
+        <property role="TrG5h" value="jetbrains.mps.lang.behaviorExt" />
         <property role="3LESm3" value="e6d71378-a200-440d-aee2-16f93b792e86" />
-        <node concept="55IIr" id="1tzntNAm$mo" role="3LF7KH">
-          <node concept="2Ry0Ak" id="1tzntNAm$rl" role="iGT6I">
+        <node concept="55IIr" id="51h1DIGwo4r" role="3LF7KH">
+          <node concept="2Ry0Ak" id="51h1DIGwoau" role="iGT6I">
             <property role="2Ry0Am" value="languages" />
-            <node concept="2Ry0Ak" id="1tzntNAm$rq" role="2Ry0An">
+            <node concept="2Ry0Ak" id="51h1DIGwoaz" role="2Ry0An">
               <property role="2Ry0Am" value="jetbrains.mps.lang.behaviorExt" />
-              <node concept="2Ry0Ak" id="1tzntNAm$rv" role="2Ry0An">
-                <property role="2Ry0Am" value="jetbrains.mps.behaviorExt.mpl" />
+              <node concept="2Ry0Ak" id="51h1DIGwoaC" role="2Ry0An">
+                <property role="2Ry0Am" value="jetbrains.mps.lang.behaviorExt.mpl" />
               </node>
             </node>
           </node>
         </node>
-        <node concept="1BupzO" id="1tzntNAm$s3" role="3bR31x">
+        <node concept="1SiIV0" id="51h1DIGwobm" role="3bR37C">
+          <node concept="3bR9La" id="51h1DIGwobn" role="1SiIV1">
+            <ref role="3bR37D" node="6Dg__VJQ3B2" resolve="jetbrains.mps.lang.smodelExt" />
+          </node>
+        </node>
+        <node concept="1BupzO" id="51h1DIGwobw" role="3bR31x">
           <property role="3ZfqAx" value="models" />
           <property role="1Hdu6h" value="true" />
           <property role="1HemKv" value="true" />
-          <node concept="3LXTmp" id="1tzntNAm$s4" role="1HemKq">
-            <node concept="398BVA" id="1tzntNAm$rV" role="3LXTmr">
+          <node concept="3LXTmp" id="51h1DIGwobx" role="1HemKq">
+            <node concept="398BVA" id="51h1DIGwobo" role="3LXTmr">
               <ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.mpscore_home" />
-              <node concept="2Ry0Ak" id="1tzntNAm$rW" role="iGT6I">
+              <node concept="2Ry0Ak" id="51h1DIGwobp" role="iGT6I">
                 <property role="2Ry0Am" value="languages" />
-                <node concept="2Ry0Ak" id="1tzntNAm$rX" role="2Ry0An">
+                <node concept="2Ry0Ak" id="51h1DIGwobq" role="2Ry0An">
                   <property role="2Ry0Am" value="jetbrains.mps.lang.behaviorExt" />
-                  <node concept="2Ry0Ak" id="1tzntNAm$rY" role="2Ry0An">
+                  <node concept="2Ry0Ak" id="51h1DIGwobr" role="2Ry0An">
                     <property role="2Ry0Am" value="models" />
                   </node>
                 </node>
               </node>
             </node>
-            <node concept="3qWCbU" id="1tzntNAm$s5" role="3LXTna">
+            <node concept="3qWCbU" id="51h1DIGwoby" role="3LXTna">
               <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
             </node>
           </node>
         </node>
-        <node concept="1SiIV0" id="1tzntNAm$s6" role="3bR37C">
-          <node concept="1Busua" id="1tzntNAm$s7" role="1SiIV1">
+        <node concept="1SiIV0" id="51h1DIGwobz" role="3bR37C">
+          <node concept="1Busua" id="51h1DIGwob$" role="1SiIV1">
+            <ref role="1Busuk" node="69UmpDmJW26" resolve="jetbrains.mps.baseLanguageExt" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="51h1DIGwob_" role="3bR37C">
+          <node concept="1Busua" id="51h1DIGwobA" role="1SiIV1">
             <ref role="1Busuk" to="ffeo:7Kfy9QB6L4p" resolve="jetbrains.mps.lang.behavior" />
           </node>
         </node>
-        <node concept="1yeLz9" id="1tzntNAm$s8" role="1TViLv">
-          <property role="TrG5h" value="jetbrains.mps.behaviorExt.generator" />
+        <node concept="1yeLz9" id="51h1DIGwobB" role="1TViLv">
+          <property role="TrG5h" value="jetbrains.mps.lang.behaviorExt.generator" />
           <property role="3LESm3" value="64feabf9-0bb2-49ae-800e-ae9bc7f04c9e" />
-          <node concept="1BupzO" id="1tzntNAm$sj" role="3bR31x">
+          <node concept="1BupzO" id="51h1DIGwobM" role="3bR31x">
             <property role="3ZfqAx" value="generator/templates" />
             <property role="1Hdu6h" value="true" />
             <property role="1HemKv" value="true" />
-            <node concept="3LXTmp" id="1tzntNAm$sk" role="1HemKq">
-              <node concept="398BVA" id="1tzntNAm$s9" role="3LXTmr">
+            <node concept="3LXTmp" id="51h1DIGwobN" role="1HemKq">
+              <node concept="398BVA" id="51h1DIGwobC" role="3LXTmr">
                 <ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.mpscore_home" />
-                <node concept="2Ry0Ak" id="1tzntNAm$sa" role="iGT6I">
+                <node concept="2Ry0Ak" id="51h1DIGwobD" role="iGT6I">
                   <property role="2Ry0Am" value="languages" />
-                  <node concept="2Ry0Ak" id="1tzntNAm$sb" role="2Ry0An">
+                  <node concept="2Ry0Ak" id="51h1DIGwobE" role="2Ry0An">
                     <property role="2Ry0Am" value="jetbrains.mps.lang.behaviorExt" />
-                    <node concept="2Ry0Ak" id="1tzntNAm$sc" role="2Ry0An">
+                    <node concept="2Ry0Ak" id="51h1DIGwobF" role="2Ry0An">
                       <property role="2Ry0Am" value="generator" />
-                      <node concept="2Ry0Ak" id="1tzntNAm$sd" role="2Ry0An">
+                      <node concept="2Ry0Ak" id="51h1DIGwobG" role="2Ry0An">
                         <property role="2Ry0Am" value="templates" />
                       </node>
                     </node>
                   </node>
                 </node>
               </node>
-              <node concept="3qWCbU" id="1tzntNAm$sl" role="3LXTna">
+              <node concept="3qWCbU" id="51h1DIGwobO" role="3LXTna">
                 <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
               </node>
             </node>
           </node>
         </node>
-        <node concept="1SiIV0" id="1tzntNAvpnW" role="3bR37C">
-          <node concept="3bR9La" id="1tzntNAvpnX" role="1SiIV1">
-            <ref role="3bR37D" node="69UmpDmJW26" resolve="jetbrains.mps.baseLanguageExt" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="1tzntNAvpnY" role="3bR37C">
-          <node concept="3bR9La" id="1tzntNAvpnZ" role="1SiIV1">
-            <ref role="3bR37D" node="6Dg__VJQ3B2" resolve="jetbrains.mps.lang.smodelExt" />
-          </node>
-        </node>
       </node>
       <node concept="1E1JtD" id="61G6TdEeMYr" role="2G$12L">
         <property role="TrG5h" value="jetbrains.mps.lang.typesystemExt" />