diff --git a/code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/models/org.mpsqa.arch.editor.mps b/code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/models/org.mpsqa.arch.editor.mps
index 43f477d3..c6b88a23 100644
--- a/code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/models/org.mpsqa.arch.editor.mps
+++ b/code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/models/org.mpsqa.arch.editor.mps
@@ -104,6 +104,7 @@
       </concept>
       <concept id="1073389446423" name="jetbrains.mps.lang.editor.structure.CellModel_Collection" flags="sn" stub="3013115976261988961" index="3EZMnI">
         <property id="1160590353935" name="usesFolding" index="S$Qs1" />
+        <property id="6240706158490734113" name="collapseByDefault" index="3EXrWe" />
         <child id="1106270802874" name="cellLayout" index="2iSdaV" />
         <child id="7723470090030138869" name="foldedCellModel" index="AHCbl" />
         <child id="1073389446424" name="childCellModel" index="3EZMnx" />
@@ -708,6 +709,9 @@
       </node>
     </node>
     <node concept="3EZMnI" id="Te1zv$_m_4" role="6VMZX">
+      <node concept="PMmxH" id="5gfdDUfSb_n" role="3EZMnx">
+        <ref role="PMmxG" node="2p0G1uTtlry" resolve="CommentEditorComponent" />
+      </node>
       <node concept="3F0ifn" id="Te1zv$_pgh" role="3EZMnx">
         <property role="3F0ifm" value="// module/model/node-lock: does not allow other modules/models/nodes as dependency besides those saved in the whitelist" />
         <node concept="VechU" id="Te1zv$Huvl" role="3F10Kt">
@@ -757,69 +761,74 @@
   <node concept="24kQdi" id="6MUZd5Uj9wF">
     <ref role="1XX52x" to="ryx8:6MUZd5Uj9vB" resolve="ComponentDefinition" />
     <node concept="3EZMnI" id="6MUZd5Uj9wH" role="2wV5jI">
-      <property role="S$Qs1" value="true" />
       <node concept="PMmxH" id="2p0G1uTtm2z" role="3EZMnx">
         <ref role="PMmxG" node="2p0G1uTtlry" resolve="CommentEditorComponent" />
       </node>
-      <node concept="3EZMnI" id="6MUZd5Uj9wO" role="3EZMnx">
-        <node concept="VPM3Z" id="6MUZd5Uj9wQ" role="3F10Kt" />
-        <node concept="3F0ifn" id="6MUZd5Uj9wY" role="3EZMnx">
-          <property role="3F0ifm" value="component definition:" />
-        </node>
-        <node concept="3F0A7n" id="6MUZd5Uj9x4" role="3EZMnx">
-          <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
-        </node>
-        <node concept="3F0ifn" id="6MUZd5Uj9xc" role="3EZMnx">
-          <property role="3F0ifm" value="{" />
-        </node>
-        <node concept="2iRfu4" id="6MUZd5Uj9wT" role="2iSdaV" />
-      </node>
-      <node concept="3EZMnI" id="6MUZd5Uj9xy" role="3EZMnx">
-        <node concept="VPM3Z" id="6MUZd5Uj9x$" role="3F10Kt" />
-        <node concept="3XFhqQ" id="6MUZd5Uj9xN" role="3EZMnx" />
-        <node concept="3F2HdR" id="6MUZd5Uj9xW" role="3EZMnx">
-          <ref role="1NtTu8" to="ryx8:6MUZd5Uj9xT" resolve="content" />
-          <node concept="2iRkQZ" id="6MUZd5Uj9xZ" role="2czzBx" />
-          <node concept="VPM3Z" id="6MUZd5Uj9y0" role="3F10Kt" />
-          <node concept="4$FPG" id="fm3v0WWnFf" role="4_6I_">
-            <node concept="3clFbS" id="fm3v0WWnFg" role="2VODD2">
-              <node concept="3clFbF" id="fm3v0WWnFh" role="3cqZAp">
-                <node concept="2ShNRf" id="fm3v0WWnFi" role="3clFbG">
-                  <node concept="3zrR0B" id="fm3v0WWnFj" role="2ShVmc">
-                    <node concept="3Tqbb2" id="fm3v0WWnFk" role="3zrR0E">
-                      <ref role="ehGHo" to="ryx8:fm3v0WWntE" resolve="EmptyLine" />
+      <node concept="3EZMnI" id="5gfdDUfJ$A2" role="3EZMnx">
+        <property role="S$Qs1" value="true" />
+        <property role="3EXrWe" value="true" />
+        <node concept="2iRkQZ" id="5gfdDUfJ$A3" role="2iSdaV" />
+        <node concept="3EZMnI" id="6MUZd5Uj9wO" role="3EZMnx">
+          <node concept="VPM3Z" id="6MUZd5Uj9wQ" role="3F10Kt" />
+          <node concept="3F0ifn" id="6MUZd5Uj9wY" role="3EZMnx">
+            <property role="3F0ifm" value="component definition:" />
+          </node>
+          <node concept="3F0A7n" id="6MUZd5Uj9x4" role="3EZMnx">
+            <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
+          </node>
+          <node concept="3F0ifn" id="6MUZd5Uj9xc" role="3EZMnx">
+            <property role="3F0ifm" value="{" />
+          </node>
+          <node concept="2iRfu4" id="6MUZd5Uj9wT" role="2iSdaV" />
+        </node>
+        <node concept="3EZMnI" id="6MUZd5Uj9xy" role="3EZMnx">
+          <node concept="VPM3Z" id="6MUZd5Uj9x$" role="3F10Kt" />
+          <node concept="3XFhqQ" id="6MUZd5Uj9xN" role="3EZMnx" />
+          <node concept="3F2HdR" id="6MUZd5Uj9xW" role="3EZMnx">
+            <ref role="1NtTu8" to="ryx8:6MUZd5Uj9xT" resolve="content" />
+            <node concept="2iRkQZ" id="6MUZd5Uj9xZ" role="2czzBx" />
+            <node concept="VPM3Z" id="6MUZd5Uj9y0" role="3F10Kt" />
+            <node concept="4$FPG" id="fm3v0WWnFf" role="4_6I_">
+              <node concept="3clFbS" id="fm3v0WWnFg" role="2VODD2">
+                <node concept="3clFbF" id="fm3v0WWnFh" role="3cqZAp">
+                  <node concept="2ShNRf" id="fm3v0WWnFi" role="3clFbG">
+                    <node concept="3zrR0B" id="fm3v0WWnFj" role="2ShVmc">
+                      <node concept="3Tqbb2" id="fm3v0WWnFk" role="3zrR0E">
+                        <ref role="ehGHo" to="ryx8:fm3v0WWntE" resolve="EmptyLine" />
+                      </node>
                     </node>
                   </node>
                 </node>
               </node>
             </node>
           </node>
