[423052] Generate editor code

And fix compilation pb in corresponding plugin
(org.eclipse.sirius.editor).
Other generations and compilations problems are split in other commits
to facilitate the review.

Change-Id: I607f1d7b7d18e09c2f08b0e6192993dd45f12605
Signed-off-by: Laurent Redor <laurent.redor@obeo.fr>

98 files changed, 150 insertions, 150 deletions

diff --git a/plugins/org.eclipse.sirius.editor/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.editor/META-INF/MANIFEST.MF
index 1d41f3bb29..b32d38b491 100644
--- a/plugins/org.eclipse.sirius.editor/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.sirius.editor/META-INF/MANIFEST.MF
@@ -40,7 +40,7 @@ Export-Package: org.eclipse.sirius.editor.assist.content;version="1.0.0",
  org.eclipse.sirius.editor.properties.filters.description.conditionalstyledescription;version="1.0.0",
  org.eclipse.sirius.editor.properties.filters.description.containermapping;version="1.0.0",
  org.eclipse.sirius.editor.properties.filters.description.containermappingimport;version="1.0.0",
- org.eclipse.sirius.editor.properties.filters.description.dannotation;version="1.0.0",
+  org.eclipse.sirius.editor.properties.filters.description.dannotation;version="1.0.0",
  org.eclipse.sirius.editor.properties.filters.description.dannotationentry;version="1.0.0",
  org.eclipse.sirius.editor.properties.filters.description.decorationdescription;version="1.0.0",
  org.eclipse.sirius.editor.properties.filters.description.diagramdescription;version="1.0.0",
@@ -295,19 +295,19 @@ Export-Package: org.eclipse.sirius.editor.assist.content;version="1.0.0",
  org.eclipse.sirius.editor.tools.api.assist;version="1.0.0",
  org.eclipse.sirius.editor.tools.api.editor;version="1.0.0",
  org.eclipse.sirius.editor.tools.api.menu;version="1.0.0",
- org.eclipse.sirius.editor.tools.internal.actions;x-internal:=true;version="1.0.0",
- org.eclipse.sirius.editor.tools.internal.assist;x-internal:=true;version="1.0.0",
- org.eclipse.sirius.editor.tools.internal.color;x-internal:=true;version="1.0.0",
- org.eclipse.sirius.editor.tools.internal.editor;x-internal:=true;version="1.0.0",
- org.eclipse.sirius.editor.tools.internal.marker;x-internal:=true;version="1.0.0",
- org.eclipse.sirius.editor.tools.internal.menu;x-internal:=true;version="1.0.0",
- org.eclipse.sirius.editor.tools.internal.menu.child;x-internal:=true;version="1.0.0",
- org.eclipse.sirius.editor.tools.internal.menu.refactoring;x-internal:=true;version="1.0.0",
- org.eclipse.sirius.editor.tools.internal.menu.refactoring.border;x-internal:=true;version="1.0.0",
- org.eclipse.sirius.editor.tools.internal.presentation;x-internal:=true;version="1.0.0",
- org.eclipse.sirius.editor.tools.internal.property.filter;x-internal:=true;version="1.0.0",
- org.eclipse.sirius.editor.tools.internal.property.section;x-internal:=true;version="1.0.0",
- org.eclipse.sirius.editor.tools.internal.wizards;x-internal:=true;version="1.0.0",
+ org.eclipse.sirius.editor.tools.internal.actions;version="1.0.0";x-internal:=true,
+ org.eclipse.sirius.editor.tools.internal.assist;version="1.0.0";x-internal:=true,
+ org.eclipse.sirius.editor.tools.internal.color;version="1.0.0";x-internal:=true,
+ org.eclipse.sirius.editor.tools.internal.editor;version="1.0.0";x-internal:=true,
+ org.eclipse.sirius.editor.tools.internal.marker;version="1.0.0";x-internal:=true,
+ org.eclipse.sirius.editor.tools.internal.menu;version="1.0.0";x-internal:=true,
+ org.eclipse.sirius.editor.tools.internal.menu.child;version="1.0.0";x-internal:=true,
+ org.eclipse.sirius.editor.tools.internal.menu.refactoring;version="1.0.0";x-internal:=true,
+ org.eclipse.sirius.editor.tools.internal.menu.refactoring.border;version="1.0.0";x-internal:=true,
+ org.eclipse.sirius.editor.tools.internal.presentation;version="1.0.0";x-internal:=true,
+ org.eclipse.sirius.editor.tools.internal.property.filter;version="1.0.0";x-internal:=true,
+ org.eclipse.sirius.editor.tools.internal.property.section;version="1.0.0";x-internal:=true,
+ org.eclipse.sirius.editor.tools.internal.wizards;version="1.0.0";x-internal:=true,
  org.eclipse.sirius.editor.utils;version="1.0.0",
  org.eclipse.sirius.editor.wizards;version="1.0.0"
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.sirius.editor/plugin.properties b/plugins/org.eclipse.sirius.editor/plugin.properties
index d702614601..0f5950f070 100644
--- a/plugins/org.eclipse.sirius.editor/plugin.properties
+++ b/plugins/org.eclipse.sirius.editor/plugin.properties
@@ -27,13 +27,13 @@ _UI_SiriusEditor_menu = &Viewpoint Editor
 _UI_SiriusEditor_menu = &Description Editor
 _UI_SiriusEditor_menu = &Style Editor
 _UI_SiriusEditor_menu = &Tool Editor
+_UI_SiriusEditor_menu = &Validation Editor
 _UI_SiriusEditor_menu = &Audit Editor
 _UI_SiriusEditor_menu = &Diagram Editor
 _UI_SiriusEditor_menu = &Diagram Description Editor
 _UI_SiriusEditor_menu = &Diagram Style Editor
 _UI_SiriusEditor_menu = &Diagram Tool Editor
 _UI_SiriusEditor_menu = &Filter Editor
-_UI_SiriusEditor_menu = &Validation Editor
 _UI_SiriusEditor_menu = &Concern Editor
 
 _UI_CreateChild_menu_item = &New Child
@@ -89,6 +89,13 @@ _UI_SiriusEditor_label = Tool Model Editor
 
 _UI_SiriusEditorFilenameDefaultBase = My
 _UI_SiriusEditorFilenameExtension = Tool
+_UI_ValidationModelWizard_label = Validation Model
+_UI_ValidationModelWizard_description = Create a new Validation model
+
+_UI_SiriusEditor_label = Validation Model Editor
+
+_UI_SiriusEditorFilenameDefaultBase = My
+_UI_SiriusEditorFilenameExtension = Validation
 _UI_AuditModelWizard_label = Audit Model
 _UI_AuditModelWizard_description = Create a new Audit model
 
@@ -131,13 +138,6 @@ _UI_SiriusEditor_label = Filter Model Editor
 
 _UI_SiriusEditorFilenameDefaultBase = My
 _UI_SiriusEditorFilenameExtension = Filter
-_UI_ValidationModelWizard_label = Validation Model
-_UI_ValidationModelWizard_description = Create a new Validation model
-
-_UI_SiriusEditor_label = Validation Model Editor
-
-_UI_SiriusEditorFilenameDefaultBase = My
-_UI_SiriusEditorFilenameExtension = Validation
 _UI_ConcernModelWizard_label = Concern Model
 _UI_ConcernModelWizard_description = Create a new Concern model
 
diff --git a/plugins/org.eclipse.sirius.editor/plugin.xml b/plugins/org.eclipse.sirius.editor/plugin.xml
index e05c10eb22..60093f811b 100644
--- a/plugins/org.eclipse.sirius.editor/plugin.xml
+++ b/plugins/org.eclipse.sirius.editor/plugin.xml
@@ -93,7 +93,7 @@
                id="tool.section.containerDropDescription.Containers"
                afterSection="tool.section.containerDropDescription.DragSource"
                 tab="viewpoint.tab.general">
-        <input type="org.eclipse.sirius.viewpoint.description.tool.ContainerDropDescription"/>
+        <input type="org.eclipse.sirius.diagram.description.tool.ContainerDropDescription"/>
       </propertySection>
        <propertySection
                class="org.eclipse.sirius.editor.properties.sections.tool.pastedescription.PasteDescriptionContainersPropertySection"
@@ -254,28 +254,28 @@
                filter="org.eclipse.sirius.editor.properties.filters.validation.validationfix.ValidationFixNameFilter"
                id="validation.section.validationFix.Name"
                 tab="viewpoint.tab.general">
-        <input type="org.eclipse.sirius.diagram.description.validation.ValidationFix"/>        
+        <input type="org.eclipse.sirius.viewpoint.description.validation.ValidationFix"/>        
       </propertySection>
   	  <propertySection
                class="org.eclipse.sirius.editor.properties.sections.validation.ruleaudit.RuleAuditAuditExpressionPropertySection"
                filter="org.eclipse.sirius.editor.properties.filters.validation.ruleaudit.RuleAuditAuditExpressionFilter"
                id="validation.section.ruleAudit.AuditExpression"
                 tab="viewpoint.tab.general">
-        <input type="org.eclipse.sirius.diagram.description.validation.RuleAudit"/>        
+        <input type="org.eclipse.sirius.viewpoint.description.validation.RuleAudit"/>        
       </propertySection>
   	  <propertySection
                class="org.eclipse.sirius.editor.properties.sections.validation.viewvalidationrule.ViewValidationRuleTargetsPropertySection"
                filter="org.eclipse.sirius.editor.properties.filters.validation.viewvalidationrule.ViewValidationRuleTargetsFilter"
                id="validation.section.viewValidationRule.Targets"
                 tab="viewpoint.tab.general">
-        <input type="org.eclipse.sirius.diagram.description.validation.ViewValidationRule"/>        
+        <input type="org.eclipse.sirius.viewpoint.description.validation.ViewValidationRule"/>        
       </propertySection>
   	  <propertySection
                class="org.eclipse.sirius.editor.properties.sections.validation.semanticvalidationrule.SemanticValidationRuleTargetClassPropertySection"
                filter="org.eclipse.sirius.editor.properties.filters.validation.semanticvalidationrule.SemanticValidationRuleTargetClassFilter"
                id="validation.section.semanticValidationRule.TargetClass"
                 tab="viewpoint.tab.general">
-        <input type="org.eclipse.sirius.diagram.description.validation.SemanticValidationRule"/>        
+        <input type="org.eclipse.sirius.viewpoint.description.validation.SemanticValidationRule"/>        
       </propertySection>
   	  <propertySection
                class="org.eclipse.sirius.editor.properties.sections.validation.validationrule.ValidationRuleMessagePropertySection"
@@ -283,14 +283,14 @@
                id="validation.section.validationRule.Message"
                afterSection="validation.section.validationRule.Level"
                 tab="viewpoint.tab.general">
-        <input type="org.eclipse.sirius.diagram.description.validation.ValidationRule"/>        
+        <input type="org.eclipse.sirius.viewpoint.description.validation.ValidationRule"/>        
       </propertySection>
   	  <propertySection
                class="org.eclipse.sirius.editor.properties.sections.validation.validationrule.ValidationRuleLevelPropertySection"
                filter="org.eclipse.sirius.editor.properties.filters.validation.validationrule.ValidationRuleLevelFilter"
                id="validation.section.validationRule.Level"
                 tab="viewpoint.tab.general">
-        <input type="org.eclipse.sirius.diagram.description.validation.ValidationRule"/>        
+        <input type="org.eclipse.sirius.viewpoint.description.validation.ValidationRule"/>        
       </propertySection>
   	  <propertySection
                class="org.eclipse.sirius.editor.properties.sections.validation.validationset.ValidationSetReusedRulesPropertySection"
@@ -298,14 +298,14 @@
                id="validation.section.validationSet.ReusedRules"
                afterSection="validation.section.validationSet.Name"
                 tab="viewpoint.tab.import">
-        <input type="org.eclipse.sirius.diagram.description.validation.ValidationSet"/>        
+        <input type="org.eclipse.sirius.viewpoint.description.validation.ValidationSet"/>        
       </propertySection>
   	  <propertySection
                class="org.eclipse.sirius.editor.properties.sections.validation.validationset.ValidationSetNamePropertySection"
                filter="org.eclipse.sirius.editor.properties.filters.validation.validationset.ValidationSetNameFilter"
                id="validation.section.validationSet.Name"
                 tab="viewpoint.tab.general">
