diff --git a/plugins/org.obeonetwork.dsl.uml2.core.design/build.properties b/plugins/org.obeonetwork.dsl.uml2.core.design/build.properties
index 76fea8e01..3d74c5b16 100644
--- a/plugins/org.obeonetwork.dsl.uml2.core.design/build.properties
+++ b/plugins/org.obeonetwork.dsl.uml2.core.design/build.properties
@@ -3,5 +3,6 @@ output.. = bin/
 bin.includes = META-INF/,\
                .,\
                description/,\
-               plugin.xml
+               plugin.xml,\
+               icons/
 
diff --git a/plugins/org.obeonetwork.dsl.uml2.core.design/description/uml2core.odesign b/plugins/org.obeonetwork.dsl.uml2.core.design/description/uml2core.odesign
index f41fb9c53..86be891fd 100644
--- a/plugins/org.obeonetwork.dsl.uml2.core.design/description/uml2core.odesign
+++ b/plugins/org.obeonetwork.dsl.uml2.core.design/description/uml2core.odesign
@@ -14,7 +14,7 @@
           </style>
         </nodeMappings>
         <nodeMappings name="Empty Diagram" preconditionExpression="service:diagram.isDiagramEmpty" deletionDescription="//@ownedViewpoints[name='Reused']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='delete']/@ownedTools[name='RED_NoOp']" semanticCandidatesExpression="var:self" doubleClickDescription="//@ownedViewpoints[name='Reused']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='existingElements']/@ownedTools[name='Add%20direct%20children']" domainClass="uml.Element">
-          <style xsi:type="style:WorkspaceImageDescription" showIcon="false" labelExpression="" sizeComputationExpression="-1" labelPosition="node" resizeKind="NSEW" workspacePath="/org.obeonetwork.dsl.uml2.design/icons/empty.svg">
+          <style xsi:type="style:WorkspaceImageDescription" showIcon="false" labelExpression="" sizeComputationExpression="-1" labelPosition="node" resizeKind="NSEW" workspacePath="/org.obeonetwork.dsl.uml2.core.design/icons/empty.svg">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           </style>
@@ -69,7 +69,7 @@
       </defaultLayer>
       <toolSection documentation="reused tools" name="reused tools">
         <subSections name="existingElements">
-          <ownedTools xsi:type="tool:ToolDescription" documentation="Add existing elements to the diagram" name="AddExistingElements" label="Add" precondition="service:containerView.isValidContainerMapping" iconPath="/org.obeonetwork.dsl.uml2.design/icons/properties/create.gif">
+          <ownedTools xsi:type="tool:ToolDescription" documentation="Add existing elements to the diagram" name="AddExistingElements" label="Add" precondition="service:containerView.isValidContainerMapping" iconPath="/org.obeonetwork.dsl.uml2.core.design/icons/properties/create.gif">
             <element name="element"/>
             <elementView name="elementView"/>
             <initialOperation>
@@ -104,7 +104,7 @@
               </firstModelOperations>
             </initialOperation>
           </ownedTools>
-          <ownedTools xsi:type="tool:ToolDescription" documentation="Remove an existing element from the diagram" name="RemoveExistingElements" label="Remove" precondition="service:containerView.isNotDiagram" forceRefresh="true" iconPath="/org.obeonetwork.dsl.uml2.design/icons/properties/unset.gif">
+          <ownedTools xsi:type="tool:ToolDescription" documentation="Remove an existing element from the diagram" name="RemoveExistingElements" label="Remove" precondition="service:containerView.isNotDiagram" forceRefresh="true" iconPath="/org.obeonetwork.dsl.uml2.core.design/icons/properties/unset.gif">
             <element name="element"/>
             <elementView name="elementView"/>
             <initialOperation>
@@ -311,7 +311,7 @@
             </menuItemDescription>
           </ownedTools>
           <ownedTools xsi:type="tool:PopupMenu" name="Delete" label="Delete" precondition="service:containerView.isNotDiagram">