+          <node concept="2iRfu4" id="6MUZd5Uj9xB" role="2iSdaV" />
         </node>
-        <node concept="2iRfu4" id="6MUZd5Uj9xB" role="2iSdaV" />
-      </node>
-      <node concept="3F0ifn" id="6MUZd5Uj9xp" role="3EZMnx">
-        <property role="3F0ifm" value="}" />
-      </node>
-      <node concept="2iRkQZ" id="6MUZd5Uj9wK" role="2iSdaV" />
-      <node concept="3EZMnI" id="fm3v0WWu31" role="AHCbl">
-        <node concept="VPM3Z" id="fm3v0WWu32" role="3F10Kt" />
-        <node concept="3F0ifn" id="fm3v0WWu33" role="3EZMnx">
-          <property role="3F0ifm" value="component" />
-        </node>
-        <node concept="3F0A7n" id="fm3v0WWu34" role="3EZMnx">
-          <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
-        </node>
-        <node concept="3F0ifn" id="fm3v0WWu35" role="3EZMnx">
-          <property role="3F0ifm" value="{" />
-        </node>
-        <node concept="3F0ifn" id="fm3v0WWu3s" role="3EZMnx">
-          <property role="3F0ifm" value="..." />
-        </node>
-        <node concept="3F0ifn" id="fm3v0WWu3L" role="3EZMnx">
+        <node concept="3F0ifn" id="6MUZd5Uj9xp" role="3EZMnx">
           <property role="3F0ifm" value="}" />
         </node>
-        <node concept="2iRfu4" id="fm3v0WWu36" role="2iSdaV" />
+        <node concept="3F0ifn" id="5gfdDUfJ$A1" role="3EZMnx" />
+        <node concept="3EZMnI" id="fm3v0WWu31" role="AHCbl">
+          <node concept="VPM3Z" id="fm3v0WWu32" role="3F10Kt" />
+          <node concept="3F0ifn" id="fm3v0WWu33" role="3EZMnx">
+            <property role="3F0ifm" value="component" />
+          </node>
+          <node concept="3F0A7n" id="fm3v0WWu34" role="3EZMnx">
+            <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
+          </node>
+          <node concept="3F0ifn" id="fm3v0WWu35" role="3EZMnx">
+            <property role="3F0ifm" value="{" />
+          </node>
+          <node concept="3F0ifn" id="fm3v0WWu3s" role="3EZMnx">
+            <property role="3F0ifm" value="..." />
+          </node>
+          <node concept="3F0ifn" id="fm3v0WWu3L" role="3EZMnx">
+            <property role="3F0ifm" value="}" />
+          </node>
+          <node concept="2iRfu4" id="fm3v0WWu36" role="2iSdaV" />
+        </node>
       </node>
+      <node concept="2iRkQZ" id="6MUZd5Uj9wK" role="2iSdaV" />
     </node>
     <node concept="3EZMnI" id="SYt8UYwnix" role="6VMZX">
       <node concept="2iRkQZ" id="SYt8UYwniy" role="2iSdaV" />
