diff --git a/.mps/modules.xml b/.mps/modules.xml
index 442590e4..3e7ebe31 100644
--- a/.mps/modules.xml
+++ b/.mps/modules.xml
@@ -26,13 +26,13 @@
       <modulePath path="$PROJECT_DIR$/coderules/solutions/jetbrains.mps.typechecking.testlang.sandbox/jetbrains.mps.typechecking.testlang.sandbox.msd" folder="typechecking.test" />
       <modulePath path="$PROJECT_DIR$/coderules/solutions/jetbrains.mps.typechecking.ui/jetbrains.mps.typechecking.ui.msd" folder="typechecking.ui" />
       <modulePath path="$PROJECT_DIR$/coderules/solutions/jetbrains.mps.typechecking/jetbrains.mps.typechecking.msd" folder="typechecking.service" />
-      <modulePath path="$PROJECT_DIR$/samples/fitch/languages/jetbrains.mps.fitch/jetbrains.mps.fitch.mpl" folder="samples.fitch" />
-      <modulePath path="$PROJECT_DIR$/samples/fitch/languages/jetbrains.mps.logic.firstOrder/jetbrains.mps.logic.firstOrder.mpl" folder="samples.fitch" />
-      <modulePath path="$PROJECT_DIR$/samples/fitch/languages/jetbrains.mps.logic.herbrand/jetbrains.mps.logic.herbrand.mpl" folder="samples.fitch" />
-      <modulePath path="$PROJECT_DIR$/samples/fitch/languages/jetbrains.mps.logic.propositional/jetbrains.mps.logic.propositional.mpl" folder="samples.fitch" />
-      <modulePath path="$PROJECT_DIR$/samples/fitch/solutions/jetbrains.mps.fitch.build/jetbrains.mps.fitch.build.msd" folder="samples.fitch" />
-      <modulePath path="$PROJECT_DIR$/samples/fitch/solutions/jetbrains.mps.fitch.demo/jetbrains.mps.fitch.demo.msd" folder="samples.fitch" />
-      <modulePath path="$PROJECT_DIR$/samples/lambdacalc/languages/samples.lambdacalc/samples.lambdacalc.mpl" folder="" />
+      <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" />
+      <modulePath path="$PROJECT_DIR$/samples/fitch/languages/samples.fitch/samples.fitch.mpl" folder="samples.fitch" />
+      <modulePath path="$PROJECT_DIR$/samples/fitch/solutions/samples.fitch.build/samples.fitch.build.msd" folder="samples.fitch" />
+      <modulePath path="$PROJECT_DIR$/samples/fitch/solutions/samples.fitch.demo/samples.fitch.demo.msd" folder="samples.fitch" />
+      <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.baseLanguageExt/jetbrains.mps.baseLanguageExt.mpl" folder="samples.mpscore" />
diff --git a/samples/fitch/.mps/modules.xml b/samples/fitch/.mps/modules.xml
index 5cbed267..f9c03ad0 100644
--- a/samples/fitch/.mps/modules.xml
+++ b/samples/fitch/.mps/modules.xml
@@ -2,12 +2,12 @@
 <project version="4">
   <component name="MPSProject">
     <projectModules>
-      <modulePath path="$PROJECT_DIR$/languages/jetbrains.mps.fitch/jetbrains.mps.fitch.mpl" folder="" />
-      <modulePath path="$PROJECT_DIR$/solutions/jetbrains.mps.fitch.demo/jetbrains.mps.fitch.demo.msd" folder="" />
-      <modulePath path="$PROJECT_DIR$/languages/jetbrains.mps.logic.firstOrder/jetbrains.mps.logic.firstOrder.mpl" folder="" />
-      <modulePath path="$PROJECT_DIR$/languages/jetbrains.mps.logic.herbrand/jetbrains.mps.logic.herbrand.mpl" folder="" />
-      <modulePath path="$PROJECT_DIR$/languages/jetbrains.mps.logic.propositional/jetbrains.mps.logic.propositional.mpl" folder="" />
-      <modulePath path="$PROJECT_DIR$/solutions/jetbrains.mps.fitch.build/jetbrains.mps.fitch.build.msd" folder="" />
+      <modulePath path="$PROJECT_DIR$/languages/samples.fitch.firstOrderLogic/samples.fitch.firstOrderLogic.mpl" folder="" />
+      <modulePath path="$PROJECT_DIR$/languages/samples.fitch.herbrandLogic/samples.fitch.herbrandLogic.mpl" folder="" />
+      <modulePath path="$PROJECT_DIR$/languages/samples.fitch.propositionalLogic/samples.fitch.propositionalLogic.mpl" folder="" />
+      <modulePath path="$PROJECT_DIR$/languages/samples.fitch/samples.fitch.mpl" folder="" />
+      <modulePath path="$PROJECT_DIR$/solutions/samples.fitch.build/samples.fitch.build.msd" folder="" />
+      <modulePath path="$PROJECT_DIR$/solutions/samples.fitch.demo/samples.fitch.demo.msd" folder="" />
     </projectModules>
   </component>
-</project>
+</project>
\ No newline at end of file
diff --git a/samples/fitch/build.xml b/samples/fitch/build.xml
index 04ac6dee..1ee0c567 100644
--- a/samples/fitch/build.xml
+++ b/samples/fitch/build.xml
@@ -137,13 +137,13 @@
       <library file="${artifacts.mps}/plugins/mps-core/languages/languageDesign/jetbrains.mps.lang.editor.table.runtime.jar" />
       <library file="${artifacts.mps}/plugins/mps-core/languages/languageDesign/jetbrains.mps.lang.migration.util.jar" />
       <chunk>
-        <module file="${basedir}/languages/jetbrains.mps.fitch/jetbrains.mps.fitch.mpl" />
-        <module file="${basedir}/languages/jetbrains.mps.logic.firstOrder/jetbrains.mps.logic.firstOrder.mpl" />
-        <module file="${basedir}/languages/jetbrains.mps.logic.herbrand/jetbrains.mps.logic.herbrand.mpl" />
-        <module file="${basedir}/languages/jetbrains.mps.logic.propositional/jetbrains.mps.logic.propositional.mpl" />
+        <module file="${basedir}/languages/samples.fitch/samples.fitch.mpl" />
+        <module file="${basedir}/languages/samples.fitch.firstOrderLogic/samples.fitch.firstOrderLogic.mpl" />
+        <module file="${basedir}/languages/samples.fitch.herbrandLogic/samples.fitch.herbrandLogic.mpl" />
+        <module file="${basedir}/languages/samples.fitch.propositionalLogic/samples.fitch.propositionalLogic.mpl" />
       </chunk>
       <chunk>
-        <module file="${basedir}/solutions/jetbrains.mps.fitch.demo/jetbrains.mps.fitch.demo.msd" />
+        <module file="${basedir}/solutions/samples.fitch.demo/samples.fitch.demo.msd" />
       </chunk>
       <jvmargs>
         <arg value="-Xmx512m" />
@@ -159,7 +159,7 @@
   
   <target name="makeDependents" />
   
-  <target name="compileJava" depends="java.compile.jetbrains.mps.fitch, java.compile.jetbrains.mps.fitch#4322786184247805322, java.compile.jetbrains.mps.logic.propositional, java.compile.jetbrains.mps.logic.propositional#5505606474790531941, java.compile.jetbrains.mps.logic.herbrand, java.compile.jetbrains.mps.logic.herbrand#3059457401298723545, java.compile.jetbrains.mps.logic.firstOrder, java.compile.jetbrains.mps.logic.firstOrder#4035326440039985569, java.compile.jetbrains.mps.fitch.demo" />
+  <target name="compileJava" depends="java.compile.samples.fitch, java.compile.samples.fitch#4322786184247805322, java.compile.samples.fitch.propositionalLogic, java.compile.samples.fitch.propositionalLogic#5505606474790531941, java.compile.samples.fitch.herbrandLogic, java.compile.samples.fitch.herbrandLogic#3059457401298723545, java.compile.samples.fitch.firstOrderLogic, java.compile.samples.fitch.firstOrderLogic#4035326440039985569, java.compile.samples.fitch.demo" />
   
   <target name="processResources" />
   
@@ -169,13 +169,13 @@
   
   <target name="check" depends="test" />
   
-  <target name="java.compile.jetbrains.mps.fitch" depends="fetchDependencies">
-    <mkdir dir="${basedir}/languages/jetbrains.mps.fitch/source_gen" />
-    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.fitch" />
-    <javac destdir="${build.tmp}/java/out/jetbrains.mps.fitch" fork="true" encoding="utf8" includeantruntime="false" debug="true">
+  <target name="java.compile.samples.fitch" depends="fetchDependencies">
+    <mkdir dir="${basedir}/languages/samples.fitch/source_gen" />
+    <mkdir dir="${build.tmp}/java/out/samples.fitch" />
+    <javac destdir="${build.tmp}/java/out/samples.fitch" fork="true" encoding="utf8" includeantruntime="false" debug="true">
       <compilerarg value="-Xlint:none" />
       <src>
-        <path location="${basedir}/languages/jetbrains.mps.fitch/source_gen" />
+        <path location="${basedir}/languages/samples.fitch/source_gen" />
       </src>
       <classpath>
         <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
@@ -225,13 +225,13 @@
     </javac>
   </target>
   
-  <target name="java.compile.jetbrains.mps.fitch#4322786184247805322" depends="java.compile.jetbrains.mps.fitch, fetchDependencies">
-    <mkdir dir="${basedir}/languages/jetbrains.mps.fitch/generator/source_gen" />
-    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.fitch#4322786184247805322" />
-    <javac destdir="${build.tmp}/java/out/jetbrains.mps.fitch#4322786184247805322" fork="true" encoding="utf8" includeantruntime="false" debug="true">
+  <target name="java.compile.samples.fitch#4322786184247805322" depends="java.compile.samples.fitch, fetchDependencies">
+    <mkdir dir="${basedir}/languages/samples.fitch/generator/source_gen" />
+    <mkdir dir="${build.tmp}/java/out/samples.fitch#4322786184247805322" />
+    <javac destdir="${build.tmp}/java/out/samples.fitch#4322786184247805322" fork="true" encoding="utf8" includeantruntime="false" debug="true">
       <compilerarg value="-Xlint:none" />
       <src>
-        <path location="${basedir}/languages/jetbrains.mps.fitch/generator/source_gen" />
+        <path location="${basedir}/languages/samples.fitch/generator/source_gen" />
       </src>
       <classpath>
         <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
@@ -250,7 +250,7 @@
         <fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
         <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.fitch" />
+        <pathelement path="${build.tmp}/java/out/samples.fitch" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
@@ -263,13 +263,13 @@
     </javac>
   </target>
   
-  <target name="java.compile.jetbrains.mps.logic.propositional" depends="java.compile.jetbrains.mps.fitch, fetchDependencies">
-    <mkdir dir="${basedir}/languages/jetbrains.mps.logic.propositional/source_gen" />
-    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.logic.propositional" />
-    <javac destdir="${build.tmp}/java/out/jetbrains.mps.logic.propositional" fork="true" encoding="utf8" includeantruntime="false" debug="true">
+  <target name="java.compile.samples.fitch.propositionalLogic" depends="java.compile.samples.fitch, fetchDependencies">
+    <mkdir dir="${basedir}/languages/samples.fitch.propositionalLogic/source_gen" />
+    <mkdir dir="${build.tmp}/java/out/samples.fitch.propositionalLogic" />
+    <javac destdir="${build.tmp}/java/out/samples.fitch.propositionalLogic" fork="true" encoding="utf8" includeantruntime="false" debug="true">
       <compilerarg value="-Xlint:none" />
       <src>
-        <path location="${basedir}/languages/jetbrains.mps.logic.propositional/source_gen" />
+        <path location="${basedir}/languages/samples.fitch.propositionalLogic/source_gen" />
       </src>
       <classpath>
         <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
@@ -288,7 +288,7 @@
         <fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
         <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.fitch" />
+        <pathelement path="${build.tmp}/java/out/samples.fitch" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
@@ -317,13 +317,13 @@
     </javac>
   </target>
   
-  <target name="java.compile.jetbrains.mps.logic.propositional#5505606474790531941" depends="java.compile.jetbrains.mps.fitch, java.compile.jetbrains.mps.logic.propositional, fetchDependencies">
-    <mkdir dir="${basedir}/languages/jetbrains.mps.logic.propositional/generator/source_gen" />
-    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.logic.propositional#5505606474790531941" />
-    <javac destdir="${build.tmp}/java/out/jetbrains.mps.logic.propositional#5505606474790531941" fork="true" encoding="utf8" includeantruntime="false" debug="true">
+  <target name="java.compile.samples.fitch.propositionalLogic#5505606474790531941" depends="java.compile.samples.fitch, java.compile.samples.fitch.propositionalLogic, fetchDependencies">
+    <mkdir dir="${basedir}/languages/samples.fitch.propositionalLogic/generator/source_gen" />
+    <mkdir dir="${build.tmp}/java/out/samples.fitch.propositionalLogic#5505606474790531941" />
+    <javac destdir="${build.tmp}/java/out/samples.fitch.propositionalLogic#5505606474790531941" fork="true" encoding="utf8" includeantruntime="false" debug="true">
       <compilerarg value="-Xlint:none" />
       <src>
-        <path location="${basedir}/languages/jetbrains.mps.logic.propositional/generator/source_gen" />
+        <path location="${basedir}/languages/samples.fitch.propositionalLogic/generator/source_gen" />
       </src>
       <classpath>
         <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
@@ -342,8 +342,8 @@
         <fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
         <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.fitch" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.propositional" />
+        <pathelement path="${build.tmp}/java/out/samples.fitch" />
+        <pathelement path="${build.tmp}/java/out/samples.fitch.propositionalLogic" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
@@ -356,13 +356,13 @@
     </javac>
   </target>
   
-  <target name="java.compile.jetbrains.mps.logic.herbrand" depends="java.compile.jetbrains.mps.fitch, java.compile.jetbrains.mps.logic.propositional, fetchDependencies">
-    <mkdir dir="${basedir}/languages/jetbrains.mps.logic.herbrand/source_gen" />
-    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.logic.herbrand" />
-    <javac destdir="${build.tmp}/java/out/jetbrains.mps.logic.herbrand" fork="true" encoding="utf8" includeantruntime="false" debug="true">
+  <target name="java.compile.samples.fitch.herbrandLogic" depends="java.compile.samples.fitch, java.compile.samples.fitch.propositionalLogic, fetchDependencies">
+    <mkdir dir="${basedir}/languages/samples.fitch.herbrandLogic/source_gen" />
+    <mkdir dir="${build.tmp}/java/out/samples.fitch.herbrandLogic" />
+    <javac destdir="${build.tmp}/java/out/samples.fitch.herbrandLogic" fork="true" encoding="utf8" includeantruntime="false" debug="true">
       <compilerarg value="-Xlint:none" />
       <src>
-        <path location="${basedir}/languages/jetbrains.mps.logic.herbrand/source_gen" />
+        <path location="${basedir}/languages/samples.fitch.herbrandLogic/source_gen" />
       </src>
       <classpath>
         <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
@@ -381,8 +381,8 @@
         <fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
         <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.fitch" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.propositional" />
+        <pathelement path="${build.tmp}/java/out/samples.fitch" />
+        <pathelement path="${build.tmp}/java/out/samples.fitch.propositionalLogic" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
@@ -411,13 +411,13 @@
     </javac>
   </target>
   
-  <target name="java.compile.jetbrains.mps.logic.herbrand#3059457401298723545" depends="java.compile.jetbrains.mps.fitch, java.compile.jetbrains.mps.logic.herbrand, java.compile.jetbrains.mps.logic.propositional, fetchDependencies">
-    <mkdir dir="${basedir}/languages/jetbrains.mps.logic.herbrand/generator/source_gen" />
-    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.logic.herbrand#3059457401298723545" />
-    <javac destdir="${build.tmp}/java/out/jetbrains.mps.logic.herbrand#3059457401298723545" fork="true" encoding="utf8" includeantruntime="false" debug="true">
+  <target name="java.compile.samples.fitch.herbrandLogic#3059457401298723545" depends="java.compile.samples.fitch, java.compile.samples.fitch.herbrandLogic, java.compile.samples.fitch.propositionalLogic, fetchDependencies">
+    <mkdir dir="${basedir}/languages/samples.fitch.herbrandLogic/generator/source_gen" />
+    <mkdir dir="${build.tmp}/java/out/samples.fitch.herbrandLogic#3059457401298723545" />
+    <javac destdir="${build.tmp}/java/out/samples.fitch.herbrandLogic#3059457401298723545" fork="true" encoding="utf8" includeantruntime="false" debug="true">
       <compilerarg value="-Xlint:none" />
       <src>
-        <path location="${basedir}/languages/jetbrains.mps.logic.herbrand/generator/source_gen" />
+        <path location="${basedir}/languages/samples.fitch.herbrandLogic/generator/source_gen" />
       </src>
       <classpath>
         <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
