diff --git a/build.xml b/build.xml
index 5f517b1a..7e687efb 100644
--- a/build.xml
+++ b/build.xml
@@ -56,6 +56,7 @@
     </echoxml>
     <jar destfile="${build.layout}/deploy/jetbrains.mps.coderules.build.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.coderules.build" />
+      <fileset dir="${basedir}/coderules/solutions/jetbrains.mps.coderules.build" includes="icons/**, resources/**" />
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.build/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.coderules.build.jar" />
     </jar>
@@ -753,6 +754,7 @@
     </echoxml>
     <jar destfile="${build.layout}/deploy/jetbrains.mps.coderules.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.coderules" />
+      <fileset dir="${basedir}/coderules/solutions/jetbrains.mps.coderules" includes="icons/**, resources/**" />
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.coderules.jar" />
     </jar>
@@ -819,6 +821,7 @@
     </echoxml>
     <jar destfile="${build.layout}/deploy/jetbrains.mps.coderules.ui.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.coderules.ui" />
+      <fileset dir="${basedir}/coderules/solutions/jetbrains.mps.coderules.ui" includes="icons/**, resources/**" />
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.ui/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.coderules.ui.jar" />
     </jar>
@@ -887,6 +890,7 @@
     </echoxml>
     <jar destfile="${build.layout}/deploy/jetbrains.mps.coderules.test.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.coderules.test" />
+      <fileset dir="${basedir}/coderules/solutions/jetbrains.mps.coderules.test" includes="icons/**, resources/**" />
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.test/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.coderules.test.jar" />
     </jar>
@@ -974,6 +978,7 @@
     </echoxml>
     <jar destfile="${build.layout}/deploy/jetbrains.mps.lang.typechecking.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.typechecking" />
+      <fileset dir="${basedir}/coderules/languages/jetbrains.mps.lang.typechecking" includes="icons/**, resources/**" />
       <fileset dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.lang.typechecking/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.lang.typechecking.jar" />
     </jar>
@@ -1089,6 +1094,7 @@
     </echoxml>
     <jar destfile="${build.layout}/deploy/jetbrains.mps.lang.typechecking.runtime.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.typechecking.runtime" />
+      <fileset dir="${basedir}/coderules/solutions/jetbrains.mps.lang.typechecking.runtime" includes="icons/**, resources/**" />
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.lang.typechecking.runtime/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.lang.typechecking.runtime.jar" />
     </jar>
@@ -1336,6 +1342,7 @@
     </echoxml>
     <jar destfile="${build.layout}/deploy/jetbrains.mps.typechecking.testlang.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.typechecking.testlang" />
+      <fileset dir="${basedir}/coderules/languages/jetbrains.mps.typechecking.testlang" includes="icons/**, resources/**" />
       <fileset dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.typechecking.testlang/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.typechecking.testlang.jar" />
     </jar>
@@ -1422,6 +1429,7 @@
     </echoxml>
     <jar destfile="${build.layout}/deploy/jetbrains.mps.coderules.typechecking.testlang.sandbox.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.coderules.typechecking.testlang.sandbox" />
+      <fileset dir="${basedir}/coderules/solutions/jetbrains.mps.coderules.typechecking.testlang.sandbox" includes="icons/**, resources/**" />
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.typechecking.testlang.sandbox/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.coderules.typechecking.testlang.sandbox.jar" />
     </jar>
@@ -1505,6 +1513,7 @@
     </echoxml>
     <jar destfile="${build.layout}/deploy/jetbrains.mps.coderules.typechecking.test.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.coderules.typechecking.test" />
+      <fileset dir="${basedir}/coderules/solutions/jetbrains.mps.coderules.typechecking.test" includes="icons/**, resources/**" />
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.typechecking.test/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.coderules.typechecking.test.jar" />
     </jar>
@@ -1644,6 +1653,7 @@
     </echoxml>
     <jar destfile="${build.layout}/deploy/jetbrains.mps.controlflow.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.controlflow" />
+      <fileset dir="${basedir}/coderules/solutions/jetbrains.mps.controlflow" includes="icons/**, resources/**" />
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.controlflow/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.controlflow.jar" />
     </jar>
@@ -1706,6 +1716,7 @@
     </echoxml>
     <jar destfile="${build.layout}/deploy/jetbrains.mps.controlflow.ui.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.controlflow.ui" />
+      <fileset dir="${basedir}/coderules/solutions/jetbrains.mps.controlflow.ui" includes="icons/**, resources/**" />
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.controlflow.ui/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.controlflow.ui.jar" />
     </jar>
@@ -1789,6 +1800,7 @@
     </echoxml>
     <jar destfile="${build.layout}/deploy/jetbrains.mps.lang.controlflow.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.controlflow" />
+      <fileset dir="${basedir}/coderules/languages/jetbrains.mps.lang.controlflow" includes="icons/**, resources/**" />
       <fileset dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.lang.controlflow/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.lang.controlflow.jar" />
     </jar>
@@ -1900,6 +1912,7 @@
     </echoxml>
     <jar destfile="${build.layout}/deploy/jetbrains.mps.lang.controlflow.runtime.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.controlflow.runtime" />
+      <fileset dir="${basedir}/coderules/solutions/jetbrains.mps.lang.controlflow.runtime" includes="icons/**, resources/**" />
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.lang.controlflow.runtime/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.lang.controlflow.runtime.jar" />
     </jar>
@@ -2055,6 +2068,7 @@
     </echoxml>
     <jar destfile="${build.tmp}/default/coderules-0.5.zip/coderules/languages/jetbrains.mps.coderules.build.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.coderules.build" />
+      <fileset dir="${basedir}/coderules/solutions/jetbrains.mps.coderules.build" includes="icons/**, resources/**" />
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.build/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.coderules.build.jar1" />
     </jar>
@@ -2688,6 +2702,7 @@
     </echoxml>
     <jar destfile="${build.tmp}/default/coderules-0.5.zip/coderules/languages/jetbrains.mps.coderules.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.coderules" />
+      <fileset dir="${basedir}/coderules/solutions/jetbrains.mps.coderules" includes="icons/**, resources/**" />
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.coderules.jar1" />
     </jar>
@@ -2754,6 +2769,7 @@
     </echoxml>
     <jar destfile="${build.tmp}/default/coderules-0.5.zip/coderules/languages/jetbrains.mps.coderules.ui.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.coderules.ui" />
+      <fileset dir="${basedir}/coderules/solutions/jetbrains.mps.coderules.ui" includes="icons/**, resources/**" />
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.ui/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.coderules.ui.jar1" />
     </jar>
@@ -2841,6 +2857,7 @@
     </echoxml>
     <jar destfile="${build.tmp}/default/coderules-0.5.zip/coderules/languages/jetbrains.mps.lang.typechecking.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.typechecking" />
+      <fileset dir="${basedir}/coderules/languages/jetbrains.mps.lang.typechecking" includes="icons/**, resources/**" />
       <fileset dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.lang.typechecking/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.lang.typechecking.jar1" />
     </jar>