@@ -987,6 +996,7 @@
     <ref role="1XX52x" to="ryx8:6MUZd5Uje4h" resolve="ModuleComponent" />
     <node concept="3EZMnI" id="1tkdAPw1fXU" role="2wV5jI">
       <property role="S$Qs1" value="true" />
+      <property role="3EXrWe" value="true" />
       <node concept="2iRkQZ" id="1tkdAPw1fXV" role="2iSdaV" />
       <node concept="PMmxH" id="2p0G1uTtlzF" role="3EZMnx">
         <ref role="PMmxG" node="2p0G1uTtlry" resolve="CommentEditorComponent" />
@@ -1543,7 +1553,7 @@
   </node>
   <node concept="PKFIW" id="2p0G1uTtlry">
     <property role="TrG5h" value="CommentEditorComponent" />
-    <ref role="1XX52x" to="ryx8:6MUZd5UjGNW" resolve="IComponentLike" />
+    <ref role="1XX52x" to="ryx8:5gfdDUfN3cO" resolve="ICommentable" />
     <node concept="3EZMnI" id="2p0G1uTtk0V" role="2wV5jI">
       <node concept="VPM3Z" id="2p0G1uTtk0X" role="3F10Kt" />
       <node concept="3F0ifn" id="2p0G1uTtk0Z" role="3EZMnx">
@@ -1561,7 +1571,7 @@
                     <node concept="2OqwBi" id="2p0G1uTu2n9" role="2Oq$k0">
                       <node concept="pncrf" id="2p0G1uTu298" role="2Oq$k0" />
                       <node concept="3TrEf2" id="2p0G1uTu2$6" role="2OqNvi">
-                        <ref role="3Tt5mk" to="ryx8:2p0G1uTtfqN" resolve="comment" />
+                        <ref role="3Tt5mk" to="ryx8:5gfdDUfN4cw" resolve="comment" />
                       </node>
                     </node>
                     <node concept="3Tsc0h" id="2p0G1uTullj" role="2OqNvi">
@@ -1644,7 +1654,7 @@
         </node>
       </node>
       <node concept="3F1sOY" id="2p0G1uTtk4N" role="3EZMnx">
-        <ref role="1NtTu8" to="ryx8:2p0G1uTtfqN" resolve="comment" />
+        <ref role="1NtTu8" to="ryx8:5gfdDUfN4cw" resolve="comment" />
       </node>
       <node concept="3F0ifn" id="2p0G1uTtk50" role="3EZMnx">
         <property role="3F0ifm" value=";" />
@@ -1657,7 +1667,7 @@
               <node concept="2OqwBi" id="2p0G1uTtklO" role="2Oq$k0">
                 <node concept="pncrf" id="2p0G1uTtk5x" role="2Oq$k0" />
                 <node concept="3TrEf2" id="2p0G1uTtkCc" role="2OqNvi">
-                  <ref role="3Tt5mk" to="ryx8:2p0G1uTtfqN" resolve="comment" />
+                  <ref role="3Tt5mk" to="ryx8:5gfdDUfN4cw" resolve="comment" />
                 </node>
               </node>
               <node concept="3x8VRR" id="2p0G1uTtlco" role="2OqNvi" />
diff --git a/code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/models/org.mpsqa.arch.intentions.mps b/code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/models/org.mpsqa.arch.intentions.mps
index 1a0978c0..57cf87a3 100644
--- a/code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/models/org.mpsqa.arch.intentions.mps
+++ b/code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/models/org.mpsqa.arch.intentions.mps
@@ -455,7 +455,7 @@
   </node>
   <node concept="2S6QgY" id="2p0G1uTtfVz">
     <property role="TrG5h" value="toggleComment" />
-    <ref role="2ZfgGC" to="ryx8:6MUZd5UjGNW" resolve="IComponentLike" />
+    <ref role="2ZfgGC" to="ryx8:5gfdDUfN3cO" resolve="ICommentable" />
     <node concept="2S6ZIM" id="2p0G1uTtfV$" role="2ZfVej">
       <node concept="3clFbS" id="2p0G1uTtfV_" role="2VODD2">
         <node concept="3cpWs8" id="2p0G1uTtg71" role="3cqZAp">
@@ -473,7 +473,7 @@
                 <node concept="2OqwBi" id="2p0G1uTtgpW" role="2Oq$k0">
                   <node concept="2Sf5sV" id="2p0G1uTtgb1" role="2Oq$k0" />
                   <node concept="3TrEf2" id="2p0G1uTtg_v" role="2OqNvi">
-                    <ref role="3Tt5mk" to="ryx8:2p0G1uTtfqN" resolve="comment" />
+                    <ref role="3Tt5mk" to="ryx8:5gfdDUfN4cw" resolve="comment" />
                   </node>
                 </node>
                 <node concept="3x8VRR" id="2p0G1uTth7t" role="2OqNvi" />
@@ -500,7 +500,7 @@
             <node concept="2OqwBi" id="2p0G1uTtihh" role="2Oq$k0">
               <node concept="2Sf5sV" id="2p0G1uTti6O" role="2Oq$k0" />
               <node concept="3TrEf2" id="2p0G1uTtisM" role="2OqNvi">