@@ -436,9 +436,9 @@
         <fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
         <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.fitch" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.herbrand" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.propositional" />
+        <pathelement path="${build.tmp}/java/out/samples.fitch" />
+        <pathelement path="${build.tmp}/java/out/samples.fitch.herbrandLogic" />
+        <pathelement path="${build.tmp}/java/out/samples.fitch.propositionalLogic" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
@@ -451,13 +451,13 @@
     </javac>
   </target>
   
-  <target name="java.compile.jetbrains.mps.logic.firstOrder" depends="java.compile.jetbrains.mps.fitch, java.compile.jetbrains.mps.logic.herbrand, java.compile.jetbrains.mps.logic.propositional, fetchDependencies">
-    <mkdir dir="${basedir}/languages/jetbrains.mps.logic.firstOrder/source_gen" />
-    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.logic.firstOrder" />
-    <javac destdir="${build.tmp}/java/out/jetbrains.mps.logic.firstOrder" fork="true" encoding="utf8" includeantruntime="false" debug="true">
+  <target name="java.compile.samples.fitch.firstOrderLogic" depends="java.compile.samples.fitch, java.compile.samples.fitch.herbrandLogic, java.compile.samples.fitch.propositionalLogic, fetchDependencies">
+    <mkdir dir="${basedir}/languages/samples.fitch.firstOrderLogic/source_gen" />
+    <mkdir dir="${build.tmp}/java/out/samples.fitch.firstOrderLogic" />
+    <javac destdir="${build.tmp}/java/out/samples.fitch.firstOrderLogic" fork="true" encoding="utf8" includeantruntime="false" debug="true">
       <compilerarg value="-Xlint:none" />
       <src>
-        <path location="${basedir}/languages/jetbrains.mps.logic.firstOrder/source_gen" />
+        <path location="${basedir}/languages/samples.fitch.firstOrderLogic/source_gen" />
       </src>
       <classpath>
         <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
@@ -476,9 +476,9 @@
         <fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
         <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.fitch" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.herbrand" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.propositional" />
+        <pathelement path="${build.tmp}/java/out/samples.fitch" />
+        <pathelement path="${build.tmp}/java/out/samples.fitch.herbrandLogic" />
+        <pathelement path="${build.tmp}/java/out/samples.fitch.propositionalLogic" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
@@ -502,13 +502,13 @@
     </javac>
   </target>
   
-  <target name="java.compile.jetbrains.mps.logic.firstOrder#4035326440039985569" depends="java.compile.jetbrains.mps.fitch, java.compile.jetbrains.mps.logic.firstOrder, java.compile.jetbrains.mps.logic.herbrand, java.compile.jetbrains.mps.logic.propositional, fetchDependencies">
-    <mkdir dir="${basedir}/languages/jetbrains.mps.logic.firstOrder/generator/source_gen" />
-    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.logic.firstOrder#4035326440039985569" />
-    <javac destdir="${build.tmp}/java/out/jetbrains.mps.logic.firstOrder#4035326440039985569" fork="true" encoding="utf8" includeantruntime="false" debug="true">
+  <target name="java.compile.samples.fitch.firstOrderLogic#4035326440039985569" depends="java.compile.samples.fitch, java.compile.samples.fitch.firstOrderLogic, java.compile.samples.fitch.herbrandLogic, java.compile.samples.fitch.propositionalLogic, fetchDependencies">
+    <mkdir dir="${basedir}/languages/samples.fitch.firstOrderLogic/generator/source_gen" />
+    <mkdir dir="${build.tmp}/java/out/samples.fitch.firstOrderLogic#4035326440039985569" />
+    <javac destdir="${build.tmp}/java/out/samples.fitch.firstOrderLogic#4035326440039985569" fork="true" encoding="utf8" includeantruntime="false" debug="true">
       <compilerarg value="-Xlint:none" />
       <src>
-        <path location="${basedir}/languages/jetbrains.mps.logic.firstOrder/generator/source_gen" />
+        <path location="${basedir}/languages/samples.fitch.firstOrderLogic/generator/source_gen" />
       </src>
       <classpath>
         <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
@@ -527,10 +527,10 @@
         <fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
         <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.fitch" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.firstOrder" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.herbrand" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.propositional" />
+        <pathelement path="${build.tmp}/java/out/samples.fitch" />
+        <pathelement path="${build.tmp}/java/out/samples.fitch.firstOrderLogic" />
+        <pathelement path="${build.tmp}/java/out/samples.fitch.herbrandLogic" />
+        <pathelement path="${build.tmp}/java/out/samples.fitch.propositionalLogic" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
@@ -543,27 +543,27 @@
     </javac>
   </target>
   
-  <target name="java.compile.jetbrains.mps.fitch.demo">
-    <mkdir dir="${basedir}/solutions/jetbrains.mps.fitch.demo/source_gen" />
-    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.fitch.demo" />
-    <javac destdir="${build.tmp}/java/out/jetbrains.mps.fitch.demo" fork="true" encoding="utf8" includeantruntime="false" debug="true">
+  <target name="java.compile.samples.fitch.demo">
+    <mkdir dir="${basedir}/solutions/samples.fitch.demo/source_gen" />
+    <mkdir dir="${build.tmp}/java/out/samples.fitch.demo" />
+    <javac destdir="${build.tmp}/java/out/samples.fitch.demo" fork="true" encoding="utf8" includeantruntime="false" debug="true">
       <compilerarg value="-Xlint:none" />
       <src>
-        <path location="${basedir}/solutions/jetbrains.mps.fitch.demo/source_gen" />
+        <path location="${basedir}/solutions/samples.fitch.demo/source_gen" />
       </src>
       <classpath />
     </javac>
   </target>
   
   <target name="cleanSources">
-    <delete dir="${basedir}/languages/jetbrains.mps.fitch/source_gen" />
-    <delete dir="${basedir}/languages/jetbrains.mps.fitch/generator/source_gen" />
-    <delete dir="${basedir}/languages/jetbrains.mps.logic.firstOrder/source_gen" />
-    <delete dir="${basedir}/languages/jetbrains.mps.logic.firstOrder/generator/source_gen" />
-    <delete dir="${basedir}/languages/jetbrains.mps.logic.herbrand/source_gen" />
-    <delete dir="${basedir}/languages/jetbrains.mps.logic.herbrand/generator/source_gen" />
-    <delete dir="${basedir}/languages/jetbrains.mps.logic.propositional/source_gen" />
-    <delete dir="${basedir}/languages/jetbrains.mps.logic.propositional/generator/source_gen" />
-    <delete dir="${basedir}/solutions/jetbrains.mps.fitch.demo/source_gen" />
+    <delete dir="${basedir}/languages/samples.fitch/source_gen" />
+    <delete dir="${basedir}/languages/samples.fitch/generator/source_gen" />
+    <delete dir="${basedir}/languages/samples.fitch.firstOrderLogic/source_gen" />
+    <delete dir="${basedir}/languages/samples.fitch.firstOrderLogic/generator/source_gen" />
+    <delete dir="${basedir}/languages/samples.fitch.herbrandLogic/source_gen" />
+    <delete dir="${basedir}/languages/samples.fitch.herbrandLogic/generator/source_gen" />
+    <delete dir="${basedir}/languages/samples.fitch.propositionalLogic/source_gen" />
+    <delete dir="${basedir}/languages/samples.fitch.propositionalLogic/generator/source_gen" />
+    <delete dir="${basedir}/solutions/samples.fitch.demo/source_gen" />
   </target>
 </project>
\ No newline at end of file
diff --git a/samples/fitch/languages/jetbrains.mps.logic.firstOrder/generator/template/main@generator.mps b/samples/fitch/languages/samples.fitch.firstOrderLogic/generator/template/main@generator.mps
similarity index 95%
rename from samples/fitch/languages/jetbrains.mps.logic.firstOrder/generator/template/main@generator.mps
rename to samples/fitch/languages/samples.fitch.firstOrderLogic/generator/template/main@generator.mps
index a69ccf5e..0d0183c8 100644
--- a/samples/fitch/languages/jetbrains.mps.logic.firstOrder/generator/template/main@generator.mps
+++ b/samples/fitch/languages/samples.fitch.firstOrderLogic/generator/template/main@generator.mps
@@ -5,7 +5,7 @@
     <devkit ref="a2eb3a43-fcc2-4200-80dc-c60110c4862d(jetbrains.mps.devkit.templates)" />
   </languages>
   <imports>
-    <import index="yhz9" ref="r:72b177ed-1924-4265-b8f3-64e062fd2eed(jetbrains.mps.logic.firstOrder.structure)" />
+    <import index="yhz9" ref="r:72b177ed-1924-4265-b8f3-64e062fd2eed(samples.fitch.firstOrderLogic.structure)" />
   </imports>
   <registry>
     <language id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator">
diff --git a/samples/fitch/languages/jetbrains.mps.logic.firstOrder/models/behavior.mps b/samples/fitch/languages/samples.fitch.firstOrderLogic/models/behavior.mps
similarity index 96%
rename from samples/fitch/languages/jetbrains.mps.logic.firstOrder/models/behavior.mps
rename to samples/fitch/languages/samples.fitch.firstOrderLogic/models/behavior.mps
index 1c471b2f..bfb58f08 100644
--- a/samples/fitch/languages/jetbrains.mps.logic.firstOrder/models/behavior.mps
+++ b/samples/fitch/languages/samples.fitch.firstOrderLogic/models/behavior.mps
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:5d88021c-0122-408d-879e-5eeb0f2cedcc(jetbrains.mps.logic.firstOrder.behavior)">
+<model ref="r:5d88021c-0122-408d-879e-5eeb0f2cedcc(samples.fitch.firstOrderLogic.behavior)">
   <persistence version="9" />
   <languages>
     <use id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior" version="1" />
     <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
   </languages>
   <imports>
-    <import index="qd7f" ref="r:6e0181fc-40ea-4aea-a8b0-3ba2d104ddef(jetbrains.mps.fitch.behavior)" />
-    <import index="yhz9" ref="r:72b177ed-1924-4265-b8f3-64e062fd2eed(jetbrains.mps.logic.firstOrder.structure)" implicit="true" />
-    <import index="27wh" ref="r:459ba7ac-2a61-40fc-bcc4-f13a7956cbeb(jetbrains.mps.logic.propositional.structure)" implicit="true" />
-    <import index="bw37" ref="r:faa478da-573c-4c9e-99e4-b87297289505(jetbrains.mps.logic.herbrand.structure)" implicit="true" />
+    <import index="qd7f" ref="r:6e0181fc-40ea-4aea-a8b0-3ba2d104ddef(samples.fitch.behavior)" />
+    <import index="yhz9" ref="r:72b177ed-1924-4265-b8f3-64e062fd2eed(samples.fitch.firstOrderLogic.structure)" implicit="true" />
+    <import index="27wh" ref="r:459ba7ac-2a61-40fc-bcc4-f13a7956cbeb(samples.fitch.propositionalLogic.structure)" implicit="true" />
+    <import index="bw37" ref="r:faa478da-573c-4c9e-99e4-b87297289505(samples.fitch.herbrandLogic.structure)" implicit="true" />
   </imports>
   <registry>
     <language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior">
diff --git a/samples/fitch/languages/jetbrains.mps.logic.firstOrder/models/constraints.mps b/samples/fitch/languages/samples.fitch.firstOrderLogic/models/constraints.mps
similarity index 77%
rename from samples/fitch/languages/jetbrains.mps.logic.firstOrder/models/constraints.mps
rename to samples/fitch/languages/samples.fitch.firstOrderLogic/models/constraints.mps
index bac185d2..3ff82d38 100644
--- a/samples/fitch/languages/jetbrains.mps.logic.firstOrder/models/constraints.mps
+++ b/samples/fitch/languages/samples.fitch.firstOrderLogic/models/constraints.mps
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:ca022d5c-fd0b-471c-8b4e-a0e11d3675f8(jetbrains.mps.logic.firstOrder.constraints)">
+<model ref="r:ca022d5c-fd0b-471c-8b4e-a0e11d3675f8(samples.fitch.firstOrderLogic.constraints)">
   <persistence version="9" />
   <languages>
     <use id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" name="jetbrains.mps.lang.constraints" version="4" />
diff --git a/samples/fitch/languages/jetbrains.mps.logic.firstOrder/models/editor.mps b/samples/fitch/languages/samples.fitch.firstOrderLogic/models/editor.mps
similarity index 98%
rename from samples/fitch/languages/jetbrains.mps.logic.firstOrder/models/editor.mps
rename to samples/fitch/languages/samples.fitch.firstOrderLogic/models/editor.mps
index 9a54f664..aeae6484 100644
--- a/samples/fitch/languages/jetbrains.mps.logic.firstOrder/models/editor.mps
+++ b/samples/fitch/languages/samples.fitch.firstOrderLogic/models/editor.mps
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:c18170ff-96aa-486a-aea5-01ae6cdbba3f(jetbrains.mps.logic.firstOrder.editor)">
+<model ref="r:c18170ff-96aa-486a-aea5-01ae6cdbba3f(samples.fitch.firstOrderLogic.editor)">
   <persistence version="9" />
   <languages>
     <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="11" />
@@ -7,10 +7,10 @@
   </languages>
   <imports>
     <import index="tpco" ref="r:00000000-0000-4000-0000-011c89590284(jetbrains.mps.lang.core.editor)" />
-    <import index="8v9h" ref="r:873e37f0-b045-47b9-ae9e-db79c2628975(jetbrains.mps.fitch.editor)" />
-    <import index="jfgh" ref="r:2003997c-f9a6-418f-99d4-03e1285a3e13(jetbrains.mps.fitch.structure)" />
-    <import index="bw37" ref="r:faa478da-573c-4c9e-99e4-b87297289505(jetbrains.mps.logic.herbrand.structure)" />
-    <import index="yhz9" ref="r:72b177ed-1924-4265-b8f3-64e062fd2eed(jetbrains.mps.logic.firstOrder.structure)" />
+    <import index="8v9h" ref="r:873e37f0-b045-47b9-ae9e-db79c2628975(samples.fitch.editor)" />
+    <import index="jfgh" ref="r:2003997c-f9a6-418f-99d4-03e1285a3e13(samples.fitch.structure)" />
+    <import index="bw37" ref="r:faa478da-573c-4c9e-99e4-b87297289505(samples.fitch.herbrandLogic.structure)" />
+    <import index="yhz9" ref="r:72b177ed-1924-4265-b8f3-64e062fd2eed(samples.fitch.firstOrderLogic.structure)" />
     <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/samples/fitch/languages/jetbrains.mps.logic.firstOrder/models/structure.mps b/samples/fitch/languages/samples.fitch.firstOrderLogic/models/structure.mps
similarity index 97%
rename from samples/fitch/languages/jetbrains.mps.logic.firstOrder/models/structure.mps
rename to samples/fitch/languages/samples.fitch.firstOrderLogic/models/structure.mps
index 658ebe2e..a315a75b 100644
--- a/samples/fitch/languages/jetbrains.mps.logic.firstOrder/models/structure.mps
+++ b/samples/fitch/languages/samples.fitch.firstOrderLogic/models/structure.mps
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:72b177ed-1924-4265-b8f3-64e062fd2eed(jetbrains.mps.logic.firstOrder.structure)">
+<model ref="r:72b177ed-1924-4265-b8f3-64e062fd2eed(samples.fitch.firstOrderLogic.structure)">
   <persistence version="9" />
   <languages>
     <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="6" />
     <devkit ref="78434eb8-b0e5-444b-850d-e7c4ad2da9ab(jetbrains.mps.devkit.aspect.structure)" />
   </languages>
   <imports>
-    <import index="jfgh" ref="r:2003997c-f9a6-418f-99d4-03e1285a3e13(jetbrains.mps.fitch.structure)" />
-    <import index="bw37" ref="r:faa478da-573c-4c9e-99e4-b87297289505(jetbrains.mps.logic.herbrand.structure)" />
+    <import index="jfgh" ref="r:2003997c-f9a6-418f-99d4-03e1285a3e13(samples.fitch.structure)" />
+    <import index="bw37" ref="r:faa478da-573c-4c9e-99e4-b87297289505(samples.fitch.herbrandLogic.structure)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
   </imports>
   <registry>
diff --git a/samples/fitch/languages/jetbrains.mps.logic.firstOrder/models/types.mps b/samples/fitch/languages/samples.fitch.firstOrderLogic/models/types.mps
similarity index 99%
rename from samples/fitch/languages/jetbrains.mps.logic.firstOrder/models/types.mps
rename to samples/fitch/languages/samples.fitch.firstOrderLogic/models/types.mps
index 07405f8c..c564da8d 100644
--- a/samples/fitch/languages/jetbrains.mps.logic.firstOrder/models/types.mps
+++ b/samples/fitch/languages/samples.fitch.firstOrderLogic/models/types.mps
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:a40f7100-fd07-4b1c-98c5-112d92c92128(jetbrains.mps.logic.firstOrder.types)">
+<model ref="r:a40f7100-fd07-4b1c-98c5-112d92c92128(samples.fitch.firstOrderLogic.types)">
   <persistence version="9" />
   <languages>
     <use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="14" />