-            <menuItemDescription xsi:type="tool:OperationAction" name="from Diagram" icon="/org.obeonetwork.dsl.uml2.design/icons/properties/unset.gif">
+            <menuItemDescription xsi:type="tool:OperationAction" name="from Diagram" icon="/org.obeonetwork.dsl.uml2.core.design/icons/properties/unset.gif">
               <view name="views"/>
               <initialOperation>
                 <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:views">
@@ -321,7 +321,7 @@
                 </firstModelOperations>
               </initialOperation>
             </menuItemDescription>
-            <menuItemDescription xsi:type="tool:OperationAction" name="from Model" icon="/org.obeonetwork.dsl.uml2.design/icons/deleteModel.gif">
+            <menuItemDescription xsi:type="tool:OperationAction" name="from Model" icon="/org.obeonetwork.dsl.uml2.core.design/icons/deleteModel.gif">
               <view name="views"/>
               <initialOperation>
                 <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:views->filter(viewpoint::DSemanticDecorator).target.destroy()"/>
@@ -408,7 +408,7 @@
           <conditionnalStyles predicateExpression="aql:self.interrupts->filter(ecore::EObject)->size() > 0">
             <style routingStyle="manhattan">
               <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_purple']"/>
-              <centerLabelStyleDescription labelExpression="." iconPath="/org.obeonetwork.dsl.uml2.design/icons/InterruptibleEdgeIcon.png">
+              <centerLabelStyleDescription labelExpression="." iconPath="/org.obeonetwork.dsl.core.uml2.design/icons/InterruptibleEdgeIcon.png">
                 <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
               </centerLabelStyleDescription>
             </style>
@@ -3061,7 +3061,7 @@
               </subModelOperations>
             </firstModelOperations>
           </onClickOperation>
-          <actions imageExpression="/org.obeonetwork.dsl.uml2.design/icons/properties/create.gif">
+          <actions imageExpression="/org.obeonetwork.dsl.uml2.core.design/icons/properties/create.gif">
             <initialOperation>
               <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:self">
                 <subModelOperations xsi:type="tool:If" conditionExpression="aql:self.isAttributesOwner()">
@@ -3070,7 +3070,7 @@
               </firstModelOperations>
             </initialOperation>
           </actions>
-          <actions imageExpression="/org.obeonetwork.dsl.uml2.design/icons/properties/unset.gif">
+          <actions imageExpression="/org.obeonetwork.dsl.uml2.core.design/icons/properties/unset.gif">
             <initialOperation>
               <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:self">
                 <subModelOperations xsi:type="tool:If" conditionExpression="aql: self.isRemovableAttribute(selection)">
@@ -3081,12 +3081,12 @@
               </firstModelOperations>
             </initialOperation>
           </actions>
-          <actions imageExpression="/org.obeonetwork.dsl.uml2.design/icons/properties/up.gif">
+          <actions imageExpression="/org.obeonetwork.dsl.uml2.core.design/icons/properties/up.gif">
             <initialOperation>
               <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:selection.organizeUpAttributes(self, true)"/>
             </initialOperation>
           </actions>
-          <actions imageExpression="/org.obeonetwork.dsl.uml2.design/icons/properties/down.gif">
+          <actions imageExpression="/org.obeonetwork.dsl.uml2.core.design/icons/properties/down.gif">
             <initialOperation>
               <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:selection.organizeUpAttributes(self, false)"/>
             </initialOperation>
@@ -3195,12 +3195,12 @@
             <layout xsi:type="properties:GridLayoutDescription" numberOfColumns="6"/>
           </controls>
         </controls>
-        <actions tooltipExpression="Add a new association end" imageExpression="/org.obeonetwork.dsl.uml2.design/icons/properties/create.gif">
+        <actions tooltipExpression="Add a new association end" imageExpression="/org.obeonetwork.dsl.uml2.core.design/icons/properties/create.gif">
           <initialOperation>
             <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.addAssociationEnd()"/>
           </initialOperation>
         </actions>