-                <ref role="3Tt5mk" to="ryx8:2p0G1uTtfqN" resolve="comment" />
+                <ref role="3Tt5mk" to="ryx8:5gfdDUfN4cw" resolve="comment" />
               </node>
             </node>
             <node concept="3x8VRR" id="2p0G1uTtiWc" role="2OqNvi" />
@@ -511,7 +511,7 @@
                 <node concept="2OqwBi" id="2p0G1uTtiWY" role="2Oq$k0">
                   <node concept="2Sf5sV" id="2p0G1uTtiWJ" role="2Oq$k0" />
                   <node concept="3TrEf2" id="2p0G1uTtiY5" role="2OqNvi">
-                    <ref role="3Tt5mk" to="ryx8:2p0G1uTtfqN" resolve="comment" />
+                    <ref role="3Tt5mk" to="ryx8:5gfdDUfN4cw" resolve="comment" />
                   </node>
                 </node>
                 <node concept="3YRAZt" id="2p0G1uTtj4a" role="2OqNvi" />
@@ -525,7 +525,7 @@
                   <node concept="2OqwBi" id="2p0G1uTtj5M" role="2Oq$k0">
                     <node concept="2Sf5sV" id="2p0G1uTtj5z" role="2Oq$k0" />
                     <node concept="3TrEf2" id="2p0G1uTtjim" role="2OqNvi">
-                      <ref role="3Tt5mk" to="ryx8:2p0G1uTtfqN" resolve="comment" />
+                      <ref role="3Tt5mk" to="ryx8:5gfdDUfN4cw" resolve="comment" />
                     </node>
                   </node>
                   <node concept="zfrQC" id="2p0G1uTtjLt" role="2OqNvi" />
@@ -537,7 +537,7 @@
                     <node concept="2OqwBi" id="2p0G1uTtOTZ" role="2Oq$k0">
                       <node concept="2Sf5sV" id="2p0G1uTtOKN" role="2Oq$k0" />
                       <node concept="3TrEf2" id="2p0G1uTtP54" role="2OqNvi">
-                        <ref role="3Tt5mk" to="ryx8:2p0G1uTtfqN" resolve="comment" />
+                        <ref role="3Tt5mk" to="ryx8:5gfdDUfN4cw" resolve="comment" />
                       </node>
                     </node>
                     <node concept="3Tsc0h" id="2p0G1uTtPxB" role="2OqNvi">