@@ -7,13 +7,13 @@
     <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
   </languages>
   <imports>
-    <import index="6r1k" ref="r:30d249b0-c2b0-4934-8bd8-e1d7a37c3b3b(jetbrains.mps.logic.propositional.types)" />
-    <import index="f3ld" ref="r:30efdd3a-609b-4e7b-a8f2-60af62d5341f(jetbrains.mps.fitch.types)" />
+    <import index="6r1k" ref="r:30d249b0-c2b0-4934-8bd8-e1d7a37c3b3b(samples.fitch.propositionalLogic.types)" />
+    <import index="f3ld" ref="r:30efdd3a-609b-4e7b-a8f2-60af62d5341f(samples.fitch.types)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
-    <import index="yhz9" ref="r:72b177ed-1924-4265-b8f3-64e062fd2eed(jetbrains.mps.logic.firstOrder.structure)" />
-    <import index="jfgh" ref="r:2003997c-f9a6-418f-99d4-03e1285a3e13(jetbrains.mps.fitch.structure)" />
-    <import index="bw37" ref="r:faa478da-573c-4c9e-99e4-b87297289505(jetbrains.mps.logic.herbrand.structure)" />
-    <import index="fxy1" ref="r:2e585daf-c5c7-4735-a41f-b2044cd9b207(jetbrains.mps.logic.herbrand.types)" />
+    <import index="yhz9" ref="r:72b177ed-1924-4265-b8f3-64e062fd2eed(samples.fitch.firstOrderLogic.structure)" />
+    <import index="jfgh" ref="r:2003997c-f9a6-418f-99d4-03e1285a3e13(samples.fitch.structure)" />
+    <import index="bw37" ref="r:faa478da-573c-4c9e-99e4-b87297289505(samples.fitch.herbrandLogic.structure)" />
+    <import index="fxy1" ref="r:2e585daf-c5c7-4735-a41f-b2044cd9b207(samples.fitch.herbrandLogic.types)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
diff --git a/samples/fitch/languages/jetbrains.mps.logic.firstOrder/models/typesystem.mps b/samples/fitch/languages/samples.fitch.firstOrderLogic/models/typesystem.mps
similarity index 77%
rename from samples/fitch/languages/jetbrains.mps.logic.firstOrder/models/typesystem.mps
rename to samples/fitch/languages/samples.fitch.firstOrderLogic/models/typesystem.mps
index fe35346f..835f3844 100644
--- a/samples/fitch/languages/jetbrains.mps.logic.firstOrder/models/typesystem.mps
+++ b/samples/fitch/languages/samples.fitch.firstOrderLogic/models/typesystem.mps
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:4c0e6503-314c-4f5e-9b48-78e8b9cc05ef(jetbrains.mps.logic.firstOrder.typesystem)">
+<model ref="r:4c0e6503-314c-4f5e-9b48-78e8b9cc05ef(samples.fitch.firstOrderLogic.typesystem)">
   <persistence version="9" />
   <languages>
     <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="1" />
diff --git a/samples/fitch/languages/jetbrains.mps.logic.firstOrder/jetbrains.mps.logic.firstOrder.mpl b/samples/fitch/languages/samples.fitch.firstOrderLogic/samples.fitch.firstOrderLogic.mpl
similarity index 87%
rename from samples/fitch/languages/jetbrains.mps.logic.firstOrder/jetbrains.mps.logic.firstOrder.mpl
rename to samples/fitch/languages/samples.fitch.firstOrderLogic/samples.fitch.firstOrderLogic.mpl
index d52c3d78..a7946c6b 100644
--- a/samples/fitch/languages/jetbrains.mps.logic.firstOrder/jetbrains.mps.logic.firstOrder.mpl
+++ b/samples/fitch/languages/samples.fitch.firstOrderLogic/samples.fitch.firstOrderLogic.mpl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<language namespace="jetbrains.mps.logic.firstOrder" uuid="ddb01c98-e78e-4c79-b11a-aeba193668d4" languageVersion="0" moduleVersion="0">
+<language namespace="samples.fitch.firstOrderLogic" uuid="ddb01c98-e78e-4c79-b11a-aeba193668d4" languageVersion="0" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -7,7 +7,7 @@
   </models>
   <accessoryModels />
   <generators>
-    <generator alias="main" namespace="jetbrains.mps.logic.firstOrder#4035326440039985569" uuid="467b3222-f5a8-48be-9fe1-6c009ed73049">
+    <generator alias="main" namespace="samples.fitch.firstOrderLogic#4035326440039985569" uuid="467b3222-f5a8-48be-9fe1-6c009ed73049">
       <models>
         <modelRoot contentPath="${module}/generator/template" type="default">
           <sourceRoot location="." />
@@ -37,12 +37,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="06b7c5c7-e359-4f4b-a581-5d0c9323af39(jetbrains.mps.fitch)" version="1" />
         <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
-        <module reference="ddb01c98-e78e-4c79-b11a-aeba193668d4(jetbrains.mps.logic.firstOrder)" version="0" />
-        <module reference="467b3222-f5a8-48be-9fe1-6c009ed73049(jetbrains.mps.logic.firstOrder#4035326440039985569)" version="0" />
-        <module reference="748b3ba1-2791-4ee8-b985-a5598baa7112(jetbrains.mps.logic.herbrand)" version="0" />
-        <module reference="ec79e64d-4cbb-4f6c-b7b7-108dd125aba6(jetbrains.mps.logic.propositional)" 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" />
+        <module reference="467b3222-f5a8-48be-9fe1-6c009ed73049(samples.fitch.firstOrderLogic#4035326440039985569)" version="0" />
+        <module reference="748b3ba1-2791-4ee8-b985-a5598baa7112(samples.fitch.herbrandLogic)" version="0" />
+        <module reference="ec79e64d-4cbb-4f6c-b7b7-108dd125aba6(samples.fitch.propositionalLogic)" version="0" />
       </dependencyVersions>
       <mapping-priorities />
     </generator>
@@ -50,7 +50,7 @@
   <sourcePath />
   <dependencies>
     <dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
-    <dependency reexport="false">ddb01c98-e78e-4c79-b11a-aeba193668d4(jetbrains.mps.logic.firstOrder)</dependency>
+    <dependency reexport="false">ddb01c98-e78e-4c79-b11a-aeba193668d4(samples.fitch.firstOrderLogic)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="6" />
@@ -96,16 +96,16 @@
     <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="06b7c5c7-e359-4f4b-a581-5d0c9323af39(jetbrains.mps.fitch)" version="1" />
     <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="ddb01c98-e78e-4c79-b11a-aeba193668d4(jetbrains.mps.logic.firstOrder)" version="0" />
-    <module reference="748b3ba1-2791-4ee8-b985-a5598baa7112(jetbrains.mps.logic.herbrand)" version="0" />
-    <module reference="ec79e64d-4cbb-4f6c-b7b7-108dd125aba6(jetbrains.mps.logic.propositional)" 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" />
+    <module reference="748b3ba1-2791-4ee8-b985-a5598baa7112(samples.fitch.herbrandLogic)" version="0" />
+    <module reference="ec79e64d-4cbb-4f6c-b7b7-108dd125aba6(samples.fitch.propositionalLogic)" version="0" />
   </dependencyVersions>
   <extendedLanguages>
-    <extendedLanguage>06b7c5c7-e359-4f4b-a581-5d0c9323af39(jetbrains.mps.fitch)</extendedLanguage>
-    <extendedLanguage>748b3ba1-2791-4ee8-b985-a5598baa7112(jetbrains.mps.logic.herbrand)</extendedLanguage>
+    <extendedLanguage>06b7c5c7-e359-4f4b-a581-5d0c9323af39(samples.fitch)</extendedLanguage>
+    <extendedLanguage>748b3ba1-2791-4ee8-b985-a5598baa7112(samples.fitch.herbrandLogic)</extendedLanguage>
   </extendedLanguages>
 </language>
 
diff --git a/samples/fitch/languages/jetbrains.mps.logic.herbrand/generator/template/main@generator.mps b/samples/fitch/languages/samples.fitch.herbrandLogic/generator/template/main@generator.mps
similarity index 95%
rename from samples/fitch/languages/jetbrains.mps.logic.herbrand/generator/template/main@generator.mps
rename to samples/fitch/languages/samples.fitch.herbrandLogic/generator/template/main@generator.mps
index fbc1cde1..db1b6111 100644
--- a/samples/fitch/languages/jetbrains.mps.logic.herbrand/generator/template/main@generator.mps
+++ b/samples/fitch/languages/samples.fitch.herbrandLogic/generator/template/main@generator.mps
@@ -5,7 +5,7 @@
     <devkit ref="a2eb3a43-fcc2-4200-80dc-c60110c4862d(jetbrains.mps.devkit.templates)" />
   </languages>
   <imports>
-    <import index="bw37" ref="r:faa478da-573c-4c9e-99e4-b87297289505(jetbrains.mps.logic.herbrand.structure)" />
+    <import index="bw37" ref="r:faa478da-573c-4c9e-99e4-b87297289505(samples.fitch.herbrandLogic.structure)" />
   </imports>
   <registry>
     <language id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator">
diff --git a/samples/fitch/languages/jetbrains.mps.logic.herbrand/models/behavior.mps b/samples/fitch/languages/samples.fitch.herbrandLogic/models/behavior.mps
similarity index 96%
rename from samples/fitch/languages/jetbrains.mps.logic.herbrand/models/behavior.mps
rename to samples/fitch/languages/samples.fitch.herbrandLogic/models/behavior.mps
index ffc7ce11..d27ff578 100644
--- a/samples/fitch/languages/jetbrains.mps.logic.herbrand/models/behavior.mps
+++ b/samples/fitch/languages/samples.fitch.herbrandLogic/models/behavior.mps
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:1d4d5e6e-9315-492b-a354-14fae7d93256(jetbrains.mps.logic.herbrand.behavior)">
+<model ref="r:1d4d5e6e-9315-492b-a354-14fae7d93256(samples.fitch.herbrandLogic.behavior)">
   <persistence version="9" />
   <languages>
     <use id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior" version="1" />
     <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
   </languages>
   <imports>
-    <import index="qd7f" ref="r:6e0181fc-40ea-4aea-a8b0-3ba2d104ddef(jetbrains.mps.fitch.behavior)" />
-    <import index="bw37" ref="r:faa478da-573c-4c9e-99e4-b87297289505(jetbrains.mps.logic.herbrand.structure)" implicit="true" />
-    <import index="27wh" ref="r:459ba7ac-2a61-40fc-bcc4-f13a7956cbeb(jetbrains.mps.logic.propositional.structure)" implicit="true" />
+    <import index="qd7f" ref="r:6e0181fc-40ea-4aea-a8b0-3ba2d104ddef(samples.fitch.behavior)" />
+    <import index="bw37" ref="r:faa478da-573c-4c9e-99e4-b87297289505(samples.fitch.herbrandLogic.structure)" implicit="true" />
+    <import index="27wh" ref="r:459ba7ac-2a61-40fc-bcc4-f13a7956cbeb(samples.fitch.propositionalLogic.structure)" implicit="true" />
   </imports>
   <registry>
     <language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior">
diff --git a/samples/fitch/languages/jetbrains.mps.logic.herbrand/models/constraints.mps b/samples/fitch/languages/samples.fitch.herbrandLogic/models/constraints.mps
similarity index 97%
rename from samples/fitch/languages/jetbrains.mps.logic.herbrand/models/constraints.mps
rename to samples/fitch/languages/samples.fitch.herbrandLogic/models/constraints.mps
index 4f43fa5c..3aab4aad 100644
--- a/samples/fitch/languages/jetbrains.mps.logic.herbrand/models/constraints.mps
+++ b/samples/fitch/languages/samples.fitch.herbrandLogic/models/constraints.mps
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:3df2afd9-204b-4bdf-91b7-9ed29c61dfb1(jetbrains.mps.logic.herbrand.constraints)">
+<model ref="r:3df2afd9-204b-4bdf-91b7-9ed29c61dfb1(samples.fitch.herbrandLogic.constraints)">
   <persistence version="9" />
   <languages>
     <use id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" name="jetbrains.mps.lang.constraints" version="4" />
@@ -8,10 +8,10 @@
   </languages>
   <imports>
     <import index="tpfp" ref="r:00000000-0000-4000-0000-011c89590519(jetbrains.mps.baseLanguage.regexp.jetbrains.mps.regexp.accessory)" />
-    <import index="bw37" ref="r:faa478da-573c-4c9e-99e4-b87297289505(jetbrains.mps.logic.herbrand.structure)" implicit="true" />
+    <import index="bw37" ref="r:faa478da-573c-4c9e-99e4-b87297289505(samples.fitch.herbrandLogic.structure)" implicit="true" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
-    <import index="jfgh" ref="r:2003997c-f9a6-418f-99d4-03e1285a3e13(jetbrains.mps.fitch.structure)" implicit="true" />
-    <import index="qd7f" ref="r:6e0181fc-40ea-4aea-a8b0-3ba2d104ddef(jetbrains.mps.fitch.behavior)" implicit="true" />
+    <import index="jfgh" ref="r:2003997c-f9a6-418f-99d4-03e1285a3e13(samples.fitch.structure)" implicit="true" />
+    <import index="qd7f" ref="r:6e0181fc-40ea-4aea-a8b0-3ba2d104ddef(samples.fitch.behavior)" implicit="true" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
diff --git a/samples/fitch/languages/jetbrains.mps.logic.herbrand/models/editor.mps b/samples/fitch/languages/samples.fitch.herbrandLogic/models/editor.mps
similarity index 99%
rename from samples/fitch/languages/jetbrains.mps.logic.herbrand/models/editor.mps
rename to samples/fitch/languages/samples.fitch.herbrandLogic/models/editor.mps
index ef163c5b..dbe6228d 100644
--- a/samples/fitch/languages/jetbrains.mps.logic.herbrand/models/editor.mps
+++ b/samples/fitch/languages/samples.fitch.herbrandLogic/models/editor.mps
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:0b1f15f7-167a-449c-aaf4-e2a3be522c90(jetbrains.mps.logic.herbrand.editor)">
+<model ref="r:0b1f15f7-167a-449c-aaf4-e2a3be522c90(samples.fitch.herbrandLogic.editor)">
   <persistence version="9" />
   <languages>
     <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="11" />
@@ -7,11 +7,11 @@
     <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
   </languages>
   <imports>
-    <import index="bw37" ref="r:faa478da-573c-4c9e-99e4-b87297289505(jetbrains.mps.logic.herbrand.structure)" />
-    <import index="27wh" ref="r:459ba7ac-2a61-40fc-bcc4-f13a7956cbeb(jetbrains.mps.logic.propositional.structure)" />
+    <import index="bw37" ref="r:faa478da-573c-4c9e-99e4-b87297289505(samples.fitch.herbrandLogic.structure)" />
+    <import index="27wh" ref="r:459ba7ac-2a61-40fc-bcc4-f13a7956cbeb(samples.fitch.propositionalLogic.structure)" />
     <import index="tpco" ref="r:00000000-0000-4000-0000-011c89590284(jetbrains.mps.lang.core.editor)" />
-    <import index="8v9h" ref="r:873e37f0-b045-47b9-ae9e-db79c2628975(jetbrains.mps.fitch.editor)" />
-    <import index="jfgh" ref="r:2003997c-f9a6-418f-99d4-03e1285a3e13(jetbrains.mps.fitch.structure)" />
+    <import index="8v9h" ref="r:873e37f0-b045-47b9-ae9e-db79c2628975(samples.fitch.editor)" />
+    <import index="jfgh" ref="r:2003997c-f9a6-418f-99d4-03e1285a3e13(samples.fitch.structure)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
     <import index="tpfp" ref="r:00000000-0000-4000-0000-011c89590519(jetbrains.mps.baseLanguage.regexp.jetbrains.mps.regexp.accessory)" implicit="true" />
   </imports>
diff --git a/samples/fitch/languages/jetbrains.mps.logic.herbrand/models/structure.mps b/samples/fitch/languages/samples.fitch.herbrandLogic/models/structure.mps
similarity index 98%
rename from samples/fitch/languages/jetbrains.mps.logic.herbrand/models/structure.mps
rename to samples/fitch/languages/samples.fitch.herbrandLogic/models/structure.mps
index 9d99f850..94a15227 100644
--- a/samples/fitch/languages/jetbrains.mps.logic.herbrand/models/structure.mps
+++ b/samples/fitch/languages/samples.fitch.herbrandLogic/models/structure.mps
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:faa478da-573c-4c9e-99e4-b87297289505(jetbrains.mps.logic.herbrand.structure)">
+<model ref="r:faa478da-573c-4c9e-99e4-b87297289505(samples.fitch.herbrandLogic.structure)">
   <persistence version="9" />
   <languages>
     <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="6" />
     <devkit ref="78434eb8-b0e5-444b-850d-e7c4ad2da9ab(jetbrains.mps.devkit.aspect.structure)" />
   </languages>
   <imports>