-        <actions tooltipExpression="Remove ends" imageExpression="/org.obeonetwork.dsl.uml2.design/icons/properties/unset.gif">
+        <actions tooltipExpression="Remove ends" imageExpression="/org.obeonetwork.dsl.uml2.core.design/icons/properties/unset.gif">
           <initialOperation>
             <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.removeAssociationEnd()"/>
           </initialOperation>
@@ -3225,12 +3225,12 @@
       </groups>
       <groups name="PR_StereotypesGroup" labelExpression="Stereotypes" domainClass="uml::Element" semanticCandidateExpression="var:self">
         <controls xsi:type="properties:ListDescription" name="Stereotypes" label="Stereotypes" labelExpression="Applied Stereotypes:" helpExpression="The Stereotypes applied to the Element" valueExpression="aql:self.oclAsType(uml::Element).getAppliedStereotypes()" displayExpression="aql:value.computeUmlLabel()">
-          <actions imageExpression="/org.obeonetwork.dsl.uml2.design/icons/properties/create.gif">
+          <actions imageExpression="/org.obeonetwork.dsl.uml2.core.design/icons/properties/create.gif">
             <initialOperation>
               <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="service:selectStereotype()"/>
             </initialOperation>
           </actions>
-          <actions imageExpression="/org.obeonetwork.dsl.uml2.design/icons/properties/unset.gif">
+          <actions imageExpression="/org.obeonetwork.dsl.uml2.core.design/icons/properties/unset.gif">
             <initialOperation>
               <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.unapplyStereotypes(selection)"/>
             </initialOperation>
diff --git a/plugins/org.obeonetwork.dsl.uml2.design/icons/InterruptibleEdgeIcon.png b/plugins/org.obeonetwork.dsl.uml2.core.design/icons/InterruptibleEdgeIcon.png
similarity index 100%
rename from plugins/org.obeonetwork.dsl.uml2.design/icons/InterruptibleEdgeIcon.png
rename to plugins/org.obeonetwork.dsl.uml2.core.design/icons/InterruptibleEdgeIcon.png
diff --git a/plugins/org.obeonetwork.dsl.uml2.design/icons/deleteModel.gif b/plugins/org.obeonetwork.dsl.uml2.core.design/icons/deleteModel.gif
similarity index 100%
rename from plugins/org.obeonetwork.dsl.uml2.design/icons/deleteModel.gif
rename to plugins/org.obeonetwork.dsl.uml2.core.design/icons/deleteModel.gif
diff --git a/plugins/org.obeonetwork.dsl.uml2.design/icons/empty.svg b/plugins/org.obeonetwork.dsl.uml2.core.design/icons/empty.svg
similarity index 100%
rename from plugins/org.obeonetwork.dsl.uml2.design/icons/empty.svg
rename to plugins/org.obeonetwork.dsl.uml2.core.design/icons/empty.svg
diff --git a/plugins/org.obeonetwork.dsl.uml2.design/icons/properties/create.gif b/plugins/org.obeonetwork.dsl.uml2.core.design/icons/properties/create.gif
similarity index 100%
rename from plugins/org.obeonetwork.dsl.uml2.design/icons/properties/create.gif
rename to plugins/org.obeonetwork.dsl.uml2.core.design/icons/properties/create.gif
diff --git a/plugins/org.obeonetwork.dsl.uml2.design/icons/properties/down.gif b/plugins/org.obeonetwork.dsl.uml2.core.design/icons/properties/down.gif
similarity index 100%
rename from plugins/org.obeonetwork.dsl.uml2.design/icons/properties/down.gif
rename to plugins/org.obeonetwork.dsl.uml2.core.design/icons/properties/down.gif
diff --git a/plugins/org.obeonetwork.dsl.uml2.design/icons/properties/unset.gif b/plugins/org.obeonetwork.dsl.uml2.core.design/icons/properties/unset.gif
similarity index 100%
rename from plugins/org.obeonetwork.dsl.uml2.design/icons/properties/unset.gif
rename to plugins/org.obeonetwork.dsl.uml2.core.design/icons/properties/unset.gif
diff --git a/plugins/org.obeonetwork.dsl.uml2.design/icons/properties/up.gif b/plugins/org.obeonetwork.dsl.uml2.core.design/icons/properties/up.gif
similarity index 100%
rename from plugins/org.obeonetwork.dsl.uml2.design/icons/properties/up.gif
rename to plugins/org.obeonetwork.dsl.uml2.core.design/icons/properties/up.gif
diff --git a/plugins/org.obeonetwork.dsl.uml2.design/description/uml2.odesign b/plugins/org.obeonetwork.dsl.uml2.design/description/uml2.odesign
index 4916c651e..458d645af 100644
--- a/plugins/org.obeonetwork.dsl.uml2.design/description/uml2.odesign
+++ b/plugins/org.obeonetwork.dsl.uml2.design/description/uml2.odesign
@@ -14,7 +14,7 @@
           </style>
         </nodeMappings>
         <nodeMappings name="Empty Diagram" preconditionExpression="service:diagram.isDiagramEmpty" deletionDescription="//@ownedViewpoints[name='Reused']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='delete']/@ownedTools[name='RED_NoOp']" semanticCandidatesExpression="var:self" doubleClickDescription="//@ownedViewpoints[name='Reused']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='existingElements']/@ownedTools[name='Add%20direct%20children']" domainClass="uml.Element">