diff --git a/code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/models/org.mpsqa.arch.migration.mps b/code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/models/org.mpsqa.arch.migration.mps
new file mode 100644
index 00000000..a297f23f
--- /dev/null
+++ b/code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/models/org.mpsqa.arch.migration.mps
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model ref="r:05551064-8349-4600-953f-80c29a849ef4(org.mpsqa.arch.migration)">
+  <persistence version="9" />
+  <languages>
+    <use id="9882f4ad-1955-46fe-8269-94189e5dbbf2" name="jetbrains.mps.lang.migration.util" version="0" />
+  </languages>
+  <imports />
+  <registry>
+    <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
+      <concept id="6911370362349121511" name="jetbrains.mps.lang.smodel.structure.ConceptId" flags="nn" index="2x4n5u">
+        <property id="6911370362349122519" name="conceptName" index="2x4mPI" />
+        <property id="6911370362349121516" name="conceptId" index="2x4n5l" />
+        <property id="6911370362349133804" name="isInterface" index="2x4o5l" />
+        <child id="6911370362349121514" name="languageIdentity" index="2x4n5j" />
+      </concept>
+      <concept id="8415841354032330471" name="jetbrains.mps.lang.smodel.structure.ContainmentLinkId" flags="ng" index="HUanS">
+        <property id="8415841354032330474" name="linkName" index="HUanP" />
+        <property id="8415841354032330473" name="linkId" index="HUanQ" />
+        <child id="8415841354032330472" name="conceptIdentity" index="HUanR" />
+      </concept>
+      <concept id="3542851458883438784" name="jetbrains.mps.lang.smodel.structure.LanguageId" flags="nn" index="2V$Bhx">
+        <property id="3542851458883439831" name="namespace" index="2V$B1Q" />
+        <property id="3542851458883439832" name="languageId" index="2V$B1T" />
+      </concept>
+    </language>
+    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
+      <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
+        <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
+      </concept>
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
+        <property id="1169194664001" name="name" index="TrG5h" />
+      </concept>
+    </language>
+    <language id="90746344-04fd-4286-97d5-b46ae6a81709" name="jetbrains.mps.lang.migration">
+      <concept id="3116305438947623354" name="jetbrains.mps.lang.migration.structure.MoveContainmentLink" flags="ng" index="7a1rN">
+        <child id="8415841354033040054" name="targetId" index="HTpAD" />
+        <child id="8415841354033040053" name="sourceId" index="HTpAE" />
+      </concept>
+      <concept id="3116305438947553624" name="jetbrains.mps.lang.migration.structure.RefactoringPart" flags="ng" index="7amoh">
+        <property id="3628660716136424362" name="participant" index="hSBgo" />
+        <child id="3628660716136424366" name="finalState" index="hSBgs" />
+        <child id="3628660716136424364" name="initialState" index="hSBgu" />
+      </concept>
+      <concept id="2864063292004102367" name="jetbrains.mps.lang.migration.structure.ReflectionNodeReference" flags="ng" index="2pBcaW">
+        <property id="2864063292004102809" name="nodeName" index="2pBc3U" />
+        <property id="2864063292004103235" name="modelRef" index="2pBcow" />
+        <property id="2864063292004103247" name="nodeId" index="2pBcoG" />
+      </concept>
+      <concept id="2015900981881695631" name="jetbrains.mps.lang.migration.structure.RefactoringLog" flags="ng" index="W$Crc">
+        <property id="2015900981881695633" name="fromVersion" index="W$Cri" />
+        <child id="2015900981881695634" name="part" index="W$Crh" />
+        <child id="3597905718825595708" name="options" index="1w76sc" />
+      </concept>
+      <concept id="7431903976166007326" name="jetbrains.mps.lang.migration.structure.MoveNodeMigrationPart" flags="ng" index="Z4OXk">
+        <child id="3116305438947564633" name="specialization" index="7agGg" />
+        <child id="7431903976166276375" name="toNode" index="Z5P1t" />
+        <child id="7431903976166276373" name="fromNode" index="Z5P1v" />
+      </concept>
+      <concept id="7431903976166443707" name="jetbrains.mps.lang.migration.structure.PureMigrationScript" flags="ng" index="Z5qvL">
+        <property id="7431903976166443708" name="fromVersion" index="Z5qvQ" />
+        <property id="2151301691306162408" name="description" index="1AQGQl" />
+        <child id="7431903976166447091" name="part" index="Z5rET" />
+      </concept>
+      <concept id="3597905718825595712" name="jetbrains.mps.lang.migration.structure.RefactoringOptions" flags="ng" index="1w76tK">
+        <child id="3597905718825595718" name="options" index="1w76tQ" />
+      </concept>
+      <concept id="3597905718825595715" name="jetbrains.mps.lang.migration.structure.RefactoringOption" flags="ng" index="1w76tN">
+        <property id="3597905718825595716" name="optionId" index="1w76tO" />
+        <property id="3597905718825650036" name="description" index="1w7ld4" />
+      </concept>
+    </language>
+  </registry>
+  <node concept="W$Crc" id="5gfdDUfN4cx">
+    <property role="3GE5qa" value="refactoring" />
+    <property role="W$Cri" value="0" />
+    <property role="TrG5h" value="Update References: comment-&gt;comment" />
+    <node concept="1w76tK" id="5gfdDUfN4cy" role="1w76sc">
+      <node concept="1w76tN" id="5gfdDUfN4cz" role="1w76tQ">
+        <property role="1w76tO" value="moveNode.options.updateLocalInstances" />
+        <property role="1w7ld4" value="Update instances in current project" />
+      </node>
+      <node concept="1w76tN" id="5gfdDUfN4c$" role="1w76tQ">
+        <property role="1w76tO" value="moveNode.options.updateModelImports" />
+        <property role="1w7ld4" value="Update model imports" />
+      </node>
+      <node concept="1w76tN" id="5gfdDUfN4c_" role="1w76tQ">
+        <property role="1w76tO" value="moveNode.options.updateReferencesParticipant" />
+        <property role="1w7ld4" value="Update references" />
+      </node>
+      <node concept="1w76tN" id="5gfdDUfN4cA" role="1w76tQ">
+        <property role="1w76tO" value="moveNode.options.writeMigrationScript" />
+        <property role="1w7ld4" value="Write migration script" />
+      </node>
+      <node concept="1w76tN" id="5gfdDUfN4cB" role="1w76tQ">
+        <property role="1w76tO" value="moveNode.options.writeRefactoringLog" />
+        <property role="1w7ld4" value="Write refactoring log" />
+      </node>
+    </node>
+    <node concept="7amoh" id="5gfdDUfN4cD" role="W$Crh">
+      <property role="hSBgo" value="moveNode.updateReferences" />
+      <node concept="2pBcaW" id="5gfdDUfN4cu" role="hSBgu">
+        <property role="2pBcoG" value="2756396587892930227" />
+        <property role="2pBcow" value="r:d0c25d1d-f21e-42b4-b319-5eef0584d5ca(org.mpsqa.arch.structure)" />
+        <property role="2pBc3U" value="comment" />
+      </node>
+      <node concept="2pBcaW" id="5gfdDUfN4cC" role="hSBgs">
+        <property role="2pBcoG" value="6057120078481867552" />
+        <property role="2pBcow" value="r:d0c25d1d-f21e-42b4-b319-5eef0584d5ca(org.mpsqa.arch.structure)" />
+        <property role="2pBc3U" value="comment" />
+      </node>
+    </node>
+  </node>
+  <node concept="Z5qvL" id="5gfdDUfN4cE">
+    <property role="Z5qvQ" value="0" />
+    <property role="TrG5h" value="Migrate_MoveLinkUp_0" />
+    <property role="1AQGQl" value="Move link `comment` to concept `ICommentable`" />
+    <node concept="Z4OXk" id="5gfdDUfN4cP" role="Z5rET">
+      <node concept="2pBcaW" id="5gfdDUfN4cN" role="Z5P1v">
+        <property role="2pBcoG" value="2756396587892930227" />
+        <property role="2pBcow" value="r:d0c25d1d-f21e-42b4-b319-5eef0584d5ca(org.mpsqa.arch.structure)" />
+        <property role="2pBc3U" value="comment_old" />
+      </node>
+      <node concept="2pBcaW" id="5gfdDUfN4cO" role="Z5P1t">
+        <property role="2pBcoG" value="6057120078481867552" />
+        <property role="2pBcow" value="r:d0c25d1d-f21e-42b4-b319-5eef0584d5ca(org.mpsqa.arch.structure)" />
+        <property role="2pBc3U" value="comment" />
+      </node>
+      <node concept="7a1rN" id="5gfdDUfN4cM" role="7agGg">
+        <node concept="HUanS" id="5gfdDUfN4cG" role="HTpAE">
+          <property role="HUanP" value="comment_old" />
+          <property role="HUanQ" value="kxwl1jekjmwj" />
+          <node concept="2x4n5u" id="5gfdDUfN4cH" role="HUanR">
+            <property role="2x4mPI" value="IComponentLike" />
+            <property role="2x4o5l" value="true" />
+            <property role="2x4n5l" value="1nix3erx7wem4" />
+            <node concept="2V$Bhx" id="5gfdDUfN4cI" role="2x4n5j">
+              <property role="2V$B1T" value="6c101563-ba1f-458d-b298-a75634941e0c" />
+              <property role="2V$B1Q" value="org.mpsqa.arch" />
+            </node>
+          </node>
+        </node>
+        <node concept="HUanS" id="5gfdDUfN4cJ" role="HTpAD">
+          <property role="HUanP" value="comment" />
+          <property role="HUanQ" value="1a0otv9sa589s" />
+          <node concept="2x4n5u" id="5gfdDUfN4cK" role="HUanR">
+            <property role="2x4mPI" value="ICommentable" />
+            <property role="2x4o5l" value="true" />
+            <property role="2x4n5l" value="1a0otv9sa554k" />
+            <node concept="2V$Bhx" id="5gfdDUfN4cL" role="2x4n5j">
+              <property role="2V$B1T" value="6c101563-ba1f-458d-b298-a75634941e0c" />
+              <property role="2V$B1Q" value="org.mpsqa.arch" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
+</model>
+
diff --git a/code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/models/org.mpsqa.arch.structure.mps b/code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/models/org.mpsqa.arch.structure.mps
index f699aa5c..f815d2b5 100644
--- a/code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/models/org.mpsqa.arch.structure.mps
+++ b/code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/models/org.mpsqa.arch.structure.mps
@@ -19,6 +19,9 @@
       <concept id="3348158742936976479" name="jetbrains.mps.lang.structure.structure.EnumerationDeclaration" flags="ng" index="25R3W">
         <child id="3348158742936976577" name="members" index="25R1y" />
       </concept>