@@ -2956,6 +2973,7 @@
     </echoxml>
     <jar destfile="${build.tmp}/default/coderules-0.5.zip/coderules/languages/jetbrains.mps.lang.typechecking.runtime.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.typechecking.runtime" />
+      <fileset dir="${basedir}/coderules/solutions/jetbrains.mps.lang.typechecking.runtime" includes="icons/**, resources/**" />
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.lang.typechecking.runtime/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.lang.typechecking.runtime.jar1" />
     </jar>
@@ -3190,6 +3208,7 @@
     </echoxml>
     <jar destfile="${build.tmp}/default/coderules-0.5.zip/coderules/languages/jetbrains.mps.lang.typechecking.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.typechecking" />
+      <fileset dir="${basedir}/coderules/languages/jetbrains.mps.lang.typechecking" includes="icons/**, resources/**" />
       <fileset dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.lang.typechecking/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.lang.typechecking.jar2" />
     </jar>
@@ -3305,6 +3324,7 @@
     </echoxml>
     <jar destfile="${build.tmp}/default/coderules-0.5.zip/coderules/languages/jetbrains.mps.lang.typechecking.runtime.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.typechecking.runtime" />
+      <fileset dir="${basedir}/coderules/solutions/jetbrains.mps.lang.typechecking.runtime" includes="icons/**, resources/**" />
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.lang.typechecking.runtime/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.lang.typechecking.runtime.jar2" />
     </jar>
@@ -3444,6 +3464,7 @@
     </echoxml>
     <jar destfile="${build.tmp}/default/coderules-0.5.zip/coderules/languages/jetbrains.mps.controlflow.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.controlflow" />
+      <fileset dir="${basedir}/coderules/solutions/jetbrains.mps.controlflow" includes="icons/**, resources/**" />
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.controlflow/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.controlflow.jar1" />
     </jar>
@@ -3506,6 +3527,7 @@
     </echoxml>
     <jar destfile="${build.tmp}/default/coderules-0.5.zip/coderules/languages/jetbrains.mps.controlflow.ui.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.controlflow.ui" />
+      <fileset dir="${basedir}/coderules/solutions/jetbrains.mps.controlflow.ui" includes="icons/**, resources/**" />
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.controlflow.ui/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.controlflow.ui.jar1" />
     </jar>
@@ -3589,6 +3611,7 @@
     </echoxml>
     <jar destfile="${build.tmp}/default/coderules-0.5.zip/coderules/languages/jetbrains.mps.lang.controlflow.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.controlflow" />
+      <fileset dir="${basedir}/coderules/languages/jetbrains.mps.lang.controlflow" includes="icons/**, resources/**" />
       <fileset dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.lang.controlflow/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.lang.controlflow.jar1" />
     </jar>
@@ -3700,6 +3723,7 @@
     </echoxml>
     <jar destfile="${build.tmp}/default/coderules-0.5.zip/coderules/languages/jetbrains.mps.lang.controlflow.runtime.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.controlflow.runtime" />
+      <fileset dir="${basedir}/coderules/solutions/jetbrains.mps.lang.controlflow.runtime" includes="icons/**, resources/**" />
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.lang.controlflow.runtime/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.lang.controlflow.runtime.jar1" />
     </jar>
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
index c0369ad1..8ff4d423 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
@@ -8169,5 +8169,14 @@
       </node>
     </node>
   </node>
+  <node concept="Q6S24" id="7L5omgeruEi">
+    <property role="TrG5h" value="ExpandMacroPrototype_SmartReference" />
+    <property role="3GE5qa" value="macro.decl" />
+    <ref role="aqKnT" to="wq2x:5itBwM6cWQh" resolve="ExpandMacroPrototype" />
+    <node concept="3XHNnq" id="7L5omgeruEh" role="3ft7WO">
+      <ref role="3XGfJA" to="wq2x:5itBwM6dfdw" resolve="applicableConcept" />
+    </node>
+    <node concept="382kZG" id="7L5omgeruEj" role="lGtFl" />
+  </node>
 </model>
 
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps
index 863ec2c8..d2580963 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps
@@ -3,6 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="17" />
+    <use id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources" version="2" />
     <devkit ref="78434eb8-b0e5-444b-850d-e7c4ad2da9ab(jetbrains.mps.devkit.aspect.structure)" />
   </languages>
   <imports>
diff --git a/coderules/languages/jetbrains.mps.lang.controlflow/models/structure.mps b/coderules/languages/jetbrains.mps.lang.controlflow/models/structure.mps
index 9204b975..5949e0be 100644
--- a/coderules/languages/jetbrains.mps.lang.controlflow/models/structure.mps
+++ b/coderules/languages/jetbrains.mps.lang.controlflow/models/structure.mps
@@ -3,6 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="9" />
+    <use id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources" version="2" />
     <devkit ref="78434eb8-b0e5-444b-850d-e7c4ad2da9ab(jetbrains.mps.devkit.aspect.structure)" />
   </languages>
   <imports />
diff --git a/coderules/languages/jetbrains.mps.lang.typechecking/models/structure.mps b/coderules/languages/jetbrains.mps.lang.typechecking/models/structure.mps
index 8d0f5b21..088bab81 100644
--- a/coderules/languages/jetbrains.mps.lang.typechecking/models/structure.mps
+++ b/coderules/languages/jetbrains.mps.lang.typechecking/models/structure.mps
@@ -3,6 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="9" />
+    <use id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources" version="2" />
     <devkit ref="78434eb8-b0e5-444b-850d-e7c4ad2da9ab(jetbrains.mps.devkit.aspect.structure)" />
   </languages>
   <imports>
diff --git a/coderules/languages/jetbrains.mps.logic/generator/template/main@generator.mps b/coderules/languages/jetbrains.mps.logic/generator/template/main@generator.mps
index 6acfb4f0..519ba685 100644
--- a/coderules/languages/jetbrains.mps.logic/generator/template/main@generator.mps
+++ b/coderules/languages/jetbrains.mps.logic/generator/template/main@generator.mps
@@ -331,8 +331,8 @@
       <concept id="7571593955706137573" name="jetbrains.mps.logic.structure.Value" flags="ng" index="1oi5XN">
         <property id="7571593955706137638" name="value" index="1oi5yK" />
       </concept>
-      <concept id="960803923481532811" name="jetbrains.mps.logic.structure.ListNodeCons" flags="ng" index="3wJAYo">
-        <child id="960803923481835574" name="tail" index="3wIGS_" />
+      <concept id="1432138691741609740" name="jetbrains.mps.logic.structure.ConsListNode" flags="ng" index="1Pxxm1">
+        <child id="1432138691741609743" name="tail" index="1Pxxm2" />
       </concept>
     </language>
     <language id="df345b11-b8c7-4213-ac66-48d2a9b75d88" name="jetbrains.mps.baseLanguageInternal">