-    <import index="27wh" ref="r:459ba7ac-2a61-40fc-bcc4-f13a7956cbeb(jetbrains.mps.logic.propositional.structure)" />
-    <import index="jfgh" ref="r:2003997c-f9a6-418f-99d4-03e1285a3e13(jetbrains.mps.fitch.structure)" />
+    <import index="27wh" ref="r:459ba7ac-2a61-40fc-bcc4-f13a7956cbeb(samples.fitch.propositionalLogic.structure)" />
+    <import index="jfgh" ref="r:2003997c-f9a6-418f-99d4-03e1285a3e13(samples.fitch.structure)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
   </imports>
   <registry>
diff --git a/samples/fitch/languages/jetbrains.mps.logic.herbrand/models/types.mps b/samples/fitch/languages/samples.fitch.herbrandLogic/models/types.mps
similarity index 99%
rename from samples/fitch/languages/jetbrains.mps.logic.herbrand/models/types.mps
rename to samples/fitch/languages/samples.fitch.herbrandLogic/models/types.mps
index 78144cd4..d1384825 100644
--- a/samples/fitch/languages/jetbrains.mps.logic.herbrand/models/types.mps
+++ b/samples/fitch/languages/samples.fitch.herbrandLogic/models/types.mps
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:2e585daf-c5c7-4735-a41f-b2044cd9b207(jetbrains.mps.logic.herbrand.types)">
+<model ref="r:2e585daf-c5c7-4735-a41f-b2044cd9b207(samples.fitch.herbrandLogic.types)">
   <persistence version="9" />
   <languages>
     <use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="14" />
@@ -9,11 +9,11 @@
     <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
   </languages>
   <imports>
-    <import index="6r1k" ref="r:30d249b0-c2b0-4934-8bd8-e1d7a37c3b3b(jetbrains.mps.logic.propositional.types)" />
-    <import index="f3ld" ref="r:30efdd3a-609b-4e7b-a8f2-60af62d5341f(jetbrains.mps.fitch.types)" />
-    <import index="jfgh" ref="r:2003997c-f9a6-418f-99d4-03e1285a3e13(jetbrains.mps.fitch.structure)" />
-    <import index="bw37" ref="r:faa478da-573c-4c9e-99e4-b87297289505(jetbrains.mps.logic.herbrand.structure)" />
-    <import index="qd7f" ref="r:6e0181fc-40ea-4aea-a8b0-3ba2d104ddef(jetbrains.mps.fitch.behavior)" />
+    <import index="6r1k" ref="r:30d249b0-c2b0-4934-8bd8-e1d7a37c3b3b(samples.fitch.propositionalLogic.types)" />
+    <import index="f3ld" ref="r:30efdd3a-609b-4e7b-a8f2-60af62d5341f(samples.fitch.types)" />
+    <import index="jfgh" ref="r:2003997c-f9a6-418f-99d4-03e1285a3e13(samples.fitch.structure)" />
+    <import index="bw37" ref="r:faa478da-573c-4c9e-99e4-b87297289505(samples.fitch.herbrandLogic.structure)" />
+    <import index="qd7f" ref="r:6e0181fc-40ea-4aea-a8b0-3ba2d104ddef(samples.fitch.behavior)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
   </imports>
   <registry>
diff --git a/samples/fitch/languages/jetbrains.mps.logic.herbrand/models/typesystem.mps b/samples/fitch/languages/samples.fitch.herbrandLogic/models/typesystem.mps
similarity index 78%
rename from samples/fitch/languages/jetbrains.mps.logic.herbrand/models/typesystem.mps
rename to samples/fitch/languages/samples.fitch.herbrandLogic/models/typesystem.mps
index eca7fea4..1443dd1b 100644
--- a/samples/fitch/languages/jetbrains.mps.logic.herbrand/models/typesystem.mps
+++ b/samples/fitch/languages/samples.fitch.herbrandLogic/models/typesystem.mps
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:a131ff8b-2e4a-4043-b66f-532fa530a251(jetbrains.mps.logic.herbrand.typesystem)">
+<model ref="r:a131ff8b-2e4a-4043-b66f-532fa530a251(samples.fitch.herbrandLogic.typesystem)">
   <persistence version="9" />
   <languages>
     <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="1" />
diff --git a/samples/fitch/languages/jetbrains.mps.logic.herbrand/jetbrains.mps.logic.herbrand.mpl b/samples/fitch/languages/samples.fitch.herbrandLogic/samples.fitch.herbrandLogic.mpl
similarity index 89%
rename from samples/fitch/languages/jetbrains.mps.logic.herbrand/jetbrains.mps.logic.herbrand.mpl
rename to samples/fitch/languages/samples.fitch.herbrandLogic/samples.fitch.herbrandLogic.mpl
index a0a466a9..bcadfbe6 100644
--- a/samples/fitch/languages/jetbrains.mps.logic.herbrand/jetbrains.mps.logic.herbrand.mpl
+++ b/samples/fitch/languages/samples.fitch.herbrandLogic/samples.fitch.herbrandLogic.mpl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<language namespace="jetbrains.mps.logic.herbrand" uuid="748b3ba1-2791-4ee8-b985-a5598baa7112" languageVersion="0" moduleVersion="0">
+<language namespace="samples.fitch.herbrandLogic" uuid="748b3ba1-2791-4ee8-b985-a5598baa7112" languageVersion="0" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -7,7 +7,7 @@
   </models>
   <accessoryModels />
   <generators>
-    <generator alias="main" namespace="jetbrains.mps.logic.herbrand#3059457401298723545" uuid="8efed383-9c82-409e-81c8-4bd2a012c164">
+    <generator alias="main" namespace="samples.fitch.herbrandLogic#3059457401298723545" uuid="8efed383-9c82-409e-81c8-4bd2a012c164">
       <models>
         <modelRoot contentPath="${module}/generator/template" type="default">
           <sourceRoot location="." />
@@ -37,20 +37,20 @@
         <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="06b7c5c7-e359-4f4b-a581-5d0c9323af39(jetbrains.mps.fitch)" version="1" />
         <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
-        <module reference="748b3ba1-2791-4ee8-b985-a5598baa7112(jetbrains.mps.logic.herbrand)" version="0" />
-        <module reference="8efed383-9c82-409e-81c8-4bd2a012c164(jetbrains.mps.logic.herbrand#3059457401298723545)" version="0" />
-        <module reference="ec79e64d-4cbb-4f6c-b7b7-108dd125aba6(jetbrains.mps.logic.propositional)" 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" />
+        <module reference="8efed383-9c82-409e-81c8-4bd2a012c164(samples.fitch.herbrandLogic#3059457401298723545)" version="0" />
+        <module reference="ec79e64d-4cbb-4f6c-b7b7-108dd125aba6(samples.fitch.propositionalLogic)" version="0" />
       </dependencyVersions>
       <mapping-priorities />
     </generator>
   </generators>
   <sourcePath />
   <dependencies>
-    <dependency reexport="false">748b3ba1-2791-4ee8-b985-a5598baa7112(jetbrains.mps.logic.herbrand)</dependency>
+    <dependency reexport="false">748b3ba1-2791-4ee8-b985-a5598baa7112(samples.fitch.herbrandLogic)</dependency>
     <dependency reexport="false">daafa647-f1f7-4b0b-b096-69cd7c8408c0(jetbrains.mps.baseLanguage.regexp)</dependency>
-    <dependency reexport="false">06b7c5c7-e359-4f4b-a581-5d0c9323af39(jetbrains.mps.fitch)</dependency>
+    <dependency reexport="false">06b7c5c7-e359-4f4b-a581-5d0c9323af39(samples.fitch)</dependency>
     <dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
   </dependencies>
   <languageVersions>
@@ -101,16 +101,16 @@
     <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
     <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="06b7c5c7-e359-4f4b-a581-5d0c9323af39(jetbrains.mps.fitch)" version="1" />
     <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="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="748b3ba1-2791-4ee8-b985-a5598baa7112(jetbrains.mps.logic.herbrand)" version="0" />
-    <module reference="ec79e64d-4cbb-4f6c-b7b7-108dd125aba6(jetbrains.mps.logic.propositional)" 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" />
+    <module reference="ec79e64d-4cbb-4f6c-b7b7-108dd125aba6(samples.fitch.propositionalLogic)" version="0" />
   </dependencyVersions>
   <extendedLanguages>
-    <extendedLanguage>ec79e64d-4cbb-4f6c-b7b7-108dd125aba6(jetbrains.mps.logic.propositional)</extendedLanguage>
+    <extendedLanguage>ec79e64d-4cbb-4f6c-b7b7-108dd125aba6(samples.fitch.propositionalLogic)</extendedLanguage>
   </extendedLanguages>
 </language>
 
diff --git a/samples/fitch/languages/jetbrains.mps.logic.propositional/generator/template/main@generator.mps b/samples/fitch/languages/samples.fitch.propositionalLogic/generator/template/main@generator.mps
similarity index 94%
rename from samples/fitch/languages/jetbrains.mps.logic.propositional/generator/template/main@generator.mps
rename to samples/fitch/languages/samples.fitch.propositionalLogic/generator/template/main@generator.mps
index 0729410f..7397e6ff 100644
--- a/samples/fitch/languages/jetbrains.mps.logic.propositional/generator/template/main@generator.mps
+++ b/samples/fitch/languages/samples.fitch.propositionalLogic/generator/template/main@generator.mps
@@ -5,7 +5,7 @@
     <devkit ref="a2eb3a43-fcc2-4200-80dc-c60110c4862d(jetbrains.mps.devkit.templates)" />
   </languages>
   <imports>
-    <import index="27wh" ref="r:459ba7ac-2a61-40fc-bcc4-f13a7956cbeb(jetbrains.mps.logic.propositional.structure)" />
+    <import index="27wh" ref="r:459ba7ac-2a61-40fc-bcc4-f13a7956cbeb(samples.fitch.propositionalLogic.structure)" />
   </imports>
   <registry>
     <language id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator">
diff --git a/samples/fitch/languages/jetbrains.mps.logic.propositional/models/behavior.mps b/samples/fitch/languages/samples.fitch.propositionalLogic/models/behavior.mps
similarity index 96%
rename from samples/fitch/languages/jetbrains.mps.logic.propositional/models/behavior.mps
rename to samples/fitch/languages/samples.fitch.propositionalLogic/models/behavior.mps
index 369940a9..242d483e 100644
--- a/samples/fitch/languages/jetbrains.mps.logic.propositional/models/behavior.mps
+++ b/samples/fitch/languages/samples.fitch.propositionalLogic/models/behavior.mps
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:74226e2f-92d8-4334-831e-4e7b7fa70741(jetbrains.mps.logic.propositional.behavior)">
+<model ref="r:74226e2f-92d8-4334-831e-4e7b7fa70741(samples.fitch.propositionalLogic.behavior)">
   <persistence version="9" />
   <languages>
     <use id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior" version="1" />
     <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
   </languages>
   <imports>
-    <import index="qd7f" ref="r:6e0181fc-40ea-4aea-a8b0-3ba2d104ddef(jetbrains.mps.fitch.behavior)" />
-    <import index="27wh" ref="r:459ba7ac-2a61-40fc-bcc4-f13a7956cbeb(jetbrains.mps.logic.propositional.structure)" implicit="true" />
+    <import index="qd7f" ref="r:6e0181fc-40ea-4aea-a8b0-3ba2d104ddef(samples.fitch.behavior)" />
+    <import index="27wh" ref="r:459ba7ac-2a61-40fc-bcc4-f13a7956cbeb(samples.fitch.propositionalLogic.structure)" implicit="true" />
   </imports>
   <registry>
     <language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior">
diff --git a/samples/fitch/languages/jetbrains.mps.logic.propositional/models/constraints.mps b/samples/fitch/languages/samples.fitch.propositionalLogic/models/constraints.mps
similarity index 97%
rename from samples/fitch/languages/jetbrains.mps.logic.propositional/models/constraints.mps
rename to samples/fitch/languages/samples.fitch.propositionalLogic/models/constraints.mps
index 139ba1a1..ea7bf740 100644
--- a/samples/fitch/languages/jetbrains.mps.logic.propositional/models/constraints.mps
+++ b/samples/fitch/languages/samples.fitch.propositionalLogic/models/constraints.mps
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:8ccc0587-6cb2-4342-adfa-b9156d0d1eeb(jetbrains.mps.logic.propositional.constraints)">
+<model ref="r:8ccc0587-6cb2-4342-adfa-b9156d0d1eeb(samples.fitch.propositionalLogic.constraints)">
   <persistence version="9" />
   <languages>
     <use id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" name="jetbrains.mps.lang.constraints" version="4" />
@@ -11,11 +11,11 @@
     <devkit ref="00000000-0000-4000-0000-5604ebd4f22c(jetbrains.mps.devkit.aspect.constraints)" />
   </languages>
   <imports>
-    <import index="27wh" ref="r:459ba7ac-2a61-40fc-bcc4-f13a7956cbeb(jetbrains.mps.logic.propositional.structure)" />
+    <import index="27wh" ref="r:459ba7ac-2a61-40fc-bcc4-f13a7956cbeb(samples.fitch.propositionalLogic.structure)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
     <import index="tpfp" ref="r:00000000-0000-4000-0000-011c89590519(jetbrains.mps.baseLanguage.regexp.jetbrains.mps.regexp.accessory)" />
-    <import index="jfgh" ref="r:2003997c-f9a6-418f-99d4-03e1285a3e13(jetbrains.mps.fitch.structure)" />
-    <import index="qd7f" ref="r:6e0181fc-40ea-4aea-a8b0-3ba2d104ddef(jetbrains.mps.fitch.behavior)" implicit="true" />
+    <import index="jfgh" ref="r:2003997c-f9a6-418f-99d4-03e1285a3e13(samples.fitch.structure)" />
+    <import index="qd7f" ref="r:6e0181fc-40ea-4aea-a8b0-3ba2d104ddef(samples.fitch.behavior)" implicit="true" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
diff --git a/samples/fitch/languages/jetbrains.mps.logic.propositional/models/editor.mps b/samples/fitch/languages/samples.fitch.propositionalLogic/models/editor.mps
similarity index 99%
rename from samples/fitch/languages/jetbrains.mps.logic.propositional/models/editor.mps
rename to samples/fitch/languages/samples.fitch.propositionalLogic/models/editor.mps
index 22e30835..790edc2c 100644
--- a/samples/fitch/languages/jetbrains.mps.logic.propositional/models/editor.mps
+++ b/samples/fitch/languages/samples.fitch.propositionalLogic/models/editor.mps
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:2ca623f4-8f74-473f-b3b6-e9b637018c0b(jetbrains.mps.logic.propositional.editor)">
+<model ref="r:2ca623f4-8f74-473f-b3b6-e9b637018c0b(samples.fitch.propositionalLogic.editor)">
   <persistence version="9" />
   <languages>
     <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="11" />
@@ -10,11 +10,11 @@
     <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
   </languages>
   <imports>
-    <import index="27wh" ref="r:459ba7ac-2a61-40fc-bcc4-f13a7956cbeb(jetbrains.mps.logic.propositional.structure)" />
+    <import index="27wh" ref="r:459ba7ac-2a61-40fc-bcc4-f13a7956cbeb(samples.fitch.propositionalLogic.structure)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
     <import index="tpfp" ref="r:00000000-0000-4000-0000-011c89590519(jetbrains.mps.baseLanguage.regexp.jetbrains.mps.regexp.accessory)" />
-    <import index="jfgh" ref="r:2003997c-f9a6-418f-99d4-03e1285a3e13(jetbrains.mps.fitch.structure)" />
-    <import index="8v9h" ref="r:873e37f0-b045-47b9-ae9e-db79c2628975(jetbrains.mps.fitch.editor)" />
+    <import index="jfgh" ref="r:2003997c-f9a6-418f-99d4-03e1285a3e13(samples.fitch.structure)" />
+    <import index="8v9h" ref="r:873e37f0-b045-47b9-ae9e-db79c2628975(samples.fitch.editor)" />
     <import index="tpco" ref="r:00000000-0000-4000-0000-011c89590284(jetbrains.mps.lang.core.editor)" implicit="true" />
   </imports>
   <registry>
diff --git a/samples/fitch/languages/jetbrains.mps.logic.propositional/models/structure.mps b/samples/fitch/languages/samples.fitch.propositionalLogic/models/structure.mps
similarity index 99%
rename from samples/fitch/languages/jetbrains.mps.logic.propositional/models/structure.mps
rename to samples/fitch/languages/samples.fitch.propositionalLogic/models/structure.mps
index cad0e6a4..6681f4e9 100644
--- a/samples/fitch/languages/jetbrains.mps.logic.propositional/models/structure.mps
+++ b/samples/fitch/languages/samples.fitch.propositionalLogic/models/structure.mps
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:459ba7ac-2a61-40fc-bcc4-f13a7956cbeb(jetbrains.mps.logic.propositional.structure)">
+<model ref="r:459ba7ac-2a61-40fc-bcc4-f13a7956cbeb(samples.fitch.propositionalLogic.structure)">
   <persistence version="9" />
   <languages>
     <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="6" />
     <devkit ref="78434eb8-b0e5-444b-850d-e7c4ad2da9ab(jetbrains.mps.devkit.aspect.structure)" />
   </languages>
   <imports>
