[423052] Generate model code

And fix compilation pb in corresponding plugin (org.eclipse.sirius). Other generations and compilations problems are split in other commits to facilitate the review. Change-Id: Ie7e1ec1a27959062690f79a6b622e854865cc5c8 Signed-off-by: Laurent Redor <laurent.redor@obeo.fr>
author: Laurent Redor 2014-01-31 15:02:36 +0000
committer: Laurent Redor 2014-02-04 09:22:45 +0000
commit: 0e5e2bdb7dc61d76b9091f34d095b7c48b6f2e8f (patch)
tree: c6e9d5950dc12508aec02d80061dd99c8e9655bf
parent: 58c788056282b7eb0c7a3a2e91a479c894d7f9da (diff)
download: org.eclipse.sirius-0e5e2bdb7dc61d76b9091f34d095b7c48b6f2e8f.tar.gz
org.eclipse.sirius-0e5e2bdb7dc61d76b9091f34d095b7c48b6f2e8f.tar.xz
org.eclipse.sirius-0e5e2bdb7dc61d76b9091f34d095b7c48b6f2e8f.zip
132 files changed, 1539 insertions, 1617 deletions
diff --git a/plugins/org.eclipse.sirius/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius/META-INF/MANIFEST.MF
index 913ce6047d..11b3788eab 100644
--- a/plugins/org.eclipse.sirius/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.sirius/META-INF/MANIFEST.MF
@@ -111,9 +111,6 @@ Export-Package: org.eclipse.sirius.business.api.action;version="1.0.0",
  org.eclipse.sirius.diagram.description.tool.util;version="1.0.0",
  org.eclipse.sirius.diagram.description.impl;version="1.0.0",
  org.eclipse.sirius.diagram.description.util;version="1.0.0",
- org.eclipse.sirius.diagram.description.validation;version="1.0.0",
- org.eclipse.sirius.diagram.description.validation.impl;version="1.0.0",
- org.eclipse.sirius.diagram.description.validation.util;version="1.0.0",
  org.eclipse.sirius.diagram.impl;version="1.0.0",
  org.eclipse.sirius.diagram.util;version="1.0.0",
  org.eclipse.sirius.tools.api.command;version="1.0.0",
@@ -158,6 +155,9 @@ Export-Package: org.eclipse.sirius.business.api.action;version="1.0.0",
  org.eclipse.sirius.viewpoint.description.tool.impl;version="1.0.0",
  org.eclipse.sirius.viewpoint.description.tool.util;version="1.0.0",
  org.eclipse.sirius.viewpoint.description.util;version="1.0.0",
+ org.eclipse.sirius.viewpoint.description.validation;version="1.0.0",
+ org.eclipse.sirius.viewpoint.description.validation.impl;version="1.0.0",
+ org.eclipse.sirius.viewpoint.description.validation.util;version="1.0.0",
  org.eclipse.sirius.viewpoint.impl;version="1.0.0",
  org.eclipse.sirius.viewpoint.util;version="1.0.0"
 Require-Bundle: org.eclipse.sirius.common;bundle-version="1.0.0",
diff --git a/plugins/org.eclipse.sirius/plugin.xml b/plugins/org.eclipse.sirius/plugin.xml
index 570c285853..5ba078775d 100644
--- a/plugins/org.eclipse.sirius/plugin.xml
+++ b/plugins/org.eclipse.sirius/plugin.xml
@@ -62,6 +62,14 @@
    <extension point="org.eclipse.emf.ecore.generated_package">
       <!-- @generated viewpoint -->
       <package
+            uri="http://www.eclipse.org/sirius/description/validation/1.1.0"
+            class="org.eclipse.sirius.viewpoint.description.validation.ValidationPackage"
+            genModel="model/viewpoint.genmodel"/>
+   </extension>
+
+   <extension point="org.eclipse.emf.ecore.generated_package">
+      <!-- @generated viewpoint -->
+      <package
             uri="http://www.eclipse.org/sirius/description/audit/1.1.0"
             class="org.eclipse.sirius.viewpoint.description.audit.AuditPackage"
             genModel="model/viewpoint.genmodel"/>
@@ -94,14 +102,6 @@
    <extension point="org.eclipse.emf.ecore.generated_package">
       <!-- @generated viewpoint -->
       <package
-            uri="http://www.eclipse.org/sirius/diagram/description/validation/1.1.0"
-            class="org.eclipse.sirius.diagram.description.validation.ValidationPackage"
-            genModel="model/viewpoint.genmodel"/>
-   </extension>
-
-   <extension point="org.eclipse.emf.ecore.generated_package">
-      <!-- @generated viewpoint -->
-      <package
             uri="http://www.eclipse.org/sirius/diagram/description/concern/1.1.0"
             class="org.eclipse.sirius.diagram.description.concern.ConcernPackage"
             genModel="model/viewpoint.genmodel"/>
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/DDiagram.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/DDiagram.java
index 04a9f7c31c..8d10e2cb7b 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/DDiagram.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/DDiagram.java
@@ -22,12 +22,11 @@ import org.eclipse.sirius.diagram.description.NodeMapping;
 import org.eclipse.sirius.diagram.description.concern.ConcernDescription;
 import org.eclipse.sirius.diagram.description.filter.FilterDescription;
 import org.eclipse.sirius.diagram.description.tool.BehaviorTool;
-import org.eclipse.sirius.diagram.description.validation.ValidationRule;
 import org.eclipse.sirius.viewpoint.DContainer;
 import org.eclipse.sirius.viewpoint.DRepresentation;
 import org.eclipse.sirius.viewpoint.DValidable;
-import org.eclipse.sirius.viewpoint.DragAndDropTarget;
 import org.eclipse.sirius.viewpoint.description.DocumentedElement;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationRule;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/DDiagramElementContainer.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/DDiagramElementContainer.java
index 2470ad30a5..4f5f38351e 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/DDiagramElementContainer.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/DDiagramElementContainer.java
@@ -15,7 +15,6 @@ import org.eclipse.emf.common.util.EList;
 import org.eclipse.sirius.diagram.description.ContainerMapping;
 import org.eclipse.sirius.diagram.description.NodeMapping;
 import org.eclipse.sirius.viewpoint.DContainer;
-import org.eclipse.sirius.viewpoint.DragAndDropTarget;
 import org.eclipse.sirius.viewpoint.Style;
 
 /**
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/DNode.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/DNode.java
index b457d92e84..594123b97c 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/DNode.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/DNode.java
@@ -13,7 +13,6 @@ package org.eclipse.sirius.diagram;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.sirius.diagram.description.NodeMapping;
-import org.eclipse.sirius.viewpoint.DragAndDropTarget;
 import org.eclipse.sirius.viewpoint.Style;
 
 /**
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/DiagramFactory.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/DiagramFactory.java
index d7a8f7b403..62aeeaede1 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/DiagramFactory.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/DiagramFactory.java
@@ -365,6 +365,15 @@ public interface DiagramFactory extends EFactory {
     ComputedStyleDescriptionRegistry createComputedStyleDescriptionRegistry();
 
     /**
+     * Returns a new object of class '<em>Drag And Drop Target</em>'. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @return a new object of class '<em>Drag And Drop Target</em>'.
+     * @generated
+     */
+    DragAndDropTarget createDragAndDropTarget();
+
+    /**
      * Returns the package supported by this factory. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * 
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/DiagramPackage.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/DiagramPackage.java
index 5beff4aa06..7d2ddf9a6a 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/DiagramPackage.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/DiagramPackage.java
@@ -5432,6 +5432,27 @@ public interface DiagramPackage extends EPackage {
 
     /**
      * The meta object id for the '
+     * {@link org.eclipse.sirius.diagram.impl.DragAndDropTargetImpl
+     * <em>Drag And Drop Target</em>}' class. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @see org.eclipse.sirius.diagram.impl.DragAndDropTargetImpl
+     * @see org.eclipse.sirius.diagram.impl.DiagramPackageImpl#getDragAndDropTarget()
+     * @generated
+     */
+    int DRAG_AND_DROP_TARGET = 48;
+
+    /**
+     * The number of structural features of the '<em>Drag And Drop Target</em>'
+     * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     * @ordered
+     */
+    int DRAG_AND_DROP_TARGET_FEATURE_COUNT = 0;
+
+    /**
+     * The meta object id for the '
      * {@link org.eclipse.sirius.diagram.ContainerLayout
      * <em>Container Layout</em>}' enum. <!-- begin-user-doc --> <!--
      * end-user-doc -->
@@ -5440,7 +5461,7 @@ public interface DiagramPackage extends EPackage {
      * @see org.eclipse.sirius.diagram.impl.DiagramPackageImpl#getContainerLayout()
      * @generated
      */
-    int CONTAINER_LAYOUT = 48;
+    int CONTAINER_LAYOUT = 49;
 
     /**
      * The meta object id for the '
@@ -5451,7 +5472,7 @@ public interface DiagramPackage extends EPackage {
      * @see org.eclipse.sirius.diagram.impl.DiagramPackageImpl#getLabelPosition()
      * @generated
      */
-    int LABEL_POSITION = 49;
+    int LABEL_POSITION = 50;
 
     /**
      * The meta object id for the '
@@ -5463,7 +5484,7 @@ public interface DiagramPackage extends EPackage {
      * @see org.eclipse.sirius.diagram.impl.DiagramPackageImpl#getContainerShape()
      * @generated
      */
-    int CONTAINER_SHAPE = 50;
+    int CONTAINER_SHAPE = 51;
 
     /**
      * The meta object id for the '
@@ -5475,7 +5496,7 @@ public interface DiagramPackage extends EPackage {
      * @see org.eclipse.sirius.diagram.impl.DiagramPackageImpl#getBackgroundStyle()
      * @generated
      */
-    int BACKGROUND_STYLE = 51;
+    int BACKGROUND_STYLE = 52;
 
     /**
      * The meta object id for the '
@@ -5487,7 +5508,7 @@ public interface DiagramPackage extends EPackage {
      * @see org.eclipse.sirius.diagram.impl.DiagramPackageImpl#getBundledImageShape()
      * @generated
      */
-    int BUNDLED_IMAGE_SHAPE = 52;
+    int BUNDLED_IMAGE_SHAPE = 53;
 
     /**
      * The meta object id for the '{@link org.eclipse.sirius.diagram.LineStyle
@@ -5497,7 +5518,7 @@ public interface DiagramPackage extends EPackage {
      * @see org.eclipse.sirius.diagram.impl.DiagramPackageImpl#getLineStyle()
      * @generated
      */
-    int LINE_STYLE = 53;
+    int LINE_STYLE = 54;
 
     /**
      * The meta object id for the '{@link org.eclipse.sirius.diagram.EdgeArrows
@@ -5508,7 +5529,7 @@ public interface DiagramPackage extends EPackage {
      * @see org.eclipse.sirius.diagram.impl.DiagramPackageImpl#getEdgeArrows()
      * @generated
      */
-    int EDGE_ARROWS = 54;
+    int EDGE_ARROWS = 55;
 
     /**
      * The meta object id for the '
@@ -5519,7 +5540,7 @@ public interface DiagramPackage extends EPackage {
      * @see org.eclipse.sirius.diagram.impl.DiagramPackageImpl#getEdgeRouting()
      * @generated
      */
-    int EDGE_ROUTING = 55;
+    int EDGE_ROUTING = 56;
 
     /**
      * The meta object id for the '
@@ -5530,7 +5551,7 @@ public interface DiagramPackage extends EPackage {
      * @see org.eclipse.sirius.diagram.impl.DiagramPackageImpl#getAlignmentKind()
      * @generated
      */
-    int ALIGNMENT_KIND = 56;
+    int ALIGNMENT_KIND = 57;
 
     /**
      * The meta object id for the '{@link org.eclipse.sirius.diagram.ResizeKind
@@ -5541,7 +5562,7 @@ public interface DiagramPackage extends EPackage {
      * @see org.eclipse.sirius.diagram.impl.DiagramPackageImpl#getResizeKind()
      * @generated
      */
-    int RESIZE_KIND = 57;
+    int RESIZE_KIND = 58;
 
     /**
      * The meta object id for the '
@@ -5553,7 +5574,7 @@ public interface DiagramPackage extends EPackage {
      * @see org.eclipse.sirius.diagram.impl.DiagramPackageImpl#getArrangeConstraint()
      * @generated
      */
-    int ARRANGE_CONSTRAINT = 58;
+    int ARRANGE_CONSTRAINT = 59;
 
     /**
      * Returns the meta object for class '
@@ -7826,6 +7847,18 @@ public interface DiagramPackage extends EPackage {
     EReference getContainerVariable2StyleDescription_Value();
 
     /**
+     * Returns the meta object for class '
+     * {@link org.eclipse.sirius.diagram.DragAndDropTarget
+     * <em>Drag And Drop Target</em>}'. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @return the meta object for class '<em>Drag And Drop Target</em>'.
+     * @see org.eclipse.sirius.diagram.DragAndDropTarget
+     * @generated
+     */
+    EClass getDragAndDropTarget();
+
+    /**
      * Returns the meta object for enum '
      * {@link org.eclipse.sirius.diagram.ContainerLayout
      * <em>Container Layout</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
@@ -9666,6 +9699,18 @@ public interface DiagramPackage extends EPackage {
 
         /**
          * The meta object literal for the '
+         * {@link org.eclipse.sirius.diagram.impl.DragAndDropTargetImpl
+         * <em>Drag And Drop Target</em>}' class. <!-- begin-user-doc --> <!--
+         * end-user-doc -->
+         * 
+         * @see org.eclipse.sirius.diagram.impl.DragAndDropTargetImpl
+         * @see org.eclipse.sirius.diagram.impl.DiagramPackageImpl#getDragAndDropTarget()
+         * @generated
+         */
+        EClass DRAG_AND_DROP_TARGET = eINSTANCE.getDragAndDropTarget();
+
+        /**
+         * The meta object literal for the '
          * {@link org.eclipse.sirius.diagram.ContainerLayout
          * <em>Container Layout</em>}' enum. <!-- begin-user-doc --> <!--
          * end-user-doc -->
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/DragAndDropTarget.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/DragAndDropTarget.java
index 124255afb1..43af00426b 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/DragAndDropTarget.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/DragAndDropTarget.java
@@ -9,10 +9,10 @@
  *    Obeo - initial API and implementation
  * 
  */
-package org.eclipse.sirius.viewpoint;
+package org.eclipse.sirius.diagram;
 
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.sirius.viewpoint.description.DragAndDropTargetDescription;
+import org.eclipse.sirius.diagram.description.DragAndDropTargetDescription;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '
@@ -22,7 +22,7 @@ import org.eclipse.sirius.viewpoint.description.DragAndDropTargetDescription;
  * drop requests. <!-- end-model-doc -->
  * 
  * 
- * @see org.eclipse.sirius.viewpoint.ViewpointPackage#getDragAndDropTarget()
+ * @see org.eclipse.sirius.diagram.DiagramPackage#getDragAndDropTarget()
  * @model
  * @generated
  */
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/ContainerMapping.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/ContainerMapping.java
index 7c6b2fd292..f16a5f1081 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/ContainerMapping.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/ContainerMapping.java
@@ -20,7 +20,6 @@ import org.eclipse.sirius.diagram.DDiagramElement;
 import org.eclipse.sirius.diagram.DDiagramElementContainer;
 import org.eclipse.sirius.diagram.description.style.ContainerStyleDescription;
 import org.eclipse.sirius.viewpoint.DSemanticDecorator;
-import org.eclipse.sirius.viewpoint.description.DragAndDropTargetDescription;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/DescriptionPackage.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/DescriptionPackage.java
index 1860e526ad..fa42b01fc7 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/DescriptionPackage.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/DescriptionPackage.java
@@ -64,6 +64,37 @@ public interface DescriptionPackage extends EPackage {
 
     /**
      * The meta object id for the '
+     * {@link org.eclipse.sirius.diagram.description.impl.DragAndDropTargetDescriptionImpl
+     * <em>Drag And Drop Target Description</em>}' class. <!-- begin-user-doc
+     * --> <!-- end-user-doc -->
+     * 
+     * @see org.eclipse.sirius.diagram.description.impl.DragAndDropTargetDescriptionImpl
+     * @see org.eclipse.sirius.diagram.description.impl.DescriptionPackageImpl#getDragAndDropTargetDescription()
+     * @generated
+     */
+    int DRAG_AND_DROP_TARGET_DESCRIPTION = 21;
+
+    /**
+     * The feature id for the '<em><b>Drop Descriptions</b></em>' reference
+     * list. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     * @ordered
+     */
+    int DRAG_AND_DROP_TARGET_DESCRIPTION__DROP_DESCRIPTIONS = 0;
+
+    /**
+     * The number of structural features of the '
+     * <em>Drag And Drop Target Description</em>' class. <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * 
+     * @generated
+     * @ordered
+     */
+    int DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT = 1;
+
+    /**
+     * The meta object id for the '
      * {@link org.eclipse.sirius.diagram.description.impl.DiagramDescriptionImpl
      * <em>Diagram Description</em>}' class. <!-- begin-user-doc --> <!--
      * end-user-doc -->
@@ -81,7 +112,7 @@ public interface DescriptionPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DIAGRAM_DESCRIPTION__DROP_DESCRIPTIONS = org.eclipse.sirius.viewpoint.description.DescriptionPackage.DRAG_AND_DROP_TARGET_DESCRIPTION__DROP_DESCRIPTIONS;
+    int DIAGRAM_DESCRIPTION__DROP_DESCRIPTIONS = DRAG_AND_DROP_TARGET_DESCRIPTION__DROP_DESCRIPTIONS;
 
     /**
      * The feature id for the '<em><b>Documentation</b></em>' attribute. <!--
@@ -90,7 +121,7 @@ public interface DescriptionPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DIAGRAM_DESCRIPTION__DOCUMENTATION = org.eclipse.sirius.viewpoint.description.DescriptionPackage.DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 0;
+    int DIAGRAM_DESCRIPTION__DOCUMENTATION = DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 0;
 
     /**
      * The feature id for the '<em><b>End User Documentation</b></em>'
@@ -99,7 +130,7 @@ public interface DescriptionPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DIAGRAM_DESCRIPTION__END_USER_DOCUMENTATION = org.eclipse.sirius.viewpoint.description.DescriptionPackage.DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 1;
+    int DIAGRAM_DESCRIPTION__END_USER_DOCUMENTATION = DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 1;
 
     /**
      * The feature id for the '<em><b>Name</b></em>' attribute. <!--
@@ -108,7 +139,7 @@ public interface DescriptionPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DIAGRAM_DESCRIPTION__NAME = org.eclipse.sirius.viewpoint.description.DescriptionPackage.DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 2;
+    int DIAGRAM_DESCRIPTION__NAME = DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 2;
 
     /**
      * The feature id for the '<em><b>Label</b></em>' attribute. <!--
@@ -117,7 +148,7 @@ public interface DescriptionPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DIAGRAM_DESCRIPTION__LABEL = org.eclipse.sirius.viewpoint.description.DescriptionPackage.DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 3;
+    int DIAGRAM_DESCRIPTION__LABEL = DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 3;
 
     /**
      * The feature id for the '<em><b>Title Expression</b></em>' attribute. <!--
@@ -126,7 +157,7 @@ public interface DescriptionPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DIAGRAM_DESCRIPTION__TITLE_EXPRESSION = org.eclipse.sirius.viewpoint.description.DescriptionPackage.DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 4;
+    int DIAGRAM_DESCRIPTION__TITLE_EXPRESSION = DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 4;
 
     /**
      * The feature id for the '<em><b>Initialisation</b></em>' attribute. <!--
@@ -135,7 +166,7 @@ public interface DescriptionPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DIAGRAM_DESCRIPTION__INITIALISATION = org.eclipse.sirius.viewpoint.description.DescriptionPackage.DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 5;
+    int DIAGRAM_DESCRIPTION__INITIALISATION = DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 5;
 
     /**
      * The feature id for the '<em><b>Metamodel</b></em>' reference list. <!--
@@ -144,7 +175,7 @@ public interface DescriptionPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DIAGRAM_DESCRIPTION__METAMODEL = org.eclipse.sirius.viewpoint.description.DescriptionPackage.DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 6;
+    int DIAGRAM_DESCRIPTION__METAMODEL = DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 6;
 
     /**
      * The feature id for the '<em><b>Show On Startup</b></em>' attribute. <!--
@@ -153,7 +184,7 @@ public interface DescriptionPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DIAGRAM_DESCRIPTION__SHOW_ON_STARTUP = org.eclipse.sirius.viewpoint.description.DescriptionPackage.DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 7;
+    int DIAGRAM_DESCRIPTION__SHOW_ON_STARTUP = DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 7;
 
     /**
      * The feature id for the '<em><b>Paste Descriptions</b></em>' reference
@@ -162,7 +193,7 @@ public interface DescriptionPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DIAGRAM_DESCRIPTION__PASTE_DESCRIPTIONS = org.eclipse.sirius.viewpoint.description.DescriptionPackage.DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 8;
+    int DIAGRAM_DESCRIPTION__PASTE_DESCRIPTIONS = DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 8;
 
     /**
      * The feature id for the '<em><b>Filters</b></em>' containment reference
@@ -171,7 +202,7 @@ public interface DescriptionPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DIAGRAM_DESCRIPTION__FILTERS = org.eclipse.sirius.viewpoint.description.DescriptionPackage.DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 9;
+    int DIAGRAM_DESCRIPTION__FILTERS = DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 9;
 
     /**
      * The feature id for the '<em><b>All Edge Mappings</b></em>' reference
@@ -180,7 +211,7 @@ public interface DescriptionPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DIAGRAM_DESCRIPTION__ALL_EDGE_MAPPINGS = org.eclipse.sirius.viewpoint.description.DescriptionPackage.DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 10;
+    int DIAGRAM_DESCRIPTION__ALL_EDGE_MAPPINGS = DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 10;
 
     /**
      * The feature id for the '<em><b>All Node Mappings</b></em>' reference
@@ -189,7 +220,7 @@ public interface DescriptionPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DIAGRAM_DESCRIPTION__ALL_NODE_MAPPINGS = org.eclipse.sirius.viewpoint.description.DescriptionPackage.DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 11;
+    int DIAGRAM_DESCRIPTION__ALL_NODE_MAPPINGS = DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 11;
 
     /**
      * The feature id for the '<em><b>All Container Mappings</b></em>' reference
@@ -198,7 +229,7 @@ public interface DescriptionPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DIAGRAM_DESCRIPTION__ALL_CONTAINER_MAPPINGS = org.eclipse.sirius.viewpoint.description.DescriptionPackage.DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 12;
+    int DIAGRAM_DESCRIPTION__ALL_CONTAINER_MAPPINGS = DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 12;
 
     /**
      * The feature id for the '<em><b>Validation Set</b></em>' containment
@@ -207,7 +238,7 @@ public interface DescriptionPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DIAGRAM_DESCRIPTION__VALIDATION_SET = org.eclipse.sirius.viewpoint.description.DescriptionPackage.DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 13;
+    int DIAGRAM_DESCRIPTION__VALIDATION_SET = DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 13;
 
     /**
      * The feature id for the '<em><b>Concerns</b></em>' containment reference.
@@ -216,7 +247,7 @@ public interface DescriptionPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DIAGRAM_DESCRIPTION__CONCERNS = org.eclipse.sirius.viewpoint.description.DescriptionPackage.DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 14;
+    int DIAGRAM_DESCRIPTION__CONCERNS = DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 14;
 
     /**
      * The feature id for the '<em><b>All Tools</b></em>' reference list. <!--
@@ -225,7 +256,7 @@ public interface DescriptionPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DIAGRAM_DESCRIPTION__ALL_TOOLS = org.eclipse.sirius.viewpoint.description.DescriptionPackage.DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 15;
+    int DIAGRAM_DESCRIPTION__ALL_TOOLS = DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 15;
 
     /**
      * The feature id for the '<em><b>Domain Class</b></em>' attribute. <!--
@@ -234,7 +265,7 @@ public interface DescriptionPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DIAGRAM_DESCRIPTION__DOMAIN_CLASS = org.eclipse.sirius.viewpoint.description.DescriptionPackage.DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 16;
+    int DIAGRAM_DESCRIPTION__DOMAIN_CLASS = DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 16;
 
     /**
      * The feature id for the '<em><b>Precondition Expression</b></em>'
@@ -243,7 +274,7 @@ public interface DescriptionPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DIAGRAM_DESCRIPTION__PRECONDITION_EXPRESSION = org.eclipse.sirius.viewpoint.description.DescriptionPackage.DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 17;
+    int DIAGRAM_DESCRIPTION__PRECONDITION_EXPRESSION = DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 17;
 
     /**
      * The feature id for the '<em><b>Default Concern</b></em>' reference. <!--
@@ -252,7 +283,7 @@ public interface DescriptionPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DIAGRAM_DESCRIPTION__DEFAULT_CONCERN = org.eclipse.sirius.viewpoint.description.DescriptionPackage.DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 18;
+    int DIAGRAM_DESCRIPTION__DEFAULT_CONCERN = DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 18;
 
     /**
      * The feature id for the '<em><b>Root Expression</b></em>' attribute. <!--
@@ -261,7 +292,7 @@ public interface DescriptionPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DIAGRAM_DESCRIPTION__ROOT_EXPRESSION = org.eclipse.sirius.viewpoint.description.DescriptionPackage.DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 19;
+    int DIAGRAM_DESCRIPTION__ROOT_EXPRESSION = DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 19;
 
     /**
      * The feature id for the '<em><b>Init</b></em>' reference. <!--
@@ -270,7 +301,7 @@ public interface DescriptionPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DIAGRAM_DESCRIPTION__INIT = org.eclipse.sirius.viewpoint.description.DescriptionPackage.DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 20;
+    int DIAGRAM_DESCRIPTION__INIT = DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 20;
 
     /**
      * The feature id for the '<em><b>Layout</b></em>' containment reference.
@@ -279,7 +310,7 @@ public interface DescriptionPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DIAGRAM_DESCRIPTION__LAYOUT = org.eclipse.sirius.viewpoint.description.DescriptionPackage.DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 21;
+    int DIAGRAM_DESCRIPTION__LAYOUT = DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 21;
 
     /**
      * The feature id for the '<em><b>Diagram Initialisation</b></em>'
@@ -288,7 +319,7 @@ public interface DescriptionPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DIAGRAM_DESCRIPTION__DIAGRAM_INITIALISATION = org.eclipse.sirius.viewpoint.description.DescriptionPackage.DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 22;
+    int DIAGRAM_DESCRIPTION__DIAGRAM_INITIALISATION = DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 22;
 
     /**
      * The feature id for the '<em><b>Default Layer</b></em>' containment
@@ -297,7 +328,7 @@ public interface DescriptionPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DIAGRAM_DESCRIPTION__DEFAULT_LAYER = org.eclipse.sirius.viewpoint.description.DescriptionPackage.DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 23;
+    int DIAGRAM_DESCRIPTION__DEFAULT_LAYER = DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 23;
 
     /**
      * The feature id for the '<em><b>Additional Layers</b></em>' containment
@@ -306,7 +337,7 @@ public interface DescriptionPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DIAGRAM_DESCRIPTION__ADDITIONAL_LAYERS = org.eclipse.sirius.viewpoint.description.DescriptionPackage.DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 24;
+    int DIAGRAM_DESCRIPTION__ADDITIONAL_LAYERS = DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 24;
 
     /**
      * The feature id for the '<em><b>All Layers</b></em>' reference list. <!--
@@ -315,7 +346,7 @@ public interface DescriptionPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DIAGRAM_DESCRIPTION__ALL_LAYERS = org.eclipse.sirius.viewpoint.description.DescriptionPackage.DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 25;
+    int DIAGRAM_DESCRIPTION__ALL_LAYERS = DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 25;
 
     /**
      * The feature id for the '<em><b>All Activated Tools</b></em>' reference
@@ -324,7 +355,7 @@ public interface DescriptionPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DIAGRAM_DESCRIPTION__ALL_ACTIVATED_TOOLS = org.eclipse.sirius.viewpoint.description.DescriptionPackage.DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 26;
+    int DIAGRAM_DESCRIPTION__ALL_ACTIVATED_TOOLS = DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 26;
 
     /**
      * The feature id for the '<em><b>Node Mappings</b></em>' containment
@@ -333,7 +364,7 @@ public interface DescriptionPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DIAGRAM_DESCRIPTION__NODE_MAPPINGS = org.eclipse.sirius.viewpoint.description.DescriptionPackage.DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 27;
+    int DIAGRAM_DESCRIPTION__NODE_MAPPINGS = DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 27;
 
     /**
      * The feature id for the '<em><b>Edge Mappings</b></em>' containment
@@ -342,7 +373,7 @@ public interface DescriptionPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DIAGRAM_DESCRIPTION__EDGE_MAPPINGS = org.eclipse.sirius.viewpoint.description.DescriptionPackage.DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 28;
+    int DIAGRAM_DESCRIPTION__EDGE_MAPPINGS = DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 28;
 
     /**
      * The feature id for the '<em><b>Edge Mapping Imports</b></em>' containment
@@ -351,7 +382,7 @@ public interface DescriptionPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DIAGRAM_DESCRIPTION__EDGE_MAPPING_IMPORTS = org.eclipse.sirius.viewpoint.description.DescriptionPackage.DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 29;
+    int DIAGRAM_DESCRIPTION__EDGE_MAPPING_IMPORTS = DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 29;
 
     /**
      * The feature id for the '<em><b>Container Mappings</b></em>' containment
@@ -360,7 +391,7 @@ public interface DescriptionPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DIAGRAM_DESCRIPTION__CONTAINER_MAPPINGS = org.eclipse.sirius.viewpoint.description.DescriptionPackage.DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 30;
+    int DIAGRAM_DESCRIPTION__CONTAINER_MAPPINGS = DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 30;
 
     /**
      * The feature id for the '<em><b>Reused Mappings</b></em>' reference list.
@@ -369,7 +400,7 @@ public interface DescriptionPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DIAGRAM_DESCRIPTION__REUSED_MAPPINGS = org.eclipse.sirius.viewpoint.description.DescriptionPackage.DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 31;
+    int DIAGRAM_DESCRIPTION__REUSED_MAPPINGS = DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 31;
 
     /**
      * The feature id for the '<em><b>Tool Section</b></em>' containment
@@ -378,7 +409,7 @@ public interface DescriptionPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DIAGRAM_DESCRIPTION__TOOL_SECTION = org.eclipse.sirius.viewpoint.description.DescriptionPackage.DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 32;
+    int DIAGRAM_DESCRIPTION__TOOL_SECTION = DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 32;
 
     /**
      * The feature id for the '<em><b>Reused Tools</b></em>' reference list.
@@ -387,7 +418,7 @@ public interface DescriptionPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DIAGRAM_DESCRIPTION__REUSED_TOOLS = org.eclipse.sirius.viewpoint.description.DescriptionPackage.DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 33;
+    int DIAGRAM_DESCRIPTION__REUSED_TOOLS = DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 33;
 
     /**
      * The feature id for the '<em><b>Enable Popup Bars</b></em>' attribute.
@@ -396,7 +427,7 @@ public interface DescriptionPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DIAGRAM_DESCRIPTION__ENABLE_POPUP_BARS = org.eclipse.sirius.viewpoint.description.DescriptionPackage.DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 34;
+    int DIAGRAM_DESCRIPTION__ENABLE_POPUP_BARS = DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 34;
 
     /**
      * The number of structural features of the '<em>Diagram Description</em>'
@@ -405,7 +436,7 @@ public interface DescriptionPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DIAGRAM_DESCRIPTION_FEATURE_COUNT = org.eclipse.sirius.viewpoint.description.DescriptionPackage.DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 35;
+    int DIAGRAM_DESCRIPTION_FEATURE_COUNT = DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 35;
 
     /**
      * The meta object id for the '
@@ -3165,7 +3196,7 @@ public interface DescriptionPackage extends EPackage {
      * @see org.eclipse.sirius.diagram.description.impl.DescriptionPackageImpl#getFoldingStyle()
      * @generated
      */
-    int FOLDING_STYLE = 21;
+    int FOLDING_STYLE = 22;
 
     /**
      * The meta object id for the '
@@ -3177,7 +3208,7 @@ public interface DescriptionPackage extends EPackage {
      * @see org.eclipse.sirius.diagram.description.impl.DescriptionPackageImpl#getLayoutDirection()
      * @generated
      */
-    int LAYOUT_DIRECTION = 22;
+    int LAYOUT_DIRECTION = 23;
 
     /**
      * Returns the meta object for class '
@@ -4620,6 +4651,33 @@ public interface DescriptionPackage extends EPackage {
     EAttribute getAdditionalLayer_Optional();
 
     /**
+     * Returns the meta object for class '
+     * {@link org.eclipse.sirius.diagram.description.DragAndDropTargetDescription
+     * <em>Drag And Drop Target Description</em>}'. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @return the meta object for class '
+     *         <em>Drag And Drop Target Description</em>'.
+     * @see org.eclipse.sirius.diagram.description.DragAndDropTargetDescription
+     * @generated
+     */
+    EClass getDragAndDropTargetDescription();
+
+    /**
+     * Returns the meta object for the reference list '
+     * {@link org.eclipse.sirius.diagram.description.DragAndDropTargetDescription#getDropDescriptions
+     * <em>Drop Descriptions</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     * 
+     * @return the meta object for the reference list '
+     *         <em>Drop Descriptions</em>'.
+     * @see org.eclipse.sirius.diagram.description.DragAndDropTargetDescription#getDropDescriptions()
+     * @see #getDragAndDropTargetDescription()
+     * @generated
+     */
+    EReference getDragAndDropTargetDescription_DropDescriptions();
+
+    /**
      * Returns the meta object for enum '
      * {@link org.eclipse.sirius.diagram.description.FoldingStyle
      * <em>Folding Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -5684,6 +5742,26 @@ public interface DescriptionPackage extends EPackage {
 
         /**
          * The meta object literal for the '
+         * {@link org.eclipse.sirius.diagram.description.impl.DragAndDropTargetDescriptionImpl
+         * <em>Drag And Drop Target Description</em>}' class. <!--
+         * begin-user-doc --> <!-- end-user-doc -->
+         * 
+         * @see org.eclipse.sirius.diagram.description.impl.DragAndDropTargetDescriptionImpl
+         * @see org.eclipse.sirius.diagram.description.impl.DescriptionPackageImpl#getDragAndDropTargetDescription()
+         * @generated
+         */
+        EClass DRAG_AND_DROP_TARGET_DESCRIPTION = eINSTANCE.getDragAndDropTargetDescription();
+
+        /**
+         * The meta object literal for the '<em><b>Drop Descriptions</b></em>'
+         * reference list feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+         * 
+         * @generated
+         */
+        EReference DRAG_AND_DROP_TARGET_DESCRIPTION__DROP_DESCRIPTIONS = eINSTANCE.getDragAndDropTargetDescription_DropDescriptions();
+
+        /**
+         * The meta object literal for the '
          * {@link org.eclipse.sirius.diagram.description.FoldingStyle
          * <em>Folding Style</em>}' enum. <!-- begin-user-doc --> <!--
          * end-user-doc -->
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/DiagramDescription.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/DiagramDescription.java
index 05ce03e5da..5ffe947669 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/DiagramDescription.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/DiagramDescription.java
@@ -17,13 +17,12 @@ import org.eclipse.sirius.diagram.description.concern.ConcernDescription;
 import org.eclipse.sirius.diagram.description.concern.ConcernSet;
 import org.eclipse.sirius.diagram.description.filter.FilterDescription;
 import org.eclipse.sirius.diagram.description.tool.ToolSection;
-import org.eclipse.sirius.diagram.description.validation.ValidationSet;
-import org.eclipse.sirius.viewpoint.description.DragAndDropTargetDescription;
 import org.eclipse.sirius.viewpoint.description.PasteTargetDescription;
 import org.eclipse.sirius.viewpoint.description.RepresentationDescription;
 import org.eclipse.sirius.viewpoint.description.tool.AbstractToolDescription;
 import org.eclipse.sirius.viewpoint.description.tool.InitialOperation;
 import org.eclipse.sirius.viewpoint.description.tool.RepresentationCreationDescription;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationSet;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/DiagramExtensionDescription.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/DiagramExtensionDescription.java
index b993254548..9f34736e94 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/DiagramExtensionDescription.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/DiagramExtensionDescription.java
@@ -13,8 +13,8 @@ package org.eclipse.sirius.diagram.description;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.sirius.diagram.description.concern.ConcernSet;
-import org.eclipse.sirius.diagram.description.validation.ValidationSet;
 import org.eclipse.sirius.viewpoint.description.RepresentationExtensionDescription;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationSet;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/DragAndDropTargetDescription.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/DragAndDropTargetDescription.java
index af822a09a3..9d6edbd93d 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/DragAndDropTargetDescription.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/DragAndDropTargetDescription.java
@@ -9,11 +9,11 @@
  *    Obeo - initial API and implementation
  * 
  */
-package org.eclipse.sirius.viewpoint.description;
+package org.eclipse.sirius.diagram.description;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.sirius.viewpoint.description.tool.ContainerDropDescription;
+import org.eclipse.sirius.diagram.description.tool.ContainerDropDescription;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '
@@ -26,12 +26,12 @@ import org.eclipse.sirius.viewpoint.description.tool.ContainerDropDescription;
  * The following features are supported:
  * <ul>
  * <li>
- * {@link org.eclipse.sirius.viewpoint.description.DragAndDropTargetDescription#getDropDescriptions
+ * {@link org.eclipse.sirius.diagram.description.DragAndDropTargetDescription#getDropDescriptions
  * <em>Drop Descriptions</em>}</li>
  * </ul>
  * </p>
  * 
- * @see org.eclipse.sirius.viewpoint.description.DescriptionPackage#getDragAndDropTargetDescription()
+ * @see org.eclipse.sirius.diagram.description.DescriptionPackage#getDragAndDropTargetDescription()
  * @model abstract="true"
  * @generated
  */
@@ -39,7 +39,7 @@ public interface DragAndDropTargetDescription extends EObject {
     /**
      * Returns the value of the '<em><b>Drop Descriptions</b></em>' reference
      * list. The list contents are of type
-     * {@link org.eclipse.sirius.viewpoint.description.tool.ContainerDropDescription}
+     * {@link org.eclipse.sirius.diagram.description.tool.ContainerDropDescription}
      * . <!-- begin-user-doc -->
      * <p>
      * If the meaning of the '<em>Drop Descriptions</em>' reference list isn't
@@ -48,7 +48,7 @@ public interface DragAndDropTargetDescription extends EObject {
      * <!-- end-user-doc -->
      * 
      * @return the value of the '<em>Drop Descriptions</em>' reference list.
-     * @see org.eclipse.sirius.viewpoint.description.DescriptionPackage#getDragAndDropTargetDescription_DropDescriptions()
+     * @see org.eclipse.sirius.diagram.description.DescriptionPackage#getDragAndDropTargetDescription_DropDescriptions()
      * @model
      * @generated
      */
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/NodeMapping.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/NodeMapping.java
index 20cbb0d983..4c246a62e6 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/NodeMapping.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/NodeMapping.java
@@ -18,7 +18,6 @@ import org.eclipse.sirius.diagram.DNode;
 import org.eclipse.sirius.diagram.DNodeListElement;
 import org.eclipse.sirius.diagram.NodeStyle;
 import org.eclipse.sirius.diagram.description.style.NodeStyleDescription;
-import org.eclipse.sirius.viewpoint.description.DragAndDropTargetDescription;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/concern/ConcernDescription.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/concern/ConcernDescription.java
index 8fe089f4d4..7258808a5f 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/concern/ConcernDescription.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/concern/ConcernDescription.java
@@ -14,9 +14,9 @@ package org.eclipse.sirius.diagram.description.concern;
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.sirius.diagram.description.filter.FilterDescription;
 import org.eclipse.sirius.diagram.description.tool.BehaviorTool;
-import org.eclipse.sirius.diagram.description.validation.ValidationRule;
 import org.eclipse.sirius.viewpoint.description.DocumentedElement;
 import org.eclipse.sirius.viewpoint.description.IdentifiedElement;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationRule;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/concern/ConcernPackage.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/concern/ConcernPackage.java
index 9f0d0749bd..c3162ae92e 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/concern/ConcernPackage.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/concern/ConcernPackage.java
@@ -44,7 +44,7 @@ public interface ConcernPackage extends EPackage {
      * 
      * @generated
      */
-    String eNS_URI = "http://www.eclipse.org/sirius/description/concern/1.1.0";
+    String eNS_URI = "http://www.eclipse.org/sirius/diagram/description/concern/1.1.0";
 
     /**
      * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/concern/impl/ConcernDescriptionImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/concern/impl/ConcernDescriptionImpl.java
index 87e9b2fd9e..1c929cbc4b 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/concern/impl/ConcernDescriptionImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/concern/impl/ConcernDescriptionImpl.java
@@ -22,10 +22,10 @@ import org.eclipse.sirius.diagram.description.concern.ConcernDescription;
 import org.eclipse.sirius.diagram.description.concern.ConcernPackage;
 import org.eclipse.sirius.diagram.description.filter.FilterDescription;
 import org.eclipse.sirius.diagram.description.tool.BehaviorTool;
-import org.eclipse.sirius.diagram.description.validation.ValidationRule;
 import org.eclipse.sirius.viewpoint.description.DescriptionPackage;
 import org.eclipse.sirius.viewpoint.description.IdentifiedElement;
 import org.eclipse.sirius.viewpoint.description.impl.DocumentedElementImpl;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationRule;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model object '
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/concern/impl/ConcernPackageImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/concern/impl/ConcernPackageImpl.java
index bd74064828..fc2d09cf5f 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/concern/impl/ConcernPackageImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/concern/impl/ConcernPackageImpl.java
@@ -23,8 +23,6 @@ import org.eclipse.sirius.diagram.description.concern.ConcernPackage;
 import org.eclipse.sirius.diagram.description.concern.ConcernSet;
 import org.eclipse.sirius.diagram.description.filter.FilterPackage;
 import org.eclipse.sirius.diagram.description.filter.impl.FilterPackageImpl;
-import org.eclipse.sirius.diagram.description.validation.ValidationPackage;
-import org.eclipse.sirius.diagram.description.validation.impl.ValidationPackageImpl;
 import org.eclipse.sirius.diagram.impl.DiagramPackageImpl;
 import org.eclipse.sirius.viewpoint.ViewpointPackage;
 import org.eclipse.sirius.viewpoint.description.DescriptionPackage;
@@ -121,6 +119,9 @@ public class ConcernPackageImpl extends EPackageImpl implements ConcernPackage {
                 .getEPackage(StylePackage.eNS_URI) : StylePackage.eINSTANCE);
         ToolPackageImpl theToolPackage = (ToolPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ToolPackage.eNS_URI) instanceof ToolPackageImpl ? EPackage.Registry.INSTANCE
                 .getEPackage(ToolPackage.eNS_URI) : ToolPackage.eINSTANCE);
+        org.eclipse.sirius.viewpoint.description.validation.impl.ValidationPackageImpl theValidationPackage = (org.eclipse.sirius.viewpoint.description.validation.impl.ValidationPackageImpl) (EPackage.Registry.INSTANCE
+                .getEPackage(org.eclipse.sirius.viewpoint.description.validation.ValidationPackage.eNS_URI) instanceof org.eclipse.sirius.viewpoint.description.validation.impl.ValidationPackageImpl ? EPackage.Registry.INSTANCE
+                .getEPackage(org.eclipse.sirius.viewpoint.description.validation.ValidationPackage.eNS_URI) : org.eclipse.sirius.viewpoint.description.validation.ValidationPackage.eINSTANCE);
         AuditPackageImpl theAuditPackage = (AuditPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(AuditPackage.eNS_URI) instanceof AuditPackageImpl ? EPackage.Registry.INSTANCE
                 .getEPackage(AuditPackage.eNS_URI) : AuditPackage.eINSTANCE);
         DiagramPackageImpl theDiagramPackage = (DiagramPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(DiagramPackage.eNS_URI) instanceof DiagramPackageImpl ? EPackage.Registry.INSTANCE
@@ -136,8 +137,6 @@ public class ConcernPackageImpl extends EPackageImpl implements ConcernPackage {
                 .getEPackage(org.eclipse.sirius.diagram.description.tool.ToolPackage.eNS_URI) : org.eclipse.sirius.diagram.description.tool.ToolPackage.eINSTANCE);
         FilterPackageImpl theFilterPackage = (FilterPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(FilterPackage.eNS_URI) instanceof FilterPackageImpl ? EPackage.Registry.INSTANCE
                 .getEPackage(FilterPackage.eNS_URI) : FilterPackage.eINSTANCE);
-        ValidationPackageImpl theValidationPackage = (ValidationPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ValidationPackage.eNS_URI) instanceof ValidationPackageImpl ? EPackage.Registry.INSTANCE
-                .getEPackage(ValidationPackage.eNS_URI) : ValidationPackage.eINSTANCE);
 
         // Create package meta-data objects
         theConcernPackage.createPackageContents();
@@ -145,13 +144,13 @@ public class ConcernPackageImpl extends EPackageImpl implements ConcernPackage {
         theDescriptionPackage.createPackageContents();
         theStylePackage.createPackageContents();
         theToolPackage.createPackageContents();
+        theValidationPackage.createPackageContents();
         theAuditPackage.createPackageContents();
         theDiagramPackage.createPackageContents();
         theDescriptionPackage_1.createPackageContents();
         theStylePackage_1.createPackageContents();
         theToolPackage_1.createPackageContents();
         theFilterPackage.createPackageContents();
-        theValidationPackage.createPackageContents();
 
         // Initialize created meta-data
         theConcernPackage.initializePackageContents();
@@ -159,13 +158,13 @@ public class ConcernPackageImpl extends EPackageImpl implements ConcernPackage {
         theDescriptionPackage.initializePackageContents();
         theStylePackage.initializePackageContents();
         theToolPackage.initializePackageContents();
+        theValidationPackage.initializePackageContents();
         theAuditPackage.initializePackageContents();
         theDiagramPackage.initializePackageContents();
         theDescriptionPackage_1.initializePackageContents();
         theStylePackage_1.initializePackageContents();
         theToolPackage_1.initializePackageContents();
         theFilterPackage.initializePackageContents();
-        theValidationPackage.initializePackageContents();
 
         // Mark meta-data to indicate it can't be changed
         theConcernPackage.freeze();
@@ -294,7 +293,8 @@ public class ConcernPackageImpl extends EPackageImpl implements ConcernPackage {
         // Obtain other dependent packages
         DescriptionPackage theDescriptionPackage = (DescriptionPackage) EPackage.Registry.INSTANCE.getEPackage(DescriptionPackage.eNS_URI);
         FilterPackage theFilterPackage = (FilterPackage) EPackage.Registry.INSTANCE.getEPackage(FilterPackage.eNS_URI);
-        ValidationPackage theValidationPackage = (ValidationPackage) EPackage.Registry.INSTANCE.getEPackage(ValidationPackage.eNS_URI);
+        org.eclipse.sirius.viewpoint.description.validation.ValidationPackage theValidationPackage = (org.eclipse.sirius.viewpoint.description.validation.ValidationPackage) EPackage.Registry.INSTANCE
+                .getEPackage(org.eclipse.sirius.viewpoint.description.validation.ValidationPackage.eNS_URI);
         org.eclipse.sirius.diagram.description.tool.ToolPackage theToolPackage_1 = (org.eclipse.sirius.diagram.description.tool.ToolPackage) EPackage.Registry.INSTANCE
                 .getEPackage(org.eclipse.sirius.diagram.description.tool.ToolPackage.eNS_URI);
 
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/filter/impl/FilterPackageImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/filter/impl/FilterPackageImpl.java
index 9dbdbba87a..6258e89f34 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/filter/impl/FilterPackageImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/filter/impl/FilterPackageImpl.java
@@ -32,8 +32,6 @@ import org.eclipse.sirius.diagram.description.filter.FilterPackage;
 import org.eclipse.sirius.diagram.description.filter.FilterVariable;
 import org.eclipse.sirius.diagram.description.filter.MappingFilter;
 import org.eclipse.sirius.diagram.description.filter.VariableFilter;
-import org.eclipse.sirius.diagram.description.validation.ValidationPackage;
-import org.eclipse.sirius.diagram.description.validation.impl.ValidationPackageImpl;
 import org.eclipse.sirius.diagram.impl.DiagramPackageImpl;
 import org.eclipse.sirius.viewpoint.ViewpointPackage;
 import org.eclipse.sirius.viewpoint.description.DescriptionPackage;
@@ -165,6 +163,9 @@ public class FilterPackageImpl extends EPackageImpl implements FilterPackage {
                 .getEPackage(StylePackage.eNS_URI) : StylePackage.eINSTANCE);
         ToolPackageImpl theToolPackage = (ToolPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ToolPackage.eNS_URI) instanceof ToolPackageImpl ? EPackage.Registry.INSTANCE
                 .getEPackage(ToolPackage.eNS_URI) : ToolPackage.eINSTANCE);
+        org.eclipse.sirius.viewpoint.description.validation.impl.ValidationPackageImpl theValidationPackage = (org.eclipse.sirius.viewpoint.description.validation.impl.ValidationPackageImpl) (EPackage.Registry.INSTANCE
+                .getEPackage(org.eclipse.sirius.viewpoint.description.validation.ValidationPackage.eNS_URI) instanceof org.eclipse.sirius.viewpoint.description.validation.impl.ValidationPackageImpl ? EPackage.Registry.INSTANCE
+                .getEPackage(org.eclipse.sirius.viewpoint.description.validation.ValidationPackage.eNS_URI) : org.eclipse.sirius.viewpoint.description.validation.ValidationPackage.eINSTANCE);
         AuditPackageImpl theAuditPackage = (AuditPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(AuditPackage.eNS_URI) instanceof AuditPackageImpl ? EPackage.Registry.INSTANCE
                 .getEPackage(AuditPackage.eNS_URI) : AuditPackage.eINSTANCE);
         DiagramPackageImpl theDiagramPackage = (DiagramPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(DiagramPackage.eNS_URI) instanceof DiagramPackageImpl ? EPackage.Registry.INSTANCE
@@ -178,8 +179,6 @@ public class FilterPackageImpl extends EPackageImpl implements FilterPackage {
         org.eclipse.sirius.diagram.description.tool.impl.ToolPackageImpl theToolPackage_1 = (org.eclipse.sirius.diagram.description.tool.impl.ToolPackageImpl) (EPackage.Registry.INSTANCE
                 .getEPackage(org.eclipse.sirius.diagram.description.tool.ToolPackage.eNS_URI) instanceof org.eclipse.sirius.diagram.description.tool.impl.ToolPackageImpl ? EPackage.Registry.INSTANCE
                 .getEPackage(org.eclipse.sirius.diagram.description.tool.ToolPackage.eNS_URI) : org.eclipse.sirius.diagram.description.tool.ToolPackage.eINSTANCE);
-        ValidationPackageImpl theValidationPackage = (ValidationPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ValidationPackage.eNS_URI) instanceof ValidationPackageImpl ? EPackage.Registry.INSTANCE
-                .getEPackage(ValidationPackage.eNS_URI) : ValidationPackage.eINSTANCE);
         ConcernPackageImpl theConcernPackage = (ConcernPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ConcernPackage.eNS_URI) instanceof ConcernPackageImpl ? EPackage.Registry.INSTANCE
                 .getEPackage(ConcernPackage.eNS_URI) : ConcernPackage.eINSTANCE);
 
@@ -189,12 +188,12 @@ public class FilterPackageImpl extends EPackageImpl implements FilterPackage {
         theDescriptionPackage.createPackageContents();
         theStylePackage.createPackageContents();
         theToolPackage.createPackageContents();
+        theValidationPackage.createPackageContents();
         theAuditPackage.createPackageContents();
         theDiagramPackage.createPackageContents();
         theDescriptionPackage_1.createPackageContents();
         theStylePackage_1.createPackageContents();
         theToolPackage_1.createPackageContents();
-        theValidationPackage.createPackageContents();
         theConcernPackage.createPackageContents();
 
         // Initialize created meta-data
@@ -203,12 +202,12 @@ public class FilterPackageImpl extends EPackageImpl implements FilterPackage {
         theDescriptionPackage.initializePackageContents();
         theStylePackage.initializePackageContents();
         theToolPackage.initializePackageContents();
+        theValidationPackage.initializePackageContents();
         theAuditPackage.initializePackageContents();
         theDiagramPackage.initializePackageContents();
         theDescriptionPackage_1.initializePackageContents();
         theStylePackage_1.initializePackageContents();
         theToolPackage_1.initializePackageContents();
-        theValidationPackage.initializePackageContents();
         theConcernPackage.initializePackageContents();
 
         // Mark meta-data to indicate it can't be changed
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/impl/ContainerMappingImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/impl/ContainerMappingImpl.java
index d23ff85e2f..6d2974387f 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/impl/ContainerMappingImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/impl/ContainerMappingImpl.java
@@ -30,10 +30,10 @@ import org.eclipse.sirius.diagram.DDiagramElementContainer;
 import org.eclipse.sirius.diagram.description.ConditionalContainerStyleDescription;
 import org.eclipse.sirius.diagram.description.ContainerMapping;
 import org.eclipse.sirius.diagram.description.DescriptionPackage;
+import org.eclipse.sirius.diagram.description.DragAndDropTargetDescription;
 import org.eclipse.sirius.diagram.description.NodeMapping;
 import org.eclipse.sirius.diagram.description.style.ContainerStyleDescription;
-import org.eclipse.sirius.viewpoint.description.DragAndDropTargetDescription;
-import org.eclipse.sirius.viewpoint.description.tool.ContainerDropDescription;
+import org.eclipse.sirius.diagram.description.tool.ContainerDropDescription;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model object '
@@ -622,7 +622,7 @@ public class ContainerMappingImpl extends AbstractNodeMappingImpl implements Con
         if (baseClass == DragAndDropTargetDescription.class) {
             switch (derivedFeatureID) {
             case DescriptionPackage.CONTAINER_MAPPING__DROP_DESCRIPTIONS:
-                return org.eclipse.sirius.viewpoint.description.DescriptionPackage.DRAG_AND_DROP_TARGET_DESCRIPTION__DROP_DESCRIPTIONS;
+                return DescriptionPackage.DRAG_AND_DROP_TARGET_DESCRIPTION__DROP_DESCRIPTIONS;
             default:
                 return -1;
             }
@@ -639,7 +639,7 @@ public class ContainerMappingImpl extends AbstractNodeMappingImpl implements Con
     public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
         if (baseClass == DragAndDropTargetDescription.class) {
             switch (baseFeatureID) {
-            case org.eclipse.sirius.viewpoint.description.DescriptionPackage.DRAG_AND_DROP_TARGET_DESCRIPTION__DROP_DESCRIPTIONS:
+            case DescriptionPackage.DRAG_AND_DROP_TARGET_DESCRIPTION__DROP_DESCRIPTIONS:
                 return DescriptionPackage.CONTAINER_MAPPING__DROP_DESCRIPTIONS;
             default:
                 return -1;
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/impl/DescriptionPackageImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/impl/DescriptionPackageImpl.java
index c94c4065a3..e33057c45b 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/impl/DescriptionPackageImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/impl/DescriptionPackageImpl.java
@@ -34,6 +34,7 @@ import org.eclipse.sirius.diagram.description.DiagramDescription;
 import org.eclipse.sirius.diagram.description.DiagramElementMapping;
 import org.eclipse.sirius.diagram.description.DiagramExtensionDescription;
 import org.eclipse.sirius.diagram.description.DiagramImportDescription;
+import org.eclipse.sirius.diagram.description.DragAndDropTargetDescription;
 import org.eclipse.sirius.diagram.description.EdgeMapping;
 import org.eclipse.sirius.diagram.description.EdgeMappingImport;
 import org.eclipse.sirius.diagram.description.FoldingStyle;
@@ -49,8 +50,6 @@ import org.eclipse.sirius.diagram.description.concern.ConcernPackage;
 import org.eclipse.sirius.diagram.description.concern.impl.ConcernPackageImpl;
 import org.eclipse.sirius.diagram.description.filter.FilterPackage;
 import org.eclipse.sirius.diagram.description.filter.impl.FilterPackageImpl;
-import org.eclipse.sirius.diagram.description.validation.ValidationPackage;
-import org.eclipse.sirius.diagram.description.validation.impl.ValidationPackageImpl;
 import org.eclipse.sirius.diagram.impl.DiagramPackageImpl;
 import org.eclipse.sirius.viewpoint.ViewpointPackage;
 import org.eclipse.sirius.viewpoint.description.audit.AuditPackage;
@@ -220,6 +219,13 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP
      * 
      * @generated
      */
+    private EClass dragAndDropTargetDescriptionEClass = null;
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
     private EEnum foldingStyleEEnum = null;
 
     /**
@@ -293,6 +299,9 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP
                 .getEPackage(StylePackage.eNS_URI) : StylePackage.eINSTANCE);
         ToolPackageImpl theToolPackage = (ToolPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ToolPackage.eNS_URI) instanceof ToolPackageImpl ? EPackage.Registry.INSTANCE
                 .getEPackage(ToolPackage.eNS_URI) : ToolPackage.eINSTANCE);
+        org.eclipse.sirius.viewpoint.description.validation.impl.ValidationPackageImpl theValidationPackage = (org.eclipse.sirius.viewpoint.description.validation.impl.ValidationPackageImpl) (EPackage.Registry.INSTANCE
+                .getEPackage(org.eclipse.sirius.viewpoint.description.validation.ValidationPackage.eNS_URI) instanceof org.eclipse.sirius.viewpoint.description.validation.impl.ValidationPackageImpl ? EPackage.Registry.INSTANCE
+                .getEPackage(org.eclipse.sirius.viewpoint.description.validation.ValidationPackage.eNS_URI) : org.eclipse.sirius.viewpoint.description.validation.ValidationPackage.eINSTANCE);
         AuditPackageImpl theAuditPackage = (AuditPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(AuditPackage.eNS_URI) instanceof AuditPackageImpl ? EPackage.Registry.INSTANCE
                 .getEPackage(AuditPackage.eNS_URI) : AuditPackage.eINSTANCE);
         DiagramPackageImpl theDiagramPackage = (DiagramPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(DiagramPackage.eNS_URI) instanceof DiagramPackageImpl ? EPackage.Registry.INSTANCE
@@ -305,8 +314,6 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP
                 .getEPackage(org.eclipse.sirius.diagram.description.tool.ToolPackage.eNS_URI) : org.eclipse.sirius.diagram.description.tool.ToolPackage.eINSTANCE);
         FilterPackageImpl theFilterPackage = (FilterPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(FilterPackage.eNS_URI) instanceof FilterPackageImpl ? EPackage.Registry.INSTANCE
                 .getEPackage(FilterPackage.eNS_URI) : FilterPackage.eINSTANCE);
-        ValidationPackageImpl theValidationPackage = (ValidationPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ValidationPackage.eNS_URI) instanceof ValidationPackageImpl ? EPackage.Registry.INSTANCE
-                .getEPackage(ValidationPackage.eNS_URI) : ValidationPackage.eINSTANCE);
         ConcernPackageImpl theConcernPackage = (ConcernPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ConcernPackage.eNS_URI) instanceof ConcernPackageImpl ? EPackage.Registry.INSTANCE
                 .getEPackage(ConcernPackage.eNS_URI) : ConcernPackage.eINSTANCE);
 
@@ -316,12 +323,12 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP
         theDescriptionPackage_1.createPackageContents();
         theStylePackage.createPackageContents();
         theToolPackage.createPackageContents();
+        theValidationPackage.createPackageContents();
         theAuditPackage.createPackageContents();
         theDiagramPackage.createPackageContents();
         theStylePackage_1.createPackageContents();
         theToolPackage_1.createPackageContents();
         theFilterPackage.createPackageContents();
-        theValidationPackage.createPackageContents();
         theConcernPackage.createPackageContents();
 
         // Initialize created meta-data
@@ -330,12 +337,12 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP
         theDescriptionPackage_1.initializePackageContents();
         theStylePackage.initializePackageContents();
         theToolPackage.initializePackageContents();
+        theValidationPackage.initializePackageContents();
         theAuditPackage.initializePackageContents();
         theDiagramPackage.initializePackageContents();
         theStylePackage_1.initializePackageContents();
         theToolPackage_1.initializePackageContents();
         theFilterPackage.initializePackageContents();
-        theValidationPackage.initializePackageContents();
         theConcernPackage.initializePackageContents();
 
         // Mark meta-data to indicate it can't be changed
@@ -1359,6 +1366,24 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP
      * 
      * @generated
      */
+    public EClass getDragAndDropTargetDescription() {
+        return dragAndDropTargetDescriptionEClass;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    public EReference getDragAndDropTargetDescription_DropDescriptions() {
+        return (EReference) dragAndDropTargetDescriptionEClass.getEStructuralFeatures().get(0);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
     public EEnum getFoldingStyle() {
         return foldingStyleEEnum;
     }
@@ -1534,6 +1559,9 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP
         createEAttribute(additionalLayerEClass, ADDITIONAL_LAYER__ACTIVE_BY_DEFAULT);
         createEAttribute(additionalLayerEClass, ADDITIONAL_LAYER__OPTIONAL);
 
+        dragAndDropTargetDescriptionEClass = createEClass(DRAG_AND_DROP_TARGET_DESCRIPTION);
+        createEReference(dragAndDropTargetDescriptionEClass, DRAG_AND_DROP_TARGET_DESCRIPTION__DROP_DESCRIPTIONS);
+
         // Create enums
         foldingStyleEEnum = createEEnum(FOLDING_STYLE);
         layoutDirectionEEnum = createEEnum(LAYOUT_DIRECTION);
@@ -1569,10 +1597,11 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP
         org.eclipse.sirius.diagram.description.tool.ToolPackage theToolPackage_1 = (org.eclipse.sirius.diagram.description.tool.ToolPackage) EPackage.Registry.INSTANCE
                 .getEPackage(org.eclipse.sirius.diagram.description.tool.ToolPackage.eNS_URI);
         FilterPackage theFilterPackage = (FilterPackage) EPackage.Registry.INSTANCE.getEPackage(FilterPackage.eNS_URI);
-        ValidationPackage theValidationPackage = (ValidationPackage) EPackage.Registry.INSTANCE.getEPackage(ValidationPackage.eNS_URI);
         ConcernPackage theConcernPackage = (ConcernPackage) EPackage.Registry.INSTANCE.getEPackage(ConcernPackage.eNS_URI);
         org.eclipse.sirius.viewpoint.description.DescriptionPackage theDescriptionPackage_1 = (org.eclipse.sirius.viewpoint.description.DescriptionPackage) EPackage.Registry.INSTANCE
                 .getEPackage(org.eclipse.sirius.viewpoint.description.DescriptionPackage.eNS_URI);
+        org.eclipse.sirius.viewpoint.description.validation.ValidationPackage theValidationPackage = (org.eclipse.sirius.viewpoint.description.validation.ValidationPackage) EPackage.Registry.INSTANCE
+                .getEPackage(org.eclipse.sirius.viewpoint.description.validation.ValidationPackage.eNS_URI);
         ToolPackage theToolPackage = (ToolPackage) EPackage.Registry.INSTANCE.getEPackage(ToolPackage.eNS_URI);
         EcorePackage theEcorePackage = (EcorePackage) EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
         DiagramPackage theDiagramPackage = (DiagramPackage) EPackage.Registry.INSTANCE.getEPackage(DiagramPackage.eNS_URI);
@@ -1582,7 +1611,6 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP
         getESubpackages().add(theStylePackage_1);
         getESubpackages().add(theToolPackage_1);
         getESubpackages().add(theFilterPackage);
-        getESubpackages().add(theValidationPackage);
         getESubpackages().add(theConcernPackage);
 
         // Create type parameters
@@ -1590,7 +1618,7 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP
         // Set bounds for type parameters
 
         // Add supertypes to classes
-        diagramDescriptionEClass.getESuperTypes().add(theDescriptionPackage_1.getDragAndDropTargetDescription());
+        diagramDescriptionEClass.getESuperTypes().add(this.getDragAndDropTargetDescription());
         diagramDescriptionEClass.getESuperTypes().add(theDescriptionPackage_1.getRepresentationDescription());
         diagramDescriptionEClass.getESuperTypes().add(theDescriptionPackage_1.getPasteTargetDescription());
         diagramImportDescriptionEClass.getESuperTypes().add(theDescriptionPackage_1.getRepresentationImportDescription());
@@ -1601,9 +1629,9 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP
         abstractNodeMappingEClass.getESuperTypes().add(this.getDiagramElementMapping());
         abstractNodeMappingEClass.getESuperTypes().add(theDescriptionPackage_1.getDocumentedElement());
         nodeMappingEClass.getESuperTypes().add(this.getAbstractNodeMapping());
-        nodeMappingEClass.getESuperTypes().add(theDescriptionPackage_1.getDragAndDropTargetDescription());
+        nodeMappingEClass.getESuperTypes().add(this.getDragAndDropTargetDescription());
         containerMappingEClass.getESuperTypes().add(this.getAbstractNodeMapping());
-        containerMappingEClass.getESuperTypes().add(theDescriptionPackage_1.getDragAndDropTargetDescription());
+        containerMappingEClass.getESuperTypes().add(this.getDragAndDropTargetDescription());
         nodeMappingImportEClass.getESuperTypes().add(this.getNodeMapping());
         nodeMappingImportEClass.getESuperTypes().add(theDescriptionPackage_1.getAbstractMappingImport());
         containerMappingImportEClass.getESuperTypes().add(this.getContainerMapping());
@@ -1980,6 +2008,10 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP
         initEAttribute(getAdditionalLayer_Optional(), ecorePackage.getEBoolean(), "optional", "true", 0, 1, AdditionalLayer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
                 IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
+        initEClass(dragAndDropTargetDescriptionEClass, DragAndDropTargetDescription.class, "DragAndDropTargetDescription", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+        initEReference(getDragAndDropTargetDescription_DropDescriptions(), theToolPackage_1.getContainerDropDescription(), null, "dropDescriptions", null, 0, -1, DragAndDropTargetDescription.class,
+                !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
         // Initialize enums and add enum literals
         initEEnum(foldingStyleEEnum, FoldingStyle.class, "FoldingStyle");
         addEEnumLiteral(foldingStyleEEnum, FoldingStyle.NONE_LITERAL);
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/impl/DiagramDescriptionImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/impl/DiagramDescriptionImpl.java
index 07c20d9aa4..1a0a8fd37b 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/impl/DiagramDescriptionImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/impl/DiagramDescriptionImpl.java
@@ -38,17 +38,16 @@ import org.eclipse.sirius.diagram.description.concern.ConcernDescription;
 import org.eclipse.sirius.diagram.description.concern.ConcernSet;
 import org.eclipse.sirius.diagram.description.filter.FilterDescription;
 import org.eclipse.sirius.diagram.description.tool.ToolSection;
-import org.eclipse.sirius.diagram.description.validation.ValidationSet;
 import org.eclipse.sirius.viewpoint.description.DocumentedElement;
 import org.eclipse.sirius.viewpoint.description.EndUserDocumentedElement;
 import org.eclipse.sirius.viewpoint.description.IdentifiedElement;
 import org.eclipse.sirius.viewpoint.description.PasteTargetDescription;
 import org.eclipse.sirius.viewpoint.description.RepresentationDescription;
-import org.eclipse.sirius.viewpoint.description.impl.DragAndDropTargetDescriptionImpl;
 import org.eclipse.sirius.viewpoint.description.tool.AbstractToolDescription;
 import org.eclipse.sirius.viewpoint.description.tool.InitialOperation;
 import org.eclipse.sirius.viewpoint.description.tool.PasteDescription;
 import org.eclipse.sirius.viewpoint.description.tool.RepresentationCreationDescription;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationSet;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model object '
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/impl/DiagramExtensionDescriptionImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/impl/DiagramExtensionDescriptionImpl.java
index 73c9d03c4a..3dec5d9f81 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/impl/DiagramExtensionDescriptionImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/impl/DiagramExtensionDescriptionImpl.java
@@ -28,7 +28,7 @@ import org.eclipse.sirius.diagram.description.AdditionalLayer;
 import org.eclipse.sirius.diagram.description.DescriptionPackage;
 import org.eclipse.sirius.diagram.description.DiagramExtensionDescription;
 import org.eclipse.sirius.diagram.description.concern.ConcernSet;
-import org.eclipse.sirius.diagram.description.validation.ValidationSet;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationSet;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model object '
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/impl/DiagramImportDescriptionImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/impl/DiagramImportDescriptionImpl.java
index 82b8a9878f..56bd754520 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/impl/DiagramImportDescriptionImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/impl/DiagramImportDescriptionImpl.java
@@ -30,6 +30,7 @@ import org.eclipse.sirius.diagram.description.DescriptionPackage;
 import org.eclipse.sirius.diagram.description.DiagramDescription;
 import org.eclipse.sirius.diagram.description.DiagramElementMapping;
 import org.eclipse.sirius.diagram.description.DiagramImportDescription;
+import org.eclipse.sirius.diagram.description.DragAndDropTargetDescription;
 import org.eclipse.sirius.diagram.description.EdgeMapping;
 import org.eclipse.sirius.diagram.description.EdgeMappingImport;
 import org.eclipse.sirius.diagram.description.Layer;
@@ -38,18 +39,17 @@ import org.eclipse.sirius.diagram.description.NodeMapping;
 import org.eclipse.sirius.diagram.description.concern.ConcernDescription;
 import org.eclipse.sirius.diagram.description.concern.ConcernSet;
 import org.eclipse.sirius.diagram.description.filter.FilterDescription;
+import org.eclipse.sirius.diagram.description.tool.ContainerDropDescription;
 import org.eclipse.sirius.diagram.description.tool.ToolSection;
-import org.eclipse.sirius.diagram.description.validation.ValidationSet;
-import org.eclipse.sirius.viewpoint.description.DragAndDropTargetDescription;
 import org.eclipse.sirius.viewpoint.description.EndUserDocumentedElement;
 import org.eclipse.sirius.viewpoint.description.IdentifiedElement;
 import org.eclipse.sirius.viewpoint.description.PasteTargetDescription;
 import org.eclipse.sirius.viewpoint.description.impl.DocumentedElementImpl;
 import org.eclipse.sirius.viewpoint.description.tool.AbstractToolDescription;
-import org.eclipse.sirius.viewpoint.description.tool.ContainerDropDescription;
 import org.eclipse.sirius.viewpoint.description.tool.InitialOperation;
 import org.eclipse.sirius.viewpoint.description.tool.PasteDescription;
 import org.eclipse.sirius.viewpoint.description.tool.RepresentationCreationDescription;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationSet;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model object '
@@ -2085,7 +2085,7 @@ public class DiagramImportDescriptionImpl extends DocumentedElementImpl implemen
         if (baseClass == DragAndDropTargetDescription.class) {
             switch (derivedFeatureID) {
             case DescriptionPackage.DIAGRAM_IMPORT_DESCRIPTION__DROP_DESCRIPTIONS:
-                return org.eclipse.sirius.viewpoint.description.DescriptionPackage.DRAG_AND_DROP_TARGET_DESCRIPTION__DROP_DESCRIPTIONS;
+                return DescriptionPackage.DRAG_AND_DROP_TARGET_DESCRIPTION__DROP_DESCRIPTIONS;
             default:
                 return -1;
             }
@@ -2186,7 +2186,7 @@ public class DiagramImportDescriptionImpl extends DocumentedElementImpl implemen
         }
         if (baseClass == DragAndDropTargetDescription.class) {
             switch (baseFeatureID) {
-            case org.eclipse.sirius.viewpoint.description.DescriptionPackage.DRAG_AND_DROP_TARGET_DESCRIPTION__DROP_DESCRIPTIONS:
+            case DescriptionPackage.DRAG_AND_DROP_TARGET_DESCRIPTION__DROP_DESCRIPTIONS:
                 return DescriptionPackage.DIAGRAM_IMPORT_DESCRIPTION__DROP_DESCRIPTIONS;
             default:
                 return -1;
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/DragAndDropTargetDescriptionImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/impl/DragAndDropTargetDescriptionImpl.java
index 9b13cdcb1c..81a68ec70b 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/DragAndDropTargetDescriptionImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/impl/DragAndDropTargetDescriptionImpl.java
@@ -9,7 +9,7 @@
  *    Obeo - initial API and implementation
  * 
  */
-package org.eclipse.sirius.viewpoint.description.impl;
+package org.eclipse.sirius.diagram.description.impl;
 
 import java.util.Collection;
 
@@ -17,9 +17,9 @@ import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
 import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-import org.eclipse.sirius.viewpoint.description.DescriptionPackage;
-import org.eclipse.sirius.viewpoint.description.DragAndDropTargetDescription;
-import org.eclipse.sirius.viewpoint.description.tool.ContainerDropDescription;
+import org.eclipse.sirius.diagram.description.DescriptionPackage;
+import org.eclipse.sirius.diagram.description.DragAndDropTargetDescription;
+import org.eclipse.sirius.diagram.description.tool.ContainerDropDescription;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model object '
@@ -28,7 +28,7 @@ import org.eclipse.sirius.viewpoint.description.tool.ContainerDropDescription;
  * The following features are implemented:
  * <ul>
  * <li>
- * {@link org.eclipse.sirius.viewpoint.description.impl.DragAndDropTargetDescriptionImpl#getDropDescriptions
+ * {@link org.eclipse.sirius.diagram.description.impl.DragAndDropTargetDescriptionImpl#getDropDescriptions
  * <em>Drop Descriptions</em>}</li>
  * </ul>
  * </p>
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/impl/NodeMappingImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/impl/NodeMappingImpl.java
index c34f84734f..5f88fa758e 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/impl/NodeMappingImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/impl/NodeMappingImpl.java
@@ -29,10 +29,10 @@ import org.eclipse.sirius.diagram.DNodeListElement;
 import org.eclipse.sirius.diagram.NodeStyle;
 import org.eclipse.sirius.diagram.description.ConditionalNodeStyleDescription;
 import org.eclipse.sirius.diagram.description.DescriptionPackage;
+import org.eclipse.sirius.diagram.description.DragAndDropTargetDescription;
 import org.eclipse.sirius.diagram.description.NodeMapping;
 import org.eclipse.sirius.diagram.description.style.NodeStyleDescription;
-import org.eclipse.sirius.viewpoint.description.DragAndDropTargetDescription;
-import org.eclipse.sirius.viewpoint.description.tool.ContainerDropDescription;
+import org.eclipse.sirius.diagram.description.tool.ContainerDropDescription;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model object '
@@ -387,7 +387,7 @@ public class NodeMappingImpl extends AbstractNodeMappingImpl implements NodeMapp
         if (baseClass == DragAndDropTargetDescription.class) {
             switch (derivedFeatureID) {
             case DescriptionPackage.NODE_MAPPING__DROP_DESCRIPTIONS:
-                return org.eclipse.sirius.viewpoint.description.DescriptionPackage.DRAG_AND_DROP_TARGET_DESCRIPTION__DROP_DESCRIPTIONS;
+                return DescriptionPackage.DRAG_AND_DROP_TARGET_DESCRIPTION__DROP_DESCRIPTIONS;
             default:
                 return -1;
             }
@@ -404,7 +404,7 @@ public class NodeMappingImpl extends AbstractNodeMappingImpl implements NodeMapp
     public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
         if (baseClass == DragAndDropTargetDescription.class) {
             switch (baseFeatureID) {
-            case org.eclipse.sirius.viewpoint.description.DescriptionPackage.DRAG_AND_DROP_TARGET_DESCRIPTION__DROP_DESCRIPTIONS:
+            case DescriptionPackage.DRAG_AND_DROP_TARGET_DESCRIPTION__DROP_DESCRIPTIONS:
                 return DescriptionPackage.NODE_MAPPING__DROP_DESCRIPTIONS;
             default:
                 return -1;
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/style/impl/StylePackageImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/style/impl/StylePackageImpl.java
index 37773b5728..5b82c3ef6d 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/style/impl/StylePackageImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/style/impl/StylePackageImpl.java
@@ -46,8 +46,6 @@ import org.eclipse.sirius.diagram.description.style.SquareDescription;
 import org.eclipse.sirius.diagram.description.style.StyleFactory;
 import org.eclipse.sirius.diagram.description.style.StylePackage;
 import org.eclipse.sirius.diagram.description.style.WorkspaceImageDescription;
-import org.eclipse.sirius.diagram.description.validation.ValidationPackage;
-import org.eclipse.sirius.diagram.description.validation.impl.ValidationPackageImpl;
 import org.eclipse.sirius.diagram.impl.DiagramPackageImpl;
 import org.eclipse.sirius.viewpoint.ViewpointPackage;
 import org.eclipse.sirius.viewpoint.description.DescriptionPackage;
@@ -282,6 +280,9 @@ public class StylePackageImpl extends EPackageImpl implements StylePackage {
                 .getEPackage(org.eclipse.sirius.viewpoint.description.style.StylePackage.eNS_URI) : org.eclipse.sirius.viewpoint.description.style.StylePackage.eINSTANCE);
         ToolPackageImpl theToolPackage = (ToolPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ToolPackage.eNS_URI) instanceof ToolPackageImpl ? EPackage.Registry.INSTANCE
                 .getEPackage(ToolPackage.eNS_URI) : ToolPackage.eINSTANCE);
+        org.eclipse.sirius.viewpoint.description.validation.impl.ValidationPackageImpl theValidationPackage = (org.eclipse.sirius.viewpoint.description.validation.impl.ValidationPackageImpl) (EPackage.Registry.INSTANCE
+                .getEPackage(org.eclipse.sirius.viewpoint.description.validation.ValidationPackage.eNS_URI) instanceof org.eclipse.sirius.viewpoint.description.validation.impl.ValidationPackageImpl ? EPackage.Registry.INSTANCE
+                .getEPackage(org.eclipse.sirius.viewpoint.description.validation.ValidationPackage.eNS_URI) : org.eclipse.sirius.viewpoint.description.validation.ValidationPackage.eINSTANCE);
         AuditPackageImpl theAuditPackage = (AuditPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(AuditPackage.eNS_URI) instanceof AuditPackageImpl ? EPackage.Registry.INSTANCE
                 .getEPackage(AuditPackage.eNS_URI) : AuditPackage.eINSTANCE);
         DiagramPackageImpl theDiagramPackage = (DiagramPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(DiagramPackage.eNS_URI) instanceof DiagramPackageImpl ? EPackage.Registry.INSTANCE
@@ -294,8 +295,6 @@ public class StylePackageImpl extends EPackageImpl implements StylePackage {
                 .getEPackage(org.eclipse.sirius.diagram.description.tool.ToolPackage.eNS_URI) : org.eclipse.sirius.diagram.description.tool.ToolPackage.eINSTANCE);
         FilterPackageImpl theFilterPackage = (FilterPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(FilterPackage.eNS_URI) instanceof FilterPackageImpl ? EPackage.Registry.INSTANCE
                 .getEPackage(FilterPackage.eNS_URI) : FilterPackage.eINSTANCE);
-        ValidationPackageImpl theValidationPackage = (ValidationPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ValidationPackage.eNS_URI) instanceof ValidationPackageImpl ? EPackage.Registry.INSTANCE
-                .getEPackage(ValidationPackage.eNS_URI) : ValidationPackage.eINSTANCE);
         ConcernPackageImpl theConcernPackage = (ConcernPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ConcernPackage.eNS_URI) instanceof ConcernPackageImpl ? EPackage.Registry.INSTANCE
                 .getEPackage(ConcernPackage.eNS_URI) : ConcernPackage.eINSTANCE);
 
@@ -305,12 +304,12 @@ public class StylePackageImpl extends EPackageImpl implements StylePackage {
         theDescriptionPackage.createPackageContents();
         theStylePackage_1.createPackageContents();
         theToolPackage.createPackageContents();
+        theValidationPackage.createPackageContents();
         theAuditPackage.createPackageContents();
         theDiagramPackage.createPackageContents();
         theDescriptionPackage_1.createPackageContents();
         theToolPackage_1.createPackageContents();
         theFilterPackage.createPackageContents();
-        theValidationPackage.createPackageContents();
         theConcernPackage.createPackageContents();
 
         // Initialize created meta-data
@@ -319,12 +318,12 @@ public class StylePackageImpl extends EPackageImpl implements StylePackage {
         theDescriptionPackage.initializePackageContents();
         theStylePackage_1.initializePackageContents();
         theToolPackage.initializePackageContents();
+        theValidationPackage.initializePackageContents();
         theAuditPackage.initializePackageContents();
         theDiagramPackage.initializePackageContents();
         theDescriptionPackage_1.initializePackageContents();
         theToolPackage_1.initializePackageContents();
         theFilterPackage.initializePackageContents();
-        theValidationPackage.initializePackageContents();
         theConcernPackage.initializePackageContents();
 
         // Mark meta-data to indicate it can't be changed
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/style/util/StyleAdapterFactory.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/style/util/StyleAdapterFactory.java
index f7f8275433..c14fb86c15 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/style/util/StyleAdapterFactory.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/style/util/StyleAdapterFactory.java
@@ -654,7 +654,7 @@ public class StyleAdapterFactory extends AdapterFactoryImpl {
      * <em>Tooltip Style Description</em>}'. <!-- begin-user-doc --> This
      * default implementation returns null so that we can easily ignore cases;
      * it's useful to ignore a case when inheritance will catch all the cases
-     * anyway. 
+     * anyway.
      * 
      * @since 0.9.0 <!-- end-user-doc -->
      * @return the new adapter.
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/ContainerDropDescription.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/tool/ContainerDropDescription.java
index 01afe3bfa7..083d600f9d 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/ContainerDropDescription.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/tool/ContainerDropDescription.java
@@ -9,13 +9,19 @@
  *    Obeo - initial API and implementation
  * 
  */
-package org.eclipse.sirius.viewpoint.description.tool;
+package org.eclipse.sirius.diagram.description.tool;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.sirius.diagram.DragAndDropTarget;
 import org.eclipse.sirius.diagram.description.DiagramElementMapping;
-import org.eclipse.sirius.viewpoint.DragAndDropTarget;
-import org.eclipse.sirius.viewpoint.description.DragAndDropTargetDescription;
+import org.eclipse.sirius.diagram.description.DragAndDropTargetDescription;
+import org.eclipse.sirius.viewpoint.description.tool.ContainerViewVariable;
+import org.eclipse.sirius.viewpoint.description.tool.DragSource;
+import org.eclipse.sirius.viewpoint.description.tool.DropContainerVariable;
+import org.eclipse.sirius.viewpoint.description.tool.ElementDropVariable;
+import org.eclipse.sirius.viewpoint.description.tool.InitialContainerDropOperation;
+import org.eclipse.sirius.viewpoint.description.tool.MappingBasedToolDescription;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '
@@ -28,33 +34,33 @@ import org.eclipse.sirius.viewpoint.description.DragAndDropTargetDescription;
  * The following features are supported:
  * <ul>
  * <li>
- * {@link org.eclipse.sirius.viewpoint.description.tool.ContainerDropDescription#getMappings
+ * {@link org.eclipse.sirius.diagram.description.tool.ContainerDropDescription#getMappings
  * <em>Mappings</em>}</li>
  * <li>
- * {@link org.eclipse.sirius.viewpoint.description.tool.ContainerDropDescription#getOldContainer
+ * {@link org.eclipse.sirius.diagram.description.tool.ContainerDropDescription#getOldContainer
  * <em>Old Container</em>}</li>
  * <li>
- * {@link org.eclipse.sirius.viewpoint.description.tool.ContainerDropDescription#getNewContainer
+ * {@link org.eclipse.sirius.diagram.description.tool.ContainerDropDescription#getNewContainer
  * <em>New Container</em>}</li>
  * <li>
- * {@link org.eclipse.sirius.viewpoint.description.tool.ContainerDropDescription#getElement
+ * {@link org.eclipse.sirius.diagram.description.tool.ContainerDropDescription#getElement
  * <em>Element</em>}</li>
  * <li>
- * {@link org.eclipse.sirius.viewpoint.description.tool.ContainerDropDescription#getNewViewContainer
+ * {@link org.eclipse.sirius.diagram.description.tool.ContainerDropDescription#getNewViewContainer
  * <em>New View Container</em>}</li>
  * <li>
- * {@link org.eclipse.sirius.viewpoint.description.tool.ContainerDropDescription#getInitialOperation
+ * {@link org.eclipse.sirius.diagram.description.tool.ContainerDropDescription#getInitialOperation
  * <em>Initial Operation</em>}</li>
  * <li>
- * {@link org.eclipse.sirius.viewpoint.description.tool.ContainerDropDescription#getDragSource
+ * {@link org.eclipse.sirius.diagram.description.tool.ContainerDropDescription#getDragSource
  * <em>Drag Source</em>}</li>
  * <li>
- * {@link org.eclipse.sirius.viewpoint.description.tool.ContainerDropDescription#isMoveEdges
+ * {@link org.eclipse.sirius.diagram.description.tool.ContainerDropDescription#isMoveEdges
  * <em>Move Edges</em>}</li>
  * </ul>
  * </p>
  * 
- * @see org.eclipse.sirius.viewpoint.description.tool.ToolPackage#getContainerDropDescription()
+ * @see org.eclipse.sirius.diagram.description.tool.ToolPackage#getContainerDropDescription()
  * @model
  * @generated
  */
@@ -67,7 +73,7 @@ public interface ContainerDropDescription extends MappingBasedToolDescription {
      * All mapping that can create the target view. <!-- end-model-doc -->
      * 
      * @return the value of the '<em>Mappings</em>' reference list.
-     * @see org.eclipse.sirius.viewpoint.description.tool.ToolPackage#getContainerDropDescription_Mappings()
+     * @see org.eclipse.sirius.diagram.description.tool.ToolPackage#getContainerDropDescription_Mappings()
      * @model
      * @generated
      */
@@ -81,7 +87,7 @@ public interface ContainerDropDescription extends MappingBasedToolDescription {
      * 
      * @return the value of the '<em>Old Container</em>' containment reference.
      * @see #setOldContainer(DropContainerVariable)
-     * @see org.eclipse.sirius.viewpoint.description.tool.ToolPackage#getContainerDropDescription_OldContainer()
+     * @see org.eclipse.sirius.diagram.description.tool.ToolPackage#getContainerDropDescription_OldContainer()
      * @model containment="true" resolveProxies="true" required="true"
      *        annotation=
      *        "http://www.eclipse.org/emf/2002/GenModel documentedName='oldSemanticElement'"
@@ -91,7 +97,7 @@ public interface ContainerDropDescription extends MappingBasedToolDescription {
 
     /**
      * Sets the value of the '
-     * {@link org.eclipse.sirius.viewpoint.description.tool.ContainerDropDescription#getOldContainer
+     * {@link org.eclipse.sirius.diagram.description.tool.ContainerDropDescription#getOldContainer
      * <em>Old Container</em>}' containment reference. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * 
@@ -111,7 +117,7 @@ public interface ContainerDropDescription extends MappingBasedToolDescription {
      * 
      * @return the value of the '<em>New Container</em>' containment reference.
      * @see #setNewContainer(DropContainerVariable)
-     * @see org.eclipse.sirius.viewpoint.description.tool.ToolPackage#getContainerDropDescription_NewContainer()
+     * @see org.eclipse.sirius.diagram.description.tool.ToolPackage#getContainerDropDescription_NewContainer()
      * @model containment="true" resolveProxies="true" required="true"
      *        annotation=
      *        "http://www.eclipse.org/emf/2002/GenModel documentedName='newSemanticContainer'"
@@ -121,7 +127,7 @@ public interface ContainerDropDescription extends MappingBasedToolDescription {
 
     /**
      * Sets the value of the '
-     * {@link org.eclipse.sirius.viewpoint.description.tool.ContainerDropDescription#getNewContainer
+     * {@link org.eclipse.sirius.diagram.description.tool.ContainerDropDescription#getNewContainer
      * <em>New Container</em>}' containment reference. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * 
@@ -140,7 +146,7 @@ public interface ContainerDropDescription extends MappingBasedToolDescription {
      * 
      * @return the value of the '<em>Element</em>' containment reference.
      * @see #setElement(ElementDropVariable)
-     * @see org.eclipse.sirius.viewpoint.description.tool.ToolPackage#getContainerDropDescription_Element()
+     * @see org.eclipse.sirius.diagram.description.tool.ToolPackage#getContainerDropDescription_Element()
      * @model containment="true" resolveProxies="true" required="true"
      * @generated
      */
@@ -148,7 +154,7 @@ public interface ContainerDropDescription extends MappingBasedToolDescription {
 
     /**
      * Sets the value of the '
-     * {@link org.eclipse.sirius.viewpoint.description.tool.ContainerDropDescription#getElement
+     * {@link org.eclipse.sirius.diagram.description.tool.ContainerDropDescription#getElement
      * <em>Element</em>}' containment reference. <!-- begin-user-doc --> <!--
      * end-user-doc -->
      * 
@@ -168,7 +174,7 @@ public interface ContainerDropDescription extends MappingBasedToolDescription {
      * @return the value of the '<em>New View Container</em>' containment
      *         reference.
      * @see #setNewViewContainer(ContainerViewVariable)
-     * @see org.eclipse.sirius.viewpoint.description.tool.ToolPackage#getContainerDropDescription_NewViewContainer()
+     * @see org.eclipse.sirius.diagram.description.tool.ToolPackage#getContainerDropDescription_NewViewContainer()
      * @model containment="true" resolveProxies="true" required="true"
      *        annotation=
      *        "http://www.eclipse.org/emf/2002/GenModel documentedName='newContainerView'"
@@ -178,7 +184,7 @@ public interface ContainerDropDescription extends MappingBasedToolDescription {
 
     /**
      * Sets the value of the '
-     * {@link org.eclipse.sirius.viewpoint.description.tool.ContainerDropDescription#getNewViewContainer
+     * {@link org.eclipse.sirius.diagram.description.tool.ContainerDropDescription#getNewViewContainer
      * <em>New View Container</em>}' containment reference. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
      * 
@@ -198,7 +204,7 @@ public interface ContainerDropDescription extends MappingBasedToolDescription {
      * @return the value of the '<em>Initial Operation</em>' containment
      *         reference.
      * @see #setInitialOperation(InitialContainerDropOperation)
-     * @see org.eclipse.sirius.viewpoint.description.tool.ToolPackage#getContainerDropDescription_InitialOperation()
+     * @see org.eclipse.sirius.diagram.description.tool.ToolPackage#getContainerDropDescription_InitialOperation()
      * @model containment="true" resolveProxies="true" required="true"
      * @generated
      */
@@ -206,7 +212,7 @@ public interface ContainerDropDescription extends MappingBasedToolDescription {
 
     /**
      * Sets the value of the '
-     * {@link org.eclipse.sirius.viewpoint.description.tool.ContainerDropDescription#getInitialOperation
+     * {@link org.eclipse.sirius.diagram.description.tool.ContainerDropDescription#getInitialOperation
      * <em>Initial Operation</em>}' containment reference. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
      * 
@@ -228,7 +234,7 @@ public interface ContainerDropDescription extends MappingBasedToolDescription {
      * @return the value of the '<em>Drag Source</em>' attribute.
      * @see org.eclipse.sirius.viewpoint.description.tool.DragSource
      * @see #setDragSource(DragSource)
-     * @see org.eclipse.sirius.viewpoint.description.tool.ToolPackage#getContainerDropDescription_DragSource()
+     * @see org.eclipse.sirius.diagram.description.tool.ToolPackage#getContainerDropDescription_DragSource()
      * @model required="true"
      * @generated
      */
@@ -236,7 +242,7 @@ public interface ContainerDropDescription extends MappingBasedToolDescription {
 
     /**
      * Sets the value of the '
-     * {@link org.eclipse.sirius.viewpoint.description.tool.ContainerDropDescription#getDragSource
+     * {@link org.eclipse.sirius.diagram.description.tool.ContainerDropDescription#getDragSource
      * <em>Drag Source</em>}' attribute. <!-- begin-user-doc --> <!--
      * end-user-doc -->
      * 
@@ -256,7 +262,7 @@ public interface ContainerDropDescription extends MappingBasedToolDescription {
      * 
      * @return the value of the '<em>Move Edges</em>' attribute.
      * @see #setMoveEdges(boolean)
-     * @see org.eclipse.sirius.viewpoint.description.tool.ToolPackage#getContainerDropDescription_MoveEdges()
+     * @see org.eclipse.sirius.diagram.description.tool.ToolPackage#getContainerDropDescription_MoveEdges()
      * @model required="true"
      * @generated
      */
@@ -264,7 +270,7 @@ public interface ContainerDropDescription extends MappingBasedToolDescription {
 
     /**
      * Sets the value of the '
-     * {@link org.eclipse.sirius.viewpoint.description.tool.ContainerDropDescription#isMoveEdges
+     * {@link org.eclipse.sirius.diagram.description.tool.ContainerDropDescription#isMoveEdges
      * <em>Move Edges</em>}' attribute. <!-- begin-user-doc --> <!--
      * end-user-doc -->
      * 
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/tool/ToolFactory.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/tool/ToolFactory.java
index 1f0c19d414..062ee380ab 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/tool/ToolFactory.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/tool/ToolFactory.java
@@ -259,6 +259,15 @@ public interface ToolFactory extends EFactory {
     DiagramNavigationDescription createDiagramNavigationDescription();
 
     /**
+     * Returns a new object of class '<em>Container Drop Description</em>'. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @return a new object of class '<em>Container Drop Description</em>'.
+     * @generated
+     */
+    ContainerDropDescription createContainerDropDescription();
+
+    /**
      * Returns the package supported by this factory. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * 
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/tool/ToolPackage.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/tool/ToolPackage.java
index b67f4a2335..fd303c8c7e 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/tool/ToolPackage.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/tool/ToolPackage.java
@@ -2122,6 +2122,154 @@ public interface ToolPackage extends EPackage {
 
     /**
      * The meta object id for the '
+     * {@link org.eclipse.sirius.diagram.description.tool.impl.ContainerDropDescriptionImpl
+     * <em>Container Drop Description</em>}' class. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @see org.eclipse.sirius.diagram.description.tool.impl.ContainerDropDescriptionImpl
+     * @see org.eclipse.sirius.diagram.description.tool.impl.ToolPackageImpl#getContainerDropDescription()
+     * @generated
+     */
+    int CONTAINER_DROP_DESCRIPTION = 25;
+
+    /**
+     * The feature id for the '<em><b>Documentation</b></em>' attribute. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     * @ordered
+     */
+    int CONTAINER_DROP_DESCRIPTION__DOCUMENTATION = org.eclipse.sirius.viewpoint.description.tool.ToolPackage.MAPPING_BASED_TOOL_DESCRIPTION__DOCUMENTATION;
+
+    /**
+     * The feature id for the '<em><b>Name</b></em>' attribute. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     * @ordered
+     */
+    int CONTAINER_DROP_DESCRIPTION__NAME = org.eclipse.sirius.viewpoint.description.tool.ToolPackage.MAPPING_BASED_TOOL_DESCRIPTION__NAME;
+
+    /**
+     * The feature id for the '<em><b>Label</b></em>' attribute. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     * @ordered
+     */
+    int CONTAINER_DROP_DESCRIPTION__LABEL = org.eclipse.sirius.viewpoint.description.tool.ToolPackage.MAPPING_BASED_TOOL_DESCRIPTION__LABEL;
+
+    /**
+     * The feature id for the '<em><b>Precondition</b></em>' attribute. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     * @ordered
+     */
+    int CONTAINER_DROP_DESCRIPTION__PRECONDITION = org.eclipse.sirius.viewpoint.description.tool.ToolPackage.MAPPING_BASED_TOOL_DESCRIPTION__PRECONDITION;
+
+    /**
+     * The feature id for the '<em><b>Force Refresh</b></em>' attribute. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     * @ordered
+     */
+    int CONTAINER_DROP_DESCRIPTION__FORCE_REFRESH = org.eclipse.sirius.viewpoint.description.tool.ToolPackage.MAPPING_BASED_TOOL_DESCRIPTION__FORCE_REFRESH;
+
+    /**
+     * The feature id for the '<em><b>Filters</b></em>' containment reference
+     * list. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     * @ordered
+     */
+    int CONTAINER_DROP_DESCRIPTION__FILTERS = org.eclipse.sirius.viewpoint.description.tool.ToolPackage.MAPPING_BASED_TOOL_DESCRIPTION__FILTERS;
+
+    /**
+     * The feature id for the '<em><b>Mappings</b></em>' reference list. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     * @ordered
+     */
+    int CONTAINER_DROP_DESCRIPTION__MAPPINGS = org.eclipse.sirius.viewpoint.description.tool.ToolPackage.MAPPING_BASED_TOOL_DESCRIPTION_FEATURE_COUNT + 0;
+
+    /**
+     * The feature id for the '<em><b>Old Container</b></em>' containment
+     * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     * @ordered
+     */
+    int CONTAINER_DROP_DESCRIPTION__OLD_CONTAINER = org.eclipse.sirius.viewpoint.description.tool.ToolPackage.MAPPING_BASED_TOOL_DESCRIPTION_FEATURE_COUNT + 1;
+
+    /**
+     * The feature id for the '<em><b>New Container</b></em>' containment
+     * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     * @ordered
+     */
+    int CONTAINER_DROP_DESCRIPTION__NEW_CONTAINER = org.eclipse.sirius.viewpoint.description.tool.ToolPackage.MAPPING_BASED_TOOL_DESCRIPTION_FEATURE_COUNT + 2;
+
+    /**
+     * The feature id for the '<em><b>Element</b></em>' containment reference.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     * @ordered
+     */
+    int CONTAINER_DROP_DESCRIPTION__ELEMENT = org.eclipse.sirius.viewpoint.description.tool.ToolPackage.MAPPING_BASED_TOOL_DESCRIPTION_FEATURE_COUNT + 3;
+
+    /**
+     * The feature id for the '<em><b>New View Container</b></em>' containment
+     * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     * @ordered
+     */
+    int CONTAINER_DROP_DESCRIPTION__NEW_VIEW_CONTAINER = org.eclipse.sirius.viewpoint.description.tool.ToolPackage.MAPPING_BASED_TOOL_DESCRIPTION_FEATURE_COUNT + 4;
+
+    /**
+     * The feature id for the '<em><b>Initial Operation</b></em>' containment
+     * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     * @ordered
+     */
+    int CONTAINER_DROP_DESCRIPTION__INITIAL_OPERATION = org.eclipse.sirius.viewpoint.description.tool.ToolPackage.MAPPING_BASED_TOOL_DESCRIPTION_FEATURE_COUNT + 5;
+
+    /**
+     * The feature id for the '<em><b>Drag Source</b></em>' attribute. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     * @ordered
+     */
+    int CONTAINER_DROP_DESCRIPTION__DRAG_SOURCE = org.eclipse.sirius.viewpoint.description.tool.ToolPackage.MAPPING_BASED_TOOL_DESCRIPTION_FEATURE_COUNT + 6;
+
+    /**
+     * The feature id for the '<em><b>Move Edges</b></em>' attribute. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     * @ordered
+     */
+    int CONTAINER_DROP_DESCRIPTION__MOVE_EDGES = org.eclipse.sirius.viewpoint.description.tool.ToolPackage.MAPPING_BASED_TOOL_DESCRIPTION_FEATURE_COUNT + 7;
+
+    /**
+     * The number of structural features of the '
+     * <em>Container Drop Description</em>' class. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @generated
+     * @ordered
+     */
+    int CONTAINER_DROP_DESCRIPTION_FEATURE_COUNT = org.eclipse.sirius.viewpoint.description.tool.ToolPackage.MAPPING_BASED_TOOL_DESCRIPTION_FEATURE_COUNT + 8;
+
+    /**
+     * The meta object id for the '
      * {@link org.eclipse.sirius.diagram.description.tool.ReconnectionKind
      * <em>Reconnection Kind</em>}' enum. <!-- begin-user-doc --> <!--
      * end-user-doc -->
@@ -2130,7 +2278,7 @@ public interface ToolPackage extends EPackage {
      * @see org.eclipse.sirius.diagram.description.tool.impl.ToolPackageImpl#getReconnectionKind()
      * @generated
      */
-    int RECONNECTION_KIND = 25;
+    int RECONNECTION_KIND = 26;
 
     /**
      * Returns the meta object for class '
@@ -3297,6 +3445,120 @@ public interface ToolPackage extends EPackage {
     EReference getDiagramNavigationDescription_DiagramDescription();
 
     /**
+     * Returns the meta object for class '
+     * {@link org.eclipse.sirius.diagram.description.tool.ContainerDropDescription
+     * <em>Container Drop Description</em>}'. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @return the meta object for class '<em>Container Drop Description</em>'.
+     * @see org.eclipse.sirius.diagram.description.tool.ContainerDropDescription
+     * @generated
+     */
+    EClass getContainerDropDescription();
+
+    /**
+     * Returns the meta object for the reference list '
+     * {@link org.eclipse.sirius.diagram.description.tool.ContainerDropDescription#getMappings
+     * <em>Mappings</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @return the meta object for the reference list '<em>Mappings</em>'.
+     * @see org.eclipse.sirius.diagram.description.tool.ContainerDropDescription#getMappings()
+     * @see #getContainerDropDescription()
+     * @generated
+     */
+    EReference getContainerDropDescription_Mappings();
+
+    /**
+     * Returns the meta object for the containment reference '
+     * {@link org.eclipse.sirius.diagram.description.tool.ContainerDropDescription#getOldContainer
+     * <em>Old Container</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @return the meta object for the containment reference '
+     *         <em>Old Container</em>'.
+     * @see org.eclipse.sirius.diagram.description.tool.ContainerDropDescription#getOldContainer()
+     * @see #getContainerDropDescription()
+     * @generated
+     */
+    EReference getContainerDropDescription_OldContainer();
+
+    /**
+     * Returns the meta object for the containment reference '
+     * {@link org.eclipse.sirius.diagram.description.tool.ContainerDropDescription#getNewContainer
+     * <em>New Container</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @return the meta object for the containment reference '
+     *         <em>New Container</em>'.
+     * @see org.eclipse.sirius.diagram.description.tool.ContainerDropDescription#getNewContainer()
+     * @see #getContainerDropDescription()
+     * @generated
+     */
+    EReference getContainerDropDescription_NewContainer();
+
+    /**
+     * Returns the meta object for the containment reference '
+     * {@link org.eclipse.sirius.diagram.description.tool.ContainerDropDescription#getElement
+     * <em>Element</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @return the meta object for the containment reference '<em>Element</em>'.
+     * @see org.eclipse.sirius.diagram.description.tool.ContainerDropDescription#getElement()
+     * @see #getContainerDropDescription()
+     * @generated
+     */
+    EReference getContainerDropDescription_Element();
+
+    /**
+     * Returns the meta object for the containment reference '
+     * {@link ContainerDropDescription#getNewViewContainer
+     * <em>New View Container</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     * 
+     * @return the meta object for the containment reference '
+     *         <em>New View Container</em>'.
+     * @see ContainerDropDescription#getNewViewContainer()
+     * @see #getContainerDropDescription()
+     * @generated
+     */
+    EReference getContainerDropDescription_NewViewContainer();
+
+    /**
+     * Returns the meta object for the containment reference '
+     * {@link ContainerDropDescription#getInitialOperation
+     * <em>Initial Operation</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     * 
+     * @return the meta object for the containment reference '
+     *         <em>Initial Operation</em>'.
+     * @see ContainerDropDescription#getInitialOperation()
+     * @see #getContainerDropDescription()
+     * @generated
+     */
+    EReference getContainerDropDescription_InitialOperation();
+
+    /**
+     * Returns the meta object for the attribute '
+     * {@link org.eclipse.sirius.diagram.description.tool.ContainerDropDescription#getDragSource
+     * <em>Drag Source</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @return the meta object for the attribute '<em>Drag Source</em>'.
+     * @see org.eclipse.sirius.diagram.description.tool.ContainerDropDescription#getDragSource()
+     * @see #getContainerDropDescription()
+     * @generated
+     */
+    EAttribute getContainerDropDescription_DragSource();
+
+    /**
+     * Returns the meta object for the attribute '
+     * {@link org.eclipse.sirius.diagram.description.tool.ContainerDropDescription#isMoveEdges
+     * <em>Move Edges</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @return the meta object for the attribute '<em>Move Edges</em>'.
+     * @see org.eclipse.sirius.diagram.description.tool.ContainerDropDescription#isMoveEdges()
+     * @see #getContainerDropDescription()
+     * @generated
+     */
+    EAttribute getContainerDropDescription_MoveEdges();
+
+    /**
      * Returns the meta object for enum '
      * {@link org.eclipse.sirius.diagram.description.tool.ReconnectionKind
      * <em>Reconnection Kind</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
@@ -4200,6 +4462,86 @@ public interface ToolPackage extends EPackage {
 
         /**
          * The meta object literal for the '
+         * {@link org.eclipse.sirius.diagram.description.tool.impl.ContainerDropDescriptionImpl
+         * <em>Container Drop Description</em>}' class. <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * 
+         * @see org.eclipse.sirius.diagram.description.tool.impl.ContainerDropDescriptionImpl
+         * @see org.eclipse.sirius.diagram.description.tool.impl.ToolPackageImpl#getContainerDropDescription()
+         * @generated
+         */
+        EClass CONTAINER_DROP_DESCRIPTION = eINSTANCE.getContainerDropDescription();
+
+        /**
+         * The meta object literal for the '<em><b>Mappings</b></em>' reference
+         * list feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+         * 
+         * @generated
+         */
+        EReference CONTAINER_DROP_DESCRIPTION__MAPPINGS = eINSTANCE.getContainerDropDescription_Mappings();
+
+        /**
+         * The meta object literal for the '<em><b>Old Container</b></em>'
+         * containment reference feature. <!-- begin-user-doc --> <!--
+         * end-user-doc -->
+         * 
+         * @generated
+         */
+        EReference CONTAINER_DROP_DESCRIPTION__OLD_CONTAINER = eINSTANCE.getContainerDropDescription_OldContainer();
+
+        /**
+         * The meta object literal for the '<em><b>New Container</b></em>'
+         * containment reference feature. <!-- begin-user-doc --> <!--
+         * end-user-doc -->
+         * 
+         * @generated
+         */
+        EReference CONTAINER_DROP_DESCRIPTION__NEW_CONTAINER = eINSTANCE.getContainerDropDescription_NewContainer();
+
+        /**
+         * The meta object literal for the '<em><b>Element</b></em>' containment
+         * reference feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+         * 
+         * @generated
+         */
+        EReference CONTAINER_DROP_DESCRIPTION__ELEMENT = eINSTANCE.getContainerDropDescription_Element();
+
+        /**
+         * The meta object literal for the '<em><b>New View Container</b></em>'
+         * containment reference feature. <!-- begin-user-doc --> <!--
+         * end-user-doc -->
+         * 
+         * @generated
+         */
+        EReference CONTAINER_DROP_DESCRIPTION__NEW_VIEW_CONTAINER = eINSTANCE.getContainerDropDescription_NewViewContainer();
+
+        /**
+         * The meta object literal for the '<em><b>Initial Operation</b></em>'
+         * containment reference feature. <!-- begin-user-doc --> <!--
+         * end-user-doc -->
+         * 
+         * @generated
+         */
+        EReference CONTAINER_DROP_DESCRIPTION__INITIAL_OPERATION = eINSTANCE.getContainerDropDescription_InitialOperation();
+
+        /**
+         * The meta object literal for the '<em><b>Drag Source</b></em>'
+         * attribute feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+         * 
+         * @generated
+         */
+        EAttribute CONTAINER_DROP_DESCRIPTION__DRAG_SOURCE = eINSTANCE.getContainerDropDescription_DragSource();
+
+        /**
+         * The meta object literal for the '<em><b>Move Edges</b></em>'
+         * attribute feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+         * 
+         * @generated
+         */
+        EAttribute CONTAINER_DROP_DESCRIPTION__MOVE_EDGES = eINSTANCE.getContainerDropDescription_MoveEdges();
+
+        /**
+         * The meta object literal for the '
          * {@link org.eclipse.sirius.diagram.description.tool.ReconnectionKind
          * <em>Reconnection Kind</em>}' enum. <!-- begin-user-doc --> <!--
          * end-user-doc -->
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/ContainerDropDescriptionImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/tool/impl/ContainerDropDescriptionImpl.java
index 4c1dae9456..166e1e6eff 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/ContainerDropDescriptionImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/tool/impl/ContainerDropDescriptionImpl.java
@@ -9,7 +9,7 @@
  *    Obeo - initial API and implementation
  * 
  */
-package org.eclipse.sirius.viewpoint.description.tool.impl;
+package org.eclipse.sirius.diagram.description.tool.impl;
 
 import java.util.Collection;
 
@@ -21,16 +21,17 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.util.EObjectResolvingEList;
+import org.eclipse.sirius.diagram.DragAndDropTarget;
 import org.eclipse.sirius.diagram.description.DiagramElementMapping;
-import org.eclipse.sirius.viewpoint.DragAndDropTarget;
-import org.eclipse.sirius.viewpoint.description.DragAndDropTargetDescription;
-import org.eclipse.sirius.viewpoint.description.tool.ContainerDropDescription;
+import org.eclipse.sirius.diagram.description.DragAndDropTargetDescription;
+import org.eclipse.sirius.diagram.description.tool.ContainerDropDescription;
+import org.eclipse.sirius.diagram.description.tool.ToolPackage;
 import org.eclipse.sirius.viewpoint.description.tool.ContainerViewVariable;
 import org.eclipse.sirius.viewpoint.description.tool.DragSource;
 import org.eclipse.sirius.viewpoint.description.tool.DropContainerVariable;
 import org.eclipse.sirius.viewpoint.description.tool.ElementDropVariable;
 import org.eclipse.sirius.viewpoint.description.tool.InitialContainerDropOperation;
-import org.eclipse.sirius.viewpoint.description.tool.ToolPackage;
+import org.eclipse.sirius.viewpoint.description.tool.impl.MappingBasedToolDescriptionImpl;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model object '
@@ -39,28 +40,28 @@ import org.eclipse.sirius.viewpoint.description.tool.ToolPackage;
  * The following features are implemented:
  * <ul>
  * <li>
- * {@link org.eclipse.sirius.viewpoint.description.tool.impl.ContainerDropDescriptionImpl#getMappings
+ * {@link org.eclipse.sirius.diagram.description.tool.impl.ContainerDropDescriptionImpl#getMappings
  * <em>Mappings</em>}</li>
  * <li>
- * {@link org.eclipse.sirius.viewpoint.description.tool.impl.ContainerDropDescriptionImpl#getOldContainer
+ * {@link org.eclipse.sirius.diagram.description.tool.impl.ContainerDropDescriptionImpl#getOldContainer
  * <em>Old Container</em>}</li>
  * <li>
- * {@link org.eclipse.sirius.viewpoint.description.tool.impl.ContainerDropDescriptionImpl#getNewContainer
+ * {@link org.eclipse.sirius.diagram.description.tool.impl.ContainerDropDescriptionImpl#getNewContainer
  * <em>New Container</em>}</li>
  * <li>
- * {@link org.eclipse.sirius.viewpoint.description.tool.impl.ContainerDropDescriptionImpl#getElement
+ * {@link org.eclipse.sirius.diagram.description.tool.impl.ContainerDropDescriptionImpl#getElement
  * <em>Element</em>}</li>
  * <li>
- * {@link org.eclipse.sirius.viewpoint.description.tool.impl.ContainerDropDescriptionImpl#getNewViewContainer
+ * {@link org.eclipse.sirius.diagram.description.tool.impl.ContainerDropDescriptionImpl#getNewViewContainer
  * <em>New View Container</em>}</li>
  * <li>
- * {@link org.eclipse.sirius.viewpoint.description.tool.impl.ContainerDropDescriptionImpl#getInitialOperation
+ * {@link org.eclipse.sirius.diagram.description.tool.impl.ContainerDropDescriptionImpl#getInitialOperation
  * <em>Initial Operation</em>}</li>
  * <li>
- * {@link org.eclipse.sirius.viewpoint.description.tool.impl.ContainerDropDescriptionImpl#getDragSource
+ * {@link org.eclipse.sirius.diagram.description.tool.impl.ContainerDropDescriptionImpl#getDragSource
  * <em>Drag Source</em>}</li>
  * <li>
- * {@link org.eclipse.sirius.viewpoint.description.tool.impl.ContainerDropDescriptionImpl#isMoveEdges
+ * {@link org.eclipse.sirius.diagram.description.tool.impl.ContainerDropDescriptionImpl#isMoveEdges
  * <em>Move Edges</em>}</li>
  * </ul>
  * </p>
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/tool/impl/ToolFactoryImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/tool/impl/ToolFactoryImpl.java
index 6fc9908a47..36be8790aa 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/tool/impl/ToolFactoryImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/tool/impl/ToolFactoryImpl.java
@@ -26,6 +26,7 @@ import org.eclipse.sirius.business.internal.metamodel.description.tool.spec.Reco
 import org.eclipse.sirius.business.internal.metamodel.description.tool.spec.ToolSectionSpec;
 import org.eclipse.sirius.diagram.description.tool.BehaviorTool;
 import org.eclipse.sirius.diagram.description.tool.ContainerCreationDescription;
+import org.eclipse.sirius.diagram.description.tool.ContainerDropDescription;
 import org.eclipse.sirius.diagram.description.tool.CreateEdgeView;
 import org.eclipse.sirius.diagram.description.tool.CreateView;
 import org.eclipse.sirius.diagram.description.tool.DeleteElementDescription;
@@ -154,6 +155,8 @@ public class ToolFactoryImpl extends EFactoryImpl implements ToolFactory {
             return createDiagramCreationDescription();
         case ToolPackage.DIAGRAM_NAVIGATION_DESCRIPTION:
             return createDiagramNavigationDescription();
+        case ToolPackage.CONTAINER_DROP_DESCRIPTION:
+            return createContainerDropDescription();
         default:
             throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
         }
@@ -543,6 +546,16 @@ public class ToolFactoryImpl extends EFactoryImpl implements ToolFactory {
      * 
      * @generated
      */
+    public ContainerDropDescription createContainerDropDescription() {
+        ContainerDropDescriptionImpl containerDropDescription = new ContainerDropDescriptionImpl();
+        return containerDropDescription;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
     public ReconnectionKind createReconnectionKindFromString(EDataType eDataType, String initialValue) {
         ReconnectionKind result = ReconnectionKind.get(initialValue);
         if (result == null)
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/tool/impl/ToolPackageImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/tool/impl/ToolPackageImpl.java
index 7fb6cdf38f..09098fdea7 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/tool/impl/ToolPackageImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/tool/impl/ToolPackageImpl.java
@@ -26,6 +26,7 @@ import org.eclipse.sirius.diagram.description.filter.FilterPackage;
 import org.eclipse.sirius.diagram.description.filter.impl.FilterPackageImpl;
 import org.eclipse.sirius.diagram.description.tool.BehaviorTool;
 import org.eclipse.sirius.diagram.description.tool.ContainerCreationDescription;
+import org.eclipse.sirius.diagram.description.tool.ContainerDropDescription;
 import org.eclipse.sirius.diagram.description.tool.CreateEdgeView;
 import org.eclipse.sirius.diagram.description.tool.CreateView;
 import org.eclipse.sirius.diagram.description.tool.DeleteElementDescription;
@@ -52,8 +53,6 @@ import org.eclipse.sirius.diagram.description.tool.ToolGroup;
 import org.eclipse.sirius.diagram.description.tool.ToolGroupExtension;
 import org.eclipse.sirius.diagram.description.tool.ToolPackage;
 import org.eclipse.sirius.diagram.description.tool.ToolSection;
-import org.eclipse.sirius.diagram.description.validation.ValidationPackage;
-import org.eclipse.sirius.diagram.description.validation.impl.ValidationPackageImpl;
 import org.eclipse.sirius.diagram.impl.DiagramPackageImpl;
 import org.eclipse.sirius.viewpoint.ViewpointPackage;
 import org.eclipse.sirius.viewpoint.description.DescriptionPackage;
@@ -251,6 +250,13 @@ public class ToolPackageImpl extends EPackageImpl implements ToolPackage {
      * 
      * @generated
      */
+    private EClass containerDropDescriptionEClass = null;
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
     private EEnum reconnectionKindEEnum = null;
 
     /**
@@ -316,6 +322,9 @@ public class ToolPackageImpl extends EPackageImpl implements ToolPackage {
         org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl theToolPackage_1 = (org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl) (EPackage.Registry.INSTANCE
                 .getEPackage(org.eclipse.sirius.viewpoint.description.tool.ToolPackage.eNS_URI) instanceof org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl ? EPackage.Registry.INSTANCE
                 .getEPackage(org.eclipse.sirius.viewpoint.description.tool.ToolPackage.eNS_URI) : org.eclipse.sirius.viewpoint.description.tool.ToolPackage.eINSTANCE);
+        org.eclipse.sirius.viewpoint.description.validation.impl.ValidationPackageImpl theValidationPackage = (org.eclipse.sirius.viewpoint.description.validation.impl.ValidationPackageImpl) (EPackage.Registry.INSTANCE
+                .getEPackage(org.eclipse.sirius.viewpoint.description.validation.ValidationPackage.eNS_URI) instanceof org.eclipse.sirius.viewpoint.description.validation.impl.ValidationPackageImpl ? EPackage.Registry.INSTANCE
+                .getEPackage(org.eclipse.sirius.viewpoint.description.validation.ValidationPackage.eNS_URI) : org.eclipse.sirius.viewpoint.description.validation.ValidationPackage.eINSTANCE);
         AuditPackageImpl theAuditPackage = (AuditPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(AuditPackage.eNS_URI) instanceof AuditPackageImpl ? EPackage.Registry.INSTANCE
                 .getEPackage(AuditPackage.eNS_URI) : AuditPackage.eINSTANCE);
         DiagramPackageImpl theDiagramPackage = (DiagramPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(DiagramPackage.eNS_URI) instanceof DiagramPackageImpl ? EPackage.Registry.INSTANCE
@@ -328,8 +337,6 @@ public class ToolPackageImpl extends EPackageImpl implements ToolPackage {
                 .getEPackage(org.eclipse.sirius.diagram.description.style.StylePackage.eNS_URI) : org.eclipse.sirius.diagram.description.style.StylePackage.eINSTANCE);
         FilterPackageImpl theFilterPackage = (FilterPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(FilterPackage.eNS_URI) instanceof FilterPackageImpl ? EPackage.Registry.INSTANCE
                 .getEPackage(FilterPackage.eNS_URI) : FilterPackage.eINSTANCE);
-        ValidationPackageImpl theValidationPackage = (ValidationPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ValidationPackage.eNS_URI) instanceof ValidationPackageImpl ? EPackage.Registry.INSTANCE
-                .getEPackage(ValidationPackage.eNS_URI) : ValidationPackage.eINSTANCE);
         ConcernPackageImpl theConcernPackage = (ConcernPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ConcernPackage.eNS_URI) instanceof ConcernPackageImpl ? EPackage.Registry.INSTANCE
                 .getEPackage(ConcernPackage.eNS_URI) : ConcernPackage.eINSTANCE);
 
@@ -339,12 +346,12 @@ public class ToolPackageImpl extends EPackageImpl implements ToolPackage {
         theDescriptionPackage.createPackageContents();
         theStylePackage.createPackageContents();
         theToolPackage_1.createPackageContents();
+        theValidationPackage.createPackageContents();
         theAuditPackage.createPackageContents();
         theDiagramPackage.createPackageContents();
         theDescriptionPackage_1.createPackageContents();
         theStylePackage_1.createPackageContents();
         theFilterPackage.createPackageContents();
-        theValidationPackage.createPackageContents();
         theConcernPackage.createPackageContents();
 
         // Initialize created meta-data
@@ -353,12 +360,12 @@ public class ToolPackageImpl extends EPackageImpl implements ToolPackage {
         theDescriptionPackage.initializePackageContents();
         theStylePackage.initializePackageContents();
         theToolPackage_1.initializePackageContents();
+        theValidationPackage.initializePackageContents();
         theAuditPackage.initializePackageContents();
         theDiagramPackage.initializePackageContents();
         theDescriptionPackage_1.initializePackageContents();
         theStylePackage_1.initializePackageContents();
         theFilterPackage.initializePackageContents();
-        theValidationPackage.initializePackageContents();
         theConcernPackage.initializePackageContents();
 
         // Mark meta-data to indicate it can't be changed
@@ -1202,6 +1209,87 @@ public class ToolPackageImpl extends EPackageImpl implements ToolPackage {
      * 
      * @generated
      */
+    public EClass getContainerDropDescription() {
+        return containerDropDescriptionEClass;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    public EReference getContainerDropDescription_Mappings() {
+        return (EReference) containerDropDescriptionEClass.getEStructuralFeatures().get(0);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    public EReference getContainerDropDescription_OldContainer() {
+        return (EReference) containerDropDescriptionEClass.getEStructuralFeatures().get(1);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    public EReference getContainerDropDescription_NewContainer() {
+        return (EReference) containerDropDescriptionEClass.getEStructuralFeatures().get(2);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    public EReference getContainerDropDescription_Element() {
+        return (EReference) containerDropDescriptionEClass.getEStructuralFeatures().get(3);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    public EReference getContainerDropDescription_NewViewContainer() {
+        return (EReference) containerDropDescriptionEClass.getEStructuralFeatures().get(4);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    public EReference getContainerDropDescription_InitialOperation() {
+        return (EReference) containerDropDescriptionEClass.getEStructuralFeatures().get(5);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    public EAttribute getContainerDropDescription_DragSource() {
+        return (EAttribute) containerDropDescriptionEClass.getEStructuralFeatures().get(6);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    public EAttribute getContainerDropDescription_MoveEdges() {
+        return (EAttribute) containerDropDescriptionEClass.getEStructuralFeatures().get(7);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
     public EEnum getReconnectionKind() {
         return reconnectionKindEEnum;
     }
@@ -1352,6 +1440,16 @@ public class ToolPackageImpl extends EPackageImpl implements ToolPackage {
         diagramNavigationDescriptionEClass = createEClass(DIAGRAM_NAVIGATION_DESCRIPTION);
         createEReference(diagramNavigationDescriptionEClass, DIAGRAM_NAVIGATION_DESCRIPTION__DIAGRAM_DESCRIPTION);
 
+        containerDropDescriptionEClass = createEClass(CONTAINER_DROP_DESCRIPTION);
+        createEReference(containerDropDescriptionEClass, CONTAINER_DROP_DESCRIPTION__MAPPINGS);
+        createEReference(containerDropDescriptionEClass, CONTAINER_DROP_DESCRIPTION__OLD_CONTAINER);
+        createEReference(containerDropDescriptionEClass, CONTAINER_DROP_DESCRIPTION__NEW_CONTAINER);
+        createEReference(containerDropDescriptionEClass, CONTAINER_DROP_DESCRIPTION__ELEMENT);
+        createEReference(containerDropDescriptionEClass, CONTAINER_DROP_DESCRIPTION__NEW_VIEW_CONTAINER);
+        createEReference(containerDropDescriptionEClass, CONTAINER_DROP_DESCRIPTION__INITIAL_OPERATION);
+        createEAttribute(containerDropDescriptionEClass, CONTAINER_DROP_DESCRIPTION__DRAG_SOURCE);
+        createEAttribute(containerDropDescriptionEClass, CONTAINER_DROP_DESCRIPTION__MOVE_EDGES);
+
         // Create enums
         reconnectionKindEEnum = createEEnum(RECONNECTION_KIND);
     }
@@ -1423,6 +1521,7 @@ public class ToolPackageImpl extends EPackageImpl implements ToolPackage {
         navigationEClass.getESuperTypes().add(theToolPackage_1.getContainerModelOperation());
         diagramCreationDescriptionEClass.getESuperTypes().add(theToolPackage_1.getRepresentationCreationDescription());
         diagramNavigationDescriptionEClass.getESuperTypes().add(theToolPackage_1.getRepresentationNavigationDescription());
+        containerDropDescriptionEClass.getESuperTypes().add(theToolPackage_1.getMappingBasedToolDescription());
 
         // Initialize classes and features; add operations and parameters
         initEClass(toolSectionEClass, ToolSection.class, "ToolSection", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -1622,6 +1721,30 @@ public class ToolPackageImpl extends EPackageImpl implements ToolPackage {
         initEReference(getDiagramNavigationDescription_DiagramDescription(), theDescriptionPackage_1.getDiagramDescription(), null, "diagramDescription", null, 1, 1,
                 DiagramNavigationDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
+        initEClass(containerDropDescriptionEClass, ContainerDropDescription.class, "ContainerDropDescription", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+        initEReference(getContainerDropDescription_Mappings(), theDescriptionPackage_1.getDiagramElementMapping(), null, "mappings", null, 0, -1, ContainerDropDescription.class, !IS_TRANSIENT,
+                !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        initEReference(getContainerDropDescription_OldContainer(), theToolPackage_1.getDropContainerVariable(), null, "oldContainer", null, 1, 1, ContainerDropDescription.class, !IS_TRANSIENT,
+                !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        initEReference(getContainerDropDescription_NewContainer(), theToolPackage_1.getDropContainerVariable(), null, "newContainer", null, 1, 1, ContainerDropDescription.class, !IS_TRANSIENT,
+                !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        initEReference(getContainerDropDescription_Element(), theToolPackage_1.getElementDropVariable(), null, "element", null, 1, 1, ContainerDropDescription.class, !IS_TRANSIENT, !IS_VOLATILE,
+                IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        initEReference(getContainerDropDescription_NewViewContainer(), theToolPackage_1.getContainerViewVariable(), null, "newViewContainer", null, 1, 1, ContainerDropDescription.class,
+                !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        initEReference(getContainerDropDescription_InitialOperation(), theToolPackage_1.getInitialContainerDropOperation(), null, "initialOperation", null, 1, 1, ContainerDropDescription.class,
+                !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        initEAttribute(getContainerDropDescription_DragSource(), theToolPackage_1.getDragSource(), "dragSource", null, 1, 1, ContainerDropDescription.class, !IS_TRANSIENT, !IS_VOLATILE,
+                IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        initEAttribute(getContainerDropDescription_MoveEdges(), ecorePackage.getEBoolean(), "moveEdges", null, 1, 1, ContainerDropDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+                !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+        op = addEOperation(containerDropDescriptionEClass, null, "getBestMapping", 0, 1, IS_UNIQUE, IS_ORDERED);
+        addEParameter(op, theDiagramPackage.getDragAndDropTarget(), "targetContainer", 0, 1, IS_UNIQUE, IS_ORDERED);
+        addEParameter(op, theEcorePackage.getEObject(), "droppedElement", 0, 1, IS_UNIQUE, IS_ORDERED);
+
+        addEOperation(containerDropDescriptionEClass, theDescriptionPackage_1.getDragAndDropTargetDescription(), "getContainers", 1, -1, IS_UNIQUE, IS_ORDERED);
+
         // Initialize enums and add enum literals
         initEEnum(reconnectionKindEEnum, ReconnectionKind.class, "ReconnectionKind");
         addEEnumLiteral(reconnectionKindEEnum, ReconnectionKind.RECONNECT_TARGET_LITERAL);
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/tool/util/ToolAdapterFactory.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/tool/util/ToolAdapterFactory.java
index bfe0f18476..b78fa3feb0 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/tool/util/ToolAdapterFactory.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/tool/util/ToolAdapterFactory.java
@@ -17,6 +17,7 @@ import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.sirius.diagram.description.tool.BehaviorTool;
 import org.eclipse.sirius.diagram.description.tool.ContainerCreationDescription;
+import org.eclipse.sirius.diagram.description.tool.ContainerDropDescription;
 import org.eclipse.sirius.diagram.description.tool.CreateEdgeView;
 import org.eclipse.sirius.diagram.description.tool.CreateView;
 import org.eclipse.sirius.diagram.description.tool.DeleteElementDescription;
@@ -234,6 +235,11 @@ public class ToolAdapterFactory extends AdapterFactoryImpl {
         }
 
         @Override
+        public Adapter caseContainerDropDescription(ContainerDropDescription object) {
+            return createContainerDropDescriptionAdapter();
+        }
+
+        @Override
         public Adapter caseDocumentedElement(DocumentedElement object) {
             return createDocumentedElementAdapter();
         }
@@ -710,6 +716,22 @@ public class ToolAdapterFactory extends AdapterFactoryImpl {
 
     /**
      * Creates a new adapter for an object of class '
+     * {@link org.eclipse.sirius.diagram.description.tool.ContainerDropDescription
+     * <em>Container Drop Description</em>}'. <!-- begin-user-doc --> This
+     * default implementation returns null so that we can easily ignore cases;
+     * it's useful to ignore a case when inheritance will catch all the cases
+     * anyway. <!-- end-user-doc -->
+     * 
+     * @return the new adapter.
+     * @see org.eclipse.sirius.diagram.description.tool.ContainerDropDescription
+     * @generated
+     */
+    public Adapter createContainerDropDescriptionAdapter() {
+        return null;
+    }
+
+    /**
+     * Creates a new adapter for an object of class '
      * {@link org.eclipse.sirius.viewpoint.description.DocumentedElement
      * <em>Documented Element</em>}'. <!-- begin-user-doc --> This default
      * implementation returns null so that we can easily ignore cases; it's
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/tool/util/ToolSwitch.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/tool/util/ToolSwitch.java
index 383bfe4e9e..cbd6193f0a 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/tool/util/ToolSwitch.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/tool/util/ToolSwitch.java
@@ -17,6 +17,7 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.sirius.diagram.description.tool.BehaviorTool;
 import org.eclipse.sirius.diagram.description.tool.ContainerCreationDescription;
+import org.eclipse.sirius.diagram.description.tool.ContainerDropDescription;
 import org.eclipse.sirius.diagram.description.tool.CreateEdgeView;
 import org.eclipse.sirius.diagram.description.tool.CreateView;
 import org.eclipse.sirius.diagram.description.tool.DeleteElementDescription;
@@ -455,6 +456,23 @@ public class ToolSwitch<T> {
                 result = defaultCase(theEObject);
             return result;
         }
+        case ToolPackage.CONTAINER_DROP_DESCRIPTION: {
+            ContainerDropDescription containerDropDescription = (ContainerDropDescription) theEObject;
+            T result = caseContainerDropDescription(containerDropDescription);
+            if (result == null)
+                result = caseMappingBasedToolDescription(containerDropDescription);
+            if (result == null)
+                result = caseAbstractToolDescription(containerDropDescription);
+            if (result == null)
+                result = caseToolEntry(containerDropDescription);
+            if (result == null)
+                result = caseDocumentedElement(containerDropDescription);
+            if (result == null)
+                result = caseIdentifiedElement(containerDropDescription);
+            if (result == null)
+                result = defaultCase(theEObject);
+            return result;
+        }
         default:
             return defaultCase(theEObject);
         }
@@ -887,6 +905,23 @@ public class ToolSwitch<T> {
 
     /**
      * Returns the result of interpreting the object as an instance of '
+     * <em>Container Drop Description</em>'. <!-- begin-user-doc --> This
+     * implementation returns null; returning a non-null result will terminate
+     * the switch. <!-- end-user-doc -->
+     * 
+     * @param object
+     *            the target of the switch.
+     * @return the result of interpreting the object as an instance of '
+     *         <em>Container Drop Description</em>'.
+     * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+     * @generated
+     */
+    public T caseContainerDropDescription(ContainerDropDescription object) {
+        return null;
+    }
+
+    /**
+     * Returns the result of interpreting the object as an instance of '
      * <em>Documented Element</em>'. <!-- begin-user-doc --> This implementation
      * returns null; returning a non-null result will terminate the switch. <!--
      * end-user-doc -->
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/util/DescriptionAdapterFactory.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/util/DescriptionAdapterFactory.java
index d1efbf7cf9..a90a7287ed 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/util/DescriptionAdapterFactory.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/util/DescriptionAdapterFactory.java
@@ -28,6 +28,7 @@ import org.eclipse.sirius.diagram.description.DiagramDescription;
 import org.eclipse.sirius.diagram.description.DiagramElementMapping;
 import org.eclipse.sirius.diagram.description.DiagramExtensionDescription;
 import org.eclipse.sirius.diagram.description.DiagramImportDescription;
+import org.eclipse.sirius.diagram.description.DragAndDropTargetDescription;
 import org.eclipse.sirius.diagram.description.EdgeMapping;
 import org.eclipse.sirius.diagram.description.EdgeMappingImport;
 import org.eclipse.sirius.diagram.description.IEdgeMapping;
@@ -41,7 +42,6 @@ import org.eclipse.sirius.viewpoint.description.AbstractMappingImport;
 import org.eclipse.sirius.viewpoint.description.ConditionalStyleDescription;
 import org.eclipse.sirius.viewpoint.description.DecorationDescription;
 import org.eclipse.sirius.viewpoint.description.DocumentedElement;
-import org.eclipse.sirius.viewpoint.description.DragAndDropTargetDescription;
 import org.eclipse.sirius.viewpoint.description.EndUserDocumentedElement;
 import org.eclipse.sirius.viewpoint.description.IdentifiedElement;
 import org.eclipse.sirius.viewpoint.description.PasteTargetDescription;
@@ -626,14 +626,14 @@ public class DescriptionAdapterFactory extends AdapterFactoryImpl {
 
     /**
      * Creates a new adapter for an object of class '
-     * {@link org.eclipse.sirius.viewpoint.description.DragAndDropTargetDescription
+     * {@link org.eclipse.sirius.diagram.description.DragAndDropTargetDescription
      * <em>Drag And Drop Target Description</em>}'. <!-- begin-user-doc --> This
      * default implementation returns null so that we can easily ignore cases;
      * it's useful to ignore a case when inheritance will catch all the cases
      * anyway. <!-- end-user-doc -->
      * 
      * @return the new adapter.
-     * @see org.eclipse.sirius.viewpoint.description.DragAndDropTargetDescription
+     * @see org.eclipse.sirius.diagram.description.DragAndDropTargetDescription
      * @generated
      */
     public Adapter createDragAndDropTargetDescriptionAdapter() {
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/util/DescriptionSwitch.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/util/DescriptionSwitch.java
index 1145bed838..6db7e9abfe 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/util/DescriptionSwitch.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/util/DescriptionSwitch.java
@@ -28,6 +28,7 @@ import org.eclipse.sirius.diagram.description.DiagramDescription;
 import org.eclipse.sirius.diagram.description.DiagramElementMapping;
 import org.eclipse.sirius.diagram.description.DiagramExtensionDescription;
 import org.eclipse.sirius.diagram.description.DiagramImportDescription;
+import org.eclipse.sirius.diagram.description.DragAndDropTargetDescription;
 import org.eclipse.sirius.diagram.description.EdgeMapping;
 import org.eclipse.sirius.diagram.description.EdgeMappingImport;
 import org.eclipse.sirius.diagram.description.IEdgeMapping;
@@ -41,7 +42,6 @@ import org.eclipse.sirius.viewpoint.description.AbstractMappingImport;
 import org.eclipse.sirius.viewpoint.description.ConditionalStyleDescription;
 import org.eclipse.sirius.viewpoint.description.DecorationDescription;
 import org.eclipse.sirius.viewpoint.description.DocumentedElement;
-import org.eclipse.sirius.viewpoint.description.DragAndDropTargetDescription;
 import org.eclipse.sirius.viewpoint.description.EndUserDocumentedElement;
 import org.eclipse.sirius.viewpoint.description.IdentifiedElement;
 import org.eclipse.sirius.viewpoint.description.PasteTargetDescription;
@@ -430,6 +430,13 @@ public class DescriptionSwitch<T> {
                 result = defaultCase(theEObject);
             return result;
         }
+        case DescriptionPackage.DRAG_AND_DROP_TARGET_DESCRIPTION: {
+            DragAndDropTargetDescription dragAndDropTargetDescription = (DragAndDropTargetDescription) theEObject;
+            T result = caseDragAndDropTargetDescription(dragAndDropTargetDescription);
+            if (result == null)
+                result = defaultCase(theEObject);
+            return result;
+        }
         default:
             return defaultCase(theEObject);
         }
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/impl/DDiagramElementContainerImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/impl/DDiagramElementContainerImpl.java
index 8693ccdc17..e59e31409a 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/impl/DDiagramElementContainerImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/impl/DDiagramElementContainerImpl.java
@@ -32,13 +32,13 @@ import org.eclipse.sirius.diagram.DDiagramElementContainer;
 import org.eclipse.sirius.diagram.DEdge;
 import org.eclipse.sirius.diagram.DNode;
 import org.eclipse.sirius.diagram.DiagramPackage;
+import org.eclipse.sirius.diagram.DragAndDropTarget;
 import org.eclipse.sirius.diagram.EdgeTarget;
 import org.eclipse.sirius.diagram.description.ContainerMapping;
+import org.eclipse.sirius.diagram.description.DragAndDropTargetDescription;
 import org.eclipse.sirius.diagram.description.NodeMapping;
 import org.eclipse.sirius.viewpoint.DContainer;
-import org.eclipse.sirius.viewpoint.DragAndDropTarget;
 import org.eclipse.sirius.viewpoint.Style;
-import org.eclipse.sirius.viewpoint.description.DragAndDropTargetDescription;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model object '
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/impl/DDiagramImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/impl/DDiagramImpl.java
index 264dd4215e..4be4b62d81 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/impl/DDiagramImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/impl/DDiagramImpl.java
@@ -33,14 +33,14 @@ import org.eclipse.sirius.diagram.DiagramPackage;
 import org.eclipse.sirius.diagram.FilterVariableHistory;
 import org.eclipse.sirius.diagram.description.ContainerMapping;
 import org.eclipse.sirius.diagram.description.DiagramDescription;
+import org.eclipse.sirius.diagram.description.DragAndDropTargetDescription;
 import org.eclipse.sirius.diagram.description.EdgeMapping;
 import org.eclipse.sirius.diagram.description.Layer;
 import org.eclipse.sirius.diagram.description.NodeMapping;
 import org.eclipse.sirius.diagram.description.concern.ConcernDescription;
 import org.eclipse.sirius.diagram.description.filter.FilterDescription;
 import org.eclipse.sirius.diagram.description.tool.BehaviorTool;
-import org.eclipse.sirius.diagram.description.validation.ValidationRule;
-import org.eclipse.sirius.viewpoint.description.DragAndDropTargetDescription;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationRule;
 import org.eclipse.sirius.viewpoint.impl.DRepresentationImpl;
 
 /**
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/impl/DNodeImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/impl/DNodeImpl.java
index 41bcd3df00..8ccba07c8d 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/impl/DNodeImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/impl/DNodeImpl.java
@@ -29,14 +29,14 @@ import org.eclipse.sirius.diagram.DDiagram;
 import org.eclipse.sirius.diagram.DEdge;
 import org.eclipse.sirius.diagram.DNode;
 import org.eclipse.sirius.diagram.DiagramPackage;
+import org.eclipse.sirius.diagram.DragAndDropTarget;
 import org.eclipse.sirius.diagram.EdgeTarget;
 import org.eclipse.sirius.diagram.LabelPosition;
 import org.eclipse.sirius.diagram.NodeStyle;
 import org.eclipse.sirius.diagram.ResizeKind;
+import org.eclipse.sirius.diagram.description.DragAndDropTargetDescription;
 import org.eclipse.sirius.diagram.description.NodeMapping;
-import org.eclipse.sirius.viewpoint.DragAndDropTarget;
 import org.eclipse.sirius.viewpoint.Style;
-import org.eclipse.sirius.viewpoint.description.DragAndDropTargetDescription;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model object '
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/impl/DiagramFactoryImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/impl/DiagramFactoryImpl.java
index e130b64a4b..3a5b993c0b 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/impl/DiagramFactoryImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/impl/DiagramFactoryImpl.java
@@ -67,6 +67,7 @@ import org.eclipse.sirius.diagram.DSemanticDiagram;
 import org.eclipse.sirius.diagram.DiagramFactory;
 import org.eclipse.sirius.diagram.DiagramPackage;
 import org.eclipse.sirius.diagram.Dot;
+import org.eclipse.sirius.diagram.DragAndDropTarget;
 import org.eclipse.sirius.diagram.EdgeArrows;
 import org.eclipse.sirius.diagram.EdgeRouting;
 import org.eclipse.sirius.diagram.EdgeStyle;
@@ -218,6 +219,8 @@ public class DiagramFactoryImpl extends EFactoryImpl implements DiagramFactory {
             return (EObject) createViewVariable2ContainerVariable();
         case DiagramPackage.CONTAINER_VARIABLE2_STYLE_DESCRIPTION:
             return (EObject) createContainerVariable2StyleDescription();
+        case DiagramPackage.DRAG_AND_DROP_TARGET:
+            return createDragAndDropTarget();
         default:
             throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
         }
@@ -708,6 +711,16 @@ public class DiagramFactoryImpl extends EFactoryImpl implements DiagramFactory {
      * 
      * @generated
      */
+    public DragAndDropTarget createDragAndDropTarget() {
+        DragAndDropTargetImpl dragAndDropTarget = new DragAndDropTargetImpl();
+        return dragAndDropTarget;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
     public ContainerLayout createContainerLayoutFromString(EDataType eDataType, String initialValue) {
         ContainerLayout result = ContainerLayout.get(initialValue);
         if (result == null)
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/impl/DiagramPackageImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/impl/DiagramPackageImpl.java
index 73b01ee80e..7afe6b4c9d 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/impl/DiagramPackageImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/impl/DiagramPackageImpl.java
@@ -53,6 +53,7 @@ import org.eclipse.sirius.diagram.DSemanticDiagram;
 import org.eclipse.sirius.diagram.DiagramFactory;
 import org.eclipse.sirius.diagram.DiagramPackage;
 import org.eclipse.sirius.diagram.Dot;
+import org.eclipse.sirius.diagram.DragAndDropTarget;
 import org.eclipse.sirius.diagram.EdgeArrows;
 import org.eclipse.sirius.diagram.EdgeRouting;
 import org.eclipse.sirius.diagram.EdgeStyle;
@@ -83,8 +84,6 @@ import org.eclipse.sirius.diagram.description.concern.ConcernPackage;
 import org.eclipse.sirius.diagram.description.concern.impl.ConcernPackageImpl;
 import org.eclipse.sirius.diagram.description.filter.FilterPackage;
 import org.eclipse.sirius.diagram.description.filter.impl.FilterPackageImpl;
-import org.eclipse.sirius.diagram.description.validation.ValidationPackage;
-import org.eclipse.sirius.diagram.description.validation.impl.ValidationPackageImpl;
 import org.eclipse.sirius.viewpoint.ViewpointPackage;
 import org.eclipse.sirius.viewpoint.description.DescriptionPackage;
 import org.eclipse.sirius.viewpoint.description.audit.AuditPackage;
@@ -444,6 +443,13 @@ public class DiagramPackageImpl extends EPackageImpl implements DiagramPackage {
      * 
      * @generated
      */
+    private EClass dragAndDropTargetEClass = null;
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
     private EEnum containerLayoutEEnum = null;
 
     /**
@@ -579,6 +585,9 @@ public class DiagramPackageImpl extends EPackageImpl implements DiagramPackage {
                 .getEPackage(StylePackage.eNS_URI) : StylePackage.eINSTANCE);
         ToolPackageImpl theToolPackage = (ToolPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ToolPackage.eNS_URI) instanceof ToolPackageImpl ? EPackage.Registry.INSTANCE
                 .getEPackage(ToolPackage.eNS_URI) : ToolPackage.eINSTANCE);
+        org.eclipse.sirius.viewpoint.description.validation.impl.ValidationPackageImpl theValidationPackage = (org.eclipse.sirius.viewpoint.description.validation.impl.ValidationPackageImpl) (EPackage.Registry.INSTANCE
+                .getEPackage(org.eclipse.sirius.viewpoint.description.validation.ValidationPackage.eNS_URI) instanceof org.eclipse.sirius.viewpoint.description.validation.impl.ValidationPackageImpl ? EPackage.Registry.INSTANCE
+                .getEPackage(org.eclipse.sirius.viewpoint.description.validation.ValidationPackage.eNS_URI) : org.eclipse.sirius.viewpoint.description.validation.ValidationPackage.eINSTANCE);
         AuditPackageImpl theAuditPackage = (AuditPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(AuditPackage.eNS_URI) instanceof AuditPackageImpl ? EPackage.Registry.INSTANCE
                 .getEPackage(AuditPackage.eNS_URI) : AuditPackage.eINSTANCE);
         org.eclipse.sirius.diagram.description.impl.DescriptionPackageImpl theDescriptionPackage_1 = (org.eclipse.sirius.diagram.description.impl.DescriptionPackageImpl) (EPackage.Registry.INSTANCE
@@ -592,8 +601,6 @@ public class DiagramPackageImpl extends EPackageImpl implements DiagramPackage {
                 .getEPackage(org.eclipse.sirius.diagram.description.tool.ToolPackage.eNS_URI) : org.eclipse.sirius.diagram.description.tool.ToolPackage.eINSTANCE);
         FilterPackageImpl theFilterPackage = (FilterPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(FilterPackage.eNS_URI) instanceof FilterPackageImpl ? EPackage.Registry.INSTANCE
                 .getEPackage(FilterPackage.eNS_URI) : FilterPackage.eINSTANCE);
-        ValidationPackageImpl theValidationPackage = (ValidationPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ValidationPackage.eNS_URI) instanceof ValidationPackageImpl ? EPackage.Registry.INSTANCE
-                .getEPackage(ValidationPackage.eNS_URI) : ValidationPackage.eINSTANCE);
         ConcernPackageImpl theConcernPackage = (ConcernPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ConcernPackage.eNS_URI) instanceof ConcernPackageImpl ? EPackage.Registry.INSTANCE
                 .getEPackage(ConcernPackage.eNS_URI) : ConcernPackage.eINSTANCE);
 
@@ -603,12 +610,12 @@ public class DiagramPackageImpl extends EPackageImpl implements DiagramPackage {
         theDescriptionPackage.createPackageContents();
         theStylePackage.createPackageContents();
         theToolPackage.createPackageContents();
+        theValidationPackage.createPackageContents();
         theAuditPackage.createPackageContents();
         theDescriptionPackage_1.createPackageContents();
         theStylePackage_1.createPackageContents();
         theToolPackage_1.createPackageContents();
         theFilterPackage.createPackageContents();
-        theValidationPackage.createPackageContents();
         theConcernPackage.createPackageContents();
 
         // Initialize created meta-data
@@ -617,12 +624,12 @@ public class DiagramPackageImpl extends EPackageImpl implements DiagramPackage {
         theDescriptionPackage.initializePackageContents();
         theStylePackage.initializePackageContents();
         theToolPackage.initializePackageContents();
+        theValidationPackage.initializePackageContents();
         theAuditPackage.initializePackageContents();
         theDescriptionPackage_1.initializePackageContents();
         theStylePackage_1.initializePackageContents();
         theToolPackage_1.initializePackageContents();
         theFilterPackage.initializePackageContents();
-        theValidationPackage.initializePackageContents();
         theConcernPackage.initializePackageContents();
 
         // Mark meta-data to indicate it can't be changed
@@ -2294,6 +2301,15 @@ public class DiagramPackageImpl extends EPackageImpl implements DiagramPackage {
      * 
      * @generated
      */
+    public EClass getDragAndDropTarget() {
+        return dragAndDropTargetEClass;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
     public EEnum getContainerLayout() {
         return containerLayoutEEnum;
     }
@@ -2649,6 +2665,8 @@ public class DiagramPackageImpl extends EPackageImpl implements DiagramPackage {
         createEReference(containerVariable2StyleDescriptionEClass, CONTAINER_VARIABLE2_STYLE_DESCRIPTION__KEY);
         createEReference(containerVariable2StyleDescriptionEClass, CONTAINER_VARIABLE2_STYLE_DESCRIPTION__VALUE);
 
+        dragAndDropTargetEClass = createEClass(DRAG_AND_DROP_TARGET);
+
         // Create enums
         containerLayoutEEnum = createEEnum(CONTAINER_LAYOUT);
         labelPositionEEnum = createEEnum(LABEL_POSITION);
@@ -2694,7 +2712,8 @@ public class DiagramPackageImpl extends EPackageImpl implements DiagramPackage {
         DescriptionPackage theDescriptionPackage = (DescriptionPackage) EPackage.Registry.INSTANCE.getEPackage(DescriptionPackage.eNS_URI);
         ConcernPackage theConcernPackage = (ConcernPackage) EPackage.Registry.INSTANCE.getEPackage(ConcernPackage.eNS_URI);
         FilterPackage theFilterPackage = (FilterPackage) EPackage.Registry.INSTANCE.getEPackage(FilterPackage.eNS_URI);
-        ValidationPackage theValidationPackage = (ValidationPackage) EPackage.Registry.INSTANCE.getEPackage(ValidationPackage.eNS_URI);
+        org.eclipse.sirius.viewpoint.description.validation.ValidationPackage theValidationPackage = (org.eclipse.sirius.viewpoint.description.validation.ValidationPackage) EPackage.Registry.INSTANCE
+                .getEPackage(org.eclipse.sirius.viewpoint.description.validation.ValidationPackage.eNS_URI);
         org.eclipse.sirius.diagram.description.tool.ToolPackage theToolPackage_1 = (org.eclipse.sirius.diagram.description.tool.ToolPackage) EPackage.Registry.INSTANCE
                 .getEPackage(org.eclipse.sirius.diagram.description.tool.ToolPackage.eNS_URI);
         EcorePackage theEcorePackage = (EcorePackage) EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
@@ -2710,7 +2729,7 @@ public class DiagramPackageImpl extends EPackageImpl implements DiagramPackage {
         // Add supertypes to classes
         dDiagramEClass.getESuperTypes().add(theViewpointPackage.getDRepresentation());
         dDiagramEClass.getESuperTypes().add(theDescriptionPackage.getDocumentedElement());
-        dDiagramEClass.getESuperTypes().add(theViewpointPackage.getDragAndDropTarget());
+        dDiagramEClass.getESuperTypes().add(this.getDragAndDropTarget());
         dDiagramEClass.getESuperTypes().add(theViewpointPackage.getDValidable());
         dDiagramEClass.getESuperTypes().add(theViewpointPackage.getDContainer());
         dSemanticDiagramEClass.getESuperTypes().add(this.getDDiagram());
@@ -2728,10 +2747,10 @@ public class DiagramPackageImpl extends EPackageImpl implements DiagramPackage {
         abstractDNodeEClass.getESuperTypes().add(this.getDDiagramElement());
         dNodeEClass.getESuperTypes().add(this.getAbstractDNode());
         dNodeEClass.getESuperTypes().add(this.getEdgeTarget());
-        dNodeEClass.getESuperTypes().add(theViewpointPackage.getDragAndDropTarget());
+        dNodeEClass.getESuperTypes().add(this.getDragAndDropTarget());
         dDiagramElementContainerEClass.getESuperTypes().add(this.getAbstractDNode());
         dDiagramElementContainerEClass.getESuperTypes().add(this.getEdgeTarget());
-        dDiagramElementContainerEClass.getESuperTypes().add(theViewpointPackage.getDragAndDropTarget());
+        dDiagramElementContainerEClass.getESuperTypes().add(this.getDragAndDropTarget());
         dDiagramElementContainerEClass.getESuperTypes().add(theViewpointPackage.getDContainer());
         dNodeContainerEClass.getESuperTypes().add(this.getDDiagramElementContainer());
         dNodeListEClass.getESuperTypes().add(this.getDDiagramElementContainer());
@@ -3185,6 +3204,10 @@ public class DiagramPackageImpl extends EPackageImpl implements DiagramPackage {
         initEReference(getContainerVariable2StyleDescription_Value(), theStylePackage.getStyleDescription(), null, "value", null, 0, 1, Map.Entry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
                 !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
+        initEClass(dragAndDropTargetEClass, DragAndDropTarget.class, "DragAndDropTarget", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+        addEOperation(dragAndDropTargetEClass, theDescriptionPackage_1.getDragAndDropTargetDescription(), "getDragAndDropDescription", 0, 1, IS_UNIQUE, IS_ORDERED);
+
         // Initialize enums and add enum literals
         initEEnum(containerLayoutEEnum, ContainerLayout.class, "ContainerLayout");
         addEEnumLiteral(containerLayoutEEnum, ContainerLayout.FREE_FORM);
@@ -3251,6 +3274,9 @@ public class DiagramPackageImpl extends EPackageImpl implements DiagramPackage {
         addEEnumLiteral(arrangeConstraintEEnum, ArrangeConstraint.KEEP_SIZE);
         addEEnumLiteral(arrangeConstraintEEnum, ArrangeConstraint.KEEP_RATIO);
 
+        // Create resource
+        createResource(eNS_URI);
+
         // Create annotations
         // http://www.eclipse.org/sirius/interpreted/expression/returnType
         createReturnTypeAnnotations();
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/DragAndDropTargetImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/impl/DragAndDropTargetImpl.java
index f3b590466e..10f718cd39 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/DragAndDropTargetImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/impl/DragAndDropTargetImpl.java
@@ -9,13 +9,13 @@
  *    Obeo - initial API and implementation
  * 
  */
-package org.eclipse.sirius.viewpoint.impl;
+package org.eclipse.sirius.diagram.impl;
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.sirius.viewpoint.DragAndDropTarget;
-import org.eclipse.sirius.viewpoint.ViewpointPackage;
-import org.eclipse.sirius.viewpoint.description.DragAndDropTargetDescription;
+import org.eclipse.sirius.diagram.DiagramPackage;
+import org.eclipse.sirius.diagram.DragAndDropTarget;
+import org.eclipse.sirius.diagram.description.DragAndDropTargetDescription;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model object '
@@ -42,7 +42,7 @@ public class DragAndDropTargetImpl extends EObjectImpl implements DragAndDropTar
      */
     @Override
     protected EClass eStaticClass() {
-        return ViewpointPackage.Literals.DRAG_AND_DROP_TARGET;
+        return DiagramPackage.Literals.DRAG_AND_DROP_TARGET;
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/util/DiagramAdapterFactory.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/util/DiagramAdapterFactory.java
index 6ce27f9e2a..dc17ed5b74 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/util/DiagramAdapterFactory.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/util/DiagramAdapterFactory.java
@@ -42,6 +42,7 @@ import org.eclipse.sirius.diagram.DNodeListElement;
 import org.eclipse.sirius.diagram.DSemanticDiagram;
 import org.eclipse.sirius.diagram.DiagramPackage;
 import org.eclipse.sirius.diagram.Dot;
+import org.eclipse.sirius.diagram.DragAndDropTarget;
 import org.eclipse.sirius.diagram.EdgeStyle;
 import org.eclipse.sirius.diagram.EdgeTarget;
 import org.eclipse.sirius.diagram.Ellipse;
@@ -77,7 +78,6 @@ import org.eclipse.sirius.viewpoint.DRepresentationElement;
 import org.eclipse.sirius.viewpoint.DSemanticDecorator;
 import org.eclipse.sirius.viewpoint.DStylizable;
 import org.eclipse.sirius.viewpoint.DValidable;
-import org.eclipse.sirius.viewpoint.DragAndDropTarget;
 import org.eclipse.sirius.viewpoint.LabelStyle;
 import org.eclipse.sirius.viewpoint.Style;
 import org.eclipse.sirius.viewpoint.description.DModelElement;
@@ -380,6 +380,11 @@ public class DiagramAdapterFactory extends AdapterFactoryImpl {
         }
 
         @Override
+        public Adapter caseDragAndDropTarget(DragAndDropTarget object) {
+            return createDragAndDropTargetAdapter();
+        }
+
+        @Override
         public Adapter caseDocumentedElement(DocumentedElement object) {
             return createDocumentedElementAdapter();
         }
@@ -400,11 +405,6 @@ public class DiagramAdapterFactory extends AdapterFactoryImpl {
         }
 
         @Override
-        public Adapter caseDragAndDropTarget(DragAndDropTarget object) {
-            return createDragAndDropTargetAdapter();
-        }
-
-        @Override
         public Adapter caseDValidable(DValidable object) {
             return createDValidableAdapter();
         }
@@ -1297,14 +1297,14 @@ public class DiagramAdapterFactory extends AdapterFactoryImpl {
 
     /**
      * Creates a new adapter for an object of class '
-     * {@link org.eclipse.sirius.viewpoint.DragAndDropTarget
+     * {@link org.eclipse.sirius.diagram.DragAndDropTarget
      * <em>Drag And Drop Target</em>}'. <!-- begin-user-doc --> This default
      * implementation returns null so that we can easily ignore cases; it's
      * useful to ignore a case when inheritance will catch all the cases anyway.
      * <!-- end-user-doc -->
      * 
      * @return the new adapter.
-     * @see org.eclipse.sirius.viewpoint.DragAndDropTarget
+     * @see org.eclipse.sirius.diagram.DragAndDropTarget
      * @generated
      */
     public Adapter createDragAndDropTargetAdapter() {
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/util/DiagramSwitch.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/util/DiagramSwitch.java
index 2af9e7419b..07cda5dae7 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/util/DiagramSwitch.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/util/DiagramSwitch.java
@@ -41,6 +41,7 @@ import org.eclipse.sirius.diagram.DNodeListElement;
 import org.eclipse.sirius.diagram.DSemanticDiagram;
 import org.eclipse.sirius.diagram.DiagramPackage;
 import org.eclipse.sirius.diagram.Dot;
+import org.eclipse.sirius.diagram.DragAndDropTarget;
 import org.eclipse.sirius.diagram.EdgeStyle;
 import org.eclipse.sirius.diagram.EdgeTarget;
 import org.eclipse.sirius.diagram.Ellipse;
@@ -76,7 +77,6 @@ import org.eclipse.sirius.viewpoint.DRepresentationElement;
 import org.eclipse.sirius.viewpoint.DSemanticDecorator;
 import org.eclipse.sirius.viewpoint.DStylizable;
 import org.eclipse.sirius.viewpoint.DValidable;
-import org.eclipse.sirius.viewpoint.DragAndDropTarget;
 import org.eclipse.sirius.viewpoint.LabelStyle;
 import org.eclipse.sirius.viewpoint.Style;
 import org.eclipse.sirius.viewpoint.description.DModelElement;
@@ -942,6 +942,13 @@ public class DiagramSwitch<T> {
                 result = defaultCase(theEObject);
             return result;
         }
+        case DiagramPackage.DRAG_AND_DROP_TARGET: {
+            DragAndDropTarget dragAndDropTarget = (DragAndDropTarget) theEObject;
+            T result = caseDragAndDropTarget(dragAndDropTarget);
+            if (result == null)
+                result = defaultCase(theEObject);
+            return result;
+        }
         default:
             return defaultCase(theEObject);
         }
@@ -1765,6 +1772,23 @@ public class DiagramSwitch<T> {
 
     /**
      * Returns the result of interpreting the object as an instance of '
+     * <em>Drag And Drop Target</em>'. <!-- begin-user-doc --> This
+     * implementation returns null; returning a non-null result will terminate
+     * the switch. <!-- end-user-doc -->
+     * 
+     * @param object
+     *            the target of the switch.
+     * @return the result of interpreting the object as an instance of '
+     *         <em>Drag And Drop Target</em>'.
+     * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+     * @generated
+     */
+    public T caseDragAndDropTarget(DragAndDropTarget object) {
+        return null;
+    }
+
+    /**
+     * Returns the result of interpreting the object as an instance of '
      * <em>Documented Element</em>'. <!-- begin-user-doc --> This implementation
      * returns null; returning a non-null result will terminate the switch. <!--
      * end-user-doc -->
@@ -1833,23 +1857,6 @@ public class DiagramSwitch<T> {
 
     /**
      * Returns the result of interpreting the object as an instance of '
-     * <em>Drag And Drop Target</em>'. <!-- begin-user-doc --> This
-     * implementation returns null; returning a non-null result will terminate
-     * the switch. <!-- end-user-doc -->
-     * 
-     * @param object
-     *            the target of the switch.
-     * @return the result of interpreting the object as an instance of '
-     *         <em>Drag And Drop Target</em>'.
-     * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-     * @generated
-     */
-    public T caseDragAndDropTarget(DragAndDropTarget object) {
-        return null;
-    }
-
-    /**
-     * Returns the result of interpreting the object as an instance of '
      * <em>DValidable</em>'. <!-- begin-user-doc --> This implementation returns
      * null; returning a non-null result will terminate the switch. <!--
      * end-user-doc -->
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/ViewpointFactory.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/ViewpointFactory.java
index 1b9b5c46a3..486a51a8d4 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/ViewpointFactory.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/ViewpointFactory.java
@@ -111,15 +111,6 @@ public interface ViewpointFactory extends EFactory {
     LabelStyle createLabelStyle();
 
     /**
-     * Returns a new object of class '<em>Drag And Drop Target</em>'. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @return a new object of class '<em>Drag And Drop Target</em>'.
-     * @generated
-     */
-    DragAndDropTarget createDragAndDropTarget();
-
-    /**
      * Returns a new object of class '<em>RGB Values</em>'. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
      * 
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/ViewpointPackage.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/ViewpointPackage.java
index a3023169a9..76bd22aa07 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/ViewpointPackage.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/ViewpointPackage.java
@@ -922,7 +922,7 @@ public interface ViewpointPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.impl.ViewpointPackageImpl#getCustomizable()
      * @generated
      */
-    int CUSTOMIZABLE = 33;
+    int CUSTOMIZABLE = 32;
 
     /**
      * The feature id for the '<em><b>Custom Features</b></em>' attribute list.
@@ -952,7 +952,7 @@ public interface ViewpointPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.impl.ViewpointPackageImpl#getBasicLabelStyle()
      * @generated
      */
-    int BASIC_LABEL_STYLE = 32;
+    int BASIC_LABEL_STYLE = 31;
 
     /**
      * The feature id for the '<em><b>Custom Features</b></em>' attribute list.
@@ -1141,27 +1141,6 @@ public interface ViewpointPackage extends EPackage {
 
     /**
      * The meta object id for the '
-     * {@link org.eclipse.sirius.viewpoint.impl.DragAndDropTargetImpl
-     * <em>Drag And Drop Target</em>}' class. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * 
-     * @see org.eclipse.sirius.viewpoint.impl.DragAndDropTargetImpl
-     * @see org.eclipse.sirius.viewpoint.impl.ViewpointPackageImpl#getDragAndDropTarget()
-     * @generated
-     */
-    int DRAG_AND_DROP_TARGET = 22;
-
-    /**
-     * The number of structural features of the '<em>Drag And Drop Target</em>'
-     * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     * @ordered
-     */
-    int DRAG_AND_DROP_TARGET_FEATURE_COUNT = 0;
-
-    /**
-     * The meta object id for the '
      * {@link org.eclipse.sirius.viewpoint.impl.RGBValuesImpl
      * <em>RGB Values</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -1170,7 +1149,7 @@ public interface ViewpointPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.impl.ViewpointPackageImpl#getRGBValues()
      * @generated
      */
-    int RGB_VALUES = 23;
+    int RGB_VALUES = 22;
 
     /**
      * The feature id for the '<em><b>Red</b></em>' attribute. <!--
@@ -1218,7 +1197,7 @@ public interface ViewpointPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.impl.ViewpointPackageImpl#getDAnalysisSessionEObject()
      * @generated
      */
-    int DANALYSIS_SESSION_EOBJECT = 24;
+    int DANALYSIS_SESSION_EOBJECT = 23;
 
     /**
      * The feature id for the '<em><b>Open</b></em>' attribute. <!--
@@ -1303,7 +1282,7 @@ public interface ViewpointPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.impl.ViewpointPackageImpl#getSessionManagerEObject()
      * @generated
      */
-    int SESSION_MANAGER_EOBJECT = 25;
+    int SESSION_MANAGER_EOBJECT = 24;
 
     /**
      * The feature id for the '<em><b>Owned Sessions</b></em>' containment
@@ -1333,7 +1312,7 @@ public interface ViewpointPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.impl.ViewpointPackageImpl#getDResource()
      * @generated
      */
-    int DRESOURCE = 26;
+    int DRESOURCE = 25;
 
     /**
      * The feature id for the '<em><b>Name</b></em>' attribute. <!--
@@ -1371,7 +1350,7 @@ public interface ViewpointPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.impl.ViewpointPackageImpl#getDFile()
      * @generated
      */
-    int DFILE = 27;
+    int DFILE = 26;
 
     /**
      * The feature id for the '<em><b>Name</b></em>' attribute. <!--
@@ -1410,7 +1389,7 @@ public interface ViewpointPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.impl.ViewpointPackageImpl#getDResourceContainer()
      * @generated
      */
-    int DRESOURCE_CONTAINER = 28;
+    int DRESOURCE_CONTAINER = 27;
 
     /**
      * The feature id for the '<em><b>Name</b></em>' attribute. <!--
@@ -1457,7 +1436,7 @@ public interface ViewpointPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.impl.ViewpointPackageImpl#getDProject()
      * @generated
      */
-    int DPROJECT = 29;
+    int DPROJECT = 28;
 
     /**
      * The feature id for the '<em><b>Name</b></em>' attribute. <!--
@@ -1504,7 +1483,7 @@ public interface ViewpointPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.impl.ViewpointPackageImpl#getDFolder()
      * @generated
      */
-    int DFOLDER = 30;
+    int DFOLDER = 29;
 
     /**
      * The feature id for the '<em><b>Name</b></em>' attribute. <!--
@@ -1551,7 +1530,7 @@ public interface ViewpointPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.impl.ViewpointPackageImpl#getDModel()
      * @generated
      */
-    int DMODEL = 31;
+    int DMODEL = 30;
 
     /**
      * The feature id for the '<em><b>Name</b></em>' attribute. <!--
@@ -1589,7 +1568,7 @@ public interface ViewpointPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.impl.ViewpointPackageImpl#getFontFormat()
      * @generated
      */
-    int FONT_FORMAT = 34;
+    int FONT_FORMAT = 33;
 
     /**
      * The meta object id for the '
@@ -1601,7 +1580,7 @@ public interface ViewpointPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.impl.ViewpointPackageImpl#getLabelAlignment()
      * @generated
      */
-    int LABEL_ALIGNMENT = 35;
+    int LABEL_ALIGNMENT = 34;
 
     /**
      * The meta object id for the '
@@ -1612,7 +1591,7 @@ public interface ViewpointPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.impl.ViewpointPackageImpl#getSyncStatus()
      * @generated
      */
-    int SYNC_STATUS = 36;
+    int SYNC_STATUS = 35;
 
     /**
      * The meta object id for the '<em>Extended Package</em>' data type. <!--
@@ -1622,7 +1601,7 @@ public interface ViewpointPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.impl.ViewpointPackageImpl#getExtendedPackage()
      * @generated
      */
-    int EXTENDED_PACKAGE = 37;
+    int EXTENDED_PACKAGE = 36;
 
     /**
      * Returns the meta object for class '
@@ -2334,18 +2313,6 @@ public interface ViewpointPackage extends EPackage {
 
     /**
      * Returns the meta object for class '
-     * {@link org.eclipse.sirius.viewpoint.DragAndDropTarget
-     * <em>Drag And Drop Target</em>}'. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * 
-     * @return the meta object for class '<em>Drag And Drop Target</em>'.
-     * @see org.eclipse.sirius.viewpoint.DragAndDropTarget
-     * @generated
-     */
-    EClass getDragAndDropTarget();
-
-    /**
-     * Returns the meta object for class '
      * {@link org.eclipse.sirius.viewpoint.RGBValues <em>RGB Values</em>}'. <!--
      * begin-user-doc --> <!-- end-user-doc -->
      * 
@@ -3348,18 +3315,6 @@ public interface ViewpointPackage extends EPackage {
 
         /**
          * The meta object literal for the '
-         * {@link org.eclipse.sirius.viewpoint.impl.DragAndDropTargetImpl
-         * <em>Drag And Drop Target</em>}' class. <!-- begin-user-doc --> <!--
-         * end-user-doc -->
-         * 
-         * @see org.eclipse.sirius.viewpoint.impl.DragAndDropTargetImpl
-         * @see org.eclipse.sirius.viewpoint.impl.ViewpointPackageImpl#getDragAndDropTarget()
-         * @generated
-         */
-        EClass DRAG_AND_DROP_TARGET = eINSTANCE.getDragAndDropTarget();
-
-        /**
-         * The meta object literal for the '
          * {@link org.eclipse.sirius.viewpoint.impl.RGBValuesImpl
          * <em>RGB Values</em>}' class. <!-- begin-user-doc --> <!--
          * end-user-doc -->
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/DescriptionPackage.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/DescriptionPackage.java
index 29fcfbab4b..898a322340 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/DescriptionPackage.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/DescriptionPackage.java
@@ -771,7 +771,7 @@ public interface DescriptionPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getIdentifiedElement()
      * @generated
      */
-    int IDENTIFIED_ELEMENT = 41;
+    int IDENTIFIED_ELEMENT = 40;
 
     /**
      * The feature id for the '<em><b>Name</b></em>' attribute. <!--
@@ -970,37 +970,6 @@ public interface DescriptionPackage extends EPackage {
 
     /**
      * The meta object id for the '
-     * {@link org.eclipse.sirius.viewpoint.description.impl.DragAndDropTargetDescriptionImpl
-     * <em>Drag And Drop Target Description</em>}' class. <!-- begin-user-doc
-     * --> <!-- end-user-doc -->
-     * 
-     * @see org.eclipse.sirius.viewpoint.description.impl.DragAndDropTargetDescriptionImpl
-     * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getDragAndDropTargetDescription()
-     * @generated
-     */
-    int DRAG_AND_DROP_TARGET_DESCRIPTION = 16;
-
-    /**
-     * The feature id for the '<em><b>Drop Descriptions</b></em>' reference
-     * list. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     * @ordered
-     */
-    int DRAG_AND_DROP_TARGET_DESCRIPTION__DROP_DESCRIPTIONS = 0;
-
-    /**
-     * The number of structural features of the '
-     * <em>Drag And Drop Target Description</em>' class. <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * 
-     * @generated
-     * @ordered
-     */
-    int DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT = 1;
-
-    /**
-     * The meta object id for the '
      * {@link org.eclipse.sirius.viewpoint.description.impl.PasteTargetDescriptionImpl
      * <em>Paste Target Description</em>}' class. <!-- begin-user-doc --> <!--
      * end-user-doc -->
@@ -1009,7 +978,7 @@ public interface DescriptionPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getPasteTargetDescription()
      * @generated
      */
-    int PASTE_TARGET_DESCRIPTION = 17;
+    int PASTE_TARGET_DESCRIPTION = 16;
 
     /**
      * The feature id for the '<em><b>Paste Descriptions</b></em>' reference
@@ -1040,7 +1009,7 @@ public interface DescriptionPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getDecorationDescriptionsSet()
      * @generated
      */
-    int DECORATION_DESCRIPTIONS_SET = 18;
+    int DECORATION_DESCRIPTIONS_SET = 17;
 
     /**
      * The feature id for the '<em><b>Decoration Descriptions</b></em>'
@@ -1071,7 +1040,7 @@ public interface DescriptionPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getDecorationDescription()
      * @generated
      */
-    int DECORATION_DESCRIPTION = 19;
+    int DECORATION_DESCRIPTION = 18;
 
     /**
      * The feature id for the '<em><b>Name</b></em>' attribute. <!--
@@ -1128,7 +1097,7 @@ public interface DescriptionPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getSemanticBasedDecoration()
      * @generated
      */
-    int SEMANTIC_BASED_DECORATION = 20;
+    int SEMANTIC_BASED_DECORATION = 19;
 
     /**
      * The feature id for the '<em><b>Name</b></em>' attribute. <!--
@@ -1195,7 +1164,7 @@ public interface DescriptionPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getCustomization()
      * @generated
      */
-    int CUSTOMIZATION = 21;
+    int CUSTOMIZATION = 20;
 
     /**
      * The feature id for the '<em><b>Vsm Element Customizations</b></em>'
@@ -1225,7 +1194,7 @@ public interface DescriptionPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getIVSMElementCustomization()
      * @generated
      */
-    int IVSM_ELEMENT_CUSTOMIZATION = 22;
+    int IVSM_ELEMENT_CUSTOMIZATION = 21;
 
     /**
      * The number of structural features of the '
@@ -1247,7 +1216,7 @@ public interface DescriptionPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getVSMElementCustomization()
      * @generated
      */
-    int VSM_ELEMENT_CUSTOMIZATION = 23;
+    int VSM_ELEMENT_CUSTOMIZATION = 22;
 
     /**
      * The feature id for the '<em><b>Predicate Expression</b></em>' attribute.
@@ -1287,7 +1256,7 @@ public interface DescriptionPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getVSMElementCustomizationReuse()
      * @generated
      */
-    int VSM_ELEMENT_CUSTOMIZATION_REUSE = 24;
+    int VSM_ELEMENT_CUSTOMIZATION_REUSE = 23;
 
     /**
      * The feature id for the '<em><b>Reuse</b></em>' reference list. <!--
@@ -1327,7 +1296,7 @@ public interface DescriptionPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getEStructuralFeatureCustomization()
      * @generated
      */
-    int ESTRUCTURAL_FEATURE_CUSTOMIZATION = 25;
+    int ESTRUCTURAL_FEATURE_CUSTOMIZATION = 24;
 
     /**
      * The feature id for the '<em><b>Applied On</b></em>' reference list. <!--
@@ -1367,7 +1336,7 @@ public interface DescriptionPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getEAttributeCustomization()
      * @generated
      */
-    int EATTRIBUTE_CUSTOMIZATION = 26;
+    int EATTRIBUTE_CUSTOMIZATION = 25;
 
     /**
      * The feature id for the '<em><b>Applied On</b></em>' reference list. <!--
@@ -1425,7 +1394,7 @@ public interface DescriptionPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getEReferenceCustomization()
      * @generated
      */
-    int EREFERENCE_CUSTOMIZATION = 27;
+    int EREFERENCE_CUSTOMIZATION = 26;
 
     /**
      * The feature id for the '<em><b>Applied On</b></em>' reference list. <!--
@@ -1483,7 +1452,7 @@ public interface DescriptionPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getSelectionDescription()
      * @generated
      */
-    int SELECTION_DESCRIPTION = 28;
+    int SELECTION_DESCRIPTION = 27;
 
     /**
      * The feature id for the '<em><b>Candidates Expression</b></em>' attribute.
@@ -1558,7 +1527,7 @@ public interface DescriptionPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getColorDescription()
      * @generated
      */
-    int COLOR_DESCRIPTION = 29;
+    int COLOR_DESCRIPTION = 28;
 
     /**
      * The number of structural features of the '<em>Color Description</em>'
@@ -1579,7 +1548,7 @@ public interface DescriptionPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getFixedColor()
      * @generated
      */
-    int FIXED_COLOR = 33;
+    int FIXED_COLOR = 32;
 
     /**
      * The feature id for the '<em><b>Red</b></em>' attribute. <!--
@@ -1627,7 +1596,7 @@ public interface DescriptionPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getSystemColor()
      * @generated
      */
-    int SYSTEM_COLOR = 30;
+    int SYSTEM_COLOR = 29;
 
     /**
      * The feature id for the '<em><b>Red</b></em>' attribute. <!--
@@ -1684,7 +1653,7 @@ public interface DescriptionPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getInterpolatedColor()
      * @generated
      */
-    int INTERPOLATED_COLOR = 31;
+    int INTERPOLATED_COLOR = 30;
 
     /**
      * The feature id for the '<em><b>Name</b></em>' attribute. <!--
@@ -1751,7 +1720,7 @@ public interface DescriptionPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getColorStep()
      * @generated
      */
-    int COLOR_STEP = 32;
+    int COLOR_STEP = 31;
 
     /**
      * The feature id for the '<em><b>Associated Value</b></em>' attribute. <!--
@@ -1790,7 +1759,7 @@ public interface DescriptionPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getUserFixedColor()
      * @generated
      */
-    int USER_FIXED_COLOR = 34;
+    int USER_FIXED_COLOR = 33;
 
     /**
      * The feature id for the '<em><b>Red</b></em>' attribute. <!--
@@ -1847,7 +1816,7 @@ public interface DescriptionPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getUserColor()
      * @generated
      */
-    int USER_COLOR = 35;
+    int USER_COLOR = 34;
 
     /**
      * The feature id for the '<em><b>Name</b></em>' attribute. <!--
@@ -1877,7 +1846,7 @@ public interface DescriptionPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getEnvironment()
      * @generated
      */
-    int ENVIRONMENT = 36;
+    int ENVIRONMENT = 35;
 
     /**
      * The feature id for the '<em><b>System Colors</b></em>' containment
@@ -1925,7 +1894,7 @@ public interface DescriptionPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getSytemColorsPalette()
      * @generated
      */
-    int SYTEM_COLORS_PALETTE = 37;
+    int SYTEM_COLORS_PALETTE = 36;
 
     /**
      * The feature id for the '<em><b>Entries</b></em>' containment reference
@@ -1955,7 +1924,7 @@ public interface DescriptionPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getUserColorsPalette()
      * @generated
      */
-    int USER_COLORS_PALETTE = 38;
+    int USER_COLORS_PALETTE = 37;
 
     /**
      * The feature id for the '<em><b>Name</b></em>' attribute. <!--
@@ -1994,7 +1963,7 @@ public interface DescriptionPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getAnnotationEntry()
      * @generated
      */
-    int ANNOTATION_ENTRY = 39;
+    int ANNOTATION_ENTRY = 38;
 
     /**
      * The feature id for the '<em><b>Source</b></em>' attribute. <!--
@@ -2033,7 +2002,7 @@ public interface DescriptionPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getEndUserDocumentedElement()
      * @generated
      */
-    int END_USER_DOCUMENTED_ELEMENT = 40;
+    int END_USER_DOCUMENTED_ELEMENT = 39;
 
     /**
      * The feature id for the '<em><b>End User Documentation</b></em>'
@@ -2064,7 +2033,7 @@ public interface DescriptionPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getComputedColor()
      * @generated
      */
-    int COMPUTED_COLOR = 42;
+    int COMPUTED_COLOR = 41;
 
     /**
      * The feature id for the '<em><b>Name</b></em>' attribute. <!--
@@ -2121,7 +2090,7 @@ public interface DescriptionPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getDAnnotationEntry()
      * @generated
      */
-    int DANNOTATION_ENTRY = 43;
+    int DANNOTATION_ENTRY = 42;
 
     /**
      * The feature id for the '<em><b>Source</b></em>' attribute. <!--
@@ -2160,7 +2129,7 @@ public interface DescriptionPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getNavigationTargetType()
      * @generated
      */
-    int NAVIGATION_TARGET_TYPE = 44;
+    int NAVIGATION_TARGET_TYPE = 43;
 
     /**
      * The meta object id for the '
@@ -2171,7 +2140,7 @@ public interface DescriptionPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getPosition()
      * @generated
      */
-    int POSITION = 45;
+    int POSITION = 44;
 
     /**
      * The meta object id for the '
@@ -2183,7 +2152,7 @@ public interface DescriptionPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getSystemColors()
      * @generated
      */
-    int SYSTEM_COLORS = 46;
+    int SYSTEM_COLORS = 45;
 
     /**
      * The meta object id for the '<em>Type Name</em>' data type. <!--
@@ -2193,7 +2162,7 @@ public interface DescriptionPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getTypeName()
      * @generated
      */
-    int TYPE_NAME = 47;
+    int TYPE_NAME = 46;
 
     /**
      * The meta object id for the '<em>Interpreted Expression</em>' data type.
@@ -2203,7 +2172,7 @@ public interface DescriptionPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getInterpretedExpression()
      * @generated
      */
-    int INTERPRETED_EXPRESSION = 48;
+    int INTERPRETED_EXPRESSION = 47;
 
     /**
      * The meta object id for the '<em>Feature Name</em>' data type. <!--
@@ -2213,7 +2182,7 @@ public interface DescriptionPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getFeatureName()
      * @generated
      */
-    int FEATURE_NAME = 49;
+    int FEATURE_NAME = 48;
 
     /**
      * The meta object id for the '<em>URI</em>' data type. <!-- begin-user-doc
@@ -2223,7 +2192,7 @@ public interface DescriptionPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getURI()
      * @generated
      */
-    int URI = 50;
+    int URI = 49;
 
     /**
      * Returns the meta object for class '
@@ -2910,33 +2879,6 @@ public interface DescriptionPackage extends EPackage {
 
     /**
      * Returns the meta object for class '
-     * {@link org.eclipse.sirius.viewpoint.description.DragAndDropTargetDescription
-     * <em>Drag And Drop Target Description</em>}'. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * 
-     * @return the meta object for class '
-     *         <em>Drag And Drop Target Description</em>'.
-     * @see org.eclipse.sirius.viewpoint.description.DragAndDropTargetDescription
-     * @generated
-     */
-    EClass getDragAndDropTargetDescription();
-
-    /**
-     * Returns the meta object for the reference list '
-     * {@link org.eclipse.sirius.viewpoint.description.DragAndDropTargetDescription#getDropDescriptions
-     * <em>Drop Descriptions</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
-     * -->
-     * 
-     * @return the meta object for the reference list '
-     *         <em>Drop Descriptions</em>'.
-     * @see org.eclipse.sirius.viewpoint.description.DragAndDropTargetDescription#getDropDescriptions()
-     * @see #getDragAndDropTargetDescription()
-     * @generated
-     */
-    EReference getDragAndDropTargetDescription_DropDescriptions();
-
-    /**
-     * Returns the meta object for class '
      * {@link org.eclipse.sirius.viewpoint.description.PasteTargetDescription
      * <em>Paste Target Description</em>}'. <!-- begin-user-doc --> <!--
      * end-user-doc -->
@@ -4512,26 +4454,6 @@ public interface DescriptionPackage extends EPackage {
 
         /**
          * The meta object literal for the '
-         * {@link org.eclipse.sirius.viewpoint.description.impl.DragAndDropTargetDescriptionImpl
-         * <em>Drag And Drop Target Description</em>}' class. <!--
-         * begin-user-doc --> <!-- end-user-doc -->
-         * 
-         * @see org.eclipse.sirius.viewpoint.description.impl.DragAndDropTargetDescriptionImpl
-         * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getDragAndDropTargetDescription()
-         * @generated
-         */
-        EClass DRAG_AND_DROP_TARGET_DESCRIPTION = eINSTANCE.getDragAndDropTargetDescription();
-
-        /**
-         * The meta object literal for the '<em><b>Drop Descriptions</b></em>'
-         * reference list feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-         * 
-         * @generated
-         */
-        EReference DRAG_AND_DROP_TARGET_DESCRIPTION__DROP_DESCRIPTIONS = eINSTANCE.getDragAndDropTargetDescription_DropDescriptions();
-
-        /**
-         * The meta object literal for the '
          * {@link org.eclipse.sirius.viewpoint.description.impl.PasteTargetDescriptionImpl
          * <em>Paste Target Description</em>}' class. <!-- begin-user-doc -->
          * <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/Viewpoint.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/Viewpoint.java
index e4bfc9ce3e..f3b8d66f0b 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/Viewpoint.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/Viewpoint.java
@@ -14,7 +14,7 @@ package org.eclipse.sirius.viewpoint.description;
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.sirius.diagram.description.validation.ValidationSet;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationSet;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/audit/impl/AuditPackageImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/audit/impl/AuditPackageImpl.java
index 814bff156e..763de43e25 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/audit/impl/AuditPackageImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/audit/impl/AuditPackageImpl.java
@@ -22,8 +22,6 @@ import org.eclipse.sirius.diagram.description.concern.ConcernPackage;
 import org.eclipse.sirius.diagram.description.concern.impl.ConcernPackageImpl;
 import org.eclipse.sirius.diagram.description.filter.FilterPackage;
 import org.eclipse.sirius.diagram.description.filter.impl.FilterPackageImpl;
-import org.eclipse.sirius.diagram.description.validation.ValidationPackage;
-import org.eclipse.sirius.diagram.description.validation.impl.ValidationPackageImpl;
 import org.eclipse.sirius.diagram.impl.DiagramPackageImpl;
 import org.eclipse.sirius.viewpoint.ViewpointPackage;
 import org.eclipse.sirius.viewpoint.description.DescriptionPackage;
@@ -121,6 +119,9 @@ public class AuditPackageImpl extends EPackageImpl implements AuditPackage {
                 .getEPackage(StylePackage.eNS_URI) : StylePackage.eINSTANCE);
         ToolPackageImpl theToolPackage = (ToolPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ToolPackage.eNS_URI) instanceof ToolPackageImpl ? EPackage.Registry.INSTANCE
                 .getEPackage(ToolPackage.eNS_URI) : ToolPackage.eINSTANCE);
+        org.eclipse.sirius.viewpoint.description.validation.impl.ValidationPackageImpl theValidationPackage = (org.eclipse.sirius.viewpoint.description.validation.impl.ValidationPackageImpl) (EPackage.Registry.INSTANCE
+                .getEPackage(org.eclipse.sirius.viewpoint.description.validation.ValidationPackage.eNS_URI) instanceof org.eclipse.sirius.viewpoint.description.validation.impl.ValidationPackageImpl ? EPackage.Registry.INSTANCE
+                .getEPackage(org.eclipse.sirius.viewpoint.description.validation.ValidationPackage.eNS_URI) : org.eclipse.sirius.viewpoint.description.validation.ValidationPackage.eINSTANCE);
         DiagramPackageImpl theDiagramPackage = (DiagramPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(DiagramPackage.eNS_URI) instanceof DiagramPackageImpl ? EPackage.Registry.INSTANCE
                 .getEPackage(DiagramPackage.eNS_URI) : DiagramPackage.eINSTANCE);
         org.eclipse.sirius.diagram.description.impl.DescriptionPackageImpl theDescriptionPackage_1 = (org.eclipse.sirius.diagram.description.impl.DescriptionPackageImpl) (EPackage.Registry.INSTANCE
@@ -134,8 +135,6 @@ public class AuditPackageImpl extends EPackageImpl implements AuditPackage {
                 .getEPackage(org.eclipse.sirius.diagram.description.tool.ToolPackage.eNS_URI) : org.eclipse.sirius.diagram.description.tool.ToolPackage.eINSTANCE);
         FilterPackageImpl theFilterPackage = (FilterPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(FilterPackage.eNS_URI) instanceof FilterPackageImpl ? EPackage.Registry.INSTANCE
                 .getEPackage(FilterPackage.eNS_URI) : FilterPackage.eINSTANCE);
-        ValidationPackageImpl theValidationPackage = (ValidationPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ValidationPackage.eNS_URI) instanceof ValidationPackageImpl ? EPackage.Registry.INSTANCE
-                .getEPackage(ValidationPackage.eNS_URI) : ValidationPackage.eINSTANCE);
         ConcernPackageImpl theConcernPackage = (ConcernPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ConcernPackage.eNS_URI) instanceof ConcernPackageImpl ? EPackage.Registry.INSTANCE
                 .getEPackage(ConcernPackage.eNS_URI) : ConcernPackage.eINSTANCE);
 
@@ -145,12 +144,12 @@ public class AuditPackageImpl extends EPackageImpl implements AuditPackage {
         theDescriptionPackage.createPackageContents();
         theStylePackage.createPackageContents();
         theToolPackage.createPackageContents();
+        theValidationPackage.createPackageContents();
         theDiagramPackage.createPackageContents();
         theDescriptionPackage_1.createPackageContents();
         theStylePackage_1.createPackageContents();
         theToolPackage_1.createPackageContents();
         theFilterPackage.createPackageContents();
-        theValidationPackage.createPackageContents();
         theConcernPackage.createPackageContents();
 
         // Initialize created meta-data
@@ -159,12 +158,12 @@ public class AuditPackageImpl extends EPackageImpl implements AuditPackage {
         theDescriptionPackage.initializePackageContents();
         theStylePackage.initializePackageContents();
         theToolPackage.initializePackageContents();
+        theValidationPackage.initializePackageContents();
         theDiagramPackage.initializePackageContents();
         theDescriptionPackage_1.initializePackageContents();
         theStylePackage_1.initializePackageContents();
         theToolPackage_1.initializePackageContents();
         theFilterPackage.initializePackageContents();
-        theValidationPackage.initializePackageContents();
         theConcernPackage.initializePackageContents();
 
         // Mark meta-data to indicate it can't be changed
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/DescriptionPackageImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/DescriptionPackageImpl.java
index 7632bd66c6..62f2612275 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/DescriptionPackageImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/DescriptionPackageImpl.java
@@ -25,8 +25,6 @@ import org.eclipse.sirius.diagram.description.concern.ConcernPackage;
 import org.eclipse.sirius.diagram.description.concern.impl.ConcernPackageImpl;
 import org.eclipse.sirius.diagram.description.filter.FilterPackage;
 import org.eclipse.sirius.diagram.description.filter.impl.FilterPackageImpl;
-import org.eclipse.sirius.diagram.description.validation.ValidationPackage;
-import org.eclipse.sirius.diagram.description.validation.impl.ValidationPackageImpl;
 import org.eclipse.sirius.diagram.impl.DiagramPackageImpl;
 import org.eclipse.sirius.viewpoint.ViewpointPackage;
 import org.eclipse.sirius.viewpoint.description.AbstractMappingImport;
@@ -45,7 +43,6 @@ import org.eclipse.sirius.viewpoint.description.DecorationDescriptionsSet;
 import org.eclipse.sirius.viewpoint.description.DescriptionFactory;
 import org.eclipse.sirius.viewpoint.description.DescriptionPackage;
 import org.eclipse.sirius.viewpoint.description.DocumentedElement;
-import org.eclipse.sirius.viewpoint.description.DragAndDropTargetDescription;
 import org.eclipse.sirius.viewpoint.description.EAttributeCustomization;
 import org.eclipse.sirius.viewpoint.description.EReferenceCustomization;
 import org.eclipse.sirius.viewpoint.description.EStructuralFeatureCustomization;
@@ -210,13 +207,6 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP
      * 
      * @generated
      */
-    private EClass dragAndDropTargetDescriptionEClass = null;
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
     private EClass pasteTargetDescriptionEClass = null;
 
     /**
@@ -511,6 +501,9 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP
                 .getEPackage(StylePackage.eNS_URI) : StylePackage.eINSTANCE);
         ToolPackageImpl theToolPackage = (ToolPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ToolPackage.eNS_URI) instanceof ToolPackageImpl ? EPackage.Registry.INSTANCE
                 .getEPackage(ToolPackage.eNS_URI) : ToolPackage.eINSTANCE);
+        org.eclipse.sirius.viewpoint.description.validation.impl.ValidationPackageImpl theValidationPackage = (org.eclipse.sirius.viewpoint.description.validation.impl.ValidationPackageImpl) (EPackage.Registry.INSTANCE
+                .getEPackage(org.eclipse.sirius.viewpoint.description.validation.ValidationPackage.eNS_URI) instanceof org.eclipse.sirius.viewpoint.description.validation.impl.ValidationPackageImpl ? EPackage.Registry.INSTANCE
+                .getEPackage(org.eclipse.sirius.viewpoint.description.validation.ValidationPackage.eNS_URI) : org.eclipse.sirius.viewpoint.description.validation.ValidationPackage.eINSTANCE);
         AuditPackageImpl theAuditPackage = (AuditPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(AuditPackage.eNS_URI) instanceof AuditPackageImpl ? EPackage.Registry.INSTANCE
                 .getEPackage(AuditPackage.eNS_URI) : AuditPackage.eINSTANCE);
         DiagramPackageImpl theDiagramPackage = (DiagramPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(DiagramPackage.eNS_URI) instanceof DiagramPackageImpl ? EPackage.Registry.INSTANCE
@@ -526,8 +519,6 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP
                 .getEPackage(org.eclipse.sirius.diagram.description.tool.ToolPackage.eNS_URI) : org.eclipse.sirius.diagram.description.tool.ToolPackage.eINSTANCE);
         FilterPackageImpl theFilterPackage = (FilterPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(FilterPackage.eNS_URI) instanceof FilterPackageImpl ? EPackage.Registry.INSTANCE
                 .getEPackage(FilterPackage.eNS_URI) : FilterPackage.eINSTANCE);
-        ValidationPackageImpl theValidationPackage = (ValidationPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ValidationPackage.eNS_URI) instanceof ValidationPackageImpl ? EPackage.Registry.INSTANCE
-                .getEPackage(ValidationPackage.eNS_URI) : ValidationPackage.eINSTANCE);
         ConcernPackageImpl theConcernPackage = (ConcernPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ConcernPackage.eNS_URI) instanceof ConcernPackageImpl ? EPackage.Registry.INSTANCE
                 .getEPackage(ConcernPackage.eNS_URI) : ConcernPackage.eINSTANCE);
 
@@ -536,13 +527,13 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP
         theViewpointPackage.createPackageContents();
         theStylePackage.createPackageContents();
         theToolPackage.createPackageContents();
+        theValidationPackage.createPackageContents();
         theAuditPackage.createPackageContents();
         theDiagramPackage.createPackageContents();
         theDescriptionPackage_1.createPackageContents();
         theStylePackage_1.createPackageContents();
         theToolPackage_1.createPackageContents();
         theFilterPackage.createPackageContents();
-        theValidationPackage.createPackageContents();
         theConcernPackage.createPackageContents();
 
         // Initialize created meta-data
@@ -550,13 +541,13 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP
         theViewpointPackage.initializePackageContents();
         theStylePackage.initializePackageContents();
         theToolPackage.initializePackageContents();
+        theValidationPackage.initializePackageContents();
         theAuditPackage.initializePackageContents();
         theDiagramPackage.initializePackageContents();
         theDescriptionPackage_1.initializePackageContents();
         theStylePackage_1.initializePackageContents();
         theToolPackage_1.initializePackageContents();
         theFilterPackage.initializePackageContents();
-        theValidationPackage.initializePackageContents();
         theConcernPackage.initializePackageContents();
 
         // Mark meta-data to indicate it can't be changed
@@ -1058,24 +1049,6 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP
      * 
      * @generated
      */
-    public EClass getDragAndDropTargetDescription() {
-        return dragAndDropTargetDescriptionEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    public EReference getDragAndDropTargetDescription_DropDescriptions() {
-        return (EReference) dragAndDropTargetDescriptionEClass.getEStructuralFeatures().get(0);
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
     public EClass getPasteTargetDescription() {
         return pasteTargetDescriptionEClass;
     }
@@ -1935,9 +1908,6 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP
         conditionalStyleDescriptionEClass = createEClass(CONDITIONAL_STYLE_DESCRIPTION);
         createEAttribute(conditionalStyleDescriptionEClass, CONDITIONAL_STYLE_DESCRIPTION__PREDICATE_EXPRESSION);
 
-        dragAndDropTargetDescriptionEClass = createEClass(DRAG_AND_DROP_TARGET_DESCRIPTION);
-        createEReference(dragAndDropTargetDescriptionEClass, DRAG_AND_DROP_TARGET_DESCRIPTION__DROP_DESCRIPTIONS);
-
         pasteTargetDescriptionEClass = createEClass(PASTE_TARGET_DESCRIPTION);
         createEReference(pasteTargetDescriptionEClass, PASTE_TARGET_DESCRIPTION__PASTE_DESCRIPTIONS);
 
@@ -2082,13 +2052,15 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP
         // Obtain other dependent packages
         StylePackage theStylePackage = (StylePackage) EPackage.Registry.INSTANCE.getEPackage(StylePackage.eNS_URI);
         ToolPackage theToolPackage = (ToolPackage) EPackage.Registry.INSTANCE.getEPackage(ToolPackage.eNS_URI);
+        org.eclipse.sirius.viewpoint.description.validation.ValidationPackage theValidationPackage = (org.eclipse.sirius.viewpoint.description.validation.ValidationPackage) EPackage.Registry.INSTANCE
+                .getEPackage(org.eclipse.sirius.viewpoint.description.validation.ValidationPackage.eNS_URI);
         AuditPackage theAuditPackage = (AuditPackage) EPackage.Registry.INSTANCE.getEPackage(AuditPackage.eNS_URI);
         EcorePackage theEcorePackage = (EcorePackage) EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
-        ValidationPackage theValidationPackage = (ValidationPackage) EPackage.Registry.INSTANCE.getEPackage(ValidationPackage.eNS_URI);
 
         // Add subpackages
         getESubpackages().add(theStylePackage);
         getESubpackages().add(theToolPackage);
+        getESubpackages().add(theValidationPackage);
         getESubpackages().add(theAuditPackage);
 
         // Create type parameters
@@ -2247,10 +2219,6 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP
         addEParameter(op, theEcorePackage.getEObject(), "viewVariable", 0, 1, IS_UNIQUE, IS_ORDERED);
         addEParameter(op, theEcorePackage.getEObject(), "containerVariable", 0, 1, IS_UNIQUE, IS_ORDERED);
 
-        initEClass(dragAndDropTargetDescriptionEClass, DragAndDropTargetDescription.class, "DragAndDropTargetDescription", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getDragAndDropTargetDescription_DropDescriptions(), theToolPackage.getContainerDropDescription(), null, "dropDescriptions", null, 0, -1, DragAndDropTargetDescription.class,
-                !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
         initEClass(pasteTargetDescriptionEClass, PasteTargetDescription.class, "PasteTargetDescription", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
         initEReference(getPasteTargetDescription_PasteDescriptions(), theToolPackage.getPasteDescription(), null, "pasteDescriptions", null, 0, -1, PasteTargetDescription.class, !IS_TRANSIENT,
                 !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/ViewpointImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/ViewpointImpl.java
index 4df854cbc4..132225c4ad 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/ViewpointImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/ViewpointImpl.java
@@ -24,7 +24,6 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.sirius.diagram.description.validation.ValidationSet;
 import org.eclipse.sirius.viewpoint.description.Component;
 import org.eclipse.sirius.viewpoint.description.DescriptionPackage;
 import org.eclipse.sirius.viewpoint.description.EndUserDocumentedElement;
@@ -36,6 +35,7 @@ import org.eclipse.sirius.viewpoint.description.RepresentationDescription;
 import org.eclipse.sirius.viewpoint.description.RepresentationExtensionDescription;
 import org.eclipse.sirius.viewpoint.description.RepresentationTemplate;
 import org.eclipse.sirius.viewpoint.description.Viewpoint;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationSet;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model object '
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/style/TooltipStyleDescription.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/style/TooltipStyleDescription.java
index 398a4a5f16..178d5ef082 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/style/TooltipStyleDescription.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/style/TooltipStyleDescription.java
@@ -18,14 +18,15 @@ import org.eclipse.emf.ecore.EObject;
  * <em><b>Tooltip Style Description</b></em>'.
  * 
  * @since 0.9.0<!-- end-user-doc -->
- * <p>
- * The following features are supported:
- * <ul>
- * <li>
- * {@link org.eclipse.sirius.viewpoint.description.style.TooltipStyleDescription#getTooltipExpression
- * <em>Tooltip Expression</em>}</li>
- * </ul>
- * </p>
+ * 
+ *        <p>
+ *        The following features are supported:
+ *        <ul>
+ *        <li>
+ *        {@link org.eclipse.sirius.viewpoint.description.style.TooltipStyleDescription#getTooltipExpression
+ *        <em>Tooltip Expression</em>}</li>
+ *        </ul>
+ *        </p>
  * 
  * @see org.eclipse.sirius.viewpoint.description.style.StylePackage#getTooltipStyleDescription()
  * @model
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/style/impl/StylePackageImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/style/impl/StylePackageImpl.java
index 5653b343af..56678ffd00 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/style/impl/StylePackageImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/style/impl/StylePackageImpl.java
@@ -22,8 +22,6 @@ import org.eclipse.sirius.diagram.description.concern.ConcernPackage;
 import org.eclipse.sirius.diagram.description.concern.impl.ConcernPackageImpl;
 import org.eclipse.sirius.diagram.description.filter.FilterPackage;
 import org.eclipse.sirius.diagram.description.filter.impl.FilterPackageImpl;
-import org.eclipse.sirius.diagram.description.validation.ValidationPackage;
-import org.eclipse.sirius.diagram.description.validation.impl.ValidationPackageImpl;
 import org.eclipse.sirius.diagram.impl.DiagramPackageImpl;
 import org.eclipse.sirius.viewpoint.ViewpointPackage;
 import org.eclipse.sirius.viewpoint.description.DescriptionPackage;
@@ -151,6 +149,9 @@ public class StylePackageImpl extends EPackageImpl implements StylePackage {
                 .getEPackage(DescriptionPackage.eNS_URI) : DescriptionPackage.eINSTANCE);
         ToolPackageImpl theToolPackage = (ToolPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ToolPackage.eNS_URI) instanceof ToolPackageImpl ? EPackage.Registry.INSTANCE
                 .getEPackage(ToolPackage.eNS_URI) : ToolPackage.eINSTANCE);
+        org.eclipse.sirius.viewpoint.description.validation.impl.ValidationPackageImpl theValidationPackage = (org.eclipse.sirius.viewpoint.description.validation.impl.ValidationPackageImpl) (EPackage.Registry.INSTANCE
+                .getEPackage(org.eclipse.sirius.viewpoint.description.validation.ValidationPackage.eNS_URI) instanceof org.eclipse.sirius.viewpoint.description.validation.impl.ValidationPackageImpl ? EPackage.Registry.INSTANCE
+                .getEPackage(org.eclipse.sirius.viewpoint.description.validation.ValidationPackage.eNS_URI) : org.eclipse.sirius.viewpoint.description.validation.ValidationPackage.eINSTANCE);
         AuditPackageImpl theAuditPackage = (AuditPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(AuditPackage.eNS_URI) instanceof AuditPackageImpl ? EPackage.Registry.INSTANCE
                 .getEPackage(AuditPackage.eNS_URI) : AuditPackage.eINSTANCE);
         DiagramPackageImpl theDiagramPackage = (DiagramPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(DiagramPackage.eNS_URI) instanceof DiagramPackageImpl ? EPackage.Registry.INSTANCE
@@ -166,8 +167,6 @@ public class StylePackageImpl extends EPackageImpl implements StylePackage {
                 .getEPackage(org.eclipse.sirius.diagram.description.tool.ToolPackage.eNS_URI) : org.eclipse.sirius.diagram.description.tool.ToolPackage.eINSTANCE);
         FilterPackageImpl theFilterPackage = (FilterPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(FilterPackage.eNS_URI) instanceof FilterPackageImpl ? EPackage.Registry.INSTANCE
                 .getEPackage(FilterPackage.eNS_URI) : FilterPackage.eINSTANCE);
-        ValidationPackageImpl theValidationPackage = (ValidationPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ValidationPackage.eNS_URI) instanceof ValidationPackageImpl ? EPackage.Registry.INSTANCE
-                .getEPackage(ValidationPackage.eNS_URI) : ValidationPackage.eINSTANCE);
         ConcernPackageImpl theConcernPackage = (ConcernPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ConcernPackage.eNS_URI) instanceof ConcernPackageImpl ? EPackage.Registry.INSTANCE
                 .getEPackage(ConcernPackage.eNS_URI) : ConcernPackage.eINSTANCE);
 
@@ -176,13 +175,13 @@ public class StylePackageImpl extends EPackageImpl implements StylePackage {
         theViewpointPackage.createPackageContents();
         theDescriptionPackage.createPackageContents();
         theToolPackage.createPackageContents();
+        theValidationPackage.createPackageContents();
         theAuditPackage.createPackageContents();
         theDiagramPackage.createPackageContents();
         theDescriptionPackage_1.createPackageContents();
         theStylePackage_1.createPackageContents();
         theToolPackage_1.createPackageContents();
         theFilterPackage.createPackageContents();
-        theValidationPackage.createPackageContents();
         theConcernPackage.createPackageContents();
 
         // Initialize created meta-data
@@ -190,13 +189,13 @@ public class StylePackageImpl extends EPackageImpl implements StylePackage {
         theViewpointPackage.initializePackageContents();
         theDescriptionPackage.initializePackageContents();
         theToolPackage.initializePackageContents();
+        theValidationPackage.initializePackageContents();
         theAuditPackage.initializePackageContents();
         theDiagramPackage.initializePackageContents();
         theDescriptionPackage_1.initializePackageContents();
         theStylePackage_1.initializePackageContents();
         theToolPackage_1.initializePackageContents();
         theFilterPackage.initializePackageContents();
-        theValidationPackage.initializePackageContents();
         theConcernPackage.initializePackageContents();
 
         // Mark meta-data to indicate it can't be changed
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/ToolFactory.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/ToolFactory.java
index 8bd8c04fde..55a2f0a660 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/ToolFactory.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/ToolFactory.java
@@ -39,15 +39,6 @@ public interface ToolFactory extends EFactory {
     ToolDescription createToolDescription();
 
     /**
-     * Returns a new object of class '<em>Container Drop Description</em>'. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @return a new object of class '<em>Container Drop Description</em>'.
-     * @generated
-     */
-    ContainerDropDescription createContainerDropDescription();
-
-    /**
      * Returns a new object of class '<em>Paste Description</em>'. <!--
      * begin-user-doc --> <!-- end-user-doc -->
      * 
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/ToolPackage.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/ToolPackage.java
index 4a3ff762ed..b37debeeca 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/ToolPackage.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/ToolPackage.java
@@ -375,154 +375,6 @@ public interface ToolPackage extends EPackage {
 
     /**
      * The meta object id for the '
-     * {@link org.eclipse.sirius.viewpoint.description.tool.impl.ContainerDropDescriptionImpl
-     * <em>Container Drop Description</em>}' class. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * 
-     * @see org.eclipse.sirius.viewpoint.description.tool.impl.ContainerDropDescriptionImpl
-     * @see org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl#getContainerDropDescription()
-     * @generated
-     */
-    int CONTAINER_DROP_DESCRIPTION = 4;
-
-    /**
-     * The feature id for the '<em><b>Documentation</b></em>' attribute. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     * @ordered
-     */
-    int CONTAINER_DROP_DESCRIPTION__DOCUMENTATION = MAPPING_BASED_TOOL_DESCRIPTION__DOCUMENTATION;
-
-    /**
-     * The feature id for the '<em><b>Name</b></em>' attribute. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     * @ordered
-     */
-    int CONTAINER_DROP_DESCRIPTION__NAME = MAPPING_BASED_TOOL_DESCRIPTION__NAME;
-
-    /**
-     * The feature id for the '<em><b>Label</b></em>' attribute. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     * @ordered
-     */
-    int CONTAINER_DROP_DESCRIPTION__LABEL = MAPPING_BASED_TOOL_DESCRIPTION__LABEL;
-
-    /**
-     * The feature id for the '<em><b>Precondition</b></em>' attribute. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     * @ordered
-     */
-    int CONTAINER_DROP_DESCRIPTION__PRECONDITION = MAPPING_BASED_TOOL_DESCRIPTION__PRECONDITION;
-
-    /**
-     * The feature id for the '<em><b>Force Refresh</b></em>' attribute. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     * @ordered
-     */
-    int CONTAINER_DROP_DESCRIPTION__FORCE_REFRESH = MAPPING_BASED_TOOL_DESCRIPTION__FORCE_REFRESH;
-
-    /**
-     * The feature id for the '<em><b>Filters</b></em>' containment reference
-     * list. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     * @ordered
-     */
-    int CONTAINER_DROP_DESCRIPTION__FILTERS = MAPPING_BASED_TOOL_DESCRIPTION__FILTERS;
-
-    /**
-     * The feature id for the '<em><b>Mappings</b></em>' reference list. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     * @ordered
-     */
-    int CONTAINER_DROP_DESCRIPTION__MAPPINGS = MAPPING_BASED_TOOL_DESCRIPTION_FEATURE_COUNT + 0;
-
-    /**
-     * The feature id for the '<em><b>Old Container</b></em>' containment
-     * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     * @ordered
-     */
-    int CONTAINER_DROP_DESCRIPTION__OLD_CONTAINER = MAPPING_BASED_TOOL_DESCRIPTION_FEATURE_COUNT + 1;
-
-    /**
-     * The feature id for the '<em><b>New Container</b></em>' containment
-     * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     * @ordered
-     */
-    int CONTAINER_DROP_DESCRIPTION__NEW_CONTAINER = MAPPING_BASED_TOOL_DESCRIPTION_FEATURE_COUNT + 2;
-
-    /**
-     * The feature id for the '<em><b>Element</b></em>' containment reference.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     * @ordered
-     */
-    int CONTAINER_DROP_DESCRIPTION__ELEMENT = MAPPING_BASED_TOOL_DESCRIPTION_FEATURE_COUNT + 3;
-
-    /**
-     * The feature id for the '<em><b>New View Container</b></em>' containment
-     * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     * @ordered
-     */
-    int CONTAINER_DROP_DESCRIPTION__NEW_VIEW_CONTAINER = MAPPING_BASED_TOOL_DESCRIPTION_FEATURE_COUNT + 4;
-
-    /**
-     * The feature id for the '<em><b>Initial Operation</b></em>' containment
-     * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     * @ordered
-     */
-    int CONTAINER_DROP_DESCRIPTION__INITIAL_OPERATION = MAPPING_BASED_TOOL_DESCRIPTION_FEATURE_COUNT + 5;
-
-    /**
-     * The feature id for the '<em><b>Drag Source</b></em>' attribute. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     * @ordered
-     */
-    int CONTAINER_DROP_DESCRIPTION__DRAG_SOURCE = MAPPING_BASED_TOOL_DESCRIPTION_FEATURE_COUNT + 6;
-
-    /**
-     * The feature id for the '<em><b>Move Edges</b></em>' attribute. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     * @ordered
-     */
-    int CONTAINER_DROP_DESCRIPTION__MOVE_EDGES = MAPPING_BASED_TOOL_DESCRIPTION_FEATURE_COUNT + 7;
-
-    /**
-     * The number of structural features of the '
-     * <em>Container Drop Description</em>' class. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * 
-     * @generated
-     * @ordered
-     */
-    int CONTAINER_DROP_DESCRIPTION_FEATURE_COUNT = MAPPING_BASED_TOOL_DESCRIPTION_FEATURE_COUNT + 8;
-
-    /**
-     * The meta object id for the '
      * {@link org.eclipse.sirius.viewpoint.description.tool.impl.PasteDescriptionImpl
      * <em>Paste Description</em>}' class. <!-- begin-user-doc --> <!--
      * end-user-doc -->
@@ -531,7 +383,7 @@ public interface ToolPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl#getPasteDescription()
      * @generated
      */
-    int PASTE_DESCRIPTION = 5;
+    int PASTE_DESCRIPTION = 4;
 
     /**
      * The feature id for the '<em><b>Documentation</b></em>' attribute. <!--
@@ -651,7 +503,7 @@ public interface ToolPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl#getSelectionWizardDescription()
      * @generated
      */
-    int SELECTION_WIZARD_DESCRIPTION = 6;
+    int SELECTION_WIZARD_DESCRIPTION = 5;
 
     /**
      * The feature id for the '<em><b>Documentation</b></em>' attribute. <!--
@@ -844,7 +696,7 @@ public interface ToolPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl#getPaneBasedSelectionWizardDescription()
      * @generated
      */
-    int PANE_BASED_SELECTION_WIZARD_DESCRIPTION = 7;
+    int PANE_BASED_SELECTION_WIZARD_DESCRIPTION = 6;
 
     /**
      * The feature id for the '<em><b>Documentation</b></em>' attribute. <!--
@@ -1056,7 +908,7 @@ public interface ToolPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl#getRepresentationCreationDescription()
      * @generated
      */
-    int REPRESENTATION_CREATION_DESCRIPTION = 8;
+    int REPRESENTATION_CREATION_DESCRIPTION = 7;
 
     /**
      * The feature id for the '<em><b>Documentation</b></em>' attribute. <!--
@@ -1186,7 +1038,7 @@ public interface ToolPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl#getRepresentationNavigationDescription()
      * @generated
      */
-    int REPRESENTATION_NAVIGATION_DESCRIPTION = 9;
+    int REPRESENTATION_NAVIGATION_DESCRIPTION = 8;
 
     /**
      * The feature id for the '<em><b>Documentation</b></em>' attribute. <!--
@@ -1316,7 +1168,7 @@ public interface ToolPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl#getMenuItemOrRef()
      * @generated
      */
-    int MENU_ITEM_OR_REF = 10;
+    int MENU_ITEM_OR_REF = 9;
 
     /**
      * The number of structural features of the '<em>Menu Item Or Ref</em>'
@@ -1337,7 +1189,7 @@ public interface ToolPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl#getMenuItemDescription()
      * @generated
      */
-    int MENU_ITEM_DESCRIPTION = 11;
+    int MENU_ITEM_DESCRIPTION = 10;
 
     /**
      * The feature id for the '<em><b>Documentation</b></em>' attribute. <!--
@@ -1421,7 +1273,7 @@ public interface ToolPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl#getMenuItemDescriptionReference()
      * @generated
      */
-    int MENU_ITEM_DESCRIPTION_REFERENCE = 12;
+    int MENU_ITEM_DESCRIPTION_REFERENCE = 11;
 
     /**
      * The feature id for the '<em><b>Item</b></em>' reference. <!--
@@ -1452,7 +1304,7 @@ public interface ToolPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl#getOperationAction()
      * @generated
      */
-    int OPERATION_ACTION = 13;
+    int OPERATION_ACTION = 12;
 
     /**
      * The feature id for the '<em><b>Documentation</b></em>' attribute. <!--
@@ -1554,7 +1406,7 @@ public interface ToolPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl#getExternalJavaAction()
      * @generated
      */
-    int EXTERNAL_JAVA_ACTION = 14;
+    int EXTERNAL_JAVA_ACTION = 13;
 
     /**
      * The feature id for the '<em><b>Documentation</b></em>' attribute. <!--
@@ -1665,7 +1517,7 @@ public interface ToolPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl#getExternalJavaActionCall()
      * @generated
      */
-    int EXTERNAL_JAVA_ACTION_CALL = 15;
+    int EXTERNAL_JAVA_ACTION_CALL = 14;
 
     /**
      * The feature id for the '<em><b>Documentation</b></em>' attribute. <!--
@@ -1768,7 +1620,7 @@ public interface ToolPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl#getPopupMenu()
      * @generated
      */
-    int POPUP_MENU = 16;
+    int POPUP_MENU = 15;
 
     /**
      * The feature id for the '<em><b>Documentation</b></em>' attribute. <!--
@@ -1852,7 +1704,7 @@ public interface ToolPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl#getAbstractVariable()
      * @generated
      */
-    int ABSTRACT_VARIABLE = 17;
+    int ABSTRACT_VARIABLE = 16;
 
     /**
      * The feature id for the '<em><b>Name</b></em>' attribute. <!--
@@ -1882,7 +1734,7 @@ public interface ToolPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl#getVariableContainer()
      * @generated
      */
-    int VARIABLE_CONTAINER = 18;
+    int VARIABLE_CONTAINER = 17;
 
     /**
      * The feature id for the '<em><b>Sub Variables</b></em>' containment
@@ -1912,7 +1764,7 @@ public interface ToolPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl#getAcceleoVariable()
      * @generated
      */
-    int ACCELEO_VARIABLE = 19;
+    int ACCELEO_VARIABLE = 18;
 
     /**
      * The feature id for the '<em><b>Sub Variables</b></em>' containment
@@ -1960,7 +1812,7 @@ public interface ToolPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl#getSubVariable()
      * @generated
      */
-    int SUB_VARIABLE = 20;
+    int SUB_VARIABLE = 19;
 
     /**
      * The feature id for the '<em><b>Name</b></em>' attribute. <!--
@@ -1990,7 +1842,7 @@ public interface ToolPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl#getDialogVariable()
      * @generated
      */
-    int DIALOG_VARIABLE = 21;
+    int DIALOG_VARIABLE = 20;
 
     /**
      * The feature id for the '<em><b>Name</b></em>' attribute. <!--
@@ -2029,7 +1881,7 @@ public interface ToolPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl#getElementDropVariable()
      * @generated
      */
-    int ELEMENT_DROP_VARIABLE = 22;
+    int ELEMENT_DROP_VARIABLE = 21;
 
     /**
      * The feature id for the '<em><b>Name</b></em>' attribute. <!--
@@ -2068,7 +1920,7 @@ public interface ToolPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl#getElementSelectVariable()
      * @generated
      */
-    int ELEMENT_SELECT_VARIABLE = 23;
+    int ELEMENT_SELECT_VARIABLE = 22;
 
     /**
      * The feature id for the '<em><b>Name</b></em>' attribute. <!--
@@ -2099,7 +1951,7 @@ public interface ToolPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl#getElementVariable()
      * @generated
      */
-    int ELEMENT_VARIABLE = 24;
+    int ELEMENT_VARIABLE = 23;
 
     /**
      * The feature id for the '<em><b>Name</b></em>' attribute. <!--
@@ -2138,7 +1990,7 @@ public interface ToolPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl#getElementViewVariable()
      * @generated
      */
-    int ELEMENT_VIEW_VARIABLE = 25;
+    int ELEMENT_VIEW_VARIABLE = 24;
 
     /**
      * The feature id for the '<em><b>Name</b></em>' attribute. <!--
@@ -2177,7 +2029,7 @@ public interface ToolPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl#getElementDeleteVariable()
      * @generated
      */
-    int ELEMENT_DELETE_VARIABLE = 26;
+    int ELEMENT_DELETE_VARIABLE = 25;
 
     /**
      * The feature id for the '<em><b>Name</b></em>' attribute. <!--
@@ -2217,7 +2069,7 @@ public interface ToolPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl#getDropContainerVariable()
      * @generated
      */
-    int DROP_CONTAINER_VARIABLE = 27;
+    int DROP_CONTAINER_VARIABLE = 26;
 
     /**
      * The feature id for the '<em><b>Name</b></em>' attribute. <!--
@@ -2257,7 +2109,7 @@ public interface ToolPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl#getSelectContainerVariable()
      * @generated
      */
-    int SELECT_CONTAINER_VARIABLE = 28;
+    int SELECT_CONTAINER_VARIABLE = 27;
 
     /**
      * The feature id for the '<em><b>Name</b></em>' attribute. <!--
@@ -2297,7 +2149,7 @@ public interface ToolPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl#getContainerViewVariable()
      * @generated
      */
-    int CONTAINER_VIEW_VARIABLE = 29;
+    int CONTAINER_VIEW_VARIABLE = 28;
 
     /**
      * The feature id for the '<em><b>Name</b></em>' attribute. <!--
@@ -2337,7 +2189,7 @@ public interface ToolPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl#getSelectModelElementVariable()
      * @generated
      */
-    int SELECT_MODEL_ELEMENT_VARIABLE = 30;
+    int SELECT_MODEL_ELEMENT_VARIABLE = 29;
 
     /**
      * The feature id for the '<em><b>Name</b></em>' attribute. <!--
@@ -2422,7 +2274,7 @@ public interface ToolPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl#getEditMaskVariables()
      * @generated
      */
-    int EDIT_MASK_VARIABLES = 31;
+    int EDIT_MASK_VARIABLES = 30;
 
     /**
      * The feature id for the '<em><b>Mask</b></em>' attribute. <!--
@@ -2452,7 +2304,7 @@ public interface ToolPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl#getModelOperation()
      * @generated
      */
-    int MODEL_OPERATION = 33;
+    int MODEL_OPERATION = 32;
 
     /**
      * The number of structural features of the '<em>Model Operation</em>'
@@ -2473,7 +2325,7 @@ public interface ToolPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl#getContainerModelOperation()
      * @generated
      */
-    int CONTAINER_MODEL_OPERATION = 32;
+    int CONTAINER_MODEL_OPERATION = 31;
 
     /**
      * The feature id for the '<em><b>Sub Model Operations</b></em>' containment
@@ -2504,7 +2356,7 @@ public interface ToolPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl#getInitialNodeCreationOperation()
      * @generated
      */
-    int INITIAL_NODE_CREATION_OPERATION = 34;
+    int INITIAL_NODE_CREATION_OPERATION = 33;
 
     /**
      * The feature id for the '<em><b>First Model Operations</b></em>'
@@ -2535,7 +2387,7 @@ public interface ToolPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl#getInitialOperation()
      * @generated
      */
-    int INITIAL_OPERATION = 35;
+    int INITIAL_OPERATION = 34;
 
     /**
      * The feature id for the '<em><b>First Model Operations</b></em>'
@@ -2565,7 +2417,7 @@ public interface ToolPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl#getInitEdgeCreationOperation()
      * @generated
      */
-    int INIT_EDGE_CREATION_OPERATION = 36;
+    int INIT_EDGE_CREATION_OPERATION = 35;
 
     /**
      * The feature id for the '<em><b>First Model Operations</b></em>'
@@ -2596,7 +2448,7 @@ public interface ToolPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl#getInitialContainerDropOperation()
      * @generated
      */
-    int INITIAL_CONTAINER_DROP_OPERATION = 37;
+    int INITIAL_CONTAINER_DROP_OPERATION = 36;
 
     /**
      * The feature id for the '<em><b>First Model Operations</b></em>'
@@ -2627,7 +2479,7 @@ public interface ToolPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl#getCreateInstance()
      * @generated
      */
-    int CREATE_INSTANCE = 38;
+    int CREATE_INSTANCE = 37;
 
     /**
      * The feature id for the '<em><b>Sub Model Operations</b></em>' containment
@@ -2684,7 +2536,7 @@ public interface ToolPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl#getChangeContext()
      * @generated
      */
-    int CHANGE_CONTEXT = 39;
+    int CHANGE_CONTEXT = 38;
 
     /**
      * The feature id for the '<em><b>Sub Model Operations</b></em>' containment
@@ -2722,7 +2574,7 @@ public interface ToolPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl#getSetValue()
      * @generated
      */
-    int SET_VALUE = 40;
+    int SET_VALUE = 39;
 
     /**
      * The feature id for the '<em><b>Sub Model Operations</b></em>' containment
@@ -2770,7 +2622,7 @@ public interface ToolPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl#getSetObject()
      * @generated
      */
-    int SET_OBJECT = 41;
+    int SET_OBJECT = 40;
 
     /**
      * The feature id for the '<em><b>Sub Model Operations</b></em>' containment
@@ -2817,7 +2669,7 @@ public interface ToolPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl#getUnset()
      * @generated
      */
-    int UNSET = 42;
+    int UNSET = 41;
 
     /**
      * The feature id for the '<em><b>Sub Model Operations</b></em>' containment
@@ -2865,7 +2717,7 @@ public interface ToolPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl#getMoveElement()
      * @generated
      */
-    int MOVE_ELEMENT = 43;
+    int MOVE_ELEMENT = 42;
 
     /**
      * The feature id for the '<em><b>Sub Model Operations</b></em>' containment
@@ -2913,7 +2765,7 @@ public interface ToolPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl#getRemoveElement()
      * @generated
      */
-    int REMOVE_ELEMENT = 44;
+    int REMOVE_ELEMENT = 43;
 
     /**
      * The feature id for the '<em><b>Sub Model Operations</b></em>' containment
@@ -2942,7 +2794,7 @@ public interface ToolPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl#getFor()
      * @generated
      */
-    int FOR = 45;
+    int FOR = 44;
 
     /**
      * The feature id for the '<em><b>Sub Model Operations</b></em>' containment
@@ -2989,7 +2841,7 @@ public interface ToolPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl#getIf()
      * @generated
      */
-    int IF = 46;
+    int IF = 45;
 
     /**
      * The feature id for the '<em><b>Sub Model Operations</b></em>' containment
@@ -3028,7 +2880,7 @@ public interface ToolPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl#getDeleteView()
      * @generated
      */
-    int DELETE_VIEW = 47;
+    int DELETE_VIEW = 46;
 
     /**
      * The feature id for the '<em><b>Sub Model Operations</b></em>' containment
@@ -3058,7 +2910,7 @@ public interface ToolPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl#getNameVariable()
      * @generated
      */
-    int NAME_VARIABLE = 48;
+    int NAME_VARIABLE = 47;
 
     /**
      * The feature id for the '<em><b>Name</b></em>' attribute. <!--
@@ -3088,7 +2940,7 @@ public interface ToolPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl#getExternalJavaActionParameter()
      * @generated
      */
-    int EXTERNAL_JAVA_ACTION_PARAMETER = 49;
+    int EXTERNAL_JAVA_ACTION_PARAMETER = 48;
 
     /**
      * The feature id for the '<em><b>Name</b></em>' attribute. <!--
@@ -3128,7 +2980,7 @@ public interface ToolPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl#getToolFilterDescription()
      * @generated
      */
-    int TOOL_FILTER_DESCRIPTION = 50;
+    int TOOL_FILTER_DESCRIPTION = 49;
 
     /**
      * The feature id for the '<em><b>Precondition</b></em>' attribute. <!--
@@ -3176,7 +3028,7 @@ public interface ToolPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl#getFeatureChangeListener()
      * @generated
      */
-    int FEATURE_CHANGE_LISTENER = 51;
+    int FEATURE_CHANGE_LISTENER = 50;
 
     /**
      * The feature id for the '<em><b>Domain Class</b></em>' attribute. <!--
@@ -3216,7 +3068,7 @@ public interface ToolPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl#getSwitchChild()
      * @generated
      */
-    int SWITCH_CHILD = 53;
+    int SWITCH_CHILD = 52;
 
     /**
      * The feature id for the '<em><b>Sub Model Operations</b></em>' containment
@@ -3245,7 +3097,7 @@ public interface ToolPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl#getCase()
      * @generated
      */
-    int CASE = 52;
+    int CASE = 51;
 
     /**
      * The feature id for the '<em><b>Sub Model Operations</b></em>' containment
@@ -3283,7 +3135,7 @@ public interface ToolPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl#getDefault()
      * @generated
      */
-    int DEFAULT = 54;
+    int DEFAULT = 53;
 
     /**
      * The feature id for the '<em><b>Sub Model Operations</b></em>' containment
@@ -3312,7 +3164,7 @@ public interface ToolPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl#getSwitch()
      * @generated
      */
-    int SWITCH = 55;
+    int SWITCH = 54;
 
     /**
      * The feature id for the '<em><b>Cases</b></em>' containment reference
@@ -3351,7 +3203,7 @@ public interface ToolPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl#getDragSource()
      * @generated
      */
-    int DRAG_SOURCE = 56;
+    int DRAG_SOURCE = 55;
 
     /**
      * Returns the meta object for class '
@@ -3490,120 +3342,6 @@ public interface ToolPackage extends EPackage {
 
     /**
      * Returns the meta object for class '
-     * {@link org.eclipse.sirius.viewpoint.description.tool.ContainerDropDescription
-     * <em>Container Drop Description</em>}'. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * 
-     * @return the meta object for class '<em>Container Drop Description</em>'.
-     * @see org.eclipse.sirius.viewpoint.description.tool.ContainerDropDescription
-     * @generated
-     */
-    EClass getContainerDropDescription();
-
-    /**
-     * Returns the meta object for the reference list '
-     * {@link org.eclipse.sirius.viewpoint.description.tool.ContainerDropDescription#getMappings
-     * <em>Mappings</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @return the meta object for the reference list '<em>Mappings</em>'.
-     * @see org.eclipse.sirius.viewpoint.description.tool.ContainerDropDescription#getMappings()
-     * @see #getContainerDropDescription()
-     * @generated
-     */
-    EReference getContainerDropDescription_Mappings();
-
-    /**
-     * Returns the meta object for the containment reference '
-     * {@link org.eclipse.sirius.viewpoint.description.tool.ContainerDropDescription#getOldContainer
-     * <em>Old Container</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @return the meta object for the containment reference '
-     *         <em>Old Container</em>'.
-     * @see org.eclipse.sirius.viewpoint.description.tool.ContainerDropDescription#getOldContainer()
-     * @see #getContainerDropDescription()
-     * @generated
-     */
-    EReference getContainerDropDescription_OldContainer();
-
-    /**
-     * Returns the meta object for the containment reference '
-     * {@link org.eclipse.sirius.viewpoint.description.tool.ContainerDropDescription#getNewContainer
-     * <em>New Container</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @return the meta object for the containment reference '
-     *         <em>New Container</em>'.
-     * @see org.eclipse.sirius.viewpoint.description.tool.ContainerDropDescription#getNewContainer()
-     * @see #getContainerDropDescription()
-     * @generated
-     */
-    EReference getContainerDropDescription_NewContainer();
-
-    /**
-     * Returns the meta object for the containment reference '
-     * {@link org.eclipse.sirius.viewpoint.description.tool.ContainerDropDescription#getElement
-     * <em>Element</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @return the meta object for the containment reference '<em>Element</em>'.
-     * @see org.eclipse.sirius.viewpoint.description.tool.ContainerDropDescription#getElement()
-     * @see #getContainerDropDescription()
-     * @generated
-     */
-    EReference getContainerDropDescription_Element();
-
-    /**
-     * Returns the meta object for the containment reference '
-     * {@link org.eclipse.sirius.viewpoint.description.tool.ContainerDropDescription#getNewViewContainer
-     * <em>New View Container</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
-     * -->
-     * 
-     * @return the meta object for the containment reference '
-     *         <em>New View Container</em>'.
-     * @see org.eclipse.sirius.viewpoint.description.tool.ContainerDropDescription#getNewViewContainer()
-     * @see #getContainerDropDescription()
-     * @generated
-     */
-    EReference getContainerDropDescription_NewViewContainer();
-
-    /**
-     * Returns the meta object for the containment reference '
-     * {@link org.eclipse.sirius.viewpoint.description.tool.ContainerDropDescription#getInitialOperation
-     * <em>Initial Operation</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
-     * -->
-     * 
-     * @return the meta object for the containment reference '
-     *         <em>Initial Operation</em>'.
-     * @see org.eclipse.sirius.viewpoint.description.tool.ContainerDropDescription#getInitialOperation()
-     * @see #getContainerDropDescription()
-     * @generated
-     */
-    EReference getContainerDropDescription_InitialOperation();
-
-    /**
-     * Returns the meta object for the attribute '
-     * {@link org.eclipse.sirius.viewpoint.description.tool.ContainerDropDescription#getDragSource
-     * <em>Drag Source</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @return the meta object for the attribute '<em>Drag Source</em>'.
-     * @see org.eclipse.sirius.viewpoint.description.tool.ContainerDropDescription#getDragSource()
-     * @see #getContainerDropDescription()
-     * @generated
-     */
-    EAttribute getContainerDropDescription_DragSource();
-
-    /**
-     * Returns the meta object for the attribute '
-     * {@link org.eclipse.sirius.viewpoint.description.tool.ContainerDropDescription#isMoveEdges
-     * <em>Move Edges</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @return the meta object for the attribute '<em>Move Edges</em>'.
-     * @see org.eclipse.sirius.viewpoint.description.tool.ContainerDropDescription#isMoveEdges()
-     * @see #getContainerDropDescription()
-     * @generated
-     */
-    EAttribute getContainerDropDescription_MoveEdges();
-
-    /**
-     * Returns the meta object for class '
      * {@link org.eclipse.sirius.viewpoint.description.tool.PasteDescription
      * <em>Paste Description</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -5420,86 +5158,6 @@ public interface ToolPackage extends EPackage {
 
         /**
          * The meta object literal for the '
-         * {@link org.eclipse.sirius.viewpoint.description.tool.impl.ContainerDropDescriptionImpl
-         * <em>Container Drop Description</em>}' class. <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * 
-         * @see org.eclipse.sirius.viewpoint.description.tool.impl.ContainerDropDescriptionImpl
-         * @see org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl#getContainerDropDescription()
-         * @generated
-         */
-        EClass CONTAINER_DROP_DESCRIPTION = eINSTANCE.getContainerDropDescription();
-
-        /**
-         * The meta object literal for the '<em><b>Mappings</b></em>' reference
-         * list feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-         * 
-         * @generated
-         */
-        EReference CONTAINER_DROP_DESCRIPTION__MAPPINGS = eINSTANCE.getContainerDropDescription_Mappings();
-
-        /**
-         * The meta object literal for the '<em><b>Old Container</b></em>'
-         * containment reference feature. <!-- begin-user-doc --> <!--
-         * end-user-doc -->
-         * 
-         * @generated
-         */
-        EReference CONTAINER_DROP_DESCRIPTION__OLD_CONTAINER = eINSTANCE.getContainerDropDescription_OldContainer();
-
-        /**
-         * The meta object literal for the '<em><b>New Container</b></em>'
-         * containment reference feature. <!-- begin-user-doc --> <!--
-         * end-user-doc -->
-         * 
-         * @generated
-         */
-        EReference CONTAINER_DROP_DESCRIPTION__NEW_CONTAINER = eINSTANCE.getContainerDropDescription_NewContainer();
-
-        /**
-         * The meta object literal for the '<em><b>Element</b></em>' containment
-         * reference feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-         * 
-         * @generated
-         */
-        EReference CONTAINER_DROP_DESCRIPTION__ELEMENT = eINSTANCE.getContainerDropDescription_Element();
-
-        /**
-         * The meta object literal for the '<em><b>New View Container</b></em>'
-         * containment reference feature. <!-- begin-user-doc --> <!--
-         * end-user-doc -->
-         * 
-         * @generated
-         */
-        EReference CONTAINER_DROP_DESCRIPTION__NEW_VIEW_CONTAINER = eINSTANCE.getContainerDropDescription_NewViewContainer();
-
-        /**
-         * The meta object literal for the '<em><b>Initial Operation</b></em>'
-         * containment reference feature. <!-- begin-user-doc --> <!--
-         * end-user-doc -->
-         * 
-         * @generated
-         */
-        EReference CONTAINER_DROP_DESCRIPTION__INITIAL_OPERATION = eINSTANCE.getContainerDropDescription_InitialOperation();
-
-        /**
-         * The meta object literal for the '<em><b>Drag Source</b></em>'
-         * attribute feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-         * 
-         * @generated
-         */
-        EAttribute CONTAINER_DROP_DESCRIPTION__DRAG_SOURCE = eINSTANCE.getContainerDropDescription_DragSource();
-
-        /**
-         * The meta object literal for the '<em><b>Move Edges</b></em>'
-         * attribute feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-         * 
-         * @generated
-         */
-        EAttribute CONTAINER_DROP_DESCRIPTION__MOVE_EDGES = eINSTANCE.getContainerDropDescription_MoveEdges();
-
-        /**
-         * The meta object literal for the '
          * {@link org.eclipse.sirius.viewpoint.description.tool.impl.PasteDescriptionImpl
          * <em>Paste Description</em>}' class. <!-- begin-user-doc --> <!--
          * end-user-doc -->
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/ToolFactoryImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/ToolFactoryImpl.java
index 9926197140..4787e524d2 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/ToolFactoryImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/ToolFactoryImpl.java
@@ -20,10 +20,11 @@ import org.eclipse.emf.ecore.plugin.EcorePlugin;
 import org.eclipse.sirius.business.internal.metamodel.description.tool.spec.ContainerDropDescriptionSpec;
 import org.eclipse.sirius.business.internal.metamodel.description.tool.spec.PasteDescriptionSpec;
 import org.eclipse.sirius.common.tools.api.interpreter.IInterpreterSiriusVariables;
+import org.eclipse.sirius.diagram.description.tool.ContainerDropDescription;
+import org.eclipse.sirius.diagram.description.tool.impl.ContainerDropDescriptionImpl;
 import org.eclipse.sirius.viewpoint.description.tool.AcceleoVariable;
 import org.eclipse.sirius.viewpoint.description.tool.Case;
 import org.eclipse.sirius.viewpoint.description.tool.ChangeContext;
-import org.eclipse.sirius.viewpoint.description.tool.ContainerDropDescription;
 import org.eclipse.sirius.viewpoint.description.tool.ContainerViewVariable;
 import org.eclipse.sirius.viewpoint.description.tool.CreateInstance;
 import org.eclipse.sirius.viewpoint.description.tool.Default;
@@ -111,8 +112,6 @@ public class ToolFactoryImpl extends EFactoryImpl implements ToolFactory {
         switch (eClass.getClassifierID()) {
         case ToolPackage.TOOL_DESCRIPTION:
             return createToolDescription();
-        case ToolPackage.CONTAINER_DROP_DESCRIPTION:
-            return createContainerDropDescription();
         case ToolPackage.PASTE_DESCRIPTION:
             return createPasteDescription();
         case ToolPackage.SELECTION_WIZARD_DESCRIPTION:
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/ToolPackageImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/ToolPackageImpl.java
index de97354c72..15a26bf677 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/ToolPackageImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/ToolPackageImpl.java
@@ -14,7 +14,6 @@ package org.eclipse.sirius.viewpoint.description.tool.impl;
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EOperation;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.ecore.EcorePackage;
@@ -24,8 +23,6 @@ import org.eclipse.sirius.diagram.description.concern.ConcernPackage;
 import org.eclipse.sirius.diagram.description.concern.impl.ConcernPackageImpl;
 import org.eclipse.sirius.diagram.description.filter.FilterPackage;
 import org.eclipse.sirius.diagram.description.filter.impl.FilterPackageImpl;
-import org.eclipse.sirius.diagram.description.validation.ValidationPackage;
-import org.eclipse.sirius.diagram.description.validation.impl.ValidationPackageImpl;
 import org.eclipse.sirius.diagram.impl.DiagramPackageImpl;
 import org.eclipse.sirius.viewpoint.ViewpointPackage;
 import org.eclipse.sirius.viewpoint.description.DescriptionPackage;
@@ -39,7 +36,6 @@ import org.eclipse.sirius.viewpoint.description.tool.AbstractVariable;
 import org.eclipse.sirius.viewpoint.description.tool.AcceleoVariable;
 import org.eclipse.sirius.viewpoint.description.tool.Case;
 import org.eclipse.sirius.viewpoint.description.tool.ChangeContext;
-import org.eclipse.sirius.viewpoint.description.tool.ContainerDropDescription;
 import org.eclipse.sirius.viewpoint.description.tool.ContainerModelOperation;
 import org.eclipse.sirius.viewpoint.description.tool.ContainerViewVariable;
 import org.eclipse.sirius.viewpoint.description.tool.CreateInstance;
@@ -135,13 +131,6 @@ public class ToolPackageImpl extends EPackageImpl implements ToolPackage {
      * 
      * @generated
      */
-    private EClass containerDropDescriptionEClass = null;
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
     private EClass pasteDescriptionEClass = null;
 
     /**
@@ -561,6 +550,9 @@ public class ToolPackageImpl extends EPackageImpl implements ToolPackage {
                 .getEPackage(DescriptionPackage.eNS_URI) : DescriptionPackage.eINSTANCE);
         StylePackageImpl theStylePackage = (StylePackageImpl) (EPackage.Registry.INSTANCE.getEPackage(StylePackage.eNS_URI) instanceof StylePackageImpl ? EPackage.Registry.INSTANCE
                 .getEPackage(StylePackage.eNS_URI) : StylePackage.eINSTANCE);
+        org.eclipse.sirius.viewpoint.description.validation.impl.ValidationPackageImpl theValidationPackage = (org.eclipse.sirius.viewpoint.description.validation.impl.ValidationPackageImpl) (EPackage.Registry.INSTANCE
+                .getEPackage(org.eclipse.sirius.viewpoint.description.validation.ValidationPackage.eNS_URI) instanceof org.eclipse.sirius.viewpoint.description.validation.impl.ValidationPackageImpl ? EPackage.Registry.INSTANCE
+                .getEPackage(org.eclipse.sirius.viewpoint.description.validation.ValidationPackage.eNS_URI) : org.eclipse.sirius.viewpoint.description.validation.ValidationPackage.eINSTANCE);
         AuditPackageImpl theAuditPackage = (AuditPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(AuditPackage.eNS_URI) instanceof AuditPackageImpl ? EPackage.Registry.INSTANCE
                 .getEPackage(AuditPackage.eNS_URI) : AuditPackage.eINSTANCE);
         DiagramPackageImpl theDiagramPackage = (DiagramPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(DiagramPackage.eNS_URI) instanceof DiagramPackageImpl ? EPackage.Registry.INSTANCE
@@ -576,8 +568,6 @@ public class ToolPackageImpl extends EPackageImpl implements ToolPackage {
                 .getEPackage(org.eclipse.sirius.diagram.description.tool.ToolPackage.eNS_URI) : org.eclipse.sirius.diagram.description.tool.ToolPackage.eINSTANCE);
         FilterPackageImpl theFilterPackage = (FilterPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(FilterPackage.eNS_URI) instanceof FilterPackageImpl ? EPackage.Registry.INSTANCE
                 .getEPackage(FilterPackage.eNS_URI) : FilterPackage.eINSTANCE);
-        ValidationPackageImpl theValidationPackage = (ValidationPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ValidationPackage.eNS_URI) instanceof ValidationPackageImpl ? EPackage.Registry.INSTANCE
-                .getEPackage(ValidationPackage.eNS_URI) : ValidationPackage.eINSTANCE);
         ConcernPackageImpl theConcernPackage = (ConcernPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ConcernPackage.eNS_URI) instanceof ConcernPackageImpl ? EPackage.Registry.INSTANCE
                 .getEPackage(ConcernPackage.eNS_URI) : ConcernPackage.eINSTANCE);
 
@@ -586,13 +576,13 @@ public class ToolPackageImpl extends EPackageImpl implements ToolPackage {
         theViewpointPackage.createPackageContents();
         theDescriptionPackage.createPackageContents();
         theStylePackage.createPackageContents();
+        theValidationPackage.createPackageContents();
         theAuditPackage.createPackageContents();
         theDiagramPackage.createPackageContents();
         theDescriptionPackage_1.createPackageContents();
         theStylePackage_1.createPackageContents();
         theToolPackage_1.createPackageContents();
         theFilterPackage.createPackageContents();
-        theValidationPackage.createPackageContents();
         theConcernPackage.createPackageContents();
 
         // Initialize created meta-data
@@ -600,13 +590,13 @@ public class ToolPackageImpl extends EPackageImpl implements ToolPackage {
         theViewpointPackage.initializePackageContents();
         theDescriptionPackage.initializePackageContents();
         theStylePackage.initializePackageContents();
+        theValidationPackage.initializePackageContents();
         theAuditPackage.initializePackageContents();
         theDiagramPackage.initializePackageContents();
         theDescriptionPackage_1.initializePackageContents();
         theStylePackage_1.initializePackageContents();
         theToolPackage_1.initializePackageContents();
         theFilterPackage.initializePackageContents();
-        theValidationPackage.initializePackageContents();
         theConcernPackage.initializePackageContents();
 
         // Mark meta-data to indicate it can't be changed
@@ -721,87 +711,6 @@ public class ToolPackageImpl extends EPackageImpl implements ToolPackage {
      * 
      * @generated
      */
-    public EClass getContainerDropDescription() {
-        return containerDropDescriptionEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    public EReference getContainerDropDescription_Mappings() {
-        return (EReference) containerDropDescriptionEClass.getEStructuralFeatures().get(0);
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    public EReference getContainerDropDescription_OldContainer() {
-        return (EReference) containerDropDescriptionEClass.getEStructuralFeatures().get(1);
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    public EReference getContainerDropDescription_NewContainer() {
-        return (EReference) containerDropDescriptionEClass.getEStructuralFeatures().get(2);
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    public EReference getContainerDropDescription_Element() {
-        return (EReference) containerDropDescriptionEClass.getEStructuralFeatures().get(3);
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    public EReference getContainerDropDescription_NewViewContainer() {
-        return (EReference) containerDropDescriptionEClass.getEStructuralFeatures().get(4);
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    public EReference getContainerDropDescription_InitialOperation() {
-        return (EReference) containerDropDescriptionEClass.getEStructuralFeatures().get(5);
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    public EAttribute getContainerDropDescription_DragSource() {
-        return (EAttribute) containerDropDescriptionEClass.getEStructuralFeatures().get(6);
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    public EAttribute getContainerDropDescription_MoveEdges() {
-        return (EAttribute) containerDropDescriptionEClass.getEStructuralFeatures().get(7);
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
     public EClass getPasteDescription() {
         return pasteDescriptionEClass;
     }
@@ -2056,16 +1965,6 @@ public class ToolPackageImpl extends EPackageImpl implements ToolPackage {
         createEReference(toolDescriptionEClass, TOOL_DESCRIPTION__ELEMENT_VIEW);
         createEReference(toolDescriptionEClass, TOOL_DESCRIPTION__INITIAL_OPERATION);
 
-        containerDropDescriptionEClass = createEClass(CONTAINER_DROP_DESCRIPTION);
-        createEReference(containerDropDescriptionEClass, CONTAINER_DROP_DESCRIPTION__MAPPINGS);
-        createEReference(containerDropDescriptionEClass, CONTAINER_DROP_DESCRIPTION__OLD_CONTAINER);
-        createEReference(containerDropDescriptionEClass, CONTAINER_DROP_DESCRIPTION__NEW_CONTAINER);
-        createEReference(containerDropDescriptionEClass, CONTAINER_DROP_DESCRIPTION__ELEMENT);
-        createEReference(containerDropDescriptionEClass, CONTAINER_DROP_DESCRIPTION__NEW_VIEW_CONTAINER);
-        createEReference(containerDropDescriptionEClass, CONTAINER_DROP_DESCRIPTION__INITIAL_OPERATION);
-        createEAttribute(containerDropDescriptionEClass, CONTAINER_DROP_DESCRIPTION__DRAG_SOURCE);
-        createEAttribute(containerDropDescriptionEClass, CONTAINER_DROP_DESCRIPTION__MOVE_EDGES);
-
         pasteDescriptionEClass = createEClass(PASTE_DESCRIPTION);
         createEReference(pasteDescriptionEClass, PASTE_DESCRIPTION__CONTAINER);
         createEReference(pasteDescriptionEClass, PASTE_DESCRIPTION__CONTAINER_VIEW);
@@ -2282,9 +2181,6 @@ public class ToolPackageImpl extends EPackageImpl implements ToolPackage {
         // Obtain other dependent packages
         DescriptionPackage theDescriptionPackage = (DescriptionPackage) EPackage.Registry.INSTANCE.getEPackage(DescriptionPackage.eNS_URI);
         EcorePackage theEcorePackage = (EcorePackage) EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
-        org.eclipse.sirius.diagram.description.DescriptionPackage theDescriptionPackage_1 = (org.eclipse.sirius.diagram.description.DescriptionPackage) EPackage.Registry.INSTANCE
-                .getEPackage(org.eclipse.sirius.diagram.description.DescriptionPackage.eNS_URI);
-        ViewpointPackage theViewpointPackage = (ViewpointPackage) EPackage.Registry.INSTANCE.getEPackage(ViewpointPackage.eNS_URI);
 
         // Create type parameters
 
@@ -2296,7 +2192,6 @@ public class ToolPackageImpl extends EPackageImpl implements ToolPackage {
         abstractToolDescriptionEClass.getESuperTypes().add(this.getToolEntry());
         mappingBasedToolDescriptionEClass.getESuperTypes().add(this.getAbstractToolDescription());
         toolDescriptionEClass.getESuperTypes().add(this.getMappingBasedToolDescription());
-        containerDropDescriptionEClass.getESuperTypes().add(this.getMappingBasedToolDescription());
         pasteDescriptionEClass.getESuperTypes().add(this.getMappingBasedToolDescription());
         selectionWizardDescriptionEClass.getESuperTypes().add(this.getAbstractToolDescription());
         selectionWizardDescriptionEClass.getESuperTypes().add(theDescriptionPackage.getSelectionDescription());
@@ -2372,30 +2267,6 @@ public class ToolPackageImpl extends EPackageImpl implements ToolPackage {
         initEReference(getToolDescription_InitialOperation(), this.getInitialOperation(), null, "initialOperation", null, 1, 1, ToolDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
                 IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-        initEClass(containerDropDescriptionEClass, ContainerDropDescription.class, "ContainerDropDescription", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getContainerDropDescription_Mappings(), theDescriptionPackage_1.getDiagramElementMapping(), null, "mappings", null, 0, -1, ContainerDropDescription.class, !IS_TRANSIENT,
-                !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getContainerDropDescription_OldContainer(), this.getDropContainerVariable(), null, "oldContainer", null, 1, 1, ContainerDropDescription.class, !IS_TRANSIENT, !IS_VOLATILE,
-                IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getContainerDropDescription_NewContainer(), this.getDropContainerVariable(), null, "newContainer", null, 1, 1, ContainerDropDescription.class, !IS_TRANSIENT, !IS_VOLATILE,
-                IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getContainerDropDescription_Element(), this.getElementDropVariable(), null, "element", null, 1, 1, ContainerDropDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
-                IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getContainerDropDescription_NewViewContainer(), this.getContainerViewVariable(), null, "newViewContainer", null, 1, 1, ContainerDropDescription.class, !IS_TRANSIENT,
-                !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getContainerDropDescription_InitialOperation(), this.getInitialContainerDropOperation(), null, "initialOperation", null, 1, 1, ContainerDropDescription.class, !IS_TRANSIENT,
-                !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getContainerDropDescription_DragSource(), this.getDragSource(), "dragSource", null, 1, 1, ContainerDropDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
-                !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getContainerDropDescription_MoveEdges(), ecorePackage.getEBoolean(), "moveEdges", null, 1, 1, ContainerDropDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
-                !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-        EOperation op = addEOperation(containerDropDescriptionEClass, theDescriptionPackage_1.getDiagramElementMapping(), "getBestMapping", 0, 1, IS_UNIQUE, IS_ORDERED);
-        addEParameter(op, theViewpointPackage.getDragAndDropTarget(), "targetContainer", 0, 1, IS_UNIQUE, IS_ORDERED);
-        addEParameter(op, theEcorePackage.getEObject(), "droppedElement", 0, 1, IS_UNIQUE, IS_ORDERED);
-
-        addEOperation(containerDropDescriptionEClass, theDescriptionPackage.getDragAndDropTargetDescription(), "getContainers", 1, -1, IS_UNIQUE, IS_ORDERED);
-
         initEClass(pasteDescriptionEClass, PasteDescription.class, "PasteDescription", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
         initEReference(getPasteDescription_Container(), this.getDropContainerVariable(), null, "container", null, 1, 1, PasteDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
                 IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/util/ToolAdapterFactory.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/util/ToolAdapterFactory.java
index 0e00385820..1d8124c267 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/util/ToolAdapterFactory.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/util/ToolAdapterFactory.java
@@ -23,7 +23,6 @@ import org.eclipse.sirius.viewpoint.description.tool.AbstractVariable;
 import org.eclipse.sirius.viewpoint.description.tool.AcceleoVariable;
 import org.eclipse.sirius.viewpoint.description.tool.Case;
 import org.eclipse.sirius.viewpoint.description.tool.ChangeContext;
-import org.eclipse.sirius.viewpoint.description.tool.ContainerDropDescription;
 import org.eclipse.sirius.viewpoint.description.tool.ContainerModelOperation;
 import org.eclipse.sirius.viewpoint.description.tool.ContainerViewVariable;
 import org.eclipse.sirius.viewpoint.description.tool.CreateInstance;
@@ -152,11 +151,6 @@ public class ToolAdapterFactory extends AdapterFactoryImpl {
         }
 
         @Override
-        public Adapter caseContainerDropDescription(ContainerDropDescription object) {
-            return createContainerDropDescriptionAdapter();
-        }
-
-        @Override
         public Adapter casePasteDescription(PasteDescription object) {
             return createPasteDescriptionAdapter();
         }
@@ -512,22 +506,6 @@ public class ToolAdapterFactory extends AdapterFactoryImpl {
 
     /**
      * Creates a new adapter for an object of class '
-     * {@link org.eclipse.sirius.viewpoint.description.tool.ContainerDropDescription
-     * <em>Container Drop Description</em>}'. <!-- begin-user-doc --> This
-     * default implementation returns null so that we can easily ignore cases;
-     * it's useful to ignore a case when inheritance will catch all the cases
-     * anyway. <!-- end-user-doc -->
-     * 
-     * @return the new adapter.
-     * @see org.eclipse.sirius.viewpoint.description.tool.ContainerDropDescription
-     * @generated
-     */
-    public Adapter createContainerDropDescriptionAdapter() {
-        return null;
-    }
-
-    /**
-     * Creates a new adapter for an object of class '
      * {@link org.eclipse.sirius.viewpoint.description.tool.PasteDescription
      * <em>Paste Description</em>}'. <!-- begin-user-doc --> This default
      * implementation returns null so that we can easily ignore cases; it's
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/util/ToolSwitch.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/util/ToolSwitch.java
index f79a486d0f..4f009ebcbe 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/util/ToolSwitch.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/util/ToolSwitch.java
@@ -23,7 +23,6 @@ import org.eclipse.sirius.viewpoint.description.tool.AbstractVariable;
 import org.eclipse.sirius.viewpoint.description.tool.AcceleoVariable;
 import org.eclipse.sirius.viewpoint.description.tool.Case;
 import org.eclipse.sirius.viewpoint.description.tool.ChangeContext;
-import org.eclipse.sirius.viewpoint.description.tool.ContainerDropDescription;
 import org.eclipse.sirius.viewpoint.description.tool.ContainerModelOperation;
 import org.eclipse.sirius.viewpoint.description.tool.ContainerViewVariable;
 import org.eclipse.sirius.viewpoint.description.tool.CreateInstance;
@@ -205,23 +204,6 @@ public class ToolSwitch<T> {
                 result = defaultCase(theEObject);
             return result;
         }
-        case ToolPackage.CONTAINER_DROP_DESCRIPTION: {
-            ContainerDropDescription containerDropDescription = (ContainerDropDescription) theEObject;
-            T result = caseContainerDropDescription(containerDropDescription);
-            if (result == null)
-                result = caseMappingBasedToolDescription(containerDropDescription);
-            if (result == null)
-                result = caseAbstractToolDescription(containerDropDescription);
-            if (result == null)
-                result = caseToolEntry(containerDropDescription);
-            if (result == null)
-                result = caseDocumentedElement(containerDropDescription);
-            if (result == null)
-                result = caseIdentifiedElement(containerDropDescription);
-            if (result == null)
-                result = defaultCase(theEObject);
-            return result;
-        }
         case ToolPackage.PASTE_DESCRIPTION: {
             PasteDescription pasteDescription = (PasteDescription) theEObject;
             T result = casePasteDescription(pasteDescription);
@@ -858,23 +840,6 @@ public class ToolSwitch<T> {
 
     /**
      * Returns the result of interpreting the object as an instance of '
-     * <em>Container Drop Description</em>'. <!-- begin-user-doc --> This
-     * implementation returns null; returning a non-null result will terminate
-     * the switch. <!-- end-user-doc -->
-     * 
-     * @param object
-     *            the target of the switch.
-     * @return the result of interpreting the object as an instance of '
-     *         <em>Container Drop Description</em>'.
-     * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-     * @generated
-     */
-    public T caseContainerDropDescription(ContainerDropDescription object) {
-        return null;
-    }
-
-    /**
-     * Returns the result of interpreting the object as an instance of '
      * <em>Paste Description</em>'. <!-- begin-user-doc --> This implementation
      * returns null; returning a non-null result will terminate the switch. <!--
      * end-user-doc -->
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/util/DescriptionAdapterFactory.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/util/DescriptionAdapterFactory.java
index 531b2dfbee..23c69d8f94 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/util/DescriptionAdapterFactory.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/util/DescriptionAdapterFactory.java
@@ -30,7 +30,6 @@ import org.eclipse.sirius.viewpoint.description.DecorationDescription;
 import org.eclipse.sirius.viewpoint.description.DecorationDescriptionsSet;
 import org.eclipse.sirius.viewpoint.description.DescriptionPackage;
 import org.eclipse.sirius.viewpoint.description.DocumentedElement;
-import org.eclipse.sirius.viewpoint.description.DragAndDropTargetDescription;
 import org.eclipse.sirius.viewpoint.description.EAttributeCustomization;
 import org.eclipse.sirius.viewpoint.description.EReferenceCustomization;
 import org.eclipse.sirius.viewpoint.description.EStructuralFeatureCustomization;
@@ -197,11 +196,6 @@ public class DescriptionAdapterFactory extends AdapterFactoryImpl {
         }
 
         @Override
-        public Adapter caseDragAndDropTargetDescription(DragAndDropTargetDescription object) {
-            return createDragAndDropTargetDescriptionAdapter();
-        }
-
-        @Override
         public Adapter casePasteTargetDescription(PasteTargetDescription object) {
             return createPasteTargetDescriptionAdapter();
         }
@@ -613,22 +607,6 @@ public class DescriptionAdapterFactory extends AdapterFactoryImpl {
 
     /**
      * Creates a new adapter for an object of class '
-     * {@link org.eclipse.sirius.viewpoint.description.DragAndDropTargetDescription
-     * <em>Drag And Drop Target Description</em>}'. <!-- begin-user-doc --> This
-     * default implementation returns null so that we can easily ignore cases;
-     * it's useful to ignore a case when inheritance will catch all the cases
-     * anyway. <!-- end-user-doc -->
-     * 
-     * @return the new adapter.
-     * @see org.eclipse.sirius.viewpoint.description.DragAndDropTargetDescription
-     * @generated
-     */
-    public Adapter createDragAndDropTargetDescriptionAdapter() {
-        return null;
-    }
-
-    /**
-     * Creates a new adapter for an object of class '
      * {@link org.eclipse.sirius.viewpoint.description.PasteTargetDescription
      * <em>Paste Target Description</em>}'. <!-- begin-user-doc --> This default
      * implementation returns null so that we can easily ignore cases; it's
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/util/DescriptionSwitch.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/util/DescriptionSwitch.java
index d8f93cf9fd..37aa4711d3 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/util/DescriptionSwitch.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/util/DescriptionSwitch.java
@@ -30,7 +30,6 @@ import org.eclipse.sirius.viewpoint.description.DecorationDescription;
 import org.eclipse.sirius.viewpoint.description.DecorationDescriptionsSet;
 import org.eclipse.sirius.viewpoint.description.DescriptionPackage;
 import org.eclipse.sirius.viewpoint.description.DocumentedElement;
-import org.eclipse.sirius.viewpoint.description.DragAndDropTargetDescription;
 import org.eclipse.sirius.viewpoint.description.EAttributeCustomization;
 import org.eclipse.sirius.viewpoint.description.EReferenceCustomization;
 import org.eclipse.sirius.viewpoint.description.EStructuralFeatureCustomization;
@@ -274,13 +273,6 @@ public class DescriptionSwitch<T> {
                 result = defaultCase(theEObject);
             return result;
         }
-        case DescriptionPackage.DRAG_AND_DROP_TARGET_DESCRIPTION: {
-            DragAndDropTargetDescription dragAndDropTargetDescription = (DragAndDropTargetDescription) theEObject;
-            T result = caseDragAndDropTargetDescription(dragAndDropTargetDescription);
-            if (result == null)
-                result = defaultCase(theEObject);
-            return result;
-        }
         case DescriptionPackage.PASTE_TARGET_DESCRIPTION: {
             PasteTargetDescription pasteTargetDescription = (PasteTargetDescription) theEObject;
             T result = casePasteTargetDescription(pasteTargetDescription);
@@ -779,23 +771,6 @@ public class DescriptionSwitch<T> {
 
     /**
      * Returns the result of interpreting the object as an instance of '
-     * <em>Drag And Drop Target Description</em>'. <!-- begin-user-doc --> This
-     * implementation returns null; returning a non-null result will terminate
-     * the switch. <!-- end-user-doc -->
-     * 
-     * @param object
-     *            the target of the switch.
-     * @return the result of interpreting the object as an instance of '
-     *         <em>Drag And Drop Target Description</em>'.
-     * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-     * @generated
-     */
-    public T caseDragAndDropTargetDescription(DragAndDropTargetDescription object) {
-        return null;
-    }
-
-    /**
-     * Returns the result of interpreting the object as an instance of '
      * <em>Paste Target Description</em>'. <!-- begin-user-doc --> This
      * implementation returns null; returning a non-null result will terminate
      * the switch. <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/validation/ERROR_LEVEL.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/validation/ERROR_LEVEL.java
index f1761c7c93..731ccd50ca 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/validation/ERROR_LEVEL.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/validation/ERROR_LEVEL.java
@@ -9,7 +9,7 @@
  *    Obeo - initial API and implementation
  * 
  */
-package org.eclipse.sirius.diagram.description.validation;
+package org.eclipse.sirius.viewpoint.description.validation;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -23,7 +23,7 @@ import org.eclipse.emf.common.util.Enumerator;
  * end-user-doc --> <!-- begin-model-doc --> All levels of error for a
  * validation rule. <!-- end-model-doc -->
  * 
- * @see org.eclipse.sirius.diagram.description.validation.ValidationPackage#getERROR_LEVEL()
+ * @see org.eclipse.sirius.viewpoint.description.validation.ValidationPackage#getERROR_LEVEL()
  * @model
  * @generated
  */
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/validation/RuleAudit.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/validation/RuleAudit.java
index 44e636c490..286fea8635 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/validation/RuleAudit.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/validation/RuleAudit.java
@@ -9,7 +9,7 @@
  *    Obeo - initial API and implementation
  * 
  */
-package org.eclipse.sirius.diagram.description.validation;
+package org.eclipse.sirius.viewpoint.description.validation;
 
 import org.eclipse.emf.ecore.EObject;
 
@@ -23,12 +23,12 @@ import org.eclipse.emf.ecore.EObject;
  * The following features are supported:
  * <ul>
  * <li>
- * {@link org.eclipse.sirius.diagram.description.validation.RuleAudit#getAuditExpression
+ * {@link org.eclipse.sirius.viewpoint.description.validation.RuleAudit#getAuditExpression
  * <em>Audit Expression</em>}</li>
  * </ul>
  * </p>
  * 
- * @see org.eclipse.sirius.diagram.description.validation.ValidationPackage#getRuleAudit()
+ * @see org.eclipse.sirius.viewpoint.description.validation.ValidationPackage#getRuleAudit()
  * @model
  * @generated
  */
@@ -41,7 +41,7 @@ public interface RuleAudit extends EObject {
      * 
      * @return the value of the '<em>Audit Expression</em>' attribute.
      * @see #setAuditExpression(String)
-     * @see org.eclipse.sirius.diagram.description.validation.ValidationPackage#getRuleAudit_AuditExpression()
+     * @see org.eclipse.sirius.viewpoint.description.validation.ValidationPackage#getRuleAudit_AuditExpression()
      * @model dataType=
      *        "org.eclipse.sirius.viewpoint.description.InterpretedExpression"
      *        required="true" annotation=
@@ -52,7 +52,7 @@ public interface RuleAudit extends EObject {
 
     /**
      * Sets the value of the '
-     * {@link org.eclipse.sirius.diagram.description.validation.RuleAudit#getAuditExpression
+     * {@link org.eclipse.sirius.viewpoint.description.validation.RuleAudit#getAuditExpression
      * <em>Audit Expression</em>}' attribute. <!-- begin-user-doc --> <!--
      * end-user-doc -->
      * 
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/validation/SemanticValidationRule.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/validation/SemanticValidationRule.java
index 2d9518e72e..062c67301b 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/validation/SemanticValidationRule.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/validation/SemanticValidationRule.java
@@ -9,7 +9,7 @@
  *    Obeo - initial API and implementation
  * 
  */
-package org.eclipse.sirius.diagram.description.validation;
+package org.eclipse.sirius.viewpoint.description.validation;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '
@@ -22,12 +22,12 @@ package org.eclipse.sirius.diagram.description.validation;
  * The following features are supported:
  * <ul>
  * <li>
- * {@link org.eclipse.sirius.diagram.description.validation.SemanticValidationRule#getTargetClass
+ * {@link org.eclipse.sirius.viewpoint.description.validation.SemanticValidationRule#getTargetClass
  * <em>Target Class</em>}</li>
  * </ul>
  * </p>
  * 
- * @see org.eclipse.sirius.diagram.description.validation.ValidationPackage#getSemanticValidationRule()
+ * @see org.eclipse.sirius.viewpoint.description.validation.ValidationPackage#getSemanticValidationRule()
  * @model
  * @generated
  */
@@ -39,7 +39,7 @@ public interface SemanticValidationRule extends ValidationRule {
      * 
      * @return the value of the '<em>Target Class</em>' attribute.
      * @see #setTargetClass(String)
-     * @see org.eclipse.sirius.diagram.description.validation.ValidationPackage#getSemanticValidationRule_TargetClass()
+     * @see org.eclipse.sirius.viewpoint.description.validation.ValidationPackage#getSemanticValidationRule_TargetClass()
      * @model dataType="org.eclipse.sirius.viewpoint.description.TypeName"
      *        required="true"
      * @generated
@@ -48,7 +48,7 @@ public interface SemanticValidationRule extends ValidationRule {
 
     /**
      * Sets the value of the '
-     * {@link org.eclipse.sirius.diagram.description.validation.SemanticValidationRule#getTargetClass
+     * {@link org.eclipse.sirius.viewpoint.description.validation.SemanticValidationRule#getTargetClass
      * <em>Target Class</em>}' attribute. <!-- begin-user-doc --> <!--
      * end-user-doc -->
      * 
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/validation/ValidationFactory.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/validation/ValidationFactory.java
index c8b536e88c..9d3fbc1f4e 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/validation/ValidationFactory.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/validation/ValidationFactory.java
@@ -9,7 +9,7 @@
  *    Obeo - initial API and implementation
  * 
  */
-package org.eclipse.sirius.diagram.description.validation;
+package org.eclipse.sirius.viewpoint.description.validation;
 
 import org.eclipse.emf.ecore.EFactory;
 
@@ -17,7 +17,7 @@ import org.eclipse.emf.ecore.EFactory;
  * <!-- begin-user-doc --> The <b>Factory</b> for the model. It provides a
  * create method for each non-abstract class of the model. <!-- end-user-doc -->
  * 
- * @see org.eclipse.sirius.diagram.description.validation.ValidationPackage
+ * @see org.eclipse.sirius.viewpoint.description.validation.ValidationPackage
  * @generated
  */
 public interface ValidationFactory extends EFactory {
@@ -27,7 +27,7 @@ public interface ValidationFactory extends EFactory {
      * 
      * @generated
      */
-    ValidationFactory eINSTANCE = org.eclipse.sirius.diagram.description.validation.impl.ValidationFactoryImpl.init();
+    ValidationFactory eINSTANCE = org.eclipse.sirius.viewpoint.description.validation.impl.ValidationFactoryImpl.init();
 
     /**
      * Returns a new object of class '<em>Set</em>'. <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/validation/ValidationFix.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/validation/ValidationFix.java
index d8124a79ad..78217f42b8 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/validation/ValidationFix.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/validation/ValidationFix.java
@@ -9,7 +9,7 @@
  *    Obeo - initial API and implementation
  * 
  */
-package org.eclipse.sirius.diagram.description.validation;
+package org.eclipse.sirius.viewpoint.description.validation;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.sirius.viewpoint.description.tool.InitialOperation;
@@ -22,15 +22,15 @@ import org.eclipse.sirius.viewpoint.description.tool.InitialOperation;
  * The following features are supported:
  * <ul>
  * <li>
- * {@link org.eclipse.sirius.diagram.description.validation.ValidationFix#getName
+ * {@link org.eclipse.sirius.viewpoint.description.validation.ValidationFix#getName
  * <em>Name</em>}</li>
  * <li>
- * {@link org.eclipse.sirius.diagram.description.validation.ValidationFix#getInitialOperation
+ * {@link org.eclipse.sirius.viewpoint.description.validation.ValidationFix#getInitialOperation
  * <em>Initial Operation</em>}</li>
  * </ul>
  * </p>
  * 
- * @see org.eclipse.sirius.diagram.description.validation.ValidationPackage#getValidationFix()
+ * @see org.eclipse.sirius.viewpoint.description.validation.ValidationPackage#getValidationFix()
  * @model
  * @generated
  */
@@ -42,7 +42,7 @@ public interface ValidationFix extends EObject {
      * 
      * @return the value of the '<em>Name</em>' attribute.
      * @see #setName(String)
-     * @see org.eclipse.sirius.diagram.description.validation.ValidationPackage#getValidationFix_Name()
+     * @see org.eclipse.sirius.viewpoint.description.validation.ValidationPackage#getValidationFix_Name()
      * @model required="true"
      * @generated
      */
@@ -50,7 +50,7 @@ public interface ValidationFix extends EObject {
 
     /**
      * Sets the value of the '
-     * {@link org.eclipse.sirius.diagram.description.validation.ValidationFix#getName
+     * {@link org.eclipse.sirius.viewpoint.description.validation.ValidationFix#getName
      * <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
      * 
      * @param value
@@ -68,7 +68,7 @@ public interface ValidationFix extends EObject {
      * @return the value of the '<em>Initial Operation</em>' containment
      *         reference.
      * @see #setInitialOperation(InitialOperation)
-     * @see org.eclipse.sirius.diagram.description.validation.ValidationPackage#getValidationFix_InitialOperation()
+     * @see org.eclipse.sirius.viewpoint.description.validation.ValidationPackage#getValidationFix_InitialOperation()
      * @model containment="true" resolveProxies="true" required="true"
      * @generated
      */
@@ -76,7 +76,7 @@ public interface ValidationFix extends EObject {
 
     /**
      * Sets the value of the '
-     * {@link org.eclipse.sirius.diagram.description.validation.ValidationFix#getInitialOperation
+     * {@link org.eclipse.sirius.viewpoint.description.validation.ValidationFix#getInitialOperation
      * <em>Initial Operation</em>}' containment reference. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
      * 
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/validation/ValidationPackage.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/validation/ValidationPackage.java
index 647c05c602..f817c9c8f2 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/validation/ValidationPackage.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/validation/ValidationPackage.java
@@ -9,7 +9,7 @@
  *    Obeo - initial API and implementation
  * 
  */
-package org.eclipse.sirius.diagram.description.validation;
+package org.eclipse.sirius.viewpoint.description.validation;
 
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
@@ -29,7 +29,7 @@ import org.eclipse.sirius.viewpoint.description.DescriptionPackage;
  * </ul>
  * <!-- end-user-doc -->
  * 
- * @see org.eclipse.sirius.diagram.description.validation.ValidationFactory
+ * @see org.eclipse.sirius.viewpoint.description.validation.ValidationFactory
  * @model kind="package"
  * @generated
  */
@@ -46,7 +46,7 @@ public interface ValidationPackage extends EPackage {
      * 
      * @generated
      */
-    String eNS_URI = "http://www.eclipse.org/sirius/diagram/description/validation/1.1.0";
+    String eNS_URI = "http://www.eclipse.org/sirius/description/validation/1.1.0";
 
     /**
      * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -61,15 +61,15 @@ public interface ValidationPackage extends EPackage {
      * 
      * @generated
      */
-    ValidationPackage eINSTANCE = org.eclipse.sirius.diagram.description.validation.impl.ValidationPackageImpl.init();
+    ValidationPackage eINSTANCE = org.eclipse.sirius.viewpoint.description.validation.impl.ValidationPackageImpl.init();
 
     /**
      * The meta object id for the '
-     * {@link org.eclipse.sirius.diagram.description.validation.impl.ValidationSetImpl
+     * {@link org.eclipse.sirius.viewpoint.description.validation.impl.ValidationSetImpl
      * <em>Set</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
      * 
-     * @see org.eclipse.sirius.diagram.description.validation.impl.ValidationSetImpl
-     * @see org.eclipse.sirius.diagram.description.validation.impl.ValidationPackageImpl#getValidationSet()
+     * @see org.eclipse.sirius.viewpoint.description.validation.impl.ValidationSetImpl
+     * @see org.eclipse.sirius.viewpoint.description.validation.impl.ValidationPackageImpl#getValidationSet()
      * @generated
      */
     int VALIDATION_SET = 0;
@@ -84,22 +84,22 @@ public interface ValidationPackage extends EPackage {
     int VALIDATION_SET__DOCUMENTATION = DescriptionPackage.DOCUMENTED_ELEMENT__DOCUMENTATION;
 
     /**
-     * The feature id for the '<em><b>Owned Rules</b></em>' containment
-     * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * The feature id for the '<em><b>Name</b></em>' attribute. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
      * 
      * @generated
      * @ordered
      */
-    int VALIDATION_SET__OWNED_RULES = DescriptionPackage.DOCUMENTED_ELEMENT_FEATURE_COUNT + 0;
+    int VALIDATION_SET__NAME = DescriptionPackage.DOCUMENTED_ELEMENT_FEATURE_COUNT + 0;
 
     /**
-     * The feature id for the '<em><b>Name</b></em>' attribute. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
+     * The feature id for the '<em><b>Owned Rules</b></em>' containment
+     * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
      * 
      * @generated
      * @ordered
      */
-    int VALIDATION_SET__NAME = DescriptionPackage.DOCUMENTED_ELEMENT_FEATURE_COUNT + 1;
+    int VALIDATION_SET__OWNED_RULES = DescriptionPackage.DOCUMENTED_ELEMENT_FEATURE_COUNT + 1;
 
     /**
      * The feature id for the '<em><b>Reused Rules</b></em>' reference list.
@@ -130,11 +130,11 @@ public interface ValidationPackage extends EPackage {
 
     /**
      * The meta object id for the '
-     * {@link org.eclipse.sirius.diagram.description.validation.impl.ValidationRuleImpl
+     * {@link org.eclipse.sirius.viewpoint.description.validation.impl.ValidationRuleImpl
      * <em>Rule</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
      * 
-     * @see org.eclipse.sirius.diagram.description.validation.impl.ValidationRuleImpl
-     * @see org.eclipse.sirius.diagram.description.validation.impl.ValidationPackageImpl#getValidationRule()
+     * @see org.eclipse.sirius.viewpoint.description.validation.impl.ValidationRuleImpl
+     * @see org.eclipse.sirius.viewpoint.description.validation.impl.ValidationPackageImpl#getValidationRule()
      * @generated
      */
     int VALIDATION_RULE = 1;
@@ -186,12 +186,12 @@ public interface ValidationPackage extends EPackage {
 
     /**
      * The meta object id for the '
-     * {@link org.eclipse.sirius.diagram.description.validation.impl.SemanticValidationRuleImpl
+     * {@link org.eclipse.sirius.viewpoint.description.validation.impl.SemanticValidationRuleImpl
      * <em>Semantic Validation Rule</em>}' class. <!-- begin-user-doc --> <!--
      * end-user-doc -->
      * 
-     * @see org.eclipse.sirius.diagram.description.validation.impl.SemanticValidationRuleImpl
-     * @see org.eclipse.sirius.diagram.description.validation.impl.ValidationPackageImpl#getSemanticValidationRule()
+     * @see org.eclipse.sirius.viewpoint.description.validation.impl.SemanticValidationRuleImpl
+     * @see org.eclipse.sirius.viewpoint.description.validation.impl.ValidationPackageImpl#getSemanticValidationRule()
      * @generated
      */
     int SEMANTIC_VALIDATION_RULE = 2;
@@ -253,12 +253,12 @@ public interface ValidationPackage extends EPackage {
 
     /**
      * The meta object id for the '
-     * {@link org.eclipse.sirius.diagram.description.validation.impl.ViewValidationRuleImpl
+     * {@link org.eclipse.sirius.viewpoint.description.validation.impl.ViewValidationRuleImpl
      * <em>View Validation Rule</em>}' class. <!-- begin-user-doc --> <!--
      * end-user-doc -->
      * 
-     * @see org.eclipse.sirius.diagram.description.validation.impl.ViewValidationRuleImpl
-     * @see org.eclipse.sirius.diagram.description.validation.impl.ValidationPackageImpl#getViewValidationRule()
+     * @see org.eclipse.sirius.viewpoint.description.validation.impl.ViewValidationRuleImpl
+     * @see org.eclipse.sirius.viewpoint.description.validation.impl.ValidationPackageImpl#getViewValidationRule()
      * @generated
      */
     int VIEW_VALIDATION_RULE = 3;
@@ -319,12 +319,12 @@ public interface ValidationPackage extends EPackage {
 
     /**
      * The meta object id for the '
-     * {@link org.eclipse.sirius.diagram.description.validation.impl.RuleAuditImpl
+     * {@link org.eclipse.sirius.viewpoint.description.validation.impl.RuleAuditImpl
      * <em>Rule Audit</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
      * 
-     * @see org.eclipse.sirius.diagram.description.validation.impl.RuleAuditImpl
-     * @see org.eclipse.sirius.diagram.description.validation.impl.ValidationPackageImpl#getRuleAudit()
+     * @see org.eclipse.sirius.viewpoint.description.validation.impl.RuleAuditImpl
+     * @see org.eclipse.sirius.viewpoint.description.validation.impl.ValidationPackageImpl#getRuleAudit()
      * @generated
      */
     int RULE_AUDIT = 4;
@@ -349,11 +349,11 @@ public interface ValidationPackage extends EPackage {
 
     /**
      * The meta object id for the '
-     * {@link org.eclipse.sirius.diagram.description.validation.impl.ValidationFixImpl
+     * {@link org.eclipse.sirius.viewpoint.description.validation.impl.ValidationFixImpl
      * <em>Fix</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
      * 
-     * @see org.eclipse.sirius.diagram.description.validation.impl.ValidationFixImpl
-     * @see org.eclipse.sirius.diagram.description.validation.impl.ValidationPackageImpl#getValidationFix()
+     * @see org.eclipse.sirius.viewpoint.description.validation.impl.ValidationFixImpl
+     * @see org.eclipse.sirius.viewpoint.description.validation.impl.ValidationPackageImpl#getValidationFix()
      * @generated
      */
     int VALIDATION_FIX = 5;
@@ -387,59 +387,59 @@ public interface ValidationPackage extends EPackage {
 
     /**
      * The meta object id for the '
-     * {@link org.eclipse.sirius.diagram.description.validation.ERROR_LEVEL
+     * {@link org.eclipse.sirius.viewpoint.description.validation.ERROR_LEVEL
      * <em>ERROR LEVEL</em>}' enum. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
      * 
-     * @see org.eclipse.sirius.diagram.description.validation.ERROR_LEVEL
-     * @see org.eclipse.sirius.diagram.description.validation.impl.ValidationPackageImpl#getERROR_LEVEL()
+     * @see org.eclipse.sirius.viewpoint.description.validation.ERROR_LEVEL
+     * @see org.eclipse.sirius.viewpoint.description.validation.impl.ValidationPackageImpl#getERROR_LEVEL()
      * @generated
      */
     int ERROR_LEVEL = 6;
 
     /**
      * Returns the meta object for class '
-     * {@link org.eclipse.sirius.diagram.description.validation.ValidationSet
+     * {@link org.eclipse.sirius.viewpoint.description.validation.ValidationSet
      * <em>Set</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
      * 
      * @return the meta object for class '<em>Set</em>'.
-     * @see org.eclipse.sirius.diagram.description.validation.ValidationSet
+     * @see org.eclipse.sirius.viewpoint.description.validation.ValidationSet
      * @generated
      */
     EClass getValidationSet();
 
     /**
-     * Returns the meta object for the containment reference list '
-     * {@link org.eclipse.sirius.diagram.description.validation.ValidationSet#getOwnedRules
-     * <em>Owned Rules</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * Returns the meta object for the attribute '
+     * {@link org.eclipse.sirius.viewpoint.description.validation.ValidationSet#getName
+     * <em>Name</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
      * 
-     * @return the meta object for the containment reference list '
-     *         <em>Owned Rules</em>'.
-     * @see org.eclipse.sirius.diagram.description.validation.ValidationSet#getOwnedRules()
+     * @return the meta object for the attribute '<em>Name</em>'.
+     * @see org.eclipse.sirius.viewpoint.description.validation.ValidationSet#getName()
      * @see #getValidationSet()
      * @generated
      */
-    EReference getValidationSet_OwnedRules();
+    EAttribute getValidationSet_Name();
 
     /**
-     * Returns the meta object for the attribute '
-     * {@link org.eclipse.sirius.diagram.description.validation.ValidationSet#getName
-     * <em>Name</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * Returns the meta object for the containment reference list '
+     * {@link org.eclipse.sirius.viewpoint.description.validation.ValidationSet#getOwnedRules
+     * <em>Owned Rules</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
      * 
-     * @return the meta object for the attribute '<em>Name</em>'.
-     * @see org.eclipse.sirius.diagram.description.validation.ValidationSet#getName()
+     * @return the meta object for the containment reference list '
+     *         <em>Owned Rules</em>'.
+     * @see org.eclipse.sirius.viewpoint.description.validation.ValidationSet#getOwnedRules()
      * @see #getValidationSet()
      * @generated
      */
-    EAttribute getValidationSet_Name();
+    EReference getValidationSet_OwnedRules();
 
     /**
      * Returns the meta object for the reference list '
-     * {@link org.eclipse.sirius.diagram.description.validation.ValidationSet#getReusedRules
+     * {@link org.eclipse.sirius.viewpoint.description.validation.ValidationSet#getReusedRules
      * <em>Reused Rules</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
      * 
      * @return the meta object for the reference list '<em>Reused Rules</em>'.
-     * @see org.eclipse.sirius.diagram.description.validation.ValidationSet#getReusedRules()
+     * @see org.eclipse.sirius.viewpoint.description.validation.ValidationSet#getReusedRules()
      * @see #getValidationSet()
      * @generated
      */
@@ -447,11 +447,11 @@ public interface ValidationPackage extends EPackage {
 
     /**
      * Returns the meta object for the reference list '
-     * {@link org.eclipse.sirius.diagram.description.validation.ValidationSet#getAllRules
+     * {@link org.eclipse.sirius.viewpoint.description.validation.ValidationSet#getAllRules
      * <em>All Rules</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
      * 
      * @return the meta object for the reference list '<em>All Rules</em>'.
-     * @see org.eclipse.sirius.diagram.description.validation.ValidationSet#getAllRules()
+     * @see org.eclipse.sirius.viewpoint.description.validation.ValidationSet#getAllRules()
      * @see #getValidationSet()
      * @generated
      */
@@ -459,22 +459,22 @@ public interface ValidationPackage extends EPackage {
 
     /**
      * Returns the meta object for class '
-     * {@link org.eclipse.sirius.diagram.description.validation.ValidationRule
+     * {@link org.eclipse.sirius.viewpoint.description.validation.ValidationRule
      * <em>Rule</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
      * 
      * @return the meta object for class '<em>Rule</em>'.
-     * @see org.eclipse.sirius.diagram.description.validation.ValidationRule
+     * @see org.eclipse.sirius.viewpoint.description.validation.ValidationRule
      * @generated
      */
     EClass getValidationRule();
 
     /**
      * Returns the meta object for the attribute '
-     * {@link org.eclipse.sirius.diagram.description.validation.ValidationRule#getLevel
+     * {@link org.eclipse.sirius.viewpoint.description.validation.ValidationRule#getLevel
      * <em>Level</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
      * 
      * @return the meta object for the attribute '<em>Level</em>'.
-     * @see org.eclipse.sirius.diagram.description.validation.ValidationRule#getLevel()
+     * @see org.eclipse.sirius.viewpoint.description.validation.ValidationRule#getLevel()
      * @see #getValidationRule()
      * @generated
      */
@@ -482,11 +482,11 @@ public interface ValidationPackage extends EPackage {
 
     /**
      * Returns the meta object for the attribute '
-     * {@link org.eclipse.sirius.diagram.description.validation.ValidationRule#getMessage
+     * {@link org.eclipse.sirius.viewpoint.description.validation.ValidationRule#getMessage
      * <em>Message</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
      * 
      * @return the meta object for the attribute '<em>Message</em>'.
-     * @see org.eclipse.sirius.diagram.description.validation.ValidationRule#getMessage()
+     * @see org.eclipse.sirius.viewpoint.description.validation.ValidationRule#getMessage()
      * @see #getValidationRule()
      * @generated
      */
@@ -494,12 +494,12 @@ public interface ValidationPackage extends EPackage {
 
     /**
      * Returns the meta object for the containment reference list '
-     * {@link org.eclipse.sirius.diagram.description.validation.ValidationRule#getAudits
+     * {@link org.eclipse.sirius.viewpoint.description.validation.ValidationRule#getAudits
      * <em>Audits</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
      * 
      * @return the meta object for the containment reference list '
      *         <em>Audits</em>'.
-     * @see org.eclipse.sirius.diagram.description.validation.ValidationRule#getAudits()
+     * @see org.eclipse.sirius.viewpoint.description.validation.ValidationRule#getAudits()
      * @see #getValidationRule()
      * @generated
      */
@@ -507,12 +507,12 @@ public interface ValidationPackage extends EPackage {
 
     /**
      * Returns the meta object for the containment reference list '
-     * {@link org.eclipse.sirius.diagram.description.validation.ValidationRule#getFixes
+     * {@link org.eclipse.sirius.viewpoint.description.validation.ValidationRule#getFixes
      * <em>Fixes</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
      * 
      * @return the meta object for the containment reference list '
      *         <em>Fixes</em>'.
-     * @see org.eclipse.sirius.diagram.description.validation.ValidationRule#getFixes()
+     * @see org.eclipse.sirius.viewpoint.description.validation.ValidationRule#getFixes()
      * @see #getValidationRule()
      * @generated
      */
@@ -520,23 +520,23 @@ public interface ValidationPackage extends EPackage {
 
     /**
      * Returns the meta object for class '
-     * {@link org.eclipse.sirius.diagram.description.validation.SemanticValidationRule
+     * {@link org.eclipse.sirius.viewpoint.description.validation.SemanticValidationRule
      * <em>Semantic Validation Rule</em>}'. <!-- begin-user-doc --> <!--
      * end-user-doc -->
      * 
      * @return the meta object for class '<em>Semantic Validation Rule</em>'.
-     * @see org.eclipse.sirius.diagram.description.validation.SemanticValidationRule
+     * @see org.eclipse.sirius.viewpoint.description.validation.SemanticValidationRule
      * @generated
      */
     EClass getSemanticValidationRule();
 
     /**
      * Returns the meta object for the attribute '
-     * {@link org.eclipse.sirius.diagram.description.validation.SemanticValidationRule#getTargetClass
+     * {@link org.eclipse.sirius.viewpoint.description.validation.SemanticValidationRule#getTargetClass
      * <em>Target Class</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
      * 
      * @return the meta object for the attribute '<em>Target Class</em>'.
-     * @see org.eclipse.sirius.diagram.description.validation.SemanticValidationRule#getTargetClass()
+     * @see org.eclipse.sirius.viewpoint.description.validation.SemanticValidationRule#getTargetClass()
      * @see #getSemanticValidationRule()
      * @generated
      */
@@ -544,23 +544,23 @@ public interface ValidationPackage extends EPackage {
 
     /**
      * Returns the meta object for class '
-     * {@link org.eclipse.sirius.diagram.description.validation.ViewValidationRule
+     * {@link org.eclipse.sirius.viewpoint.description.validation.ViewValidationRule
      * <em>View Validation Rule</em>}'. <!-- begin-user-doc --> <!--
      * end-user-doc -->
      * 
      * @return the meta object for class '<em>View Validation Rule</em>'.
-     * @see org.eclipse.sirius.diagram.description.validation.ViewValidationRule
+     * @see org.eclipse.sirius.viewpoint.description.validation.ViewValidationRule
      * @generated
      */
     EClass getViewValidationRule();
 
     /**
      * Returns the meta object for the reference list '
-     * {@link org.eclipse.sirius.diagram.description.validation.ViewValidationRule#getTargets
+     * {@link org.eclipse.sirius.viewpoint.description.validation.ViewValidationRule#getTargets
      * <em>Targets</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
      * 
      * @return the meta object for the reference list '<em>Targets</em>'.
-     * @see org.eclipse.sirius.diagram.description.validation.ViewValidationRule#getTargets()
+     * @see org.eclipse.sirius.viewpoint.description.validation.ViewValidationRule#getTargets()
      * @see #getViewValidationRule()
      * @generated
      */
@@ -568,23 +568,23 @@ public interface ValidationPackage extends EPackage {
 
     /**
      * Returns the meta object for class '
-     * {@link org.eclipse.sirius.diagram.description.validation.RuleAudit
+     * {@link org.eclipse.sirius.viewpoint.description.validation.RuleAudit
      * <em>Rule Audit</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
      * 
      * @return the meta object for class '<em>Rule Audit</em>'.
-     * @see org.eclipse.sirius.diagram.description.validation.RuleAudit
+     * @see org.eclipse.sirius.viewpoint.description.validation.RuleAudit
      * @generated
      */
     EClass getRuleAudit();
 
     /**
      * Returns the meta object for the attribute '
-     * {@link org.eclipse.sirius.diagram.description.validation.RuleAudit#getAuditExpression
+     * {@link org.eclipse.sirius.viewpoint.description.validation.RuleAudit#getAuditExpression
      * <em>Audit Expression</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
      * 
      * @return the meta object for the attribute '<em>Audit Expression</em>'.
-     * @see org.eclipse.sirius.diagram.description.validation.RuleAudit#getAuditExpression()
+     * @see org.eclipse.sirius.viewpoint.description.validation.RuleAudit#getAuditExpression()
      * @see #getRuleAudit()
      * @generated
      */
@@ -592,22 +592,22 @@ public interface ValidationPackage extends EPackage {
 
     /**
      * Returns the meta object for class '
-     * {@link org.eclipse.sirius.diagram.description.validation.ValidationFix
+     * {@link org.eclipse.sirius.viewpoint.description.validation.ValidationFix
      * <em>Fix</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
      * 
      * @return the meta object for class '<em>Fix</em>'.
-     * @see org.eclipse.sirius.diagram.description.validation.ValidationFix
+     * @see org.eclipse.sirius.viewpoint.description.validation.ValidationFix
      * @generated
      */
     EClass getValidationFix();
 
     /**
      * Returns the meta object for the attribute '
-     * {@link org.eclipse.sirius.diagram.description.validation.ValidationFix#getName
+     * {@link org.eclipse.sirius.viewpoint.description.validation.ValidationFix#getName
      * <em>Name</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
      * 
      * @return the meta object for the attribute '<em>Name</em>'.
-     * @see org.eclipse.sirius.diagram.description.validation.ValidationFix#getName()
+     * @see org.eclipse.sirius.viewpoint.description.validation.ValidationFix#getName()
      * @see #getValidationFix()
      * @generated
      */
@@ -615,13 +615,13 @@ public interface ValidationPackage extends EPackage {
 
     /**
      * Returns the meta object for the containment reference '
-     * {@link org.eclipse.sirius.diagram.description.validation.ValidationFix#getInitialOperation
+     * {@link org.eclipse.sirius.viewpoint.description.validation.ValidationFix#getInitialOperation
      * <em>Initial Operation</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
      * 
      * @return the meta object for the containment reference '
      *         <em>Initial Operation</em>'.
-     * @see org.eclipse.sirius.diagram.description.validation.ValidationFix#getInitialOperation()
+     * @see org.eclipse.sirius.viewpoint.description.validation.ValidationFix#getInitialOperation()
      * @see #getValidationFix()
      * @generated
      */
@@ -629,11 +629,11 @@ public interface ValidationPackage extends EPackage {
 
     /**
      * Returns the meta object for enum '
-     * {@link org.eclipse.sirius.diagram.description.validation.ERROR_LEVEL
+     * {@link org.eclipse.sirius.viewpoint.description.validation.ERROR_LEVEL
      * <em>ERROR LEVEL</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
      * 
      * @return the meta object for enum '<em>ERROR LEVEL</em>'.
-     * @see org.eclipse.sirius.diagram.description.validation.ERROR_LEVEL
+     * @see org.eclipse.sirius.viewpoint.description.validation.ERROR_LEVEL
      * @generated
      */
     EEnum getERROR_LEVEL();
@@ -663,31 +663,31 @@ public interface ValidationPackage extends EPackage {
     interface Literals {
         /**
          * The meta object literal for the '
-         * {@link org.eclipse.sirius.diagram.description.validation.impl.ValidationSetImpl
+         * {@link org.eclipse.sirius.viewpoint.description.validation.impl.ValidationSetImpl
          * <em>Set</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
          * 
-         * @see org.eclipse.sirius.diagram.description.validation.impl.ValidationSetImpl
-         * @see org.eclipse.sirius.diagram.description.validation.impl.ValidationPackageImpl#getValidationSet()
+         * @see org.eclipse.sirius.viewpoint.description.validation.impl.ValidationSetImpl
+         * @see org.eclipse.sirius.viewpoint.description.validation.impl.ValidationPackageImpl#getValidationSet()
          * @generated
          */
         EClass VALIDATION_SET = eINSTANCE.getValidationSet();
 
         /**
-         * The meta object literal for the '<em><b>Owned Rules</b></em>'
-         * containment reference list feature. <!-- begin-user-doc --> <!--
-         * end-user-doc -->
+         * The meta object literal for the '<em><b>Name</b></em>' attribute
+         * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
          * 
          * @generated
          */
-        EReference VALIDATION_SET__OWNED_RULES = eINSTANCE.getValidationSet_OwnedRules();
+        EAttribute VALIDATION_SET__NAME = eINSTANCE.getValidationSet_Name();
 
         /**
-         * The meta object literal for the '<em><b>Name</b></em>' attribute
-         * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+         * The meta object literal for the '<em><b>Owned Rules</b></em>'
+         * containment reference list feature. <!-- begin-user-doc --> <!--
+         * end-user-doc -->
          * 
          * @generated
          */
-        EAttribute VALIDATION_SET__NAME = eINSTANCE.getValidationSet_Name();
+        EReference VALIDATION_SET__OWNED_RULES = eINSTANCE.getValidationSet_OwnedRules();
 
         /**
          * The meta object literal for the '<em><b>Reused Rules</b></em>'
@@ -707,11 +707,11 @@ public interface ValidationPackage extends EPackage {
 
         /**
          * The meta object literal for the '
-         * {@link org.eclipse.sirius.diagram.description.validation.impl.ValidationRuleImpl
+         * {@link org.eclipse.sirius.viewpoint.description.validation.impl.ValidationRuleImpl
          * <em>Rule</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
          * 
-         * @see org.eclipse.sirius.diagram.description.validation.impl.ValidationRuleImpl
-         * @see org.eclipse.sirius.diagram.description.validation.impl.ValidationPackageImpl#getValidationRule()
+         * @see org.eclipse.sirius.viewpoint.description.validation.impl.ValidationRuleImpl
+         * @see org.eclipse.sirius.viewpoint.description.validation.impl.ValidationPackageImpl#getValidationRule()
          * @generated
          */
         EClass VALIDATION_RULE = eINSTANCE.getValidationRule();
@@ -750,12 +750,12 @@ public interface ValidationPackage extends EPackage {
 
         /**
          * The meta object literal for the '
-         * {@link org.eclipse.sirius.diagram.description.validation.impl.SemanticValidationRuleImpl
+         * {@link org.eclipse.sirius.viewpoint.description.validation.impl.SemanticValidationRuleImpl
          * <em>Semantic Validation Rule</em>}' class. <!-- begin-user-doc -->
          * <!-- end-user-doc -->
          * 
-         * @see org.eclipse.sirius.diagram.description.validation.impl.SemanticValidationRuleImpl
-         * @see org.eclipse.sirius.diagram.description.validation.impl.ValidationPackageImpl#getSemanticValidationRule()
+         * @see org.eclipse.sirius.viewpoint.description.validation.impl.SemanticValidationRuleImpl
+         * @see org.eclipse.sirius.viewpoint.description.validation.impl.ValidationPackageImpl#getSemanticValidationRule()
          * @generated
          */
         EClass SEMANTIC_VALIDATION_RULE = eINSTANCE.getSemanticValidationRule();
@@ -770,12 +770,12 @@ public interface ValidationPackage extends EPackage {
 
         /**
          * The meta object literal for the '
-         * {@link org.eclipse.sirius.diagram.description.validation.impl.ViewValidationRuleImpl
+         * {@link org.eclipse.sirius.viewpoint.description.validation.impl.ViewValidationRuleImpl
          * <em>View Validation Rule</em>}' class. <!-- begin-user-doc --> <!--
          * end-user-doc -->
          * 
-         * @see org.eclipse.sirius.diagram.description.validation.impl.ViewValidationRuleImpl
-         * @see org.eclipse.sirius.diagram.description.validation.impl.ValidationPackageImpl#getViewValidationRule()
+         * @see org.eclipse.sirius.viewpoint.description.validation.impl.ViewValidationRuleImpl
+         * @see org.eclipse.sirius.viewpoint.description.validation.impl.ValidationPackageImpl#getViewValidationRule()
          * @generated
          */
         EClass VIEW_VALIDATION_RULE = eINSTANCE.getViewValidationRule();
@@ -790,12 +790,12 @@ public interface ValidationPackage extends EPackage {
 
         /**
          * The meta object literal for the '
-         * {@link org.eclipse.sirius.diagram.description.validation.impl.RuleAuditImpl
+         * {@link org.eclipse.sirius.viewpoint.description.validation.impl.RuleAuditImpl
          * <em>Rule Audit</em>}' class. <!-- begin-user-doc --> <!--
          * end-user-doc -->
          * 
-         * @see org.eclipse.sirius.diagram.description.validation.impl.RuleAuditImpl
-         * @see org.eclipse.sirius.diagram.description.validation.impl.ValidationPackageImpl#getRuleAudit()
+         * @see org.eclipse.sirius.viewpoint.description.validation.impl.RuleAuditImpl
+         * @see org.eclipse.sirius.viewpoint.description.validation.impl.ValidationPackageImpl#getRuleAudit()
          * @generated
          */
         EClass RULE_AUDIT = eINSTANCE.getRuleAudit();
@@ -810,11 +810,11 @@ public interface ValidationPackage extends EPackage {
 
         /**
          * The meta object literal for the '
-         * {@link org.eclipse.sirius.diagram.description.validation.impl.ValidationFixImpl
+         * {@link org.eclipse.sirius.viewpoint.description.validation.impl.ValidationFixImpl
          * <em>Fix</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
          * 
-         * @see org.eclipse.sirius.diagram.description.validation.impl.ValidationFixImpl
-         * @see org.eclipse.sirius.diagram.description.validation.impl.ValidationPackageImpl#getValidationFix()
+         * @see org.eclipse.sirius.viewpoint.description.validation.impl.ValidationFixImpl
+         * @see org.eclipse.sirius.viewpoint.description.validation.impl.ValidationPackageImpl#getValidationFix()
          * @generated
          */
         EClass VALIDATION_FIX = eINSTANCE.getValidationFix();
@@ -838,12 +838,12 @@ public interface ValidationPackage extends EPackage {
 
         /**
          * The meta object literal for the '
-         * {@link org.eclipse.sirius.diagram.description.validation.ERROR_LEVEL
+         * {@link org.eclipse.sirius.viewpoint.description.validation.ERROR_LEVEL
          * <em>ERROR LEVEL</em>}' enum. <!-- begin-user-doc --> <!--
          * end-user-doc -->
          * 
-         * @see org.eclipse.sirius.diagram.description.validation.ERROR_LEVEL
-         * @see org.eclipse.sirius.diagram.description.validation.impl.ValidationPackageImpl#getERROR_LEVEL()
+         * @see org.eclipse.sirius.viewpoint.description.validation.ERROR_LEVEL
+         * @see org.eclipse.sirius.viewpoint.description.validation.impl.ValidationPackageImpl#getERROR_LEVEL()
          * @generated
          */
         EEnum ERROR_LEVEL = eINSTANCE.getERROR_LEVEL();
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/validation/ValidationRule.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/validation/ValidationRule.java
index c7697b25ef..4d0bdf846e 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/validation/ValidationRule.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/validation/ValidationRule.java
@@ -9,7 +9,7 @@
  *    Obeo - initial API and implementation
  * 
  */
-package org.eclipse.sirius.diagram.description.validation;
+package org.eclipse.sirius.viewpoint.description.validation;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EObject;
@@ -24,21 +24,21 @@ import org.eclipse.emf.ecore.EObject;
  * The following features are supported:
  * <ul>
  * <li>
- * {@link org.eclipse.sirius.diagram.description.validation.ValidationRule#getLevel
+ * {@link org.eclipse.sirius.viewpoint.description.validation.ValidationRule#getLevel
  * <em>Level</em>}</li>
  * <li>
- * {@link org.eclipse.sirius.diagram.description.validation.ValidationRule#getMessage
+ * {@link org.eclipse.sirius.viewpoint.description.validation.ValidationRule#getMessage
  * <em>Message</em>}</li>
  * <li>
- * {@link org.eclipse.sirius.diagram.description.validation.ValidationRule#getAudits
+ * {@link org.eclipse.sirius.viewpoint.description.validation.ValidationRule#getAudits
  * <em>Audits</em>}</li>
  * <li>
- * {@link org.eclipse.sirius.diagram.description.validation.ValidationRule#getFixes
+ * {@link org.eclipse.sirius.viewpoint.description.validation.ValidationRule#getFixes
  * <em>Fixes</em>}</li>
  * </ul>
  * </p>
  * 
- * @see org.eclipse.sirius.diagram.description.validation.ValidationPackage#getValidationRule()
+ * @see org.eclipse.sirius.viewpoint.description.validation.ValidationPackage#getValidationRule()
  * @model abstract="true"
  * @generated
  */
@@ -46,7 +46,7 @@ public interface ValidationRule extends EObject {
     /**
      * Returns the value of the '<em><b>Level</b></em>' attribute. The default
      * value is <code>"INFO"</code>. The literals are from the enumeration
-     * {@link org.eclipse.sirius.diagram.description.validation.ERROR_LEVEL}.
+     * {@link org.eclipse.sirius.viewpoint.description.validation.ERROR_LEVEL}.
      * <!-- begin-user-doc -->
      * <p>
      * If the meaning of the '<em>Level</em>' attribute isn't clear, there
@@ -55,9 +55,9 @@ public interface ValidationRule extends EObject {
      * <!-- end-user-doc -->
      * 
      * @return the value of the '<em>Level</em>' attribute.
-     * @see org.eclipse.sirius.diagram.description.validation.ERROR_LEVEL
+     * @see org.eclipse.sirius.viewpoint.description.validation.ERROR_LEVEL
      * @see #setLevel(ERROR_LEVEL)
-     * @see org.eclipse.sirius.diagram.description.validation.ValidationPackage#getValidationRule_Level()
+     * @see org.eclipse.sirius.viewpoint.description.validation.ValidationPackage#getValidationRule_Level()
      * @model default="INFO" required="true"
      * @generated
      */
@@ -65,12 +65,12 @@ public interface ValidationRule extends EObject {
 
     /**
      * Sets the value of the '
-     * {@link org.eclipse.sirius.diagram.description.validation.ValidationRule#getLevel
+     * {@link org.eclipse.sirius.viewpoint.description.validation.ValidationRule#getLevel
      * <em>Level</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
      * 
      * @param value
      *            the new value of the '<em>Level</em>' attribute.
-     * @see org.eclipse.sirius.diagram.description.validation.ERROR_LEVEL
+     * @see org.eclipse.sirius.viewpoint.description.validation.ERROR_LEVEL
      * @see #getLevel()
      * @generated
      */
@@ -88,7 +88,7 @@ public interface ValidationRule extends EObject {
      * 
      * @return the value of the '<em>Message</em>' attribute.
      * @see #setMessage(String)
-     * @see org.eclipse.sirius.diagram.description.validation.ValidationPackage#getValidationRule_Message()
+     * @see org.eclipse.sirius.viewpoint.description.validation.ValidationPackage#getValidationRule_Message()
      * @model default="The <%name%> element has..." dataType=
      *        "org.eclipse.sirius.viewpoint.description.InterpretedExpression"
      *        annotation=
@@ -99,7 +99,7 @@ public interface ValidationRule extends EObject {
 
     /**
      * Sets the value of the '
-     * {@link org.eclipse.sirius.diagram.description.validation.ValidationRule#getMessage
+     * {@link org.eclipse.sirius.viewpoint.description.validation.ValidationRule#getMessage
      * <em>Message</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
      * 
@@ -113,8 +113,8 @@ public interface ValidationRule extends EObject {
     /**
      * Returns the value of the '<em><b>Audits</b></em>' containment reference
      * list. The list contents are of type
-     * {@link org.eclipse.sirius.diagram.description.validation.RuleAudit}. <!--
-     * begin-user-doc -->
+     * {@link org.eclipse.sirius.viewpoint.description.validation.RuleAudit}.
+     * <!-- begin-user-doc -->
      * <p>
      * If the meaning of the '<em>Audits</em>' containment reference list isn't
      * clear, there really should be more of a description here...
@@ -122,7 +122,7 @@ public interface ValidationRule extends EObject {
      * <!-- end-user-doc -->
      * 
      * @return the value of the '<em>Audits</em>' containment reference list.
-     * @see org.eclipse.sirius.diagram.description.validation.ValidationPackage#getValidationRule_Audits()
+     * @see org.eclipse.sirius.viewpoint.description.validation.ValidationPackage#getValidationRule_Audits()
      * @model containment="true" resolveProxies="true"
      * @generated
      */
@@ -131,8 +131,8 @@ public interface ValidationRule extends EObject {
     /**
      * Returns the value of the '<em><b>Fixes</b></em>' containment reference
      * list. The list contents are of type
-     * {@link org.eclipse.sirius.diagram.description.validation.ValidationFix}.
-     * <!-- begin-user-doc -->
+     * {@link org.eclipse.sirius.viewpoint.description.validation.ValidationFix}
+     * . <!-- begin-user-doc -->
      * <p>
      * If the meaning of the '<em>Fixes</em>' containment reference list isn't
      * clear, there really should be more of a description here...
@@ -140,7 +140,7 @@ public interface ValidationRule extends EObject {
      * <!-- end-user-doc -->
      * 
      * @return the value of the '<em>Fixes</em>' containment reference list.
-     * @see org.eclipse.sirius.diagram.description.validation.ValidationPackage#getValidationRule_Fixes()
+     * @see org.eclipse.sirius.viewpoint.description.validation.ValidationPackage#getValidationRule_Fixes()
      * @model containment="true" resolveProxies="true"
      * @generated
      */
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/validation/ValidationSet.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/validation/ValidationSet.java
index 2a0fd8945e..7f0270e595 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/validation/ValidationSet.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/validation/ValidationSet.java
@@ -9,7 +9,7 @@
  *    Obeo - initial API and implementation
  * 
  */
-package org.eclipse.sirius.diagram.description.validation;
+package org.eclipse.sirius.viewpoint.description.validation;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.sirius.viewpoint.description.DocumentedElement;
@@ -24,48 +24,33 @@ import org.eclipse.sirius.viewpoint.description.DocumentedElement;
  * The following features are supported:
  * <ul>
  * <li>
- * {@link org.eclipse.sirius.diagram.description.validation.ValidationSet#getOwnedRules
- * <em>Owned Rules</em>}</li>
- * <li>
- * {@link org.eclipse.sirius.diagram.description.validation.ValidationSet#getName
+ * {@link org.eclipse.sirius.viewpoint.description.validation.ValidationSet#getName
  * <em>Name</em>}</li>
  * <li>
- * {@link org.eclipse.sirius.diagram.description.validation.ValidationSet#getReusedRules
+ * {@link org.eclipse.sirius.viewpoint.description.validation.ValidationSet#getOwnedRules
+ * <em>Owned Rules</em>}</li>
+ * <li>
+ * {@link org.eclipse.sirius.viewpoint.description.validation.ValidationSet#getReusedRules
  * <em>Reused Rules</em>}</li>
  * <li>
- * {@link org.eclipse.sirius.diagram.description.validation.ValidationSet#getAllRules
+ * {@link org.eclipse.sirius.viewpoint.description.validation.ValidationSet#getAllRules
  * <em>All Rules</em>}</li>
  * </ul>
  * </p>
  * 
- * @see org.eclipse.sirius.diagram.description.validation.ValidationPackage#getValidationSet()
+ * @see org.eclipse.sirius.viewpoint.description.validation.ValidationPackage#getValidationSet()
  * @model
  * @generated
  */
 public interface ValidationSet extends DocumentedElement {
     /**
-     * Returns the value of the '<em><b>Owned Rules</b></em>' containment
-     * reference list. The list contents are of type
-     * {@link org.eclipse.sirius.diagram.description.validation.ValidationRule}.
-     * <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc -->
-     * The validation rules owned by this set. <!-- end-model-doc -->
-     * 
-     * @return the value of the '<em>Owned Rules</em>' containment reference
-     *         list.
-     * @see org.eclipse.sirius.diagram.description.validation.ValidationPackage#getValidationSet_OwnedRules()
-     * @model containment="true" resolveProxies="true"
-     * @generated
-     */
-    EList<ValidationRule> getOwnedRules();
-
-    /**
      * Returns the value of the '<em><b>Name</b></em>' attribute. The default
      * value is <code>""</code>. <!-- begin-user-doc --> <!-- end-user-doc -->
      * <!-- begin-model-doc --> The name of the set. <!-- end-model-doc -->
      * 
      * @return the value of the '<em>Name</em>' attribute.
      * @see #setName(String)
-     * @see org.eclipse.sirius.diagram.description.validation.ValidationPackage#getValidationSet_Name()
+     * @see org.eclipse.sirius.viewpoint.description.validation.ValidationPackage#getValidationSet_Name()
      * @model default=""
      * @generated
      */
@@ -73,7 +58,7 @@ public interface ValidationSet extends DocumentedElement {
 
     /**
      * Sets the value of the '
-     * {@link org.eclipse.sirius.diagram.description.validation.ValidationSet#getName
+     * {@link org.eclipse.sirius.viewpoint.description.validation.ValidationSet#getName
      * <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
      * 
      * @param value
@@ -84,14 +69,29 @@ public interface ValidationSet extends DocumentedElement {
     void setName(String value);
 
     /**
+     * Returns the value of the '<em><b>Owned Rules</b></em>' containment
+     * reference list. The list contents are of type
+     * {@link org.eclipse.sirius.viewpoint.description.validation.ValidationRule}
+     * . <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc -->
+     * The validation rules owned by this set. <!-- end-model-doc -->
+     * 
+     * @return the value of the '<em>Owned Rules</em>' containment reference
+     *         list.
+     * @see org.eclipse.sirius.viewpoint.description.validation.ValidationPackage#getValidationSet_OwnedRules()
+     * @model containment="true" resolveProxies="true"
+     * @generated
+     */
+    EList<ValidationRule> getOwnedRules();
+
+    /**
      * Returns the value of the '<em><b>Reused Rules</b></em>' reference list.
      * The list contents are of type
-     * {@link org.eclipse.sirius.diagram.description.validation.ValidationRule}.
-     * <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc -->
+     * {@link org.eclipse.sirius.viewpoint.description.validation.ValidationRule}
+     * . <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc -->
      * The validations rules that are reused by this set. <!-- end-model-doc -->
      * 
      * @return the value of the '<em>Reused Rules</em>' reference list.
-     * @see org.eclipse.sirius.diagram.description.validation.ValidationPackage#getValidationSet_ReusedRules()
+     * @see org.eclipse.sirius.viewpoint.description.validation.ValidationPackage#getValidationSet_ReusedRules()
      * @model
      * @generated
      */
@@ -100,12 +100,12 @@ public interface ValidationSet extends DocumentedElement {
     /**
      * Returns the value of the '<em><b>All Rules</b></em>' reference list. The
      * list contents are of type
-     * {@link org.eclipse.sirius.diagram.description.validation.ValidationRule}.
-     * <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc -->
+     * {@link org.eclipse.sirius.viewpoint.description.validation.ValidationRule}
+     * . <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc -->
      * All rules of the set. <!-- end-model-doc -->
      * 
      * @return the value of the '<em>All Rules</em>' reference list.
-     * @see org.eclipse.sirius.diagram.description.validation.ValidationPackage#getValidationSet_AllRules()
+     * @see org.eclipse.sirius.viewpoint.description.validation.ValidationPackage#getValidationSet_AllRules()
      * @model transient="true" changeable="false" volatile="true" derived="true"
      * @generated
      */
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/validation/ViewValidationRule.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/validation/ViewValidationRule.java
index 1a5cfd7732..f9ea3784af 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/validation/ViewValidationRule.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/validation/ViewValidationRule.java
@@ -9,10 +9,10 @@
  *    Obeo - initial API and implementation
  * 
  */
-package org.eclipse.sirius.diagram.description.validation;
+package org.eclipse.sirius.viewpoint.description.validation;
 
 import org.eclipse.emf.common.util.EList;
-import org.eclipse.sirius.diagram.description.DiagramElementMapping;
+import org.eclipse.sirius.viewpoint.description.RepresentationElementMapping;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '
@@ -25,12 +25,12 @@ import org.eclipse.sirius.diagram.description.DiagramElementMapping;
  * The following features are supported:
  * <ul>
  * <li>
- * {@link org.eclipse.sirius.diagram.description.validation.ViewValidationRule#getTargets
+ * {@link org.eclipse.sirius.viewpoint.description.validation.ViewValidationRule#getTargets
  * <em>Targets</em>}</li>
  * </ul>
  * </p>
  * 
- * @see org.eclipse.sirius.diagram.description.validation.ValidationPackage#getViewValidationRule()
+ * @see org.eclipse.sirius.viewpoint.description.validation.ValidationPackage#getViewValidationRule()
  * @model
  * @generated
  */
@@ -38,15 +38,15 @@ public interface ViewValidationRule extends ValidationRule {
     /**
      * Returns the value of the '<em><b>Targets</b></em>' reference list. The
      * list contents are of type
-     * {@link org.eclipse.sirius.diagram.description.DiagramElementMapping}.
-     * <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc -->
+     * {@link org.eclipse.sirius.viewpoint.description.RepresentationElementMapping}
+     * . <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc -->
      * The mapping to validate. <!-- end-model-doc -->
      * 
      * @return the value of the '<em>Targets</em>' reference list.
-     * @see org.eclipse.sirius.diagram.description.validation.ValidationPackage#getViewValidationRule_Targets()
+     * @see org.eclipse.sirius.viewpoint.description.validation.ValidationPackage#getViewValidationRule_Targets()
      * @model
      * @generated
      */
-    EList<DiagramElementMapping> getTargets();
+    EList<RepresentationElementMapping> getTargets();
 
 } // ViewValidationRule
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/validation/impl/RuleAuditImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/validation/impl/RuleAuditImpl.java
index ba0076d96d..caafcd275f 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/validation/impl/RuleAuditImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/validation/impl/RuleAuditImpl.java
@@ -9,14 +9,14 @@
  *    Obeo - initial API and implementation
  * 
  */
-package org.eclipse.sirius.diagram.description.validation.impl;
+package org.eclipse.sirius.viewpoint.description.validation.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.sirius.diagram.description.validation.RuleAudit;
-import org.eclipse.sirius.diagram.description.validation.ValidationPackage;
+import org.eclipse.sirius.viewpoint.description.validation.RuleAudit;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationPackage;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model object '
@@ -25,7 +25,7 @@ import org.eclipse.sirius.diagram.description.validation.ValidationPackage;
  * The following features are implemented:
  * <ul>
  * <li>
- * {@link org.eclipse.sirius.diagram.description.validation.impl.RuleAuditImpl#getAuditExpression
+ * {@link org.eclipse.sirius.viewpoint.description.validation.impl.RuleAuditImpl#getAuditExpression
  * <em>Audit Expression</em>}</li>
  * </ul>
  * </p>
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/validation/impl/SemanticValidationRuleImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/validation/impl/SemanticValidationRuleImpl.java
index 8ab3f8e25c..2fa93928ff 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/validation/impl/SemanticValidationRuleImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/validation/impl/SemanticValidationRuleImpl.java
@@ -9,13 +9,13 @@
  *    Obeo - initial API and implementation
  * 
  */
-package org.eclipse.sirius.diagram.description.validation.impl;
+package org.eclipse.sirius.viewpoint.description.validation.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.sirius.diagram.description.validation.SemanticValidationRule;
-import org.eclipse.sirius.diagram.description.validation.ValidationPackage;
+import org.eclipse.sirius.viewpoint.description.validation.SemanticValidationRule;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationPackage;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model object '
@@ -24,7 +24,7 @@ import org.eclipse.sirius.diagram.description.validation.ValidationPackage;
  * The following features are implemented:
  * <ul>
  * <li>
- * {@link org.eclipse.sirius.diagram.description.validation.impl.SemanticValidationRuleImpl#getTargetClass
+ * {@link org.eclipse.sirius.viewpoint.description.validation.impl.SemanticValidationRuleImpl#getTargetClass
  * <em>Target Class</em>}</li>
  * </ul>
  * </p>
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/validation/impl/ValidationFactoryImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/validation/impl/ValidationFactoryImpl.java
index ffb5146537..1aa3aaa608 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/validation/impl/ValidationFactoryImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/validation/impl/ValidationFactoryImpl.java
@@ -9,7 +9,7 @@
  *    Obeo - initial API and implementation
  * 
  */
-package org.eclipse.sirius.diagram.description.validation.impl;
+package org.eclipse.sirius.viewpoint.description.validation.impl;
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EDataType;
@@ -20,14 +20,14 @@ import org.eclipse.emf.ecore.plugin.EcorePlugin;
 import org.eclipse.sirius.business.internal.metamodel.description.validation.ValidationSetSpec;
 import org.eclipse.sirius.business.internal.metamodel.description.validation.spec.SemanticValidationRuleSpec;
 import org.eclipse.sirius.business.internal.metamodel.description.validation.spec.ViewValidationRuleSpec;
-import org.eclipse.sirius.diagram.description.validation.ERROR_LEVEL;
-import org.eclipse.sirius.diagram.description.validation.RuleAudit;
-import org.eclipse.sirius.diagram.description.validation.SemanticValidationRule;
-import org.eclipse.sirius.diagram.description.validation.ValidationFactory;
-import org.eclipse.sirius.diagram.description.validation.ValidationFix;
-import org.eclipse.sirius.diagram.description.validation.ValidationPackage;
-import org.eclipse.sirius.diagram.description.validation.ValidationSet;
-import org.eclipse.sirius.diagram.description.validation.ViewValidationRule;
+import org.eclipse.sirius.viewpoint.description.validation.ERROR_LEVEL;
+import org.eclipse.sirius.viewpoint.description.validation.RuleAudit;
+import org.eclipse.sirius.viewpoint.description.validation.SemanticValidationRule;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationFactory;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationFix;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationPackage;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationSet;
+import org.eclipse.sirius.viewpoint.description.validation.ViewValidationRule;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!--
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/validation/impl/ValidationFixImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/validation/impl/ValidationFixImpl.java
index 53fc3179bc..ea02c9dd25 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/validation/impl/ValidationFixImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/validation/impl/ValidationFixImpl.java
@@ -9,7 +9,7 @@
  *    Obeo - initial API and implementation
  * 
  */
-package org.eclipse.sirius.diagram.description.validation.impl;
+package org.eclipse.sirius.viewpoint.description.validation.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
@@ -17,9 +17,9 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.sirius.diagram.description.validation.ValidationFix;
-import org.eclipse.sirius.diagram.description.validation.ValidationPackage;
 import org.eclipse.sirius.viewpoint.description.tool.InitialOperation;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationFix;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationPackage;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model object '
@@ -28,10 +28,10 @@ import org.eclipse.sirius.viewpoint.description.tool.InitialOperation;
  * The following features are implemented:
  * <ul>
  * <li>
- * {@link org.eclipse.sirius.diagram.description.validation.impl.ValidationFixImpl#getName
+ * {@link org.eclipse.sirius.viewpoint.description.validation.impl.ValidationFixImpl#getName
  * <em>Name</em>}</li>
  * <li>
- * {@link org.eclipse.sirius.diagram.description.validation.impl.ValidationFixImpl#getInitialOperation
+ * {@link org.eclipse.sirius.viewpoint.description.validation.impl.ValidationFixImpl#getInitialOperation
  * <em>Initial Operation</em>}</li>
  * </ul>
  * </p>
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/validation/impl/ValidationPackageImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/validation/impl/ValidationPackageImpl.java
index 726aed89a0..2c0df26777 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/validation/impl/ValidationPackageImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/validation/impl/ValidationPackageImpl.java
@@ -9,7 +9,7 @@
  *    Obeo - initial API and implementation
  * 
  */
-package org.eclipse.sirius.diagram.description.validation.impl;
+package org.eclipse.sirius.viewpoint.description.validation.impl;
 
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
@@ -24,14 +24,6 @@ import org.eclipse.sirius.diagram.description.concern.ConcernPackage;
 import org.eclipse.sirius.diagram.description.concern.impl.ConcernPackageImpl;
 import org.eclipse.sirius.diagram.description.filter.FilterPackage;
 import org.eclipse.sirius.diagram.description.filter.impl.FilterPackageImpl;
-import org.eclipse.sirius.diagram.description.validation.RuleAudit;
-import org.eclipse.sirius.diagram.description.validation.SemanticValidationRule;
-import org.eclipse.sirius.diagram.description.validation.ValidationFactory;
-import org.eclipse.sirius.diagram.description.validation.ValidationFix;
-import org.eclipse.sirius.diagram.description.validation.ValidationPackage;
-import org.eclipse.sirius.diagram.description.validation.ValidationRule;
-import org.eclipse.sirius.diagram.description.validation.ValidationSet;
-import org.eclipse.sirius.diagram.description.validation.ViewValidationRule;
 import org.eclipse.sirius.diagram.impl.DiagramPackageImpl;
 import org.eclipse.sirius.viewpoint.ViewpointPackage;
 import org.eclipse.sirius.viewpoint.description.DescriptionPackage;
@@ -42,6 +34,14 @@ import org.eclipse.sirius.viewpoint.description.style.StylePackage;
 import org.eclipse.sirius.viewpoint.description.style.impl.StylePackageImpl;
 import org.eclipse.sirius.viewpoint.description.tool.ToolPackage;
 import org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl;
+import org.eclipse.sirius.viewpoint.description.validation.RuleAudit;
+import org.eclipse.sirius.viewpoint.description.validation.SemanticValidationRule;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationFactory;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationFix;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationPackage;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationRule;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationSet;
+import org.eclipse.sirius.viewpoint.description.validation.ViewValidationRule;
 import org.eclipse.sirius.viewpoint.impl.ViewpointPackageImpl;
 
 /**
@@ -111,7 +111,7 @@ public class ValidationPackageImpl extends EPackageImpl implements ValidationPac
      * begin-user-doc --> <!-- end-user-doc -->
      * 
      * @see org.eclipse.emf.ecore.EPackage.Registry
-     * @see org.eclipse.sirius.diagram.description.validation.ValidationPackage#eNS_URI
+     * @see org.eclipse.sirius.viewpoint.description.validation.ValidationPackage#eNS_URI
      * @see #init()
      * @generated
      */
@@ -231,8 +231,8 @@ public class ValidationPackageImpl extends EPackageImpl implements ValidationPac
      * 
      * @generated
      */
-    public EReference getValidationSet_OwnedRules() {
-        return (EReference) validationSetEClass.getEStructuralFeatures().get(0);
+    public EAttribute getValidationSet_Name() {
+        return (EAttribute) validationSetEClass.getEStructuralFeatures().get(0);
     }
 
     /**
@@ -240,8 +240,8 @@ public class ValidationPackageImpl extends EPackageImpl implements ValidationPac
      * 
      * @generated
      */
-    public EAttribute getValidationSet_Name() {
-        return (EAttribute) validationSetEClass.getEStructuralFeatures().get(1);
+    public EReference getValidationSet_OwnedRules() {
+        return (EReference) validationSetEClass.getEStructuralFeatures().get(1);
     }
 
     /**
@@ -427,8 +427,8 @@ public class ValidationPackageImpl extends EPackageImpl implements ValidationPac
 
         // Create classes and their features
         validationSetEClass = createEClass(VALIDATION_SET);
-        createEReference(validationSetEClass, VALIDATION_SET__OWNED_RULES);
         createEAttribute(validationSetEClass, VALIDATION_SET__NAME);
+        createEReference(validationSetEClass, VALIDATION_SET__OWNED_RULES);
         createEReference(validationSetEClass, VALIDATION_SET__REUSED_RULES);
         createEReference(validationSetEClass, VALIDATION_SET__ALL_RULES);
 
@@ -482,8 +482,6 @@ public class ValidationPackageImpl extends EPackageImpl implements ValidationPac
         // Obtain other dependent packages
         DescriptionPackage theDescriptionPackage = (DescriptionPackage) EPackage.Registry.INSTANCE.getEPackage(DescriptionPackage.eNS_URI);
         EcorePackage theEcorePackage = (EcorePackage) EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
-        org.eclipse.sirius.diagram.description.DescriptionPackage theDescriptionPackage_1 = (org.eclipse.sirius.diagram.description.DescriptionPackage) EPackage.Registry.INSTANCE
-                .getEPackage(org.eclipse.sirius.diagram.description.DescriptionPackage.eNS_URI);
         ToolPackage theToolPackage = (ToolPackage) EPackage.Registry.INSTANCE.getEPackage(ToolPackage.eNS_URI);
 
         // Create type parameters
@@ -497,10 +495,10 @@ public class ValidationPackageImpl extends EPackageImpl implements ValidationPac
 
         // Initialize classes and features; add operations and parameters
         initEClass(validationSetEClass, ValidationSet.class, "ValidationSet", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getValidationSet_OwnedRules(), this.getValidationRule(), null, "ownedRules", null, 0, -1, ValidationSet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
-                IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
         initEAttribute(getValidationSet_Name(), ecorePackage.getEString(), "name", "", 0, 1, ValidationSet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
                 !IS_DERIVED, IS_ORDERED);
+        initEReference(getValidationSet_OwnedRules(), this.getValidationRule(), null, "ownedRules", null, 0, -1, ValidationSet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
+                IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
         initEReference(getValidationSet_ReusedRules(), this.getValidationRule(), null, "reusedRules", null, 0, -1, ValidationSet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
                 IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
         initEReference(getValidationSet_AllRules(), this.getValidationRule(), null, "allRules", null, 0, -1, ValidationSet.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE,
@@ -527,7 +525,7 @@ public class ValidationPackageImpl extends EPackageImpl implements ValidationPac
                 IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
         initEClass(viewValidationRuleEClass, ViewValidationRule.class, "ViewValidationRule", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getViewValidationRule_Targets(), theDescriptionPackage_1.getDiagramElementMapping(), null, "targets", null, 0, -1, ViewValidationRule.class, !IS_TRANSIENT, !IS_VOLATILE,
+        initEReference(getViewValidationRule_Targets(), theDescriptionPackage.getRepresentationElementMapping(), null, "targets", null, 0, -1, ViewValidationRule.class, !IS_TRANSIENT, !IS_VOLATILE,
                 IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
         initEClass(ruleAuditEClass, RuleAudit.class, "RuleAudit", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -541,10 +539,10 @@ public class ValidationPackageImpl extends EPackageImpl implements ValidationPac
                 IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
         // Initialize enums and add enum literals
-        initEEnum(erroR_LEVELEEnum, org.eclipse.sirius.diagram.description.validation.ERROR_LEVEL.class, "ERROR_LEVEL");
-        addEEnumLiteral(erroR_LEVELEEnum, org.eclipse.sirius.diagram.description.validation.ERROR_LEVEL.INFO_LITERAL);
-        addEEnumLiteral(erroR_LEVELEEnum, org.eclipse.sirius.diagram.description.validation.ERROR_LEVEL.WARNING_LITERAL);
-        addEEnumLiteral(erroR_LEVELEEnum, org.eclipse.sirius.diagram.description.validation.ERROR_LEVEL.ERROR_LITERAL);
+        initEEnum(erroR_LEVELEEnum, org.eclipse.sirius.viewpoint.description.validation.ERROR_LEVEL.class, "ERROR_LEVEL");
+        addEEnumLiteral(erroR_LEVELEEnum, org.eclipse.sirius.viewpoint.description.validation.ERROR_LEVEL.INFO_LITERAL);
+        addEEnumLiteral(erroR_LEVELEEnum, org.eclipse.sirius.viewpoint.description.validation.ERROR_LEVEL.WARNING_LITERAL);
+        addEEnumLiteral(erroR_LEVELEEnum, org.eclipse.sirius.viewpoint.description.validation.ERROR_LEVEL.ERROR_LITERAL);
 
         // Create annotations
         // http://www.eclipse.org/sirius/interpreted/expression/returnType
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/validation/impl/ValidationRuleImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/validation/impl/ValidationRuleImpl.java
index 5474e9904c..4ba76b4507 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/validation/impl/ValidationRuleImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/validation/impl/ValidationRuleImpl.java
@@ -9,7 +9,7 @@
  *    Obeo - initial API and implementation
  * 
  */
-package org.eclipse.sirius.diagram.description.validation.impl;
+package org.eclipse.sirius.viewpoint.description.validation.impl;
 
 import java.util.Collection;
 
@@ -23,11 +23,11 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.sirius.diagram.description.validation.ERROR_LEVEL;
-import org.eclipse.sirius.diagram.description.validation.RuleAudit;
-import org.eclipse.sirius.diagram.description.validation.ValidationFix;
-import org.eclipse.sirius.diagram.description.validation.ValidationPackage;
-import org.eclipse.sirius.diagram.description.validation.ValidationRule;
+import org.eclipse.sirius.viewpoint.description.validation.ERROR_LEVEL;
+import org.eclipse.sirius.viewpoint.description.validation.RuleAudit;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationFix;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationPackage;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationRule;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model object '
@@ -36,16 +36,16 @@ import org.eclipse.sirius.diagram.description.validation.ValidationRule;
  * The following features are implemented:
  * <ul>
  * <li>
- * {@link org.eclipse.sirius.diagram.description.validation.impl.ValidationRuleImpl#getLevel
+ * {@link org.eclipse.sirius.viewpoint.description.validation.impl.ValidationRuleImpl#getLevel
  * <em>Level</em>}</li>
  * <li>
- * {@link org.eclipse.sirius.diagram.description.validation.impl.ValidationRuleImpl#getMessage
+ * {@link org.eclipse.sirius.viewpoint.description.validation.impl.ValidationRuleImpl#getMessage
  * <em>Message</em>}</li>
  * <li>
- * {@link org.eclipse.sirius.diagram.description.validation.impl.ValidationRuleImpl#getAudits
+ * {@link org.eclipse.sirius.viewpoint.description.validation.impl.ValidationRuleImpl#getAudits
  * <em>Audits</em>}</li>
  * <li>
- * {@link org.eclipse.sirius.diagram.description.validation.impl.ValidationRuleImpl#getFixes
+ * {@link org.eclipse.sirius.viewpoint.description.validation.impl.ValidationRuleImpl#getFixes
  * <em>Fixes</em>}</li>
  * </ul>
  * </p>
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/validation/impl/ValidationSetImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/validation/impl/ValidationSetImpl.java
index 9ffd4db87f..a32858b534 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/validation/impl/ValidationSetImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/validation/impl/ValidationSetImpl.java
@@ -9,7 +9,7 @@
  *    Obeo - initial API and implementation
  * 
  */
-package org.eclipse.sirius.diagram.description.validation.impl;
+package org.eclipse.sirius.viewpoint.description.validation.impl;
 
 import java.util.Collection;
 
@@ -22,10 +22,10 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.EObjectResolvingEList;
 import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.sirius.diagram.description.validation.ValidationPackage;
-import org.eclipse.sirius.diagram.description.validation.ValidationRule;
-import org.eclipse.sirius.diagram.description.validation.ValidationSet;
 import org.eclipse.sirius.viewpoint.description.impl.DocumentedElementImpl;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationPackage;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationRule;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationSet;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model object '
@@ -34,16 +34,16 @@ import org.eclipse.sirius.viewpoint.description.impl.DocumentedElementImpl;
  * The following features are implemented:
  * <ul>
  * <li>
- * {@link org.eclipse.sirius.diagram.description.validation.impl.ValidationSetImpl#getOwnedRules
- * <em>Owned Rules</em>}</li>
- * <li>
- * {@link org.eclipse.sirius.diagram.description.validation.impl.ValidationSetImpl#getName
+ * {@link org.eclipse.sirius.viewpoint.description.validation.impl.ValidationSetImpl#getName
  * <em>Name</em>}</li>
  * <li>
- * {@link org.eclipse.sirius.diagram.description.validation.impl.ValidationSetImpl#getReusedRules
+ * {@link org.eclipse.sirius.viewpoint.description.validation.impl.ValidationSetImpl#getOwnedRules
+ * <em>Owned Rules</em>}</li>
+ * <li>
+ * {@link org.eclipse.sirius.viewpoint.description.validation.impl.ValidationSetImpl#getReusedRules
  * <em>Reused Rules</em>}</li>
  * <li>
- * {@link org.eclipse.sirius.diagram.description.validation.impl.ValidationSetImpl#getAllRules
+ * {@link org.eclipse.sirius.viewpoint.description.validation.impl.ValidationSetImpl#getAllRules
  * <em>All Rules</em>}</li>
  * </ul>
  * </p>
@@ -52,16 +52,6 @@ import org.eclipse.sirius.viewpoint.description.impl.DocumentedElementImpl;
  */
 public class ValidationSetImpl extends DocumentedElementImpl implements ValidationSet {
     /**
-     * The cached value of the '{@link #getOwnedRules() <em>Owned Rules</em>}'
-     * containment reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @see #getOwnedRules()
-     * @generated
-     * @ordered
-     */
-    protected EList<ValidationRule> ownedRules;
-
-    /**
      * The default value of the '{@link #getName() <em>Name</em>}' attribute.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
      * 
@@ -82,6 +72,16 @@ public class ValidationSetImpl extends DocumentedElementImpl implements Validati
     protected String name = NAME_EDEFAULT;
 
     /**
+     * The cached value of the '{@link #getOwnedRules() <em>Owned Rules</em>}'
+     * containment reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @see #getOwnedRules()
+     * @generated
+     * @ordered
+     */
+    protected EList<ValidationRule> ownedRules;
+
+    /**
      * The cached value of the '{@link #getReusedRules() <em>Reused Rules</em>}'
      * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
      * 
@@ -115,18 +115,6 @@ public class ValidationSetImpl extends DocumentedElementImpl implements Validati
      * 
      * @generated
      */
-    public EList<ValidationRule> getOwnedRules() {
-        if (ownedRules == null) {
-            ownedRules = new EObjectContainmentEList.Resolving<ValidationRule>(ValidationRule.class, this, ValidationPackage.VALIDATION_SET__OWNED_RULES);
-        }
-        return ownedRules;
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
     public String getName() {
         return name;
     }
@@ -148,6 +136,18 @@ public class ValidationSetImpl extends DocumentedElementImpl implements Validati
      * 
      * @generated
      */
+    public EList<ValidationRule> getOwnedRules() {
+        if (ownedRules == null) {
+            ownedRules = new EObjectContainmentEList.Resolving<ValidationRule>(ValidationRule.class, this, ValidationPackage.VALIDATION_SET__OWNED_RULES);
+        }
+        return ownedRules;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
     public EList<ValidationRule> getReusedRules() {
         if (reusedRules == null) {
             reusedRules = new EObjectResolvingEList<ValidationRule>(ValidationRule.class, this, ValidationPackage.VALIDATION_SET__REUSED_RULES);
@@ -193,10 +193,10 @@ public class ValidationSetImpl extends DocumentedElementImpl implements Validati
     @Override
     public Object eGet(int featureID, boolean resolve, boolean coreType) {
         switch (featureID) {
-        case ValidationPackage.VALIDATION_SET__OWNED_RULES:
-            return getOwnedRules();
         case ValidationPackage.VALIDATION_SET__NAME:
             return getName();
+        case ValidationPackage.VALIDATION_SET__OWNED_RULES:
+            return getOwnedRules();
         case ValidationPackage.VALIDATION_SET__REUSED_RULES:
             return getReusedRules();
         case ValidationPackage.VALIDATION_SET__ALL_RULES:
@@ -214,13 +214,13 @@ public class ValidationSetImpl extends DocumentedElementImpl implements Validati
     @Override
     public void eSet(int featureID, Object newValue) {
         switch (featureID) {
+        case ValidationPackage.VALIDATION_SET__NAME:
+            setName((String) newValue);
+            return;
         case ValidationPackage.VALIDATION_SET__OWNED_RULES:
             getOwnedRules().clear();
             getOwnedRules().addAll((Collection<? extends ValidationRule>) newValue);
             return;
-        case ValidationPackage.VALIDATION_SET__NAME:
-            setName((String) newValue);
-            return;
         case ValidationPackage.VALIDATION_SET__REUSED_RULES:
             getReusedRules().clear();
             getReusedRules().addAll((Collection<? extends ValidationRule>) newValue);
@@ -237,12 +237,12 @@ public class ValidationSetImpl extends DocumentedElementImpl implements Validati
     @Override
     public void eUnset(int featureID) {
         switch (featureID) {
-        case ValidationPackage.VALIDATION_SET__OWNED_RULES:
-            getOwnedRules().clear();
-            return;
         case ValidationPackage.VALIDATION_SET__NAME:
             setName(NAME_EDEFAULT);
             return;
+        case ValidationPackage.VALIDATION_SET__OWNED_RULES:
+            getOwnedRules().clear();
+            return;
         case ValidationPackage.VALIDATION_SET__REUSED_RULES:
             getReusedRules().clear();
             return;
@@ -258,10 +258,10 @@ public class ValidationSetImpl extends DocumentedElementImpl implements Validati
     @Override
     public boolean eIsSet(int featureID) {
         switch (featureID) {
-        case ValidationPackage.VALIDATION_SET__OWNED_RULES:
-            return ownedRules != null && !ownedRules.isEmpty();
         case ValidationPackage.VALIDATION_SET__NAME:
             return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+        case ValidationPackage.VALIDATION_SET__OWNED_RULES:
+            return ownedRules != null && !ownedRules.isEmpty();
         case ValidationPackage.VALIDATION_SET__REUSED_RULES:
             return reusedRules != null && !reusedRules.isEmpty();
         case ValidationPackage.VALIDATION_SET__ALL_RULES:
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/validation/impl/ViewValidationRuleImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/validation/impl/ViewValidationRuleImpl.java
index 436302aaa8..89be9d2da1 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/validation/impl/ViewValidationRuleImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/validation/impl/ViewValidationRuleImpl.java
@@ -9,16 +9,16 @@
  *    Obeo - initial API and implementation
  * 
  */
-package org.eclipse.sirius.diagram.description.validation.impl;
+package org.eclipse.sirius.viewpoint.description.validation.impl;
 
 import java.util.Collection;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-import org.eclipse.sirius.diagram.description.DiagramElementMapping;
-import org.eclipse.sirius.diagram.description.validation.ValidationPackage;
-import org.eclipse.sirius.diagram.description.validation.ViewValidationRule;
+import org.eclipse.sirius.viewpoint.description.RepresentationElementMapping;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationPackage;
+import org.eclipse.sirius.viewpoint.description.validation.ViewValidationRule;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model object '
@@ -27,7 +27,7 @@ import org.eclipse.sirius.diagram.description.validation.ViewValidationRule;
  * The following features are implemented:
  * <ul>
  * <li>
- * {@link org.eclipse.sirius.diagram.description.validation.impl.ViewValidationRuleImpl#getTargets
+ * {@link org.eclipse.sirius.viewpoint.description.validation.impl.ViewValidationRuleImpl#getTargets
  * <em>Targets</em>}</li>
  * </ul>
  * </p>
@@ -43,7 +43,7 @@ public class ViewValidationRuleImpl extends ValidationRuleImpl implements ViewVa
      * @generated
      * @ordered
      */
-    protected EList<DiagramElementMapping> targets;
+    protected EList<RepresentationElementMapping> targets;
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -69,9 +69,9 @@ public class ViewValidationRuleImpl extends ValidationRuleImpl implements ViewVa
      * 
      * @generated
      */
-    public EList<DiagramElementMapping> getTargets() {
+    public EList<RepresentationElementMapping> getTargets() {
         if (targets == null) {
-            targets = new EObjectResolvingEList<DiagramElementMapping>(DiagramElementMapping.class, this, ValidationPackage.VIEW_VALIDATION_RULE__TARGETS);
+            targets = new EObjectResolvingEList<RepresentationElementMapping>(RepresentationElementMapping.class, this, ValidationPackage.VIEW_VALIDATION_RULE__TARGETS);
         }
         return targets;
     }
@@ -101,7 +101,7 @@ public class ViewValidationRuleImpl extends ValidationRuleImpl implements ViewVa
         switch (featureID) {
         case ValidationPackage.VIEW_VALIDATION_RULE__TARGETS:
             getTargets().clear();
-            getTargets().addAll((Collection<? extends DiagramElementMapping>) newValue);
+            getTargets().addAll((Collection<? extends RepresentationElementMapping>) newValue);
             return;
         }
         super.eSet(featureID, newValue);
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/validation/util/ValidationAdapterFactory.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/validation/util/ValidationAdapterFactory.java
index 4ca0a3f39f..25d5c42e18 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/validation/util/ValidationAdapterFactory.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/validation/util/ValidationAdapterFactory.java
@@ -9,27 +9,27 @@
  *    Obeo - initial API and implementation
  * 
  */
-package org.eclipse.sirius.diagram.description.validation.util;
+package org.eclipse.sirius.viewpoint.description.validation.util;
 
 import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.notify.Notifier;
 import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.sirius.diagram.description.validation.RuleAudit;
-import org.eclipse.sirius.diagram.description.validation.SemanticValidationRule;
-import org.eclipse.sirius.diagram.description.validation.ValidationFix;
-import org.eclipse.sirius.diagram.description.validation.ValidationPackage;
-import org.eclipse.sirius.diagram.description.validation.ValidationRule;
-import org.eclipse.sirius.diagram.description.validation.ValidationSet;
-import org.eclipse.sirius.diagram.description.validation.ViewValidationRule;
 import org.eclipse.sirius.viewpoint.description.DocumentedElement;
+import org.eclipse.sirius.viewpoint.description.validation.RuleAudit;
+import org.eclipse.sirius.viewpoint.description.validation.SemanticValidationRule;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationFix;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationPackage;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationRule;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationSet;
+import org.eclipse.sirius.viewpoint.description.validation.ViewValidationRule;
 
 /**
  * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides
  * an adapter <code>createXXX</code> method for each class of the model. <!--
  * end-user-doc -->
  * 
- * @see org.eclipse.sirius.diagram.description.validation.ValidationPackage
+ * @see org.eclipse.sirius.viewpoint.description.validation.ValidationPackage
  * @generated
  */
 public class ValidationAdapterFactory extends AdapterFactoryImpl {
@@ -136,14 +136,14 @@ public class ValidationAdapterFactory extends AdapterFactoryImpl {
 
     /**
      * Creates a new adapter for an object of class '
-     * {@link org.eclipse.sirius.diagram.description.validation.ValidationSet
+     * {@link org.eclipse.sirius.viewpoint.description.validation.ValidationSet
      * <em>Set</em>}'. <!-- begin-user-doc --> This default implementation
      * returns null so that we can easily ignore cases; it's useful to ignore a
      * case when inheritance will catch all the cases anyway. <!-- end-user-doc
      * -->
      * 
      * @return the new adapter.
-     * @see org.eclipse.sirius.diagram.description.validation.ValidationSet
+     * @see org.eclipse.sirius.viewpoint.description.validation.ValidationSet
      * @generated
      */
     public Adapter createValidationSetAdapter() {
@@ -152,14 +152,14 @@ public class ValidationAdapterFactory extends AdapterFactoryImpl {
 
     /**
      * Creates a new adapter for an object of class '
-     * {@link org.eclipse.sirius.diagram.description.validation.ValidationRule
+     * {@link org.eclipse.sirius.viewpoint.description.validation.ValidationRule
      * <em>Rule</em>}'. <!-- begin-user-doc --> This default implementation
      * returns null so that we can easily ignore cases; it's useful to ignore a
      * case when inheritance will catch all the cases anyway. <!-- end-user-doc
      * -->
      * 
      * @return the new adapter.
-     * @see org.eclipse.sirius.diagram.description.validation.ValidationRule
+     * @see org.eclipse.sirius.viewpoint.description.validation.ValidationRule
      * @generated
      */
     public Adapter createValidationRuleAdapter() {
@@ -168,14 +168,14 @@ public class ValidationAdapterFactory extends AdapterFactoryImpl {
 
     /**
      * Creates a new adapter for an object of class '
-     * {@link org.eclipse.sirius.diagram.description.validation.SemanticValidationRule
+     * {@link org.eclipse.sirius.viewpoint.description.validation.SemanticValidationRule
      * <em>Semantic Validation Rule</em>}'. <!-- begin-user-doc --> This default
      * implementation returns null so that we can easily ignore cases; it's
      * useful to ignore a case when inheritance will catch all the cases anyway.
      * <!-- end-user-doc -->
      * 
      * @return the new adapter.
-     * @see org.eclipse.sirius.diagram.description.validation.SemanticValidationRule
+     * @see org.eclipse.sirius.viewpoint.description.validation.SemanticValidationRule
      * @generated
      */
     public Adapter createSemanticValidationRuleAdapter() {
@@ -184,14 +184,14 @@ public class ValidationAdapterFactory extends AdapterFactoryImpl {
 
     /**
      * Creates a new adapter for an object of class '
-     * {@link org.eclipse.sirius.diagram.description.validation.ViewValidationRule
+     * {@link org.eclipse.sirius.viewpoint.description.validation.ViewValidationRule
      * <em>View Validation Rule</em>}'. <!-- begin-user-doc --> This default
      * implementation returns null so that we can easily ignore cases; it's
      * useful to ignore a case when inheritance will catch all the cases anyway.
      * <!-- end-user-doc -->
      * 
      * @return the new adapter.
-     * @see org.eclipse.sirius.diagram.description.validation.ViewValidationRule
+     * @see org.eclipse.sirius.viewpoint.description.validation.ViewValidationRule
      * @generated
      */
     public Adapter createViewValidationRuleAdapter() {
@@ -200,14 +200,14 @@ public class ValidationAdapterFactory extends AdapterFactoryImpl {
 
     /**
      * Creates a new adapter for an object of class '
-     * {@link org.eclipse.sirius.diagram.description.validation.RuleAudit
+     * {@link org.eclipse.sirius.viewpoint.description.validation.RuleAudit
      * <em>Rule Audit</em>}'. <!-- begin-user-doc --> This default
      * implementation returns null so that we can easily ignore cases; it's
      * useful to ignore a case when inheritance will catch all the cases anyway.
      * <!-- end-user-doc -->
      * 
      * @return the new adapter.
-     * @see org.eclipse.sirius.diagram.description.validation.RuleAudit
+     * @see org.eclipse.sirius.viewpoint.description.validation.RuleAudit
      * @generated
      */
     public Adapter createRuleAuditAdapter() {
@@ -216,14 +216,14 @@ public class ValidationAdapterFactory extends AdapterFactoryImpl {
 
     /**
      * Creates a new adapter for an object of class '
-     * {@link org.eclipse.sirius.diagram.description.validation.ValidationFix
+     * {@link org.eclipse.sirius.viewpoint.description.validation.ValidationFix
      * <em>Fix</em>}'. <!-- begin-user-doc --> This default implementation
      * returns null so that we can easily ignore cases; it's useful to ignore a
      * case when inheritance will catch all the cases anyway. <!-- end-user-doc
      * -->
      * 
      * @return the new adapter.
-     * @see org.eclipse.sirius.diagram.description.validation.ValidationFix
+     * @see org.eclipse.sirius.viewpoint.description.validation.ValidationFix
      * @generated
      */
     public Adapter createValidationFixAdapter() {
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/validation/util/ValidationSwitch.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/validation/util/ValidationSwitch.java
index ec82b3674d..d0bbccdc38 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/diagram/description/validation/util/ValidationSwitch.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/validation/util/ValidationSwitch.java
@@ -9,20 +9,20 @@
  *    Obeo - initial API and implementation
  * 
  */
-package org.eclipse.sirius.diagram.description.validation.util;
+package org.eclipse.sirius.viewpoint.description.validation.util;
 
 import java.util.List;
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.sirius.diagram.description.validation.RuleAudit;
-import org.eclipse.sirius.diagram.description.validation.SemanticValidationRule;
-import org.eclipse.sirius.diagram.description.validation.ValidationFix;
-import org.eclipse.sirius.diagram.description.validation.ValidationPackage;
-import org.eclipse.sirius.diagram.description.validation.ValidationRule;
-import org.eclipse.sirius.diagram.description.validation.ValidationSet;
-import org.eclipse.sirius.diagram.description.validation.ViewValidationRule;
 import org.eclipse.sirius.viewpoint.description.DocumentedElement;
+import org.eclipse.sirius.viewpoint.description.validation.RuleAudit;
+import org.eclipse.sirius.viewpoint.description.validation.SemanticValidationRule;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationFix;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationPackage;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationRule;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationSet;
+import org.eclipse.sirius.viewpoint.description.validation.ViewValidationRule;
 
 /**
  * <!-- begin-user-doc --> The <b>Switch</b> for the model's inheritance
@@ -32,7 +32,7 @@ import org.eclipse.sirius.viewpoint.description.DocumentedElement;
  * inheritance hierarchy until a non-null result is returned, which is the
  * result of the switch. <!-- end-user-doc -->
  * 
- * @see org.eclipse.sirius.diagram.description.validation.ValidationPackage
+ * @see org.eclipse.sirius.viewpoint.description.validation.ValidationPackage
  * @generated
  */
 public class ValidationSwitch<T> {
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/ViewpointFactoryImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/ViewpointFactoryImpl.java
index bf418c3b90..b2bf991c62 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/ViewpointFactoryImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/ViewpointFactoryImpl.java
@@ -34,7 +34,6 @@ import org.eclipse.sirius.viewpoint.DResourceContainer;
 import org.eclipse.sirius.viewpoint.DSourceFileLink;
 import org.eclipse.sirius.viewpoint.DView;
 import org.eclipse.sirius.viewpoint.Decoration;
-import org.eclipse.sirius.viewpoint.DragAndDropTarget;
 import org.eclipse.sirius.viewpoint.FontFormat;
 import org.eclipse.sirius.viewpoint.LabelAlignment;
 import org.eclipse.sirius.viewpoint.LabelStyle;
@@ -106,8 +105,6 @@ public class ViewpointFactoryImpl extends EFactoryImpl implements ViewpointFacto
             return createDAnalysisCustomData();
         case ViewpointPackage.LABEL_STYLE:
             return createLabelStyle();
-        case ViewpointPackage.DRAG_AND_DROP_TARGET:
-            return createDragAndDropTarget();
         case ViewpointPackage.RGB_VALUES:
             return createRGBValues();
         case ViewpointPackage.DANALYSIS_SESSION_EOBJECT:
@@ -268,16 +265,6 @@ public class ViewpointFactoryImpl extends EFactoryImpl implements ViewpointFacto
      * 
      * @generated
      */
-    public DragAndDropTarget createDragAndDropTarget() {
-        DragAndDropTargetImpl dragAndDropTarget = new DragAndDropTargetImpl();
-        return dragAndDropTarget;
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
     public RGBValues createRGBValues() {
         RGBValuesImpl rgbValues = new RGBValuesImpl();
         return rgbValues;
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/ViewpointPackageImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/ViewpointPackageImpl.java
index d6cb9502c9..e27929c3d1 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/ViewpointPackageImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/ViewpointPackageImpl.java
@@ -25,8 +25,6 @@ import org.eclipse.sirius.diagram.description.concern.ConcernPackage;
 import org.eclipse.sirius.diagram.description.concern.impl.ConcernPackageImpl;
 import org.eclipse.sirius.diagram.description.filter.FilterPackage;
 import org.eclipse.sirius.diagram.description.filter.impl.FilterPackageImpl;
-import org.eclipse.sirius.diagram.description.validation.ValidationPackage;
-import org.eclipse.sirius.diagram.description.validation.impl.ValidationPackageImpl;
 import org.eclipse.sirius.diagram.impl.DiagramPackageImpl;
 import org.eclipse.sirius.ecore.extender.business.api.accessor.ModelAccessor;
 import org.eclipse.sirius.viewpoint.BasicLabelStyle;
@@ -57,7 +55,6 @@ import org.eclipse.sirius.viewpoint.DStylizable;
 import org.eclipse.sirius.viewpoint.DValidable;
 import org.eclipse.sirius.viewpoint.DView;
 import org.eclipse.sirius.viewpoint.Decoration;
-import org.eclipse.sirius.viewpoint.DragAndDropTarget;
 import org.eclipse.sirius.viewpoint.FontFormat;
 import org.eclipse.sirius.viewpoint.LabelAlignment;
 import org.eclipse.sirius.viewpoint.LabelStyle;
@@ -243,13 +240,6 @@ public class ViewpointPackageImpl extends EPackageImpl implements ViewpointPacka
      * 
      * @generated
      */
-    private EClass dragAndDropTargetEClass = null;
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
     private EClass rgbValuesEClass = null;
 
     /**
@@ -411,6 +401,9 @@ public class ViewpointPackageImpl extends EPackageImpl implements ViewpointPacka
                 .getEPackage(StylePackage.eNS_URI) : StylePackage.eINSTANCE);
         ToolPackageImpl theToolPackage = (ToolPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ToolPackage.eNS_URI) instanceof ToolPackageImpl ? EPackage.Registry.INSTANCE
                 .getEPackage(ToolPackage.eNS_URI) : ToolPackage.eINSTANCE);
+        org.eclipse.sirius.viewpoint.description.validation.impl.ValidationPackageImpl theValidationPackage = (org.eclipse.sirius.viewpoint.description.validation.impl.ValidationPackageImpl) (EPackage.Registry.INSTANCE
+                .getEPackage(org.eclipse.sirius.viewpoint.description.validation.ValidationPackage.eNS_URI) instanceof org.eclipse.sirius.viewpoint.description.validation.impl.ValidationPackageImpl ? EPackage.Registry.INSTANCE
+                .getEPackage(org.eclipse.sirius.viewpoint.description.validation.ValidationPackage.eNS_URI) : org.eclipse.sirius.viewpoint.description.validation.ValidationPackage.eINSTANCE);
         AuditPackageImpl theAuditPackage = (AuditPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(AuditPackage.eNS_URI) instanceof AuditPackageImpl ? EPackage.Registry.INSTANCE
                 .getEPackage(AuditPackage.eNS_URI) : AuditPackage.eINSTANCE);
         DiagramPackageImpl theDiagramPackage = (DiagramPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(DiagramPackage.eNS_URI) instanceof DiagramPackageImpl ? EPackage.Registry.INSTANCE
@@ -426,8 +419,6 @@ public class ViewpointPackageImpl extends EPackageImpl implements ViewpointPacka
                 .getEPackage(org.eclipse.sirius.diagram.description.tool.ToolPackage.eNS_URI) : org.eclipse.sirius.diagram.description.tool.ToolPackage.eINSTANCE);
         FilterPackageImpl theFilterPackage = (FilterPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(FilterPackage.eNS_URI) instanceof FilterPackageImpl ? EPackage.Registry.INSTANCE
                 .getEPackage(FilterPackage.eNS_URI) : FilterPackage.eINSTANCE);
-        ValidationPackageImpl theValidationPackage = (ValidationPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ValidationPackage.eNS_URI) instanceof ValidationPackageImpl ? EPackage.Registry.INSTANCE
-                .getEPackage(ValidationPackage.eNS_URI) : ValidationPackage.eINSTANCE);
         ConcernPackageImpl theConcernPackage = (ConcernPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ConcernPackage.eNS_URI) instanceof ConcernPackageImpl ? EPackage.Registry.INSTANCE
                 .getEPackage(ConcernPackage.eNS_URI) : ConcernPackage.eINSTANCE);
 
@@ -436,13 +427,13 @@ public class ViewpointPackageImpl extends EPackageImpl implements ViewpointPacka
         theDescriptionPackage.createPackageContents();
         theStylePackage.createPackageContents();
         theToolPackage.createPackageContents();
+        theValidationPackage.createPackageContents();
         theAuditPackage.createPackageContents();
         theDiagramPackage.createPackageContents();
         theDescriptionPackage_1.createPackageContents();
         theStylePackage_1.createPackageContents();
         theToolPackage_1.createPackageContents();
         theFilterPackage.createPackageContents();
-        theValidationPackage.createPackageContents();
         theConcernPackage.createPackageContents();
 
         // Initialize created meta-data
@@ -450,13 +441,13 @@ public class ViewpointPackageImpl extends EPackageImpl implements ViewpointPacka
         theDescriptionPackage.initializePackageContents();
         theStylePackage.initializePackageContents();
         theToolPackage.initializePackageContents();
+        theValidationPackage.initializePackageContents();
         theAuditPackage.initializePackageContents();
         theDiagramPackage.initializePackageContents();
         theDescriptionPackage_1.initializePackageContents();
         theStylePackage_1.initializePackageContents();
         theToolPackage_1.initializePackageContents();
         theFilterPackage.initializePackageContents();
-        theValidationPackage.initializePackageContents();
         theConcernPackage.initializePackageContents();
 
         // Mark meta-data to indicate it can't be changed
@@ -994,15 +985,6 @@ public class ViewpointPackageImpl extends EPackageImpl implements ViewpointPacka
      * 
      * @generated
      */
-    public EClass getDragAndDropTarget() {
-        return dragAndDropTargetEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
     public EClass getRGBValues() {
         return rgbValuesEClass;
     }
@@ -1422,8 +1404,6 @@ public class ViewpointPackageImpl extends EPackageImpl implements ViewpointPacka
         styleEClass = createEClass(STYLE);
         createEReference(styleEClass, STYLE__DESCRIPTION);
 
-        dragAndDropTargetEClass = createEClass(DRAG_AND_DROP_TARGET);
-
         rgbValuesEClass = createEClass(RGB_VALUES);
         createEAttribute(rgbValuesEClass, RGB_VALUES__RED);
         createEAttribute(rgbValuesEClass, RGB_VALUES__GREEN);
@@ -1501,13 +1481,11 @@ public class ViewpointPackageImpl extends EPackageImpl implements ViewpointPacka
 
         // Obtain other dependent packages
         DescriptionPackage theDescriptionPackage = (DescriptionPackage) EPackage.Registry.INSTANCE.getEPackage(DescriptionPackage.eNS_URI);
-        DiagramPackage theDiagramPackage = (DiagramPackage) EPackage.Registry.INSTANCE.getEPackage(DiagramPackage.eNS_URI);
         EcorePackage theEcorePackage = (EcorePackage) EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
         StylePackage theStylePackage = (StylePackage) EPackage.Registry.INSTANCE.getEPackage(StylePackage.eNS_URI);
 
         // Add subpackages
         getESubpackages().add(theDescriptionPackage);
-        getESubpackages().add(theDiagramPackage);
 
         // Create type parameters
 
@@ -1670,10 +1648,6 @@ public class ViewpointPackageImpl extends EPackageImpl implements ViewpointPacka
         initEReference(getStyle_Description(), theStylePackage.getStyleDescription(), null, "description", null, 0, 1, Style.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
                 IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-        initEClass(dragAndDropTargetEClass, DragAndDropTarget.class, "DragAndDropTarget", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-        addEOperation(dragAndDropTargetEClass, theDescriptionPackage.getDragAndDropTargetDescription(), "getDragAndDropDescription", 0, 1, IS_UNIQUE, IS_ORDERED);
-
         initEClass(rgbValuesEClass, RGBValues.class, "RGBValues", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
         initEAttribute(getRGBValues_Red(), theEcorePackage.getEInt(), "red", null, 1, 1, RGBValues.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
                 IS_ORDERED);
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/util/ViewpointAdapterFactory.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/util/ViewpointAdapterFactory.java
index 4fd8229ed3..2dabb4bd5f 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/util/ViewpointAdapterFactory.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/util/ViewpointAdapterFactory.java
@@ -43,7 +43,6 @@ import org.eclipse.sirius.viewpoint.DStylizable;
 import org.eclipse.sirius.viewpoint.DValidable;
 import org.eclipse.sirius.viewpoint.DView;
 import org.eclipse.sirius.viewpoint.Decoration;
-import org.eclipse.sirius.viewpoint.DragAndDropTarget;
 import org.eclipse.sirius.viewpoint.LabelStyle;
 import org.eclipse.sirius.viewpoint.MetaModelExtension;
 import org.eclipse.sirius.viewpoint.RGBValues;
@@ -219,11 +218,6 @@ public class ViewpointAdapterFactory extends AdapterFactoryImpl {
         }
 
         @Override
-        public Adapter caseDragAndDropTarget(DragAndDropTarget object) {
-            return createDragAndDropTargetAdapter();
-        }
-
-        @Override
         public Adapter caseRGBValues(RGBValues object) {
             return createRGBValuesAdapter();
         }
@@ -650,22 +644,6 @@ public class ViewpointAdapterFactory extends AdapterFactoryImpl {
 
     /**
      * Creates a new adapter for an object of class '
-     * {@link org.eclipse.sirius.viewpoint.DragAndDropTarget
-     * <em>Drag And Drop Target</em>}'. <!-- begin-user-doc --> This default
-     * implementation returns null so that we can easily ignore cases; it's
-     * useful to ignore a case when inheritance will catch all the cases anyway.
-     * <!-- end-user-doc -->
-     * 
-     * @return the new adapter.
-     * @see org.eclipse.sirius.viewpoint.DragAndDropTarget
-     * @generated
-     */
-    public Adapter createDragAndDropTargetAdapter() {
-        return null;
-    }
-
-    /**
-     * Creates a new adapter for an object of class '
      * {@link org.eclipse.sirius.viewpoint.RGBValues <em>RGB Values</em>}'. <!--
      * begin-user-doc --> This default implementation returns null so that we
      * can easily ignore cases; it's useful to ignore a case when inheritance
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/util/ViewpointSwitch.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/util/ViewpointSwitch.java
index 5248f5926d..f64422dddb 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/util/ViewpointSwitch.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/util/ViewpointSwitch.java
@@ -43,7 +43,6 @@ import org.eclipse.sirius.viewpoint.DStylizable;
 import org.eclipse.sirius.viewpoint.DValidable;
 import org.eclipse.sirius.viewpoint.DView;
 import org.eclipse.sirius.viewpoint.Decoration;
-import org.eclipse.sirius.viewpoint.DragAndDropTarget;
 import org.eclipse.sirius.viewpoint.LabelStyle;
 import org.eclipse.sirius.viewpoint.MetaModelExtension;
 import org.eclipse.sirius.viewpoint.RGBValues;
@@ -314,13 +313,6 @@ public class ViewpointSwitch<T> {
                 result = defaultCase(theEObject);
             return result;
         }
-        case ViewpointPackage.DRAG_AND_DROP_TARGET: {
-            DragAndDropTarget dragAndDropTarget = (DragAndDropTarget) theEObject;
-            T result = caseDragAndDropTarget(dragAndDropTarget);
-            if (result == null)
-                result = defaultCase(theEObject);
-            return result;
-        }
         case ViewpointPackage.RGB_VALUES: {
             RGBValues rgbValues = (RGBValues) theEObject;
             T result = caseRGBValues(rgbValues);
@@ -797,23 +789,6 @@ public class ViewpointSwitch<T> {
 
     /**
      * Returns the result of interpreting the object as an instance of '
-     * <em>Drag And Drop Target</em>'. <!-- begin-user-doc --> This
-     * implementation returns null; returning a non-null result will terminate
-     * the switch. <!-- end-user-doc -->
-     * 
-     * @param object
-     *            the target of the switch.
-     * @return the result of interpreting the object as an instance of '
-     *         <em>Drag And Drop Target</em>'.
-     * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-     * @generated
-     */
-    public T caseDragAndDropTarget(DragAndDropTarget object) {
-        return null;
-    }
-
-    /**
-     * Returns the result of interpreting the object as an instance of '
      * <em>RGB Values</em>'. <!-- begin-user-doc --> This implementation returns
      * null; returning a non-null result will terminate the switch. <!--
      * end-user-doc -->
diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/componentization/DiagramMappingsManager.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/componentization/DiagramMappingsManager.java
index b2160dfdba..f39741f9e4 100644
--- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/componentization/DiagramMappingsManager.java
+++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/componentization/DiagramMappingsManager.java
@@ -17,13 +17,13 @@ import org.eclipse.sirius.business.internal.metamodel.helper.MappingsListVisitor
 import org.eclipse.sirius.diagram.AbstractDNode;
 import org.eclipse.sirius.diagram.DNodeContainer;
 import org.eclipse.sirius.diagram.DNodeList;
+import org.eclipse.sirius.diagram.DragAndDropTarget;
 import org.eclipse.sirius.diagram.description.AbstractNodeMapping;
 import org.eclipse.sirius.diagram.description.ContainerMapping;
 import org.eclipse.sirius.diagram.description.DiagramElementMapping;
 import org.eclipse.sirius.diagram.description.EdgeMapping;
 import org.eclipse.sirius.diagram.description.Layer;
 import org.eclipse.sirius.diagram.description.NodeMapping;
-import org.eclipse.sirius.viewpoint.DragAndDropTarget;
 import org.eclipse.sirius.viewpoint.description.Viewpoint;
 
 /**
diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/helper/SiriusHelper.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/helper/SiriusHelper.java
index b6aa686ee3..277babc607 100644
--- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/helper/SiriusHelper.java
+++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/helper/SiriusHelper.java
@@ -30,13 +30,13 @@ import org.eclipse.sirius.diagram.DNodeContainer;
 import org.eclipse.sirius.diagram.DNodeList;
 import org.eclipse.sirius.diagram.DNodeListElement;
 import org.eclipse.sirius.diagram.DSemanticDiagram;
+import org.eclipse.sirius.diagram.DragAndDropTarget;
 import org.eclipse.sirius.diagram.description.ContainerMapping;
 import org.eclipse.sirius.diagram.description.DiagramDescription;
 import org.eclipse.sirius.diagram.description.NodeMapping;
 import org.eclipse.sirius.ext.base.Option;
 import org.eclipse.sirius.viewpoint.DRepresentation;
 import org.eclipse.sirius.viewpoint.DRepresentationElement;
-import org.eclipse.sirius.viewpoint.DragAndDropTarget;
 import org.eclipse.sirius.viewpoint.ViewpointPackage;
 import org.eclipse.sirius.viewpoint.description.AnnotationEntry;
 import org.eclipse.sirius.viewpoint.description.DescriptionFactory;
diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/query/AbstractNodeMappingQuery.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/query/AbstractNodeMappingQuery.java
index e0888b8b29..372c6f7d70 100644
--- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/query/AbstractNodeMappingQuery.java
+++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/query/AbstractNodeMappingQuery.java
@@ -17,10 +17,10 @@ import org.eclipse.sirius.common.tools.api.interpreter.IInterpreter;
 import org.eclipse.sirius.common.tools.api.interpreter.IInterpreterSiriusVariables;
 import org.eclipse.sirius.common.tools.api.util.StringUtil;
 import org.eclipse.sirius.diagram.DSemanticDiagram;
+import org.eclipse.sirius.diagram.DragAndDropTarget;
 import org.eclipse.sirius.diagram.description.AbstractNodeMapping;
 import org.eclipse.sirius.tools.api.profiler.SiriusTasksKey;
 import org.eclipse.sirius.viewpoint.DSemanticDecorator;
-import org.eclipse.sirius.viewpoint.DragAndDropTarget;
 import org.eclipse.sirius.viewpoint.SiriusPlugin;
 
 /**
diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/query/DiagramElementMappingQuery.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/query/DiagramElementMappingQuery.java
index de656301c3..677e40b4e5 100644
--- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/query/DiagramElementMappingQuery.java
+++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/query/DiagramElementMappingQuery.java
@@ -26,24 +26,24 @@ import org.eclipse.sirius.common.tools.api.util.StringUtil;
 import org.eclipse.sirius.diagram.DDiagram;
 import org.eclipse.sirius.diagram.DDiagramElement;
 import org.eclipse.sirius.diagram.DSemanticDiagram;
+import org.eclipse.sirius.diagram.DragAndDropTarget;
 import org.eclipse.sirius.diagram.description.AbstractNodeMapping;
 import org.eclipse.sirius.diagram.description.ContainerMappingImport;
 import org.eclipse.sirius.diagram.description.DiagramElementMapping;
+import org.eclipse.sirius.diagram.description.DragAndDropTargetDescription;
 import org.eclipse.sirius.diagram.description.EdgeMapping;
 import org.eclipse.sirius.diagram.description.EdgeMappingImport;
 import org.eclipse.sirius.diagram.description.NodeMappingImport;
+import org.eclipse.sirius.diagram.description.tool.ContainerDropDescription;
 import org.eclipse.sirius.ecore.extender.business.api.accessor.ModelAccessor;
 import org.eclipse.sirius.ext.base.Option;
 import org.eclipse.sirius.ext.base.Options;
 import org.eclipse.sirius.ext.base.collect.MultipleCollection;
 import org.eclipse.sirius.viewpoint.DMappingBased;
 import org.eclipse.sirius.viewpoint.DSemanticDecorator;
-import org.eclipse.sirius.viewpoint.DragAndDropTarget;
 import org.eclipse.sirius.viewpoint.SiriusPlugin;
 import org.eclipse.sirius.viewpoint.description.AbstractMappingImport;
-import org.eclipse.sirius.viewpoint.description.DragAndDropTargetDescription;
 import org.eclipse.sirius.viewpoint.description.PasteTargetDescription;
-import org.eclipse.sirius.viewpoint.description.tool.ContainerDropDescription;
 import org.eclipse.sirius.viewpoint.description.tool.PasteDescription;
 
 import com.google.common.collect.Iterators;
diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/query/DragAndDropTargetQuery.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/query/DragAndDropTargetQuery.java
index 432d2acf08..643c30fa96 100644
--- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/query/DragAndDropTargetQuery.java
+++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/query/DragAndDropTargetQuery.java
@@ -14,9 +14,9 @@ import java.util.Iterator;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.sirius.diagram.DDiagramElement;
+import org.eclipse.sirius.diagram.DragAndDropTarget;
 import org.eclipse.sirius.ext.base.Option;
 import org.eclipse.sirius.ext.base.Options;
-import org.eclipse.sirius.viewpoint.DragAndDropTarget;
 
 /**
  * A class aggregating all the queries (read-only!) having a
diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/query/EdgeMappingQuery.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/query/EdgeMappingQuery.java
index 1d8af4624d..6668c7203e 100644
--- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/query/EdgeMappingQuery.java
+++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/query/EdgeMappingQuery.java
@@ -20,11 +20,11 @@ import org.eclipse.sirius.common.tools.api.interpreter.IInterpreter;
 import org.eclipse.sirius.common.tools.api.interpreter.IInterpreterSiriusVariables;
 import org.eclipse.sirius.common.tools.api.util.StringUtil;
 import org.eclipse.sirius.diagram.DSemanticDiagram;
+import org.eclipse.sirius.diagram.DragAndDropTarget;
 import org.eclipse.sirius.diagram.description.EdgeMapping;
 import org.eclipse.sirius.tools.api.profiler.SiriusTasksKey;
 import org.eclipse.sirius.viewpoint.DMappingBased;
 import org.eclipse.sirius.viewpoint.DSemanticDecorator;
-import org.eclipse.sirius.viewpoint.DragAndDropTarget;
 import org.eclipse.sirius.viewpoint.SiriusPlugin;
 
 /**
diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/query/MappingBasedToolDescriptionQuery.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/query/MappingBasedToolDescriptionQuery.java
index 91feea0e7d..fc132ec6d5 100644
--- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/query/MappingBasedToolDescriptionQuery.java
+++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/query/MappingBasedToolDescriptionQuery.java
@@ -13,6 +13,7 @@ package org.eclipse.sirius.business.api.query;
 import java.util.Collection;
 
 import org.eclipse.sirius.diagram.description.tool.ContainerCreationDescription;
+import org.eclipse.sirius.diagram.description.tool.ContainerDropDescription;
 import org.eclipse.sirius.diagram.description.tool.DeleteElementDescription;
 import org.eclipse.sirius.diagram.description.tool.DirectEditLabel;
 import org.eclipse.sirius.diagram.description.tool.DoubleClickDescription;
@@ -20,7 +21,6 @@ import org.eclipse.sirius.diagram.description.tool.EdgeCreationDescription;
 import org.eclipse.sirius.diagram.description.tool.NodeCreationDescription;
 import org.eclipse.sirius.diagram.description.tool.ReconnectEdgeDescription;
 import org.eclipse.sirius.viewpoint.description.RepresentationElementMapping;
-import org.eclipse.sirius.viewpoint.description.tool.ContainerDropDescription;
 import org.eclipse.sirius.viewpoint.description.tool.MappingBasedToolDescription;
 
 import com.google.common.collect.Sets;
diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/repair/SiriusRepairProcess.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/repair/SiriusRepairProcess.java
index 387b56d788..68a8efdd72 100644
--- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/repair/SiriusRepairProcess.java
+++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/repair/SiriusRepairProcess.java
@@ -71,7 +71,6 @@ import org.eclipse.sirius.diagram.DSemanticDiagram;
 import org.eclipse.sirius.diagram.FilterVariableValue;
 import org.eclipse.sirius.diagram.description.filter.FilterDescription;
 import org.eclipse.sirius.diagram.description.tool.BehaviorTool;
-import org.eclipse.sirius.diagram.description.validation.ValidationRule;
 import org.eclipse.sirius.ecore.extender.tool.api.ModelUtils;
 import org.eclipse.sirius.viewpoint.DAnalysis;
 import org.eclipse.sirius.viewpoint.DRepresentation;
@@ -81,6 +80,7 @@ import org.eclipse.sirius.viewpoint.DView;
 import org.eclipse.sirius.viewpoint.SiriusPlugin;
 import org.eclipse.sirius.viewpoint.description.RepresentationDescription;
 import org.eclipse.sirius.viewpoint.description.Viewpoint;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationRule;
 
 import com.google.common.base.Predicate;
 import com.google.common.collect.ArrayListMultimap;
diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/componentization/mappings/DiagramMappingsManagerImpl.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/componentization/mappings/DiagramMappingsManagerImpl.java
index d132e62531..921ffa3379 100644
--- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/componentization/mappings/DiagramMappingsManagerImpl.java
+++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/componentization/mappings/DiagramMappingsManagerImpl.java
@@ -29,6 +29,7 @@ import org.eclipse.sirius.diagram.DDiagram;
 import org.eclipse.sirius.diagram.DNode;
 import org.eclipse.sirius.diagram.DNodeContainer;
 import org.eclipse.sirius.diagram.DNodeList;
+import org.eclipse.sirius.diagram.DragAndDropTarget;
 import org.eclipse.sirius.diagram.description.AbstractNodeMapping;
 import org.eclipse.sirius.diagram.description.ContainerMapping;
 import org.eclipse.sirius.diagram.description.ContainerMappingImport;
@@ -36,7 +37,6 @@ import org.eclipse.sirius.diagram.description.DiagramElementMapping;
 import org.eclipse.sirius.diagram.description.EdgeMapping;
 import org.eclipse.sirius.diagram.description.Layer;
 import org.eclipse.sirius.diagram.description.NodeMapping;
-import org.eclipse.sirius.viewpoint.DragAndDropTarget;
 import org.eclipse.sirius.viewpoint.description.AbstractMappingImport;
 import org.eclipse.sirius.viewpoint.description.Viewpoint;
 
diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/dialect/description/ValidationInterpretedExpressionTargetSwitch.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/dialect/description/ValidationInterpretedExpressionTargetSwitch.java
index 489f41c84e..3abfe80264 100644
--- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/dialect/description/ValidationInterpretedExpressionTargetSwitch.java
+++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/dialect/description/ValidationInterpretedExpressionTargetSwitch.java
@@ -15,15 +15,15 @@ import java.util.Collection;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.sirius.business.api.dialect.description.IInterpretedExpressionTargetSwitch;
-import org.eclipse.sirius.diagram.description.validation.RuleAudit;
-import org.eclipse.sirius.diagram.description.validation.SemanticValidationRule;
-import org.eclipse.sirius.diagram.description.validation.ValidationFix;
-import org.eclipse.sirius.diagram.description.validation.ValidationPackage;
-import org.eclipse.sirius.diagram.description.validation.ValidationRule;
-import org.eclipse.sirius.diagram.description.validation.ViewValidationRule;
-import org.eclipse.sirius.diagram.description.validation.util.ValidationSwitch;
 import org.eclipse.sirius.ext.base.Option;
 import org.eclipse.sirius.ext.base.Options;
+import org.eclipse.sirius.viewpoint.description.validation.RuleAudit;
+import org.eclipse.sirius.viewpoint.description.validation.SemanticValidationRule;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationFix;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationPackage;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationRule;
+import org.eclipse.sirius.viewpoint.description.validation.ViewValidationRule;
+import org.eclipse.sirius.viewpoint.description.validation.util.ValidationSwitch;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
@@ -31,8 +31,8 @@ import com.google.common.collect.Sets;
 /**
  * A switch that will return the Target Types associated to a given element
  * (part of the
- * {@link org.eclipse.sirius.diagram.description.validation.ValidationPackage}
- * ) and feature corresponding to an Interpreted Expression. For example, for a
+ * {@link org.eclipse.sirius.description.validation.ValidationPackage} ) and
+ * feature corresponding to an Interpreted Expression. For example, for a
  * NodeMapping :
  * <p>
  * <li>if the feature is semantic candidate expression, we return the domain
diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/experimental/sync/AbstractDNodeCandidate.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/experimental/sync/AbstractDNodeCandidate.java
index 4a3f3e2e1e..9a8641714a 100644
--- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/experimental/sync/AbstractDNodeCandidate.java
+++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/experimental/sync/AbstractDNodeCandidate.java
@@ -13,10 +13,10 @@ package org.eclipse.sirius.business.internal.experimental.sync;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.sirius.common.tools.api.util.RefreshIDFactory;
 import org.eclipse.sirius.diagram.AbstractDNode;
+import org.eclipse.sirius.diagram.DragAndDropTarget;
 import org.eclipse.sirius.diagram.description.AbstractNodeMapping;
 import org.eclipse.sirius.diagram.description.ContainerMappingImport;
 import org.eclipse.sirius.diagram.description.NodeMappingImport;
-import org.eclipse.sirius.viewpoint.DragAndDropTarget;
 import org.eclipse.sirius.viewpoint.description.AbstractMappingImport;
 
 /**
diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/experimental/sync/AbstractSynchronizerHelper.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/experimental/sync/AbstractSynchronizerHelper.java
index 558916829b..81e61793ec 100644
--- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/experimental/sync/AbstractSynchronizerHelper.java
+++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/experimental/sync/AbstractSynchronizerHelper.java
@@ -21,6 +21,7 @@ import org.eclipse.sirius.common.tools.DslCommonPlugin;
 import org.eclipse.sirius.common.tools.api.interpreter.IInterpreter;
 import org.eclipse.sirius.diagram.DDiagramElement;
 import org.eclipse.sirius.diagram.DSemanticDiagram;
+import org.eclipse.sirius.diagram.DragAndDropTarget;
 import org.eclipse.sirius.diagram.description.DiagramElementMapping;
 import org.eclipse.sirius.ecore.extender.business.api.accessor.ModelAccessor;
 import org.eclipse.sirius.ext.base.Option;
@@ -28,7 +29,6 @@ import org.eclipse.sirius.ext.base.collect.MultipleCollection;
 import org.eclipse.sirius.tools.api.interpreter.InterpreterUtil;
 import org.eclipse.sirius.tools.api.profiler.SiriusTasksKey;
 import org.eclipse.sirius.viewpoint.DSemanticDecorator;
-import org.eclipse.sirius.viewpoint.DragAndDropTarget;
 
 import com.google.common.base.Function;
 import com.google.common.base.Predicate;
diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/experimental/sync/DDiagramElementSynchronizer.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/experimental/sync/DDiagramElementSynchronizer.java
index 117cf229dd..d1569aaed5 100644
--- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/experimental/sync/DDiagramElementSynchronizer.java
+++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/experimental/sync/DDiagramElementSynchronizer.java
@@ -56,6 +56,7 @@ import org.eclipse.sirius.diagram.DNodeListElement;
 import org.eclipse.sirius.diagram.DSemanticDiagram;
 import org.eclipse.sirius.diagram.DiagramFactory;
 import org.eclipse.sirius.diagram.DiagramPackage;
+import org.eclipse.sirius.diagram.DragAndDropTarget;
 import org.eclipse.sirius.diagram.EdgeStyle;
 import org.eclipse.sirius.diagram.EdgeTarget;
 import org.eclipse.sirius.diagram.NodeStyle;
@@ -82,7 +83,6 @@ import org.eclipse.sirius.tools.api.interpreter.IInterpreterMessages;
 import org.eclipse.sirius.tools.api.profiler.SiriusTasksKey;
 import org.eclipse.sirius.viewpoint.DSemanticDecorator;
 import org.eclipse.sirius.viewpoint.Decoration;
-import org.eclipse.sirius.viewpoint.DragAndDropTarget;
 import org.eclipse.sirius.viewpoint.Style;
 import org.eclipse.sirius.viewpoint.ViewpointFactory;
 import org.eclipse.sirius.viewpoint.description.DecorationDescription;
diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/experimental/sync/DDiagramSynchronizer.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/experimental/sync/DDiagramSynchronizer.java
index 1ea017925f..11a175f6ed 100644
--- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/experimental/sync/DDiagramSynchronizer.java
+++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/experimental/sync/DDiagramSynchronizer.java
@@ -67,6 +67,7 @@ import org.eclipse.sirius.diagram.DNodeListElement;
 import org.eclipse.sirius.diagram.DSemanticDiagram;
 import org.eclipse.sirius.diagram.DiagramFactory;
 import org.eclipse.sirius.diagram.DiagramPackage;
+import org.eclipse.sirius.diagram.DragAndDropTarget;
 import org.eclipse.sirius.diagram.EdgeTarget;
 import org.eclipse.sirius.diagram.description.AbstractNodeMapping;
 import org.eclipse.sirius.diagram.description.AdditionalLayer;
@@ -94,7 +95,6 @@ import org.eclipse.sirius.ext.base.collect.SetIntersection;
 import org.eclipse.sirius.tools.api.command.ui.NoUICallback;
 import org.eclipse.sirius.tools.api.command.ui.UICallBack;
 import org.eclipse.sirius.tools.api.profiler.SiriusTasksKey;
-import org.eclipse.sirius.viewpoint.DragAndDropTarget;
 import org.eclipse.sirius.viewpoint.description.DecorationDescription;
 import org.eclipse.sirius.viewpoint.description.RepresentationElementMapping;
 import org.eclipse.sirius.viewpoint.description.SemanticBasedDecoration;
diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/experimental/sync/DNodeSynchronizerHelper.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/experimental/sync/DNodeSynchronizerHelper.java
index a80620c033..1bafd85a8b 100644
--- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/experimental/sync/DNodeSynchronizerHelper.java
+++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/experimental/sync/DNodeSynchronizerHelper.java
@@ -15,9 +15,9 @@ import java.util.Collection;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.sirius.business.api.query.AbstractNodeMappingQuery;
 import org.eclipse.sirius.diagram.DSemanticDiagram;
+import org.eclipse.sirius.diagram.DragAndDropTarget;
 import org.eclipse.sirius.diagram.description.AbstractNodeMapping;
 import org.eclipse.sirius.ecore.extender.business.api.accessor.ModelAccessor;
-import org.eclipse.sirius.viewpoint.DragAndDropTarget;
 
 import com.google.common.collect.Lists;
 
diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/experimental/sync/MappingsUpdater.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/experimental/sync/MappingsUpdater.java
index dfe2336d51..06e7c3545e 100644
--- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/experimental/sync/MappingsUpdater.java
+++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/experimental/sync/MappingsUpdater.java
@@ -24,9 +24,9 @@ import org.eclipse.sirius.business.internal.metamodel.helper.MappingsListVisitor
 import org.eclipse.sirius.business.internal.sync.visitor.DiagramElementsHierarchyVisitor;
 import org.eclipse.sirius.diagram.DDiagram;
 import org.eclipse.sirius.diagram.DDiagramElement;
+import org.eclipse.sirius.diagram.DragAndDropTarget;
 import org.eclipse.sirius.diagram.description.AbstractNodeMapping;
 import org.eclipse.sirius.diagram.description.DiagramElementMapping;
-import org.eclipse.sirius.viewpoint.DragAndDropTarget;
 
 import com.google.common.base.Function;
 import com.google.common.collect.Collections2;
diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/helper/task/CreateContainerTask.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/helper/task/CreateContainerTask.java
index e42adbf3fd..d1d2d7b61f 100644
--- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/helper/task/CreateContainerTask.java
+++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/helper/task/CreateContainerTask.java
@@ -31,6 +31,7 @@ import org.eclipse.sirius.diagram.AbstractDNode;
 import org.eclipse.sirius.diagram.ArrangeConstraint;
 import org.eclipse.sirius.diagram.DDiagram;
 import org.eclipse.sirius.diagram.DSemanticDiagram;
+import org.eclipse.sirius.diagram.DragAndDropTarget;
 import org.eclipse.sirius.diagram.description.ContainerMapping;
 import org.eclipse.sirius.diagram.description.tool.ContainerCreationDescription;
 import org.eclipse.sirius.ecore.extender.business.api.accessor.ModelAccessor;
@@ -39,7 +40,6 @@ import org.eclipse.sirius.tools.api.command.DCommand;
 import org.eclipse.sirius.tools.api.refresh.BestMappingGetter;
 import org.eclipse.sirius.viewpoint.DRepresentationElement;
 import org.eclipse.sirius.viewpoint.DSemanticDecorator;
-import org.eclipse.sirius.viewpoint.DragAndDropTarget;
 import org.eclipse.sirius.viewpoint.SiriusPlugin;
 
 /**
diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/helper/task/CreateDNodeTask.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/helper/task/CreateDNodeTask.java
index 711785f55c..e251035a77 100644
--- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/helper/task/CreateDNodeTask.java
+++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/helper/task/CreateDNodeTask.java
@@ -30,6 +30,7 @@ import org.eclipse.sirius.common.tools.api.interpreter.IInterpreter;
 import org.eclipse.sirius.diagram.AbstractDNode;
 import org.eclipse.sirius.diagram.ArrangeConstraint;
 import org.eclipse.sirius.diagram.DSemanticDiagram;
+import org.eclipse.sirius.diagram.DragAndDropTarget;
 import org.eclipse.sirius.diagram.description.DescriptionPackage;
 import org.eclipse.sirius.diagram.description.NodeMapping;
 import org.eclipse.sirius.diagram.description.tool.NodeCreationDescription;
@@ -38,7 +39,6 @@ import org.eclipse.sirius.tools.api.command.DCommand;
 import org.eclipse.sirius.tools.api.refresh.BestMappingGetter;
 import org.eclipse.sirius.viewpoint.DRepresentationElement;
 import org.eclipse.sirius.viewpoint.DSemanticDecorator;
-import org.eclipse.sirius.viewpoint.DragAndDropTarget;
 import org.eclipse.sirius.viewpoint.SiriusPlugin;
 
 /**
diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/helper/task/DnDTasksOperations.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/helper/task/DnDTasksOperations.java
index f471362a50..94f50350d8 100644
--- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/helper/task/DnDTasksOperations.java
+++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/helper/task/DnDTasksOperations.java
@@ -44,23 +44,23 @@ import org.eclipse.sirius.diagram.DNodeContainer;
 import org.eclipse.sirius.diagram.DNodeList;
 import org.eclipse.sirius.diagram.DNodeListElement;
 import org.eclipse.sirius.diagram.DSemanticDiagram;
+import org.eclipse.sirius.diagram.DragAndDropTarget;
 import org.eclipse.sirius.diagram.EdgeTarget;
 import org.eclipse.sirius.diagram.description.ContainerMapping;
 import org.eclipse.sirius.diagram.description.DiagramDescription;
 import org.eclipse.sirius.diagram.description.DiagramElementMapping;
+import org.eclipse.sirius.diagram.description.DragAndDropTargetDescription;
 import org.eclipse.sirius.diagram.description.EdgeMapping;
 import org.eclipse.sirius.diagram.description.MappingBasedDecoration;
 import org.eclipse.sirius.diagram.description.NodeMapping;
+import org.eclipse.sirius.diagram.description.tool.ContainerDropDescription;
 import org.eclipse.sirius.ecore.extender.business.api.accessor.ModelAccessor;
 import org.eclipse.sirius.ecore.extender.business.api.accessor.exception.FeatureNotFoundException;
 import org.eclipse.sirius.ecore.extender.business.api.accessor.exception.MetaClassNotFoundException;
 import org.eclipse.sirius.ext.base.Option;
 import org.eclipse.sirius.viewpoint.DMappingBased;
-import org.eclipse.sirius.viewpoint.DragAndDropTarget;
 import org.eclipse.sirius.viewpoint.SiriusPlugin;
-import org.eclipse.sirius.viewpoint.description.DragAndDropTargetDescription;
 import org.eclipse.sirius.viewpoint.description.SemanticBasedDecoration;
-import org.eclipse.sirius.viewpoint.description.tool.ContainerDropDescription;
 import org.eclipse.sirius.viewpoint.description.tool.DragSource;
 import org.eclipse.sirius.viewpoint.description.tool.ToolPackage;
 
diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/helper/task/operations/CreateViewTask.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/helper/task/operations/CreateViewTask.java
index 8a30eeab4e..9f3f71bbaf 100644
--- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/helper/task/operations/CreateViewTask.java
+++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/helper/task/operations/CreateViewTask.java
@@ -48,6 +48,7 @@ import org.eclipse.sirius.diagram.DDiagram;
 import org.eclipse.sirius.diagram.DDiagramElement;
 import org.eclipse.sirius.diagram.DEdge;
 import org.eclipse.sirius.diagram.DSemanticDiagram;
+import org.eclipse.sirius.diagram.DragAndDropTarget;
 import org.eclipse.sirius.diagram.EdgeTarget;
 import org.eclipse.sirius.diagram.description.AbstractNodeMapping;
 import org.eclipse.sirius.diagram.description.ContainerMapping;
@@ -65,7 +66,6 @@ import org.eclipse.sirius.ecore.extender.business.api.accessor.exception.MetaCla
 import org.eclipse.sirius.tools.api.command.CommandContext;
 import org.eclipse.sirius.tools.api.refresh.BestMappingGetter;
 import org.eclipse.sirius.viewpoint.DSemanticDecorator;
-import org.eclipse.sirius.viewpoint.DragAndDropTarget;
 import org.eclipse.sirius.viewpoint.SiriusPlugin;
 import org.eclipse.sirius.viewpoint.description.SemanticBasedDecoration;
 import org.eclipse.sirius.viewpoint.description.tool.AbstractToolDescription;
diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/metamodel/description/tool/spec/ContainerDropDescriptionSpec.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/metamodel/description/tool/spec/ContainerDropDescriptionSpec.java
index 32d1d32f8a..c2152718eb 100644
--- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/metamodel/description/tool/spec/ContainerDropDescriptionSpec.java
+++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/metamodel/description/tool/spec/ContainerDropDescriptionSpec.java
@@ -34,18 +34,18 @@ import org.eclipse.sirius.diagram.DDiagramElement;
 import org.eclipse.sirius.diagram.DDiagramElementContainer;
 import org.eclipse.sirius.diagram.DNode;
 import org.eclipse.sirius.diagram.DSemanticDiagram;
+import org.eclipse.sirius.diagram.DragAndDropTarget;
 import org.eclipse.sirius.diagram.description.AbstractNodeMapping;
 import org.eclipse.sirius.diagram.description.ContainerMapping;
+import org.eclipse.sirius.diagram.description.DescriptionPackage;
 import org.eclipse.sirius.diagram.description.DiagramDescription;
 import org.eclipse.sirius.diagram.description.DiagramElementMapping;
+import org.eclipse.sirius.diagram.description.DragAndDropTargetDescription;
 import org.eclipse.sirius.diagram.description.EdgeMapping;
 import org.eclipse.sirius.diagram.description.NodeMapping;
+import org.eclipse.sirius.diagram.description.tool.impl.ContainerDropDescriptionImpl;
 import org.eclipse.sirius.ecore.extender.business.api.accessor.ModelAccessor;
-import org.eclipse.sirius.viewpoint.DragAndDropTarget;
 import org.eclipse.sirius.viewpoint.SiriusPlugin;
-import org.eclipse.sirius.viewpoint.description.DescriptionPackage;
-import org.eclipse.sirius.viewpoint.description.DragAndDropTargetDescription;
-import org.eclipse.sirius.viewpoint.description.tool.impl.ContainerDropDescriptionImpl;
 
 /**
  * Implementation of ContainerDropDescription.
@@ -73,7 +73,8 @@ public class ContainerDropDescriptionSpec extends ContainerDropDescriptionImpl {
                 session = SessionManager.INSTANCE.getSession(((DSemanticDiagram) diagram).getTarget());
             }
 
-            final Collection<DiagramElementMapping> allMappings = new LinkedList<DiagramElementMapping>(new DiagramComponentizationManager().getAllContainerMappings(session.getSelectedViewpoints(false), desc));
+            final Collection<DiagramElementMapping> allMappings = new LinkedList<DiagramElementMapping>(new DiagramComponentizationManager().getAllContainerMappings(
+                    session.getSelectedViewpoints(false), desc));
             allMappings.addAll(getAllMappingsWithSuperMappings(session, desc));
             allMappings.addAll(new DiagramComponentizationManager().getAllEdgeMappings(session.getSelectedViewpoints(false), desc));
             iterCandidates = allMappings.iterator();
@@ -101,7 +102,7 @@ public class ContainerDropDescriptionSpec extends ContainerDropDescriptionImpl {
             return null;
         }
         Session session = SessionManager.INSTANCE.getSession(droppedElement);
-        
+
         final ModelAccessor extendedPackage = session.getModelAccessor();
         while (iterCandidates.hasNext()) {
             final DiagramElementMapping currentMapping = iterCandidates.next();
diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/metamodel/description/validation/ValidationSetSpec.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/metamodel/description/validation/ValidationSetSpec.java
index 8872c30cfb..5555885d14 100644
--- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/metamodel/description/validation/ValidationSetSpec.java
+++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/metamodel/description/validation/ValidationSetSpec.java
@@ -15,9 +15,9 @@ import java.util.Collection;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.util.EcoreEList;
-import org.eclipse.sirius.diagram.description.validation.ValidationPackage;
-import org.eclipse.sirius.diagram.description.validation.ValidationRule;
-import org.eclipse.sirius.diagram.description.validation.impl.ValidationSetImpl;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationPackage;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationRule;
+import org.eclipse.sirius.viewpoint.description.validation.impl.ValidationSetImpl;
 
 /**
  * Implementation of
diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/metamodel/description/validation/operations/ValidationRuleSpecOperations.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/metamodel/description/validation/operations/ValidationRuleSpecOperations.java
index 65c01573d0..82a543b7c8 100644
--- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/metamodel/description/validation/operations/ValidationRuleSpecOperations.java
+++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/metamodel/description/validation/operations/ValidationRuleSpecOperations.java
@@ -16,10 +16,10 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.sirius.business.api.logger.RuntimeLoggerManager;
 import org.eclipse.sirius.common.tools.api.interpreter.EvaluationException;
 import org.eclipse.sirius.common.tools.api.interpreter.IInterpreter;
-import org.eclipse.sirius.diagram.description.validation.RuleAudit;
-import org.eclipse.sirius.diagram.description.validation.ValidationPackage;
-import org.eclipse.sirius.diagram.description.validation.ValidationRule;
 import org.eclipse.sirius.viewpoint.SiriusPlugin;
+import org.eclipse.sirius.viewpoint.description.validation.RuleAudit;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationPackage;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationRule;
 
 /**
  * Implementation of ValidationRuleImpl.java.
diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/metamodel/description/validation/spec/SemanticValidationRuleSpec.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/metamodel/description/validation/spec/SemanticValidationRuleSpec.java
index 7d944b659d..2575f32952 100644
--- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/metamodel/description/validation/spec/SemanticValidationRuleSpec.java
+++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/metamodel/description/validation/spec/SemanticValidationRuleSpec.java
@@ -12,7 +12,7 @@ package org.eclipse.sirius.business.internal.metamodel.description.validation.sp
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.sirius.business.internal.metamodel.description.validation.operations.ValidationRuleSpecOperations;
-import org.eclipse.sirius.diagram.description.validation.impl.SemanticValidationRuleImpl;
+import org.eclipse.sirius.viewpoint.description.validation.impl.SemanticValidationRuleImpl;
 
 /**
  * Implementation of SemanticValidationRule.
diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/metamodel/description/validation/spec/ViewValidationRuleSpec.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/metamodel/description/validation/spec/ViewValidationRuleSpec.java
index 7de02d39f8..8fbca5222e 100644
--- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/metamodel/description/validation/spec/ViewValidationRuleSpec.java
+++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/metamodel/description/validation/spec/ViewValidationRuleSpec.java
@@ -12,7 +12,7 @@ package org.eclipse.sirius.business.internal.metamodel.description.validation.sp
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.sirius.business.internal.metamodel.description.validation.operations.ValidationRuleSpecOperations;
-import org.eclipse.sirius.diagram.description.validation.impl.ViewValidationRuleImpl;
+import org.eclipse.sirius.viewpoint.description.validation.impl.ViewValidationRuleImpl;
 
 /**
  * Implementation of ViewValidationRule.
diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/metamodel/operations/DDiagramElementContainerSpecOperations.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/metamodel/operations/DDiagramElementContainerSpecOperations.java
index 694aac0651..a866edec20 100644
--- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/metamodel/operations/DDiagramElementContainerSpecOperations.java
+++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/metamodel/operations/DDiagramElementContainerSpecOperations.java
@@ -31,16 +31,16 @@ import org.eclipse.sirius.diagram.DNodeContainer;
 import org.eclipse.sirius.diagram.DNodeList;
 import org.eclipse.sirius.diagram.DNodeListElement;
 import org.eclipse.sirius.diagram.DSemanticDiagram;
+import org.eclipse.sirius.diagram.DragAndDropTarget;
 import org.eclipse.sirius.diagram.description.ContainerMapping;
 import org.eclipse.sirius.diagram.description.DiagramElementMapping;
+import org.eclipse.sirius.diagram.description.DragAndDropTargetDescription;
 import org.eclipse.sirius.diagram.description.Layer;
 import org.eclipse.sirius.diagram.description.NodeMapping;
+import org.eclipse.sirius.diagram.description.tool.ContainerDropDescription;
 import org.eclipse.sirius.viewpoint.DSemanticDecorator;
-import org.eclipse.sirius.viewpoint.DragAndDropTarget;
 import org.eclipse.sirius.viewpoint.SiriusPlugin;
-import org.eclipse.sirius.viewpoint.description.DragAndDropTargetDescription;
 import org.eclipse.sirius.viewpoint.description.tool.AbstractToolDescription;
-import org.eclipse.sirius.viewpoint.description.tool.ContainerDropDescription;
 import org.eclipse.sirius.viewpoint.description.tool.DragSource;
 import org.eclipse.sirius.viewpoint.description.tool.ToolPackage;
 
diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/metamodel/spec/DDiagramSpec.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/metamodel/spec/DDiagramSpec.java
index 9efaee96a6..177d66bd52 100644
--- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/metamodel/spec/DDiagramSpec.java
+++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/metamodel/spec/DDiagramSpec.java
@@ -28,6 +28,7 @@ import org.eclipse.sirius.diagram.DNode;
 import org.eclipse.sirius.diagram.DNodeListElement;
 import org.eclipse.sirius.diagram.DiagramPackage;
 import org.eclipse.sirius.diagram.description.ContainerMapping;
+import org.eclipse.sirius.diagram.description.DragAndDropTargetDescription;
 import org.eclipse.sirius.diagram.description.EdgeMapping;
 import org.eclipse.sirius.diagram.description.NodeMapping;
 import org.eclipse.sirius.diagram.description.concern.ConcernDescription;
@@ -36,7 +37,6 @@ import org.eclipse.sirius.diagram.impl.DDiagramImpl;
 import org.eclipse.sirius.viewpoint.DRepresentationElement;
 import org.eclipse.sirius.viewpoint.ViewpointPackage;
 import org.eclipse.sirius.viewpoint.description.DAnnotation;
-import org.eclipse.sirius.viewpoint.description.DragAndDropTargetDescription;
 
 /**
  * Implementation of DDiagramImpl.java.
diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/metamodel/spec/DNodeContainerSpec.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/metamodel/spec/DNodeContainerSpec.java
index 34a11c157d..30f46f1458 100644
--- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/metamodel/spec/DNodeContainerSpec.java
+++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/metamodel/spec/DNodeContainerSpec.java
@@ -30,10 +30,10 @@ import org.eclipse.sirius.diagram.DNode;
 import org.eclipse.sirius.diagram.DiagramPackage;
 import org.eclipse.sirius.diagram.description.ContainerMapping;
 import org.eclipse.sirius.diagram.description.DiagramElementMapping;
+import org.eclipse.sirius.diagram.description.DragAndDropTargetDescription;
 import org.eclipse.sirius.diagram.description.NodeMapping;
 import org.eclipse.sirius.diagram.impl.DNodeContainerImpl;
 import org.eclipse.sirius.viewpoint.Style;
-import org.eclipse.sirius.viewpoint.description.DragAndDropTargetDescription;
 
 import com.google.common.base.Predicates;
 import com.google.common.collect.Collections2;
diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/metamodel/spec/DNodeListSpec.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/metamodel/spec/DNodeListSpec.java
index 8925bdb14b..926f871cce 100644
--- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/metamodel/spec/DNodeListSpec.java
+++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/metamodel/spec/DNodeListSpec.java
@@ -27,10 +27,10 @@ import org.eclipse.sirius.diagram.DNode;
 import org.eclipse.sirius.diagram.DiagramPackage;
 import org.eclipse.sirius.diagram.description.ContainerMapping;
 import org.eclipse.sirius.diagram.description.DiagramElementMapping;
+import org.eclipse.sirius.diagram.description.DragAndDropTargetDescription;
 import org.eclipse.sirius.diagram.description.NodeMapping;
 import org.eclipse.sirius.diagram.impl.DNodeListImpl;
 import org.eclipse.sirius.viewpoint.Style;
-import org.eclipse.sirius.viewpoint.description.DragAndDropTargetDescription;
 
 import com.google.common.base.Predicates;
 import com.google.common.collect.Collections2;
diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/metamodel/spec/DNodeSpec.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/metamodel/spec/DNodeSpec.java
index f899e0fc97..2bdc808beb 100644
--- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/metamodel/spec/DNodeSpec.java
+++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/metamodel/spec/DNodeSpec.java
@@ -24,11 +24,11 @@ import org.eclipse.sirius.diagram.DDiagram;
 import org.eclipse.sirius.diagram.DNode;
 import org.eclipse.sirius.diagram.DSemanticDiagram;
 import org.eclipse.sirius.diagram.description.DiagramElementMapping;
+import org.eclipse.sirius.diagram.description.DragAndDropTargetDescription;
 import org.eclipse.sirius.diagram.impl.DNodeImpl;
 import org.eclipse.sirius.tools.api.profiler.SiriusTasksKey;
 import org.eclipse.sirius.viewpoint.DSemanticDecorator;
 import org.eclipse.sirius.viewpoint.Style;
-import org.eclipse.sirius.viewpoint.description.DragAndDropTargetDescription;
 
 /**
  * Implementation of DNodeImpl.java.
diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/metamodel/spec/DSemanticDiagramSpec.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/metamodel/spec/DSemanticDiagramSpec.java
index 23fad929a9..7ca514a629 100644
--- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/metamodel/spec/DSemanticDiagramSpec.java
+++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/metamodel/spec/DSemanticDiagramSpec.java
@@ -29,6 +29,7 @@ import org.eclipse.sirius.diagram.DNode;
 import org.eclipse.sirius.diagram.DNodeListElement;
 import org.eclipse.sirius.diagram.DiagramPackage;
 import org.eclipse.sirius.diagram.description.ContainerMapping;
+import org.eclipse.sirius.diagram.description.DragAndDropTargetDescription;
 import org.eclipse.sirius.diagram.description.EdgeMapping;
 import org.eclipse.sirius.diagram.description.NodeMapping;
 import org.eclipse.sirius.diagram.description.concern.ConcernDescription;
@@ -37,7 +38,6 @@ import org.eclipse.sirius.diagram.impl.DSemanticDiagramImpl;
 import org.eclipse.sirius.viewpoint.DRepresentationElement;
 import org.eclipse.sirius.viewpoint.ViewpointPackage;
 import org.eclipse.sirius.viewpoint.description.DAnnotation;
-import org.eclipse.sirius.viewpoint.description.DragAndDropTargetDescription;
 
 /**
  * Operations of semantic viewpoints.
diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/query/DDiagramInternalQuery.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/query/DDiagramInternalQuery.java
index 1b430ae4cd..6a06376150 100644
--- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/query/DDiagramInternalQuery.java
+++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/query/DDiagramInternalQuery.java
@@ -23,8 +23,8 @@ import org.eclipse.sirius.diagram.DNode;
 import org.eclipse.sirius.diagram.DNodeContainer;
 import org.eclipse.sirius.diagram.DNodeList;
 import org.eclipse.sirius.diagram.DNodeListElement;
+import org.eclipse.sirius.diagram.description.DragAndDropTargetDescription;
 import org.eclipse.sirius.diagram.description.filter.FilterDescription;
-import org.eclipse.sirius.viewpoint.description.DragAndDropTargetDescription;
 
 /**
  * A class aggregating all the queries (read-only!) having a {@link DDiagram} as
diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/sync/visitor/DefaultDiagramElementsHierarchyVisitor.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/sync/visitor/DefaultDiagramElementsHierarchyVisitor.java
index 6ebe2a552c..db70cf465d 100644
--- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/sync/visitor/DefaultDiagramElementsHierarchyVisitor.java
+++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/sync/visitor/DefaultDiagramElementsHierarchyVisitor.java
@@ -17,7 +17,7 @@ import org.eclipse.sirius.diagram.DDiagramElement;
 import org.eclipse.sirius.diagram.DNode;
 import org.eclipse.sirius.diagram.DNodeContainer;
 import org.eclipse.sirius.diagram.DNodeList;
-import org.eclipse.sirius.viewpoint.DragAndDropTarget;
+import org.eclipse.sirius.diagram.DragAndDropTarget;
 
 import com.google.common.collect.Iterables;
 
diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/sync/visitor/DiagramElementsHierarchyVisitor.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/sync/visitor/DiagramElementsHierarchyVisitor.java
index 8a8b053380..e5b3bbd03e 100644
--- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/sync/visitor/DiagramElementsHierarchyVisitor.java
+++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/sync/visitor/DiagramElementsHierarchyVisitor.java
@@ -11,7 +11,7 @@
 package org.eclipse.sirius.business.internal.sync.visitor;
 
 import org.eclipse.sirius.diagram.DDiagramElement;
-import org.eclipse.sirius.viewpoint.DragAndDropTarget;
+import org.eclipse.sirius.diagram.DragAndDropTarget;
 
 /**
  * A visitor to retrieve diagram element children.
diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/api/command/IDiagramCommandFactory.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/api/command/IDiagramCommandFactory.java
index 85ed8a4c8e..677d761954 100644
--- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/api/command/IDiagramCommandFactory.java
+++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/api/command/IDiagramCommandFactory.java
@@ -21,28 +21,28 @@ import org.eclipse.sirius.diagram.DDiagramElement;
 import org.eclipse.sirius.diagram.DDiagramElementContainer;
 import org.eclipse.sirius.diagram.DEdge;
 import org.eclipse.sirius.diagram.DNode;
+import org.eclipse.sirius.diagram.DragAndDropTarget;
 import org.eclipse.sirius.diagram.EdgeTarget;
 import org.eclipse.sirius.diagram.description.DiagramDescription;
 import org.eclipse.sirius.diagram.description.tool.BehaviorTool;
 import org.eclipse.sirius.diagram.description.tool.ContainerCreationDescription;
+import org.eclipse.sirius.diagram.description.tool.ContainerDropDescription;
 import org.eclipse.sirius.diagram.description.tool.DirectEditLabel;
 import org.eclipse.sirius.diagram.description.tool.DoubleClickDescription;
 import org.eclipse.sirius.diagram.description.tool.EdgeCreationDescription;
 import org.eclipse.sirius.diagram.description.tool.NodeCreationDescription;
 import org.eclipse.sirius.diagram.description.tool.ReconnectEdgeDescription;
-import org.eclipse.sirius.diagram.description.validation.ValidationFix;
 import org.eclipse.sirius.tools.api.ui.IExternalJavaAction;
 import org.eclipse.sirius.viewpoint.DLabelled;
 import org.eclipse.sirius.viewpoint.DRefreshable;
 import org.eclipse.sirius.viewpoint.DSemanticDecorator;
-import org.eclipse.sirius.viewpoint.DragAndDropTarget;
-import org.eclipse.sirius.viewpoint.description.tool.ContainerDropDescription;
 import org.eclipse.sirius.viewpoint.description.tool.ExternalJavaAction;
 import org.eclipse.sirius.viewpoint.description.tool.OperationAction;
 import org.eclipse.sirius.viewpoint.description.tool.PaneBasedSelectionWizardDescription;
 import org.eclipse.sirius.viewpoint.description.tool.PasteDescription;
 import org.eclipse.sirius.viewpoint.description.tool.SelectionWizardDescription;
 import org.eclipse.sirius.viewpoint.description.tool.ToolDescription;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationFix;
 
 /**
  * The command factory for diagram dialect.
diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/api/command/view/CreateDDiagramElementCommand.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/api/command/view/CreateDDiagramElementCommand.java
index e6ad8d81a5..3fcf99a28e 100644
--- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/api/command/view/CreateDDiagramElementCommand.java
+++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/api/command/view/CreateDDiagramElementCommand.java
@@ -29,13 +29,13 @@ import org.eclipse.sirius.common.tools.api.interpreter.IInterpreter;
 import org.eclipse.sirius.diagram.DDiagram;
 import org.eclipse.sirius.diagram.DDiagramElement;
 import org.eclipse.sirius.diagram.DSemanticDiagram;
+import org.eclipse.sirius.diagram.DragAndDropTarget;
 import org.eclipse.sirius.diagram.EdgeTarget;
 import org.eclipse.sirius.diagram.description.AbstractNodeMapping;
 import org.eclipse.sirius.diagram.description.DiagramElementMapping;
 import org.eclipse.sirius.diagram.description.EdgeMapping;
 import org.eclipse.sirius.diagram.description.MappingBasedDecoration;
 import org.eclipse.sirius.ecore.extender.business.api.accessor.ModelAccessor;
-import org.eclipse.sirius.viewpoint.DragAndDropTarget;
 import org.eclipse.sirius.viewpoint.SiriusPlugin;
 import org.eclipse.sirius.viewpoint.description.SemanticBasedDecoration;
 
diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/api/refresh/BestMappingGetter.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/api/refresh/BestMappingGetter.java
index f604be315c..ca87374bbf 100644
--- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/api/refresh/BestMappingGetter.java
+++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/api/refresh/BestMappingGetter.java
@@ -28,6 +28,7 @@ import org.eclipse.sirius.diagram.DDiagramElement;
 import org.eclipse.sirius.diagram.DNodeContainer;
 import org.eclipse.sirius.diagram.DNodeList;
 import org.eclipse.sirius.diagram.DSemanticDiagram;
+import org.eclipse.sirius.diagram.DragAndDropTarget;
 import org.eclipse.sirius.diagram.EdgeTarget;
 import org.eclipse.sirius.diagram.description.AbstractNodeMapping;
 import org.eclipse.sirius.diagram.description.ContainerMapping;
@@ -36,7 +37,6 @@ import org.eclipse.sirius.diagram.description.NodeMapping;
 import org.eclipse.sirius.ecore.extender.business.api.accessor.ModelAccessor;
 import org.eclipse.sirius.viewpoint.DMappingBased;
 import org.eclipse.sirius.viewpoint.DSemanticDecorator;
-import org.eclipse.sirius.viewpoint.DragAndDropTarget;
 
 /**
  * Get the best mapping according to a contextual diagram, its enabled layers
diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/api/validation/constraint/AbstractDDiagramConstraint.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/api/validation/constraint/AbstractDDiagramConstraint.java
index 1503158a59..408199351b 100644
--- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/api/validation/constraint/AbstractDDiagramConstraint.java
+++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/api/validation/constraint/AbstractDDiagramConstraint.java
@@ -30,14 +30,14 @@ import org.eclipse.sirius.diagram.DDiagramElement;
 import org.eclipse.sirius.diagram.DEdge;
 import org.eclipse.sirius.diagram.description.DiagramDescription;
 import org.eclipse.sirius.diagram.description.DiagramElementMapping;
-import org.eclipse.sirius.diagram.description.validation.ERROR_LEVEL;
-import org.eclipse.sirius.diagram.description.validation.SemanticValidationRule;
-import org.eclipse.sirius.diagram.description.validation.ValidationRule;
-import org.eclipse.sirius.diagram.description.validation.ValidationSet;
-import org.eclipse.sirius.diagram.description.validation.ViewValidationRule;
 import org.eclipse.sirius.viewpoint.DSemanticDecorator;
 import org.eclipse.sirius.viewpoint.SiriusPlugin;
 import org.eclipse.sirius.viewpoint.description.Viewpoint;
+import org.eclipse.sirius.viewpoint.description.validation.ERROR_LEVEL;
+import org.eclipse.sirius.viewpoint.description.validation.SemanticValidationRule;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationRule;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationSet;
+import org.eclipse.sirius.viewpoint.description.validation.ViewValidationRule;
 
 /**
  * Common class for all the DDiagram constraints. This class wrapp the base
diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/api/validation/constraint/RuleWrappingStatus.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/api/validation/constraint/RuleWrappingStatus.java
index bfe2a4c89c..092e737d5d 100644
--- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/api/validation/constraint/RuleWrappingStatus.java
+++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/api/validation/constraint/RuleWrappingStatus.java
@@ -12,7 +12,7 @@ package org.eclipse.sirius.tools.api.validation.constraint;
 
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.emf.validation.model.ConstraintStatus;
-import org.eclipse.sirius.diagram.description.validation.ValidationRule;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationRule;
 
 /**
  * 
diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/internal/command/UndoRedoCapableEMFCommandFactory.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/internal/command/UndoRedoCapableEMFCommandFactory.java
index 498f19c967..9812cb7ec6 100644
--- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/internal/command/UndoRedoCapableEMFCommandFactory.java
+++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/internal/command/UndoRedoCapableEMFCommandFactory.java
@@ -40,16 +40,17 @@ import org.eclipse.sirius.diagram.DDiagramElement;
 import org.eclipse.sirius.diagram.DDiagramElementContainer;
 import org.eclipse.sirius.diagram.DEdge;
 import org.eclipse.sirius.diagram.DNode;
+import org.eclipse.sirius.diagram.DragAndDropTarget;
 import org.eclipse.sirius.diagram.EdgeTarget;
 import org.eclipse.sirius.diagram.description.DiagramDescription;
 import org.eclipse.sirius.diagram.description.tool.BehaviorTool;
 import org.eclipse.sirius.diagram.description.tool.ContainerCreationDescription;
+import org.eclipse.sirius.diagram.description.tool.ContainerDropDescription;
 import org.eclipse.sirius.diagram.description.tool.DirectEditLabel;
 import org.eclipse.sirius.diagram.description.tool.DoubleClickDescription;
 import org.eclipse.sirius.diagram.description.tool.EdgeCreationDescription;
 import org.eclipse.sirius.diagram.description.tool.NodeCreationDescription;
 import org.eclipse.sirius.diagram.description.tool.ReconnectEdgeDescription;
-import org.eclipse.sirius.diagram.description.validation.ValidationFix;
 import org.eclipse.sirius.ecore.extender.business.api.permission.IPermissionAuthority;
 import org.eclipse.sirius.ext.base.Option;
 import org.eclipse.sirius.tools.api.command.AbstractCommandFactory;
@@ -84,9 +85,7 @@ import org.eclipse.sirius.viewpoint.DLabelled;
 import org.eclipse.sirius.viewpoint.DRefreshable;
 import org.eclipse.sirius.viewpoint.DRepresentation;
 import org.eclipse.sirius.viewpoint.DSemanticDecorator;
-import org.eclipse.sirius.viewpoint.DragAndDropTarget;
 import org.eclipse.sirius.viewpoint.description.tool.AbstractVariable;
-import org.eclipse.sirius.viewpoint.description.tool.ContainerDropDescription;
 import org.eclipse.sirius.viewpoint.description.tool.ExternalJavaAction;
 import org.eclipse.sirius.viewpoint.description.tool.OperationAction;
 import org.eclipse.sirius.viewpoint.description.tool.PaneBasedSelectionWizardDescription;
@@ -94,6 +93,7 @@ import org.eclipse.sirius.viewpoint.description.tool.PasteDescription;
 import org.eclipse.sirius.viewpoint.description.tool.RepresentationCreationDescription;
 import org.eclipse.sirius.viewpoint.description.tool.SelectionWizardDescription;
 import org.eclipse.sirius.viewpoint.description.tool.ToolDescription;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationFix;
 
 /**
  * A command factory that creates commands that can be undone.
diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/internal/command/builders/DragAndDropCommandBuilder.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/internal/command/builders/DragAndDropCommandBuilder.java
index 692de22226..c13325e0bd 100644
--- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/internal/command/builders/DragAndDropCommandBuilder.java
+++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/internal/command/builders/DragAndDropCommandBuilder.java
@@ -32,10 +32,12 @@ import org.eclipse.sirius.business.internal.helper.task.DnDTasksOperations;
 import org.eclipse.sirius.common.tools.api.interpreter.IInterpreter;
 import org.eclipse.sirius.diagram.DDiagram;
 import org.eclipse.sirius.diagram.DDiagramElement;
+import org.eclipse.sirius.diagram.DragAndDropTarget;
 import org.eclipse.sirius.diagram.description.ContainerMapping;
 import org.eclipse.sirius.diagram.description.DiagramElementMapping;
 import org.eclipse.sirius.diagram.description.EdgeMapping;
 import org.eclipse.sirius.diagram.description.NodeMapping;
+import org.eclipse.sirius.diagram.description.tool.ContainerDropDescription;
 import org.eclipse.sirius.ext.base.Option;
 import org.eclipse.sirius.tools.api.command.DCommand;
 import org.eclipse.sirius.tools.api.interpreter.InterpreterUtil;
@@ -43,10 +45,8 @@ import org.eclipse.sirius.tools.api.ui.resource.ISiriusMessages;
 import org.eclipse.sirius.viewpoint.DModel;
 import org.eclipse.sirius.viewpoint.DRepresentation;
 import org.eclipse.sirius.viewpoint.DSemanticDecorator;
-import org.eclipse.sirius.viewpoint.DragAndDropTarget;
 import org.eclipse.sirius.viewpoint.SiriusPlugin;
 import org.eclipse.sirius.viewpoint.description.tool.AbstractVariable;
-import org.eclipse.sirius.viewpoint.description.tool.ContainerDropDescription;
 
 /**
  * .
diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/internal/validation/constraints/ErrorConstraint.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/internal/validation/constraints/ErrorConstraint.java
index b177e70101..22b46b3a6c 100644
--- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/internal/validation/constraints/ErrorConstraint.java
+++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/internal/validation/constraints/ErrorConstraint.java
@@ -10,9 +10,9 @@
  *******************************************************************************/
 package org.eclipse.sirius.tools.internal.validation.constraints;
 
-import org.eclipse.sirius.diagram.description.validation.ERROR_LEVEL;
-import org.eclipse.sirius.diagram.description.validation.ValidationRule;
 import org.eclipse.sirius.tools.api.validation.constraint.AbstractDDiagramConstraint;
+import org.eclipse.sirius.viewpoint.description.validation.ERROR_LEVEL;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationRule;
 
 /**
  * Constraint for DDiagramElement bridging EMF validation framework and our
diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/internal/validation/constraints/InfoConstraint.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/internal/validation/constraints/InfoConstraint.java
index 312dbe023a..c59d8e2fa9 100644
--- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/internal/validation/constraints/InfoConstraint.java
+++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/internal/validation/constraints/InfoConstraint.java
@@ -10,9 +10,9 @@
  *******************************************************************************/
 package org.eclipse.sirius.tools.internal.validation.constraints;
 
-import org.eclipse.sirius.diagram.description.validation.ERROR_LEVEL;
-import org.eclipse.sirius.diagram.description.validation.ValidationRule;
 import org.eclipse.sirius.tools.api.validation.constraint.AbstractDDiagramConstraint;
+import org.eclipse.sirius.viewpoint.description.validation.ERROR_LEVEL;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationRule;
 
 /**
  * Constraint for DDiagramElement bridging EMF validation framework and our
diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/internal/validation/constraints/WarningConstraint.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/internal/validation/constraints/WarningConstraint.java
index 7d2574e737..0fc0187554 100644
--- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/internal/validation/constraints/WarningConstraint.java
+++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/internal/validation/constraints/WarningConstraint.java
@@ -10,9 +10,9 @@
  *******************************************************************************/
 package org.eclipse.sirius.tools.internal.validation.constraints;
 
-import org.eclipse.sirius.diagram.description.validation.ERROR_LEVEL;
-import org.eclipse.sirius.diagram.description.validation.ValidationRule;
 import org.eclipse.sirius.tools.api.validation.constraint.AbstractDDiagramConstraint;
+import org.eclipse.sirius.viewpoint.description.validation.ERROR_LEVEL;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationRule;
 
 /**
  * Constraint for DDiagramElement bridging EMF validation framework and our
diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/internal/validation/description/constraints/ExistingExpressionVariablesConstraint.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/internal/validation/description/constraints/ExistingExpressionVariablesConstraint.java
index e6180ef32e..8bf7ced173 100644
--- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/internal/validation/description/constraints/ExistingExpressionVariablesConstraint.java
+++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/internal/validation/description/constraints/ExistingExpressionVariablesConstraint.java
@@ -32,6 +32,7 @@ import org.eclipse.sirius.diagram.description.EdgeMapping;
 import org.eclipse.sirius.diagram.description.NodeMapping;
 import org.eclipse.sirius.diagram.description.style.ContainerStyleDescription;
 import org.eclipse.sirius.diagram.description.style.NodeStyleDescription;
+import org.eclipse.sirius.diagram.description.tool.ContainerDropDescription;
 import org.eclipse.sirius.diagram.description.tool.CreateEdgeView;
 import org.eclipse.sirius.diagram.description.tool.CreateView;
 import org.eclipse.sirius.diagram.description.tool.DeleteElementDescription;
@@ -46,7 +47,6 @@ import org.eclipse.sirius.viewpoint.description.tool.AbstractToolDescription;
 import org.eclipse.sirius.viewpoint.description.tool.AbstractVariable;
 import org.eclipse.sirius.viewpoint.description.tool.AcceleoVariable;
 import org.eclipse.sirius.viewpoint.description.tool.ChangeContext;
-import org.eclipse.sirius.viewpoint.description.tool.ContainerDropDescription;
 import org.eclipse.sirius.viewpoint.description.tool.CreateInstance;
 import org.eclipse.sirius.viewpoint.description.tool.DragSource;
 import org.eclipse.sirius.viewpoint.description.tool.EditMaskVariables;
diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/internal/validation/description/constraints/PreconditionForDndToolsConstraint.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/internal/validation/description/constraints/PreconditionForDndToolsConstraint.java
index 223c3f1df5..bd476abf3e 100644
--- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/internal/validation/description/constraints/PreconditionForDndToolsConstraint.java
+++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/internal/validation/description/constraints/PreconditionForDndToolsConstraint.java
@@ -17,7 +17,7 @@ import org.eclipse.emf.validation.EMFEventType;
 import org.eclipse.emf.validation.IValidationContext;
 import org.eclipse.sirius.business.api.query.IdentifiedElementQuery;
 import org.eclipse.sirius.common.tools.api.util.StringUtil;
-import org.eclipse.sirius.viewpoint.description.tool.ContainerDropDescription;
+import org.eclipse.sirius.diagram.description.tool.ContainerDropDescription;
 import org.eclipse.sirius.viewpoint.description.tool.DragSource;
 
 /**
author	Laurent Redor	2014-01-31 15:02:36 +0000
committer	Laurent Redor	2014-02-04 09:22:45 +0000
commit	0e5e2bdb7dc61d76b9091f34d095b7c48b6f2e8f (patch)
tree	c6e9d5950dc12508aec02d80061dd99c8e9655bf
parent	58c788056282b7eb0c7a3a2e91a479c894d7f9da (diff)
download	org.eclipse.sirius-0e5e2bdb7dc61d76b9091f34d095b7c48b6f2e8f.tar.gz org.eclipse.sirius-0e5e2bdb7dc61d76b9091f34d095b7c48b6f2e8f.tar.xz org.eclipse.sirius-0e5e2bdb7dc61d76b9091f34d095b7c48b6f2e8f.zip