@@ -3117,8 +3117,8 @@
               </node>
             </node>
           </node>
-          <node concept="3wJAYo" id="1fvYCPA6RLt" role="1oi5TL">
-            <node concept="2IllgU" id="1fvYCPA6RLu" role="3wIGS_" />
+          <node concept="1Pxxm1" id="7L5omgeruXd" role="1oi5TL">
+            <node concept="2IllgU" id="1fvYCPA6RLu" role="1Pxxm2" />
           </node>
         </node>
       </node>
diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/structure.mps b/coderules/languages/jetbrains.mps.logic/languageModels/structure.mps
index 8c918867..fdde05d3 100644
--- a/coderules/languages/jetbrains.mps.logic/languageModels/structure.mps
+++ b/coderules/languages/jetbrains.mps.logic/languageModels/structure.mps
@@ -3,6 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="9" />
+    <use id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources" version="2" />
     <devkit ref="78434eb8-b0e5-444b-850d-e7c4ad2da9ab(jetbrains.mps.devkit.aspect.structure)" />
   </languages>
   <imports>
diff --git a/coderules/solutions/jetbrains.mps.coderules.build/models/jetbrains.mps.coderules.build.mps b/coderules/solutions/jetbrains.mps.coderules.build/models/jetbrains.mps.coderules.build.mps
index 2623481d..8d78dd75 100644
--- a/coderules/solutions/jetbrains.mps.coderules.build/models/jetbrains.mps.coderules.build.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.build/models/jetbrains.mps.coderules.build.mps
@@ -293,6 +293,24 @@
             </node>
           </node>
         </node>
+        <node concept="3rtmxn" id="7L5omgervV_" role="3bR31x">
+          <node concept="3LXTmp" id="7L5omgervVA" role="3rtmxm">
+            <node concept="3qWCbU" id="7L5omgervVB" role="3LXTna">
+              <property role="3qWCbO" value="icons/**, resources/**" />
+            </node>
+            <node concept="55IIr" id="7L5omgervVC" role="3LXTmr">
+              <node concept="2Ry0Ak" id="7L5omgervVD" role="iGT6I">
+                <property role="2Ry0Am" value="coderules" />
+                <node concept="2Ry0Ak" id="7L5omgervVE" role="2Ry0An">
+                  <property role="2Ry0Am" value="solutions" />
+                  <node concept="2Ry0Ak" id="7L5omgervVF" role="2Ry0An">
+                    <property role="2Ry0Am" value="jetbrains.mps.coderules.build" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2G$12M" id="7BVjoXzUxju" role="3989C9">
@@ -862,6 +880,24 @@
             </node>
           </node>
         </node>
+        <node concept="3rtmxn" id="7L5omgervVH" role="3bR31x">
+          <node concept="3LXTmp" id="7L5omgervVI" role="3rtmxm">
+            <node concept="3qWCbU" id="7L5omgervVJ" role="3LXTna">
+              <property role="3qWCbO" value="icons/**, resources/**" />
+            </node>
+            <node concept="55IIr" id="7L5omgervVK" role="3LXTmr">
+              <node concept="2Ry0Ak" id="7L5omgervVL" role="iGT6I">
+                <property role="2Ry0Am" value="coderules" />
+                <node concept="2Ry0Ak" id="7L5omgervVM" role="2Ry0An">
+                  <property role="2Ry0Am" value="solutions" />
+                  <node concept="2Ry0Ak" id="7L5omgervVN" role="2Ry0An">
+                    <property role="2Ry0Am" value="jetbrains.mps.lang.typechecking.runtime" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="NKt6ynvPIP" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -1007,6 +1043,24 @@
             </node>
           </node>
         </node>
+        <node concept="3rtmxn" id="7L5omgervWP" role="3bR31x">
+          <node concept="3LXTmp" id="7L5omgervWQ" role="3rtmxm">
+            <node concept="3qWCbU" id="7L5omgervWR" role="3LXTna">
+              <property role="3qWCbO" value="icons/**, resources/**" />
+            </node>
+            <node concept="55IIr" id="7L5omgervWS" role="3LXTmr">
+              <node concept="2Ry0Ak" id="7L5omgervWT" role="iGT6I">
+                <property role="2Ry0Am" value="coderules" />
+                <node concept="2Ry0Ak" id="7L5omgervWU" role="2Ry0An">
+                  <property role="2Ry0Am" value="languages" />
+                  <node concept="2Ry0Ak" id="7L5omgervWV" role="2Ry0An">
+                    <property role="2Ry0Am" value="jetbrains.mps.lang.typechecking" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="1E1JtA" id="65DJywFj0Fi" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -1449,6 +1503,24 @@
             </node>
           </node>
         </node>
+        <node concept="3rtmxn" id="7L5omgervWX" role="3bR31x">
+          <node concept="3LXTmp" id="7L5omgervWY" role="3rtmxm">
+            <node concept="3qWCbU" id="7L5omgervWZ" role="3LXTna">
+              <property role="3qWCbO" value="icons/**, resources/**" />
+            </node>
+            <node concept="55IIr" id="7L5omgervX0" role="3LXTmr">
+              <node concept="2Ry0Ak" id="7L5omgervX1" role="iGT6I">
+                <property role="2Ry0Am" value="coderules" />
+                <node concept="2Ry0Ak" id="7L5omgervX2" role="2Ry0An">
+                  <property role="2Ry0Am" value="languages" />
+                  <node concept="2Ry0Ak" id="7L5omgervX3" role="2Ry0An">
+                    <property role="2Ry0Am" value="jetbrains.mps.typechecking.testlang" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="1E1JtA" id="7mB3viLuq51" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -1493,6 +1565,24 @@
             </node>
           </node>
         </node>
+        <node concept="3rtmxn" id="7L5omgervVP" role="3bR31x">
+          <node concept="3LXTmp" id="7L5omgervVQ" role="3rtmxm">
+            <node concept="3qWCbU" id="7L5omgervVR" role="3LXTna">
+              <property role="3qWCbO" value="icons/**, resources/**" />
+            </node>
+            <node concept="55IIr" id="7L5omgervVS" role="3LXTmr">
+              <node concept="2Ry0Ak" id="7L5omgervVT" role="iGT6I">
+                <property role="2Ry0Am" value="coderules" />
+                <node concept="2Ry0Ak" id="7L5omgervVU" role="2Ry0An">
+                  <property role="2Ry0Am" value="solutions" />
+                  <node concept="2Ry0Ak" id="7L5omgervVV" role="2Ry0An">
+                    <property role="2Ry0Am" value="jetbrains.mps.coderules.typechecking.testlang.sandbox" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="1E1JtA" id="7mB3viLwG3m" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -1604,6 +1694,24 @@
             </node>
           </node>
         </node>