-    <import index="jfgh" ref="r:2003997c-f9a6-418f-99d4-03e1285a3e13(jetbrains.mps.fitch.structure)" />
+    <import index="jfgh" ref="r:2003997c-f9a6-418f-99d4-03e1285a3e13(samples.fitch.structure)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
   </imports>
   <registry>
diff --git a/samples/fitch/languages/jetbrains.mps.logic.propositional/models/types.mps b/samples/fitch/languages/samples.fitch.propositionalLogic/models/types.mps
similarity index 99%
rename from samples/fitch/languages/jetbrains.mps.logic.propositional/models/types.mps
rename to samples/fitch/languages/samples.fitch.propositionalLogic/models/types.mps
index 371ebc50..7e2598ab 100644
--- a/samples/fitch/languages/jetbrains.mps.logic.propositional/models/types.mps
+++ b/samples/fitch/languages/samples.fitch.propositionalLogic/models/types.mps
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:30d249b0-c2b0-4934-8bd8-e1d7a37c3b3b(jetbrains.mps.logic.propositional.types)">
+<model ref="r:30d249b0-c2b0-4934-8bd8-e1d7a37c3b3b(samples.fitch.propositionalLogic.types)">
   <persistence version="9" />
   <languages>
     <use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="14" />
@@ -11,9 +11,9 @@
   </languages>
   <imports>
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
-    <import index="27wh" ref="r:459ba7ac-2a61-40fc-bcc4-f13a7956cbeb(jetbrains.mps.logic.propositional.structure)" />
-    <import index="f3ld" ref="r:30efdd3a-609b-4e7b-a8f2-60af62d5341f(jetbrains.mps.fitch.types)" />
-    <import index="jfgh" ref="r:2003997c-f9a6-418f-99d4-03e1285a3e13(jetbrains.mps.fitch.structure)" />
+    <import index="27wh" ref="r:459ba7ac-2a61-40fc-bcc4-f13a7956cbeb(samples.fitch.propositionalLogic.structure)" />
+    <import index="f3ld" ref="r:30efdd3a-609b-4e7b-a8f2-60af62d5341f(samples.fitch.types)" />
+    <import index="jfgh" ref="r:2003997c-f9a6-418f-99d4-03e1285a3e13(samples.fitch.structure)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
diff --git a/samples/fitch/languages/jetbrains.mps.logic.propositional/models/typesystem.mps b/samples/fitch/languages/samples.fitch.propositionalLogic/models/typesystem.mps
similarity index 77%
rename from samples/fitch/languages/jetbrains.mps.logic.propositional/models/typesystem.mps
rename to samples/fitch/languages/samples.fitch.propositionalLogic/models/typesystem.mps
index d0e74840..e4ea76e8 100644
--- a/samples/fitch/languages/jetbrains.mps.logic.propositional/models/typesystem.mps
+++ b/samples/fitch/languages/samples.fitch.propositionalLogic/models/typesystem.mps
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:66ac687e-b631-4ad4-84c8-55502c32e02c(jetbrains.mps.logic.propositional.typesystem)">
+<model ref="r:66ac687e-b631-4ad4-84c8-55502c32e02c(samples.fitch.propositionalLogic.typesystem)">
   <persistence version="9" />
   <languages>
     <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="1" />
diff --git a/samples/fitch/languages/jetbrains.mps.logic.propositional/jetbrains.mps.logic.propositional.mpl b/samples/fitch/languages/samples.fitch.propositionalLogic/samples.fitch.propositionalLogic.mpl
similarity index 91%
rename from samples/fitch/languages/jetbrains.mps.logic.propositional/jetbrains.mps.logic.propositional.mpl
rename to samples/fitch/languages/samples.fitch.propositionalLogic/samples.fitch.propositionalLogic.mpl
index 34eb1ab5..8cc031fe 100644
--- a/samples/fitch/languages/jetbrains.mps.logic.propositional/jetbrains.mps.logic.propositional.mpl
+++ b/samples/fitch/languages/samples.fitch.propositionalLogic/samples.fitch.propositionalLogic.mpl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<language namespace="jetbrains.mps.logic.propositional" uuid="ec79e64d-4cbb-4f6c-b7b7-108dd125aba6" languageVersion="0" moduleVersion="0">
+<language namespace="samples.fitch.propositionalLogic" uuid="ec79e64d-4cbb-4f6c-b7b7-108dd125aba6" languageVersion="0" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -7,7 +7,7 @@
   </models>
   <accessoryModels />
   <generators>
-    <generator alias="main" namespace="jetbrains.mps.logic.propositional#5505606474790531941" uuid="53b8ab24-cc4a-4fe2-b461-11a91d798670">
+    <generator alias="main" namespace="samples.fitch.propositionalLogic#5505606474790531941" uuid="53b8ab24-cc4a-4fe2-b461-11a91d798670">
       <models>
         <modelRoot contentPath="${module}/generator/template" type="default">
           <sourceRoot location="." />
@@ -37,10 +37,10 @@
         <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="06b7c5c7-e359-4f4b-a581-5d0c9323af39(jetbrains.mps.fitch)" version="1" />
         <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
-        <module reference="ec79e64d-4cbb-4f6c-b7b7-108dd125aba6(jetbrains.mps.logic.propositional)" version="0" />
-        <module reference="53b8ab24-cc4a-4fe2-b461-11a91d798670(jetbrains.mps.logic.propositional#5505606474790531941)" 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" />
+        <module reference="53b8ab24-cc4a-4fe2-b461-11a91d798670(samples.fitch.propositionalLogic#5505606474790531941)" version="0" />
       </dependencyVersions>
       <mapping-priorities />
     </generator>
@@ -97,15 +97,15 @@
     <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
     <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="06b7c5c7-e359-4f4b-a581-5d0c9323af39(jetbrains.mps.fitch)" version="1" />
     <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="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="ec79e64d-4cbb-4f6c-b7b7-108dd125aba6(jetbrains.mps.logic.propositional)" 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" />
   </dependencyVersions>
   <extendedLanguages>
-    <extendedLanguage>06b7c5c7-e359-4f4b-a581-5d0c9323af39(jetbrains.mps.fitch)</extendedLanguage>
+    <extendedLanguage>06b7c5c7-e359-4f4b-a581-5d0c9323af39(samples.fitch)</extendedLanguage>
   </extendedLanguages>
 </language>
 
diff --git a/samples/fitch/languages/jetbrains.mps.fitch/generator/template/main@generator.mps b/samples/fitch/languages/samples.fitch/generator/template/main@generator.mps
similarity index 96%
rename from samples/fitch/languages/jetbrains.mps.fitch/generator/template/main@generator.mps
rename to samples/fitch/languages/samples.fitch/generator/template/main@generator.mps
index 151bf772..6a804044 100644
--- a/samples/fitch/languages/jetbrains.mps.fitch/generator/template/main@generator.mps
+++ b/samples/fitch/languages/samples.fitch/generator/template/main@generator.mps
@@ -5,7 +5,7 @@
     <devkit ref="a2eb3a43-fcc2-4200-80dc-c60110c4862d(jetbrains.mps.devkit.templates)" />
   </languages>
   <imports>
-    <import index="jfgh" ref="r:2003997c-f9a6-418f-99d4-03e1285a3e13(jetbrains.mps.fitch.structure)" />
+    <import index="jfgh" ref="r:2003997c-f9a6-418f-99d4-03e1285a3e13(samples.fitch.structure)" />
   </imports>
   <registry>
     <language id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator">
diff --git a/samples/fitch/languages/jetbrains.mps.fitch/models/behavior.mps b/samples/fitch/languages/samples.fitch/models/behavior.mps
similarity index 99%
rename from samples/fitch/languages/jetbrains.mps.fitch/models/behavior.mps
rename to samples/fitch/languages/samples.fitch/models/behavior.mps
index db6bde03..505db52d 100644
--- a/samples/fitch/languages/jetbrains.mps.fitch/models/behavior.mps
+++ b/samples/fitch/languages/samples.fitch/models/behavior.mps
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:6e0181fc-40ea-4aea-a8b0-3ba2d104ddef(jetbrains.mps.fitch.behavior)">
+<model ref="r:6e0181fc-40ea-4aea-a8b0-3ba2d104ddef(samples.fitch.behavior)">
   <persistence version="9" />
   <languages>
     <use id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior" version="1" />
     <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
   </languages>
   <imports>
-    <import index="jfgh" ref="r:2003997c-f9a6-418f-99d4-03e1285a3e13(jetbrains.mps.fitch.structure)" />
+    <import index="jfgh" ref="r:2003997c-f9a6-418f-99d4-03e1285a3e13(samples.fitch.structure)" />
   </imports>
   <registry>
     <language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior">
diff --git a/samples/fitch/languages/jetbrains.mps.fitch/models/constraints.mps b/samples/fitch/languages/samples.fitch/models/constraints.mps
similarity index 99%
rename from samples/fitch/languages/jetbrains.mps.fitch/models/constraints.mps
rename to samples/fitch/languages/samples.fitch/models/constraints.mps
index 44abe635..c09d8733 100644
--- a/samples/fitch/languages/jetbrains.mps.fitch/models/constraints.mps
+++ b/samples/fitch/languages/samples.fitch/models/constraints.mps
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:3e3289bd-0103-48e0-beb3-89796cdeaf7c(jetbrains.mps.fitch.constraints)">
+<model ref="r:3e3289bd-0103-48e0-beb3-89796cdeaf7c(samples.fitch.constraints)">
   <persistence version="9" />
   <languages>
     <use id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" name="jetbrains.mps.lang.constraints" version="4" />
@@ -7,8 +7,8 @@
     <devkit ref="00000000-0000-4000-0000-5604ebd4f22c(jetbrains.mps.devkit.aspect.constraints)" />
   </languages>
   <imports>
-    <import index="jfgh" ref="r:2003997c-f9a6-418f-99d4-03e1285a3e13(jetbrains.mps.fitch.structure)" />
-    <import index="qd7f" ref="r:6e0181fc-40ea-4aea-a8b0-3ba2d104ddef(jetbrains.mps.fitch.behavior)" />
+    <import index="jfgh" ref="r:2003997c-f9a6-418f-99d4-03e1285a3e13(samples.fitch.structure)" />
+    <import index="qd7f" ref="r:6e0181fc-40ea-4aea-a8b0-3ba2d104ddef(samples.fitch.behavior)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
     <import index="o8zo" ref="r:314576fc-3aee-4386-a0a5-a38348ac317d(jetbrains.mps.scope)" />
   </imports>
diff --git a/samples/fitch/languages/jetbrains.mps.fitch/models/editor.mps b/samples/fitch/languages/samples.fitch/models/editor.mps
similarity index 99%
rename from samples/fitch/languages/jetbrains.mps.fitch/models/editor.mps
rename to samples/fitch/languages/samples.fitch/models/editor.mps
index 53a00ea2..7937d7a9 100644
--- a/samples/fitch/languages/jetbrains.mps.fitch/models/editor.mps
+++ b/samples/fitch/languages/samples.fitch/models/editor.mps
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:873e37f0-b045-47b9-ae9e-db79c2628975(jetbrains.mps.fitch.editor)">
+<model ref="r:873e37f0-b045-47b9-ae9e-db79c2628975(samples.fitch.editor)">
   <persistence version="9" />
   <languages>
     <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="11" />
@@ -8,10 +8,10 @@
     <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
   </languages>
   <imports>
-    <import index="jfgh" ref="r:2003997c-f9a6-418f-99d4-03e1285a3e13(jetbrains.mps.fitch.structure)" />
+    <import index="jfgh" ref="r:2003997c-f9a6-418f-99d4-03e1285a3e13(samples.fitch.structure)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
     <import index="tpco" ref="r:00000000-0000-4000-0000-011c89590284(jetbrains.mps.lang.core.editor)" implicit="true" />
-    <import index="qd7f" ref="r:6e0181fc-40ea-4aea-a8b0-3ba2d104ddef(jetbrains.mps.fitch.behavior)" implicit="true" />
+    <import index="qd7f" ref="r:6e0181fc-40ea-4aea-a8b0-3ba2d104ddef(samples.fitch.behavior)" implicit="true" />
   </imports>
   <registry>
     <language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor">
diff --git a/samples/fitch/languages/jetbrains.mps.fitch/models/migration.mps b/samples/fitch/languages/samples.fitch/models/migration.mps
similarity index 84%
rename from samples/fitch/languages/jetbrains.mps.fitch/models/migration.mps
rename to samples/fitch/languages/samples.fitch/models/migration.mps
index 6e8cc297..58c02d52 100644
--- a/samples/fitch/languages/jetbrains.mps.fitch/models/migration.mps
+++ b/samples/fitch/languages/samples.fitch/models/migration.mps
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:b0d68e87-c19f-44c1-8fed-3b2c58e7ac98(jetbrains.mps.fitch.migration)">
+<model ref="r:b0d68e87-c19f-44c1-8fed-3b2c58e7ac98(samples.fitch.migration)">
   <persistence version="9" />
   <languages>
     <use id="90746344-04fd-4286-97d5-b46ae6a81709" name="jetbrains.mps.lang.migration" version="0" />
diff --git a/samples/fitch/languages/jetbrains.mps.fitch/models/structure.mps b/samples/fitch/languages/samples.fitch/models/structure.mps
similarity index 99%
rename from samples/fitch/languages/jetbrains.mps.fitch/models/structure.mps
rename to samples/fitch/languages/samples.fitch/models/structure.mps
index 30d5868c..d0a67210 100644
--- a/samples/fitch/languages/jetbrains.mps.fitch/models/structure.mps
+++ b/samples/fitch/languages/samples.fitch/models/structure.mps
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:2003997c-f9a6-418f-99d4-03e1285a3e13(jetbrains.mps.fitch.structure)">
+<model ref="r:2003997c-f9a6-418f-99d4-03e1285a3e13(samples.fitch.structure)">
   <persistence version="9" />
   <languages>
     <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="6" />
diff --git a/samples/fitch/languages/jetbrains.mps.fitch/models/types.mps b/samples/fitch/languages/samples.fitch/models/types.mps
similarity index 98%
rename from samples/fitch/languages/jetbrains.mps.fitch/models/types.mps
rename to samples/fitch/languages/samples.fitch/models/types.mps
index b0ecb8ab..873757f5 100644
--- a/samples/fitch/languages/jetbrains.mps.fitch/models/types.mps
+++ b/samples/fitch/languages/samples.fitch/models/types.mps
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:30efdd3a-609b-4e7b-a8f2-60af62d5341f(jetbrains.mps.fitch.types)">
+<model ref="r:30efdd3a-609b-4e7b-a8f2-60af62d5341f(samples.fitch.types)">
   <persistence version="9" />
   <languages>
     <use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="14" />
@@ -10,7 +10,7 @@
     <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
   </languages>
   <imports>
-    <import index="jfgh" ref="r:2003997c-f9a6-418f-99d4-03e1285a3e13(jetbrains.mps.fitch.structure)" />
+    <import index="jfgh" ref="r:2003997c-f9a6-418f-99d4-03e1285a3e13(samples.fitch.structure)" />
     <import index="1g4i" ref="r:102178da-67ba-49f6-ba73-eb29fa352fe7(jetbrains.mps.typechecking)" />
   </imports>
   <registry>
@@ -69,8 +69,8 @@
       </concept>
     </language>
     <language id="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462" name="jetbrains.mps.lang.typechecking">
-      <concept id="6958395084019752" name="" flags="ng" index="2ra22R">
-        <child id="6958395084020241" name="" index="2ra2ae" />
+      <concept id="6958395084019752" name="jetbrains.mps.lang.typechecking.structure.SNodeSetTypeOperation" flags="ng" index="2ra22R">
+        <child id="6958395084020241" name="typeExpr" index="2ra2ae" />
       </concept>
     </language>
     <language id="cba985fe-1e96-4f16-9f8d-b07434405d4f" name="jetbrains.mps.lang.smodel.types">
diff --git a/samples/fitch/languages/jetbrains.mps.fitch/models/typesystem.mps b/samples/fitch/languages/samples.fitch/models/typesystem.mps
similarity index 79%
rename from samples/fitch/languages/jetbrains.mps.fitch/models/typesystem.mps
rename to samples/fitch/languages/samples.fitch/models/typesystem.mps
index c64b9266..136df543 100644
--- a/samples/fitch/languages/jetbrains.mps.fitch/models/typesystem.mps
+++ b/samples/fitch/languages/samples.fitch/models/typesystem.mps
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:0fc28004-caa1-4d7f-a96d-1a8d903e1c13(jetbrains.mps.fitch.typesystem)">
+<model ref="r:0fc28004-caa1-4d7f-a96d-1a8d903e1c13(samples.fitch.typesystem)">
   <persistence version="9" />
   <languages>
     <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="1" />