-        <input type="org.eclipse.sirius.diagram.description.validation.ValidationSet"/>        
+        <input type="org.eclipse.sirius.viewpoint.description.validation.ValidationSet"/>        
       </propertySection>
   	  <propertySection
                class="org.eclipse.sirius.editor.properties.sections.filter.filtervariable.FilterVariableNamePropertySection"
@@ -843,7 +843,7 @@
                id="tool.section.containerDropDescription.Mappings"
                afterSection="tool.section.containerDropDescription.MoveEdges"
                 tab="viewpoint.tab.general">
-        <input type="org.eclipse.sirius.viewpoint.description.tool.ContainerDropDescription"/>        
+        <input type="org.eclipse.sirius.diagram.description.tool.ContainerDropDescription"/>        
       </propertySection>
   	  <propertySection
                class="org.eclipse.sirius.editor.properties.sections.tool.containerdropdescription.ContainerDropDescriptionMoveEdgesPropertySection"
@@ -851,14 +851,14 @@
                id="tool.section.containerDropDescription.MoveEdges"
                afterSection="tool.section.containerDropDescription.DragSource"
                 tab="viewpoint.tab.advanced">
-        <input type="org.eclipse.sirius.viewpoint.description.tool.ContainerDropDescription"/>        
+        <input type="org.eclipse.sirius.diagram.description.tool.ContainerDropDescription"/>        
       </propertySection>
   	  <propertySection
                class="org.eclipse.sirius.editor.properties.sections.tool.containerdropdescription.ContainerDropDescriptionDragSourcePropertySection"
                filter="org.eclipse.sirius.editor.properties.filters.tool.containerdropdescription.ContainerDropDescriptionDragSourceFilter"
                id="tool.section.containerDropDescription.DragSource"
                 tab="viewpoint.tab.general">
-        <input type="org.eclipse.sirius.viewpoint.description.tool.ContainerDropDescription"/>        
+        <input type="org.eclipse.sirius.diagram.description.tool.ContainerDropDescription"/>        
       </propertySection>
   	  <propertySection
                class="org.eclipse.sirius.editor.properties.sections.tool.containercreationdescription.ContainerCreationDescriptionExtraMappingsPropertySection"
@@ -2109,7 +2109,7 @@
                filter="org.eclipse.sirius.editor.properties.filters.description.draganddroptargetdescription.DragAndDropTargetDescriptionDropDescriptionsFilter"
                id="description.section.dragAndDropTargetDescription.DropDescriptions"
                 tab="viewpoint.tab.behavior">
-        <input type="org.eclipse.sirius.viewpoint.description.DragAndDropTargetDescription"/>        
+        <input type="org.eclipse.sirius.diagram.description.DragAndDropTargetDescription"/>        
       </propertySection>
   	  <propertySection
                class="org.eclipse.sirius.editor.properties.sections.description.representationextensiondescription.RepresentationExtensionDescriptionMetamodelPropertySectionSpec"
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/editorPlugin/SiriusEditor.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/editorPlugin/SiriusEditor.java
index fd797cd1c6..32e26ebb1a 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/editorPlugin/SiriusEditor.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/editorPlugin/SiriusEditor.java
@@ -95,7 +95,6 @@ import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.sirius.diagram.description.concern.provider.ConcernItemProviderAdapterFactory;
 import org.eclipse.sirius.diagram.description.filter.provider.FilterItemProviderAdapterFactory;
-import org.eclipse.sirius.diagram.description.validation.provider.ValidationItemProviderAdapterFactory;
 import org.eclipse.sirius.diagram.provider.DiagramItemProviderAdapterFactory;
 import org.eclipse.sirius.editor.properties.ViewpointPropertySheetPage;
 import org.eclipse.sirius.editor.utils.SelectionTreeTextEditor;
@@ -106,6 +105,7 @@ import org.eclipse.sirius.viewpoint.description.audit.provider.AuditItemProvider
 import org.eclipse.sirius.viewpoint.description.provider.DescriptionItemProviderAdapterFactory;
 import org.eclipse.sirius.viewpoint.description.style.provider.StyleItemProviderAdapterFactory;
 import org.eclipse.sirius.viewpoint.description.tool.provider.ToolItemProviderAdapterFactory;
+import org.eclipse.sirius.viewpoint.description.validation.provider.ValidationItemProviderAdapterFactory;
 import org.eclipse.sirius.viewpoint.provider.ViewpointItemProviderAdapterFactory;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.SWTError;
@@ -615,13 +615,13 @@ public class SiriusEditor extends MultiPageEditorPart implements IAdapterFactory
         factories.add(new DescriptionItemProviderAdapterFactory());
         factories.add(new StyleItemProviderAdapterFactory());
         factories.add(new ToolItemProviderAdapterFactory());
+        factories.add(new ValidationItemProviderAdapterFactory());
         factories.add(new AuditItemProviderAdapterFactory());
         factories.add(new DiagramItemProviderAdapterFactory());
         factories.add(new DescriptionItemProviderAdapterFactory());
         factories.add(new StyleItemProviderAdapterFactory());
         factories.add(new ToolItemProviderAdapterFactory());
         factories.add(new FilterItemProviderAdapterFactory());
-        factories.add(new ValidationItemProviderAdapterFactory());
         factories.add(new ConcernItemProviderAdapterFactory());
         factories.add(new ReflectiveItemProviderAdapterFactory());
 
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/description/draganddroptargetdescription/DragAndDropTargetDescriptionDropDescriptionsFilter.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/description/draganddroptargetdescription/DragAndDropTargetDescriptionDropDescriptionsFilter.java
index 0f33d7f3a8..11ff7e2add 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/description/draganddroptargetdescription/DragAndDropTargetDescriptionDropDescriptionsFilter.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/description/draganddroptargetdescription/DragAndDropTargetDescriptionDropDescriptionsFilter.java
@@ -12,8 +12,8 @@ package org.eclipse.sirius.editor.properties.filters.description.draganddroptarg
 // Start of user code specific imports
 
 import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.sirius.diagram.description.DescriptionPackage;
 import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
-import org.eclipse.sirius.viewpoint.description.DescriptionPackage;
 
 // End of user code specific imports
 
@@ -33,7 +33,7 @@ public class DragAndDropTargetDescriptionDropDescriptionsFilter extends Viewpoin
      * {@inheritDoc}
      */
     protected boolean isRightInputType(Object arg0) {
-        return arg0 instanceof org.eclipse.sirius.viewpoint.description.DragAndDropTargetDescription;
+        return arg0 instanceof org.eclipse.sirius.diagram.description.DragAndDropTargetDescription;
     }
 
     // Start of user code user methods
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/containercreationdescription/ContainerCreationDescriptionExtraMappingsFilter.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/containercreationdescription/ContainerCreationDescriptionExtraMappingsFilter.java
index ded4854769..b7ac4954bd 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/containercreationdescription/ContainerCreationDescriptionExtraMappingsFilter.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/containercreationdescription/ContainerCreationDescriptionExtraMappingsFilter.java
@@ -12,8 +12,8 @@ package org.eclipse.sirius.editor.properties.filters.tool.containercreationdescr
 // Start of user code specific imports
 
 import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
 import org.eclipse.sirius.diagram.description.tool.ToolPackage;
+import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
 
 // End of user code specific imports
 
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/containercreationdescription/ContainerCreationDescriptionIconPathFilter.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/containercreationdescription/ContainerCreationDescriptionIconPathFilter.java
index d297e8970d..ce0d28b54e 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/containercreationdescription/ContainerCreationDescriptionIconPathFilter.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/containercreationdescription/ContainerCreationDescriptionIconPathFilter.java
@@ -12,8 +12,8 @@ package org.eclipse.sirius.editor.properties.filters.tool.containercreationdescr
 // Start of user code specific imports
 
 import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
 import org.eclipse.sirius.diagram.description.tool.ToolPackage;
+import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
 
 // End of user code specific imports
 
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/containerdropdescription/ContainerDropDescriptionDragSourceFilter.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/containerdropdescription/ContainerDropDescriptionDragSourceFilter.java
index ad6ef58956..6a202556d8 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/containerdropdescription/ContainerDropDescriptionDragSourceFilter.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/containerdropdescription/ContainerDropDescriptionDragSourceFilter.java
@@ -12,8 +12,8 @@ package org.eclipse.sirius.editor.properties.filters.tool.containerdropdescripti
 // Start of user code specific imports
 
 import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.sirius.diagram.description.tool.ToolPackage;
 import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
-import org.eclipse.sirius.viewpoint.description.tool.ToolPackage;
 
 // End of user code specific imports
 
@@ -33,7 +33,7 @@ public class ContainerDropDescriptionDragSourceFilter extends ViewpointPropertyF
      * {@inheritDoc}
      */
     protected boolean isRightInputType(Object arg0) {
-        return arg0 instanceof org.eclipse.sirius.viewpoint.description.tool.ContainerDropDescription;
+        return arg0 instanceof org.eclipse.sirius.diagram.description.tool.ContainerDropDescription;
     }
 
     // Start of user code user methods
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/containerdropdescription/ContainerDropDescriptionMappingsFilter.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/containerdropdescription/ContainerDropDescriptionMappingsFilter.java
index a1d7efc85d..03144b8b8b 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/containerdropdescription/ContainerDropDescriptionMappingsFilter.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/containerdropdescription/ContainerDropDescriptionMappingsFilter.java
@@ -12,8 +12,8 @@ package org.eclipse.sirius.editor.properties.filters.tool.containerdropdescripti
 // Start of user code specific imports
 
 import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.sirius.diagram.description.tool.ToolPackage;
 import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
-import org.eclipse.sirius.viewpoint.description.tool.ToolPackage;
 
 // End of user code specific imports
 
@@ -33,7 +33,7 @@ public class ContainerDropDescriptionMappingsFilter extends ViewpointPropertyFil
      * {@inheritDoc}
      */
     protected boolean isRightInputType(Object arg0) {
-        return arg0 instanceof org.eclipse.sirius.viewpoint.description.tool.ContainerDropDescription;
+        return arg0 instanceof org.eclipse.sirius.diagram.description.tool.ContainerDropDescription;
     }
 
     // Start of user code user methods
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/containerdropdescription/ContainerDropDescriptionMoveEdgesFilter.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/containerdropdescription/ContainerDropDescriptionMoveEdgesFilter.java
index aae49c3fdd..1115484759 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/containerdropdescription/ContainerDropDescriptionMoveEdgesFilter.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/containerdropdescription/ContainerDropDescriptionMoveEdgesFilter.java
@@ -12,8 +12,8 @@ package org.eclipse.sirius.editor.properties.filters.tool.containerdropdescripti
 // Start of user code specific imports
 
 import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.sirius.diagram.description.tool.ToolPackage;
 import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
-import org.eclipse.sirius.viewpoint.description.tool.ToolPackage;
 
 // End of user code specific imports
 
@@ -33,7 +33,7 @@ public class ContainerDropDescriptionMoveEdgesFilter extends ViewpointPropertyFi
      * {@inheritDoc}
      */
     protected boolean isRightInputType(Object arg0) {
-        return arg0 instanceof org.eclipse.sirius.viewpoint.description.tool.ContainerDropDescription;
+        return arg0 instanceof org.eclipse.sirius.diagram.description.tool.ContainerDropDescription;
     }
 
     // Start of user code user methods
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/createedgeview/CreateEdgeViewSourceExpressionFilter.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/createedgeview/CreateEdgeViewSourceExpressionFilter.java
index f91cc9e3f4..2fcb574f82 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/createedgeview/CreateEdgeViewSourceExpressionFilter.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/createedgeview/CreateEdgeViewSourceExpressionFilter.java
@@ -12,8 +12,8 @@ package org.eclipse.sirius.editor.properties.filters.tool.createedgeview;
 // Start of user code specific imports
 
 import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
 import org.eclipse.sirius.diagram.description.tool.ToolPackage;
+import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
 
 // End of user code specific imports
 
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/createedgeview/CreateEdgeViewTargetExpressionFilter.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/createedgeview/CreateEdgeViewTargetExpressionFilter.java
index 9a86c41bf6..83f019b42c 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/createedgeview/CreateEdgeViewTargetExpressionFilter.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/createedgeview/CreateEdgeViewTargetExpressionFilter.java
@@ -12,8 +12,8 @@ package org.eclipse.sirius.editor.properties.filters.tool.createedgeview;
 // Start of user code specific imports
 
 import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
 import org.eclipse.sirius.diagram.description.tool.ToolPackage;