+        <node concept="3rtmxn" id="7L5omgervVX" role="3bR31x">
+          <node concept="3LXTmp" id="7L5omgervVY" role="3rtmxm">
+            <node concept="3qWCbU" id="7L5omgervVZ" role="3LXTna">
+              <property role="3qWCbO" value="icons/**, resources/**" />
+            </node>
+            <node concept="55IIr" id="7L5omgervW0" role="3LXTmr">
+              <node concept="2Ry0Ak" id="7L5omgervW1" role="iGT6I">
+                <property role="2Ry0Am" value="coderules" />
+                <node concept="2Ry0Ak" id="7L5omgervW2" role="2Ry0An">
+                  <property role="2Ry0Am" value="solutions" />
+                  <node concept="2Ry0Ak" id="7L5omgervW3" role="2Ry0An">
+                    <property role="2Ry0Am" value="jetbrains.mps.coderules.typechecking.test" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2G$12M" id="78H58oeeFzd" role="3989C9">
@@ -1672,6 +1780,24 @@
             </node>
           </node>
         </node>
+        <node concept="3rtmxn" id="7L5omgervW5" role="3bR31x">
+          <node concept="3LXTmp" id="7L5omgervW6" role="3rtmxm">
+            <node concept="3qWCbU" id="7L5omgervW7" role="3LXTna">
+              <property role="3qWCbO" value="icons/**, resources/**" />
+            </node>
+            <node concept="55IIr" id="7L5omgervW8" role="3LXTmr">
+              <node concept="2Ry0Ak" id="7L5omgervW9" role="iGT6I">
+                <property role="2Ry0Am" value="coderules" />
+                <node concept="2Ry0Ak" id="7L5omgervWa" role="2Ry0An">
+                  <property role="2Ry0Am" value="solutions" />
+                  <node concept="2Ry0Ak" id="7L5omgervWb" role="2Ry0An">
+                    <property role="2Ry0Am" value="jetbrains.mps.lang.controlflow.runtime" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="78H58oeeJaR" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -1788,6 +1914,24 @@
             </node>
           </node>
         </node>
+        <node concept="3rtmxn" id="7L5omgervX5" role="3bR31x">
+          <node concept="3LXTmp" id="7L5omgervX6" role="3rtmxm">
+            <node concept="3qWCbU" id="7L5omgervX7" role="3LXTna">
+              <property role="3qWCbO" value="icons/**, resources/**" />
+            </node>
+            <node concept="55IIr" id="7L5omgervX8" role="3LXTmr">
+              <node concept="2Ry0Ak" id="7L5omgervX9" role="iGT6I">
+                <property role="2Ry0Am" value="coderules" />
+                <node concept="2Ry0Ak" id="7L5omgervXa" role="2Ry0An">
+                  <property role="2Ry0Am" value="languages" />
+                  <node concept="2Ry0Ak" id="7L5omgervXb" role="2Ry0An">
+                    <property role="2Ry0Am" value="jetbrains.mps.lang.controlflow" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="1E1JtA" id="78H58oeeGcw" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -1848,6 +1992,24 @@
             </node>
           </node>
         </node>
+        <node concept="3rtmxn" id="7L5omgervWd" role="3bR31x">
+          <node concept="3LXTmp" id="7L5omgervWe" role="3rtmxm">
+            <node concept="3qWCbU" id="7L5omgervWf" role="3LXTna">
+              <property role="3qWCbO" value="icons/**, resources/**" />
+            </node>
+            <node concept="55IIr" id="7L5omgervWg" role="3LXTmr">
+              <node concept="2Ry0Ak" id="7L5omgervWh" role="iGT6I">
+                <property role="2Ry0Am" value="coderules" />
+                <node concept="2Ry0Ak" id="7L5omgervWi" role="2Ry0An">
+                  <property role="2Ry0Am" value="solutions" />
+                  <node concept="2Ry0Ak" id="7L5omgervWj" role="2Ry0An">
+                    <property role="2Ry0Am" value="jetbrains.mps.controlflow" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="1E1JtA" id="78H58oeeI52" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -1943,6 +2105,24 @@
             </node>
           </node>
         </node>
+        <node concept="3rtmxn" id="7L5omgervWl" role="3bR31x">
+          <node concept="3LXTmp" id="7L5omgervWm" role="3rtmxm">
+            <node concept="3qWCbU" id="7L5omgervWn" role="3LXTna">
+              <property role="3qWCbO" value="icons/**, resources/**" />
+            </node>
+            <node concept="55IIr" id="7L5omgervWo" role="3LXTmr">
+              <node concept="2Ry0Ak" id="7L5omgervWp" role="iGT6I">
+                <property role="2Ry0Am" value="coderules" />
+                <node concept="2Ry0Ak" id="7L5omgervWq" role="2Ry0An">
+                  <property role="2Ry0Am" value="solutions" />
+                  <node concept="2Ry0Ak" id="7L5omgervWr" role="2Ry0An">
+                    <property role="2Ry0Am" value="jetbrains.mps.controlflow.ui" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2G$12M" id="7BVjoXzUx6$" role="3989C9">
@@ -2533,6 +2713,24 @@
             </node>
           </node>
         </node>
+        <node concept="3rtmxn" id="7L5omgervWt" role="3bR31x">
+          <node concept="3LXTmp" id="7L5omgervWu" role="3rtmxm">
+            <node concept="3qWCbU" id="7L5omgervWv" role="3LXTna">
+              <property role="3qWCbO" value="icons/**, resources/**" />
+            </node>
+            <node concept="55IIr" id="7L5omgervWw" role="3LXTmr">
+              <node concept="2Ry0Ak" id="7L5omgervWx" role="iGT6I">
+                <property role="2Ry0Am" value="coderules" />
+                <node concept="2Ry0Ak" id="7L5omgervWy" role="2Ry0An">
+                  <property role="2Ry0Am" value="solutions" />
+                  <node concept="2Ry0Ak" id="7L5omgervWz" role="2Ry0An">
+                    <property role="2Ry0Am" value="jetbrains.mps.coderules" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="1E1JtA" id="6Yb9hAqy9L2" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -2622,6 +2820,24 @@
             </node>
           </node>
         </node>
+        <node concept="3rtmxn" id="7L5omgervW_" role="3bR31x">
+          <node concept="3LXTmp" id="7L5omgervWA" role="3rtmxm">
+            <node concept="3qWCbU" id="7L5omgervWB" role="3LXTna">
+              <property role="3qWCbO" value="icons/**, resources/**" />
+            </node>
+            <node concept="55IIr" id="7L5omgervWC" role="3LXTmr">
+              <node concept="2Ry0Ak" id="7L5omgervWD" role="iGT6I">
+                <property role="2Ry0Am" value="coderules" />
+                <node concept="2Ry0Ak" id="7L5omgervWE" role="2Ry0An">
+                  <property role="2Ry0Am" value="solutions" />
+                  <node concept="2Ry0Ak" id="7L5omgervWF" role="2Ry0An">
+                    <property role="2Ry0Am" value="jetbrains.mps.coderules.ui" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2G$12M" id="1Lr58WFO8Mc" role="3989C9">
@@ -2706,6 +2922,24 @@
             </node>
           </node>
         </node>