diff --git a/samples/fitch/languages/jetbrains.mps.fitch/jetbrains.mps.fitch.mpl b/samples/fitch/languages/samples.fitch/samples.fitch.mpl
similarity index 95%
rename from samples/fitch/languages/jetbrains.mps.fitch/jetbrains.mps.fitch.mpl
rename to samples/fitch/languages/samples.fitch/samples.fitch.mpl
index 1ed4c699..91025f22 100644
--- a/samples/fitch/languages/jetbrains.mps.fitch/jetbrains.mps.fitch.mpl
+++ b/samples/fitch/languages/samples.fitch/samples.fitch.mpl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<language namespace="jetbrains.mps.fitch" uuid="06b7c5c7-e359-4f4b-a581-5d0c9323af39" languageVersion="1" moduleVersion="1">
+<language namespace="samples.fitch" uuid="06b7c5c7-e359-4f4b-a581-5d0c9323af39" languageVersion="1" moduleVersion="1">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -7,7 +7,7 @@
   </models>
   <accessoryModels />
   <generators>
-    <generator alias="main" namespace="jetbrains.mps.fitch#4322786184247805322" uuid="65b2d9d2-5a92-4dd0-abf5-f3a1bd399bec">
+    <generator alias="main" namespace="samples.fitch#4322786184247805322" uuid="65b2d9d2-5a92-4dd0-abf5-f3a1bd399bec">
       <models>
         <modelRoot contentPath="${module}/generator/template" type="default">
           <sourceRoot location="." />
@@ -37,9 +37,9 @@
         <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="06b7c5c7-e359-4f4b-a581-5d0c9323af39(jetbrains.mps.fitch)" version="1" />
-        <module reference="65b2d9d2-5a92-4dd0-abf5-f3a1bd399bec(jetbrains.mps.fitch#4322786184247805322)" version="0" />
         <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
+        <module reference="06b7c5c7-e359-4f4b-a581-5d0c9323af39(samples.fitch)" version="1" />
+        <module reference="65b2d9d2-5a92-4dd0-abf5-f3a1bd399bec(samples.fitch#4322786184247805322)" version="0" />
       </dependencyVersions>
       <mapping-priorities />
     </generator>
@@ -47,7 +47,7 @@
   <sourcePath />
   <dependencies>
     <dependency reexport="false">6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.typechecking)</dependency>
-    <dependency reexport="false">06b7c5c7-e359-4f4b-a581-5d0c9323af39(jetbrains.mps.fitch)</dependency>
+    <dependency reexport="false">06b7c5c7-e359-4f4b-a581-5d0c9323af39(samples.fitch)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)</dependency>
   </dependencies>
@@ -101,7 +101,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="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c(jetbrains.mps.coderules)" version="0" />
-    <module reference="06b7c5c7-e359-4f4b-a581-5d0c9323af39(jetbrains.mps.fitch)" version="1" />
     <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" />
@@ -112,6 +111,7 @@
     <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="6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.typechecking)" version="0" />
+    <module reference="06b7c5c7-e359-4f4b-a581-5d0c9323af39(samples.fitch)" version="1" />
   </dependencyVersions>
   <extendedLanguages />
 </language>
diff --git a/samples/fitch/solutions/jetbrains.mps.fitch.demo/jetbrains.mps.fitch.demo.msd b/samples/fitch/solutions/jetbrains.mps.fitch.demo/jetbrains.mps.fitch.demo.msd
deleted file mode 100644
index 05204959..00000000
--- a/samples/fitch/solutions/jetbrains.mps.fitch.demo/jetbrains.mps.fitch.demo.msd
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<solution name="jetbrains.mps.fitch.demo" uuid="86925f4e-7856-4553-a261-c86fbf09bb52" moduleVersion="0" compileInMPS="true">
-  <models>
-    <modelRoot contentPath="${module}" type="default">
-      <sourceRoot location="models" />
-    </modelRoot>
-  </models>
-  <sourcePath />
-  <languageVersions>
-    <language slang="l:06b7c5c7-e359-4f4b-a581-5d0c9323af39:jetbrains.mps.fitch" version="1" />
-    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
-    <language slang="l:ddb01c98-e78e-4c79-b11a-aeba193668d4:jetbrains.mps.logic.firstOrder" version="0" />
-    <language slang="l:748b3ba1-2791-4ee8-b985-a5598baa7112:jetbrains.mps.logic.herbrand" version="0" />
-    <language slang="l:ec79e64d-4cbb-4f6c-b7b7-108dd125aba6:jetbrains.mps.logic.propositional" version="-1" />
-  </languageVersions>
-  <dependencyVersions>
-    <module reference="86925f4e-7856-4553-a261-c86fbf09bb52(jetbrains.mps.fitch.demo)" version="0" />
-  </dependencyVersions>
-</solution>
-
diff --git a/samples/fitch/solutions/jetbrains.mps.fitch.build/models/jetbrains.mps.fitch.build.mps b/samples/fitch/solutions/samples.fitch.build/models/samples.fitch.build.mps
similarity index 83%
rename from samples/fitch/solutions/jetbrains.mps.fitch.build/models/jetbrains.mps.fitch.build.mps
rename to samples/fitch/solutions/samples.fitch.build/models/samples.fitch.build.mps
index c73599d0..a037789f 100644
--- a/samples/fitch/solutions/jetbrains.mps.fitch.build/models/jetbrains.mps.fitch.build.mps
+++ b/samples/fitch/solutions/samples.fitch.build/models/samples.fitch.build.mps
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:0601aae4-0981-4217-9b8a-f73ee0df159c(jetbrains.mps.fitch.build)">
+<model ref="r:0601aae4-0981-4217-9b8a-f73ee0df159c(samples.fitch.build)">
   <persistence version="9" />
   <languages>
     <use id="427a473d-5177-432c-9905-bcbceb71b996" name="jetbrains.mps.build.mps.runner" version="0" />
@@ -89,16 +89,16 @@
       <property role="TrG5h" value="fitch" />
       <node concept="1E1JtD" id="4$bYnYI$URy" role="2G$12L">
         <property role="BnDLt" value="true" />
-        <property role="TrG5h" value="jetbrains.mps.fitch" />
+        <property role="TrG5h" value="samples.fitch" />
         <property role="3LESm3" value="06b7c5c7-e359-4f4b-a581-5d0c9323af39" />
         <property role="2GAjPV" value="false" />
         <node concept="55IIr" id="4$bYnYI$UR_" role="3LF7KH">
           <node concept="2Ry0Ak" id="4$bYnYI$URF" role="iGT6I">
             <property role="2Ry0Am" value="languages" />
             <node concept="2Ry0Ak" id="4$bYnYI$URK" role="2Ry0An">
-              <property role="2Ry0Am" value="jetbrains.mps.fitch" />
-              <node concept="2Ry0Ak" id="4$bYnYI$URP" role="2Ry0An">
-                <property role="2Ry0Am" value="jetbrains.mps.fitch.mpl" />
+              <property role="2Ry0Am" value="samples.fitch" />
+              <node concept="2Ry0Ak" id="58VeaO3ARTE" role="2Ry0An">
+                <property role="2Ry0Am" value="samples.fitch.mpl" />
               </node>
             </node>
           </node>
@@ -110,7 +110,7 @@
           </node>
         </node>
         <node concept="1yeLz9" id="4$bYnYI$URT" role="1TViLv">
-          <property role="TrG5h" value="jetbrains.mps.fitch#4322786184247805322" />
+          <property role="TrG5h" value="samples.fitch#4322786184247805322" />
           <property role="3LESm3" value="65b2d9d2-5a92-4dd0-abf5-f3a1bd399bec" />
           <property role="2GAjPV" value="false" />
         </node>
@@ -129,28 +129,28 @@
         <node concept="1SiIV0" id="5p9vXslHrSJ" role="3bR37C">
           <node concept="3bR9La" id="5p9vXslHrSK" role="1SiIV1">
             <property role="3bR36h" value="false" />
-            <ref role="3bR37D" node="4$bYnYI$URy" resolve="jetbrains.mps.fitch" />
+            <ref role="3bR37D" node="4$bYnYI$URy" resolve="samples.fitch" />
           </node>
         </node>
       </node>
       <node concept="1E1JtD" id="4$bYnYI$UVm" role="2G$12L">
         <property role="BnDLt" value="true" />
-        <property role="TrG5h" value="jetbrains.mps.logic.propositional" />
+        <property role="TrG5h" value="samples.fitch.propositionalLogic" />
         <property role="3LESm3" value="ec79e64d-4cbb-4f6c-b7b7-108dd125aba6" />
         <property role="2GAjPV" value="false" />
         <node concept="55IIr" id="4$bYnYI$UVn" role="3LF7KH">
           <node concept="2Ry0Ak" id="4$bYnYI$UVo" role="iGT6I">
             <property role="2Ry0Am" value="languages" />
             <node concept="2Ry0Ak" id="4$bYnYI$UVp" role="2Ry0An">
-              <property role="2Ry0Am" value="jetbrains.mps.logic.propositional" />
-              <node concept="2Ry0Ak" id="4$bYnYI$UXb" role="2Ry0An">
-                <property role="2Ry0Am" value="jetbrains.mps.logic.propositional.mpl" />
+              <property role="2Ry0Am" value="samples.fitch.propositionalLogic" />
+              <node concept="2Ry0Ak" id="58VeaO3ARU6" role="2Ry0An">
+                <property role="2Ry0Am" value="samples.fitch.propositionalLogic.mpl" />
               </node>
             </node>
           </node>
         </node>
         <node concept="1yeLz9" id="4$bYnYI$UVr" role="1TViLv">
-          <property role="TrG5h" value="jetbrains.mps.logic.propositional#5505606474790531941" />
+          <property role="TrG5h" value="samples.fitch.propositionalLogic#5505606474790531941" />
           <property role="3LESm3" value="53b8ab24-cc4a-4fe2-b461-11a91d798670" />
           <property role="2GAjPV" value="false" />
         </node>
@@ -162,28 +162,28 @@
         </node>
         <node concept="1SiIV0" id="4$bYnYI$UXC" role="3bR37C">
           <node concept="1Busua" id="4$bYnYI$UXD" role="1SiIV1">
-            <ref role="1Busuk" node="4$bYnYI$URy" resolve="jetbrains.mps.fitch" />
+            <ref role="1Busuk" node="4$bYnYI$URy" resolve="samples.fitch" />
           </node>
         </node>
       </node>
       <node concept="1E1JtD" id="4$bYnYI$UTN" role="2G$12L">
         <property role="BnDLt" value="true" />
-        <property role="TrG5h" value="jetbrains.mps.logic.herbrand" />
+        <property role="TrG5h" value="samples.fitch.herbrandLogic" />
         <property role="3LESm3" value="748b3ba1-2791-4ee8-b985-a5598baa7112" />
         <property role="2GAjPV" value="false" />
         <node concept="55IIr" id="4$bYnYI$UTO" role="3LF7KH">
           <node concept="2Ry0Ak" id="4$bYnYI$UTP" role="iGT6I">
             <property role="2Ry0Am" value="languages" />
             <node concept="2Ry0Ak" id="4$bYnYI$UTQ" role="2Ry0An">
-              <property role="2Ry0Am" value="jetbrains.mps.logic.herbrand" />
-              <node concept="2Ry0Ak" id="4$bYnYI$UU_" role="2Ry0An">
-                <property role="2Ry0Am" value="jetbrains.mps.logic.herbrand.mpl" />
+              <property role="2Ry0Am" value="samples.fitch.herbrandLogic" />
+              <node concept="2Ry0Ak" id="58VeaO3ARV6" role="2Ry0An">
+                <property role="2Ry0Am" value="samples.fitch.herbrandLogic.mpl" />
               </node>
             </node>
           </node>
         </node>
         <node concept="1yeLz9" id="4$bYnYI$UTS" role="1TViLv">
-          <property role="TrG5h" value="jetbrains.mps.logic.herbrand#3059457401298723545" />
+          <property role="TrG5h" value="samples.fitch.herbrandLogic#3059457401298723545" />
           <property role="3LESm3" value="8efed383-9c82-409e-81c8-4bd2a012c164" />
           <property role="2GAjPV" value="false" />
         </node>
@@ -202,77 +202,77 @@
         <node concept="1SiIV0" id="4$bYnYI$UUZ" role="3bR37C">
           <node concept="3bR9La" id="4$bYnYI$UV0" role="1SiIV1">
             <property role="3bR36h" value="false" />
-            <ref role="3bR37D" node="4$bYnYI$URy" resolve="jetbrains.mps.fitch" />
+            <ref role="3bR37D" node="4$bYnYI$URy" resolve="samples.fitch" />
           </node>
         </node>
         <node concept="1SiIV0" id="4$bYnYI$V36" role="3bR37C">
           <node concept="3bR9La" id="4$bYnYI$V37" role="1SiIV1">
             <property role="3bR36h" value="false" />
-            <ref role="3bR37D" node="4$bYnYI$UTN" resolve="jetbrains.mps.logic.herbrand" />
+            <ref role="3bR37D" node="4$bYnYI$UTN" resolve="samples.fitch.herbrandLogic" />
           </node>
         </node>
-        <node concept="1SiIV0" id="4$bYnYI$V38" role="3bR37C">
-          <node concept="1Busua" id="4$bYnYI$V39" role="1SiIV1">
-            <ref role="1Busuk" node="4$bYnYI$UVm" resolve="jetbrains.mps.logic.propositional" />
+        <node concept="1SiIV0" id="58VeaO3B65o" role="3bR37C">
+          <node concept="1Busua" id="58VeaO3B65p" role="1SiIV1">
+            <ref role="1Busuk" node="4$bYnYI$UVm" resolve="samples.fitch.propositionalLogic" />
           </node>
         </node>
       </node>
       <node concept="1E1JtD" id="4$bYnYI$USZ" role="2G$12L">
         <property role="BnDLt" value="true" />
-        <property role="TrG5h" value="jetbrains.mps.logic.firstOrder" />
+        <property role="TrG5h" value="samples.fitch.firstOrderLogic" />
         <property role="3LESm3" value="ddb01c98-e78e-4c79-b11a-aeba193668d4" />
         <property role="2GAjPV" value="false" />
         <node concept="55IIr" id="4$bYnYI$UT0" role="3LF7KH">
           <node concept="2Ry0Ak" id="4$bYnYI$UT1" role="iGT6I">
             <property role="2Ry0Am" value="languages" />
             <node concept="2Ry0Ak" id="4$bYnYI$UT2" role="2Ry0An">
-              <property role="2Ry0Am" value="jetbrains.mps.logic.firstOrder" />
-              <node concept="2Ry0Ak" id="4$bYnYI$UTn" role="2Ry0An">
-                <property role="2Ry0Am" value="jetbrains.mps.logic.firstOrder.mpl" />
+              <property role="2Ry0Am" value="samples.fitch.firstOrderLogic" />
+              <node concept="2Ry0Ak" id="58VeaO3B63i" role="2Ry0An">
+                <property role="2Ry0Am" value="samples.fitch.firstOrderLogic.mpl" />
               </node>
             </node>
           </node>
         </node>
         <node concept="1yeLz9" id="4$bYnYI$UT6" role="1TViLv">
-          <property role="TrG5h" value="jetbrains.mps.logic.firstOrder#4035326440039985569" />
+          <property role="TrG5h" value="samples.fitch.firstOrderLogic#4035326440039985569" />
           <property role="3LESm3" value="467b3222-f5a8-48be-9fe1-6c009ed73049" />
           <property role="2GAjPV" value="false" />
         </node>
-        <node concept="1SiIV0" id="4$bYnYI$UTy" role="3bR37C">
-          <node concept="3bR9La" id="4$bYnYI$UTz" role="1SiIV1">
+        <node concept="1SiIV0" id="4$bYnYI$UUM" role="3bR37C">
+          <node concept="1Busua" id="4$bYnYI$UUN" role="1SiIV1">
+            <ref role="1Busuk" node="4$bYnYI$URy" resolve="samples.fitch" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="58VeaO3B64d" role="3bR37C">
+          <node concept="3bR9La" id="58VeaO3B64e" role="1SiIV1">
             <property role="3bR36h" value="false" />
             <ref role="3bR37D" to="ffeo:7Kfy9QB6KXW" resolve="jetbrains.mps.lang.core" />
           </node>
         </node>
-        <node concept="1SiIV0" id="4$bYnYI$UUM" role="3bR37C">
-          <node concept="1Busua" id="4$bYnYI$UUN" role="1SiIV1">
-            <ref role="1Busuk" node="4$bYnYI$URy" resolve="jetbrains.mps.fitch" />
+        <node concept="1SiIV0" id="58VeaO3B64f" role="3bR37C">
+          <node concept="1Busua" id="58VeaO3B64g" role="1SiIV1">
+            <ref role="1Busuk" node="4$bYnYI$UTN" resolve="samples.fitch.herbrandLogic" />
           </node>
         </node>