+      <concept id="1224240836180" name="jetbrains.mps.lang.structure.structure.DeprecatedNodeAnnotation" flags="ig" index="asaX9">
+        <property id="1225118933224" name="comment" index="YLQ7P" />
+      </concept>
       <concept id="1082978164218" name="jetbrains.mps.lang.structure.structure.DataTypeDeclaration" flags="ng" index="AxPO6">
         <property id="7791109065626895363" name="datatypeId" index="3F6X1D" />
       </concept>
@@ -55,6 +58,7 @@
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
+        <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
       <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
@@ -148,6 +152,9 @@
       <property role="20lbJX" value="fLJekj5/_0__n" />
       <ref role="20lvS9" node="Te1zv$_lA2" resolve="SingleComponentDependencyWhitelistEntry" />
     </node>
+    <node concept="PrWs8" id="5gfdDUfRu3S" role="PzmwI">
+      <ref role="PrY4T" node="5gfdDUfN3cO" resolve="ICommentable" />
+    </node>
   </node>
   <node concept="PlHQZ" id="6MUZd5Uj9MP">
     <property role="EcuMT" value="7834852478394604725" />
@@ -219,12 +226,18 @@
     <node concept="1TJgyj" id="2p0G1uTtfqN" role="1TKVEi">
       <property role="IQ2ns" value="2756396587892930227" />
       <property role="20lmBu" value="fLJjDmT/aggregation" />
-      <property role="20kJfa" value="comment" />
+      <property role="20kJfa" value="comment_old" />
       <ref role="20lvS9" to="zqge:2cLqkTm6vgh" resolve="Text" />