+        <node concept="3rtmxn" id="7L5omgervWH" role="3bR31x">
+          <node concept="3LXTmp" id="7L5omgervWI" role="3rtmxm">
+            <node concept="3qWCbU" id="7L5omgervWJ" role="3LXTna">
+              <property role="3qWCbO" value="icons/**, resources/**" />
+            </node>
+            <node concept="55IIr" id="7L5omgervWK" role="3LXTmr">
+              <node concept="2Ry0Ak" id="7L5omgervWL" role="iGT6I">
+                <property role="2Ry0Am" value="coderules" />
+                <node concept="2Ry0Ak" id="7L5omgervWM" role="2Ry0An">
+                  <property role="2Ry0Am" value="solutions" />
+                  <node concept="2Ry0Ak" id="7L5omgervWN" role="2Ry0An">
+                    <property role="2Ry0Am" value="jetbrains.mps.coderules.test" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2sgV4H" id="7Ant4WkHLmd" role="1l3spa">
@@ -3105,7 +3339,7 @@
               </node>
             </node>
           </node>
-          <node concept="pUk6x" id="1GKPrS22Kip" role="pUk7w" />
+          <node concept="pUk6x" id="7L5omgervXd" role="pUk7w" />
         </node>
       </node>
     </node>
diff --git a/samples/fitch/build.xml b/samples/fitch/build.xml
index f512b89f..8155465c 100644
--- a/samples/fitch/build.xml
+++ b/samples/fitch/build.xml
@@ -126,6 +126,7 @@
     </echoxml>
     <jar destfile="${build.layout}/modules/samples.fitch.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/samples.fitch" />
+      <fileset dir="${basedir}/languages/samples.fitch" includes="icons/**, resources/**" />
       <fileset dir="${mps.macro.fitch_home}/languages/samples.fitch/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/samples.fitch.jar" />
     </jar>
@@ -278,6 +279,7 @@
     </echoxml>
     <jar destfile="${build.layout}/modules/samples.fitch.firstOrderLogic.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/samples.fitch.firstOrderLogic" />
+      <fileset dir="${basedir}/languages/samples.fitch.firstOrderLogic" includes="icons/**, resources/**" />
       <fileset dir="${mps.macro.fitch_home}/languages/samples.fitch.firstOrderLogic/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/samples.fitch.firstOrderLogic.jar" />
     </jar>
@@ -433,6 +435,7 @@
     </echoxml>
     <jar destfile="${build.layout}/modules/samples.fitch.herbrandLogic.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/samples.fitch.herbrandLogic" />
+      <fileset dir="${basedir}/languages/samples.fitch.herbrandLogic" includes="icons/**, resources/**" />
       <fileset dir="${mps.macro.fitch_home}/languages/samples.fitch.herbrandLogic/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/samples.fitch.herbrandLogic.jar" />
     </jar>
@@ -587,6 +590,7 @@
     </echoxml>
     <jar destfile="${build.layout}/modules/samples.fitch.propositionalLogic.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/samples.fitch.propositionalLogic" />
+      <fileset dir="${basedir}/languages/samples.fitch.propositionalLogic" includes="icons/**, resources/**" />
       <fileset dir="${mps.macro.fitch_home}/languages/samples.fitch.propositionalLogic/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/samples.fitch.propositionalLogic.jar" />
     </jar>
@@ -699,6 +703,7 @@
     </echoxml>
     <jar destfile="${build.layout}/modules/samples.fitch.demo.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/samples.fitch.demo" />
+      <fileset dir="${basedir}/solutions/samples.fitch.demo" includes="icons/**, resources/**" />
       <fileset dir="${mps.macro.fitch_home}/solutions/samples.fitch.demo/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/samples.fitch.demo.jar" />
     </jar>
diff --git a/samples/fitch/solutions/samples.fitch.build/models/samples.fitch.build.mps b/samples/fitch/solutions/samples.fitch.build/models/samples.fitch.build.mps
index a95a1de0..1c38c0e9 100644
--- a/samples/fitch/solutions/samples.fitch.build/models/samples.fitch.build.mps
+++ b/samples/fitch/solutions/samples.fitch.build/models/samples.fitch.build.mps
@@ -67,10 +67,17 @@
         <child id="5617550519002745378" name="macros" index="1l3spd" />
         <child id="5617550519002745372" name="layout" index="1l3spN" />
       </concept>
+      <concept id="8654221991637384182" name="jetbrains.mps.build.structure.BuildFileIncludesSelector" flags="ng" index="3qWCbU">
+        <property id="8654221991637384184" name="pattern" index="3qWCbO" />
+      </concept>
       <concept id="4701820937132344003" name="jetbrains.mps.build.structure.BuildLayout_Container" flags="ng" index="1y1bJS">
         <child id="7389400916848037006" name="children" index="39821P" />
       </concept>
       <concept id="841011766566059607" name="jetbrains.mps.build.structure.BuildStringNotEmpty" flags="ng" index="3_J27D" />
+      <concept id="5248329904287794596" name="jetbrains.mps.build.structure.BuildInputFiles" flags="ng" index="3LXTmp">
+        <child id="5248329904287794598" name="dir" index="3LXTmr" />
+        <child id="5248329904287794679" name="selectors" index="3LXTna" />
+      </concept>
       <concept id="4903714810883702019" name="jetbrains.mps.build.structure.BuildTextStringPart" flags="ng" index="3Mxwew">
         <property id="4903714810883755350" name="text" index="3MwjfP" />
       </concept>
@@ -89,11 +96,15 @@
       </concept>
       <concept id="868032131020265945" name="jetbrains.mps.build.mps.structure.BuildMPSPlugin" flags="ng" index="3b7kt6" />
       <concept id="5253498789149381388" name="jetbrains.mps.build.mps.structure.BuildMps_Module" flags="ng" index="3bQrTs">
+        <child id="5253498789149547825" name="sources" index="3bR31x" />
         <child id="5253498789149547704" name="dependencies" index="3bR37C" />
       </concept>
       <concept id="5253498789149585690" name="jetbrains.mps.build.mps.structure.BuildMps_ModuleDependencyOnModule" flags="ng" index="3bR9La">
         <reference id="5253498789149547705" name="module" index="3bR37D" />
       </concept>
+      <concept id="763829979718664966" name="jetbrains.mps.build.mps.structure.BuildMps_ModuleResources" flags="ng" index="3rtmxn">
+        <child id="763829979718664967" name="files" index="3rtmxm" />
+      </concept>
       <concept id="5507251971038816436" name="jetbrains.mps.build.mps.structure.BuildMps_Generator" flags="ng" index="1yeLz9" />
       <concept id="4278635856200794926" name="jetbrains.mps.build.mps.structure.BuildMps_ModuleDependencyExtendLanguage" flags="ng" index="1Busua">
         <reference id="4278635856200794928" name="language" index="1Busuk" />