-        <node concept="1SiIV0" id="4$bYnYI$UWz" role="3bR37C">
-          <node concept="3bR9La" id="4$bYnYI$UW$" role="1SiIV1">
+        <node concept="1SiIV0" id="58VeaO3B65z" role="3bR37C">
+          <node concept="3bR9La" id="58VeaO3B65$" role="1SiIV1">
             <property role="3bR36h" value="false" />
-            <ref role="3bR37D" node="4$bYnYI$USZ" resolve="jetbrains.mps.logic.firstOrder" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="4$bYnYI$V3j" role="3bR37C">
-          <node concept="1Busua" id="4$bYnYI$V3k" role="1SiIV1">
-            <ref role="1Busuk" node="4$bYnYI$UTN" resolve="jetbrains.mps.logic.herbrand" />
+            <ref role="3bR37D" node="4$bYnYI$USZ" resolve="samples.fitch.firstOrderLogic" />
           </node>
         </node>
       </node>
       <node concept="1E1JtA" id="4$bYnYI$ZFL" role="2G$12L">
         <property role="BnDLt" value="true" />
-        <property role="TrG5h" value="jetbrains.mps.fitch.demo" />
+        <property role="TrG5h" value="samples.fitch.demo" />
         <property role="3LESm3" value="86925f4e-7856-4553-a261-c86fbf09bb52" />
         <property role="2GAjPV" value="false" />
         <node concept="55IIr" id="4$bYnYI$ZFO" role="3LF7KH">
           <node concept="2Ry0Ak" id="4$bYnYI$ZGE" role="iGT6I">
             <property role="2Ry0Am" value="solutions" />
             <node concept="2Ry0Ak" id="4$bYnYI$ZGJ" role="2Ry0An">
-              <property role="2Ry0Am" value="jetbrains.mps.fitch.demo" />
-              <node concept="2Ry0Ak" id="3kk50IPESSV" role="2Ry0An">
-                <property role="2Ry0Am" value="jetbrains.mps.fitch.demo.msd" />
+              <property role="2Ry0Am" value="samples.fitch.demo" />
+              <node concept="2Ry0Ak" id="58VeaO3ARYO" role="2Ry0An">
+                <property role="2Ry0Am" value="samples.fitch.demo.msd" />
               </node>
             </node>
           </node>
diff --git a/samples/fitch/solutions/jetbrains.mps.fitch.build/jetbrains.mps.fitch.build.msd b/samples/fitch/solutions/samples.fitch.build/samples.fitch.build.msd
similarity index 89%
rename from samples/fitch/solutions/jetbrains.mps.fitch.build/jetbrains.mps.fitch.build.msd
rename to samples/fitch/solutions/samples.fitch.build/samples.fitch.build.msd
index fa579b34..0d471398 100644
--- a/samples/fitch/solutions/jetbrains.mps.fitch.build/jetbrains.mps.fitch.build.msd
+++ b/samples/fitch/solutions/samples.fitch.build/samples.fitch.build.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="jetbrains.mps.fitch.build" uuid="31f024b3-c834-4c99-a06a-f90a46c76e7e" moduleVersion="0" compileInMPS="true">
+<solution name="samples.fitch.build" uuid="31f024b3-c834-4c99-a06a-f90a46c76e7e" moduleVersion="0" compileInMPS="true">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
@@ -24,9 +24,9 @@
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
   <dependencyVersions>
-    <module reference="31f024b3-c834-4c99-a06a-f90a46c76e7e(jetbrains.mps.fitch.build)" version="0" />
     <module reference="422c2909-59d6-41a9-b318-40e6256b250f(jetbrains.mps.ide.build)" version="0" />
     <module reference="bc9cd1e7-827b-4d61-b111-d2c896dcae6f(jetbrains.mps.typechecking.build)" version="0" />
+    <module reference="31f024b3-c834-4c99-a06a-f90a46c76e7e(samples.fitch.build)" version="0" />
   </dependencyVersions>
 </solution>
 
diff --git a/samples/fitch/solutions/jetbrains.mps.fitch.demo/models/jetbrains.mps.fitch.firstOrder.mps b/samples/fitch/solutions/samples.fitch.demo/models/firstOrderLogic.mps
similarity index 84%
rename from samples/fitch/solutions/jetbrains.mps.fitch.demo/models/jetbrains.mps.fitch.firstOrder.mps
rename to samples/fitch/solutions/samples.fitch.demo/models/firstOrderLogic.mps
index 9ded6a75..fdb408f0 100644
--- a/samples/fitch/solutions/jetbrains.mps.fitch.demo/models/jetbrains.mps.fitch.firstOrder.mps
+++ b/samples/fitch/solutions/samples.fitch.demo/models/firstOrderLogic.mps
@@ -1,68 +1,68 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:2deee13f-4a3d-4229-ad45-9e5b85327419(jetbrains.mps.fitch.firstOrder)">
+<model ref="r:2deee13f-4a3d-4229-ad45-9e5b85327419(samples.fitch.demo.firstOrderLogic)">
   <persistence version="9" />
   <languages>
-    <use id="ddb01c98-e78e-4c79-b11a-aeba193668d4" name="jetbrains.mps.logic.firstOrder" version="0" />
+    <use id="ddb01c98-e78e-4c79-b11a-aeba193668d4" name="samples.fitch.firstOrderLogic" version="0" />
   </languages>
   <imports />
   <registry>
-    <language id="ddb01c98-e78e-4c79-b11a-aeba193668d4" name="jetbrains.mps.logic.firstOrder">
-      <concept id="4035326440040001483" name="jetbrains.mps.logic.firstOrder.structure.Equality" flags="ng" index="1rkNff">
+    <language id="ddb01c98-e78e-4c79-b11a-aeba193668d4" name="samples.fitch.firstOrderLogic">
+      <concept id="4035326440040001483" name="samples.fitch.firstOrderLogic.structure.Equality" flags="ng" index="1rkNff">
         <child id="4035326440040001493" name="left" index="1rkNfh" />
         <child id="4035326440040001495" name="right" index="1rkNfj" />
       </concept>
-      <concept id="4035326440039997715" name="jetbrains.mps.logic.firstOrder.structure.EqualityElim" flags="ng" index="1rkNOn" />
-      <concept id="4035326440039985580" name="jetbrains.mps.logic.firstOrder.structure.FirstOrderProof" flags="ng" index="1rkQQC" />
+      <concept id="4035326440039997715" name="samples.fitch.firstOrderLogic.structure.EqualityElim" flags="ng" index="1rkNOn" />
+      <concept id="4035326440039985580" name="samples.fitch.firstOrderLogic.structure.FirstOrderProof" flags="ng" index="1rkQQC" />
     </language>
-    <language id="ec79e64d-4cbb-4f6c-b7b7-108dd125aba6" name="jetbrains.mps.logic.propositional">
-      <concept id="4322786184247881317" name="jetbrains.mps.logic.propositional.structure.OrElim" flags="ng" index="2jWz54" />
-      <concept id="4322786184247901129" name="jetbrains.mps.logic.propositional.structure.IfIntro" flags="ng" index="2jWAjC" />
-      <concept id="4322786184247817766" name="jetbrains.mps.logic.propositional.structure.Or" flags="ng" index="2jWM$7">
+    <language id="ec79e64d-4cbb-4f6c-b7b7-108dd125aba6" name="samples.fitch.propositionalLogic">
+      <concept id="4322786184247881317" name="samples.fitch.propositionalLogic.structure.OrElim" flags="ng" index="2jWz54" />
+      <concept id="4322786184247901129" name="samples.fitch.propositionalLogic.structure.IfIntro" flags="ng" index="2jWAjC" />
+      <concept id="4322786184247817766" name="samples.fitch.propositionalLogic.structure.Or" flags="ng" index="2jWM$7">
         <child id="4322786184247817796" name="disjunct" index="2jWM__" />
       </concept>
-      <concept id="4322786184247817809" name="jetbrains.mps.logic.propositional.structure.If" flags="ng" index="2jWM_K">
+      <concept id="4322786184247817809" name="samples.fitch.propositionalLogic.structure.If" flags="ng" index="2jWM_K">
         <child id="4322786184247817810" name="antecedent" index="2jWM_N" />
         <child id="4322786184247817812" name="consequent" index="2jWM_P" />
       </concept>
     </language>
-    <language id="06b7c5c7-e359-4f4b-a581-5d0c9323af39" name="jetbrains.mps.fitch">
-      <concept id="4322786184247881124" name="jetbrains.mps.fitch.structure.SubProof" flags="ng" index="2jWza5">
+    <language id="06b7c5c7-e359-4f4b-a581-5d0c9323af39" name="samples.fitch">
+      <concept id="4322786184247881124" name="samples.fitch.structure.SubProof" flags="ng" index="2jWza5">
         <child id="4322786184247881125" name="content" index="2jWza4" />
       </concept>
-      <concept id="4322786184247859218" name="jetbrains.mps.fitch.structure.Assumption" flags="ng" index="2jWGsN" />
-      <concept id="4322786184247854968" name="jetbrains.mps.fitch.structure.Reasoning" flags="ng" index="2jWHxp">
+      <concept id="4322786184247859218" name="samples.fitch.structure.Assumption" flags="ng" index="2jWGsN" />
+      <concept id="4322786184247854968" name="samples.fitch.structure.Reasoning" flags="ng" index="2jWHxp">
         <child id="2497161927181071993" name="conclusion" index="3MT$nN" />
       </concept>
-      <concept id="4322786184247818022" name="jetbrains.mps.fitch.structure.Judgement" flags="ng" index="2jWMw7">
+      <concept id="4322786184247818022" name="samples.fitch.structure.Judgement" flags="ng" index="2jWMw7">
         <child id="4322786184247848320" name="basis" index="2jWFax" />
       </concept>
-      <concept id="4322786184247818035" name="jetbrains.mps.fitch.structure.Reference" flags="ng" index="2jWMwi">
+      <concept id="4322786184247818035" name="samples.fitch.structure.Reference" flags="ng" index="2jWMwi">
         <reference id="4322786184247818157" name="reasoning" index="2jWMyc" />
       </concept>
-      <concept id="657004910291123662" name="jetbrains.mps.fitch.structure.Premise" flags="ng" index="GydIM" />
-      <concept id="657004910291159432" name="jetbrains.mps.fitch.structure.Goal" flags="ng" index="GyqZO">
+      <concept id="657004910291123662" name="samples.fitch.structure.Premise" flags="ng" index="GydIM" />
+      <concept id="657004910291159432" name="samples.fitch.structure.Goal" flags="ng" index="GyqZO">
         <child id="657004910291159433" name="sentence" index="GyqZP" />
       </concept>
-      <concept id="4035326440038975469" name="jetbrains.mps.fitch.structure.AbstractProof" flags="ng" index="1rgTJD">
+      <concept id="4035326440038975469" name="samples.fitch.structure.AbstractProof" flags="ng" index="1rgTJD">
         <property id="2994859399702197792" name="description" index="26WHrx" />
         <child id="4322786184248036774" name="content" index="2jVTa7" />
         <child id="657004910291159451" name="goal" index="GyqZB" />
       </concept>
     </language>
-    <language id="748b3ba1-2791-4ee8-b985-a5598baa7112" name="jetbrains.mps.logic.herbrand">
-      <concept id="3059457401299011405" name="jetbrains.mps.logic.herbrand.structure.Forall" flags="ng" index="3jEQs6">
+    <language id="748b3ba1-2791-4ee8-b985-a5598baa7112" name="samples.fitch.herbrandLogic">
+      <concept id="3059457401299011405" name="samples.fitch.herbrandLogic.structure.Forall" flags="ng" index="3jEQs6">
         <child id="3059457401299011419" name="variable" index="3jEQsg" />
         <child id="3059457401299011420" name="sentence" index="3jEQsn" />
       </concept>
-      <concept id="3059457401299011425" name="jetbrains.mps.logic.herbrand.structure.Relation" flags="ng" index="3jEQsE">
+      <concept id="3059457401299011425" name="samples.fitch.herbrandLogic.structure.Relation" flags="ng" index="3jEQsE">
         <child id="3059457401299011435" name="member" index="3jEQsw" />
       </concept>
-      <concept id="3059457401299011374" name="jetbrains.mps.logic.herbrand.structure.Object" flags="ng" index="3jEQt_" />
-      <concept id="3059457401299011378" name="jetbrains.mps.logic.herbrand.structure.Variable" flags="ng" index="3jEQtT" />
-      <concept id="3059457401299011381" name="jetbrains.mps.logic.herbrand.structure.Function" flags="ng" index="3jEQtY">
+      <concept id="3059457401299011374" name="samples.fitch.herbrandLogic.structure.Object" flags="ng" index="3jEQt_" />
+      <concept id="3059457401299011378" name="samples.fitch.herbrandLogic.structure.Variable" flags="ng" index="3jEQtT" />
+      <concept id="3059457401299011381" name="samples.fitch.herbrandLogic.structure.Function" flags="ng" index="3jEQtY">
         <child id="3059457401299011423" name="argument" index="3jEQsk" />
       </concept>
-      <concept id="1069765272453957482" name="jetbrains.mps.logic.herbrand.structure.ForallElim" flags="ng" index="3Zs_qM" />
+      <concept id="1069765272453957482" name="samples.fitch.herbrandLogic.structure.ForallElim" flags="ng" index="3Zs_qM" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
       <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
diff --git a/samples/fitch/solutions/jetbrains.mps.fitch.demo/models/jetbrains.mps.fitch.herbrand.mps b/samples/fitch/solutions/samples.fitch.demo/models/herbrandLogic.mps
similarity index 77%
rename from samples/fitch/solutions/jetbrains.mps.fitch.demo/models/jetbrains.mps.fitch.herbrand.mps
rename to samples/fitch/solutions/samples.fitch.demo/models/herbrandLogic.mps
index 8ee65dac..d2a74cbf 100644
--- a/samples/fitch/solutions/jetbrains.mps.fitch.demo/models/jetbrains.mps.fitch.herbrand.mps
+++ b/samples/fitch/solutions/samples.fitch.demo/models/herbrandLogic.mps
@@ -1,61 +1,61 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:8762d21a-5bfe-45a2-8a7c-66fa5147f3db(jetbrains.mps.fitch.herbrand)">
+<model ref="r:8762d21a-5bfe-45a2-8a7c-66fa5147f3db(samples.fitch.demo.herbrandLogic)">
   <persistence version="9" />
   <languages>
-    <use id="06b7c5c7-e359-4f4b-a581-5d0c9323af39" name="jetbrains.mps.fitch" version="1" />
-    <use id="748b3ba1-2791-4ee8-b985-a5598baa7112" name="jetbrains.mps.logic.herbrand" version="0" />
-    <use id="ec79e64d-4cbb-4f6c-b7b7-108dd125aba6" name="jetbrains.mps.logic.propositional" version="0" />
+    <use id="06b7c5c7-e359-4f4b-a581-5d0c9323af39" name="samples.fitch" version="1" />
+    <use id="748b3ba1-2791-4ee8-b985-a5598baa7112" name="samples.fitch.herbrandLogic" version="0" />
+    <use id="ec79e64d-4cbb-4f6c-b7b7-108dd125aba6" name="samples.fitch.propositionalLogic" version="0" />
   </languages>
   <imports />
   <registry>
-    <language id="ec79e64d-4cbb-4f6c-b7b7-108dd125aba6" name="jetbrains.mps.logic.propositional">
-      <concept id="4322786184247901129" name="jetbrains.mps.logic.propositional.structure.IfIntro" flags="ng" index="2jWAjC" />
-      <concept id="4322786184247817809" name="jetbrains.mps.logic.propositional.structure.If" flags="ng" index="2jWM_K">
+    <language id="ec79e64d-4cbb-4f6c-b7b7-108dd125aba6" name="samples.fitch.propositionalLogic">
+      <concept id="4322786184247901129" name="samples.fitch.propositionalLogic.structure.IfIntro" flags="ng" index="2jWAjC" />
+      <concept id="4322786184247817809" name="samples.fitch.propositionalLogic.structure.If" flags="ng" index="2jWM_K">
         <child id="4322786184247817810" name="antecedent" index="2jWM_N" />
         <child id="4322786184247817812" name="consequent" index="2jWM_P" />
       </concept>
     </language>
-    <language id="06b7c5c7-e359-4f4b-a581-5d0c9323af39" name="jetbrains.mps.fitch">
-      <concept id="4322786184247881124" name="jetbrains.mps.fitch.structure.SubProof" flags="ng" index="2jWza5">
+    <language id="06b7c5c7-e359-4f4b-a581-5d0c9323af39" name="samples.fitch">
+      <concept id="4322786184247881124" name="samples.fitch.structure.SubProof" flags="ng" index="2jWza5">
         <child id="4322786184247881125" name="content" index="2jWza4" />
       </concept>