-          <style xsi:type="style:WorkspaceImageDescription" showIcon="false" labelExpression="" sizeComputationExpression="-1" labelPosition="node" resizeKind="NSEW" workspacePath="/org.obeonetwork.dsl.uml2.design/icons/empty.svg">
+          <style xsi:type="style:WorkspaceImageDescription" showIcon="false" labelExpression="" sizeComputationExpression="-1" labelPosition="node" resizeKind="NSEW" workspacePath="/org.obeonetwork.dsl.uml2.core.design/icons/empty.svg">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           </style>
@@ -30,7 +30,7 @@
       </defaultLayer>
       <toolSection documentation="reused tools" name="reused tools">
         <subSections name="existingElements">
-          <ownedTools xsi:type="tool:ToolDescription" documentation="Add existing elements to the diagram" name="AddExistingElements" label="Add" precondition="service:containerView.isValidContainerMapping" iconPath="/org.obeonetwork.dsl.uml2.design/icons/properties/create.gif">
+          <ownedTools xsi:type="tool:ToolDescription" documentation="Add existing elements to the diagram" name="AddExistingElements" label="Add" precondition="service:containerView.isValidContainerMapping" iconPath="/org.obeonetwork.dsl.uml2.core.design/icons/properties/create.gif">
             <element name="element"/>
             <elementView name="elementView"/>
             <initialOperation>
@@ -74,7 +74,7 @@
               </firstModelOperations>
             </initialOperation>
           </ownedTools>
-          <ownedTools xsi:type="tool:ToolDescription" documentation="Remove an existing element from the diagram" name="RemoveExistingElements" label="Remove" precondition="service:containerView.isNotDiagram" forceRefresh="true" iconPath="/org.obeonetwork.dsl.uml2.design/icons/properties/unset.gif">
+          <ownedTools xsi:type="tool:ToolDescription" documentation="Remove an existing element from the diagram" name="RemoveExistingElements" label="Remove" precondition="service:containerView.isNotDiagram" forceRefresh="true" iconPath="/org.obeonetwork.dsl.uml2.core.design/icons/properties/unset.gif">
             <element name="element"/>
             <elementView name="elementView"/>
             <initialOperation>
@@ -512,7 +512,7 @@
             </menuItemDescription>
           </ownedTools>
           <ownedTools xsi:type="tool:PopupMenu" name="Delete" label="Delete" precondition="service:containerView.isNotDiagram">