@@ -163,6 +174,21 @@
             <ref role="3bR37D" to="zqd8:NKt6ynvPIP" resolve="jetbrains.mps.lang.typechecking" />
           </node>
         </node>
+        <node concept="3rtmxn" id="7L5omges4XA" role="3bR31x">
+          <node concept="3LXTmp" id="7L5omges4XB" role="3rtmxm">
+            <node concept="3qWCbU" id="7L5omges4XC" role="3LXTna">
+              <property role="3qWCbO" value="icons/**, resources/**" />
+            </node>
+            <node concept="55IIr" id="7L5omges4XD" role="3LXTmr">
+              <node concept="2Ry0Ak" id="7L5omges4XE" role="iGT6I">
+                <property role="2Ry0Am" value="languages" />
+                <node concept="2Ry0Ak" id="7L5omges4XF" role="2Ry0An">
+                  <property role="2Ry0Am" value="samples.fitch" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="4$bYnYI$UVm" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -208,6 +234,21 @@
             <ref role="3bR37D" to="zqd8:65DJywFj0Fi" resolve="jetbrains.mps.coderules.typechecking" />
           </node>
         </node>
+        <node concept="3rtmxn" id="7L5omges4XH" role="3bR31x">
+          <node concept="3LXTmp" id="7L5omges4XI" role="3rtmxm">
+            <node concept="3qWCbU" id="7L5omges4XJ" role="3LXTna">
+              <property role="3qWCbO" value="icons/**, resources/**" />
+            </node>
+            <node concept="55IIr" id="7L5omges4XK" role="3LXTmr">
+              <node concept="2Ry0Ak" id="7L5omges4XL" role="iGT6I">
+                <property role="2Ry0Am" value="languages" />
+                <node concept="2Ry0Ak" id="7L5omges4XM" role="2Ry0An">
+                  <property role="2Ry0Am" value="samples.fitch.propositionalLogic" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="4$bYnYI$UTN" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -258,6 +299,21 @@
             <ref role="3bR37D" to="zqd8:65DJywFj0Fi" resolve="jetbrains.mps.coderules.typechecking" />
           </node>
         </node>
+        <node concept="3rtmxn" id="7L5omges4XO" role="3bR31x">
+          <node concept="3LXTmp" id="7L5omges4XP" role="3rtmxm">
+            <node concept="3qWCbU" id="7L5omges4XQ" role="3LXTna">
+              <property role="3qWCbO" value="icons/**, resources/**" />
+            </node>
+            <node concept="55IIr" id="7L5omges4XR" role="3LXTmr">
+              <node concept="2Ry0Ak" id="7L5omges4XS" role="iGT6I">
+                <property role="2Ry0Am" value="languages" />
+                <node concept="2Ry0Ak" id="7L5omges4XT" role="2Ry0An">
+                  <property role="2Ry0Am" value="samples.fitch.herbrandLogic" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="4$bYnYI$USZ" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -303,6 +359,21 @@
             <ref role="3bR37D" to="zqd8:65DJywFj0Fi" resolve="jetbrains.mps.coderules.typechecking" />
           </node>
         </node>
+        <node concept="3rtmxn" id="7L5omges4XV" role="3bR31x">
+          <node concept="3LXTmp" id="7L5omges4XW" role="3rtmxm">
+            <node concept="3qWCbU" id="7L5omges4XX" role="3LXTna">
+              <property role="3qWCbO" value="icons/**, resources/**" />
+            </node>
+            <node concept="55IIr" id="7L5omges4XY" role="3LXTmr">
+              <node concept="2Ry0Ak" id="7L5omges4XZ" role="iGT6I">
+                <property role="2Ry0Am" value="languages" />
+                <node concept="2Ry0Ak" id="7L5omges4Y0" role="2Ry0An">
+                  <property role="2Ry0Am" value="samples.fitch.firstOrderLogic" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="1E1JtA" id="4$bYnYI$ZFL" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -345,6 +416,21 @@
             <ref role="3bR37D" to="zqd8:65DJywFj0Fi" resolve="jetbrains.mps.coderules.typechecking" />
           </node>
         </node>
+        <node concept="3rtmxn" id="7L5omges4Xv" role="3bR31x">
+          <node concept="3LXTmp" id="7L5omges4Xw" role="3rtmxm">
+            <node concept="3qWCbU" id="7L5omges4Xx" role="3LXTna">
+              <property role="3qWCbO" value="icons/**, resources/**" />
+            </node>
+            <node concept="55IIr" id="7L5omges4Xy" role="3LXTmr">
+              <node concept="2Ry0Ak" id="7L5omges4Xz" role="iGT6I">
+                <property role="2Ry0Am" value="solutions" />
+                <node concept="2Ry0Ak" id="7L5omges4X$" role="2Ry0An">
+                  <property role="2Ry0Am" value="samples.fitch.demo" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
     </node>
     <node concept="55IIr" id="4$bYnYI$RBX" role="auvoZ" />
diff --git a/samples/lambdacalc/build.xml b/samples/lambdacalc/build.xml
index 3d62a3d1..e5e56f28 100644
--- a/samples/lambdacalc/build.xml
+++ b/samples/lambdacalc/build.xml
@@ -126,6 +126,7 @@
     </echoxml>
     <jar destfile="${build.layout}/lambdacalc/samples.lambdacalc.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/samples.lambdacalc" />
+      <fileset dir="${basedir}/languages/samples.lambdacalc" includes="icons/**, resources/**" />
       <fileset dir="${mps.macro.lambdacalc_home}/languages/samples.lambdacalc/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/samples.lambdacalc.jar" />
     </jar>
@@ -180,6 +181,7 @@
     </echoxml>
     <jar destfile="${build.layout}/lambdacalc/samples.lambdacalc.demo.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/samples.lambdacalc.demo" />
+      <fileset dir="${basedir}/solutions/samples.lambdacalc.demo" includes="icons/**, resources/**" />
       <fileset dir="${mps.macro.lambdacalc_home}/solutions/samples.lambdacalc.demo/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/samples.lambdacalc.demo.jar" />
     </jar>
diff --git a/samples/lambdacalc/solutions/samples.lambdacalc.build/models/samples.lamdacalc.build.mps b/samples/lambdacalc/solutions/samples.lambdacalc.build/models/samples.lamdacalc.build.mps
index 0c11807f..6f15f735 100644
--- a/samples/lambdacalc/solutions/samples.lambdacalc.build/models/samples.lamdacalc.build.mps
+++ b/samples/lambdacalc/solutions/samples.lambdacalc.build/models/samples.lamdacalc.build.mps
@@ -67,10 +67,17 @@
         <child id="5617550519002745378" name="macros" index="1l3spd" />
         <child id="5617550519002745372" name="layout" index="1l3spN" />
       </concept>