+import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
 
 // End of user code specific imports
 
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/createview/CreateViewContainerViewExpressionFilter.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/createview/CreateViewContainerViewExpressionFilter.java
index bf7da461a9..a1143cb296 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/createview/CreateViewContainerViewExpressionFilter.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/createview/CreateViewContainerViewExpressionFilter.java
@@ -12,8 +12,8 @@ package org.eclipse.sirius.editor.properties.filters.tool.createview;
 // Start of user code specific imports
 
 import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
 import org.eclipse.sirius.diagram.description.tool.ToolPackage;
+import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
 
 // End of user code specific imports
 
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/createview/CreateViewMappingFilter.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/createview/CreateViewMappingFilter.java
index 4ede89a2ce..69a0c3295c 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/createview/CreateViewMappingFilter.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/createview/CreateViewMappingFilter.java
@@ -12,8 +12,8 @@ package org.eclipse.sirius.editor.properties.filters.tool.createview;
 // Start of user code specific imports
 
 import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
 import org.eclipse.sirius.diagram.description.tool.ToolPackage;
+import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
 
 // End of user code specific imports
 
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/createview/CreateViewVariableNameFilter.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/createview/CreateViewVariableNameFilter.java
index ca64d98983..29d79e66f9 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/createview/CreateViewVariableNameFilter.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/createview/CreateViewVariableNameFilter.java
@@ -12,8 +12,8 @@ package org.eclipse.sirius.editor.properties.filters.tool.createview;
 // Start of user code specific imports
 
 import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
 import org.eclipse.sirius.diagram.description.tool.ToolPackage;
+import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
 
 // End of user code specific imports
 
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/deletehook/DeleteHookIdFilter.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/deletehook/DeleteHookIdFilter.java
index 8777e65d35..b781887025 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/deletehook/DeleteHookIdFilter.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/deletehook/DeleteHookIdFilter.java
@@ -12,8 +12,8 @@ package org.eclipse.sirius.editor.properties.filters.tool.deletehook;
 // Start of user code specific imports
 
 import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
 import org.eclipse.sirius.diagram.description.tool.ToolPackage;
+import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
 
 // End of user code specific imports
 
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/deletehookparameter/DeleteHookParameterNameFilter.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/deletehookparameter/DeleteHookParameterNameFilter.java
index 3a0e77c4cb..b2bda1dff5 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/deletehookparameter/DeleteHookParameterNameFilter.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/deletehookparameter/DeleteHookParameterNameFilter.java
@@ -12,8 +12,8 @@ package org.eclipse.sirius.editor.properties.filters.tool.deletehookparameter;
 // Start of user code specific imports
 
 import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
 import org.eclipse.sirius.diagram.description.tool.ToolPackage;
+import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
 
 // End of user code specific imports
 
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/deletehookparameter/DeleteHookParameterValueFilter.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/deletehookparameter/DeleteHookParameterValueFilter.java
index 3fa1c07e54..4edb49be50 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/deletehookparameter/DeleteHookParameterValueFilter.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/deletehookparameter/DeleteHookParameterValueFilter.java
@@ -12,8 +12,8 @@ package org.eclipse.sirius.editor.properties.filters.tool.deletehookparameter;
 // Start of user code specific imports
 
 import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
 import org.eclipse.sirius.diagram.description.tool.ToolPackage;
+import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
 
 // End of user code specific imports
 
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/diagramcreationdescription/DiagramCreationDescriptionDiagramDescriptionFilter.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/diagramcreationdescription/DiagramCreationDescriptionDiagramDescriptionFilter.java
index b160f05db0..c9ff0bd935 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/diagramcreationdescription/DiagramCreationDescriptionDiagramDescriptionFilter.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/diagramcreationdescription/DiagramCreationDescriptionDiagramDescriptionFilter.java
@@ -12,8 +12,8 @@ package org.eclipse.sirius.editor.properties.filters.tool.diagramcreationdescrip
 // Start of user code specific imports
 
 import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
 import org.eclipse.sirius.diagram.description.tool.ToolPackage;
+import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
 
 // End of user code specific imports
 
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/diagramnavigationdescription/DiagramNavigationDescriptionDiagramDescriptionFilter.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/diagramnavigationdescription/DiagramNavigationDescriptionDiagramDescriptionFilter.java
index 6160efbc8f..9299ad7312 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/diagramnavigationdescription/DiagramNavigationDescriptionDiagramDescriptionFilter.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/diagramnavigationdescription/DiagramNavigationDescriptionDiagramDescriptionFilter.java
@@ -12,8 +12,8 @@ package org.eclipse.sirius.editor.properties.filters.tool.diagramnavigationdescr
 // Start of user code specific imports
 
 import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
 import org.eclipse.sirius.diagram.description.tool.ToolPackage;
+import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
 
 // End of user code specific imports
 
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/directeditlabel/DirectEditLabelInputLabelExpressionFilter.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/directeditlabel/DirectEditLabelInputLabelExpressionFilter.java
index 14453b9d61..167b4d4a01 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/directeditlabel/DirectEditLabelInputLabelExpressionFilter.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/directeditlabel/DirectEditLabelInputLabelExpressionFilter.java
@@ -12,8 +12,8 @@ package org.eclipse.sirius.editor.properties.filters.tool.directeditlabel;
 // Start of user code specific imports
 
 import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
 import org.eclipse.sirius.diagram.description.tool.ToolPackage;
+import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
 
 // End of user code specific imports
 
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/doubleclickdescription/DoubleClickDescriptionMappingsFilter.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/doubleclickdescription/DoubleClickDescriptionMappingsFilter.java
index 2607931f4b..5da85c5f0f 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/doubleclickdescription/DoubleClickDescriptionMappingsFilter.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/doubleclickdescription/DoubleClickDescriptionMappingsFilter.java
@@ -12,8 +12,8 @@ package org.eclipse.sirius.editor.properties.filters.tool.doubleclickdescription
 // Start of user code specific imports
 
 import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
 import org.eclipse.sirius.diagram.description.tool.ToolPackage;
+import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
 
 // End of user code specific imports
 
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/edgecreationdescription/EdgeCreationDescriptionConnectionStartPreconditionFilter.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/edgecreationdescription/EdgeCreationDescriptionConnectionStartPreconditionFilter.java
index 876fd58dd9..af8173527f 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/edgecreationdescription/EdgeCreationDescriptionConnectionStartPreconditionFilter.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/edgecreationdescription/EdgeCreationDescriptionConnectionStartPreconditionFilter.java
@@ -12,8 +12,8 @@ package org.eclipse.sirius.editor.properties.filters.tool.edgecreationdescriptio
 // Start of user code specific imports
 
 import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
 import org.eclipse.sirius.diagram.description.tool.ToolPackage;
+import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
 
 // End of user code specific imports
 
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/edgecreationdescription/EdgeCreationDescriptionEdgeMappingsFilter.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/edgecreationdescription/EdgeCreationDescriptionEdgeMappingsFilter.java
index 0af7d4566a..601d5ef41e 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/edgecreationdescription/EdgeCreationDescriptionEdgeMappingsFilter.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/edgecreationdescription/EdgeCreationDescriptionEdgeMappingsFilter.java
@@ -12,8 +12,8 @@ package org.eclipse.sirius.editor.properties.filters.tool.edgecreationdescriptio
 // Start of user code specific imports
 
 import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
 import org.eclipse.sirius.diagram.description.tool.ToolPackage;
+import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
 
 // End of user code specific imports
 
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/edgecreationdescription/EdgeCreationDescriptionExtraSourceMappingsFilter.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/edgecreationdescription/EdgeCreationDescriptionExtraSourceMappingsFilter.java
index 56837df6be..c3d2708ce7 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/edgecreationdescription/EdgeCreationDescriptionExtraSourceMappingsFilter.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/edgecreationdescription/EdgeCreationDescriptionExtraSourceMappingsFilter.java
@@ -12,8 +12,8 @@ package org.eclipse.sirius.editor.properties.filters.tool.edgecreationdescriptio
 // Start of user code specific imports
 
 import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
 import org.eclipse.sirius.diagram.description.tool.ToolPackage;
+import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
 
 // End of user code specific imports
 
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/edgecreationdescription/EdgeCreationDescriptionExtraTargetMappingsFilter.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/edgecreationdescription/EdgeCreationDescriptionExtraTargetMappingsFilter.java
index 1dd926bf6d..5331b97fa1 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/edgecreationdescription/EdgeCreationDescriptionExtraTargetMappingsFilter.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/edgecreationdescription/EdgeCreationDescriptionExtraTargetMappingsFilter.java
@@ -12,8 +12,8 @@ package org.eclipse.sirius.editor.properties.filters.tool.edgecreationdescriptio
 // Start of user code specific imports
 
 import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
 import org.eclipse.sirius.diagram.description.tool.ToolPackage;
+import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
 
 // End of user code specific imports
 
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/edgecreationdescription/EdgeCreationDescriptionIconPathFilter.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/edgecreationdescription/EdgeCreationDescriptionIconPathFilter.java
index 6f633ea87a..feab1455d9 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/edgecreationdescription/EdgeCreationDescriptionIconPathFilter.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/edgecreationdescription/EdgeCreationDescriptionIconPathFilter.java
@@ -12,8 +12,8 @@ package org.eclipse.sirius.editor.properties.filters.tool.edgecreationdescriptio
 // Start of user code specific imports
 
 import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
 import org.eclipse.sirius.diagram.description.tool.ToolPackage;
+import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
 
 // End of user code specific imports
 
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/navigation/NavigationCreateIfNotExistentFilter.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/navigation/NavigationCreateIfNotExistentFilter.java
index 6507258b62..f2db76a80b 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/navigation/NavigationCreateIfNotExistentFilter.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/navigation/NavigationCreateIfNotExistentFilter.java
@@ -12,8 +12,8 @@ package org.eclipse.sirius.editor.properties.filters.tool.navigation;
 // Start of user code specific imports
 
 import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
 import org.eclipse.sirius.diagram.description.tool.ToolPackage;
+import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
 
 // End of user code specific imports
 
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/navigation/NavigationDiagramDescriptionFilter.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/navigation/NavigationDiagramDescriptionFilter.java
index 38cf1acb33..de6e90af74 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/navigation/NavigationDiagramDescriptionFilter.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/navigation/NavigationDiagramDescriptionFilter.java
@@ -12,8 +12,8 @@ package org.eclipse.sirius.editor.properties.filters.tool.navigation;
 // Start of user code specific imports
 
 import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
 import org.eclipse.sirius.diagram.description.tool.ToolPackage;
+import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
 
 // End of user code specific imports
 
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/nodecreationdescription/NodeCreationDescriptionExtraMappingsFilter.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/nodecreationdescription/NodeCreationDescriptionExtraMappingsFilter.java
index 79030c5f16..1cf23c9954 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/nodecreationdescription/NodeCreationDescriptionExtraMappingsFilter.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/nodecreationdescription/NodeCreationDescriptionExtraMappingsFilter.java
@@ -12,8 +12,8 @@ package org.eclipse.sirius.editor.properties.filters.tool.nodecreationdescriptio
 // Start of user code specific imports
 
 import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
 import org.eclipse.sirius.diagram.description.tool.ToolPackage;
+import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
 
 // End of user code specific imports
 
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/nodecreationdescription/NodeCreationDescriptionIconPathFilter.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/nodecreationdescription/NodeCreationDescriptionIconPathFilter.java
index 6feb656a64..42a6a6abb9 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/nodecreationdescription/NodeCreationDescriptionIconPathFilter.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/nodecreationdescription/NodeCreationDescriptionIconPathFilter.java
@@ -12,8 +12,8 @@ package org.eclipse.sirius.editor.properties.filters.tool.nodecreationdescriptio
 // Start of user code specific imports
 
 import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
 import org.eclipse.sirius.diagram.description.tool.ToolPackage;
