diff --git a/.mps/modules.xml b/.mps/modules.xml
index 5a7216f5..b17052e5 100644
--- a/.mps/modules.xml
+++ b/.mps/modules.xml
@@ -34,21 +34,21 @@
       <modulePath path="$PROJECT_DIR$/samples/lambdacalc/languages/samples.lambdacalc/samples.lambdacalc.mpl" folder="samples.lambdacalc" />
       <modulePath path="$PROJECT_DIR$/samples/lambdacalc/solutions/samples.lambdacalc.build/samples.lambdacalc.build.msd" folder="samples.lambdacalc" />
       <modulePath path="$PROJECT_DIR$/samples/lambdacalc/solutions/samples.lambdacalc.demo/samples.lambdacalc.demo.msd" folder="samples.lambdacalc" />
-      <modulePath path="$PROJECT_DIR$/samples/mpscore/languages/jetbrains.mps.baseLanguage.closuresExt/jetbrains.mps.baseLanguage.closuresExt.mpl" folder="samples.mpscore.baseLanguageExt" />
-      <modulePath path="$PROJECT_DIR$/samples/mpscore/languages/jetbrains.mps.baseLanguage.collectionsExt/jetbrains.mps.baseLanguage.collectionsExt.mpl" folder="samples.mpscore.baseLanguageExt" />
-      <modulePath path="$PROJECT_DIR$/samples/mpscore/languages/jetbrains.mps.baseLanguage.function/jetbrains.mps.baseLanguage.function.mpl" folder="samples.mpscore.baseLanguageExt" />
-      <modulePath path="$PROJECT_DIR$/samples/mpscore/languages/jetbrains.mps.baseLanguage.javadocExt/jetbrains.mps.baseLanguage.javadocExt.mpl" folder="samples.mpscore.baseLanguageExt" />
-      <modulePath path="$PROJECT_DIR$/samples/mpscore/languages/jetbrains.mps.baseLanguage.sequence/jetbrains.mps.baseLanguage.sequence.mpl" folder="samples.mpscore.baseLanguageExt" />
-      <modulePath path="$PROJECT_DIR$/samples/mpscore/languages/jetbrains.mps.baseLanguage.tuplesExt/jetbrains.mps.baseLanguage.tuplesExt.mpl" folder="samples.mpscore.baseLanguageExt" />
-      <modulePath path="$PROJECT_DIR$/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/jetbrains.mps.baseLanguageExt.mpl" folder="samples.mpscore.baseLanguageExt" />
-      <modulePath path="$PROJECT_DIR$/samples/mpscore/languages/jetbrains.mps.lang.coderulesExt.mpl" folder="samples.mpscore.coderulesExt" />
-      <modulePath path="$PROJECT_DIR$/samples/mpscore/languages/jetbrains.mps.logicExt/jetbrains.mps.logicExt.mpl" folder="samples.mpscore.coderulesExt" />
-      <modulePath path="$PROJECT_DIR$/samples/mpscore/solutions/jetbrains.mps.baseLanguage.closuresExt.test/jetbrains.mps.baseLanguage.closuresExt.test.msd" folder="samples.mpscore.baseLanguageExt" />
-      <modulePath path="$PROJECT_DIR$/samples/mpscore/solutions/jetbrains.mps.baseLanguage.collectionsExt.test/jetbrains.mps.baseLanguage.collectionsExt.test.msd" folder="samples.mpscore.baseLanguageExt" />
-      <modulePath path="$PROJECT_DIR$/samples/mpscore/solutions/jetbrains.mps.baseLanguage.tuplesExt.test/jetbrains.mps.baseLanguage.tuplesExt.test.msd" folder="samples.mpscore.baseLanguageExt" />
-      <modulePath path="$PROJECT_DIR$/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/jetbrains.mps.baseLanguageExt.test.msd" folder="samples.mpscore.baseLanguageExt" />
+      <modulePath path="$PROJECT_DIR$/samples/mpscore/languages/jetbrains.mps.baseLanguage.closuresExt/jetbrains.mps.baseLanguage.closuresExt.mpl" folder="samples.mpscore.ext.baseLanguage" />
+      <modulePath path="$PROJECT_DIR$/samples/mpscore/languages/jetbrains.mps.baseLanguage.collectionsExt/jetbrains.mps.baseLanguage.collectionsExt.mpl" folder="samples.mpscore.ext.baseLanguage" />
+      <modulePath path="$PROJECT_DIR$/samples/mpscore/languages/jetbrains.mps.baseLanguage.function/jetbrains.mps.baseLanguage.function.mpl" folder="samples.mpscore.ext.baseLanguage" />
+      <modulePath path="$PROJECT_DIR$/samples/mpscore/languages/jetbrains.mps.baseLanguage.javadocExt/jetbrains.mps.baseLanguage.javadocExt.mpl" folder="samples.mpscore.ext.baseLanguage" />
+      <modulePath path="$PROJECT_DIR$/samples/mpscore/languages/jetbrains.mps.baseLanguage.sequence/jetbrains.mps.baseLanguage.sequence.mpl" folder="samples.mpscore.ext.baseLanguage" />
+      <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.lang.coderulesExt/jetbrains.mps.lang.coderulesExt.mpl" folder="samples.mpscore.ext.coderulesExt" />
+      <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.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/samples.mpscore.build/samples.mpscore.build.msd" folder="samples.mpscore.build" />
       <modulePath path="$PROJECT_DIR$/samples/mpscore/solutions/typechecking.samples.baseLanguage/typechecking.samples.baseLanguage.msd" folder="samples.mpscore" />
     </projectModules>
   </component>