+      <concept id="8654221991637384182" name="jetbrains.mps.build.structure.BuildFileIncludesSelector" flags="ng" index="3qWCbU">
+        <property id="8654221991637384184" name="pattern" index="3qWCbO" />
+      </concept>
       <concept id="4701820937132344003" name="jetbrains.mps.build.structure.BuildLayout_Container" flags="ng" index="1y1bJS">
         <child id="7389400916848037006" name="children" index="39821P" />
       </concept>
       <concept id="841011766566059607" name="jetbrains.mps.build.structure.BuildStringNotEmpty" flags="ng" index="3_J27D" />
+      <concept id="5248329904287794596" name="jetbrains.mps.build.structure.BuildInputFiles" flags="ng" index="3LXTmp">
+        <child id="5248329904287794598" name="dir" index="3LXTmr" />
+        <child id="5248329904287794679" name="selectors" index="3LXTna" />
+      </concept>
       <concept id="4903714810883702019" name="jetbrains.mps.build.structure.BuildTextStringPart" flags="ng" index="3Mxwew">
         <property id="4903714810883755350" name="text" index="3MwjfP" />
       </concept>
@@ -92,11 +99,15 @@
       </concept>
       <concept id="868032131020265945" name="jetbrains.mps.build.mps.structure.BuildMPSPlugin" flags="ng" index="3b7kt6" />
       <concept id="5253498789149381388" name="jetbrains.mps.build.mps.structure.BuildMps_Module" flags="ng" index="3bQrTs">
+        <child id="5253498789149547825" name="sources" index="3bR31x" />
         <child id="5253498789149547704" name="dependencies" index="3bR37C" />
       </concept>
       <concept id="5253498789149585690" name="jetbrains.mps.build.mps.structure.BuildMps_ModuleDependencyOnModule" flags="ng" index="3bR9La">
         <reference id="5253498789149547705" name="module" index="3bR37D" />
       </concept>
+      <concept id="763829979718664966" name="jetbrains.mps.build.mps.structure.BuildMps_ModuleResources" flags="ng" index="3rtmxn">
+        <child id="763829979718664967" name="files" index="3rtmxm" />
+      </concept>
       <concept id="3189788309731840247" name="jetbrains.mps.build.mps.structure.BuildMps_Solution" flags="ng" index="1E1JtA">
         <property id="269707337715731330" name="sourcesKind" index="aoJFB" />
       </concept>
@@ -171,6 +182,21 @@
             <ref role="3bR37D" to="zqd8:65DJywFj0Fi" resolve="jetbrains.mps.coderules.typechecking" />
           </node>
         </node>
+        <node concept="3rtmxn" id="7L5omges50_" role="3bR31x">
+          <node concept="3LXTmp" id="7L5omges50A" role="3rtmxm">
+            <node concept="3qWCbU" id="7L5omges50B" role="3LXTna">
+              <property role="3qWCbO" value="icons/**, resources/**" />
+            </node>
+            <node concept="55IIr" id="7L5omges50C" role="3LXTmr">
+              <node concept="2Ry0Ak" id="7L5omges50D" role="iGT6I">
+                <property role="2Ry0Am" value="languages" />
+                <node concept="2Ry0Ak" id="7L5omges50E" role="2Ry0An">
+                  <property role="2Ry0Am" value="samples.lambdacalc" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="1E1JtA" id="7E7FS_VaVB_" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -198,6 +224,21 @@
             <ref role="3bR37D" node="7E7FS_VaVAl" resolve="samples.lambdacalc" />
           </node>
         </node>
+        <node concept="3rtmxn" id="7L5omges50u" role="3bR31x">
+          <node concept="3LXTmp" id="7L5omges50v" role="3rtmxm">
+            <node concept="3qWCbU" id="7L5omges50w" role="3LXTna">
+              <property role="3qWCbO" value="icons/**, resources/**" />
+            </node>
+            <node concept="55IIr" id="7L5omges50x" role="3LXTmr">
+              <node concept="2Ry0Ak" id="7L5omges50y" role="iGT6I">
+                <property role="2Ry0Am" value="solutions" />
+                <node concept="2Ry0Ak" id="7L5omges50z" role="2Ry0An">
+                  <property role="2Ry0Am" value="samples.lambdacalc.demo" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2sgV4H" id="7E7FS_VaV_9" role="1l3spa">
diff --git a/samples/mpscore/build.xml b/samples/mpscore/build.xml
index 963945f0..7ed9bebc 100644
--- a/samples/mpscore/build.xml
+++ b/samples/mpscore/build.xml
@@ -129,6 +129,7 @@
     </echoxml>
     <jar destfile="${build.layout}/deploy/jetbrains.mps.baseLanguageExt.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.baseLanguageExt" />
+      <fileset dir="${basedir}/languages/jetbrains.mps.baseLanguageExt" includes="icons/**, resources/**" />
       <fileset dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.baseLanguageExt/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.baseLanguageExt.jar" />
     </jar>
@@ -473,6 +474,7 @@
     </echoxml>
     <jar destfile="${build.layout}/deploy/jetbrains.mps.baseLanguageExt.test.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.baseLanguageExt.test" />
+      <fileset dir="${basedir}/solutions/jetbrains.mps.baseLanguageExt.test" includes="icons/**, resources/**" />
       <fileset dir="${mps.macro.mpscore_home}/solutions/jetbrains.mps.baseLanguageExt.test/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.baseLanguageExt.test.jar" />
     </jar>
@@ -593,6 +595,7 @@
     </echoxml>
     <jar destfile="${build.layout}/deploy/typechecking.samples.baseLanguage.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/typechecking.samples.baseLanguage" />
+      <fileset dir="${basedir}/solutions/typechecking.samples.baseLanguage" includes="icons/**, resources/**" />
       <fileset dir="${mps.macro.mpscore_home}/solutions/typechecking.samples.baseLanguage/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/typechecking.samples.baseLanguage.jar" />
     </jar>
diff --git a/samples/mpscore/solutions/samples.mpscore.build/models/samples.mpscore.build.mps b/samples/mpscore/solutions/samples.mpscore.build/models/samples.mpscore.build.mps
index e30ae72c..088087a4 100644
--- a/samples/mpscore/solutions/samples.mpscore.build/models/samples.mpscore.build.mps
+++ b/samples/mpscore/solutions/samples.mpscore.build/models/samples.mpscore.build.mps
@@ -311,6 +311,21 @@
             </node>
           </node>
         </node>
+        <node concept="3rtmxn" id="7L5omges55K" role="3bR31x">
+          <node concept="3LXTmp" id="7L5omges55L" role="3rtmxm">
+            <node concept="3qWCbU" id="7L5omges55M" role="3LXTna">
+              <property role="3qWCbO" value="icons/**, resources/**" />
+            </node>
+            <node concept="55IIr" id="7L5omges55N" role="3LXTmr">
+              <node concept="2Ry0Ak" id="7L5omges55O" role="iGT6I">
+                <property role="2Ry0Am" value="languages" />
+                <node concept="2Ry0Ak" id="7L5omges55P" role="2Ry0An">
+                  <property role="2Ry0Am" value="jetbrains.mps.baseLanguageExt" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="3DveV8qz3Qm" role="2G$12L">
         <property role="TrG5h" value="jetbrains.mps.baseLanguage.javadocExt" />