+import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
 
 // End of user code specific imports
 
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/nodecreationdescription/NodeCreationDescriptionNodeMappingsFilter.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/nodecreationdescription/NodeCreationDescriptionNodeMappingsFilter.java
index fa0b8da9fd..11e9e31165 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/nodecreationdescription/NodeCreationDescriptionNodeMappingsFilter.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/nodecreationdescription/NodeCreationDescriptionNodeMappingsFilter.java
@@ -12,8 +12,8 @@ package org.eclipse.sirius.editor.properties.filters.tool.nodecreationdescriptio
 // Start of user code specific imports
 
 import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
 import org.eclipse.sirius.diagram.description.tool.ToolPackage;
+import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
 
 // End of user code specific imports
 
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/reconnectedgedescription/ReconnectEdgeDescriptionReconnectionKindFilter.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/reconnectedgedescription/ReconnectEdgeDescriptionReconnectionKindFilter.java
index 779e385539..70d08808d3 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/reconnectedgedescription/ReconnectEdgeDescriptionReconnectionKindFilter.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/reconnectedgedescription/ReconnectEdgeDescriptionReconnectionKindFilter.java
@@ -12,8 +12,8 @@ package org.eclipse.sirius.editor.properties.filters.tool.reconnectedgedescripti
 // Start of user code specific imports
 
 import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
 import org.eclipse.sirius.diagram.description.tool.ToolPackage;
+import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
 
 // End of user code specific imports
 
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/requestdescription/RequestDescriptionTypeFilter.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/requestdescription/RequestDescriptionTypeFilter.java
index 640c8af4ae..7f7745ccbf 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/requestdescription/RequestDescriptionTypeFilter.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/requestdescription/RequestDescriptionTypeFilter.java
@@ -12,8 +12,8 @@ package org.eclipse.sirius.editor.properties.filters.tool.requestdescription;
 // Start of user code specific imports
 
 import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
 import org.eclipse.sirius.diagram.description.tool.ToolPackage;
+import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
 
 // End of user code specific imports
 
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/toolgroupextension/ToolGroupExtensionGroupFilter.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/toolgroupextension/ToolGroupExtensionGroupFilter.java
index da6cbba013..5862da1afc 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/toolgroupextension/ToolGroupExtensionGroupFilter.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/toolgroupextension/ToolGroupExtensionGroupFilter.java
@@ -12,8 +12,8 @@ package org.eclipse.sirius.editor.properties.filters.tool.toolgroupextension;
 // Start of user code specific imports
 
 import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
 import org.eclipse.sirius.diagram.description.tool.ToolPackage;
+import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
 
 // End of user code specific imports
 
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/toolsection/ToolSectionIconFilter.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/toolsection/ToolSectionIconFilter.java
index c4be85d972..ba70c0980d 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/toolsection/ToolSectionIconFilter.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/toolsection/ToolSectionIconFilter.java
@@ -12,8 +12,8 @@ package org.eclipse.sirius.editor.properties.filters.tool.toolsection;
 // Start of user code specific imports
 
 import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
 import org.eclipse.sirius.diagram.description.tool.ToolPackage;
+import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
 
 // End of user code specific imports
 
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/toolsection/ToolSectionPopupMenusFilter.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/toolsection/ToolSectionPopupMenusFilter.java
index e87f6abbd3..9365ffae0c 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/toolsection/ToolSectionPopupMenusFilter.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/toolsection/ToolSectionPopupMenusFilter.java
@@ -12,8 +12,8 @@ package org.eclipse.sirius.editor.properties.filters.tool.toolsection;
 // Start of user code specific imports
 
 import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
 import org.eclipse.sirius.diagram.description.tool.ToolPackage;
+import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
 
 // End of user code specific imports
 
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/toolsection/ToolSectionReusedToolsFilter.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/toolsection/ToolSectionReusedToolsFilter.java
index 3726131b1c..61fff7dd0d 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/toolsection/ToolSectionReusedToolsFilter.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/toolsection/ToolSectionReusedToolsFilter.java
@@ -12,8 +12,8 @@ package org.eclipse.sirius.editor.properties.filters.tool.toolsection;
 // Start of user code specific imports
 
 import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
 import org.eclipse.sirius.diagram.description.tool.ToolPackage;
+import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
 
 // End of user code specific imports
 
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/validation/ruleaudit/RuleAuditAuditExpressionFilter.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/validation/ruleaudit/RuleAuditAuditExpressionFilter.java
index 5125a7ebc2..773082d77f 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/validation/ruleaudit/RuleAuditAuditExpressionFilter.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/validation/ruleaudit/RuleAuditAuditExpressionFilter.java
@@ -12,8 +12,8 @@ package org.eclipse.sirius.editor.properties.filters.validation.ruleaudit;
 // Start of user code specific imports
 
 import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.sirius.diagram.description.validation.ValidationPackage;
 import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationPackage;
 
 // End of user code specific imports
 