-            <menuItemDescription xsi:type="tool:OperationAction" name="from Diagram" icon="/org.obeonetwork.dsl.uml2.design/icons/properties/unset.gif">
+            <menuItemDescription xsi:type="tool:OperationAction" name="from Diagram" icon="/org.obeonetwork.dsl.uml2.core.design/icons/properties/unset.gif">
               <view name="views"/>
               <initialOperation>
                 <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:views">
@@ -522,7 +522,7 @@
                 </firstModelOperations>
               </initialOperation>
             </menuItemDescription>
-            <menuItemDescription xsi:type="tool:OperationAction" name="from Model" icon="/org.obeonetwork.dsl.uml2.design/icons/deleteModel.gif">
+            <menuItemDescription xsi:type="tool:OperationAction" name="from Model" icon="/org.obeonetwork.dsl.uml2.core.design/icons/deleteModel.gif">
               <view name="views"/>
               <initialOperation>
                 <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:views->filter(viewpoint::DSemanticDecorator).target.destroy()"/>
@@ -655,7 +655,7 @@
           </style>
         </edgeMappings>
         <toolSections name="PH_ExistingElements" label="Existing Elements" reusedTools="//@ownedViewpoints[name='Reused']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='existingElements']/@ownedTools[name='AddExistingElements'] //@ownedViewpoints[name='Reused']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='existingElements']/@ownedTools[name='RemoveExistingElements'] //@ownedViewpoints[name='Reused']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='existingElements']/@ownedTools[name='Paste'] //@ownedViewpoints[name='Reused']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='existingElements']/@ownedTools[name='Drop%20From%20TreeView'] //@ownedViewpoints[name='Reused']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='existingElements']/@ownedTools[name='Drop%20From%20Diagram'] //@ownedViewpoints[name='Reused']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='popup%20menu']/@ownedTools[name='Delete']">
-          <ownedTools xsi:type="tool:OperationAction" documentation="Add related elements to the diagram" name="PH_AddRelatedElements" label="Add Related Elements" forceRefresh="true" icon="/org.obeonetwork.dsl.uml2.design/icons/properties/create.gif">
+          <ownedTools xsi:type="tool:OperationAction" documentation="Add related elements to the diagram" name="PH_AddRelatedElements" label="Add Related Elements" forceRefresh="true" icon="/org.obeonetwork.dsl.uml2.core.design/icons/properties/create.gif">
             <view name="views"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="service:views.getTarget">
@@ -957,7 +957,7 @@
           </style>
         </containerMappings>
         <toolSections name="Existing Elements" reusedTools="//@ownedViewpoints[name='Reused']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='existingElements']/@ownedTools[name='AddExistingElements'] //@ownedViewpoints[name='Reused']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='existingElements']/@ownedTools[name='RemoveExistingElements'] //@ownedViewpoints[name='Reused']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='existingElements']/@ownedTools[name='Paste'] //@ownedViewpoints[name='Reused']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='existingElements']/@ownedTools[name='Drop%20From%20TreeView'] //@ownedViewpoints[name='Reused']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='existingElements']/@ownedTools[name='Drop%20From%20Diagram'] //@ownedViewpoints[name='Reused']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='popup%20menu']/@ownedTools[name='Delete']">
-          <ownedTools xsi:type="tool:OperationAction" documentation="Add related elements to diagram" name="UCD_AddRelatedElements" label="Add Related Elements" forceRefresh="true" icon="/org.obeonetwork.dsl.uml2.design/icons/properties/create.gif">
+          <ownedTools xsi:type="tool:OperationAction" documentation="Add related elements to diagram" name="UCD_AddRelatedElements" label="Add Related Elements" forceRefresh="true" icon="/org.obeonetwork.dsl.uml2.core.design/icons/properties/create.gif">
             <view name="views"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool:For" expression="aql:views->filter(viewpoint::DSemanticDecorator)">