+      <node concept="asaX9" id="5gfdDUfN4cF" role="lGtFl">
+        <property role="YLQ7P" value="The link was moved to concept &quot;org.mpsqa.arch.structure.ICommentable&quot;" />
+      </node>
     </node>
     <node concept="PrWs8" id="6MUZd5UjGNX" role="PrDN$">
       <ref role="PrY4T" to="tpck:h0TrEE$" resolve="INamedConcept" />
     </node>
+    <node concept="PrWs8" id="5gfdDUfN3cP" role="PrDN$">
+      <ref role="PrY4T" node="5gfdDUfN3cO" resolve="ICommentable" />
+    </node>
   </node>
   <node concept="1TIwiD" id="fm3v0WWntE">
     <property role="EcuMT" value="276423752595634026" />
@@ -277,5 +290,15 @@
     <property role="R4oN_" value="a dependency which is forbidden" />
     <ref role="1TJDcQ" node="6MUZd5Uj9MQ" resolve="ComponentDependency" />
   </node>
+  <node concept="PlHQZ" id="5gfdDUfN3cO">
+    <property role="EcuMT" value="6057120078481863476" />
+    <property role="TrG5h" value="ICommentable" />
+    <node concept="1TJgyj" id="5gfdDUfN4cw" role="1TKVEi">
+      <property role="IQ2ns" value="6057120078481867552" />
+      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20kJfa" value="comment" />
+      <ref role="20lvS9" to="zqge:2cLqkTm6vgh" resolve="Text" />
+    </node>
+  </node>
 </model>
 
diff --git a/code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/org.mpsqa.arch.mpl b/code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/org.mpsqa.arch.mpl
index dd7775c2..0763bb03 100644
--- a/code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/org.mpsqa.arch.mpl
+++ b/code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/org.mpsqa.arch.mpl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<language namespace="org.mpsqa.arch" uuid="6c101563-ba1f-458d-b298-a75634941e0c" languageVersion="0" moduleVersion="0">
+<language namespace="org.mpsqa.arch" uuid="6c101563-ba1f-458d-b298-a75634941e0c" languageVersion="1" moduleVersion="1">
   <models>
     <modelRoot type="default" contentPath="${module}">
       <sourceRoot location="models" />
@@ -47,6 +47,7 @@
     <language slang="l:b1ab8c10-c118-4755-bf2a-cebab35cf533:jetbrains.mps.lang.editor.tooltips" version="0" />
     <language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="1" />
     <language slang="l:ad93155d-79b2-4759-b10c-55123e763903:jetbrains.mps.lang.messages" version="0" />
+    <language slang="l:9882f4ad-1955-46fe-8269-94189e5dbbf2:jetbrains.mps.lang.migration.util" version="0" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
@@ -82,7 +83,7 @@
     <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
     <module reference="c7fb639f-be78-4307-89b0-b5959c3fa8c8(jetbrains.mps.lang.text)" version="0" />
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
-    <module reference="6c101563-ba1f-458d-b298-a75634941e0c(org.mpsqa.arch)" version="0" />
+    <module reference="6c101563-ba1f-458d-b298-a75634941e0c(org.mpsqa.arch)" version="1" />
     <module reference="3867cfe1-8589-4ef1-9b3c-48b17d473edf(org.mpsqa.base.utils)" version="0" />
   </dependencyVersions>
   <extendedLanguages />
diff --git a/code/languages/org.mpsqa.arch/solutions/org.mpsqa.arch.pluginSolution/org.mpsqa.arch.pluginSolution.msd b/code/languages/org.mpsqa.arch/solutions/org.mpsqa.arch.pluginSolution/org.mpsqa.arch.pluginSolution.msd
index 6bae75cc..ecc71391 100644
--- a/code/languages/org.mpsqa.arch/solutions/org.mpsqa.arch.pluginSolution/org.mpsqa.arch.pluginSolution.msd
+++ b/code/languages/org.mpsqa.arch/solutions/org.mpsqa.arch.pluginSolution/org.mpsqa.arch.pluginSolution.msd
@@ -46,10 +46,9 @@
     <module reference="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" version="0" />
     <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
     <module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
-    <module reference="39983771-4e9b-401b-a1a9-1da6c777c843(MPS.ThirdParty)" version="0" />
     <module reference="86441d7a-e194-42da-81a5-2161ec62a379(MPS.Workbench)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
-    <module reference="6c101563-ba1f-458d-b298-a75634941e0c(org.mpsqa.arch)" version="0" />
+    <module reference="6c101563-ba1f-458d-b298-a75634941e0c(org.mpsqa.arch)" version="1" />
     <module reference="96212ac2-423f-4cfb-b211-b58d0546b6bf(org.mpsqa.arch.pluginSolution)" version="0" />
   </dependencyVersions>
 </solution>