-      <concept id="4322786184247859218" name="jetbrains.mps.fitch.structure.Assumption" flags="ng" index="2jWGsN" />
-      <concept id="4322786184247854968" name="jetbrains.mps.fitch.structure.Reasoning" flags="ng" index="2jWHxp">
+      <concept id="4322786184247859218" name="samples.fitch.structure.Assumption" flags="ng" index="2jWGsN" />
+      <concept id="4322786184247854968" name="samples.fitch.structure.Reasoning" flags="ng" index="2jWHxp">
         <child id="2497161927181071993" name="conclusion" index="3MT$nN" />
       </concept>
-      <concept id="4322786184247818022" name="jetbrains.mps.fitch.structure.Judgement" flags="ng" index="2jWMw7">
+      <concept id="4322786184247818022" name="samples.fitch.structure.Judgement" flags="ng" index="2jWMw7">
         <child id="4322786184247848320" name="basis" index="2jWFax" />
       </concept>
-      <concept id="4322786184247818035" name="jetbrains.mps.fitch.structure.Reference" flags="ng" index="2jWMwi">
+      <concept id="4322786184247818035" name="samples.fitch.structure.Reference" flags="ng" index="2jWMwi">
         <reference id="4322786184247818157" name="reasoning" index="2jWMyc" />
       </concept>
-      <concept id="657004910291123662" name="jetbrains.mps.fitch.structure.Premise" flags="ng" index="GydIM" />
-      <concept id="657004910291159432" name="jetbrains.mps.fitch.structure.Goal" flags="ng" index="GyqZO">
+      <concept id="657004910291123662" name="samples.fitch.structure.Premise" flags="ng" index="GydIM" />
+      <concept id="657004910291159432" name="samples.fitch.structure.Goal" flags="ng" index="GyqZO">
         <child id="657004910291159433" name="sentence" index="GyqZP" />
       </concept>
-      <concept id="4035326440038975469" name="jetbrains.mps.fitch.structure.AbstractProof" flags="ng" index="1rgTJD">
+      <concept id="4035326440038975469" name="samples.fitch.structure.AbstractProof" flags="ng" index="1rgTJD">
         <property id="2994859399702197792" name="description" index="26WHrx" />
         <child id="4322786184248036774" name="content" index="2jVTa7" />
         <child id="657004910291159451" name="goal" index="GyqZB" />
       </concept>
     </language>
-    <language id="748b3ba1-2791-4ee8-b985-a5598baa7112" name="jetbrains.mps.logic.herbrand">
-      <concept id="3059457401299011405" name="jetbrains.mps.logic.herbrand.structure.Forall" flags="ng" index="3jEQs6">
+    <language id="748b3ba1-2791-4ee8-b985-a5598baa7112" name="samples.fitch.herbrandLogic">
+      <concept id="3059457401299011405" name="samples.fitch.herbrandLogic.structure.Forall" flags="ng" index="3jEQs6">
         <child id="3059457401299011419" name="variable" index="3jEQsg" />
         <child id="3059457401299011420" name="sentence" index="3jEQsn" />
       </concept>
-      <concept id="3059457401299011411" name="jetbrains.mps.logic.herbrand.structure.Exists" flags="ng" index="3jEQso">
+      <concept id="3059457401299011411" name="samples.fitch.herbrandLogic.structure.Exists" flags="ng" index="3jEQso">
         <child id="3059457401299011416" name="variable" index="3jEQsj" />
         <child id="3059457401299011414" name="sentence" index="3jEQst" />
       </concept>
-      <concept id="3059457401299011425" name="jetbrains.mps.logic.herbrand.structure.Relation" flags="ng" index="3jEQsE">
+      <concept id="3059457401299011425" name="samples.fitch.herbrandLogic.structure.Relation" flags="ng" index="3jEQsE">
         <child id="3059457401299011435" name="member" index="3jEQsw" />
       </concept>
-      <concept id="3059457401299011378" name="jetbrains.mps.logic.herbrand.structure.Variable" flags="ng" index="3jEQtT" />
-      <concept id="4035326440038749016" name="jetbrains.mps.logic.herbrand.structure.HerbrandProof" flags="ng" index="1rg0Xs" />
-      <concept id="1069765272453957481" name="jetbrains.mps.logic.herbrand.structure.ForallIntro" flags="ng" index="3Zs_qL" />
-      <concept id="1069765272453957482" name="jetbrains.mps.logic.herbrand.structure.ForallElim" flags="ng" index="3Zs_qM" />
-      <concept id="1069765272453957484" name="jetbrains.mps.logic.herbrand.structure.ExistsElim" flags="ng" index="3Zs_qO" />
+      <concept id="3059457401299011378" name="samples.fitch.herbrandLogic.structure.Variable" flags="ng" index="3jEQtT" />
+      <concept id="4035326440038749016" name="samples.fitch.herbrandLogic.structure.HerbrandProof" flags="ng" index="1rg0Xs" />
+      <concept id="1069765272453957481" name="samples.fitch.herbrandLogic.structure.ForallIntro" flags="ng" index="3Zs_qL" />
+      <concept id="1069765272453957482" name="samples.fitch.herbrandLogic.structure.ForallElim" flags="ng" index="3Zs_qM" />
+      <concept id="1069765272453957484" name="samples.fitch.herbrandLogic.structure.ExistsElim" flags="ng" index="3Zs_qO" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
       <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
diff --git a/samples/fitch/solutions/jetbrains.mps.fitch.demo/models/jetbrains.mps.fitch.propositional.mps b/samples/fitch/solutions/samples.fitch.demo/models/propositionalLogic.mps
similarity index 94%
rename from samples/fitch/solutions/jetbrains.mps.fitch.demo/models/jetbrains.mps.fitch.propositional.mps
rename to samples/fitch/solutions/samples.fitch.demo/models/propositionalLogic.mps
index 0bd63222..93d3851e 100644
--- a/samples/fitch/solutions/jetbrains.mps.fitch.demo/models/jetbrains.mps.fitch.propositional.mps
+++ b/samples/fitch/solutions/samples.fitch.demo/models/propositionalLogic.mps
@@ -1,63 +1,63 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:ff7f5a29-d9b8-40f0-b446-35696305dff0(jetbrains.mps.fitch.propositional)">
+<model ref="r:ff7f5a29-d9b8-40f0-b446-35696305dff0(samples.fitch.demo.propositionalLogic)">
   <persistence version="9" />
   <languages>
-    <use id="06b7c5c7-e359-4f4b-a581-5d0c9323af39" name="jetbrains.mps.fitch" version="1" />
-    <use id="ec79e64d-4cbb-4f6c-b7b7-108dd125aba6" name="jetbrains.mps.logic.propositional" version="-1" />
+    <use id="06b7c5c7-e359-4f4b-a581-5d0c9323af39" name="samples.fitch" version="1" />
+    <use id="ec79e64d-4cbb-4f6c-b7b7-108dd125aba6" name="samples.fitch.propositionalLogic" version="-1" />
   </languages>
   <imports />
   <registry>
-    <language id="ec79e64d-4cbb-4f6c-b7b7-108dd125aba6" name="jetbrains.mps.logic.propositional">
-      <concept id="4322786184247881315" name="jetbrains.mps.logic.propositional.structure.AndElim" flags="ng" index="2jWz52" />
-      <concept id="4322786184247881317" name="jetbrains.mps.logic.propositional.structure.OrElim" flags="ng" index="2jWz54" />
-      <concept id="4322786184247881316" name="jetbrains.mps.logic.propositional.structure.OrIntro" flags="ng" index="2jWz55" />
-      <concept id="4322786184247881318" name="jetbrains.mps.logic.propositional.structure.NotIntro" flags="ng" index="2jWz57" />
-      <concept id="4322786184247881194" name="jetbrains.mps.logic.propositional.structure.AndIntro" flags="ng" index="2jWzbb" />
-      <concept id="4322786184247901129" name="jetbrains.mps.logic.propositional.structure.IfIntro" flags="ng" index="2jWAjC" />
-      <concept id="4322786184247901128" name="jetbrains.mps.logic.propositional.structure.NotElim" flags="ng" index="2jWAjD" />
-      <concept id="4322786184247901143" name="jetbrains.mps.logic.propositional.structure.IffIntro" flags="ng" index="2jWAjQ" />
-      <concept id="4322786184247901142" name="jetbrains.mps.logic.propositional.structure.IfElim" flags="ng" index="2jWAjR" />
-      <concept id="4322786184247901144" name="jetbrains.mps.logic.propositional.structure.IffElim" flags="ng" index="2jWAjT" />
-      <concept id="4322786184247805384" name="jetbrains.mps.logic.propositional.structure.Proposition" flags="ng" index="2jWLFD" />
-      <concept id="4322786184247805399" name="jetbrains.mps.logic.propositional.structure.Not" flags="ng" index="2jWLFQ">
+    <language id="ec79e64d-4cbb-4f6c-b7b7-108dd125aba6" name="samples.fitch.propositionalLogic">
+      <concept id="4322786184247881315" name="samples.fitch.propositionalLogic.structure.AndElim" flags="ng" index="2jWz52" />
+      <concept id="4322786184247881317" name="samples.fitch.propositionalLogic.structure.OrElim" flags="ng" index="2jWz54" />
+      <concept id="4322786184247881316" name="samples.fitch.propositionalLogic.structure.OrIntro" flags="ng" index="2jWz55" />
+      <concept id="4322786184247881318" name="samples.fitch.propositionalLogic.structure.NotIntro" flags="ng" index="2jWz57" />
+      <concept id="4322786184247881194" name="samples.fitch.propositionalLogic.structure.AndIntro" flags="ng" index="2jWzbb" />
+      <concept id="4322786184247901129" name="samples.fitch.propositionalLogic.structure.IfIntro" flags="ng" index="2jWAjC" />
+      <concept id="4322786184247901128" name="samples.fitch.propositionalLogic.structure.NotElim" flags="ng" index="2jWAjD" />
+      <concept id="4322786184247901143" name="samples.fitch.propositionalLogic.structure.IffIntro" flags="ng" index="2jWAjQ" />
+      <concept id="4322786184247901142" name="samples.fitch.propositionalLogic.structure.IfElim" flags="ng" index="2jWAjR" />
+      <concept id="4322786184247901144" name="samples.fitch.propositionalLogic.structure.IffElim" flags="ng" index="2jWAjT" />
+      <concept id="4322786184247805384" name="samples.fitch.propositionalLogic.structure.Proposition" flags="ng" index="2jWLFD" />
+      <concept id="4322786184247805399" name="samples.fitch.propositionalLogic.structure.Not" flags="ng" index="2jWLFQ">
         <child id="4322786184247805400" name="target" index="2jWLFT" />
       </concept>
-      <concept id="4322786184247818020" name="jetbrains.mps.logic.propositional.structure.PropositionalProof" flags="ng" index="2jWMw5" />
-      <concept id="4322786184247817766" name="jetbrains.mps.logic.propositional.structure.Or" flags="ng" index="2jWM$7">
+      <concept id="4322786184247818020" name="samples.fitch.propositionalLogic.structure.PropositionalProof" flags="ng" index="2jWMw5" />
+      <concept id="4322786184247817766" name="samples.fitch.propositionalLogic.structure.Or" flags="ng" index="2jWM$7">
         <child id="4322786184247817796" name="disjunct" index="2jWM__" />
       </concept>
-      <concept id="4322786184247817809" name="jetbrains.mps.logic.propositional.structure.If" flags="ng" index="2jWM_K">
+      <concept id="4322786184247817809" name="samples.fitch.propositionalLogic.structure.If" flags="ng" index="2jWM_K">
         <child id="4322786184247817810" name="antecedent" index="2jWM_N" />
         <child id="4322786184247817812" name="consequent" index="2jWM_P" />
       </concept>
-      <concept id="4322786184247817953" name="jetbrains.mps.logic.propositional.structure.Iff" flags="ng" index="2jWMB0">
+      <concept id="4322786184247817953" name="samples.fitch.propositionalLogic.structure.Iff" flags="ng" index="2jWMB0">
         <child id="4322786184247817963" name="antecedent" index="2jWMBa" />
         <child id="4322786184247817964" name="consequent" index="2jWMBd" />
       </concept>
-      <concept id="4322786184247817723" name="jetbrains.mps.logic.propositional.structure.And" flags="ng" index="2jWMFq">
+      <concept id="4322786184247817723" name="samples.fitch.propositionalLogic.structure.And" flags="ng" index="2jWMFq">
         <child id="4322786184247817724" name="conjunct" index="2jWMFt" />
       </concept>
     </language>
-    <language id="06b7c5c7-e359-4f4b-a581-5d0c9323af39" name="jetbrains.mps.fitch">
-      <concept id="4322786184247881124" name="jetbrains.mps.fitch.structure.SubProof" flags="ng" index="2jWza5">
+    <language id="06b7c5c7-e359-4f4b-a581-5d0c9323af39" name="samples.fitch">
+      <concept id="4322786184247881124" name="samples.fitch.structure.SubProof" flags="ng" index="2jWza5">
         <child id="4322786184247881125" name="content" index="2jWza4" />
       </concept>
-      <concept id="4322786184247859218" name="jetbrains.mps.fitch.structure.Assumption" flags="ng" index="2jWGsN" />
-      <concept id="4322786184247854968" name="jetbrains.mps.fitch.structure.Reasoning" flags="ng" index="2jWHxp">
+      <concept id="4322786184247859218" name="samples.fitch.structure.Assumption" flags="ng" index="2jWGsN" />
+      <concept id="4322786184247854968" name="samples.fitch.structure.Reasoning" flags="ng" index="2jWHxp">
         <child id="2497161927181071993" name="conclusion" index="3MT$nN" />
       </concept>
-      <concept id="4322786184247818022" name="jetbrains.mps.fitch.structure.Judgement" flags="ng" index="2jWMw7">
+      <concept id="4322786184247818022" name="samples.fitch.structure.Judgement" flags="ng" index="2jWMw7">
         <child id="4322786184247848320" name="basis" index="2jWFax" />
       </concept>
-      <concept id="4322786184247818035" name="jetbrains.mps.fitch.structure.Reference" flags="ng" index="2jWMwi">
+      <concept id="4322786184247818035" name="samples.fitch.structure.Reference" flags="ng" index="2jWMwi">
         <reference id="4322786184247818157" name="reasoning" index="2jWMyc" />
       </concept>
-      <concept id="657004910291123662" name="jetbrains.mps.fitch.structure.Premise" flags="ng" index="GydIM" />
-      <concept id="657004910291159432" name="jetbrains.mps.fitch.structure.Goal" flags="ng" index="GyqZO">
+      <concept id="657004910291123662" name="samples.fitch.structure.Premise" flags="ng" index="GydIM" />
+      <concept id="657004910291159432" name="samples.fitch.structure.Goal" flags="ng" index="GyqZO">
         <child id="657004910291159433" name="sentence" index="GyqZP" />
       </concept>
-      <concept id="6123633795074140037" name="jetbrains.mps.fitch.structure.Reiteration" flags="ng" index="1l0MfV" />
-      <concept id="4035326440038975469" name="jetbrains.mps.fitch.structure.AbstractProof" flags="ng" index="1rgTJD">
+      <concept id="6123633795074140037" name="samples.fitch.structure.Reiteration" flags="ng" index="1l0MfV" />
+      <concept id="4035326440038975469" name="samples.fitch.structure.AbstractProof" flags="ng" index="1rgTJD">
         <property id="2994859399702197792" name="description" index="26WHrx" />
         <child id="4322786184248036774" name="content" index="2jVTa7" />
         <child id="657004910291159451" name="goal" index="GyqZB" />
diff --git a/samples/fitch/solutions/samples.fitch.demo/samples.fitch.demo.msd b/samples/fitch/solutions/samples.fitch.demo/samples.fitch.demo.msd
new file mode 100644
index 00000000..72269b10
--- /dev/null
+++ b/samples/fitch/solutions/samples.fitch.demo/samples.fitch.demo.msd
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<solution name="samples.fitch.demo" uuid="86925f4e-7856-4553-a261-c86fbf09bb52" moduleVersion="0" compileInMPS="true">
+  <models>
+    <modelRoot contentPath="${module}" type="default">
+      <sourceRoot location="models" />
+    </modelRoot>
+  </models>
+  <sourcePath />
+  <languageVersions>
+    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
+    <language slang="l:06b7c5c7-e359-4f4b-a581-5d0c9323af39:samples.fitch" version="1" />
+    <language slang="l:ddb01c98-e78e-4c79-b11a-aeba193668d4:samples.fitch.logic.firstOrder" version="0" />
+    <language slang="l:748b3ba1-2791-4ee8-b985-a5598baa7112:samples.fitch.logic.herbrand" version="0" />
+    <language slang="l:ec79e64d-4cbb-4f6c-b7b7-108dd125aba6:samples.fitch.logic.propositional" version="-1" />
+  </languageVersions>
+  <dependencyVersions>
+    <module reference="86925f4e-7856-4553-a261-c86fbf09bb52(samples.fitch.demo)" version="0" />
+  </dependencyVersions>
+</solution>
+