@@ -1604,7 +1604,7 @@
           </conditionnalStyles>
         </containerMappings>
         <toolSections name="CD_ExistingElements" label="Existing Elements" reusedTools="//@ownedViewpoints[name='Reused']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='existingElements']/@ownedTools[name='AddExistingElements'] //@ownedViewpoints[name='Reused']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='existingElements']/@ownedTools[name='Paste'] //@ownedViewpoints[name='Reused']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='existingElements']/@ownedTools[name='Drop%20From%20TreeView'] //@ownedViewpoints[name='Reused']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='existingElements']/@ownedTools[name='Drop%20From%20Diagram'] //@ownedViewpoints[name='Reused']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='existingElements']/@ownedTools[name='RemoveExistingElements'] //@ownedViewpoints[name='Reused']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='popup%20menu']/@ownedTools[name='Delete']">
-          <ownedTools xsi:type="tool:OperationAction" documentation="Add related elements" name="CD_AddRelatedElements" label="Add Related Elements" forceRefresh="true" icon="/org.obeonetwork.dsl.uml2.design/icons/properties/create.gif">
+          <ownedTools xsi:type="tool:OperationAction" documentation="Add related elements" name="CD_AddRelatedElements" label="Add Related Elements" forceRefresh="true" icon="/org.obeonetwork.dsl.uml2.core.design/icons/properties/create.gif">
             <view name="views"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="service:views.getTarget">
@@ -2978,7 +2978,7 @@
           </conditionnalStyles>
         </containerMappings>
         <toolSections name="CS_ExistingElements" label="Existing Elements" reusedTools="//@ownedViewpoints[name='Reused']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='existingElements']/@ownedTools[name='AddExistingElements'] //@ownedViewpoints[name='Reused']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='existingElements']/@ownedTools[name='RemoveExistingElements'] //@ownedViewpoints[name='Reused']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='existingElements']/@ownedTools[name='Paste'] //@ownedViewpoints[name='Reused']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='existingElements']/@ownedTools[name='Drop%20From%20TreeView'] //@ownedViewpoints[name='Reused']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='existingElements']/@ownedTools[name='Drop%20From%20Diagram'] //@ownedViewpoints[name='Reused']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='popup%20menu']/@ownedTools[name='Delete']">
-          <ownedTools xsi:type="tool:OperationAction" documentation="Add related elements to the diagram" name="CS_AddRelatedElements" label="Add Related Elements" precondition="aql:self.oclIsKindOf(uml::Interface) or self.oclIsKindOf(uml::Port) or self.oclIsKindOf(uml::EncapsulatedClassifier) or self.oclIsKindOf(uml::PackageableElement)" forceRefresh="true" icon="/org.obeonetwork.dsl.uml2.design/icons/properties/create.gif">
+          <ownedTools xsi:type="tool:OperationAction" documentation="Add related elements to the diagram" name="CS_AddRelatedElements" label="Add Related Elements" precondition="aql:self.oclIsKindOf(uml::Interface) or self.oclIsKindOf(uml::Port) or self.oclIsKindOf(uml::EncapsulatedClassifier) or self.oclIsKindOf(uml::PackageableElement)" forceRefresh="true" icon="/org.obeonetwork.dsl.uml2.core.design/icons/properties/create.gif">
             <view name="views"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="service:views.getTarget">
@@ -3341,7 +3341,7 @@
           </conditionnalStyles>
         </containerMappings>
         <toolSections name="CO_ExistingElements" label="Existing Elements" reusedTools="//@ownedViewpoints[name='Reused']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='existingElements']/@ownedTools[name='AddExistingElements'] //@ownedViewpoints[name='Reused']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='existingElements']/@ownedTools[name='RemoveExistingElements'] //@ownedViewpoints[name='Reused']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='existingElements']/@ownedTools[name='Paste'] //@ownedViewpoints[name='Reused']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='existingElements']/@ownedTools[name='Drop%20From%20TreeView'] //@ownedViewpoints[name='Reused']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='existingElements']/@ownedTools[name='Drop%20From%20Diagram'] //@ownedViewpoints[name='Reused']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='popup%20menu']/@ownedTools[name='Delete']">