diff --git a/code/languages/org.mpsqa.arch/solutions/org.mpsqa.arch.sandbox/models/org.mpsqa.arch.sandbox.smoke.mps b/code/languages/org.mpsqa.arch/solutions/org.mpsqa.arch.sandbox/models/org.mpsqa.arch.sandbox.smoke.mps
index c6b7ec4f..c9d58497 100644
--- a/code/languages/org.mpsqa.arch/solutions/org.mpsqa.arch.sandbox/models/org.mpsqa.arch.sandbox.smoke.mps
+++ b/code/languages/org.mpsqa.arch/solutions/org.mpsqa.arch.sandbox/models/org.mpsqa.arch.sandbox.smoke.mps
@@ -2,7 +2,7 @@
 <model ref="r:c84ea1be-c5cd-4d8d-810e-3d6722f22270(org.mpsqa.arch.sandbox.smoke)">
   <persistence version="9" />
   <languages>
-    <use id="6c101563-ba1f-458d-b298-a75634941e0c" name="org.mpsqa.arch" version="0" />
+    <use id="6c101563-ba1f-458d-b298-a75634941e0c" name="org.mpsqa.arch" version="1" />
     <use id="446c26eb-2b7b-4bf0-9b35-f83fa582753e" name="jetbrains.mps.lang.modelapi" version="0" />
   </languages>
   <imports />
diff --git a/code/languages/org.mpsqa.arch/solutions/org.mpsqa.arch.sandbox/org.mpsqa.arch.sandbox.msd b/code/languages/org.mpsqa.arch/solutions/org.mpsqa.arch.sandbox/org.mpsqa.arch.sandbox.msd
index cf3c8caa..95f142c5 100644
--- a/code/languages/org.mpsqa.arch/solutions/org.mpsqa.arch.sandbox/org.mpsqa.arch.sandbox.msd
+++ b/code/languages/org.mpsqa.arch/solutions/org.mpsqa.arch.sandbox/org.mpsqa.arch.sandbox.msd
@@ -13,7 +13,7 @@
   <languageVersions>
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:6c101563-ba1f-458d-b298-a75634941e0c:org.mpsqa.arch" version="0" />
+    <language slang="l:6c101563-ba1f-458d-b298-a75634941e0c:org.mpsqa.arch" version="1" />
   </languageVersions>
   <dependencyVersions>
     <module reference="9abe2e7d-d94d-49b4-9574-c7a13413163e(org.mpsqa.arch.sandbox)" version="0" />
diff --git a/code/languages/org.mpsqa.arch/solutions/test.org.mpsqa.arch/models/test.org.mpsqa.arch._010_simple_dependencies@tests.mps b/code/languages/org.mpsqa.arch/solutions/test.org.mpsqa.arch/models/test.org.mpsqa.arch._010_simple_dependencies@tests.mps
index df9f9a74..ba237ec0 100644
--- a/code/languages/org.mpsqa.arch/solutions/test.org.mpsqa.arch/models/test.org.mpsqa.arch._010_simple_dependencies@tests.mps
+++ b/code/languages/org.mpsqa.arch/solutions/test.org.mpsqa.arch/models/test.org.mpsqa.arch._010_simple_dependencies@tests.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="6" />
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
-    <use id="6c101563-ba1f-458d-b298-a75634941e0c" name="org.mpsqa.arch" version="0" />
+    <use id="6c101563-ba1f-458d-b298-a75634941e0c" name="org.mpsqa.arch" version="1" />
     <use id="446c26eb-2b7b-4bf0-9b35-f83fa582753e" name="jetbrains.mps.lang.modelapi" version="0" />
   </languages>
   <imports>
diff --git a/code/languages/org.mpsqa.arch/solutions/test.org.mpsqa.arch/test.org.mpsqa.arch.msd b/code/languages/org.mpsqa.arch/solutions/test.org.mpsqa.arch/test.org.mpsqa.arch.msd
index d665e541..1c3e445b 100644
--- a/code/languages/org.mpsqa.arch/solutions/test.org.mpsqa.arch/test.org.mpsqa.arch.msd
+++ b/code/languages/org.mpsqa.arch/solutions/test.org.mpsqa.arch/test.org.mpsqa.arch.msd
@@ -22,7 +22,7 @@
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:8585453e-6bfb-4d80-98de-b16074f1d86c:jetbrains.mps.lang.test" version="6" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
-    <language slang="l:6c101563-ba1f-458d-b298-a75634941e0c:org.mpsqa.arch" version="0" />
+    <language slang="l:6c101563-ba1f-458d-b298-a75634941e0c:org.mpsqa.arch" version="1" />
   </languageVersions>
   <dependencyVersions>
     <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
@@ -30,7 +30,7 @@
     <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
     <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
-    <module reference="6c101563-ba1f-458d-b298-a75634941e0c(org.mpsqa.arch)" version="0" />
+    <module reference="6c101563-ba1f-458d-b298-a75634941e0c(org.mpsqa.arch)" version="1" />
     <module reference="e9a9dadb-1692-4088-a9d0-5e75db05f61a(test.org.mpsqa.arch)" version="0" />
   </dependencyVersions>
 </solution>