@@ -33,7 +33,7 @@ public class RuleAuditAuditExpressionFilter extends ViewpointPropertyFilter {
      * {@inheritDoc}
      */
     protected boolean isRightInputType(Object arg0) {
-        return arg0 instanceof org.eclipse.sirius.diagram.description.validation.RuleAudit;
+        return arg0 instanceof org.eclipse.sirius.viewpoint.description.validation.RuleAudit;
     }
 
     // Start of user code user methods
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/validation/semanticvalidationrule/SemanticValidationRuleTargetClassFilter.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/validation/semanticvalidationrule/SemanticValidationRuleTargetClassFilter.java
index 0c9a9d4aba..026fea87d9 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/validation/semanticvalidationrule/SemanticValidationRuleTargetClassFilter.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/validation/semanticvalidationrule/SemanticValidationRuleTargetClassFilter.java
@@ -12,8 +12,8 @@ package org.eclipse.sirius.editor.properties.filters.validation.semanticvalidati
 // Start of user code specific imports
 
 import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.sirius.diagram.description.validation.ValidationPackage;
 import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationPackage;
 
 // End of user code specific imports
 
@@ -33,7 +33,7 @@ public class SemanticValidationRuleTargetClassFilter extends ViewpointPropertyFi
      * {@inheritDoc}
      */
     protected boolean isRightInputType(Object arg0) {
-        return arg0 instanceof org.eclipse.sirius.diagram.description.validation.SemanticValidationRule;
+        return arg0 instanceof org.eclipse.sirius.viewpoint.description.validation.SemanticValidationRule;
     }
 
     // Start of user code user methods
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/validation/validationfix/ValidationFixNameFilter.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/validation/validationfix/ValidationFixNameFilter.java
index 69f5810575..76a2a202ac 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/validation/validationfix/ValidationFixNameFilter.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/validation/validationfix/ValidationFixNameFilter.java
@@ -12,8 +12,8 @@ package org.eclipse.sirius.editor.properties.filters.validation.validationfix;
 // Start of user code specific imports
 
 import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.sirius.diagram.description.validation.ValidationPackage;
 import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationPackage;
 
 // End of user code specific imports
 
@@ -33,7 +33,7 @@ public class ValidationFixNameFilter extends ViewpointPropertyFilter {
      * {@inheritDoc}
      */
     protected boolean isRightInputType(Object arg0) {
-        return arg0 instanceof org.eclipse.sirius.diagram.description.validation.ValidationFix;
+        return arg0 instanceof org.eclipse.sirius.viewpoint.description.validation.ValidationFix;
     }
 
     // Start of user code user methods
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/validation/validationrule/ValidationRuleLevelFilter.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/validation/validationrule/ValidationRuleLevelFilter.java
index b6f8b8a39b..994bbda88a 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/validation/validationrule/ValidationRuleLevelFilter.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/validation/validationrule/ValidationRuleLevelFilter.java
@@ -12,8 +12,8 @@ package org.eclipse.sirius.editor.properties.filters.validation.validationrule;
 // Start of user code specific imports
 
 import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.sirius.diagram.description.validation.ValidationPackage;
 import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationPackage;
 
 // End of user code specific imports
 
@@ -33,7 +33,7 @@ public class ValidationRuleLevelFilter extends ViewpointPropertyFilter {
      * {@inheritDoc}
      */
     protected boolean isRightInputType(Object arg0) {
-        return arg0 instanceof org.eclipse.sirius.diagram.description.validation.ValidationRule;
+        return arg0 instanceof org.eclipse.sirius.viewpoint.description.validation.ValidationRule;
     }
 
     // Start of user code user methods
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/validation/validationrule/ValidationRuleMessageFilter.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/validation/validationrule/ValidationRuleMessageFilter.java
index 0ef56c1bc4..46ce6fa5eb 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/validation/validationrule/ValidationRuleMessageFilter.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/validation/validationrule/ValidationRuleMessageFilter.java
@@ -12,8 +12,8 @@ package org.eclipse.sirius.editor.properties.filters.validation.validationrule;
 // Start of user code specific imports
 
 import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.sirius.diagram.description.validation.ValidationPackage;
 import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationPackage;
 
 // End of user code specific imports
 
@@ -33,7 +33,7 @@ public class ValidationRuleMessageFilter extends ViewpointPropertyFilter {
      * {@inheritDoc}
      */
     protected boolean isRightInputType(Object arg0) {
-        return arg0 instanceof org.eclipse.sirius.diagram.description.validation.ValidationRule;
+        return arg0 instanceof org.eclipse.sirius.viewpoint.description.validation.ValidationRule;
     }
 
     // Start of user code user methods
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/validation/validationset/ValidationSetAllRulesFilter.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/validation/validationset/ValidationSetAllRulesFilter.java
index 6b266943c0..b6c812ae7a 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/validation/validationset/ValidationSetAllRulesFilter.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/validation/validationset/ValidationSetAllRulesFilter.java
@@ -12,8 +12,8 @@ package org.eclipse.sirius.editor.properties.filters.validation.validationset;
 // Start of user code specific imports
 
 import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.sirius.diagram.description.validation.ValidationPackage;
 import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationPackage;
 
 // End of user code specific imports
 
@@ -33,7 +33,7 @@ public class ValidationSetAllRulesFilter extends ViewpointPropertyFilter {
      * {@inheritDoc}
      */
     protected boolean isRightInputType(Object arg0) {
-        return arg0 instanceof org.eclipse.sirius.diagram.description.validation.ValidationSet;
+        return arg0 instanceof org.eclipse.sirius.viewpoint.description.validation.ValidationSet;
     }
 
     // Start of user code user methods
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/validation/validationset/ValidationSetNameFilter.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/validation/validationset/ValidationSetNameFilter.java
index 70d8b50eef..f2540ab2f1 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/validation/validationset/ValidationSetNameFilter.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/validation/validationset/ValidationSetNameFilter.java
@@ -12,8 +12,8 @@ package org.eclipse.sirius.editor.properties.filters.validation.validationset;
 // Start of user code specific imports
 
 import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.sirius.diagram.description.validation.ValidationPackage;
 import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationPackage;
 
 // End of user code specific imports
 
@@ -33,7 +33,7 @@ public class ValidationSetNameFilter extends ViewpointPropertyFilter {
      * {@inheritDoc}
      */
     protected boolean isRightInputType(Object arg0) {
-        return arg0 instanceof org.eclipse.sirius.diagram.description.validation.ValidationSet;
+        return arg0 instanceof org.eclipse.sirius.viewpoint.description.validation.ValidationSet;
     }
 
     // Start of user code user methods
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/validation/validationset/ValidationSetReusedRulesFilter.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/validation/validationset/ValidationSetReusedRulesFilter.java
index 7e76c9e74f..69f016e41a 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/validation/validationset/ValidationSetReusedRulesFilter.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/validation/validationset/ValidationSetReusedRulesFilter.java
@@ -12,8 +12,8 @@ package org.eclipse.sirius.editor.properties.filters.validation.validationset;
 // Start of user code specific imports
 
 import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.sirius.diagram.description.validation.ValidationPackage;
 import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationPackage;
 
 // End of user code specific imports
 
@@ -33,7 +33,7 @@ public class ValidationSetReusedRulesFilter extends ViewpointPropertyFilter {
      * {@inheritDoc}
      */
     protected boolean isRightInputType(Object arg0) {
-        return arg0 instanceof org.eclipse.sirius.diagram.description.validation.ValidationSet;
+        return arg0 instanceof org.eclipse.sirius.viewpoint.description.validation.ValidationSet;
     }
 
     // Start of user code user methods
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/validation/viewvalidationrule/ViewValidationRuleTargetsFilter.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/validation/viewvalidationrule/ViewValidationRuleTargetsFilter.java
index 34bd436137..43a62f0ee7 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/validation/viewvalidationrule/ViewValidationRuleTargetsFilter.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/validation/viewvalidationrule/ViewValidationRuleTargetsFilter.java
@@ -12,8 +12,8 @@ package org.eclipse.sirius.editor.properties.filters.validation.viewvalidationru
 // Start of user code specific imports
 
 import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.sirius.diagram.description.validation.ValidationPackage;
 import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationPackage;
 
 // End of user code specific imports
 
@@ -33,7 +33,7 @@ public class ViewValidationRuleTargetsFilter extends ViewpointPropertyFilter {
      * {@inheritDoc}
      */
     protected boolean isRightInputType(Object arg0) {
-        return arg0 instanceof org.eclipse.sirius.diagram.description.validation.ViewValidationRule;
+        return arg0 instanceof org.eclipse.sirius.viewpoint.description.validation.ViewValidationRule;
     }
 
     // Start of user code user methods
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/description/draganddroptargetdescription/DragAndDropTargetDescriptionDropDescriptionsPropertySection.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/description/draganddroptargetdescription/DragAndDropTargetDescriptionDropDescriptionsPropertySection.java
index 19f9dd93fc..b2cf8b0d7c 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/description/draganddroptargetdescription/DragAndDropTargetDescriptionDropDescriptionsPropertySection.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/description/draganddroptargetdescription/DragAndDropTargetDescriptionDropDescriptionsPropertySection.java
@@ -16,9 +16,9 @@ import java.util.List;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EReference;
+import org.eclipse.sirius.diagram.description.DescriptionPackage;
 import org.eclipse.sirius.editor.editorPlugin.SiriusEditor;
 import org.eclipse.sirius.editor.properties.sections.common.AbstractEditorDialogPropertySection;
-import org.eclipse.sirius.viewpoint.description.DescriptionPackage;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CLabel;
 import org.eclipse.swt.layout.FormAttachment;
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/behaviortool/BehaviorToolDomainClassPropertySection.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/behaviortool/BehaviorToolDomainClassPropertySection.java
index 5d6095ddf6..901e6b3bce 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/behaviortool/BehaviorToolDomainClassPropertySection.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/behaviortool/BehaviorToolDomainClassPropertySection.java
@@ -12,10 +12,10 @@ package org.eclipse.sirius.editor.properties.sections.tool.behaviortool;
 // Start of user code imports
 
 import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.sirius.diagram.description.tool.ToolPackage;
 import org.eclipse.sirius.editor.editorPlugin.SiriusEditor;
 import org.eclipse.sirius.editor.properties.sections.common.AbstractTextPropertySection;
 import org.eclipse.sirius.editor.tools.api.assist.TypeContentProposalProvider;
-import org.eclipse.sirius.diagram.description.tool.ToolPackage;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CLabel;
 import org.eclipse.swt.layout.FormAttachment;
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/containercreationdescription/ContainerCreationDescriptionContainerMappingsPropertySection.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/containercreationdescription/ContainerCreationDescriptionContainerMappingsPropertySection.java
index e13daa5894..6e66421855 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/containercreationdescription/ContainerCreationDescriptionContainerMappingsPropertySection.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/containercreationdescription/ContainerCreationDescriptionContainerMappingsPropertySection.java
@@ -16,9 +16,9 @@ import java.util.List;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EReference;
+import org.eclipse.sirius.diagram.description.tool.ToolPackage;
 import org.eclipse.sirius.editor.editorPlugin.SiriusEditor;
 import org.eclipse.sirius.editor.properties.sections.common.AbstractEditorDialogPropertySection;
-import org.eclipse.sirius.diagram.description.tool.ToolPackage;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CLabel;
 import org.eclipse.swt.layout.FormAttachment;
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/containercreationdescription/ContainerCreationDescriptionExtraMappingsPropertySection.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/containercreationdescription/ContainerCreationDescriptionExtraMappingsPropertySection.java
index c8b81ee946..81646e36c2 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/containercreationdescription/ContainerCreationDescriptionExtraMappingsPropertySection.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/containercreationdescription/ContainerCreationDescriptionExtraMappingsPropertySection.java
@@ -16,9 +16,9 @@ import java.util.List;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EReference;
+import org.eclipse.sirius.diagram.description.tool.ToolPackage;
 import org.eclipse.sirius.editor.editorPlugin.SiriusEditor;
 import org.eclipse.sirius.editor.properties.sections.common.AbstractEditorDialogPropertySection;
-import org.eclipse.sirius.diagram.description.tool.ToolPackage;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CLabel;
 import org.eclipse.swt.layout.FormAttachment;
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/containercreationdescription/ContainerCreationDescriptionIconPathPropertySection.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/containercreationdescription/ContainerCreationDescriptionIconPathPropertySection.java
index 8bca989253..6078dda72f 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/containercreationdescription/ContainerCreationDescriptionIconPathPropertySection.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/containercreationdescription/ContainerCreationDescriptionIconPathPropertySection.java
@@ -12,9 +12,9 @@ package org.eclipse.sirius.editor.properties.sections.tool.containercreationdesc
 // Start of user code imports
 
 import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.sirius.diagram.description.tool.ToolPackage;
 import org.eclipse.sirius.editor.editorPlugin.SiriusEditor;
 import org.eclipse.sirius.editor.properties.sections.common.AbstractTextPropertySection;
-import org.eclipse.sirius.diagram.description.tool.ToolPackage;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CLabel;
 import org.eclipse.swt.layout.FormAttachment;
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/containerdropdescription/ContainerDropDescriptionDragSourcePropertySection.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/containerdropdescription/ContainerDropDescriptionDragSourcePropertySection.java
index 1a157374d8..20bc43783f 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/containerdropdescription/ContainerDropDescriptionDragSourcePropertySection.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/containerdropdescription/ContainerDropDescriptionDragSourcePropertySection.java
@@ -14,10 +14,10 @@ package org.eclipse.sirius.editor.properties.sections.tool.containerdropdescript
 import java.util.List;
 
 import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.sirius.diagram.description.tool.ToolPackage;
 import org.eclipse.sirius.editor.editorPlugin.SiriusEditor;
 import org.eclipse.sirius.editor.properties.sections.common.AbstractRadioButtonPropertySection;
 import org.eclipse.sirius.viewpoint.description.tool.DragSource;
-import org.eclipse.sirius.viewpoint.description.tool.ToolPackage;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CLabel;
 import org.eclipse.swt.layout.FormAttachment;
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/containerdropdescription/ContainerDropDescriptionMappingsPropertySection.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/containerdropdescription/ContainerDropDescriptionMappingsPropertySection.java
index f855eb4f1b..4a973c596c 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/containerdropdescription/ContainerDropDescriptionMappingsPropertySection.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/containerdropdescription/ContainerDropDescriptionMappingsPropertySection.java
@@ -16,9 +16,9 @@ import java.util.List;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EReference;
+import org.eclipse.sirius.diagram.description.tool.ToolPackage;
 import org.eclipse.sirius.editor.editorPlugin.SiriusEditor;
 import org.eclipse.sirius.editor.properties.sections.common.AbstractEditorDialogPropertySection;
-import org.eclipse.sirius.viewpoint.description.tool.ToolPackage;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CLabel;
 import org.eclipse.swt.layout.FormAttachment;
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/containerdropdescription/ContainerDropDescriptionMoveEdgesPropertySection.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/containerdropdescription/ContainerDropDescriptionMoveEdgesPropertySection.java
index d8464ae05f..fb074ceac4 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/containerdropdescription/ContainerDropDescriptionMoveEdgesPropertySection.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/containerdropdescription/ContainerDropDescriptionMoveEdgesPropertySection.java
@@ -11,9 +11,9 @@ package org.eclipse.sirius.editor.properties.sections.tool.containerdropdescript
 
 // Start of user code imports
 import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.sirius.diagram.description.tool.ToolPackage;
 import org.eclipse.sirius.editor.editorPlugin.SiriusEditor;
 import org.eclipse.sirius.editor.properties.sections.common.AbstractCheckBoxPropertySection;
-import org.eclipse.sirius.viewpoint.description.tool.ToolPackage;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CLabel;
 import org.eclipse.swt.layout.FormAttachment;
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/createedgeview/CreateEdgeViewSourceExpressionPropertySection.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/createedgeview/CreateEdgeViewSourceExpressionPropertySection.java
index 8aad070798..4ebef5001e 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/createedgeview/CreateEdgeViewSourceExpressionPropertySection.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/createedgeview/CreateEdgeViewSourceExpressionPropertySection.java
@@ -20,11 +20,11 @@ import org.eclipse.jface.bindings.keys.KeyStroke;
 import org.eclipse.jface.fieldassist.ContentProposalAdapter;
 import org.eclipse.jface.fieldassist.TextContentAdapter;
 import org.eclipse.sirius.common.tools.api.util.EclipseUtil;
+import org.eclipse.sirius.diagram.description.tool.ToolPackage;
 import org.eclipse.sirius.editor.editorPlugin.SiriusEditor;
 import org.eclipse.sirius.editor.properties.sections.common.AbstractTextPropertySection;
 import org.eclipse.sirius.ui.tools.api.assist.ContentProposalClient;
 import org.eclipse.sirius.ui.tools.api.assist.IAssistContentProvider;
-import org.eclipse.sirius.diagram.description.tool.ToolPackage;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CLabel;
 import org.eclipse.swt.graphics.Point;
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/createedgeview/CreateEdgeViewTargetExpressionPropertySection.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/createedgeview/CreateEdgeViewTargetExpressionPropertySection.java
index 06cda94c6e..3982b3798c 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/createedgeview/CreateEdgeViewTargetExpressionPropertySection.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/createedgeview/CreateEdgeViewTargetExpressionPropertySection.java
@@ -20,11 +20,11 @@ import org.eclipse.jface.bindings.keys.KeyStroke;
 import org.eclipse.jface.fieldassist.ContentProposalAdapter;
 import org.eclipse.jface.fieldassist.TextContentAdapter;
 import org.eclipse.sirius.common.tools.api.util.EclipseUtil;
+import org.eclipse.sirius.diagram.description.tool.ToolPackage;
 import org.eclipse.sirius.editor.editorPlugin.SiriusEditor;
 import org.eclipse.sirius.editor.properties.sections.common.AbstractTextPropertySection;
 import org.eclipse.sirius.ui.tools.api.assist.ContentProposalClient;
 import org.eclipse.sirius.ui.tools.api.assist.IAssistContentProvider;
-import org.eclipse.sirius.diagram.description.tool.ToolPackage;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CLabel;
 import org.eclipse.swt.graphics.Point;
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/createview/CreateViewContainerViewExpressionPropertySection.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/createview/CreateViewContainerViewExpressionPropertySection.java
index 6f015c3fa7..636e988bf1 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/createview/CreateViewContainerViewExpressionPropertySection.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/createview/CreateViewContainerViewExpressionPropertySection.java
@@ -20,11 +20,11 @@ import org.eclipse.jface.bindings.keys.KeyStroke;
 import org.eclipse.jface.fieldassist.ContentProposalAdapter;
 import org.eclipse.jface.fieldassist.TextContentAdapter;
 import org.eclipse.sirius.common.tools.api.util.EclipseUtil;
+import org.eclipse.sirius.diagram.description.tool.ToolPackage;
 import org.eclipse.sirius.editor.editorPlugin.SiriusEditor;
 import org.eclipse.sirius.editor.properties.sections.common.AbstractTextPropertySection;
 import org.eclipse.sirius.ui.tools.api.assist.ContentProposalClient;
 import org.eclipse.sirius.ui.tools.api.assist.IAssistContentProvider;
-import org.eclipse.sirius.diagram.description.tool.ToolPackage;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CLabel;
 import org.eclipse.swt.graphics.Point;
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/createview/CreateViewMappingPropertySection.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/createview/CreateViewMappingPropertySection.java
index 8d9fcabc29..718be89d3f 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/createview/CreateViewMappingPropertySection.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/createview/CreateViewMappingPropertySection.java
@@ -23,9 +23,9 @@ import org.eclipse.sirius.diagram.description.EdgeMapping;
 import org.eclipse.sirius.diagram.description.EdgeMappingImport;
 import org.eclipse.sirius.diagram.description.tool.CreateEdgeView;
 import org.eclipse.sirius.diagram.description.tool.CreateView;
+import org.eclipse.sirius.diagram.description.tool.ToolPackage;
 import org.eclipse.sirius.editor.editorPlugin.SiriusEditor;
 import org.eclipse.sirius.editor.properties.sections.common.AbstractComboPropertySection;
-import org.eclipse.sirius.diagram.description.tool.ToolPackage;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CLabel;
 import org.eclipse.swt.layout.FormAttachment;
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/createview/CreateViewVariableNamePropertySection.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/createview/CreateViewVariableNamePropertySection.java
index a66fc7859d..ab1ca1baf4 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/createview/CreateViewVariableNamePropertySection.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/createview/CreateViewVariableNamePropertySection.java
@@ -12,9 +12,9 @@ package org.eclipse.sirius.editor.properties.sections.tool.createview;
 // Start of user code imports
 
 import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.sirius.diagram.description.tool.ToolPackage;
 import org.eclipse.sirius.editor.editorPlugin.SiriusEditor;
 import org.eclipse.sirius.editor.properties.sections.common.AbstractTextPropertySection;
-import org.eclipse.sirius.diagram.description.tool.ToolPackage;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CLabel;
 import org.eclipse.swt.layout.FormAttachment;
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/deletehook/DeleteHookIdPropertySection.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/deletehook/DeleteHookIdPropertySection.java
index b11a2be8ac..5e30ed232e 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/deletehook/DeleteHookIdPropertySection.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/deletehook/DeleteHookIdPropertySection.java
@@ -12,9 +12,9 @@ package org.eclipse.sirius.editor.properties.sections.tool.deletehook;
 // Start of user code imports
 
 import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.sirius.diagram.description.tool.ToolPackage;
 import org.eclipse.sirius.editor.editorPlugin.SiriusEditor;
 import org.eclipse.sirius.editor.properties.sections.common.AbstractTextPropertySection;
-import org.eclipse.sirius.diagram.description.tool.ToolPackage;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CLabel;
 import org.eclipse.swt.layout.FormAttachment;
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/deletehookparameter/DeleteHookParameterNamePropertySection.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/deletehookparameter/DeleteHookParameterNamePropertySection.java
index c2e3db4140..bcbf00fa36 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/deletehookparameter/DeleteHookParameterNamePropertySection.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/deletehookparameter/DeleteHookParameterNamePropertySection.java
@@ -12,9 +12,9 @@ package org.eclipse.sirius.editor.properties.sections.tool.deletehookparameter;
 // Start of user code imports
 
 import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.sirius.diagram.description.tool.ToolPackage;
 import org.eclipse.sirius.editor.editorPlugin.SiriusEditor;
 import org.eclipse.sirius.editor.properties.sections.common.AbstractTextPropertySection;
-import org.eclipse.sirius.diagram.description.tool.ToolPackage;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
 
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/deletehookparameter/DeleteHookParameterValuePropertySection.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/deletehookparameter/DeleteHookParameterValuePropertySection.java
index f3d4499a1a..d263f1e814 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/deletehookparameter/DeleteHookParameterValuePropertySection.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/deletehookparameter/DeleteHookParameterValuePropertySection.java
@@ -20,11 +20,11 @@ import org.eclipse.jface.bindings.keys.KeyStroke;
 import org.eclipse.jface.fieldassist.ContentProposalAdapter;
 import org.eclipse.jface.fieldassist.TextContentAdapter;
 import org.eclipse.sirius.common.tools.api.util.EclipseUtil;
+import org.eclipse.sirius.diagram.description.tool.ToolPackage;
 import org.eclipse.sirius.editor.editorPlugin.SiriusEditor;
 import org.eclipse.sirius.editor.properties.sections.common.AbstractTextPropertySection;
 import org.eclipse.sirius.ui.tools.api.assist.ContentProposalClient;
 import org.eclipse.sirius.ui.tools.api.assist.IAssistContentProvider;
-import org.eclipse.sirius.diagram.description.tool.ToolPackage;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CLabel;
 import org.eclipse.swt.graphics.Point;
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/diagramcreationdescription/DiagramCreationDescriptionDiagramDescriptionPropertySection.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/diagramcreationdescription/DiagramCreationDescriptionDiagramDescriptionPropertySection.java
index afd1346d0a..01188a03e7 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/diagramcreationdescription/DiagramCreationDescriptionDiagramDescriptionPropertySection.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/diagramcreationdescription/DiagramCreationDescriptionDiagramDescriptionPropertySection.java
@@ -19,9 +19,9 @@ import java.util.List;
 import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.sirius.diagram.description.tool.ToolPackage;
 import org.eclipse.sirius.editor.editorPlugin.SiriusEditor;
 import org.eclipse.sirius.editor.properties.sections.common.AbstractComboPropertySection;
-import org.eclipse.sirius.diagram.description.tool.ToolPackage;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
 
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/diagramnavigationdescription/DiagramNavigationDescriptionDiagramDescriptionPropertySection.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/diagramnavigationdescription/DiagramNavigationDescriptionDiagramDescriptionPropertySection.java
index 5cd49e9c60..419cb6466f 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/diagramnavigationdescription/DiagramNavigationDescriptionDiagramDescriptionPropertySection.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/diagramnavigationdescription/DiagramNavigationDescriptionDiagramDescriptionPropertySection.java
@@ -19,9 +19,9 @@ import java.util.List;
 import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.sirius.diagram.description.tool.ToolPackage;
 import org.eclipse.sirius.editor.editorPlugin.SiriusEditor;
 import org.eclipse.sirius.editor.properties.sections.common.AbstractComboPropertySection;
-import org.eclipse.sirius.diagram.description.tool.ToolPackage;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
 
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/directeditlabel/DirectEditLabelInputLabelExpressionPropertySection.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/directeditlabel/DirectEditLabelInputLabelExpressionPropertySection.java
index 3c1f709dc5..81a2bc0e2f 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/directeditlabel/DirectEditLabelInputLabelExpressionPropertySection.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/directeditlabel/DirectEditLabelInputLabelExpressionPropertySection.java
@@ -20,11 +20,11 @@ import org.eclipse.jface.bindings.keys.KeyStroke;
 import org.eclipse.jface.fieldassist.ContentProposalAdapter;
 import org.eclipse.jface.fieldassist.TextContentAdapter;
 import org.eclipse.sirius.common.tools.api.util.EclipseUtil;
+import org.eclipse.sirius.diagram.description.tool.ToolPackage;
 import org.eclipse.sirius.editor.editorPlugin.SiriusEditor;
 import org.eclipse.sirius.editor.properties.sections.common.AbstractTextPropertySection;
 import org.eclipse.sirius.ui.tools.api.assist.ContentProposalClient;
 import org.eclipse.sirius.ui.tools.api.assist.IAssistContentProvider;
-import org.eclipse.sirius.diagram.description.tool.ToolPackage;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CLabel;
 import org.eclipse.swt.graphics.Point;
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/doubleclickdescription/DoubleClickDescriptionMappingsPropertySection.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/doubleclickdescription/DoubleClickDescriptionMappingsPropertySection.java
index 3def15c44b..bcff16c609 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/doubleclickdescription/DoubleClickDescriptionMappingsPropertySection.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/doubleclickdescription/DoubleClickDescriptionMappingsPropertySection.java
@@ -16,9 +16,9 @@ import java.util.List;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EReference;
+import org.eclipse.sirius.diagram.description.tool.ToolPackage;
 import org.eclipse.sirius.editor.editorPlugin.SiriusEditor;
 import org.eclipse.sirius.editor.properties.sections.common.AbstractEditorDialogPropertySection;
-import org.eclipse.sirius.diagram.description.tool.ToolPackage;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
 
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/edgecreationdescription/EdgeCreationDescriptionConnectionStartPreconditionPropertySection.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/edgecreationdescription/EdgeCreationDescriptionConnectionStartPreconditionPropertySection.java
index 6f237693c2..146acf8fc9 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/edgecreationdescription/EdgeCreationDescriptionConnectionStartPreconditionPropertySection.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/edgecreationdescription/EdgeCreationDescriptionConnectionStartPreconditionPropertySection.java
@@ -20,11 +20,11 @@ import org.eclipse.jface.bindings.keys.KeyStroke;
 import org.eclipse.jface.fieldassist.ContentProposalAdapter;
 import org.eclipse.jface.fieldassist.TextContentAdapter;
 import org.eclipse.sirius.common.tools.api.util.EclipseUtil;
+import org.eclipse.sirius.diagram.description.tool.ToolPackage;
 import org.eclipse.sirius.editor.editorPlugin.SiriusEditor;
 import org.eclipse.sirius.editor.properties.sections.common.AbstractTextPropertySection;
 import org.eclipse.sirius.ui.tools.api.assist.ContentProposalClient;
 import org.eclipse.sirius.ui.tools.api.assist.IAssistContentProvider;
-import org.eclipse.sirius.diagram.description.tool.ToolPackage;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CLabel;
 import org.eclipse.swt.graphics.Point;
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/edgecreationdescription/EdgeCreationDescriptionEdgeMappingsPropertySection.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/edgecreationdescription/EdgeCreationDescriptionEdgeMappingsPropertySection.java
index 83a5301795..29e028d949 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/edgecreationdescription/EdgeCreationDescriptionEdgeMappingsPropertySection.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/edgecreationdescription/EdgeCreationDescriptionEdgeMappingsPropertySection.java
@@ -16,9 +16,9 @@ import java.util.List;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EReference;
+import org.eclipse.sirius.diagram.description.tool.ToolPackage;
 import org.eclipse.sirius.editor.editorPlugin.SiriusEditor;
 import org.eclipse.sirius.editor.properties.sections.common.AbstractEditorDialogPropertySection;
-import org.eclipse.sirius.diagram.description.tool.ToolPackage;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CLabel;
 import org.eclipse.swt.layout.FormAttachment;
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/edgecreationdescription/EdgeCreationDescriptionExtraSourceMappingsPropertySection.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/edgecreationdescription/EdgeCreationDescriptionExtraSourceMappingsPropertySection.java
index 2b8715d857..690150d436 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/edgecreationdescription/EdgeCreationDescriptionExtraSourceMappingsPropertySection.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/edgecreationdescription/EdgeCreationDescriptionExtraSourceMappingsPropertySection.java
@@ -16,9 +16,9 @@ import java.util.List;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EReference;
+import org.eclipse.sirius.diagram.description.tool.ToolPackage;
 import org.eclipse.sirius.editor.editorPlugin.SiriusEditor;
 import org.eclipse.sirius.editor.properties.sections.common.AbstractEditorDialogPropertySection;
-import org.eclipse.sirius.diagram.description.tool.ToolPackage;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CLabel;
 import org.eclipse.swt.layout.FormAttachment;
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/edgecreationdescription/EdgeCreationDescriptionExtraTargetMappingsPropertySection.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/edgecreationdescription/EdgeCreationDescriptionExtraTargetMappingsPropertySection.java
index 686a4b4149..8759873359 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/edgecreationdescription/EdgeCreationDescriptionExtraTargetMappingsPropertySection.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/edgecreationdescription/EdgeCreationDescriptionExtraTargetMappingsPropertySection.java
@@ -16,8 +16,8 @@ import java.util.List;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EReference;
-import org.eclipse.sirius.editor.properties.sections.common.AbstractEditorDialogPropertySection;
 import org.eclipse.sirius.diagram.description.tool.ToolPackage;
+import org.eclipse.sirius.editor.properties.sections.common.AbstractEditorDialogPropertySection;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
 
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/edgecreationdescription/EdgeCreationDescriptionIconPathPropertySection.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/edgecreationdescription/EdgeCreationDescriptionIconPathPropertySection.java
index 9986e005dc..98b24ffa55 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/edgecreationdescription/EdgeCreationDescriptionIconPathPropertySection.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/edgecreationdescription/EdgeCreationDescriptionIconPathPropertySection.java
@@ -12,9 +12,9 @@ package org.eclipse.sirius.editor.properties.sections.tool.edgecreationdescripti
 // Start of user code imports
 
 import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.sirius.diagram.description.tool.ToolPackage;
 import org.eclipse.sirius.editor.editorPlugin.SiriusEditor;
 import org.eclipse.sirius.editor.properties.sections.common.AbstractTextPropertySection;
-import org.eclipse.sirius.diagram.description.tool.ToolPackage;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CLabel;
 import org.eclipse.swt.layout.FormAttachment;
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/navigation/NavigationCreateIfNotExistentPropertySection.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/navigation/NavigationCreateIfNotExistentPropertySection.java
index ae419358fb..22c924f777 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/navigation/NavigationCreateIfNotExistentPropertySection.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/navigation/NavigationCreateIfNotExistentPropertySection.java
@@ -11,8 +11,8 @@ package org.eclipse.sirius.editor.properties.sections.tool.navigation;
 
 // Start of user code imports
 import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.sirius.editor.properties.sections.common.AbstractCheckBoxPropertySection;
 import org.eclipse.sirius.diagram.description.tool.ToolPackage;
+import org.eclipse.sirius.editor.properties.sections.common.AbstractCheckBoxPropertySection;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
 
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/navigation/NavigationDiagramDescriptionPropertySection.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/navigation/NavigationDiagramDescriptionPropertySection.java
index fbe5117088..69038f60e3 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/navigation/NavigationDiagramDescriptionPropertySection.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/navigation/NavigationDiagramDescriptionPropertySection.java
@@ -19,9 +19,9 @@ import java.util.List;
 import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.sirius.diagram.description.tool.ToolPackage;
 import org.eclipse.sirius.editor.editorPlugin.SiriusEditor;
 import org.eclipse.sirius.editor.properties.sections.common.AbstractComboPropertySection;
-import org.eclipse.sirius.diagram.description.tool.ToolPackage;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
 
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/nodecreationdescription/NodeCreationDescriptionExtraMappingsPropertySection.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/nodecreationdescription/NodeCreationDescriptionExtraMappingsPropertySection.java
index c676dc3270..fe12309019 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/nodecreationdescription/NodeCreationDescriptionExtraMappingsPropertySection.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/nodecreationdescription/NodeCreationDescriptionExtraMappingsPropertySection.java
@@ -16,9 +16,9 @@ import java.util.List;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EReference;
+import org.eclipse.sirius.diagram.description.tool.ToolPackage;
 import org.eclipse.sirius.editor.editorPlugin.SiriusEditor;
 import org.eclipse.sirius.editor.properties.sections.common.AbstractEditorDialogPropertySection;
-import org.eclipse.sirius.diagram.description.tool.ToolPackage;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CLabel;
 import org.eclipse.swt.layout.FormAttachment;
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/nodecreationdescription/NodeCreationDescriptionIconPathPropertySection.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/nodecreationdescription/NodeCreationDescriptionIconPathPropertySection.java
index 0791363e76..f7f4d7907a 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/nodecreationdescription/NodeCreationDescriptionIconPathPropertySection.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/nodecreationdescription/NodeCreationDescriptionIconPathPropertySection.java
@@ -12,9 +12,9 @@ package org.eclipse.sirius.editor.properties.sections.tool.nodecreationdescripti
 // Start of user code imports
 
 import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.sirius.diagram.description.tool.ToolPackage;
 import org.eclipse.sirius.editor.editorPlugin.SiriusEditor;
 import org.eclipse.sirius.editor.properties.sections.common.AbstractTextPropertySection;
-import org.eclipse.sirius.diagram.description.tool.ToolPackage;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CLabel;
 import org.eclipse.swt.layout.FormAttachment;
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/nodecreationdescription/NodeCreationDescriptionNodeMappingsPropertySection.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/nodecreationdescription/NodeCreationDescriptionNodeMappingsPropertySection.java
index 614d98bb8c..3b9c5de223 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/nodecreationdescription/NodeCreationDescriptionNodeMappingsPropertySection.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/nodecreationdescription/NodeCreationDescriptionNodeMappingsPropertySection.java
@@ -16,9 +16,9 @@ import java.util.List;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EReference;
+import org.eclipse.sirius.diagram.description.tool.ToolPackage;
 import org.eclipse.sirius.editor.editorPlugin.SiriusEditor;
 import org.eclipse.sirius.editor.properties.sections.common.AbstractEditorDialogPropertySection;
-import org.eclipse.sirius.diagram.description.tool.ToolPackage;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CLabel;
 import org.eclipse.swt.layout.FormAttachment;
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/reconnectedgedescription/ReconnectEdgeDescriptionReconnectionKindPropertySection.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/reconnectedgedescription/ReconnectEdgeDescriptionReconnectionKindPropertySection.java
index 33f7462a34..918c9c7fb9 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/reconnectedgedescription/ReconnectEdgeDescriptionReconnectionKindPropertySection.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/reconnectedgedescription/ReconnectEdgeDescriptionReconnectionKindPropertySection.java
@@ -15,9 +15,9 @@ import java.util.List;
 
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.sirius.diagram.description.tool.ReconnectionKind;
+import org.eclipse.sirius.diagram.description.tool.ToolPackage;
 import org.eclipse.sirius.editor.editorPlugin.SiriusEditor;
 import org.eclipse.sirius.editor.properties.sections.common.AbstractRadioButtonPropertySection;
-import org.eclipse.sirius.diagram.description.tool.ToolPackage;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
 
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/requestdescription/RequestDescriptionTypePropertySection.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/requestdescription/RequestDescriptionTypePropertySection.java
index 68f72fa8d7..0c6f4eb79e 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/requestdescription/RequestDescriptionTypePropertySection.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/requestdescription/RequestDescriptionTypePropertySection.java
@@ -12,9 +12,9 @@ package org.eclipse.sirius.editor.properties.sections.tool.requestdescription;
 // Start of user code imports
 
 import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.sirius.diagram.description.tool.ToolPackage;
 import org.eclipse.sirius.editor.editorPlugin.SiriusEditor;
 import org.eclipse.sirius.editor.properties.sections.common.AbstractTextPropertySection;
-import org.eclipse.sirius.diagram.description.tool.ToolPackage;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CLabel;
 import org.eclipse.swt.layout.FormAttachment;
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/toolgroupextension/ToolGroupExtensionGroupPropertySection.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/toolgroupextension/ToolGroupExtensionGroupPropertySection.java
index 9d56b20e95..5e0a605742 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/toolgroupextension/ToolGroupExtensionGroupPropertySection.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/toolgroupextension/ToolGroupExtensionGroupPropertySection.java
@@ -19,9 +19,9 @@ import java.util.List;
 import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.sirius.diagram.description.tool.ToolPackage;
 import org.eclipse.sirius.editor.editorPlugin.SiriusEditor;
 import org.eclipse.sirius.editor.properties.sections.common.AbstractComboPropertySection;
-import org.eclipse.sirius.diagram.description.tool.ToolPackage;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
 
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/toolsection/ToolSectionIconPropertySection.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/toolsection/ToolSectionIconPropertySection.java
index 578b4e2387..8d391c1db4 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/toolsection/ToolSectionIconPropertySection.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/toolsection/ToolSectionIconPropertySection.java
@@ -12,8 +12,8 @@ package org.eclipse.sirius.editor.properties.sections.tool.toolsection;
 // Start of user code imports
 
 import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.sirius.editor.properties.sections.common.AbstractTextPropertySection;
 import org.eclipse.sirius.diagram.description.tool.ToolPackage;
+import org.eclipse.sirius.editor.properties.sections.common.AbstractTextPropertySection;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
 
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/toolsection/ToolSectionPopupMenusPropertySection.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/toolsection/ToolSectionPopupMenusPropertySection.java
index 8f975eb80e..d2f71f46eb 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/toolsection/ToolSectionPopupMenusPropertySection.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/toolsection/ToolSectionPopupMenusPropertySection.java
@@ -16,8 +16,8 @@ import java.util.List;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EReference;
-import org.eclipse.sirius.editor.properties.sections.common.AbstractEditorDialogPropertySection;
 import org.eclipse.sirius.diagram.description.tool.ToolPackage;
+import org.eclipse.sirius.editor.properties.sections.common.AbstractEditorDialogPropertySection;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
 
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/toolsection/ToolSectionReusedToolsPropertySection.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/toolsection/ToolSectionReusedToolsPropertySection.java
index 87b3f1b99d..edaaaac497 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/toolsection/ToolSectionReusedToolsPropertySection.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/toolsection/ToolSectionReusedToolsPropertySection.java
@@ -16,8 +16,8 @@ import java.util.List;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EReference;
-import org.eclipse.sirius.editor.properties.sections.common.AbstractEditorDialogPropertySection;
 import org.eclipse.sirius.diagram.description.tool.ToolPackage;
+import org.eclipse.sirius.editor.properties.sections.common.AbstractEditorDialogPropertySection;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
 
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/validation/ruleaudit/RuleAuditAuditExpressionPropertySection.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/validation/ruleaudit/RuleAuditAuditExpressionPropertySection.java
index a977841a50..889319982f 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/validation/ruleaudit/RuleAuditAuditExpressionPropertySection.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/validation/ruleaudit/RuleAuditAuditExpressionPropertySection.java
@@ -20,11 +20,11 @@ import org.eclipse.jface.bindings.keys.KeyStroke;
 import org.eclipse.jface.fieldassist.ContentProposalAdapter;
 import org.eclipse.jface.fieldassist.TextContentAdapter;
 import org.eclipse.sirius.common.tools.api.util.EclipseUtil;
-import org.eclipse.sirius.diagram.description.validation.ValidationPackage;
 import org.eclipse.sirius.editor.editorPlugin.SiriusEditor;
 import org.eclipse.sirius.editor.properties.sections.common.AbstractTextPropertySection;
 import org.eclipse.sirius.ui.tools.api.assist.ContentProposalClient;
 import org.eclipse.sirius.ui.tools.api.assist.IAssistContentProvider;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationPackage;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CLabel;
 import org.eclipse.swt.graphics.Point;
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/validation/semanticvalidationrule/SemanticValidationRuleTargetClassPropertySection.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/validation/semanticvalidationrule/SemanticValidationRuleTargetClassPropertySection.java
index 43ae9efd5e..416f9da161 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/validation/semanticvalidationrule/SemanticValidationRuleTargetClassPropertySection.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/validation/semanticvalidationrule/SemanticValidationRuleTargetClassPropertySection.java
@@ -12,10 +12,10 @@ package org.eclipse.sirius.editor.properties.sections.validation.semanticvalidat
 // Start of user code imports
 
 import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.sirius.diagram.description.validation.ValidationPackage;
 import org.eclipse.sirius.editor.editorPlugin.SiriusEditor;
 import org.eclipse.sirius.editor.properties.sections.common.AbstractTextPropertySection;
 import org.eclipse.sirius.editor.tools.api.assist.TypeContentProposalProvider;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationPackage;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
 
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/validation/validationfix/ValidationFixNamePropertySection.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/validation/validationfix/ValidationFixNamePropertySection.java
index 12f0210dad..43b266f0e8 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/validation/validationfix/ValidationFixNamePropertySection.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/validation/validationfix/ValidationFixNamePropertySection.java
@@ -12,9 +12,9 @@ package org.eclipse.sirius.editor.properties.sections.validation.validationfix;
 // Start of user code imports
 
 import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.sirius.diagram.description.validation.ValidationPackage;
 import org.eclipse.sirius.editor.editorPlugin.SiriusEditor;
 import org.eclipse.sirius.editor.properties.sections.common.AbstractTextPropertySection;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationPackage;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
 
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/validation/validationrule/ValidationRuleLevelPropertySection.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/validation/validationrule/ValidationRuleLevelPropertySection.java
index b8c3bf77f4..de0ed7dd76 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/validation/validationrule/ValidationRuleLevelPropertySection.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/validation/validationrule/ValidationRuleLevelPropertySection.java
@@ -14,10 +14,10 @@ package org.eclipse.sirius.editor.properties.sections.validation.validationrule;
 import java.util.List;
 
 import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.sirius.diagram.description.validation.ERROR_LEVEL;
-import org.eclipse.sirius.diagram.description.validation.ValidationPackage;
 import org.eclipse.sirius.editor.editorPlugin.SiriusEditor;
 import org.eclipse.sirius.editor.properties.sections.common.AbstractComboPropertySection;
+import org.eclipse.sirius.viewpoint.description.validation.ERROR_LEVEL;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationPackage;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
 
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/validation/validationrule/ValidationRuleMessagePropertySection.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/validation/validationrule/ValidationRuleMessagePropertySection.java
index f51d4f5c38..dfb3f25020 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/validation/validationrule/ValidationRuleMessagePropertySection.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/validation/validationrule/ValidationRuleMessagePropertySection.java
@@ -20,11 +20,11 @@ import org.eclipse.jface.bindings.keys.KeyStroke;
 import org.eclipse.jface.fieldassist.ContentProposalAdapter;
 import org.eclipse.jface.fieldassist.TextContentAdapter;
 import org.eclipse.sirius.common.tools.api.util.EclipseUtil;
-import org.eclipse.sirius.diagram.description.validation.ValidationPackage;
 import org.eclipse.sirius.editor.editorPlugin.SiriusEditor;
 import org.eclipse.sirius.editor.properties.sections.common.AbstractTextPropertySection;
 import org.eclipse.sirius.ui.tools.api.assist.ContentProposalClient;
 import org.eclipse.sirius.ui.tools.api.assist.IAssistContentProvider;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationPackage;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CLabel;
 import org.eclipse.swt.graphics.Point;
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/validation/validationset/ValidationSetAllRulesPropertySection.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/validation/validationset/ValidationSetAllRulesPropertySection.java
index a5cd393af7..67578709c3 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/validation/validationset/ValidationSetAllRulesPropertySection.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/validation/validationset/ValidationSetAllRulesPropertySection.java
@@ -16,8 +16,8 @@ import java.util.List;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EReference;
-import org.eclipse.sirius.diagram.description.validation.ValidationPackage;
 import org.eclipse.sirius.editor.properties.sections.common.AbstractEditorDialogPropertySection;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationPackage;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
 
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/validation/validationset/ValidationSetNamePropertySection.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/validation/validationset/ValidationSetNamePropertySection.java
index 336f9227e5..0b84360d76 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/validation/validationset/ValidationSetNamePropertySection.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/validation/validationset/ValidationSetNamePropertySection.java
@@ -12,8 +12,8 @@ package org.eclipse.sirius.editor.properties.sections.validation.validationset;
 // Start of user code imports
 
 import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.sirius.diagram.description.validation.ValidationPackage;
 import org.eclipse.sirius.editor.properties.sections.common.AbstractTextPropertySection;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationPackage;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
 
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/validation/validationset/ValidationSetReusedRulesPropertySection.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/validation/validationset/ValidationSetReusedRulesPropertySection.java
index d881f33592..0748770003 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/validation/validationset/ValidationSetReusedRulesPropertySection.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/validation/validationset/ValidationSetReusedRulesPropertySection.java
@@ -16,8 +16,8 @@ import java.util.List;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EReference;
-import org.eclipse.sirius.diagram.description.validation.ValidationPackage;
 import org.eclipse.sirius.editor.properties.sections.common.AbstractEditorDialogPropertySection;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationPackage;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
 
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/validation/viewvalidationrule/ViewValidationRuleTargetsPropertySection.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/validation/viewvalidationrule/ViewValidationRuleTargetsPropertySection.java
index c11fddb77a..1f7ba9fb08 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/validation/viewvalidationrule/ViewValidationRuleTargetsPropertySection.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/validation/viewvalidationrule/ViewValidationRuleTargetsPropertySection.java
@@ -16,8 +16,8 @@ import java.util.List;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EReference;
-import org.eclipse.sirius.diagram.description.validation.ValidationPackage;
 import org.eclipse.sirius.editor.properties.sections.common.AbstractEditorDialogPropertySection;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationPackage;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
 
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/wizards/ValidationModelWizard.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/wizards/ValidationModelWizard.java
index aff3d3841b..166c60a995 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/wizards/ValidationModelWizard.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/wizards/ValidationModelWizard.java
@@ -44,9 +44,9 @@ import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.wizard.Wizard;
 import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.sirius.diagram.description.validation.ValidationFactory;
-import org.eclipse.sirius.diagram.description.validation.ValidationPackage;
 import org.eclipse.sirius.editor.editorPlugin.SiriusEditorPlugin;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationFactory;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationPackage;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.ModifyEvent;
 import org.eclipse.swt.events.ModifyListener;
diff --git a/plugins/org.eclipse.sirius.editor/src/org/eclipse/sirius/editor/properties/filters/tool/containerdropdescription/ContainerDropDescriptionContainersFilter.java b/plugins/org.eclipse.sirius.editor/src/org/eclipse/sirius/editor/properties/filters/tool/containerdropdescription/ContainerDropDescriptionContainersFilter.java
index f19bd508f1..a4f3f12e01 100644
--- a/plugins/org.eclipse.sirius.editor/src/org/eclipse/sirius/editor/properties/filters/tool/containerdropdescription/ContainerDropDescriptionContainersFilter.java
+++ b/plugins/org.eclipse.sirius.editor/src/org/eclipse/sirius/editor/properties/filters/tool/containerdropdescription/ContainerDropDescriptionContainersFilter.java
@@ -13,8 +13,8 @@ package org.eclipse.sirius.editor.properties.filters.tool.containerdropdescripti
 // Start of user code specific imports
 
 import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.sirius.diagram.description.DescriptionPackage;
 import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
-import org.eclipse.sirius.viewpoint.description.DescriptionPackage;
 
 // End of user code specific imports
 
@@ -36,7 +36,7 @@ public class ContainerDropDescriptionContainersFilter extends ViewpointPropertyF
      */
     @Override
     protected boolean isRightInputType(Object arg0) {
-        return arg0 instanceof org.eclipse.sirius.viewpoint.description.tool.ContainerDropDescription;
+        return arg0 instanceof org.eclipse.sirius.diagram.description.tool.ContainerDropDescription;
     }
 
     // Start of user code user methods
diff --git a/plugins/org.eclipse.sirius.editor/src/org/eclipse/sirius/editor/properties/sections/tool/containerdropdescription/ContainerDropDescriptionContainersPropertySection.java b/plugins/org.eclipse.sirius.editor/src/org/eclipse/sirius/editor/properties/sections/tool/containerdropdescription/ContainerDropDescriptionContainersPropertySection.java
index c12ee886db..ff6c37abff 100644
--- a/plugins/org.eclipse.sirius.editor/src/org/eclipse/sirius/editor/properties/sections/tool/containerdropdescription/ContainerDropDescriptionContainersPropertySection.java
+++ b/plugins/org.eclipse.sirius.editor/src/org/eclipse/sirius/editor/properties/sections/tool/containerdropdescription/ContainerDropDescriptionContainersPropertySection.java
@@ -21,11 +21,11 @@ import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.emf.edit.domain.IEditingDomainProvider;
+import org.eclipse.sirius.diagram.description.DescriptionPackage;
+import org.eclipse.sirius.diagram.description.DragAndDropTargetDescription;
+import org.eclipse.sirius.diagram.description.tool.ContainerDropDescription;
 import org.eclipse.sirius.editor.editorPlugin.SiriusEditor;
 import org.eclipse.sirius.editor.properties.sections.common.AbstractEditorDialogWithListPropertySection;
-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.swt.SWT;
 import org.eclipse.swt.custom.CLabel;
 import org.eclipse.swt.layout.FormAttachment;
@@ -105,7 +105,7 @@ public class ContainerDropDescriptionContainersPropertySection extends AbstractE
      */
     @Override
     protected List getChoiceOfValues() {
-        UnmodifiableIterator<org.eclipse.sirius.viewpoint.description.DragAndDropTargetDescription> filter = Iterators.filter(eObject.eResource().getResourceSet().getAllContents(),
+        UnmodifiableIterator<org.eclipse.sirius.diagram.description.DragAndDropTargetDescription> filter = Iterators.filter(eObject.eResource().getResourceSet().getAllContents(),
                 DragAndDropTargetDescription.class);
         return Lists.newArrayList(filter);
     }
diff --git a/plugins/org.eclipse.sirius.editor/src/org/eclipse/sirius/editor/tools/internal/menu/child/EditToolsMenuBuilder.java b/plugins/org.eclipse.sirius.editor/src/org/eclipse/sirius/editor/tools/internal/menu/child/EditToolsMenuBuilder.java
index 9caa293509..7c23e9ad4d 100644
--- a/plugins/org.eclipse.sirius.editor/src/org/eclipse/sirius/editor/tools/internal/menu/child/EditToolsMenuBuilder.java
+++ b/plugins/org.eclipse.sirius.editor/src/org/eclipse/sirius/editor/tools/internal/menu/child/EditToolsMenuBuilder.java
@@ -27,7 +27,7 @@ public class EditToolsMenuBuilder extends AbstractTypeRestrictingMenuBuilder {
         super();
         addValidType(org.eclipse.sirius.diagram.description.tool.ToolPackage.eINSTANCE.getDirectEditLabel());
         addValidType(org.eclipse.sirius.diagram.description.tool.ToolPackage.eINSTANCE.getReconnectEdgeDescription());
-        addValidType(ToolPackage.eINSTANCE.getContainerDropDescription());
+        addValidType(org.eclipse.sirius.diagram.description.tool.ToolPackage.eINSTANCE.getContainerDropDescription());
         addValidType(org.eclipse.sirius.diagram.description.tool.ToolPackage.eINSTANCE.getDeleteElementDescription());
         addValidType(ToolPackage.eINSTANCE.getPasteDescription());
         addValidType(ToolPackage.eINSTANCE.getSelectionWizardDescription());
diff --git a/plugins/org.eclipse.sirius.editor/src/org/eclipse/sirius/editor/tools/internal/menu/child/ValidationMenuBuilder.java b/plugins/org.eclipse.sirius.editor/src/org/eclipse/sirius/editor/tools/internal/menu/child/ValidationMenuBuilder.java
index 8ab88b36b5..32a4fc545d 100644
--- a/plugins/org.eclipse.sirius.editor/src/org/eclipse/sirius/editor/tools/internal/menu/child/ValidationMenuBuilder.java
+++ b/plugins/org.eclipse.sirius.editor/src/org/eclipse/sirius/editor/tools/internal/menu/child/ValidationMenuBuilder.java
@@ -10,8 +10,8 @@
  *******************************************************************************/
 package org.eclipse.sirius.editor.tools.internal.menu.child;
 
-import org.eclipse.sirius.diagram.description.validation.ValidationPackage;
 import org.eclipse.sirius.editor.tools.api.menu.AbstractTypeRestrictingMenuBuilder;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationPackage;
 
 /**
  * The validation menu.
diff --git a/plugins/org.eclipse.sirius.editor/src/org/eclipse/sirius/editor/tools/internal/property/section/AllPropertySection.java b/plugins/org.eclipse.sirius.editor/src/org/eclipse/sirius/editor/tools/internal/property/section/AllPropertySection.java
index 56eb8d549f..42cb103cc0 100644
--- a/plugins/org.eclipse.sirius.editor/src/org/eclipse/sirius/editor/tools/internal/property/section/AllPropertySection.java
+++ b/plugins/org.eclipse.sirius.editor/src/org/eclipse/sirius/editor/tools/internal/property/section/AllPropertySection.java
@@ -25,7 +25,6 @@ import org.eclipse.emf.edit.ui.provider.PropertySource;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.sirius.diagram.description.concern.provider.ConcernItemProviderAdapterFactory;
 import org.eclipse.sirius.diagram.description.filter.provider.FilterItemProviderAdapterFactory;
-import org.eclipse.sirius.diagram.description.validation.provider.ValidationItemProviderAdapterFactory;
 import org.eclipse.sirius.editor.properties.sections.common.AbstractViewpointPropertySection;
 import org.eclipse.sirius.ui.business.api.dialect.DialectUIManager;
 import org.eclipse.sirius.ui.business.api.featureExtensions.FeatureExtensionsUIManager;
@@ -33,6 +32,7 @@ import org.eclipse.sirius.viewpoint.description.audit.provider.AuditItemProvider
 import org.eclipse.sirius.viewpoint.description.provider.DescriptionItemProviderAdapterFactory;
 import org.eclipse.sirius.viewpoint.description.style.provider.StyleItemProviderAdapterFactory;
 import org.eclipse.sirius.viewpoint.description.tool.provider.ToolItemProviderAdapterFactory;
+import org.eclipse.sirius.viewpoint.description.validation.provider.ValidationItemProviderAdapterFactory;
 import org.eclipse.sirius.viewpoint.provider.ViewpointItemProviderAdapterFactory;
 import org.eclipse.swt.layout.FormAttachment;
 import org.eclipse.swt.layout.FormData;