-          <ownedTools xsi:type="tool:OperationAction" documentation="Add related elements to the diagram" name="CO_AddRelatedElements" label="Add Related Elements" forceRefresh="true" icon="/org.obeonetwork.dsl.uml2.design/icons/properties/create.gif">
+          <ownedTools xsi:type="tool:OperationAction" documentation="Add related elements to the diagram" name="CO_AddRelatedElements" label="Add Related Elements" forceRefresh="true" icon="/org.obeonetwork.dsl.uml2.core.design/icons/properties/create.gif">
             <view name="views"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="service:views.getTarget">
@@ -3808,7 +3808,7 @@
           </conditionnalStyles>
         </containerMappings>
         <toolSections name="DE_ExistingElements" label="Existing Elements" reusedTools="//@ownedViewpoints[name='Reused']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='existingElements']/@ownedTools[name='AddExistingElements'] //@ownedViewpoints[name='Reused']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='existingElements']/@ownedTools[name='RemoveExistingElements'] //@ownedViewpoints[name='Reused']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='existingElements']/@ownedTools[name='Paste'] //@ownedViewpoints[name='Reused']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='existingElements']/@ownedTools[name='Drop%20From%20TreeView'] //@ownedViewpoints[name='Reused']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='existingElements']/@ownedTools[name='Drop%20From%20Diagram'] //@ownedViewpoints[name='Reused']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='popup%20menu']/@ownedTools[name='Delete']">
-          <ownedTools xsi:type="tool:OperationAction" documentation="Add related elements to the diagram" name="DE_AddRelatedElements" label="Add Related Elements" forceRefresh="true" icon="/org.obeonetwork.dsl.uml2.design/icons/properties/create.gif">
+          <ownedTools xsi:type="tool:OperationAction" documentation="Add related elements to the diagram" name="DE_AddRelatedElements" label="Add Related Elements" forceRefresh="true" icon="/org.obeonetwork.dsl.uml2.core.design/icons/properties/create.gif">
             <view name="views"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="service:views.getTarget">
@@ -4698,7 +4698,7 @@
           </style>
         </containerMappings>
         <toolSections name="Elements" reusedTools="//@ownedViewpoints[name='Reused']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='popup%20menu']/@ownedTools[name='Move%20UP%2FDOWN%20TO%20Elements']">
-          <ownedTools xsi:type="tool:PaneBasedSelectionWizardDescription" documentation="Move an element" name="PC_ArrangeContainment" label="Move" forceRefresh="true" iconPath="/org.obeonetwork.dsl.uml2.design/icons/properties/create.gif" message="Select elements contained in the current package" choiceOfValuesMessage="Candidate packageable elements" candidatesExpression="service:getAllPackageableElements" tree="true" rootExpression="service:getAllAvailableRootPackages" childrenExpression="feature:eContents" selectedValuesMessage="Selected packageable elements" preSelectedCandidatesExpression="aql:container.packagedElement">
+          <ownedTools xsi:type="tool:PaneBasedSelectionWizardDescription" documentation="Move an element" name="PC_ArrangeContainment" label="Move" forceRefresh="true" iconPath="/org.obeonetwork.dsl.uml2.core.design/icons/properties/create.gif" message="Select elements contained in the current package" choiceOfValuesMessage="Candidate packageable elements" candidatesExpression="service:getAllPackageableElements" tree="true" rootExpression="service:getAllAvailableRootPackages" childrenExpression="feature:eContents" selectedValuesMessage="Selected packageable elements" preSelectedCandidatesExpression="aql:container.packagedElement">
             <element name="elements"/>
             <containerView name="containerView"/>
             <container name="container"/>