-</project>
\ No newline at end of file
+</project>
diff --git a/samples/mpscore/languages/generator/templates/main@generator.mps b/samples/mpscore/languages/jetbrains.mps.lang.coderulesExt/generator/templates/main@generator.mps
similarity index 100%
rename from samples/mpscore/languages/generator/templates/main@generator.mps
rename to samples/mpscore/languages/jetbrains.mps.lang.coderulesExt/generator/templates/main@generator.mps
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.coderulesExt.mpl b/samples/mpscore/languages/jetbrains.mps.lang.coderulesExt/jetbrains.mps.lang.coderulesExt.mpl
similarity index 100%
rename from samples/mpscore/languages/jetbrains.mps.lang.coderulesExt.mpl
rename to samples/mpscore/languages/jetbrains.mps.lang.coderulesExt/jetbrains.mps.lang.coderulesExt.mpl
diff --git a/samples/mpscore/languages/models/jetbrains.mps.lang.coderulesExt.behavior.mps b/samples/mpscore/languages/jetbrains.mps.lang.coderulesExt/models/jetbrains.mps.lang.coderulesExt.behavior.mps
similarity index 100%
rename from samples/mpscore/languages/models/jetbrains.mps.lang.coderulesExt.behavior.mps
rename to samples/mpscore/languages/jetbrains.mps.lang.coderulesExt/models/jetbrains.mps.lang.coderulesExt.behavior.mps
diff --git a/samples/mpscore/languages/models/jetbrains.mps.lang.coderulesExt.constraints.mps b/samples/mpscore/languages/jetbrains.mps.lang.coderulesExt/models/jetbrains.mps.lang.coderulesExt.constraints.mps
similarity index 100%
rename from samples/mpscore/languages/models/jetbrains.mps.lang.coderulesExt.constraints.mps
rename to samples/mpscore/languages/jetbrains.mps.lang.coderulesExt/models/jetbrains.mps.lang.coderulesExt.constraints.mps
diff --git a/samples/mpscore/languages/models/jetbrains.mps.lang.coderulesExt.editor.mps b/samples/mpscore/languages/jetbrains.mps.lang.coderulesExt/models/jetbrains.mps.lang.coderulesExt.editor.mps
similarity index 100%
rename from samples/mpscore/languages/models/jetbrains.mps.lang.coderulesExt.editor.mps
rename to samples/mpscore/languages/jetbrains.mps.lang.coderulesExt/models/jetbrains.mps.lang.coderulesExt.editor.mps
diff --git a/samples/mpscore/languages/models/jetbrains.mps.lang.coderulesExt.structure.mps b/samples/mpscore/languages/jetbrains.mps.lang.coderulesExt/models/jetbrains.mps.lang.coderulesExt.structure.mps
similarity index 100%
rename from samples/mpscore/languages/models/jetbrains.mps.lang.coderulesExt.structure.mps
rename to samples/mpscore/languages/jetbrains.mps.lang.coderulesExt/models/jetbrains.mps.lang.coderulesExt.structure.mps
diff --git a/samples/mpscore/languages/models/jetbrains.mps.lang.coderulesExt.types.mps b/samples/mpscore/languages/jetbrains.mps.lang.coderulesExt/models/jetbrains.mps.lang.coderulesExt.types.mps
similarity index 100%
rename from samples/mpscore/languages/models/jetbrains.mps.lang.coderulesExt.types.mps
rename to samples/mpscore/languages/jetbrains.mps.lang.coderulesExt/models/jetbrains.mps.lang.coderulesExt.types.mps
diff --git a/samples/mpscore/languages/models/jetbrains.mps.lang.coderulesExt.typesystem.mps b/samples/mpscore/languages/jetbrains.mps.lang.coderulesExt/models/jetbrains.mps.lang.coderulesExt.typesystem.mps
similarity index 100%
rename from samples/mpscore/languages/models/jetbrains.mps.lang.coderulesExt.typesystem.mps
rename to samples/mpscore/languages/jetbrains.mps.lang.coderulesExt/models/jetbrains.mps.lang.coderulesExt.typesystem.mps