@@ -513,6 +528,21 @@
             </node>
           </node>
         </node>
+        <node concept="3rtmxn" id="7L5omges55y" role="3bR31x">
+          <node concept="3LXTmp" id="7L5omges55z" role="3rtmxm">
+            <node concept="3qWCbU" id="7L5omges55$" role="3LXTna">
+              <property role="3qWCbO" value="icons/**, resources/**" />
+            </node>
+            <node concept="55IIr" id="7L5omges55_" role="3LXTmr">
+              <node concept="2Ry0Ak" id="7L5omges55A" role="iGT6I">
+                <property role="2Ry0Am" value="solutions" />
+                <node concept="2Ry0Ak" id="7L5omges55B" role="2Ry0An">
+                  <property role="2Ry0Am" value="jetbrains.mps.baseLanguageExt.test" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="1E1JtA" id="69UmpDmJW3w" role="2G$12L">
         <property role="TrG5h" value="typechecking.samples.baseLanguage" />
@@ -760,6 +790,21 @@
             </node>
           </node>
         </node>
+        <node concept="3rtmxn" id="7L5omges55D" role="3bR31x">
+          <node concept="3LXTmp" id="7L5omges55E" role="3rtmxm">
+            <node concept="3qWCbU" id="7L5omges55F" role="3LXTna">
+              <property role="3qWCbO" value="icons/**, resources/**" />
+            </node>
+            <node concept="55IIr" id="7L5omges55G" role="3LXTmr">
+              <node concept="2Ry0Ak" id="7L5omges55H" role="iGT6I">
+                <property role="2Ry0Am" value="solutions" />
+                <node concept="2Ry0Ak" id="7L5omges55I" role="2Ry0An">
+                  <property role="2Ry0Am" value="typechecking.samples.baseLanguage" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
     </node>
     <node concept="22LTRH" id="69UmpDmJWeu" role="1hWBAP">
diff --git a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/typechecking.samples.baseLanguage.hugeSample.mps b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/typechecking.samples.baseLanguage.hugeSample.mps
index d1db7b66..20b81142 100644
--- a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/typechecking.samples.baseLanguage.hugeSample.mps
+++ b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/typechecking.samples.baseLanguage.hugeSample.mps
@@ -8,9 +8,6 @@
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
       <concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="ng" index="2tJIrI" />
-      <concept id="1224848483129" name="jetbrains.mps.baseLanguage.structure.IBLDeprecatable" flags="ng" index="IEa8$">
-        <property id="1224848525476" name="isDeprecated" index="IEkAT" />
-      </concept>
       <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
         <property id="1070475926801" name="value" index="Xl_RC" />
       </concept>
@@ -41083,7 +41080,6 @@
     <node concept="2tJIrI" id="1ilMsMjhrcT" role="jymVt" />
     <node concept="2YIFZL" id="1ilMsMjhBm0" role="jymVt">
       <property role="TrG5h" value="getGenericClass1" />
-      <property role="IEkAT" value="false" />
       <property role="DiZV1" value="false" />
       <property role="od$2w" value="false" />
       <node concept="3clFbS" id="1ilMsMjhtF5" role="3clF47">
@@ -41107,7 +41103,6 @@
     </node>
     <node concept="2YIFZL" id="1ilMsMjhBns" role="jymVt">
       <property role="TrG5h" value="getGenericClass2" />
-      <property role="IEkAT" value="false" />
       <property role="DiZV1" value="false" />
       <property role="od$2w" value="false" />
       <node concept="3clFbS" id="1ilMsMjhwp0" role="3clF47">
@@ -41131,7 +41126,6 @@
     </node>
     <node concept="2YIFZL" id="1ilMsMjhBoS" role="jymVt">
       <property role="TrG5h" value="getGenericClass3" />
-      <property role="IEkAT" value="false" />
       <property role="DiZV1" value="false" />
       <property role="od$2w" value="false" />
       <node concept="3clFbS" id="1ilMsMjhxQJ" role="3clF47">
@@ -41155,7 +41149,6 @@
     </node>
     <node concept="2YIFZL" id="1ilMsMjhBqk" role="jymVt">
       <property role="TrG5h" value="getGenericClass4" />
-      <property role="IEkAT" value="false" />
       <property role="DiZV1" value="false" />
       <property role="od$2w" value="false" />
       <node concept="3clFbS" id="1ilMsMjhxUu" role="3clF47">
@@ -41179,7 +41172,6 @@
     </node>
     <node concept="2YIFZL" id="1ilMsMjhBrK" role="jymVt">
       <property role="TrG5h" value="getGenericClass5" />
-      <property role="IEkAT" value="false" />
       <property role="DiZV1" value="false" />
       <property role="od$2w" value="false" />
       <node concept="3clFbS" id="1ilMsMjhxUB" role="3clF47">
@@ -41203,7 +41195,6 @@
     </node>
     <node concept="2YIFZL" id="1ilMsMjhBtc" role="jymVt">
       <property role="TrG5h" value="getGenericClass6" />
-      <property role="IEkAT" value="false" />
       <property role="DiZV1" value="false" />
       <property role="od$2w" value="false" />
       <node concept="3clFbS" id="1ilMsMjhxUK" role="3clF47">
@@ -41227,7 +41218,6 @@
     </node>
     <node concept="2YIFZL" id="1ilMsMjhBuC" role="jymVt">
       <property role="TrG5h" value="getGenericClass7" />
-      <property role="IEkAT" value="false" />
       <property role="DiZV1" value="false" />
       <property role="od$2w" value="false" />
       <node concept="3clFbS" id="1ilMsMjhy1D" role="3clF47">
@@ -41251,7 +41241,6 @@
     </node>
     <node concept="2YIFZL" id="1ilMsMjhBw4" role="jymVt">
       <property role="TrG5h" value="getGenericClass8" />
-      <property role="IEkAT" value="false" />
       <property role="DiZV1" value="false" />
       <property role="od$2w" value="false" />
       <node concept="3clFbS" id="1ilMsMjhy1M" role="3clF47">
@@ -41275,7 +41264,6 @@
     </node>
     <node concept="2YIFZL" id="1ilMsMjhBxw" role="jymVt">
       <property role="TrG5h" value="getGenericClass9" />
-      <property role="IEkAT" value="false" />
       <property role="DiZV1" value="false" />
       <property role="od$2w" value="false" />
       <node concept="3clFbS" id="1ilMsMjhy1V" role="3clF47">
@@ -41299,7 +41287,6 @@
     </node>
     <node concept="2YIFZL" id="1ilMsMjhByW" role="jymVt">
       <property role="TrG5h" value="getGenericClass10" />
-      <property role="IEkAT" value="false" />
       <property role="DiZV1" value="false" />
       <property role="od$2w" value="false" />
       <node concept="3clFbS" id="1ilMsMjhy24" role="3clF47">