362162: [Architecture - Refactoring] The plug-ins should be renamed to match their layer's qualified name

https://bugs.eclipse.org/bugs/show_bug.cgi?id=362162

1351 files changed, 12026 insertions, 12029 deletions

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/.project b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/.project
index c1f24eaf16d..72d7ebfc1fb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/.project
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <projectDescription>

-	<name>org.eclipse.papyrus.uml.diagram.package</name>

+	<name>org.eclipse.papyrus.uml.diagram.pkg</name>

 	<comment></comment>

 	<projects>

 	</projects>

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/META-INF/MANIFEST.MF
index 6c1dc45c38a..49404f04248 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/META-INF/MANIFEST.MF
@@ -13,6 +13,6 @@ Bundle-Version: 0.9.0.qualifier
 Bundle-Name: %pluginName

 Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.uml.diagram.pkg.Activator

-Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.package;singleton:=true

+Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.pkg;singleton:=true

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/model/UML.Package.idgen b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/model/UML.Package.idgen
index d1d119e9fa3..c596c2be6fd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/model/UML.Package.idgen
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/model/UML.Package.idgen
@@ -1,32 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <idgen:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:gmfgen="http://www.eclipse.org/gmf/2009/GenModel" xmlns:idgen="http://www.eclipse.org/papyrus/0.7.0/idgen" name="Package" type="Package" icon="icons/obj16/Diagram_Package.gif" label="UML Package Diagram" language="uml" javaPackagePrefix="org.eclipse.papyrus.uml.diagram.pkg" javaClassPrefix="PackageDiagram" createCommandLabel="Create a new Package Diagram">

   <diagramEditPart name="PackageDiagramEditPart">

-    <behaviors javaClassQualifiedName="org.eclipse.papyrus.diagram.common.editpolicies.DuplicatePasteEditPolicy" key="DuplicatePasteEditPolicy.PASTE_ROLE"/>

-    <behaviors javaClassQualifiedName="org.eclipse.papyrus.diagram.clazz.edit.policies.ModelItemSemanticEditPolicy" key="EditPolicyRoles.SEMANTIC_ROLE"/>

+    <behaviors javaClassQualifiedName="org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy" key="DuplicatePasteEditPolicy.PASTE_ROLE"/>

+    <behaviors javaClassQualifiedName="org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ModelItemSemanticEditPolicy" key="EditPolicyRoles.SEMANTIC_ROLE"/>

     <behaviors javaClassQualifiedName="org.eclipse.papyrus.uml.diagram.pkg.edit.policy.CustomDragDropEditPolicy" key="EditPolicyRoles.DRAG_DROP_ROLE"/>

   </diagramEditPart>

-  <inheritedDiagrams name="ClassDiagram" viewProviderClassQualifiedName="" editPartProviderClassQualifiedName="" dndEditPolicyClassQualifiedName="org.eclipse.papyrus.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy">

-    <genInheritedEditor href="../../org.eclipse.papyrus.diagram.clazz/model/classdiagram.gmfgen#PapyrusUMLClassDiagram"/>

+  <inheritedDiagrams name="ClassDiagram" viewProviderClassQualifiedName="" editPartProviderClassQualifiedName="" dndEditPolicyClassQualifiedName="org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy">

+    <genInheritedEditor href="../../org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.gmfgen#PapyrusUMLClassDiagram"/>

     <genNodes>

-      <genNode xsi:type="gmfgen:GenTopLevelNode" href="../../org.eclipse.papyrus.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@topLevelNodes.9"/>

+      <genNode xsi:type="gmfgen:GenTopLevelNode" href="../../org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@topLevelNodes.9"/>

     </genNodes>

     <genNodes generatePreferencePage="false" generateTool="false">

-      <genNode xsi:type="gmfgen:GenChildNode" href="../../org.eclipse.papyrus.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@childNodes.28"/>

+      <genNode xsi:type="gmfgen:GenChildNode" href="../../org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@childNodes.28"/>

     </genNodes>

     <genNodes>

-      <genNode xsi:type="gmfgen:GenTopLevelNode" href="../../org.eclipse.papyrus.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@topLevelNodes.14"/>

+      <genNode xsi:type="gmfgen:GenTopLevelNode" href="../../org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@topLevelNodes.14"/>

     </genNodes>

     <genNodes generatePreferencePage="false" generateTool="false">

-      <genNode xsi:type="gmfgen:GenChildNode" href="../../org.eclipse.papyrus.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@childNodes.32"/>

+      <genNode xsi:type="gmfgen:GenChildNode" href="../../org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@childNodes.32"/>

     </genNodes>

     <genLinks>

-      <genLink href="../../org.eclipse.papyrus.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@links.11"/>

+      <genLink href="../../org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@links.11"/>

     </genLinks>

     <genLinks>

-      <genLink href="../../org.eclipse.papyrus.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@links.13"/>

+      <genLink href="../../org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@links.13"/>

     </genLinks>

     <genLinks name="CommentLink">

-      <genLink href="../../org.eclipse.papyrus.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@links.16"/>

+      <genLink href="../../org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@links.16"/>

     </genLinks>

   </inheritedDiagrams>

   <customJavaClasses customEditPolicyProvider="org.eclipse.papyrus.uml.diagram.pkg.provider.CustomEditPolicyProvider"/>

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/plugin.gen.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/plugin.gen.xml
index 10561f73630..30619ebbd46 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/plugin.gen.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/plugin.gen.xml
@@ -11,7 +11,7 @@
 		language="uml"
 		label="UML Package Diagram"/>
 	<editorDiagram
-		actionBarContributorId="org.eclipse.papyrus.diagram.common.part.UMLDiagramActionBarContributor"
+		actionBarContributorId="org.eclipse.papyrus.uml.diagram.common.part.UMLDiagramActionBarContributor"
 		factoryClass="org.eclipse.papyrus.uml.diagram.pkg.PackageDiagramEditorFactory"
 		icon="icons/obj16/Diagram_Package.gif" />
 </extension>
@@ -45,7 +45,7 @@
 			icon="icons/obj16/Diagram_Package.gif" label="Create a new Package Diagram"
 			style="push" tooltip="Create a new Package Diagram">
 			<visibleWhen>
-				<reference definitionId="org.eclipse.papyrus.diagram.common.IsPapyrusActiveWithUMLModel"/>
+				<reference definitionId="org.eclipse.papyrus.uml.diagram.common.IsPapyrusActiveWithUMLModel"/>
 			</visibleWhen>
 					
 		</command>
@@ -58,21 +58,21 @@
 			icon="icons/obj16/Diagram_Package.gif" label="Create a new Package Diagram"
 			style="push" tooltip="Create a new Package Diagram">
 			<visibleWhen>
-				<reference definitionId="org.eclipse.papyrus.diagram.common.IsPapyrusActiveWithUMLModel"/>
+				<reference definitionId="org.eclipse.papyrus.uml.diagram.common.IsPapyrusActiveWithUMLModel"/>
 			</visibleWhen>
 				
 		</command>
 	</toolbar>
 	</menuContribution>
 	
-	<menuContribution locationURI="popup:org.eclipse.papyrus.modelexplorer.popupmenu.creatediagram">
+	<menuContribution locationURI="popup:org.eclipse.papyrus.views.modelexplorer.popupmenu.creatediagram">
 		<command commandId="org.eclipse.papyrus.uml.diagram.pkg.CreateCommand"
 			icon="icons/obj16/Diagram_Package.gif"
 			label="Create a new Package Diagram"
 			style="push"
 			tooltip="Create a new Package Diagram">
 			<visibleWhen>
-				<reference definitionId="org.eclipse.papyrus.diagram.common.IsPapyrusActiveWithUMLModel"/>
+				<reference definitionId="org.eclipse.papyrus.uml.diagram.common.IsPapyrusActiveWithUMLModel"/>
 			</visibleWhen>
 			
 		</command>
@@ -81,11 +81,11 @@
 </extension>
 
 <!-- Palette tool declaration (declares the real palette containment) -->
-<extension point="org.eclipse.papyrus.diagram.common.paletteDefinition"
+<extension point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition"
 	name="UML_Package">
 	
 	<paletteDefinition ID="UML_Package"
-		class="org.eclipse.papyrus.diagram.common.service.PluginPaletteProvider"
+		class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
 		name="UML_Package" icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif" 
 		path="palettes/package.palette.xml"
 		provider="CEA LIST">
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/plugin.xml
index e9c11815a9c..95e37772748 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/plugin.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/plugin.xml
@@ -12,7 +12,7 @@
 		language="uml"
 		label="UML Package Diagram"/>
 	<editorDiagram
-		actionBarContributorId="org.eclipse.papyrus.diagram.common.part.UMLDiagramActionBarContributor"
+		actionBarContributorId="org.eclipse.papyrus.uml.diagram.common.part.UMLDiagramActionBarContributor"
 		factoryClass="org.eclipse.papyrus.uml.diagram.pkg.PackageDiagramEditorFactory"
 		icon="icons/obj16/Diagram_Package.gif" />
 </extension>
@@ -46,7 +46,7 @@
 			icon="icons/obj16/Diagram_Package.gif" label="Create a new Package Diagram"
 			style="push" tooltip="Create a new Package Diagram">
 			<visibleWhen>
-				<reference definitionId="org.eclipse.papyrus.diagram.common.IsPapyrusActiveWithUMLModel"/>
+				<reference definitionId="org.eclipse.papyrus.uml.diagram.common.IsPapyrusActiveWithUMLModel"/>
 			</visibleWhen>
 					
 		</command>
@@ -59,21 +59,21 @@
 			icon="icons/obj16/Diagram_Package.gif" label="Create a new Package Diagram"
 			style="push" tooltip="Create a new Package Diagram">
 			<visibleWhen>
-				<reference definitionId="org.eclipse.papyrus.diagram.common.IsPapyrusActiveWithUMLModel"/>
+				<reference definitionId="org.eclipse.papyrus.uml.diagram.common.IsPapyrusActiveWithUMLModel"/>
 			</visibleWhen>
 				
 		</command>
 	</toolbar>
 	</menuContribution>
 	
-	<menuContribution locationURI="popup:org.eclipse.papyrus.modelexplorer.popupmenu.creatediagram">
+	<menuContribution locationURI="popup:org.eclipse.papyrus.views.modelexplorer.popupmenu.creatediagram">
 		<command commandId="org.eclipse.papyrus.uml.diagram.pkg.CreateCommand"
 			icon="icons/obj16/Diagram_Package.gif"
 			label="Create a new Package Diagram"
 			style="push"
 			tooltip="Create a new Package Diagram">
 			<visibleWhen>
-				<reference definitionId="org.eclipse.papyrus.diagram.common.IsPapyrusActiveWithUMLModel"/>
+				<reference definitionId="org.eclipse.papyrus.uml.diagram.common.IsPapyrusActiveWithUMLModel"/>
 			</visibleWhen>
 			
 		</command>
@@ -82,11 +82,11 @@
 </extension>
 
 <!-- Palette tool declaration (declares the real palette containment) -->
-<extension point="org.eclipse.papyrus.diagram.common.paletteDefinition"
+<extension point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition"
 	name="UML_Package">
 	
 	<paletteDefinition ID="UML_Package"
-		class="org.eclipse.papyrus.diagram.common.service.PluginPaletteProvider"
+		class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
 		name="UML_Package" icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif" 
 		path="palettes/package.palette.xml"
 		provider="CEA LIST">
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/src-gen/org/eclipse/papyrus/uml/diagram/pkg/edit/part/PackageDiagramEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/src-gen/org/eclipse/papyrus/uml/diagram/pkg/edit/part/PackageDiagramEditPart.java
index 62e874232f3..ea133b10904 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/src-gen/org/eclipse/papyrus/uml/diagram/pkg/edit/part/PackageDiagramEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/src-gen/org/eclipse/papyrus/uml/diagram/pkg/edit/part/PackageDiagramEditPart.java
@@ -16,9 +16,9 @@ package org.eclipse.papyrus.uml.diagram.pkg.edit.part;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.diagram.clazz.edit.policies.ModelItemSemanticEditPolicy;
-import org.eclipse.papyrus.diagram.common.editpolicies.DuplicatePasteEditPolicy;
+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ModelItemSemanticEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;
 import org.eclipse.papyrus.uml.diagram.pkg.edit.policy.CustomDragDropEditPolicy;
 
 public class PackageDiagramEditPart extends DiagramEditPart {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/src-gen/org/eclipse/papyrus/uml/diagram/pkg/edit/policy/PackageDiagramDragDropEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/src-gen/org/eclipse/papyrus/uml/diagram/pkg/edit/policy/PackageDiagramDragDropEditPolicy.java
index 7ba81e38411..4f9e6412103 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/src-gen/org/eclipse/papyrus/uml/diagram/pkg/edit/policy/PackageDiagramDragDropEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/src-gen/org/eclipse/papyrus/uml/diagram/pkg/edit/policy/PackageDiagramDragDropEditPolicy.java
@@ -15,7 +15,7 @@ package org.eclipse.papyrus.uml.diagram.pkg.edit.policy;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;
+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;
 import org.eclipse.papyrus.uml.diagram.pkg.provider.GraphicalTypeRegistry;
 import org.eclipse.papyrus.uml.diagram.pkg.provider.IGraphicalTypeRegistry;
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/src-gen/org/eclipse/papyrus/uml/diagram/pkg/part/PackageDiagramEditor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/src-gen/org/eclipse/papyrus/uml/diagram/pkg/part/PackageDiagramEditor.java
index cf50c531a2d..1c55a5d2c9d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/src-gen/org/eclipse/papyrus/uml/diagram/pkg/part/PackageDiagramEditor.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/src-gen/org/eclipse/papyrus/uml/diagram/pkg/part/PackageDiagramEditor.java
@@ -43,11 +43,11 @@ import org.eclipse.papyrus.core.adaptor.gmf.GmfMultiDiagramDocumentProvider;
 import org.eclipse.papyrus.core.editor.IMultiDiagramEditor;
 import org.eclipse.papyrus.core.services.ServiceException;
 import org.eclipse.papyrus.core.services.ServicesRegistry;
-import org.eclipse.papyrus.diagram.common.listeners.DropTargetListener;
-import org.eclipse.papyrus.diagram.common.part.PapyrusPaletteContextMenuProvider;
-import org.eclipse.papyrus.diagram.common.part.PapyrusPaletteViewer;
-import org.eclipse.papyrus.diagram.common.part.UmlGmfDiagramEditor;
-import org.eclipse.papyrus.diagram.common.service.PapyrusPaletteService;
+import org.eclipse.papyrus.uml.diagram.common.listeners.DropTargetListener;
+import org.eclipse.papyrus.uml.diagram.common.part.PapyrusPaletteContextMenuProvider;
+import org.eclipse.papyrus.uml.diagram.common.part.PapyrusPaletteViewer;
+import org.eclipse.papyrus.uml.diagram.common.part.UmlGmfDiagramEditor;
+import org.eclipse.papyrus.uml.diagram.common.service.PapyrusPaletteService;
 import org.eclipse.papyrus.uml.diagram.pkg.Activator;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.dnd.TransferData;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/src-gen/org/eclipse/papyrus/uml/diagram/pkg/provider/ElementTypes.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/src-gen/org/eclipse/papyrus/uml/diagram/pkg/provider/ElementTypes.java
index 6ae9a174b28..9116b09cd11 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/src-gen/org/eclipse/papyrus/uml/diagram/pkg/provider/ElementTypes.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/src-gen/org/eclipse/papyrus/uml/diagram/pkg/provider/ElementTypes.java
@@ -34,44 +34,44 @@ public class ElementTypes extends AbstractElementTypeEnumerator {
 
 
 	/** ClassDiagram :: PACKAGE */
-	public static final IHintedType PACKAGE = (IHintedType)getElementType("org.eclipse.papyrus.diagram.clazz.Package_2007"); //$NON-NLS-1$
+	public static final IHintedType PACKAGE = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.Package_2007"); //$NON-NLS-1$
 
 	public static final String PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT = "7016"; //$NON-NLS-1$
 
 	public static final String PACKAGE_LABEL_NAME_HINT = "5026"; //$NON-NLS-1$
 
 	/** ClassDiagram :: PACKAGE_CN */
-	public static final IHintedType PACKAGE_CN = (IHintedType)getElementType("org.eclipse.papyrus.diagram.clazz.Package_3009"); //$NON-NLS-1$
+	public static final IHintedType PACKAGE_CN = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.Package_3009"); //$NON-NLS-1$
 
 	public static final String PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT = "7010"; //$NON-NLS-1$
 
 	public static final String PACKAGE_CN_LABEL_NAME_HINT = "5017"; //$NON-NLS-1$
 
 	/** ClassDiagram :: COMMENT */
-	public static final IHintedType COMMENT = (IHintedType)getElementType("org.eclipse.papyrus.diagram.clazz.Comment_2012"); //$NON-NLS-1$
+	public static final IHintedType COMMENT = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.Comment_2012"); //$NON-NLS-1$
 
 	public static final String COMMENT_LABEL_BODY_HINT = "5038"; //$NON-NLS-1$
 
 	/** ClassDiagram :: COMMENT_CN */
-	public static final IHintedType COMMENT_CN = (IHintedType)getElementType("org.eclipse.papyrus.diagram.clazz.Comment_3028"); //$NON-NLS-1$
+	public static final IHintedType COMMENT_CN = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.Comment_3028"); //$NON-NLS-1$
 
 	public static final String COMMENT_CN_LABEL_BODY_HINT = "5063"; //$NON-NLS-1$
 
 
 	/** ClassDiagram :: DEPENDENCY */
-	public static final IHintedType DEPENDENCY = (IHintedType)getElementType("org.eclipse.papyrus.diagram.clazz.Dependency_4008"); //$NON-NLS-1$
+	public static final IHintedType DEPENDENCY = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.Dependency_4008"); //$NON-NLS-1$
 
 	public static final String DEPENDENCY_LABEL_NAME_HINT = "6026"; //$NON-NLS-1$
 
 	public static final String DEPENDENCY_LABEL_APPLIED_STEREOTYPE_HINT = "6027"; //$NON-NLS-1$
 
 	/** ClassDiagram :: PACKAGE_IMPORT */
-	public static final IHintedType PACKAGE_IMPORT = (IHintedType)getElementType("org.eclipse.papyrus.diagram.clazz.PackageImport_4010"); //$NON-NLS-1$
+	public static final IHintedType PACKAGE_IMPORT = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.PackageImport_4010"); //$NON-NLS-1$
 
 	public static final String PACKAGE_IMPORT_LABEL_APPLIED_STEREOTYPE_HINT = "6022"; //$NON-NLS-1$
 
 	/** ClassDiagram :: COMMENT_ANNOTATED_ELEMENT */
-	public static final IHintedType COMMENT_ANNOTATED_ELEMENT = (IHintedType)getElementType("org.eclipse.papyrus.diagram.clazz.CommentAnnotatedElement_4013"); //$NON-NLS-1$
+	public static final IHintedType COMMENT_ANNOTATED_ELEMENT = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.CommentAnnotatedElement_4013"); //$NON-NLS-1$
 
 
 }
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/src-gen/org/eclipse/papyrus/uml/diagram/pkg/provider/InheritedClassDiagramEditPartProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/src-gen/org/eclipse/papyrus/uml/diagram/pkg/provider/InheritedClassDiagramEditPartProvider.java
index 5ade69f72df..7aaceadf3c6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/src-gen/org/eclipse/papyrus/uml/diagram/pkg/provider/InheritedClassDiagramEditPartProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/src-gen/org/eclipse/papyrus/uml/diagram/pkg/provider/InheritedClassDiagramEditPartProvider.java
@@ -18,7 +18,7 @@ import org.eclipse.gmf.runtime.common.core.service.IOperation;
 import org.eclipse.gmf.runtime.diagram.ui.services.editpart.CreateGraphicEditPartOperation;
 import org.eclipse.gmf.runtime.diagram.ui.services.editpart.IEditPartOperation;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.diagram.clazz.providers.UMLEditPartProvider;
+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLEditPartProvider;
 
 public class InheritedClassDiagramEditPartProvider extends UMLEditPartProvider {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/src-gen/org/eclipse/papyrus/uml/diagram/pkg/provider/InheritedClassDiagramViewProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/src-gen/org/eclipse/papyrus/uml/diagram/pkg/provider/InheritedClassDiagramViewProvider.java
index f175a9a37e6..c4e10d318dd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/src-gen/org/eclipse/papyrus/uml/diagram/pkg/provider/InheritedClassDiagramViewProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/src-gen/org/eclipse/papyrus/uml/diagram/pkg/provider/InheritedClassDiagramViewProvider.java
@@ -27,7 +27,7 @@ import org.eclipse.gmf.runtime.emf.type.core.IElementType;
 import org.eclipse.gmf.runtime.notation.Edge;
 import org.eclipse.gmf.runtime.notation.Node;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.diagram.clazz.providers.UMLViewProvider;
+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLViewProvider;
 
 public class InheritedClassDiagramViewProvider extends UMLViewProvider {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/src-gen/org/eclipse/papyrus/uml/diagram/pkg/provider/PackageDiagramEditPolicyProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/src-gen/org/eclipse/papyrus/uml/diagram/pkg/provider/PackageDiagramEditPolicyProvider.java
index a78cc8fb649..728cfe356bf 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/src-gen/org/eclipse/papyrus/uml/diagram/pkg/provider/PackageDiagramEditPolicyProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/src-gen/org/eclipse/papyrus/uml/diagram/pkg/provider/PackageDiagramEditPolicyProvider.java
@@ -36,22 +36,22 @@ public class PackageDiagramEditPolicyProvider extends AbstractProvider implement
 			return false;
 		}
 
-		if(gep instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.PackageEditPart) {
+		if(gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageEditPart) {
 			return true;
 		}
-		if(gep instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.PackagePackageableElementCompartmentEditPart) {
+		if(gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackagePackageableElementCompartmentEditPart) {
 			return true;
 		}
-		if(gep instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.PackageEditPartCN) {
+		if(gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageEditPartCN) {
 			return true;
 		}
-		if(gep instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.PackagePackageableElementCompartmentEditPartCN) {
+		if(gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackagePackageableElementCompartmentEditPartCN) {
 			return true;
 		}
-		if(gep instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.CommentEditPart) {
+		if(gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentEditPart) {
 			return true;
 		}
-		if(gep instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.CommentEditPartCN) {
+		if(gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentEditPartCN) {
 			return true;
 		}
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/src/org/eclipse/papyrus/uml/diagram/pkg/provider/CustomEditPolicyProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/src/org/eclipse/papyrus/uml/diagram/pkg/provider/CustomEditPolicyProvider.java
index ed7f52728e8..0c431c3a96e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/src/org/eclipse/papyrus/uml/diagram/pkg/provider/CustomEditPolicyProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/src/org/eclipse/papyrus/uml/diagram/pkg/provider/CustomEditPolicyProvider.java
@@ -14,7 +14,7 @@
 package org.eclipse.papyrus.uml.diagram.pkg.provider;
 
 import org.eclipse.gef.EditPart;
-import org.eclipse.papyrus.diagram.common.editpolicies.NavigationEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.NavigationEditPolicy;
 
 public class CustomEditPolicyProvider extends PackageDiagramEditPolicyProvider {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/.options b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/.options
index 83539d7cd81..38706dd74bf 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/.options
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/.options
@@ -1,7 +1,7 @@
-# Tracing options for the org.eclipse.papyrus.diagram.profile plug-in

+# Tracing options for the org.eclipse.papyrus.uml.diagram.profile plug-in

 

 # Common issues

-org.eclipse.papyrus.diagram.profile/debug=false

+org.eclipse.papyrus.uml.diagram.profile/debug=false

 

 # Visual IDs

-org.eclipse.papyrus.diagram.profile/debug/visualID=false

+org.eclipse.papyrus.uml.diagram.profile/debug/visualID=false

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/META-INF/MANIFEST.MF
index 1aa18f77466..12e73fc93f6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/META-INF/MANIFEST.MF
@@ -1,28 +1,28 @@
 Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.diagram.profile,

- org.eclipse.papyrus.diagram.profile.custom.commands,

- org.eclipse.papyrus.diagram.profile.custom.edit.parts,

- org.eclipse.papyrus.diagram.profile.custom.factory,

- org.eclipse.papyrus.diagram.profile.custom.figure,

- org.eclipse.papyrus.diagram.profile.custom.helper,

- org.eclipse.papyrus.diagram.profile.custom.messages,

- org.eclipse.papyrus.diagram.profile.custom.policies,

- org.eclipse.papyrus.diagram.profile.custom.policies.itemsemantic,

- org.eclipse.papyrus.diagram.profile.custom.preferences,

- org.eclipse.papyrus.diagram.profile.custom.providers,

- org.eclipse.papyrus.diagram.profile.custom.requests,

- org.eclipse.papyrus.diagram.profile.custom.ui.dialog,

- org.eclipse.papyrus.diagram.profile.edit.commands,

- org.eclipse.papyrus.diagram.profile.edit.helpers,

- org.eclipse.papyrus.diagram.profile.edit.parts,

- org.eclipse.papyrus.diagram.profile.edit.policies,

- org.eclipse.papyrus.diagram.profile.navigator,

- org.eclipse.papyrus.diagram.profile.parsers,

- org.eclipse.papyrus.diagram.profile.part,

- org.eclipse.papyrus.diagram.profile.preferences,

- org.eclipse.papyrus.diagram.profile.providers,

- org.eclipse.papyrus.diagram.profile.service,

- org.eclipse.papyrus.diagram.profile.sheet

+Export-Package: org.eclipse.papyrus.uml.diagram.profile,

+ org.eclipse.papyrus.uml.diagram.profile.custom.commands,

+ org.eclipse.papyrus.uml.diagram.profile.custom.edit.parts,

+ org.eclipse.papyrus.uml.diagram.profile.custom.factory,

+ org.eclipse.papyrus.uml.diagram.profile.custom.figure,

+ org.eclipse.papyrus.uml.diagram.profile.custom.helper,

+ org.eclipse.papyrus.uml.diagram.profile.custom.messages,

+ org.eclipse.papyrus.uml.diagram.profile.custom.policies,

+ org.eclipse.papyrus.uml.diagram.profile.custom.policies.itemsemantic,

+ org.eclipse.papyrus.uml.diagram.profile.custom.preferences,

+ org.eclipse.papyrus.uml.diagram.profile.custom.providers,

+ org.eclipse.papyrus.uml.diagram.profile.custom.requests,

+ org.eclipse.papyrus.uml.diagram.profile.custom.ui.dialog,

+ org.eclipse.papyrus.uml.diagram.profile.edit.commands,

+ org.eclipse.papyrus.uml.diagram.profile.edit.helpers,

+ org.eclipse.papyrus.uml.diagram.profile.edit.parts,

+ org.eclipse.papyrus.uml.diagram.profile.edit.policies,

+ org.eclipse.papyrus.uml.diagram.profile.navigator,

+ org.eclipse.papyrus.uml.diagram.profile.parsers,

+ org.eclipse.papyrus.uml.diagram.profile.part,

+ org.eclipse.papyrus.uml.diagram.profile.preferences,

+ org.eclipse.papyrus.uml.diagram.profile.providers,

+ org.eclipse.papyrus.uml.diagram.profile.service,

+ org.eclipse.papyrus.uml.diagram.profile.sheet

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

 Bundle-Name: %pluginName

@@ -72,7 +72,6 @@ Bundle-Vendor: %providerName
 Eclipse-LazyStart: true

 Bundle-Version: 0.9.0.qualifier

 Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.diagram.profile.part.UMLDiagramE

- ditorPlugin

+Bundle-Activator: org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin

 Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.profile;singleton:=true

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/CreateProfileDiagramCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/CreateProfileDiagramCommand.java
index d493b7d1040..19f7af64d54 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/CreateProfileDiagramCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/CreateProfileDiagramCommand.java
@@ -12,12 +12,12 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Adapted from class diagram
  *****************************************************************************/
 
-package org.eclipse.papyrus.diagram.profile;
+package org.eclipse.papyrus.uml.diagram.profile;
 
 import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
 import org.eclipse.papyrus.core.adaptor.gmf.AbstractPapyrusGmfCreateDiagramCommandHandler;
-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfileDiagramEditPart;
-import org.eclipse.papyrus.diagram.profile.part.UMLDiagramEditorPlugin;
+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart;
+import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;
 
 /**
  * Define a command to create a new Composite Diagram. This command is used by all UI (toolbar,
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/CreateProfileDiagramWithNavigationHandler.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/CreateProfileDiagramWithNavigationHandler.java
index 9f7c2798468..2be4dc99539 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/CreateProfileDiagramWithNavigationHandler.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/CreateProfileDiagramWithNavigationHandler.java
@@ -11,7 +11,7 @@
  *  Mathieu Velten (Atos Origin) mathieu.velten@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile;

+package org.eclipse.papyrus.uml.diagram.profile;

 

 import org.eclipse.papyrus.navigation.CreateDiagramWithNavigationHandler;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/CreateProfileModelCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/CreateProfileModelCommand.java
index 4bb310faf5a..a0907719b0d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/CreateProfileModelCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/CreateProfileModelCommand.java
@@ -11,7 +11,7 @@
  *  Tatiana Fesenko (CEA LIST) - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile;

+package org.eclipse.papyrus.uml.diagram.profile;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.papyrus.core.extension.commands.ModelCreationCommandBase;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/ProfileDiagramCreationCondition.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/ProfileDiagramCreationCondition.java
index 4246a8711d8..d974a26d486 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/ProfileDiagramCreationCondition.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/ProfileDiagramCreationCondition.java
@@ -8,7 +8,7 @@
  * Contributors:

  *  Atos Origin - Initial API and implementation

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile;

+package org.eclipse.papyrus.uml.diagram.profile;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.papyrus.core.extension.commands.PerspectiveContextDependence;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/ProfileDiagramEditorFactory.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/ProfileDiagramEditorFactory.java
index 9d1db5474ae..268a9a7b110 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/ProfileDiagramEditorFactory.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/ProfileDiagramEditorFactory.java
@@ -13,10 +13,10 @@
  *

  *****************************************************************************/

 

-package org.eclipse.papyrus.diagram.profile;

+package org.eclipse.papyrus.uml.diagram.profile;

 

 import org.eclipse.papyrus.core.adaptor.gmf.GmfEditorFactory;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfileDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart;

 

 /**

  * The profile's diagram editor factory

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/UmlProfileDiagramForMultiEditor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/UmlProfileDiagramForMultiEditor.java
index 43ef0d7546d..ce1dffff7b3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/UmlProfileDiagramForMultiEditor.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/UmlProfileDiagramForMultiEditor.java
@@ -13,7 +13,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Adapted from composite structure diagram

  *****************************************************************************/

 

-package org.eclipse.papyrus.diagram.profile;

+package org.eclipse.papyrus.uml.diagram.profile;

 

 import org.eclipse.core.runtime.CoreException;

 import org.eclipse.emf.common.ui.URIEditorInput;

@@ -25,8 +25,8 @@ import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.papyrus.core.editor.BackboneException;

 import org.eclipse.papyrus.core.services.ServiceException;

 import org.eclipse.papyrus.core.services.ServicesRegistry;

-import org.eclipse.papyrus.diagram.profile.part.UMLDiagramEditor;

-import org.eclipse.papyrus.diagram.profile.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditor;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;

 import org.eclipse.swt.widgets.Composite;

 import org.eclipse.swt.widgets.Shell;

 import org.eclipse.ui.IEditorInput;

@@ -49,7 +49,7 @@ public class UmlProfileDiagramForMultiEditor extends UMLDiagramEditor {
 	/**

 	 * The EditingDomain ID for this diagram

 	 */

-	private static final String PROFIL_DIAGRAM_EDITING_DOMAIN_ID = "org.eclipse.papyrus.diagram.profile.EditingDomain"; //$NON-NLS-1$

+	private static final String PROFIL_DIAGRAM_EDITING_DOMAIN_ID = "org.eclipse.papyrus.uml.diagram.profile.EditingDomain"; //$NON-NLS-1$

 

 

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/commands/AssociationBranchDeletion.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/commands/AssociationBranchDeletion.java
index c2d91e182d2..8a3599bb91e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/commands/AssociationBranchDeletion.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/commands/AssociationBranchDeletion.java
@@ -11,7 +11,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Adapted code from the class diagram 

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.custom.commands;

+package org.eclipse.papyrus.uml.diagram.profile.custom.commands;

 

 import java.util.ArrayList;

 

@@ -33,11 +33,11 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.action.IAction;

 import org.eclipse.jface.viewers.ISelection;

 import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.papyrus.diagram.common.commands.SemanticAdapter;

-import org.eclipse.papyrus.diagram.profile.custom.helper.MultiAssociationHelper;

-import org.eclipse.papyrus.diagram.profile.custom.providers.CustomDeferredCreateConnectionViewCommand;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationBranchEditPart;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.common.commands.SemanticAdapter;

+import org.eclipse.papyrus.uml.diagram.profile.custom.helper.MultiAssociationHelper;

+import org.eclipse.papyrus.uml.diagram.profile.custom.providers.CustomDeferredCreateConnectionViewCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 import org.eclipse.ui.IObjectActionDelegate;

 import org.eclipse.ui.IWorkbenchPart;

 import org.eclipse.uml2.uml.Association;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/commands/AssociationDiamondViewCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/commands/AssociationDiamondViewCreateCommand.java
index 3ac884ef762..d88e739ca27 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/commands/AssociationDiamondViewCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/commands/AssociationDiamondViewCreateCommand.java
@@ -11,7 +11,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Adapted code from Class Diagram

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.custom.commands;

+package org.eclipse.papyrus.uml.diagram.profile.custom.commands;

 

 import java.util.Collections;

 import java.util.List;

@@ -35,8 +35,8 @@ import org.eclipse.gmf.runtime.notation.Location;
 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.NotationFactory;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.commands.SemanticAdapter;

-import org.eclipse.papyrus.diagram.profile.providers.UMLViewProvider;

+import org.eclipse.papyrus.uml.diagram.common.commands.SemanticAdapter;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLViewProvider;

 

 /**

  * Custom class to create the association node

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/commands/ChangeExtensionNameCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/commands/ChangeExtensionNameCommand.java
index 44c6de26b1b..15c3353fdd1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/commands/ChangeExtensionNameCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/commands/ChangeExtensionNameCommand.java
@@ -13,7 +13,7 @@
  *****************************************************************************/

 

 

-package org.eclipse.papyrus.diagram.profile.custom.commands;

+package org.eclipse.papyrus.uml.diagram.profile.custom.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/commands/CustomAssociationCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/commands/CustomAssociationCreateCommand.java
index 431ff532e91..2d5f5c4192e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/commands/CustomAssociationCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/commands/CustomAssociationCreateCommand.java
@@ -11,7 +11,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Adapted code from the class diagram to the profile diagram

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.custom.commands;

+package org.eclipse.papyrus.uml.diagram.profile.custom.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -20,7 +20,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gmf.runtime.common.core.command.CommandResult;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.papyrus.diagram.profile.custom.helper.ProfileDiagramAssociationHelper;

+import org.eclipse.papyrus.uml.diagram.profile.custom.helper.ProfileDiagramAssociationHelper;

 import org.eclipse.uml2.uml.Association;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.Type;

@@ -28,7 +28,7 @@ import org.eclipse.uml2.uml.Type;
 /**

  * custom class to create an association

  */

-public class CustomAssociationCreateCommand extends org.eclipse.papyrus.diagram.profile.edit.commands.AssociationCreateCommand {

+public class CustomAssociationCreateCommand extends org.eclipse.papyrus.uml.diagram.profile.edit.commands.AssociationCreateCommand {

 

 	/** the container */

 	protected Package container;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/commands/CustomAssociationReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/commands/CustomAssociationReorientCommand.java
index 356efb327b7..45706a48c30 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/commands/CustomAssociationReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/commands/CustomAssociationReorientCommand.java
@@ -11,15 +11,15 @@
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Adapted code from the class diagram to the profile diagram

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.custom.commands;

+package org.eclipse.papyrus.uml.diagram.profile.custom.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gmf.runtime.common.core.command.CommandResult;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.common.helper.AssociationHelper;

-import org.eclipse.papyrus.diagram.profile.edit.commands.AssociationReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.helper.AssociationHelper;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.AssociationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.UMLBaseItemSemanticEditPolicy;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.Type;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/commands/CustomExtensionCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/commands/CustomExtensionCreateCommand.java
index df64ff67277..309f92a7cf4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/commands/CustomExtensionCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/commands/CustomExtensionCreateCommand.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.custom.commands;

+package org.eclipse.papyrus.uml.diagram.profile.custom.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -23,10 +23,10 @@ import org.eclipse.gmf.runtime.emf.type.core.IElementType;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.papyrus.diagram.profile.custom.helper.ExtensionHelper;

-import org.eclipse.papyrus.diagram.profile.custom.policies.CUMLBaseItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ExtensionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.custom.helper.ExtensionHelper;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.CUMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ExtensionCreateCommand;

 import org.eclipse.uml2.uml.AggregationKind;

 import org.eclipse.uml2.uml.Class;

 import org.eclipse.uml2.uml.Extension;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/commands/CustomExtensionReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/commands/CustomExtensionReorientCommand.java
index 84989ea6a80..5a1392b03be 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/commands/CustomExtensionReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/commands/CustomExtensionReorientCommand.java
@@ -11,15 +11,15 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.custom.commands;

+package org.eclipse.papyrus.uml.diagram.profile.custom.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gmf.runtime.common.core.command.CommandResult;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.profile.custom.helper.ExtensionHelper;

-import org.eclipse.papyrus.diagram.profile.custom.policies.CUMLBaseItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ExtensionReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.custom.helper.ExtensionHelper;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.CUMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ExtensionReorientCommand;

 import org.eclipse.uml2.uml.Class;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.Stereotype;

@@ -52,7 +52,7 @@ public class CustomExtensionReorientCommand extends ExtensionReorientCommand {
 

 	/**

 	 * 

-	 * @see org.eclipse.papyrus.diagram.profile.edit.commands.ExtensionReorientCommand#canReorientSource()

+	 * @see org.eclipse.papyrus.uml.diagram.profile.edit.commands.ExtensionReorientCommand#canReorientSource()

 	 * 

 	 * @return

 	 */

@@ -71,7 +71,7 @@ public class CustomExtensionReorientCommand extends ExtensionReorientCommand {
 

 	/**

 	 * 

-	 * @see org.eclipse.papyrus.diagram.profile.edit.commands.ExtensionReorientCommand#canReorientTarget()

+	 * @see org.eclipse.papyrus.uml.diagram.profile.edit.commands.ExtensionReorientCommand#canReorientTarget()

 	 * 

 	 * @return

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/commands/CustomMetaClassCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/commands/CustomMetaClassCreateCommand.java
index 9e577ac3c06..7413cca39c2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/commands/CustomMetaClassCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/commands/CustomMetaClassCreateCommand.java
@@ -12,7 +12,7 @@
  *

  *****************************************************************************/

 

-package org.eclipse.papyrus.diagram.profile.custom.commands;

+package org.eclipse.papyrus.uml.diagram.profile.custom.commands;

 

 

 import java.util.Iterator;

@@ -32,12 +32,12 @@ import org.eclipse.gmf.runtime.notation.Location;
 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.NotationFactory;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.profile.custom.requests.CustomCreateViewRequest;

-import org.eclipse.papyrus.diagram.profile.edit.parts.MetaclassEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.MetaclassEditPartCN;

-import org.eclipse.papyrus.diagram.profile.providers.UMLViewProvider;

-import org.eclipse.papyrus.umlutils.ui.VisualInformationPapyrusConstant;

-import org.eclipse.papyrus.umlutils.ui.helper.AppliedStereotypeHelper;

+import org.eclipse.papyrus.uml.diagram.profile.custom.requests.CustomCreateViewRequest;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.MetaclassEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.MetaclassEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLViewProvider;

+import org.eclipse.papyrus.uml.tools.utils.ui.VisualInformationPapyrusConstant;

+import org.eclipse.papyrus.uml.tools.utils.ui.helper.AppliedStereotypeHelper;

 import org.eclipse.uml2.uml.Element;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/commands/CustomSemanticCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/commands/CustomSemanticCreateCommand.java
index 6da43d9d066..60961ed1876 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/commands/CustomSemanticCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/commands/CustomSemanticCreateCommand.java
@@ -13,7 +13,7 @@
  *****************************************************************************/

 

 

-package org.eclipse.papyrus.diagram.profile.custom.commands;

+package org.eclipse.papyrus.uml.diagram.profile.custom.commands;

 

 import java.util.ArrayList;

 

@@ -29,10 +29,10 @@ import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
 import org.eclipse.gmf.runtime.common.core.command.ICommand;

 import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;

-import org.eclipse.papyrus.diagram.profile.custom.messages.Messages;

-import org.eclipse.papyrus.diagram.profile.custom.requests.CustomCreateElementRequestAdapter;

-import org.eclipse.papyrus.diagram.profile.custom.ui.dialog.ChooseSetMetaclassDialog;

 import org.eclipse.papyrus.profile.ImageManager;

+import org.eclipse.papyrus.uml.diagram.profile.custom.messages.Messages;

+import org.eclipse.papyrus.uml.diagram.profile.custom.requests.CustomCreateElementRequestAdapter;

+import org.eclipse.papyrus.uml.diagram.profile.custom.ui.dialog.ChooseSetMetaclassDialog;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.widgets.Label;

 import org.eclipse.swt.widgets.Shell;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/commands/DefineProfileCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/commands/DefineProfileCommand.java
index 0094a287c24..b173ee4cb91 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/commands/DefineProfileCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/commands/DefineProfileCommand.java
@@ -13,7 +13,7 @@
  *****************************************************************************/

 

 

-package org.eclipse.papyrus.diagram.profile.custom.commands;

+package org.eclipse.papyrus.uml.diagram.profile.custom.commands;

 

 import java.util.Collections;

 import java.util.List;

@@ -32,7 +32,7 @@ import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCo
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.profile.definition.PapyrusDefinitionAnnotation;

 import org.eclipse.papyrus.profile.definition.ProfileRedefinition;

-import org.eclipse.papyrus.umlutils.PackageUtil;

+import org.eclipse.papyrus.uml.tools.utils.PackageUtil;

 import org.eclipse.uml2.uml.Profile;

 

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/commands/DependencyBranchDeletion.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/commands/DependencyBranchDeletion.java
index 640967e0423..95363764e46 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/commands/DependencyBranchDeletion.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/commands/DependencyBranchDeletion.java
@@ -11,7 +11,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Adapted code from the class diagram to the profile diagram

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.custom.commands;

+package org.eclipse.papyrus.uml.diagram.profile.custom.commands;

 

 import java.util.ArrayList;

 

@@ -32,10 +32,10 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.action.IAction;

 import org.eclipse.jface.viewers.ISelection;

 import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.papyrus.diagram.common.commands.SemanticAdapter;

-import org.eclipse.papyrus.diagram.profile.custom.providers.CustomDeferredCreateConnectionViewCommand;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.common.commands.SemanticAdapter;

+import org.eclipse.papyrus.uml.diagram.profile.custom.providers.CustomDeferredCreateConnectionViewCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 import org.eclipse.ui.IObjectActionDelegate;

 import org.eclipse.ui.IWorkbenchPart;

 import org.eclipse.uml2.uml.Dependency;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/commands/DependencyDiamondViewCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/commands/DependencyDiamondViewCreateCommand.java
index 6593872d353..a75de0023f2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/commands/DependencyDiamondViewCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/commands/DependencyDiamondViewCreateCommand.java
@@ -11,7 +11,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Adapted code from the class diagram to the profile diagram

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.custom.commands;

+package org.eclipse.papyrus.uml.diagram.profile.custom.commands;

 

 import java.util.Collections;

 import java.util.List;

@@ -34,8 +34,8 @@ import org.eclipse.gmf.runtime.notation.Location;
 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.NotationFactory;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.commands.SemanticAdapter;

-import org.eclipse.papyrus.diagram.profile.providers.UMLViewProvider;

+import org.eclipse.papyrus.uml.diagram.common.commands.SemanticAdapter;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLViewProvider;

 

 /**

  * Custom class to create the associationClass node

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/commands/DisplayAllAssociationBranchCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/commands/DisplayAllAssociationBranchCommand.java
index 28d405341ce..e7a46f95a94 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/commands/DisplayAllAssociationBranchCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/commands/DisplayAllAssociationBranchCommand.java
@@ -11,13 +11,13 @@
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Adapted code from the class diagram to the profile diagram

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.custom.commands;

+package org.eclipse.papyrus.uml.diagram.profile.custom.commands;

 

 import org.eclipse.jface.action.IAction;

 import org.eclipse.jface.viewers.ISelection;

 import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.papyrus.diagram.profile.custom.helper.MultiAssociationHelper;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationNodeEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.custom.helper.MultiAssociationHelper;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationNodeEditPart;

 import org.eclipse.ui.IObjectActionDelegate;

 import org.eclipse.ui.IWorkbenchPart;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/commands/PropertyCommandForAssociation.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/commands/PropertyCommandForAssociation.java
index 603522f648b..77c25c81ff3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/commands/PropertyCommandForAssociation.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/commands/PropertyCommandForAssociation.java
@@ -11,7 +11,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.custom.commands;

+package org.eclipse.papyrus.uml.diagram.profile.custom.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -20,8 +20,8 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gmf.runtime.common.core.command.CommandResult;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ClassPropertyCreateCommand;

-import org.eclipse.papyrus.diagram.profile.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ClassPropertyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.providers.ElementInitializers;

 import org.eclipse.uml2.uml.Association;

 import org.eclipse.uml2.uml.Property;

 import org.eclipse.uml2.uml.Type;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/commands/SetStereotypeVisibleOnMetaclassCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/commands/SetStereotypeVisibleOnMetaclassCommand.java
index effdc019723..dbbaf1ae408 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/commands/SetStereotypeVisibleOnMetaclassCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/commands/SetStereotypeVisibleOnMetaclassCommand.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.custom.commands;

+package org.eclipse.papyrus.uml.diagram.profile.custom.commands;

 

 import java.util.List;

 

@@ -24,9 +24,9 @@ import org.eclipse.gmf.runtime.common.core.command.CommandResult;
 import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

 import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.util.Util;

-import org.eclipse.papyrus.umlutils.ui.VisualInformationPapyrusConstant;

-import org.eclipse.papyrus.umlutils.ui.helper.AppliedStereotypeHelper;

+import org.eclipse.papyrus.uml.diagram.common.util.Util;

+import org.eclipse.papyrus.uml.tools.utils.ui.VisualInformationPapyrusConstant;

+import org.eclipse.papyrus.uml.tools.utils.ui.helper.AppliedStereotypeHelper;

 import org.eclipse.uml2.uml.Class;

 import org.eclipse.uml2.uml.Element;

 import org.eclipse.uml2.uml.ElementImport;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/edit/parts/AbstractAssociationBranchEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/edit/parts/AbstractAssociationBranchEditPart.java
index 2605be8037e..58b89dbeb96 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/edit/parts/AbstractAssociationBranchEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/edit/parts/AbstractAssociationBranchEditPart.java
@@ -11,14 +11,14 @@
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Adapted code from Class Diagram

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.custom.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.custom.edit.parts;

 

 import org.eclipse.emf.common.notify.Notification;

 import org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionNodeEditPart;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.profile.custom.figure.AssociationFigure;

-import org.eclipse.papyrus.diagram.profile.custom.helper.MultiAssociationHelper;

+import org.eclipse.papyrus.uml.diagram.profile.custom.figure.AssociationFigure;

+import org.eclipse.papyrus.uml.diagram.profile.custom.helper.MultiAssociationHelper;

 import org.eclipse.uml2.uml.AggregationKind;

 import org.eclipse.uml2.uml.Association;

 import org.eclipse.uml2.uml.Property;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/edit/parts/AbstractAssociationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/edit/parts/AbstractAssociationEditPart.java
index 267e5412681..bf40f7eaa70 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/edit/parts/AbstractAssociationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/edit/parts/AbstractAssociationEditPart.java
@@ -11,14 +11,14 @@
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Adapted code from Class Diagram

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.custom.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.custom.edit.parts;

 

 import org.eclipse.emf.common.notify.Notification;

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.editparts.UMLConnectionNodeEditPart;

-import org.eclipse.papyrus.diagram.profile.custom.figure.AssociationFigure;

+import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.custom.figure.AssociationFigure;

 import org.eclipse.uml2.uml.AggregationKind;

 import org.eclipse.uml2.uml.Association;

 import org.eclipse.uml2.uml.Element;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/edit/parts/AssociationEndSourceEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/edit/parts/AssociationEndSourceEditPart.java
index 29e6464ea29..e79125eb1a9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/edit/parts/AssociationEndSourceEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/edit/parts/AssociationEndSourceEditPart.java
@@ -11,12 +11,12 @@
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Adapted code from Class Diagram

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.custom.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.custom.edit.parts;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.profile.custom.helper.AssociationEndTargetLabelHelper;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationRoleSourceEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.custom.helper.AssociationEndTargetLabelHelper;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationRoleSourceEditPart;

 import org.eclipse.ui.views.properties.IPropertySource;

 

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/edit/parts/AssociationEndTargetEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/edit/parts/AssociationEndTargetEditPart.java
index c9c69073498..b1ed8fad63b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/edit/parts/AssociationEndTargetEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/edit/parts/AssociationEndTargetEditPart.java
@@ -11,12 +11,12 @@
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Adapted code from Class Diagram

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.custom.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.custom.edit.parts;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.profile.custom.helper.AssociationEndSourceLabelHelper;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationRoleTargetEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.custom.helper.AssociationEndSourceLabelHelper;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationRoleTargetEditPart;

 import org.eclipse.ui.views.properties.IPropertySource;

 

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/edit/parts/CustomAssociationNodeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/edit/parts/CustomAssociationNodeEditPart.java
index 02e416d1518..24dbf1c1b7e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/edit/parts/CustomAssociationNodeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/edit/parts/CustomAssociationNodeEditPart.java
@@ -11,13 +11,13 @@
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Adapted code from the class diagram

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.custom.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.custom.edit.parts;

 

 import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.figure.node.AssociationNodeFigure;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationNodeEditPart;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.AssociationNodeFigure;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationNodeEditPart;

 

 /**

  * this a specific editpart used to overload the method createNodePlate

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/edit/parts/CustomDependencyBranchEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/edit/parts/CustomDependencyBranchEditPart.java
index b8b826a770b..2598f28f944 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/edit/parts/CustomDependencyBranchEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/edit/parts/CustomDependencyBranchEditPart.java
@@ -11,18 +11,18 @@
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Adapted code from the class diagram

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.custom.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.custom.edit.parts;

 

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.figure.edge.DashedEdgeFigure;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DependencyNodeEditPart;

+import org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyNodeEditPart;

 

 /**

  * this branch dependency can change its arrow

  * 

  */

 

-public class CustomDependencyBranchEditPart extends org.eclipse.papyrus.diagram.profile.edit.parts.DependencyBranchEditPart {

+public class CustomDependencyBranchEditPart extends org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyBranchEditPart {

 

 	/**

 	 * 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/edit/parts/CustomDependencyNodeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/edit/parts/CustomDependencyNodeEditPart.java
index ddb75b593fd..9ac99510b7c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/edit/parts/CustomDependencyNodeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/edit/parts/CustomDependencyNodeEditPart.java
@@ -11,13 +11,13 @@
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Adapted code from the class diagram

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.custom.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.custom.edit.parts;

 

 import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.figure.node.AssociationNodeFigure;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DependencyNodeEditPart;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.AssociationNodeFigure;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyNodeEditPart;

 

 /**

  * this a specific editpart used to overload the method createNodePlate

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/edit/parts/CustomModelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/edit/parts/CustomModelEditPart.java
index b42c818fd15..76343a8b875 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/edit/parts/CustomModelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/edit/parts/CustomModelEditPart.java
@@ -10,16 +10,16 @@
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Adapted code from the class diagram

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.custom.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.custom.edit.parts;

 

 import org.eclipse.draw2d.IFigure;

 import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.Activator;

-import org.eclipse.papyrus.diagram.common.figure.node.PackageFigure;

-import org.eclipse.papyrus.diagram.common.figure.node.PackageNodePlateFigure;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ModelEditPartTN;

+import org.eclipse.papyrus.uml.diagram.common.Activator;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.PackageFigure;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.PackageNodePlateFigure;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ModelEditPartTN;

 

 /**

  * this a specific editpart used to overload the method createNodePlate

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/edit/parts/CustomModelEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/edit/parts/CustomModelEditPartCN.java
index c09eacd5ea3..61673915eb1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/edit/parts/CustomModelEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/edit/parts/CustomModelEditPartCN.java
@@ -11,16 +11,16 @@
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Adapted code from the class diagram 

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.custom.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.custom.edit.parts;

 

 import org.eclipse.draw2d.IFigure;

 import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.Activator;

-import org.eclipse.papyrus.diagram.common.figure.node.PackageFigure;

-import org.eclipse.papyrus.diagram.common.figure.node.PackageNodePlateFigure;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ModelEditPartCN;

+import org.eclipse.papyrus.uml.diagram.common.Activator;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.PackageFigure;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.PackageNodePlateFigure;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ModelEditPartCN;

 

 /**

  * this a specific editpart used to overload the method createNodePlate

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/edit/parts/CustomPackageEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/edit/parts/CustomPackageEditPart.java
index 5d072cea071..1ec1d7e7951 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/edit/parts/CustomPackageEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/edit/parts/CustomPackageEditPart.java
@@ -11,13 +11,13 @@
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Adapted code from the class diagram

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.custom.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.custom.edit.parts;

 

 import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.figure.node.PackageNodePlateFigure;

-import org.eclipse.papyrus.diagram.profile.edit.parts.PackageEditPart;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.PackageNodePlateFigure;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PackageEditPart;

 

 /**

  * this a specific editpart used to overload the method createNodePlate

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/edit/parts/CustomPackageEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/edit/parts/CustomPackageEditPartCN.java
index c85b101bf93..a3a997561fb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/edit/parts/CustomPackageEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/edit/parts/CustomPackageEditPartCN.java
@@ -11,13 +11,13 @@
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Adapted code from the class diagram

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.custom.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.custom.edit.parts;

 

 import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.figure.node.PackageNodePlateFigure;

-import org.eclipse.papyrus.diagram.profile.edit.parts.PackageEditPartCN;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.PackageNodePlateFigure;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PackageEditPartCN;

 

 /**

  * this a specific editpart used to overload the method createNodePlate

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/edit/parts/CustomProfileEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/edit/parts/CustomProfileEditPartCN.java
index 76833284ae4..ce77275f00e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/edit/parts/CustomProfileEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/edit/parts/CustomProfileEditPartCN.java
@@ -10,13 +10,13 @@
  * Contributors:

  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.custom.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.custom.edit.parts;

 

 import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.figure.node.PackageNodePlateFigure;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfileEditPartCN;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.PackageNodePlateFigure;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileEditPartCN;

 

 /**

  * this a specific editpart used to overload the method createNodePlate

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/edit/parts/CustomProfileEditPartTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/edit/parts/CustomProfileEditPartTN.java
index 0ccfbcb45fa..459e150d607 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/edit/parts/CustomProfileEditPartTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/edit/parts/CustomProfileEditPartTN.java
@@ -10,13 +10,13 @@
  * Contributors:

  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr 

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.custom.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.custom.edit.parts;

 

 import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.figure.node.PackageNodePlateFigure;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfileEditPartTN;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.PackageNodePlateFigure;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileEditPartTN;

 

 /**

  * this a specific editpart used to overload the method createNodePlate

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/factory/CustomUMLeditPartFactory.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/factory/CustomUMLeditPartFactory.java
index 5ee6b503878..975a88c18eb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/factory/CustomUMLeditPartFactory.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/factory/CustomUMLeditPartFactory.java
@@ -11,34 +11,34 @@
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Adapted code from the class diagram 

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.custom.factory;

+package org.eclipse.papyrus.uml.diagram.profile.custom.factory;

 

 import org.eclipse.gef.EditPart;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.profile.custom.edit.parts.AssociationEndSourceEditPart;

-import org.eclipse.papyrus.diagram.profile.custom.edit.parts.AssociationEndTargetEditPart;

-import org.eclipse.papyrus.diagram.profile.custom.edit.parts.CustomAssociationNodeEditPart;

-import org.eclipse.papyrus.diagram.profile.custom.edit.parts.CustomDependencyBranchEditPart;

-import org.eclipse.papyrus.diagram.profile.custom.edit.parts.CustomDependencyNodeEditPart;

-import org.eclipse.papyrus.diagram.profile.custom.edit.parts.CustomModelEditPart;

-import org.eclipse.papyrus.diagram.profile.custom.edit.parts.CustomModelEditPartCN;

-import org.eclipse.papyrus.diagram.profile.custom.edit.parts.CustomPackageEditPart;

-import org.eclipse.papyrus.diagram.profile.custom.edit.parts.CustomPackageEditPartCN;

-import org.eclipse.papyrus.diagram.profile.custom.edit.parts.CustomProfileEditPartCN;

-import org.eclipse.papyrus.diagram.profile.custom.edit.parts.CustomProfileEditPartTN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationNodeEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationRoleSourceEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationRoleTargetEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DependencyNodeEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ModelEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ModelEditPartTN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.PackageEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.PackageEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfileEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfileEditPartTN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.UMLEditPartFactory;

-import org.eclipse.papyrus.diagram.profile.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.profile.custom.edit.parts.AssociationEndSourceEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.custom.edit.parts.AssociationEndTargetEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.custom.edit.parts.CustomAssociationNodeEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.custom.edit.parts.CustomDependencyBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.custom.edit.parts.CustomDependencyNodeEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.custom.edit.parts.CustomModelEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.custom.edit.parts.CustomModelEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.custom.edit.parts.CustomPackageEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.custom.edit.parts.CustomPackageEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.custom.edit.parts.CustomProfileEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.custom.edit.parts.CustomProfileEditPartTN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationNodeEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationRoleSourceEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationRoleTargetEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyNodeEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ModelEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ModelEditPartTN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PackageEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PackageEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileEditPartTN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.UMLEditPartFactory;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry;

 

 /**

  * this is custom editpart factory to create our own editpart

@@ -47,7 +47,7 @@ public class CustomUMLeditPartFactory extends UMLEditPartFactory {
 

 	/**

 	 * 

-	 * @see org.eclipse.papyrus.diagram.profile.edit.parts.UMLEditPartFactory#createEditPart(org.eclipse.gef.EditPart, java.lang.Object)

+	 * @see org.eclipse.papyrus.uml.diagram.profile.edit.parts.UMLEditPartFactory#createEditPart(org.eclipse.gef.EditPart, java.lang.Object)

 	 * 

 	 * @param context

 	 * @param model

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/figure/AssociationFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/figure/AssociationFigure.java
index 79d912f3b7a..35f64a81e14 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/figure/AssociationFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/figure/AssociationFigure.java
@@ -11,7 +11,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Imported code from the class diagram

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.custom.figure;

+package org.eclipse.papyrus.uml.diagram.profile.custom.figure;

 

 import org.eclipse.draw2d.Graphics;

 import org.eclipse.draw2d.PolygonDecoration;

@@ -19,7 +19,7 @@ import org.eclipse.draw2d.PolylineDecoration;
 import org.eclipse.draw2d.RotatableDecoration;

 import org.eclipse.draw2d.geometry.PointList;

 import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

-import org.eclipse.papyrus.diagram.common.figure.edge.UMLEdgeFigure;

+import org.eclipse.papyrus.uml.diagram.common.figure.edge.UMLEdgeFigure;

 import org.eclipse.swt.SWT;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/figure/ExtensionFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/figure/ExtensionFigure.java
index 7038462d4ca..bdba98c7cc1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/figure/ExtensionFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/figure/ExtensionFigure.java
@@ -12,12 +12,12 @@
  *

  *****************************************************************************/

 

-package org.eclipse.papyrus.diagram.profile.custom.figure;

+package org.eclipse.papyrus.uml.diagram.profile.custom.figure;

 

 import org.eclipse.draw2d.ColorConstants;

 import org.eclipse.draw2d.Graphics;

 import org.eclipse.draw2d.PolygonDecoration;

-import org.eclipse.papyrus.diagram.common.figure.edge.UMLEdgeFigure;

+import org.eclipse.papyrus.uml.diagram.common.figure.edge.UMLEdgeFigure;

 

 /**

  * ExtensionFigure

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/figure/StereotypeFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/figure/StereotypeFigure.java
index 0e7d340c24b..a5bff80c6fe 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/figure/StereotypeFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/figure/StereotypeFigure.java
@@ -11,9 +11,9 @@
  *    Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.custom.figure;

+package org.eclipse.papyrus.uml.diagram.profile.custom.figure;

 

-import org.eclipse.papyrus.diagram.common.figure.node.ClassifierFigure;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ClassifierFigure;

 

 /**

  * Figure for representation of Stereotype

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/helper/AssociationEndSourceLabelHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/helper/AssociationEndSourceLabelHelper.java
index 20c9a12353c..582dc8e99a9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/helper/AssociationEndSourceLabelHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/helper/AssociationEndSourceLabelHelper.java
@@ -11,14 +11,14 @@
  *  Patrick Tessier (CEA LIST) - Initial API and implementation

  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Adapted code from Class Diagram

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.custom.helper;

+package org.eclipse.papyrus.uml.diagram.profile.custom.helper;

 

 import java.util.Iterator;

 

 import org.eclipse.gef.GraphicalEditPart;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.helper.PropertyLabelHelper;

+import org.eclipse.papyrus.uml.diagram.common.helper.PropertyLabelHelper;

 import org.eclipse.uml2.uml.Association;

 import org.eclipse.uml2.uml.Classifier;

 import org.eclipse.uml2.uml.Property;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/helper/AssociationEndTargetLabelHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/helper/AssociationEndTargetLabelHelper.java
index 93697ef4e62..831073983d3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/helper/AssociationEndTargetLabelHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/helper/AssociationEndTargetLabelHelper.java
@@ -11,14 +11,14 @@
  *  Patrick Tessier (CEA LIST) - Initial API and implementation

  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Adapted code from Class Diagram

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.custom.helper;

+package org.eclipse.papyrus.uml.diagram.profile.custom.helper;

 

 import java.util.Iterator;

 

 import org.eclipse.gef.GraphicalEditPart;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.helper.PropertyLabelHelper;

+import org.eclipse.papyrus.uml.diagram.common.helper.PropertyLabelHelper;

 import org.eclipse.uml2.uml.Association;

 import org.eclipse.uml2.uml.Classifier;

 import org.eclipse.uml2.uml.Property;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/helper/DiagramHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/helper/DiagramHelper.java
index 3a348ed43cd..5a4cd544a1e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/helper/DiagramHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/helper/DiagramHelper.java
@@ -13,11 +13,11 @@
  *****************************************************************************/

 

 

-package org.eclipse.papyrus.diagram.profile.custom.helper;

+package org.eclipse.papyrus.uml.diagram.profile.custom.helper;

 

 import org.eclipse.gmf.runtime.notation.Diagram;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.helper.ElementHelper;

+import org.eclipse.papyrus.uml.diagram.common.helper.ElementHelper;

 import org.eclipse.uml2.uml.Profile;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/helper/ExtensionHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/helper/ExtensionHelper.java
index 8e2b9091fa1..1b78d8b0ff6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/helper/ExtensionHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/helper/ExtensionHelper.java
@@ -12,7 +12,7 @@
  *

  *****************************************************************************/

 

-package org.eclipse.papyrus.diagram.profile.custom.helper;

+package org.eclipse.papyrus.uml.diagram.profile.custom.helper;

 

 import java.util.ArrayList;

 import java.util.List;

@@ -32,14 +32,14 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.core.editor.CoreMultiDiagramEditor;

 import org.eclipse.papyrus.commands.wrappers.EMFtoGEFCommandWrapper;

-import org.eclipse.papyrus.diagram.common.helper.ElementHelper;

-import org.eclipse.papyrus.diagram.common.helper.NamedElementHelper;

-import org.eclipse.papyrus.diagram.common.util.DiagramEditPartsUtil;

-import org.eclipse.papyrus.diagram.common.util.MDTUtil;

-import org.eclipse.papyrus.diagram.common.util.Util;

-import org.eclipse.papyrus.diagram.profile.custom.policies.ExtensionCustomNameEditPolicy;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ExtensionEditPart;

 import org.eclipse.papyrus.editor.PapyrusMultiDiagramEditor;

+import org.eclipse.papyrus.uml.diagram.common.helper.ElementHelper;

+import org.eclipse.papyrus.uml.diagram.common.helper.NamedElementHelper;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.common.util.MDTUtil;

+import org.eclipse.papyrus.uml.diagram.common.util.Util;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.ExtensionCustomNameEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ExtensionEditPart;

 import org.eclipse.ui.IEditorPart;

 import org.eclipse.ui.PlatformUI;

 import org.eclipse.uml2.uml.AggregationKind;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/helper/MetaclassHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/helper/MetaclassHelper.java
index 696c6963802..8a29efeb0d8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/helper/MetaclassHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/helper/MetaclassHelper.java
@@ -14,7 +14,7 @@
 

 

 

-package org.eclipse.papyrus.diagram.profile.custom.helper;

+package org.eclipse.papyrus.uml.diagram.profile.custom.helper;

 

 import org.eclipse.emf.common.util.EList;

 import org.eclipse.emf.ecore.EObject;

@@ -26,10 +26,10 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.notation.Diagram;

 import org.eclipse.gmf.runtime.notation.Node;

-import org.eclipse.papyrus.diagram.common.helper.ElementHelper;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfileDiagramEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfilePackageableElementCompartmentEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfilePackageableElementCompartmentEditPartTN;

+import org.eclipse.papyrus.uml.diagram.common.helper.ElementHelper;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfilePackageableElementCompartmentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfilePackageableElementCompartmentEditPartTN;

 import org.eclipse.uml2.uml.ElementImport;

 import org.eclipse.uml2.uml.Extension;

 import org.eclipse.uml2.uml.ExtensionEnd;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/helper/MultiAssociationHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/helper/MultiAssociationHelper.java
index f6b9dffb65f..d9dda1ff85d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/helper/MultiAssociationHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/helper/MultiAssociationHelper.java
@@ -11,7 +11,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Adapted code from Class Diagram

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.custom.helper;

+package org.eclipse.papyrus.uml.diagram.profile.custom.helper;

 

 import java.util.ArrayList;

 import java.util.Collection;

@@ -49,15 +49,15 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.commands.DeleteLinkDuringCreationCommand;

-import org.eclipse.papyrus.diagram.common.commands.SemanticAdapter;

-import org.eclipse.papyrus.diagram.common.helper.ElementHelper;

-import org.eclipse.papyrus.diagram.profile.custom.commands.AssociationDiamondViewCreateCommand;

-import org.eclipse.papyrus.diagram.profile.custom.commands.PropertyCommandForAssociation;

-import org.eclipse.papyrus.diagram.profile.custom.providers.CustomDeferredCreateConnectionViewCommand;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationBranchEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationNodeEditPart;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.common.commands.DeleteLinkDuringCreationCommand;

+import org.eclipse.papyrus.uml.diagram.common.commands.SemanticAdapter;

+import org.eclipse.papyrus.uml.diagram.common.helper.ElementHelper;

+import org.eclipse.papyrus.uml.diagram.profile.custom.commands.AssociationDiamondViewCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.custom.commands.PropertyCommandForAssociation;

+import org.eclipse.papyrus.uml.diagram.profile.custom.providers.CustomDeferredCreateConnectionViewCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationNodeEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 import org.eclipse.uml2.uml.Association;

 import org.eclipse.uml2.uml.Classifier;

 import org.eclipse.uml2.uml.NamedElement;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/helper/MultiDependencyHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/helper/MultiDependencyHelper.java
index 3272ad41139..82317ed53fd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/helper/MultiDependencyHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/helper/MultiDependencyHelper.java
@@ -11,7 +11,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Adapted code from the class diagram

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.custom.helper;

+package org.eclipse.papyrus.uml.diagram.profile.custom.helper;

 

 import java.util.ArrayList;

 import java.util.Collection;

@@ -48,14 +48,14 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.commands.DeleteLinkDuringCreationCommand;

-import org.eclipse.papyrus.diagram.common.commands.SemanticAdapter;

-import org.eclipse.papyrus.diagram.common.helper.ElementHelper;

-import org.eclipse.papyrus.diagram.profile.custom.commands.DependencyDiamondViewCreateCommand;

-import org.eclipse.papyrus.diagram.profile.custom.providers.CustomDeferredCreateConnectionViewCommand;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DependencyNodeEditPart;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.common.commands.DeleteLinkDuringCreationCommand;

+import org.eclipse.papyrus.uml.diagram.common.commands.SemanticAdapter;

+import org.eclipse.papyrus.uml.diagram.common.helper.ElementHelper;

+import org.eclipse.papyrus.uml.diagram.profile.custom.commands.DependencyDiamondViewCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.custom.providers.CustomDeferredCreateConnectionViewCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyNodeEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 import org.eclipse.uml2.uml.Dependency;

 import org.eclipse.uml2.uml.NamedElement;

 import org.eclipse.uml2.uml.UMLPackage;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/helper/ProfileDiagramAssociationHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/helper/ProfileDiagramAssociationHelper.java
index 865d50f087e..a0894d4c6b3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/helper/ProfileDiagramAssociationHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/helper/ProfileDiagramAssociationHelper.java
@@ -11,7 +11,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Adapted code from Class Diagram

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.custom.helper;

+package org.eclipse.papyrus.uml.diagram.profile.custom.helper;

 

 import java.awt.Container;

 import java.util.List;

@@ -21,11 +21,11 @@ import org.eclipse.emf.transaction.TransactionalEditingDomain;
 import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

 import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.diagram.common.helper.NamedElementHelper;

-import org.eclipse.papyrus.diagram.profile.custom.commands.PropertyCommandForAssociation;

-import org.eclipse.papyrus.diagram.profile.providers.ElementInitializers;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

 import org.eclipse.papyrus.ui.toolbox.LookForElement;

+import org.eclipse.papyrus.uml.diagram.common.helper.NamedElementHelper;

+import org.eclipse.papyrus.uml.diagram.profile.custom.commands.PropertyCommandForAssociation;

+import org.eclipse.papyrus.uml.diagram.profile.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 import org.eclipse.uml2.uml.Association;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.Property;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/helper/ProfileLinkMappingHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/helper/ProfileLinkMappingHelper.java
index f3c77a05d5f..8fdb6b9bc78 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/helper/ProfileLinkMappingHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/helper/ProfileLinkMappingHelper.java
@@ -13,16 +13,16 @@
  *  	refactor common behavior between diagrams, define only specific behavior

  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Adapted code from the class diagram 

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.custom.helper;

+package org.eclipse.papyrus.uml.diagram.profile.custom.helper;

 

 import java.util.ArrayList;

 import java.util.Collection;

 import java.util.Iterator;

 

-import org.eclipse.papyrus.diagram.common.helper.ILinkMappingHelper;

-import org.eclipse.papyrus.diagram.common.helper.LinkMappingHelper;

-import org.eclipse.papyrus.diagram.common.helper.LinkMappingHelper.CommonSourceUMLSwitch;

-import org.eclipse.papyrus.diagram.common.helper.LinkMappingHelper.CommonTargetUMLSwitch;

+import org.eclipse.papyrus.uml.diagram.common.helper.ILinkMappingHelper;

+import org.eclipse.papyrus.uml.diagram.common.helper.LinkMappingHelper;

+import org.eclipse.papyrus.uml.diagram.common.helper.LinkMappingHelper.CommonSourceUMLSwitch;

+import org.eclipse.papyrus.uml.diagram.common.helper.LinkMappingHelper.CommonTargetUMLSwitch;

 import org.eclipse.uml2.uml.Element;

 import org.eclipse.uml2.uml.ExtensionEnd;

 import org.eclipse.uml2.uml.Property;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/helper/StereotypeHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/helper/StereotypeHelper.java
index 1d54d362b7e..7ed8964a3e4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/helper/StereotypeHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/helper/StereotypeHelper.java
@@ -13,7 +13,7 @@
  *****************************************************************************/

 

 

-package org.eclipse.papyrus.diagram.profile.custom.helper;

+package org.eclipse.papyrus.uml.diagram.profile.custom.helper;

 

 import org.eclipse.emf.common.util.EList;

 import org.eclipse.gef.commands.Command;

@@ -23,7 +23,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;

-import org.eclipse.papyrus.diagram.common.helper.ElementHelper;

+import org.eclipse.papyrus.uml.diagram.common.helper.ElementHelper;

 import org.eclipse.uml2.uml.Association;

 import org.eclipse.uml2.uml.Extension;

 import org.eclipse.uml2.uml.ExtensionEnd;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/messages/Messages.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/messages/Messages.java
index a6916760cb8..ca8484a522e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/messages/Messages.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/messages/Messages.java
@@ -13,13 +13,13 @@
  *****************************************************************************/

 

 

-package org.eclipse.papyrus.diagram.profile.custom.messages;

+package org.eclipse.papyrus.uml.diagram.profile.custom.messages;

 

 import org.eclipse.osgi.util.NLS;

 

 public class Messages extends NLS {

 

-	private static final String BUNDLE_NAME = "org.eclipse.papyrus.diagram.profile.custom.messages.messages"; //$NON-NLS-1$

+	private static final String BUNDLE_NAME = "org.eclipse.papyrus.uml.diagram.profile.custom.messages.messages"; //$NON-NLS-1$

 

 	public static String CustomSemanticCreateCommand_MetaclassImport0;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/messages/messages.properties b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/messages/messages.properties
index 0f18c197b75..0f18c197b75 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/messages/messages.properties
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/messages/messages.properties
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/policies/AppliedStereotypeElementImportLabelDisplayEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/AppliedStereotypeElementImportLabelDisplayEditPolicy.java
index 4a631102d60..9943a974872 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/policies/AppliedStereotypeElementImportLabelDisplayEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/AppliedStereotypeElementImportLabelDisplayEditPolicy.java
@@ -11,9 +11,9 @@
  *  Remi Schnekenburger (CEA LIST) - Initial API and implementation

  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Adapted code from the class diagram

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.custom.policies;

+package org.eclipse.papyrus.uml.diagram.profile.custom.policies;

 

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

 import org.eclipse.uml2.uml.ElementImport;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/policies/AppliedStereotypeOperationDisplayEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/AppliedStereotypeOperationDisplayEditPolicy.java
index 1f709f5ceaf..32d49caf625 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/policies/AppliedStereotypeOperationDisplayEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/AppliedStereotypeOperationDisplayEditPolicy.java
@@ -11,11 +11,11 @@
  *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation

  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - adapted code from the class diagram

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.custom.policies;

+package org.eclipse.papyrus.uml.diagram.profile.custom.policies;

 

 import org.eclipse.gef.GraphicalEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.helper.OperationLabelHelper;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.helper.OperationLabelHelper;

 import org.eclipse.uml2.uml.Operation;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/policies/AppliedStereotypePackageImportLabelDisplayEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/AppliedStereotypePackageImportLabelDisplayEditPolicy.java
index 97c541a246a..6aaaa2096b8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/policies/AppliedStereotypePackageImportLabelDisplayEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/AppliedStereotypePackageImportLabelDisplayEditPolicy.java
@@ -11,9 +11,9 @@
  *  Remi Schnekenburger (CEA LIST) - Initial API and implementation

  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Adapted code from the class diagram 

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.custom.policies;

+package org.eclipse.papyrus.uml.diagram.profile.custom.policies;

 

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

 import org.eclipse.uml2.uml.PackageImport;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/policies/AppliedStereotypePropertyDisplayEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/AppliedStereotypePropertyDisplayEditPolicy.java
index c29cbfd88fa..fe1d8643cb1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/policies/AppliedStereotypePropertyDisplayEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/AppliedStereotypePropertyDisplayEditPolicy.java
@@ -11,11 +11,11 @@
  *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation

  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Adapted code from the class diagram 

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.custom.policies;

+package org.eclipse.papyrus.uml.diagram.profile.custom.policies;

 

 import org.eclipse.gef.GraphicalEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.helper.PropertyLabelHelper;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.helper.PropertyLabelHelper;

 import org.eclipse.uml2.uml.Property;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/policies/CUMLBaseItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/CUMLBaseItemSemanticEditPolicy.java
index 814d74d2add..0c27b9f0f61 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/policies/CUMLBaseItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/CUMLBaseItemSemanticEditPolicy.java
@@ -13,11 +13,11 @@
  *****************************************************************************/

 

 

-package org.eclipse.papyrus.diagram.profile.custom.policies;

+package org.eclipse.papyrus.uml.diagram.profile.custom.policies;

 

 import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.papyrus.diagram.profile.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.profile.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;

 import org.eclipse.uml2.uml.Class;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.Stereotype;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/policies/CustomCreationRoleEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/CustomCreationRoleEditPolicy.java
index 3f6be9ece83..cb2b7e26990 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/policies/CustomCreationRoleEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/CustomCreationRoleEditPolicy.java
@@ -12,7 +12,7 @@
  *

  *****************************************************************************/

 

-package org.eclipse.papyrus.diagram.profile.custom.policies;

+package org.eclipse.papyrus.uml.diagram.profile.custom.policies;

 

 import java.util.ArrayList;

 import java.util.Iterator;

@@ -49,19 +49,19 @@ import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalC
 import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.util.DiagramEditPartsUtil;

-import org.eclipse.papyrus.diagram.profile.custom.commands.CustomMetaClassCreateCommand;

-import org.eclipse.papyrus.diagram.profile.custom.commands.CustomSemanticCreateCommand;

-import org.eclipse.papyrus.diagram.profile.custom.helper.MetaclassHelper;

-import org.eclipse.papyrus.diagram.profile.custom.requests.CustomCreateElementRequestAdapter;

-import org.eclipse.papyrus.diagram.profile.custom.requests.CustomCreateViewAndElementRequest;

-import org.eclipse.papyrus.diagram.profile.custom.requests.CustomCreateViewAndElementRequest.ViewAndElementDescriptor;

-import org.eclipse.papyrus.diagram.profile.custom.requests.CustomCreateViewRequest;

-import org.eclipse.papyrus.diagram.profile.edit.parts.MetaclassEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.MetaclassEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfileDiagramEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfilePackageableElementCompartmentEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfilePackageableElementCompartmentEditPartTN;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.profile.custom.commands.CustomMetaClassCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.custom.commands.CustomSemanticCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.custom.helper.MetaclassHelper;

+import org.eclipse.papyrus.uml.diagram.profile.custom.requests.CustomCreateElementRequestAdapter;

+import org.eclipse.papyrus.uml.diagram.profile.custom.requests.CustomCreateViewAndElementRequest;

+import org.eclipse.papyrus.uml.diagram.profile.custom.requests.CustomCreateViewRequest;

+import org.eclipse.papyrus.uml.diagram.profile.custom.requests.CustomCreateViewAndElementRequest.ViewAndElementDescriptor;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.MetaclassEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.MetaclassEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfilePackageableElementCompartmentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfilePackageableElementCompartmentEditPartTN;

 import org.eclipse.uml2.uml.Class;

 import org.eclipse.uml2.uml.ElementImport;

 import org.eclipse.uml2.uml.Profile;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/policies/CustomGraphicalNodeEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/CustomGraphicalNodeEditPolicy.java
index f0128c9de5e..89d6142a053 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/policies/CustomGraphicalNodeEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/CustomGraphicalNodeEditPolicy.java
@@ -11,7 +11,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Adapted code from the class diagram 

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.custom.policies;

+package org.eclipse.papyrus.uml.diagram.profile.custom.policies;

 

 import org.eclipse.emf.transaction.TransactionalEditingDomain;

 import org.eclipse.gef.Request;

@@ -24,9 +24,9 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewAndElemen
 import org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewRequest;

 import org.eclipse.gmf.runtime.diagram.ui.requests.CreateUnspecifiedTypeConnectionRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.papyrus.diagram.profile.custom.helper.MultiAssociationHelper;

-import org.eclipse.papyrus.diagram.profile.custom.helper.MultiDependencyHelper;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.custom.helper.MultiAssociationHelper;

+import org.eclipse.papyrus.uml.diagram.profile.custom.helper.MultiDependencyHelper;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 

 /**

  * This class is used to launch command to create associationClass

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/policies/DisplayAssociationEndEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/DisplayAssociationEndEditPolicy.java
index d69ff5295f8..ee0bff79225 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/policies/DisplayAssociationEndEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/DisplayAssociationEndEditPolicy.java
@@ -11,7 +11,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Adapted code from Class Diagram

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.custom.policies;

+package org.eclipse.papyrus.uml.diagram.profile.custom.policies;

 

 import java.util.Collection;

 import java.util.List;

@@ -24,12 +24,12 @@ import org.eclipse.gef.GraphicalEditPart;
 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.common.editpolicies.AbstractMaskManagedEditPolicy;

-import org.eclipse.papyrus.diagram.common.helper.PropertyLabelHelper;

-import org.eclipse.papyrus.diagram.profile.custom.preferences.IPapyrusPropertyPreferencesConstant;

-import org.eclipse.papyrus.diagram.profile.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.umlutils.ICustomAppearence;

-import org.eclipse.papyrus.umlutils.ui.VisualInformationPapyrusConstant;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractMaskManagedEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.helper.PropertyLabelHelper;

+import org.eclipse.papyrus.uml.diagram.profile.custom.preferences.IPapyrusPropertyPreferencesConstant;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.tools.utils.ICustomAppearence;

+import org.eclipse.papyrus.uml.tools.utils.ui.VisualInformationPapyrusConstant;

 import org.eclipse.uml2.uml.Element;

 import org.eclipse.uml2.uml.Property;

 import org.eclipse.uml2.uml.Type;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/policies/DisplayAssociationEndSourceEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/DisplayAssociationEndSourceEditPolicy.java
index d81d922a25f..ee7cb5d9e26 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/policies/DisplayAssociationEndSourceEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/DisplayAssociationEndSourceEditPolicy.java
@@ -11,9 +11,9 @@
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Adapted code from Class Diagram

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.custom.policies;

+package org.eclipse.papyrus.uml.diagram.profile.custom.policies;

 

-import org.eclipse.papyrus.diagram.profile.custom.helper.AssociationEndSourceLabelHelper;

+import org.eclipse.papyrus.uml.diagram.profile.custom.helper.AssociationEndSourceLabelHelper;

 

 /**

  * Mask Managed label edit policy for association ends (source role)

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/policies/DisplayAssociationEndSourceMultiplicityEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/DisplayAssociationEndSourceMultiplicityEditPolicy.java
index ee1324978ca..33821942c98 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/policies/DisplayAssociationEndSourceMultiplicityEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/DisplayAssociationEndSourceMultiplicityEditPolicy.java
@@ -11,9 +11,9 @@
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Adapted code from Class Diagram

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.custom.policies;

+package org.eclipse.papyrus.uml.diagram.profile.custom.policies;

 

-import org.eclipse.papyrus.umlutils.ICustomAppearence;

+import org.eclipse.papyrus.uml.tools.utils.ICustomAppearence;

 

 /**

  * this class enables to refresh the multiplicity label of the association end (source)

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/policies/DisplayAssociationEndTargetEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/DisplayAssociationEndTargetEditPolicy.java
index 0913e87ad79..fed671b2ceb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/policies/DisplayAssociationEndTargetEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/DisplayAssociationEndTargetEditPolicy.java
@@ -11,9 +11,9 @@
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Adapted code from Class Diagram

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.custom.policies;

+package org.eclipse.papyrus.uml.diagram.profile.custom.policies;

 

-import org.eclipse.papyrus.diagram.profile.custom.helper.AssociationEndTargetLabelHelper;

+import org.eclipse.papyrus.uml.diagram.profile.custom.helper.AssociationEndTargetLabelHelper;

 

 /**

  * Mask Managed label edit policy for association ends (target role)

@@ -22,7 +22,7 @@ public class DisplayAssociationEndTargetEditPolicy extends DisplayAssociationEnd
 

 	/**

 	 * 

-	 * @see org.eclipse.papyrus.diagram.profile.custom.policies.DisplayAssociationEndEditPolicy#addAdditionalListeners()

+	 * @see org.eclipse.papyrus.uml.diagram.profile.custom.policies.DisplayAssociationEndEditPolicy#addAdditionalListeners()

 	 * 

 	 */

 	@Override

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/policies/DisplayAssociationEndTargetMultiplicityEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/DisplayAssociationEndTargetMultiplicityEditPolicy.java
index ddcd7500efb..3a00d49c531 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/policies/DisplayAssociationEndTargetMultiplicityEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/DisplayAssociationEndTargetMultiplicityEditPolicy.java
@@ -11,9 +11,9 @@
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Adapted code from Class Diagram

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.custom.policies;

+package org.eclipse.papyrus.uml.diagram.profile.custom.policies;

 

-import org.eclipse.papyrus.umlutils.ICustomAppearence;

+import org.eclipse.papyrus.uml.tools.utils.ICustomAppearence;

 

 /**

  * this class enables to refresh the multiplicity label of the association end (target)

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/policies/ExtensionCustomNameEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/ExtensionCustomNameEditPolicy.java
index d36c521482b..3c33d177ab2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/policies/ExtensionCustomNameEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/ExtensionCustomNameEditPolicy.java
@@ -12,7 +12,7 @@
  *

  *****************************************************************************/

 

-package org.eclipse.papyrus.diagram.profile.custom.policies;

+package org.eclipse.papyrus.uml.diagram.profile.custom.policies;

 

 import org.eclipse.emf.common.notify.Notification;

 import org.eclipse.emf.ecore.EObject;

@@ -28,8 +28,8 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.core.listenerservice.IPapyrusListener;

 import org.eclipse.papyrus.core.utils.EditorUtils;

-import org.eclipse.papyrus.diagram.common.Activator;

-import org.eclipse.papyrus.diagram.profile.custom.helper.ExtensionHelper;

+import org.eclipse.papyrus.uml.diagram.common.Activator;

+import org.eclipse.papyrus.uml.diagram.profile.custom.helper.ExtensionHelper;

 import org.eclipse.swt.widgets.Display;

 import org.eclipse.uml2.uml.Element;

 import org.eclipse.uml2.uml.Extension;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/policies/OperationLabelEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/OperationLabelEditPolicy.java
index 08f3584223d..005a86feb3a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/policies/OperationLabelEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/OperationLabelEditPolicy.java
@@ -10,7 +10,7 @@
  *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation

  *	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Adapted code from the class diagram

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.custom.policies;

+package org.eclipse.papyrus.uml.diagram.profile.custom.policies;

 

 import java.util.Collection;

 import java.util.List;

@@ -22,12 +22,12 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gef.GraphicalEditPart;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.common.editpolicies.AbstractMaskManagedEditPolicy;

-import org.eclipse.papyrus.diagram.common.helper.OperationLabelHelper;

-import org.eclipse.papyrus.diagram.profile.custom.preferences.IPapyrusOperationPreferencesConstant;

-import org.eclipse.papyrus.diagram.profile.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.umlutils.ICustomAppearence;

-import org.eclipse.papyrus.umlutils.ui.VisualInformationPapyrusConstant;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractMaskManagedEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.helper.OperationLabelHelper;

+import org.eclipse.papyrus.uml.diagram.profile.custom.preferences.IPapyrusOperationPreferencesConstant;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.tools.utils.ICustomAppearence;

+import org.eclipse.papyrus.uml.tools.utils.ui.VisualInformationPapyrusConstant;

 import org.eclipse.uml2.uml.Operation;

 import org.eclipse.uml2.uml.Parameter;

 import org.eclipse.uml2.uml.Type;

@@ -127,7 +127,7 @@ public class OperationLabelEditPolicy extends AbstractMaskManagedEditPolicy {
 	 * {@inheritDoc}

 	 */

 	public String getPreferencePageID() {

-		return "org.eclipse.papyrus.diagram.profile.custom.preferences.OperationPreferencePage"; //$NON-NLS-1$

+		return "org.eclipse.papyrus.uml.diagram.profile.custom.preferences.OperationPreferencePage"; //$NON-NLS-1$

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/policies/ProfileDiagramDragDropEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/ProfileDiagramDragDropEditPolicy.java
index 95439888c28..bf280892a08 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/policies/ProfileDiagramDragDropEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/ProfileDiagramDragDropEditPolicy.java
@@ -11,7 +11,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Adapted code from the class diagram 

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.custom.policies;

+package org.eclipse.papyrus.uml.diagram.profile.custom.policies;

 

 import java.util.ArrayList;

 import java.util.Collection;

@@ -48,27 +48,27 @@ import org.eclipse.gmf.runtime.emf.type.core.IHintedType;
 import org.eclipse.gmf.runtime.notation.Diagram;

 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.commands.CommonDeferredCreateConnectionViewCommand;

-import org.eclipse.papyrus.diagram.common.commands.SemanticAdapter;

-import org.eclipse.papyrus.diagram.common.editpolicies.OldCommonDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.diagram.common.util.DiagramEditPartsUtil;

-import org.eclipse.papyrus.diagram.common.util.Util;

-import org.eclipse.papyrus.diagram.profile.custom.commands.SetStereotypeVisibleOnMetaclassCommand;

-import org.eclipse.papyrus.diagram.profile.custom.helper.ProfileLinkMappingHelper;

-import org.eclipse.papyrus.diagram.profile.custom.helper.MultiAssociationHelper;

-import org.eclipse.papyrus.diagram.profile.custom.helper.MultiDependencyHelper;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationNodeEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.CommentEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.CommentEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ConstraintEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ConstraintEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DependencyNodeEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ExtensionEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.MetaclassEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.MetaclassEditPartCN;

-import org.eclipse.papyrus.diagram.profile.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.common.commands.CommonDeferredCreateConnectionViewCommand;

+import org.eclipse.papyrus.uml.diagram.common.commands.SemanticAdapter;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.OldCommonDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.common.util.Util;

+import org.eclipse.papyrus.uml.diagram.profile.custom.commands.SetStereotypeVisibleOnMetaclassCommand;

+import org.eclipse.papyrus.uml.diagram.profile.custom.helper.MultiAssociationHelper;

+import org.eclipse.papyrus.uml.diagram.profile.custom.helper.MultiDependencyHelper;

+import org.eclipse.papyrus.uml.diagram.profile.custom.helper.ProfileLinkMappingHelper;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationNodeEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.CommentEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.CommentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ConstraintEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ConstraintEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyNodeEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ElementImportEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ExtensionEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.MetaclassEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.MetaclassEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 import org.eclipse.uml2.uml.Association;

 import org.eclipse.uml2.uml.Class;

 import org.eclipse.uml2.uml.Comment;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/policies/PropertyLabelEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/PropertyLabelEditPolicy.java
index 75f3bf388bd..404157f82cb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/policies/PropertyLabelEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/PropertyLabelEditPolicy.java
@@ -10,7 +10,7 @@
  *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation

  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Adapted code from the class diagram

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.custom.policies;

+package org.eclipse.papyrus.uml.diagram.profile.custom.policies;

 

 import java.util.Collection;

 import java.util.List;

@@ -22,12 +22,12 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gef.GraphicalEditPart;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.common.editpolicies.AbstractMaskManagedEditPolicy;

-import org.eclipse.papyrus.diagram.common.helper.PropertyLabelHelper;

-import org.eclipse.papyrus.diagram.profile.custom.preferences.IPapyrusPropertyPreferencesConstant;

-import org.eclipse.papyrus.diagram.profile.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.umlutils.ICustomAppearence;

-import org.eclipse.papyrus.umlutils.ui.VisualInformationPapyrusConstant;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractMaskManagedEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.helper.PropertyLabelHelper;

+import org.eclipse.papyrus.uml.diagram.profile.custom.preferences.IPapyrusPropertyPreferencesConstant;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.tools.utils.ICustomAppearence;

+import org.eclipse.papyrus.uml.tools.utils.ui.VisualInformationPapyrusConstant;

 import org.eclipse.uml2.uml.Property;

 import org.eclipse.uml2.uml.Type;

 import org.eclipse.uml2.uml.UMLPackage;

@@ -120,7 +120,7 @@ public class PropertyLabelEditPolicy extends AbstractMaskManagedEditPolicy {
 	}

 

 	public String getPreferencePageID() {

-		return "org.eclipse.papyrus.diagram.profile.custom.preferences.PropertyPreferencePage"; //$NON-NLS-1$

+		return "org.eclipse.papyrus.uml.diagram.profile.custom.preferences.PropertyPreferencePage"; //$NON-NLS-1$

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/policies/RemoveOrphanViewPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/RemoveOrphanViewPolicy.java
index 1209010f937..21a72b9694f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/policies/RemoveOrphanViewPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/RemoveOrphanViewPolicy.java
@@ -13,34 +13,34 @@
  *****************************************************************************/

 

 

-package org.eclipse.papyrus.diagram.profile.custom.policies;

+package org.eclipse.papyrus.uml.diagram.profile.custom.policies;

 

 import java.util.ArrayList;

 

 import org.eclipse.emf.common.util.EList;

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.editpolicies.OrphanViewPolicy;

-import org.eclipse.papyrus.diagram.profile.custom.helper.DiagramHelper;

-import org.eclipse.papyrus.diagram.profile.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DataTypeAttributeCompartmentEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DataTypeAttributeCompartmentEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DataTypeOperationCompartmentEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DataTypeOperationCompartmentEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.EnumerationEnumerationLiteralCompartmentEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.EnumerationEnumerationLiteralCompartmentEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.MetaclassEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.MetaclassEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ModelPackageableElementCompartmentEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ModelPackageableElementCompartmentEditPartTN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.PackagePackageableElementCompartmentEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.PackagePackageableElementCompartmentEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfilePackageableElementCompartmentEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfilePackageableElementCompartmentEditPartTN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.StereotypeAttributeCompartmentEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.StereotypeAttributeCompartmentEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.StereotypeOperationCompartmentEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.StereotypeOperationCompartmentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.OrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.custom.helper.DiagramHelper;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DataTypeAttributeCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DataTypeAttributeCompartmentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DataTypeOperationCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DataTypeOperationCompartmentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.EnumerationEnumerationLiteralCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.EnumerationEnumerationLiteralCompartmentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.MetaclassEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.MetaclassEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ModelPackageableElementCompartmentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ModelPackageableElementCompartmentEditPartTN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PackagePackageableElementCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PackagePackageableElementCompartmentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfilePackageableElementCompartmentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfilePackageableElementCompartmentEditPartTN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.StereotypeAttributeCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.StereotypeAttributeCompartmentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.StereotypeOperationCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.StereotypeOperationCompartmentEditPartCN;

 import org.eclipse.uml2.uml.Class;

 import org.eclipse.uml2.uml.ElementImport;

 import org.eclipse.uml2.uml.Profile;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/policies/itemsemantic/CustomAssociationBranchItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/itemsemantic/CustomAssociationBranchItemSemanticEditPolicy.java
index 4732ad7027c..08ff3c37437 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/policies/itemsemantic/CustomAssociationBranchItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/itemsemantic/CustomAssociationBranchItemSemanticEditPolicy.java
@@ -11,17 +11,17 @@
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Adapted code from Class Diagram

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.custom.policies.itemsemantic;

+package org.eclipse.papyrus.uml.diagram.profile.custom.policies.itemsemantic;

 

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gef.commands.UnexecutableCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.profile.custom.commands.CustomAssociationReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationBranchEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.policies.AssociationBranchItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.custom.commands.CustomAssociationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.AssociationBranchItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 

 /**

  * Custom item semantic editpolicy to call custom commands

@@ -35,14 +35,14 @@ public class CustomAssociationBranchItemSemanticEditPolicy extends AssociationBr
 	@Override

 	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

 		if(UMLElementTypes.Association_4001 == req.getElementType()) {

-			return getGEFWrapper(new org.eclipse.papyrus.diagram.profile.custom.commands.CustomAssociationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new org.eclipse.papyrus.uml.diagram.profile.custom.commands.CustomAssociationCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		return super.getCompleteCreateRelationshipCommand(req);

 	}

 

 	/**

 	 * 

-	 * @see org.eclipse.papyrus.diagram.profile.edit.policies.AssociationBranchItemSemanticEditPolicy#getReorientRelationshipCommand(org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest)

+	 * @see org.eclipse.papyrus.uml.diagram.profile.edit.policies.AssociationBranchItemSemanticEditPolicy#getReorientRelationshipCommand(org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest)

 	 * 

 	 * @param req

 	 * @return

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/policies/itemsemantic/CustomAssociationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/itemsemantic/CustomAssociationItemSemanticEditPolicy.java
index 7d1d1092282..ca77b1e9027 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/policies/itemsemantic/CustomAssociationItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/itemsemantic/CustomAssociationItemSemanticEditPolicy.java
@@ -11,7 +11,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Adapted code from Class Diagram

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.custom.policies.itemsemantic;

+package org.eclipse.papyrus.uml.diagram.profile.custom.policies.itemsemantic;

 

 import java.util.ArrayList;

 import java.util.List;

@@ -24,16 +24,16 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

 import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

-import org.eclipse.papyrus.diagram.profile.custom.commands.CustomAssociationReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.custom.commands.CustomAssociationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 import org.eclipse.uml2.uml.Association;

 import org.eclipse.uml2.uml.Property;

 

 /**

  * this a specialization to manage creation of association and associationClass

  */

-public class CustomAssociationItemSemanticEditPolicy extends org.eclipse.papyrus.diagram.profile.edit.policies.AssociationItemSemanticEditPolicy {

+public class CustomAssociationItemSemanticEditPolicy extends org.eclipse.papyrus.uml.diagram.profile.edit.policies.AssociationItemSemanticEditPolicy {

 

 	/**

 	 * 

@@ -42,14 +42,14 @@ public class CustomAssociationItemSemanticEditPolicy extends org.eclipse.papyrus
 	@Override

 	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

 		if(UMLElementTypes.Association_4001 == req.getElementType()) {

-			return getGEFWrapper(new org.eclipse.papyrus.diagram.profile.custom.commands.CustomAssociationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new org.eclipse.papyrus.uml.diagram.profile.custom.commands.CustomAssociationCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		return super.getCompleteCreateRelationshipCommand(req);

 	}

 

 	/**

 	 * 

-	 * @see org.eclipse.papyrus.diagram.profile.edit.policies.AssociationItemSemanticEditPolicy#getReorientRelationshipCommand(org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest)

+	 * @see org.eclipse.papyrus.uml.diagram.profile.edit.policies.AssociationItemSemanticEditPolicy#getReorientRelationshipCommand(org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest)

 	 * 

 	 * @param req

 	 * @return

@@ -93,7 +93,7 @@ public class CustomAssociationItemSemanticEditPolicy extends org.eclipse.papyrus
 	@Override

 	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

 		if(UMLElementTypes.Association_4001 == req.getElementType()) {

-			return getGEFWrapper(new org.eclipse.papyrus.diagram.profile.custom.commands.CustomAssociationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new org.eclipse.papyrus.uml.diagram.profile.custom.commands.CustomAssociationCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		return super.getStartCreateRelationshipCommand(req);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/policies/itemsemantic/CustomAssociationNodeItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/itemsemantic/CustomAssociationNodeItemSemanticEditPolicy.java
index c7306cf35b2..337afeaee7c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/policies/itemsemantic/CustomAssociationNodeItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/itemsemantic/CustomAssociationNodeItemSemanticEditPolicy.java
@@ -11,17 +11,17 @@
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Adapted code from Class Diagram

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.custom.policies.itemsemantic;

+package org.eclipse.papyrus.uml.diagram.profile.custom.policies.itemsemantic;

 

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gef.commands.UnexecutableCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.profile.custom.commands.CustomAssociationReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationBranchEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.policies.AssociationNodeItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.custom.commands.CustomAssociationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.AssociationNodeItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 

 /**

  * this a specialization to manage creation of association

@@ -35,14 +35,14 @@ public class CustomAssociationNodeItemSemanticEditPolicy extends AssociationNode
 	@Override

 	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

 		if(UMLElementTypes.Association_4001 == req.getElementType()) {

-			return getGEFWrapper(new org.eclipse.papyrus.diagram.profile.custom.commands.CustomAssociationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new org.eclipse.papyrus.uml.diagram.profile.custom.commands.CustomAssociationCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		return super.getCompleteCreateRelationshipCommand(req);

 	}

 

 	/**

 	 * 

-	 * @see org.eclipse.papyrus.diagram.profile.edit.policies.AssociationNodeItemSemanticEditPolicy#getReorientRelationshipCommand(org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest)

+	 * @see org.eclipse.papyrus.uml.diagram.profile.edit.policies.AssociationNodeItemSemanticEditPolicy#getReorientRelationshipCommand(org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest)

 	 * 

 	 * @param req

 	 * @return

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/policies/itemsemantic/CustomDataTypeItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/itemsemantic/CustomDataTypeItemSemanticEditPolicy.java
index 1f7bc41fb4a..51905c5feb6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/policies/itemsemantic/CustomDataTypeItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/itemsemantic/CustomDataTypeItemSemanticEditPolicy.java
@@ -11,16 +11,16 @@
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Adapted code from the class diagram

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.custom.policies.itemsemantic;

+package org.eclipse.papyrus.uml.diagram.profile.custom.policies.itemsemantic;

 

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gef.commands.UnexecutableCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.profile.custom.commands.CustomAssociationReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.policies.DataTypeItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.custom.commands.CustomAssociationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.DataTypeItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 

 /**

  * this a specialization to manage creation of association and associationClass

@@ -34,7 +34,7 @@ public class CustomDataTypeItemSemanticEditPolicy extends DataTypeItemSemanticEd
 	@Override

 	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

 		if(UMLElementTypes.Association_4001 == req.getElementType()) {

-			return getGEFWrapper(new org.eclipse.papyrus.diagram.profile.custom.commands.CustomAssociationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new org.eclipse.papyrus.uml.diagram.profile.custom.commands.CustomAssociationCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		return super.getCompleteCreateRelationshipCommand(req);

 	}

@@ -55,7 +55,7 @@ public class CustomDataTypeItemSemanticEditPolicy extends DataTypeItemSemanticEd
 	@Override

 	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

 		if(UMLElementTypes.Association_4001 == req.getElementType()) {

-			return getGEFWrapper(new org.eclipse.papyrus.diagram.profile.custom.commands.CustomAssociationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new org.eclipse.papyrus.uml.diagram.profile.custom.commands.CustomAssociationCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		//forbid creation of association branch from it.

 		if(UMLElementTypes.Association_4019 == req.getElementType()) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/policies/itemsemantic/CustomDataTypeItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/itemsemantic/CustomDataTypeItemSemanticEditPolicyCN.java
index 5a383e0998f..1af9590cf87 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/policies/itemsemantic/CustomDataTypeItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/itemsemantic/CustomDataTypeItemSemanticEditPolicyCN.java
@@ -11,16 +11,16 @@
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Adapted code from the class diagram

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.custom.policies.itemsemantic;

+package org.eclipse.papyrus.uml.diagram.profile.custom.policies.itemsemantic;

 

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gef.commands.UnexecutableCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.profile.custom.commands.CustomAssociationReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.policies.DataTypeItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.custom.commands.CustomAssociationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.DataTypeItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 

 /**

  * this a specialization to manage creation of association and associationClass

@@ -34,7 +34,7 @@ public class CustomDataTypeItemSemanticEditPolicyCN extends DataTypeItemSemantic
 	@Override

 	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

 		if(UMLElementTypes.Association_4001 == req.getElementType()) {

-			return getGEFWrapper(new org.eclipse.papyrus.diagram.profile.custom.commands.CustomAssociationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new org.eclipse.papyrus.uml.diagram.profile.custom.commands.CustomAssociationCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		return super.getCompleteCreateRelationshipCommand(req);

 	}

@@ -55,7 +55,7 @@ public class CustomDataTypeItemSemanticEditPolicyCN extends DataTypeItemSemantic
 	@Override

 	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

 		if(UMLElementTypes.Association_4001 == req.getElementType()) {

-			return getGEFWrapper(new org.eclipse.papyrus.diagram.profile.custom.commands.CustomAssociationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new org.eclipse.papyrus.uml.diagram.profile.custom.commands.CustomAssociationCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		//forbid creation of association branch from it.

 		if(UMLElementTypes.Association_4019 == req.getElementType()) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/policies/itemsemantic/CustomEnumerationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/itemsemantic/CustomEnumerationItemSemanticEditPolicy.java
index b0a1f248bfa..77cd877ad4e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/policies/itemsemantic/CustomEnumerationItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/itemsemantic/CustomEnumerationItemSemanticEditPolicy.java
@@ -11,16 +11,16 @@
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Adapted code from the class diagram

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.custom.policies.itemsemantic;

+package org.eclipse.papyrus.uml.diagram.profile.custom.policies.itemsemantic;

 

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gef.commands.UnexecutableCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.profile.custom.commands.CustomAssociationReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.policies.EnumerationItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.custom.commands.CustomAssociationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.EnumerationItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 

 /**

  * this a specialization to manage creation of association and associationClass

@@ -34,7 +34,7 @@ public class CustomEnumerationItemSemanticEditPolicy extends EnumerationItemSema
 	@Override

 	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

 		if(UMLElementTypes.Association_4001 == req.getElementType()) {

-			return getGEFWrapper(new org.eclipse.papyrus.diagram.profile.custom.commands.CustomAssociationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new org.eclipse.papyrus.uml.diagram.profile.custom.commands.CustomAssociationCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		return super.getCompleteCreateRelationshipCommand(req);

 	}

@@ -55,7 +55,7 @@ public class CustomEnumerationItemSemanticEditPolicy extends EnumerationItemSema
 	@Override

 	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

 		if(UMLElementTypes.Association_4001 == req.getElementType()) {

-			return getGEFWrapper(new org.eclipse.papyrus.diagram.profile.custom.commands.CustomAssociationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new org.eclipse.papyrus.uml.diagram.profile.custom.commands.CustomAssociationCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		//forbid creation of association branch from it.

 		if(UMLElementTypes.Association_4019 == req.getElementType()) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/policies/itemsemantic/CustomEnumerationItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/itemsemantic/CustomEnumerationItemSemanticEditPolicyCN.java
index e51eb140311..ab27847e7d6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/policies/itemsemantic/CustomEnumerationItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/itemsemantic/CustomEnumerationItemSemanticEditPolicyCN.java
@@ -11,16 +11,16 @@
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Adapted code from the class diagram

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.custom.policies.itemsemantic;

+package org.eclipse.papyrus.uml.diagram.profile.custom.policies.itemsemantic;

 

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gef.commands.UnexecutableCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.profile.custom.commands.CustomAssociationReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.policies.EnumerationItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.custom.commands.CustomAssociationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.EnumerationItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 

 /**

  * this a specialization to manage creation of association and associationClass

@@ -34,7 +34,7 @@ public class CustomEnumerationItemSemanticEditPolicyCN extends EnumerationItemSe
 	@Override

 	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

 		if(UMLElementTypes.Association_4001 == req.getElementType()) {

-			return getGEFWrapper(new org.eclipse.papyrus.diagram.profile.custom.commands.CustomAssociationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new org.eclipse.papyrus.uml.diagram.profile.custom.commands.CustomAssociationCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		return super.getCompleteCreateRelationshipCommand(req);

 	}

@@ -55,7 +55,7 @@ public class CustomEnumerationItemSemanticEditPolicyCN extends EnumerationItemSe
 	@Override

 	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

 		if(UMLElementTypes.Association_4001 == req.getElementType()) {

-			return getGEFWrapper(new org.eclipse.papyrus.diagram.profile.custom.commands.CustomAssociationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new org.eclipse.papyrus.uml.diagram.profile.custom.commands.CustomAssociationCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		//forbid creation of association branch from it.

 		if(UMLElementTypes.Association_4019 == req.getElementType()) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/policies/itemsemantic/CustomExtensionItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/itemsemantic/CustomExtensionItemSemanticEditPolicy.java
index 577065f595d..b9c2222ca4f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/policies/itemsemantic/CustomExtensionItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/itemsemantic/CustomExtensionItemSemanticEditPolicy.java
@@ -13,14 +13,14 @@
  *****************************************************************************/

 

 

-package org.eclipse.papyrus.diagram.profile.custom.policies.itemsemantic;

+package org.eclipse.papyrus.uml.diagram.profile.custom.policies.itemsemantic;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gef.commands.CompoundCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.papyrus.diagram.profile.custom.helper.StereotypeHelper;

-import org.eclipse.papyrus.diagram.profile.edit.policies.ExtensionItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.custom.helper.StereotypeHelper;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.ExtensionItemSemanticEditPolicy;

 import org.eclipse.uml2.uml.Extension;

 

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/policies/itemsemantic/CustomGeneralizationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/itemsemantic/CustomGeneralizationItemSemanticEditPolicy.java
index df61807f795..9872888515d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/policies/itemsemantic/CustomGeneralizationItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/itemsemantic/CustomGeneralizationItemSemanticEditPolicy.java
@@ -11,11 +11,11 @@
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Adapted code from the class diagram to the profile diagram

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.custom.policies.itemsemantic;

+package org.eclipse.papyrus.uml.diagram.profile.custom.policies.itemsemantic;

 

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.papyrus.diagram.profile.edit.policies.GeneralizationItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.GeneralizationItemSemanticEditPolicy;

 

 /**

  * this a specialization to manage creation of GeneralizationSet

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/policies/itemsemantic/CustomMetaclassItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/itemsemantic/CustomMetaclassItemSemanticEditPolicy.java
index af2f2ba7ac7..c08f386ad33 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/policies/itemsemantic/CustomMetaclassItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/itemsemantic/CustomMetaclassItemSemanticEditPolicy.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.custom.policies.itemsemantic;

+package org.eclipse.papyrus.uml.diagram.profile.custom.policies.itemsemantic;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -19,14 +19,14 @@ import org.eclipse.gef.commands.CompoundCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.profile.custom.commands.CustomAssociationCreateCommand;

-import org.eclipse.papyrus.diagram.profile.custom.commands.CustomExtensionCreateCommand;

-import org.eclipse.papyrus.diagram.profile.custom.commands.CustomExtensionReorientCommand;

-import org.eclipse.papyrus.diagram.profile.custom.helper.MetaclassHelper;

-import org.eclipse.papyrus.diagram.profile.edit.commands.AssociationBranchCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ExtensionEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.policies.MetaclassItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.custom.commands.CustomAssociationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.custom.commands.CustomExtensionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.custom.commands.CustomExtensionReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.custom.helper.MetaclassHelper;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.AssociationBranchCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ExtensionEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.MetaclassItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 

 /**

  * 

@@ -43,7 +43,7 @@ public class CustomMetaclassItemSemanticEditPolicy extends MetaclassItemSemantic
 

 	/**

 	 * 

-	 * @see org.eclipse.papyrus.diagram.profile.edit.policies.MetaclassItemSemanticEditPolicy#getCompleteCreateRelationshipCommand(org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest)

+	 * @see org.eclipse.papyrus.uml.diagram.profile.edit.policies.MetaclassItemSemanticEditPolicy#getCompleteCreateRelationshipCommand(org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest)

 	 * 

 	 * @param req

 	 * @return

@@ -69,7 +69,7 @@ public class CustomMetaclassItemSemanticEditPolicy extends MetaclassItemSemantic
 	 * - the metaclass's extensions

 	 * - the property in the stereotype

 	 * 

-	 * @see org.eclipse.papyrus.diagram.profile.edit.policies.MetaclassItemSemanticEditPolicy#getDestroyElementCommand(org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest)

+	 * @see org.eclipse.papyrus.uml.diagram.profile.edit.policies.MetaclassItemSemanticEditPolicy#getDestroyElementCommand(org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest)

 	 * 

 	 * @param req

 	 * 

@@ -91,7 +91,7 @@ public class CustomMetaclassItemSemanticEditPolicy extends MetaclassItemSemantic
 

 	/**

 	 * 

-	 * @see org.eclipse.papyrus.diagram.profile.edit.policies.MetaclassItemSemanticEditPolicy#getReorientRelationshipCommand(org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest)

+	 * @see org.eclipse.papyrus.uml.diagram.profile.edit.policies.MetaclassItemSemanticEditPolicy#getReorientRelationshipCommand(org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest)

 	 * 

 	 * @param req

 	 * @return

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/policies/itemsemantic/CustomMetaclassItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/itemsemantic/CustomMetaclassItemSemanticEditPolicyCN.java
index 6dddbfe8140..8e3f808be54 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/policies/itemsemantic/CustomMetaclassItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/itemsemantic/CustomMetaclassItemSemanticEditPolicyCN.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.custom.policies.itemsemantic;

+package org.eclipse.papyrus.uml.diagram.profile.custom.policies.itemsemantic;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -19,14 +19,14 @@ import org.eclipse.gef.commands.CompoundCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.profile.custom.commands.CustomAssociationCreateCommand;

-import org.eclipse.papyrus.diagram.profile.custom.commands.CustomExtensionCreateCommand;

-import org.eclipse.papyrus.diagram.profile.custom.commands.CustomExtensionReorientCommand;

-import org.eclipse.papyrus.diagram.profile.custom.helper.MetaclassHelper;

-import org.eclipse.papyrus.diagram.profile.edit.commands.AssociationBranchCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ExtensionEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.policies.MetaclassItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.custom.commands.CustomAssociationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.custom.commands.CustomExtensionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.custom.commands.CustomExtensionReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.custom.helper.MetaclassHelper;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.AssociationBranchCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ExtensionEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.MetaclassItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 

 /**

  * 

@@ -42,7 +42,7 @@ public class CustomMetaclassItemSemanticEditPolicyCN extends MetaclassItemSemant
 

 	/**

 	 * 

-	 * @see org.eclipse.papyrus.diagram.profile.edit.policies.MetaclassItemSemanticEditPolicyCN#getCompleteCreateRelationshipCommand(org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest)

+	 * @see org.eclipse.papyrus.uml.diagram.profile.edit.policies.MetaclassItemSemanticEditPolicyCN#getCompleteCreateRelationshipCommand(org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest)

 	 * 

 	 * @param req

 	 * @return

@@ -67,7 +67,7 @@ public class CustomMetaclassItemSemanticEditPolicyCN extends MetaclassItemSemant
 	 * - the metaclass's extensions

 	 * - the property in the stereotype

 	 * 

-	 * @see org.eclipse.papyrus.diagram.profile.edit.policies.MetaclassItemSemanticEditPolicy#getDestroyElementCommand(org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest)

+	 * @see org.eclipse.papyrus.uml.diagram.profile.edit.policies.MetaclassItemSemanticEditPolicy#getDestroyElementCommand(org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest)

 	 * 

 	 * @param req

 	 * 

@@ -89,7 +89,7 @@ public class CustomMetaclassItemSemanticEditPolicyCN extends MetaclassItemSemant
 

 	/**

 	 * 

-	 * @see org.eclipse.papyrus.diagram.profile.edit.policies.MetaclassItemSemanticEditPolicy#getReorientRelationshipCommand(org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest)

+	 * @see org.eclipse.papyrus.uml.diagram.profile.edit.policies.MetaclassItemSemanticEditPolicy#getReorientRelationshipCommand(org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest)

 	 * 

 	 * @param req

 	 * @return

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/policies/itemsemantic/CustomPrimitiveTypeItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/itemsemantic/CustomPrimitiveTypeItemSemanticEditPolicy.java
index 069aa93eafa..3b98dac68bd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/policies/itemsemantic/CustomPrimitiveTypeItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/itemsemantic/CustomPrimitiveTypeItemSemanticEditPolicy.java
@@ -11,16 +11,16 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.custom.policies.itemsemantic;

+package org.eclipse.papyrus.uml.diagram.profile.custom.policies.itemsemantic;

 

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gef.commands.UnexecutableCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.profile.custom.commands.CustomAssociationReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.policies.PrimitiveTypeItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.custom.commands.CustomAssociationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.PrimitiveTypeItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 

 

 

@@ -36,7 +36,7 @@ public class CustomPrimitiveTypeItemSemanticEditPolicy extends PrimitiveTypeItem
 	@Override

 	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

 		if(UMLElementTypes.Association_4001 == req.getElementType()) {

-			return getGEFWrapper(new org.eclipse.papyrus.diagram.profile.custom.commands.CustomAssociationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new org.eclipse.papyrus.uml.diagram.profile.custom.commands.CustomAssociationCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		return super.getCompleteCreateRelationshipCommand(req);

 	}

@@ -57,7 +57,7 @@ public class CustomPrimitiveTypeItemSemanticEditPolicy extends PrimitiveTypeItem
 	@Override

 	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

 		if(UMLElementTypes.Association_4001 == req.getElementType()) {

-			return getGEFWrapper(new org.eclipse.papyrus.diagram.profile.custom.commands.CustomAssociationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new org.eclipse.papyrus.uml.diagram.profile.custom.commands.CustomAssociationCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		//forbid creation of association branch from it.

 		if(UMLElementTypes.Association_4019 == req.getElementType()) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/policies/itemsemantic/CustomPrimitiveTypeItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/itemsemantic/CustomPrimitiveTypeItemSemanticEditPolicyCN.java
index d0aee27af41..96ec6bfb0ee 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/policies/itemsemantic/CustomPrimitiveTypeItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/itemsemantic/CustomPrimitiveTypeItemSemanticEditPolicyCN.java
@@ -11,16 +11,16 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.custom.policies.itemsemantic;

+package org.eclipse.papyrus.uml.diagram.profile.custom.policies.itemsemantic;

 

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gef.commands.UnexecutableCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.profile.custom.commands.CustomAssociationReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.policies.PrimitiveTypeItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.custom.commands.CustomAssociationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.PrimitiveTypeItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 

 

 /**

@@ -35,7 +35,7 @@ public class CustomPrimitiveTypeItemSemanticEditPolicyCN extends PrimitiveTypeIt
 	@Override

 	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

 		if(UMLElementTypes.Association_4001 == req.getElementType()) {

-			return getGEFWrapper(new org.eclipse.papyrus.diagram.profile.custom.commands.CustomAssociationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new org.eclipse.papyrus.uml.diagram.profile.custom.commands.CustomAssociationCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		return super.getCompleteCreateRelationshipCommand(req);

 	}

@@ -56,7 +56,7 @@ public class CustomPrimitiveTypeItemSemanticEditPolicyCN extends PrimitiveTypeIt
 	@Override

 	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

 		if(UMLElementTypes.Association_4001 == req.getElementType()) {

-			return getGEFWrapper(new org.eclipse.papyrus.diagram.profile.custom.commands.CustomAssociationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new org.eclipse.papyrus.uml.diagram.profile.custom.commands.CustomAssociationCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		//forbid creation of association branch from it.

 		if(UMLElementTypes.Association_4019 == req.getElementType()) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/policies/itemsemantic/CustomStereotypeItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/itemsemantic/CustomStereotypeItemSemanticEditPolicy.java
index 55b67888921..b55f63207b5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/policies/itemsemantic/CustomStereotypeItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/itemsemantic/CustomStereotypeItemSemanticEditPolicy.java
@@ -12,7 +12,7 @@
  *

  *****************************************************************************/

 

-package org.eclipse.papyrus.diagram.profile.custom.policies.itemsemantic;

+package org.eclipse.papyrus.uml.diagram.profile.custom.policies.itemsemantic;

 

 import org.eclipse.emf.common.util.EList;

 import org.eclipse.emf.ecore.EObject;

@@ -25,17 +25,17 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.profile.custom.commands.CustomAssociationReorientCommand;

-import org.eclipse.papyrus.diagram.profile.custom.commands.CustomExtensionCreateCommand;

-import org.eclipse.papyrus.diagram.profile.custom.commands.CustomExtensionReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ExtensionEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.policies.StereotypeItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.custom.commands.CustomAssociationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.custom.commands.CustomExtensionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.custom.commands.CustomExtensionReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ExtensionEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.StereotypeItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 import org.eclipse.uml2.uml.Association;

 import org.eclipse.uml2.uml.Extension;

 import org.eclipse.uml2.uml.Stereotype;

@@ -50,7 +50,7 @@ public class CustomStereotypeItemSemanticEditPolicy extends StereotypeItemSemant
 

 	/**

 	 * 

-	 * @see org.eclipse.papyrus.diagram.profile.edit.policies.StereotypeItemSemanticEditPolicy#getCompleteCreateRelationshipCommand(org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest)

+	 * @see org.eclipse.papyrus.uml.diagram.profile.edit.policies.StereotypeItemSemanticEditPolicy#getCompleteCreateRelationshipCommand(org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest)

 	 * 

 	 * @param req

 	 * @return

@@ -58,14 +58,14 @@ public class CustomStereotypeItemSemanticEditPolicy extends StereotypeItemSemant
 	@Override

 	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

 		if(UMLElementTypes.Association_4001 == req.getElementType()) {

-			return getGEFWrapper(new org.eclipse.papyrus.diagram.profile.custom.commands.CustomAssociationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new org.eclipse.papyrus.uml.diagram.profile.custom.commands.CustomAssociationCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		return super.getCompleteCreateRelationshipCommand(req);

 	}

 

 	/**

 	 * 

-	 * @see org.eclipse.papyrus.diagram.profile.edit.policies.StereotypeItemSemanticEditPolicy#getReorientRelationshipCommand(org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest)

+	 * @see org.eclipse.papyrus.uml.diagram.profile.edit.policies.StereotypeItemSemanticEditPolicy#getReorientRelationshipCommand(org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest)

 	 * 

 	 * @param req

 	 * @return

@@ -96,7 +96,7 @@ public class CustomStereotypeItemSemanticEditPolicy extends StereotypeItemSemant
 			return getGEFWrapper(new CustomExtensionCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if(UMLElementTypes.Association_4001 == req.getElementType()) {

-			return getGEFWrapper(new org.eclipse.papyrus.diagram.profile.custom.commands.CustomAssociationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new org.eclipse.papyrus.uml.diagram.profile.custom.commands.CustomAssociationCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		//forbid creation of association branch from it.

 		if(UMLElementTypes.Association_4019 == req.getElementType()) {

@@ -107,7 +107,7 @@ public class CustomStereotypeItemSemanticEditPolicy extends StereotypeItemSemant
 

 	/**

 	 * 

-	 * @see org.eclipse.papyrus.diagram.profile.edit.policies.StereotypeItemSemanticEditPolicy#getReorientReferenceRelationshipCommand(org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest)

+	 * @see org.eclipse.papyrus.uml.diagram.profile.edit.policies.StereotypeItemSemanticEditPolicy#getReorientReferenceRelationshipCommand(org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest)

 	 * 

 	 * @param req

 	 * @return

@@ -126,7 +126,7 @@ public class CustomStereotypeItemSemanticEditPolicy extends StereotypeItemSemant
 	/**

 	 * Destroy the extensions associated to the metaclass and call the super method

 	 * 

-	 * @see org.eclipse.papyrus.diagram.profile.edit.policies.StereotypeItemSemanticEditPolicyCN#getDestroyElementCommand(org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest)

+	 * @see org.eclipse.papyrus.uml.diagram.profile.edit.policies.StereotypeItemSemanticEditPolicyCN#getDestroyElementCommand(org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest)

 	 * 

 	 * @param req

 	 * @return

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/policies/itemsemantic/CustomStereotypeItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/itemsemantic/CustomStereotypeItemSemanticEditPolicyCN.java
index b643eaa3930..f01b4958000 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/policies/itemsemantic/CustomStereotypeItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/itemsemantic/CustomStereotypeItemSemanticEditPolicyCN.java
@@ -12,7 +12,7 @@
  *

  *****************************************************************************/

 

-package org.eclipse.papyrus.diagram.profile.custom.policies.itemsemantic;

+package org.eclipse.papyrus.uml.diagram.profile.custom.policies.itemsemantic;

 

 import org.eclipse.emf.common.util.EList;

 import org.eclipse.emf.ecore.EObject;

@@ -25,17 +25,17 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.profile.custom.commands.CustomAssociationReorientCommand;

-import org.eclipse.papyrus.diagram.profile.custom.commands.CustomExtensionCreateCommand;

-import org.eclipse.papyrus.diagram.profile.custom.commands.CustomExtensionReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ExtensionEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.policies.StereotypeItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.custom.commands.CustomAssociationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.custom.commands.CustomExtensionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.custom.commands.CustomExtensionReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ExtensionEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.StereotypeItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 import org.eclipse.uml2.uml.Association;

 import org.eclipse.uml2.uml.Extension;

 import org.eclipse.uml2.uml.Stereotype;

@@ -55,14 +55,14 @@ public class CustomStereotypeItemSemanticEditPolicyCN extends StereotypeItemSema
 	@Override

 	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

 		if(UMLElementTypes.Association_4001 == req.getElementType()) {

-			return getGEFWrapper(new org.eclipse.papyrus.diagram.profile.custom.commands.CustomAssociationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new org.eclipse.papyrus.uml.diagram.profile.custom.commands.CustomAssociationCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		return super.getCompleteCreateRelationshipCommand(req);

 	}

 

 	/**

 	 * 

-	 * @see org.eclipse.papyrus.diagram.profile.edit.policies.StereotypeItemSemanticEditPolicyCN#getReorientRelationshipCommand(org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest)

+	 * @see org.eclipse.papyrus.uml.diagram.profile.edit.policies.StereotypeItemSemanticEditPolicyCN#getReorientRelationshipCommand(org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest)

 	 * 

 	 * @param req

 	 * @return

@@ -92,7 +92,7 @@ public class CustomStereotypeItemSemanticEditPolicyCN extends StereotypeItemSema
 			return getGEFWrapper(new CustomExtensionCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if(UMLElementTypes.Association_4001 == req.getElementType()) {

-			return getGEFWrapper(new org.eclipse.papyrus.diagram.profile.custom.commands.CustomAssociationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new org.eclipse.papyrus.uml.diagram.profile.custom.commands.CustomAssociationCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		//forbid creation of association branch from it.

 		if(UMLElementTypes.Association_4019 == req.getElementType()) {

@@ -119,7 +119,7 @@ public class CustomStereotypeItemSemanticEditPolicyCN extends StereotypeItemSema
 	/**

 	 * Destroy the extensions associated to the metaclass and call the super method

 	 * 

-	 * @see org.eclipse.papyrus.diagram.profile.edit.policies.StereotypeItemSemanticEditPolicyCN#getDestroyElementCommand(org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest)

+	 * @see org.eclipse.papyrus.uml.diagram.profile.edit.policies.StereotypeItemSemanticEditPolicyCN#getDestroyElementCommand(org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest)

 	 * 

 	 * @param req

 	 * @return

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/preferences/IPapyrusOperationPreferencesConstant.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/preferences/IPapyrusOperationPreferencesConstant.java
index f2cc1449176..d43bd928c76 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/preferences/IPapyrusOperationPreferencesConstant.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/preferences/IPapyrusOperationPreferencesConstant.java
@@ -11,7 +11,7 @@
  *  Remi Schnekenburger (CEA LIST) - Initial API and implementation

  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Adapted code from the class diagram

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.custom.preferences;

+package org.eclipse.papyrus.uml.diagram.profile.custom.preferences;

 

 import org.eclipse.uml2.uml.Operation;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/preferences/IPapyrusPropertyPreferencesConstant.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/preferences/IPapyrusPropertyPreferencesConstant.java
index 0f22f5dad54..5861f4b9e81 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/preferences/IPapyrusPropertyPreferencesConstant.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/preferences/IPapyrusPropertyPreferencesConstant.java
@@ -11,7 +11,7 @@
  *  Remi Schnekenburger (CEA LIST) - Initial API and implementation

  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Adapted code from the class diagram

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.custom.preferences;

+package org.eclipse.papyrus.uml.diagram.profile.custom.preferences;

 

 import org.eclipse.uml2.uml.Property;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/preferences/OperationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/preferences/OperationPreferencePage.java
index c00cbd1bc07..4247d16f485 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/preferences/OperationPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/preferences/OperationPreferencePage.java
@@ -11,15 +11,15 @@
  *  Remi Schnekenburger (CEA LIST) - Initial API and implementation

  *   Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Adapted code from the class diagram

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.custom.preferences;

+package org.eclipse.papyrus.uml.diagram.profile.custom.preferences;

 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.profile.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusElementPreferencePage;

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

-import org.eclipse.papyrus.umlutils.ICustomAppearence;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.tools.utils.ICustomAppearence;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.events.SelectionEvent;

 import org.eclipse.swt.events.SelectionListener;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/preferences/PropertyPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/preferences/PropertyPreferencePage.java
index 5e1b0318260..e00ec1ac9fd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/preferences/PropertyPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/preferences/PropertyPreferencePage.java
@@ -11,14 +11,14 @@
  *  Remi Schnekenburger (CEA LIST) - Initial API and implementation

  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Adapted code from the class diagram

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.custom.preferences;

+package org.eclipse.papyrus.uml.diagram.profile.custom.preferences;

 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusElementPreferencePage;

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

-import org.eclipse.papyrus.umlutils.ICustomAppearence;

+import org.eclipse.papyrus.uml.tools.utils.ICustomAppearence;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.events.SelectionEvent;

 import org.eclipse.swt.events.SelectionListener;

@@ -190,7 +190,7 @@ public class PropertyPreferencePage extends AbstractPapyrusElementPreferencePage
 	 */

 	@Override

 	protected String getBundleId() {

-		return org.eclipse.papyrus.diagram.profile.part.UMLDiagramEditorPlugin.ID;

+		return org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin.ID;

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/providers/CustomDeferredCreateConnectionViewCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/providers/CustomDeferredCreateConnectionViewCommand.java
index 51269fcbab4..27e9724f019 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/providers/CustomDeferredCreateConnectionViewCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/providers/CustomDeferredCreateConnectionViewCommand.java
@@ -11,7 +11,7 @@
  *  Patrick Tessier (CEA LIST) patrick.tessier@cea@cea.fr - Initial API and implementation

  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Adapted code from the class diagram 

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.custom.providers;

+package org.eclipse.papyrus.uml.diagram.profile.custom.providers;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -23,7 +23,7 @@ import org.eclipse.gmf.runtime.common.core.command.CommandResult;
 import org.eclipse.gmf.runtime.common.core.command.ICommand;

 import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;

 import org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewRequest.ConnectionViewDescriptor;

-import org.eclipse.papyrus.diagram.common.commands.CommonDeferredCreateConnectionViewCommand;

+import org.eclipse.papyrus.uml.diagram.common.commands.CommonDeferredCreateConnectionViewCommand;

 

 /**

  * This class is used to create a connection view.

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/providers/CustomEditPolicyProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/providers/CustomEditPolicyProvider.java
index 0e5eedbe9e8..c45d57dab12 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/providers/CustomEditPolicyProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/providers/CustomEditPolicyProvider.java
@@ -11,7 +11,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.custom.providers;

+package org.eclipse.papyrus.uml.diagram.profile.custom.providers;

 

 import org.eclipse.gef.EditPart;

 import org.eclipse.gmf.runtime.common.core.service.IOperation;

@@ -21,9 +21,9 @@ import org.eclipse.gmf.runtime.diagram.ui.editparts.IPrimaryEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.diagram.ui.services.editpolicy.CreateEditPoliciesOperation;

 import org.eclipse.gmf.runtime.diagram.ui.services.editpolicy.IEditPolicyProvider;

-import org.eclipse.papyrus.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.NavigationEditPolicy;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfileDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.NavigationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart;

 

 /**

  * this is an editpolicy provider in charge to install a policy to navigate between diagrams and elements

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/providers/CustomUMLEditPartProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/providers/CustomUMLEditPartProvider.java
index 018eddc708b..1cd9b15a64e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/providers/CustomUMLEditPartProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/providers/CustomUMLEditPartProvider.java
@@ -11,14 +11,14 @@
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Adapted code from the class diagram

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.custom.providers;

+package org.eclipse.papyrus.uml.diagram.profile.custom.providers;

 

-import org.eclipse.papyrus.diagram.profile.custom.factory.CustomUMLeditPartFactory;

+import org.eclipse.papyrus.uml.diagram.profile.custom.factory.CustomUMLeditPartFactory;

 

 /**

  * Custom EditPartProvider, to use our own UMLEditPartFactory

  */

-public class CustomUMLEditPartProvider extends org.eclipse.papyrus.diagram.profile.providers.UMLEditPartProvider {

+public class CustomUMLEditPartProvider extends org.eclipse.papyrus.uml.diagram.profile.providers.UMLEditPartProvider {

 

 	/**

 	 * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/requests/CustomCreateElementRequestAdapter.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/requests/CustomCreateElementRequestAdapter.java
index 768db937bf3..82cc1bd49bf 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/requests/CustomCreateElementRequestAdapter.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/requests/CustomCreateElementRequestAdapter.java
@@ -12,7 +12,7 @@
  *

  *****************************************************************************/

 

-package org.eclipse.papyrus.diagram.profile.custom.requests;

+package org.eclipse.papyrus.uml.diagram.profile.custom.requests;

 

 import java.util.ArrayList;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/requests/CustomCreateViewAndElementRequest.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/requests/CustomCreateViewAndElementRequest.java
index 5960840eecb..09a7984ea71 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/requests/CustomCreateViewAndElementRequest.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/requests/CustomCreateViewAndElementRequest.java
@@ -15,7 +15,7 @@
 

 

 

-package org.eclipse.papyrus.diagram.profile.custom.requests;

+package org.eclipse.papyrus.uml.diagram.profile.custom.requests;

 

 import java.util.Map;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/requests/CustomCreateViewRequest.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/requests/CustomCreateViewRequest.java
index 046a551d5c3..4401c286e30 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/requests/CustomCreateViewRequest.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/requests/CustomCreateViewRequest.java
@@ -12,7 +12,7 @@
  *

  *****************************************************************************/

 

-package org.eclipse.papyrus.diagram.profile.custom.requests;

+package org.eclipse.papyrus.uml.diagram.profile.custom.requests;

 

 import java.util.ArrayList;

 import java.util.Collections;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/ui/dialog/ChooseSetMetaclassDialog.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/ui/dialog/ChooseSetMetaclassDialog.java
index d350c75d454..fa5479b6259 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/ui/dialog/ChooseSetMetaclassDialog.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/ui/dialog/ChooseSetMetaclassDialog.java
@@ -11,7 +11,7 @@
  *    Patrick Tessier patrick.tessier@cea.fr - initial API and implementation

  *    Vincent Lorenzo vincent.lorenzo@cea.fr 

  *******************************************************************************/

-package org.eclipse.papyrus.diagram.profile.custom.ui.dialog;

+package org.eclipse.papyrus.uml.diagram.profile.custom.ui.dialog;

 

 

 import java.util.ArrayList;

@@ -24,13 +24,13 @@ import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.resource.ImageRegistry;

 import org.eclipse.jface.viewers.ITableLabelProvider;

 import org.eclipse.jface.viewers.LabelProvider;

-import org.eclipse.papyrus.diagram.common.Activator;

-import org.eclipse.papyrus.diagram.profile.custom.messages.Messages;

-import org.eclipse.papyrus.diagram.profile.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.profile.ui.dialogs.AlphabeticalViewerSorter;

 import org.eclipse.papyrus.profile.ui.dialogs.ChooseSetAssistedDialog;

 import org.eclipse.papyrus.profile.ui.dialogs.IChooseDialog;

-import org.eclipse.papyrus.umlutils.ElementUtil;

+import org.eclipse.papyrus.uml.diagram.common.Activator;

+import org.eclipse.papyrus.uml.diagram.profile.custom.messages.Messages;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.tools.utils.ElementUtil;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.events.SelectionAdapter;

 import org.eclipse.swt.events.SelectionEvent;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/ui/dialog/ClassElementComparator.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/ui/dialog/ClassElementComparator.java
index 3395f5bbb5f..579d2545e03 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/ui/dialog/ClassElementComparator.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/ui/dialog/ClassElementComparator.java
@@ -10,7 +10,7 @@
  * Contributors:

  *     Patrick Tessier patrick.tessier@cea.fr - initial API and implementation

  *******************************************************************************/

-package org.eclipse.papyrus.diagram.profile.custom.ui.dialog;

+package org.eclipse.papyrus.uml.diagram.profile.custom.ui.dialog;

 

 /**

  * This class is used to compare two class element by comparing the name without taking in account

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/ui/dialog/ElementListWithComparator.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/ui/dialog/ElementListWithComparator.java
index 49c66e059b8..2351fb049c3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/ui/dialog/ElementListWithComparator.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/ui/dialog/ElementListWithComparator.java
@@ -12,7 +12,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.custom.ui.dialog;

+package org.eclipse.papyrus.uml.diagram.profile.custom.ui.dialog;

 

 import java.util.Comparator;

 import java.util.Iterator;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/service/PreSaveProfileListener.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/service/PreSaveProfileListener.java
index ad82263967f..baf1e050861 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/service/PreSaveProfileListener.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/service/PreSaveProfileListener.java
@@ -12,7 +12,7 @@
  *

  *****************************************************************************/

 

-package org.eclipse.papyrus.diagram.profile.service;

+package org.eclipse.papyrus.uml.diagram.profile.service;

 

 import java.util.Collection;

 import java.util.Iterator;

@@ -30,11 +30,11 @@ import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.papyrus.core.editor.IMultiDiagramEditor;

 import org.eclipse.papyrus.core.lifecycleevents.DoSaveEvent;

 import org.eclipse.papyrus.core.lifecycleevents.ISaveEventListener;

-import org.eclipse.papyrus.diagram.common.util.DiagramEditPartsUtil;

-import org.eclipse.papyrus.diagram.profile.custom.commands.DefineProfileCommand;

 import org.eclipse.papyrus.editor.PapyrusMultiDiagramEditor;

 import org.eclipse.papyrus.profile.definition.PapyrusDefinitionAnnotation;

 import org.eclipse.papyrus.profile.ui.dialogs.ProfileDefinitionDialog;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.profile.custom.commands.DefineProfileCommand;

 import org.eclipse.swt.widgets.Display;

 import org.eclipse.swt.widgets.Shell;

 import org.eclipse.uml2.uml.Profile;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/service/ProfileService.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/service/ProfileService.java
index da4ea003c40..87c3b07441a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/service/ProfileService.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/service/ProfileService.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.service;

+package org.eclipse.papyrus.uml.diagram.profile.service;

 

 import org.eclipse.papyrus.core.lifecycleevents.ILifeCycleEventsProvider;

 import org.eclipse.papyrus.core.lifecycleevents.LifeCycleEventsProvider;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/model/profilediagram.gmfgen b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/model/profilediagram.gmfgen
index 31af6ad7342..2e71dc6bc4f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/model/profilediagram.gmfgen
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/model/profilediagram.gmfgen
@@ -5,7 +5,7 @@
     xmlns:gmfgen="http://www.eclipse.org/gmf/2009/GenModel"

     xmlns:papyrusgmfgenextension="http://www.eclipse.org/papyrus/2009/papyrusgmfgenextension">

   <gmfgen:GenEditorGenerator

-      packageNamePrefix="org.eclipse.papyrus.diagram.profile"

+      packageNamePrefix="org.eclipse.papyrus.uml.diagram.profile"

       modelID="PapyrusUMLProfileDiagram"

       domainFileExtension="PapyrusUMLProfile"

       dynamicTemplates="true"

@@ -32,15 +32,15 @@
       <behaviour

           xsi:type="gmfgen:CustomBehaviour"

           key="&quot;RemoveOrphanView&quot;"

-          editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.RemoveOrphanViewPolicy"/>

+          editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.RemoveOrphanViewPolicy"/>

       <behaviour

           xsi:type="gmfgen:CustomBehaviour"

           key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

-          editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.ProfileDiagramDragDropEditPolicy"/>

+          editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.ProfileDiagramDragDropEditPolicy"/>

       <behaviour

           xsi:type="gmfgen:CustomBehaviour"

           key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE"

-          editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.CustomCreationRoleEditPolicy"/>

+          editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomCreationRoleEditPolicy"/>

       <domainDiagramElement

           href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Profile"/>

       <childNodes

@@ -57,7 +57,7 @@
             xsi:type="gmfgen:MetamodelType"/>

         <viewmap

             xsi:type="gmfgen:FigureViewmap"

-            figureQualifiedClassName="org.eclipse.papyrus.diagram.common.figure.node.PrimitiveTypeFigure">

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.PrimitiveTypeFigure">

           <attributes

               xsi:type="gmfgen:DefaultSizeAttributes"

               width="100"

@@ -66,23 +66,23 @@
         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.POPUPBAR_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.SEMANTIC_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.itemsemantic.CustomPrimitiveTypeItemSemanticEditPolicyCN"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.itemsemantic.CustomPrimitiveTypeItemSemanticEditPolicyCN"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

         <modelFacet>

           <metaClass

               href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/PrimitiveType"/>

@@ -137,7 +137,7 @@
             href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

         <elementType

             xsi:type="gmfgen:MetamodelType"

-            uniqueIdentifier="org.eclipse.papyrus.diagram.profile.DataTypeOperation_3019"

+            uniqueIdentifier="org.eclipse.papyrus.uml.diagram.profile.DataTypeOperation_3019"

             displayName="Operation"

             editHelperClassName="DataTypeOperationEditHelper"/>

         <viewmap

@@ -151,12 +151,12 @@
         </viewmap>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.AppliedStereotypeOperationDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.AppliedStereotypeOperationDisplayEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.OperationLabelEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.OperationLabelEditPolicy"/>

         <modelFacet>

           <metaClass

               href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Operation"/>

@@ -233,7 +233,7 @@
             href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

         <elementType

             xsi:type="gmfgen:MetamodelType"

-            uniqueIdentifier="org.eclipse.papyrus.diagram.profile.DataTypeProperty_3018"

+            uniqueIdentifier="org.eclipse.papyrus.uml.diagram.profile.DataTypeProperty_3018"

             displayName="Property"

             editHelperClassName="DataTypePropertyEditHelper"/>

         <viewmap

@@ -247,12 +247,12 @@
         </viewmap>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.AppliedStereotypePropertyDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.AppliedStereotypePropertyDisplayEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.PropertyLabelEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.PropertyLabelEditPolicy"/>

         <modelFacet>

           <metaClass

               href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Property"/>

@@ -291,7 +291,7 @@
             href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

         <elementType

             xsi:type="gmfgen:MetamodelType"

-            uniqueIdentifier="org.eclipse.papyrus.diagram.profile.ClassProperty_3002"

+            uniqueIdentifier="org.eclipse.papyrus.uml.diagram.profile.ClassProperty_3002"

             displayName="Property"

             editHelperClassName="ClassPropertyEditHelper"/>

         <viewmap

@@ -305,12 +305,12 @@
         </viewmap>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.AppliedStereotypePropertyDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.AppliedStereotypePropertyDisplayEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.PropertyLabelEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.PropertyLabelEditPolicy"/>

         <modelFacet>

           <metaClass

               href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Property"/>

@@ -349,7 +349,7 @@
             href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

         <elementType

             xsi:type="gmfgen:MetamodelType"

-            uniqueIdentifier="org.eclipse.papyrus.diagram.profile.ClassOperation_3020"

+            uniqueIdentifier="org.eclipse.papyrus.uml.diagram.profile.ClassOperation_3020"

             displayName="Operation"

             editHelperClassName="ClassOperationEditHelper"/>

         <viewmap

@@ -363,12 +363,12 @@
         </viewmap>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.AppliedStereotypeOperationDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.AppliedStereotypeOperationDisplayEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.OperationLabelEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.OperationLabelEditPolicy"/>

         <modelFacet>

           <metaClass

               href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Operation"/>

@@ -406,12 +406,12 @@
             href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

         <elementType

             xsi:type="gmfgen:MetamodelType"

-            uniqueIdentifier="org.eclipse.papyrus.diagram.profile.Stereotype_1023"

+            uniqueIdentifier="org.eclipse.papyrus.uml.diagram.profile.Stereotype_1023"

             displayName="Stereotype"

             editHelperClassName="StereotypeEditHelper"/>

         <viewmap

             xsi:type="gmfgen:FigureViewmap"

-            figureQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.figure.StereotypeFigure">

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.figure.StereotypeFigure">

           <attributes

               xsi:type="gmfgen:DefaultSizeAttributes"

               width="100"

@@ -419,32 +419,32 @@
         </viewmap>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="&quot;RESIZE_BORDER_ITEMS&quot;"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.POPUPBAR_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.SEMANTIC_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.itemsemantic.CustomStereotypeItemSemanticEditPolicyCN"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.itemsemantic.CustomStereotypeItemSemanticEditPolicyCN"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>

         <modelFacet>

           <metaClass

               href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Stereotype"/>

@@ -496,12 +496,12 @@
             href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

         <elementType

             xsi:type="gmfgen:MetamodelType"

-            uniqueIdentifier="org.eclipse.papyrus.diagram.profile.Metaclass_3028"

+            uniqueIdentifier="org.eclipse.papyrus.uml.diagram.profile.Metaclass_3028"

             displayName="Metaclass"

             editHelperClassName="MetaclassEditHelper"/>

         <viewmap

             xsi:type="gmfgen:FigureViewmap"

-            figureQualifiedClassName="org.eclipse.papyrus.diagram.common.figure.node.ClassifierFigure">

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ClassifierFigure">

           <attributes

               xsi:type="gmfgen:DefaultSizeAttributes"

               width="100"

@@ -509,20 +509,20 @@
         </viewmap>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="&quot;RESIZE_BORDER_ITEMS&quot;"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.SEMANTIC_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.itemsemantic.CustomMetaclassItemSemanticEditPolicyCN"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.itemsemantic.CustomMetaclassItemSemanticEditPolicyCN"/>

         <modelFacet>

           <metaClass

               href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class"/>

@@ -568,20 +568,20 @@
             href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

         <elementType

             xsi:type="gmfgen:MetamodelType"

-            uniqueIdentifier="org.eclipse.papyrus.diagram.profile.CommentCN_1007"

+            uniqueIdentifier="org.eclipse.papyrus.uml.diagram.profile.CommentCN_1007"

             displayName="Comment"

             editHelperClassName="CommentEditHelperCN"/>

         <viewmap

             xsi:type="gmfgen:FigureViewmap"

-            figureQualifiedClassName="org.eclipse.papyrus.diagram.common.figure.node.HTMLCornerBentFigure"/>

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.HTMLCornerBentFigure"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

         <modelFacet>

           <metaClass

               href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Comment"/>

@@ -606,7 +606,7 @@
           <viewmap

               xsi:type="gmfgen:ParentAssignedViewmap"

               getterName="getCornerBentFigure"

-              figureQualifiedClassName="org.eclipse.papyrus.diagram.common.figure.node.HTMLCornerBentFigure">

+              figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.HTMLCornerBentFigure">

             <attributes

                 xsi:type="gmfgen:StyleAttributes"

                 fixedFont="true"/>

@@ -637,7 +637,7 @@
             metamodelType="/0/@diagram/@topLevelNodes.6/@elementType"/>

         <viewmap

             xsi:type="gmfgen:FigureViewmap"

-            figureQualifiedClassName="org.eclipse.papyrus.diagram.common.figure.node.PackageFigure">

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.PackageFigure">

           <attributes

               xsi:type="gmfgen:DefaultSizeAttributes"

               width="100"

@@ -646,27 +646,27 @@
         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="&quot;RESIZE_BORDER_ITEMS&quot;"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.POPUPBAR_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

         <modelFacet>

           <metaClass

               href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Model"/>

@@ -721,7 +721,7 @@
             metamodelType="/0/@diagram/@topLevelNodes.7/@elementType"/>

         <viewmap

             xsi:type="gmfgen:FigureViewmap"

-            figureQualifiedClassName="org.eclipse.papyrus.diagram.common.figure.node.ProfileFigure">

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ProfileFigure">

           <attributes

               xsi:type="gmfgen:DefaultSizeAttributes"

               width="200"

@@ -730,27 +730,27 @@
         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="&quot;RESIZE_BORDER_ITEMS&quot;"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.POPUPBAR_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

         <modelFacet>

           <metaClass

               href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Profile"/>

@@ -804,12 +804,12 @@
             href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

         <elementType

             xsi:type="gmfgen:MetamodelType"

-            uniqueIdentifier="org.eclipse.papyrus.diagram.profile.PackageCN_1012"

+            uniqueIdentifier="org.eclipse.papyrus.uml.diagram.profile.PackageCN_1012"

             displayName="Package"

             editHelperClassName="PackageEditHelperCN"/>

         <viewmap

             xsi:type="gmfgen:FigureViewmap"

-            figureQualifiedClassName="org.eclipse.papyrus.diagram.common.figure.node.PackageFigure">

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.PackageFigure">

           <attributes

               xsi:type="gmfgen:DefaultSizeAttributes"

               width="100"

@@ -818,27 +818,27 @@
         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="&quot;RESIZE_BORDER_ITEMS&quot;"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.POPUPBAR_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

         <modelFacet>

           <metaClass

               href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package"/>

@@ -894,11 +894,11 @@
             editHelperClassName="ConstraintEditHelperCN"/>

         <viewmap

             xsi:type="gmfgen:FigureViewmap"

-            figureQualifiedClassName="org.eclipse.papyrus.diagram.common.figure.node.ConstraintFigure"/>

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy"/>

         <modelFacet>

           <metaClass

               href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint"/>

@@ -946,7 +946,7 @@
           <viewmap

               xsi:type="gmfgen:ParentAssignedViewmap"

               getterName="getConstraintFigure"

-              figureQualifiedClassName="org.eclipse.papyrus.diagram.common.figure.node.ConstraintFigure"/>

+              figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure"/>

           <modelFacet

               xsi:type="gmfgen:FeatureLabelModelFacet"

               parser="/0/@labelParsers/@implementations.5">

@@ -972,7 +972,7 @@
             metamodelType="/0/@diagram/@topLevelNodes.9/@elementType"/>

         <viewmap

             xsi:type="gmfgen:FigureViewmap"

-            figureQualifiedClassName="org.eclipse.papyrus.diagram.common.figure.node.EnumerationFigure">

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.EnumerationFigure">

           <attributes

               xsi:type="gmfgen:DefaultSizeAttributes"

               width="100"

@@ -981,27 +981,27 @@
         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.POPUPBAR_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.SEMANTIC_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.itemsemantic.CustomEnumerationItemSemanticEditPolicyCN"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.itemsemantic.CustomEnumerationItemSemanticEditPolicyCN"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

         <modelFacet>

           <metaClass

               href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Enumeration"/>

@@ -1057,7 +1057,7 @@
             metamodelType="/0/@diagram/@topLevelNodes.11/@elementType"/>

         <viewmap

             xsi:type="gmfgen:FigureViewmap"

-            figureQualifiedClassName="org.eclipse.papyrus.diagram.common.figure.node.DataTypeFigure">

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.DataTypeFigure">

           <attributes

               xsi:type="gmfgen:DefaultSizeAttributes"

               width="100"

@@ -1066,31 +1066,31 @@
         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="&quot;RESIZE_BORDER_ITEMS&quot;"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.POPUPBAR_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.SEMANTIC_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.itemsemantic.CustomDataTypeItemSemanticEditPolicyCN"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.itemsemantic.CustomDataTypeItemSemanticEditPolicyCN"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

         <modelFacet>

           <metaClass

               href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/DataType"/>

@@ -1139,7 +1139,7 @@
             href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

         <elementType

             xsi:type="gmfgen:MetamodelType"

-            uniqueIdentifier="org.eclipse.papyrus.diagram.profile.Dependency_2014"

+            uniqueIdentifier="org.eclipse.papyrus.uml.diagram.profile.Dependency_2014"

             displayName="Dependency"

             editHelperClassName="DependencyEditHelper"/>

         <viewmap

@@ -1159,7 +1159,7 @@
         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy"/>

         <modelFacet>

           <metaClass

               href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency"/>

@@ -1215,11 +1215,11 @@
         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.SEMANTIC_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.itemsemantic.CustomAssociationNodeItemSemanticEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.itemsemantic.CustomAssociationNodeItemSemanticEditPolicy"/>

         <modelFacet>

           <metaClass

               href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Association"/>

@@ -1241,12 +1241,12 @@
             href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

         <elementType

             xsi:type="gmfgen:MetamodelType"

-            uniqueIdentifier="org.eclipse.papyrus.diagram.profile.Stereotype_1026"

+            uniqueIdentifier="org.eclipse.papyrus.uml.diagram.profile.Stereotype_1026"

             displayName="Stereotype"

             editHelperClassName="StereotypeEditHelper"/>

         <viewmap

             xsi:type="gmfgen:FigureViewmap"

-            figureQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.figure.StereotypeFigure">

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.figure.StereotypeFigure">

           <attributes

               xsi:type="gmfgen:DefaultSizeAttributes"

               width="100"

@@ -1254,32 +1254,32 @@
         </viewmap>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="&quot;RESIZE_BORDER_ITEMS&quot;"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.POPUPBAR_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.SEMANTIC_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.itemsemantic.CustomStereotypeItemSemanticEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.itemsemantic.CustomStereotypeItemSemanticEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>

         <modelFacet>

           <metaClass

               href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Stereotype"/>

@@ -1330,12 +1330,12 @@
             href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

         <elementType

             xsi:type="gmfgen:SpecializationType"

-            uniqueIdentifier="org.eclipse.papyrus.diagram.profile.Metaclass_1031"

+            uniqueIdentifier="org.eclipse.papyrus.uml.diagram.profile.Metaclass_1031"

             displayName="Metaclass"

             metamodelType="/0/@diagram/@childNodes.7/@elementType"/>

         <viewmap

             xsi:type="gmfgen:FigureViewmap"

-            figureQualifiedClassName="org.eclipse.papyrus.diagram.common.figure.node.ClassifierFigure">

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ClassifierFigure">

           <attributes

               xsi:type="gmfgen:DefaultSizeAttributes"

               width="100"

@@ -1343,20 +1343,20 @@
         </viewmap>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="&quot;RESIZE_BORDER_ITEMS&quot;"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.SEMANTIC_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.itemsemantic.CustomMetaclassItemSemanticEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.itemsemantic.CustomMetaclassItemSemanticEditPolicy"/>

         <modelFacet>

           <metaClass

               href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class"/>

@@ -1401,20 +1401,20 @@
             href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

         <elementType

             xsi:type="gmfgen:MetamodelType"

-            uniqueIdentifier="org.eclipse.papyrus.diagram.profile.Comment_1002"

+            uniqueIdentifier="org.eclipse.papyrus.uml.diagram.profile.Comment_1002"

             displayName="Comment"

             editHelperClassName="CommentEditHelper"/>

         <viewmap

             xsi:type="gmfgen:FigureViewmap"

-            figureQualifiedClassName="org.eclipse.papyrus.diagram.common.figure.node.HTMLCornerBentFigure"/>

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.HTMLCornerBentFigure"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

         <modelFacet>

           <metaClass

               href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Comment"/>

@@ -1439,7 +1439,7 @@
           <viewmap

               xsi:type="gmfgen:ParentAssignedViewmap"

               getterName="getCornerBentFigure"

-              figureQualifiedClassName="org.eclipse.papyrus.diagram.common.figure.node.HTMLCornerBentFigure">

+              figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.HTMLCornerBentFigure">

             <attributes

                 xsi:type="gmfgen:StyleAttributes"

                 fixedFont="true"/>

@@ -1461,19 +1461,19 @@
             displayName="Constraint"/>

         <viewmap

             xsi:type="gmfgen:FigureViewmap"

-            figureQualifiedClassName="org.eclipse.papyrus.diagram.common.figure.node.ConstraintFigure"/>

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

         <modelFacet>

           <metaClass

               href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint"/>

@@ -1521,7 +1521,7 @@
           <viewmap

               xsi:type="gmfgen:ParentAssignedViewmap"

               getterName="getConstraintFigure"

-              figureQualifiedClassName="org.eclipse.papyrus.diagram.common.figure.node.ConstraintFigure"/>

+              figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure"/>

           <modelFacet

               xsi:type="gmfgen:FeatureLabelModelFacet"

               parser="/0/@labelParsers/@implementations.5">

@@ -1544,7 +1544,7 @@
             xsi:type="gmfgen:MetamodelType"/>

         <viewmap

             xsi:type="gmfgen:FigureViewmap"

-            figureQualifiedClassName="org.eclipse.papyrus.diagram.common.figure.node.PackageFigure">

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.PackageFigure">

           <attributes

               xsi:type="gmfgen:DefaultSizeAttributes"

               width="200"

@@ -1553,27 +1553,27 @@
         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="&quot;RESIZE_BORDER_ITEMS&quot;"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.POPUPBAR_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

         <modelFacet>

           <metaClass

               href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Model"/>

@@ -1623,12 +1623,12 @@
             href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

         <elementType

             xsi:type="gmfgen:MetamodelType"

-            uniqueIdentifier="org.eclipse.papyrus.diagram.profile.Profile_1030"

+            uniqueIdentifier="org.eclipse.papyrus.uml.diagram.profile.Profile_1030"

             displayName="Profile"

             editHelperClassName="ProfileEditHelper"/>

         <viewmap

             xsi:type="gmfgen:FigureViewmap"

-            figureQualifiedClassName="org.eclipse.papyrus.diagram.common.figure.node.ProfileFigure">

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ProfileFigure">

           <attributes

               xsi:type="gmfgen:DefaultSizeAttributes"

               width="200"

@@ -1637,27 +1637,27 @@
         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="&quot;RESIZE_BORDER_ITEMS&quot;"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.POPUPBAR_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

         <modelFacet>

           <metaClass

               href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Profile"/>

@@ -1709,12 +1709,12 @@
             href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

         <elementType

             xsi:type="gmfgen:MetamodelType"

-            uniqueIdentifier="org.eclipse.papyrus.diagram.profile.Package_1004"

+            uniqueIdentifier="org.eclipse.papyrus.uml.diagram.profile.Package_1004"

             displayName="Package"

             editHelperClassName="PackageEditHelper"/>

         <viewmap

             xsi:type="gmfgen:FigureViewmap"

-            figureQualifiedClassName="org.eclipse.papyrus.diagram.common.figure.node.PackageFigure">

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.PackageFigure">

           <attributes

               xsi:type="gmfgen:DefaultSizeAttributes"

               width="200"

@@ -1723,27 +1723,27 @@
         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="&quot;RESIZE_BORDER_ITEMS&quot;"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.POPUPBAR_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

         <modelFacet>

           <metaClass

               href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package"/>

@@ -1792,7 +1792,7 @@
             xsi:type="gmfgen:MetamodelType"/>

         <viewmap

             xsi:type="gmfgen:FigureViewmap"

-            figureQualifiedClassName="org.eclipse.papyrus.diagram.common.figure.node.EnumerationFigure">

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.EnumerationFigure">

           <attributes

               xsi:type="gmfgen:DefaultSizeAttributes"

               width="100"

@@ -1801,31 +1801,31 @@
         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="&quot;RESIZE_BORDER_ITEMS&quot;"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.POPUPBAR_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.SEMANTIC_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.itemsemantic.CustomEnumerationItemSemanticEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.itemsemantic.CustomEnumerationItemSemanticEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

         <modelFacet>

           <metaClass

               href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Enumeration"/>

@@ -1872,7 +1872,7 @@
             metamodelType="/0/@diagram/@childNodes.0/@elementType"/>

         <viewmap

             xsi:type="gmfgen:FigureViewmap"

-            figureQualifiedClassName="org.eclipse.papyrus.diagram.common.figure.node.PrimitiveTypeFigure">

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.PrimitiveTypeFigure">

           <attributes

               xsi:type="gmfgen:DefaultSizeAttributes"

               width="100"

@@ -1881,23 +1881,23 @@
         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.POPUPBAR_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.SEMANTIC_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.itemsemantic.CustomPrimitiveTypeItemSemanticEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.itemsemantic.CustomPrimitiveTypeItemSemanticEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

         <modelFacet>

           <metaClass

               href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/PrimitiveType"/>

@@ -1946,12 +1946,12 @@
             href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

         <elementType

             xsi:type="gmfgen:MetamodelType"

-            uniqueIdentifier="org.eclipse.papyrus.diagram.profile.DataType_2010"

+            uniqueIdentifier="org.eclipse.papyrus.uml.diagram.profile.DataType_2010"

             displayName="DataType"

             editHelperClassName="DataTypeEditHelper"/>

         <viewmap

             xsi:type="gmfgen:FigureViewmap"

-            figureQualifiedClassName="org.eclipse.papyrus.diagram.common.figure.node.DataTypeFigure">

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.DataTypeFigure">

           <attributes

               xsi:type="gmfgen:DefaultSizeAttributes"

               width="100"

@@ -1960,31 +1960,31 @@
         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="&quot;RESIZE_BORDER_ITEMS&quot;"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.POPUPBAR_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.SEMANTIC_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.itemsemantic.CustomDataTypeItemSemanticEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.itemsemantic.CustomDataTypeItemSemanticEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

         <modelFacet>

           <metaClass

               href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/DataType"/>

@@ -2037,7 +2037,7 @@
             editHelperClassName="ShortCutDiagramEditHelper"/>

         <viewmap

             xsi:type="gmfgen:FigureViewmap"

-            figureQualifiedClassName="org.eclipse.papyrus.diagram.common.figure.node.DiagramNodeFigure">

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.DiagramNodeFigure">

           <attributes

               xsi:type="gmfgen:DefaultSizeAttributes"

               width="20"

@@ -2046,15 +2046,15 @@
         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.OPEN_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.ShortCutDiagramEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShortCutDiagramEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.ShowHideLabelEditPolicy.SHOW_HIDE_LABEL_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.ShowHideLabelEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy.SHOW_HIDE_LABEL_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy"/>

         <modelFacet>

           <metaClass

               href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Diagram"/>

@@ -2087,15 +2087,15 @@
             displayName="Extension"/>

         <viewmap

             xsi:type="gmfgen:FigureViewmap"

-            figureQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.figure.ExtensionFigure"/>

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.figure.ExtensionFigure"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.profile.custom.policies.ExtensionCustomNameEditPolicy.SPECIFIC_EXTENSION_NAME_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.ExtensionCustomNameEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.profile.custom.policies.ExtensionCustomNameEditPolicy.SPECIFIC_EXTENSION_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.ExtensionCustomNameEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.SEMANTIC_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.itemsemantic.CustomExtensionItemSemanticEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.itemsemantic.CustomExtensionItemSemanticEditPolicy"/>

         <modelFacet

             xsi:type="gmfgen:TypeLinkModelFacet">

           <metaClass

@@ -2123,19 +2123,19 @@
             metamodelType="/0/@diagram/@topLevelNodes.1/@elementType"/>

         <viewmap

             xsi:type="gmfgen:FigureViewmap"

-            figureQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.figure.AssociationFigure"/>

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.figure.AssociationFigure"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.SEMANTIC_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.itemsemantic.CustomAssociationItemSemanticEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.itemsemantic.CustomAssociationItemSemanticEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy"/>

         <modelFacet

             xsi:type="gmfgen:TypeLinkModelFacet">

           <metaClass

@@ -2221,8 +2221,8 @@
           </viewmap>

           <behaviour

               xsi:type="gmfgen:CustomBehaviour"

-              key="org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"

-              editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.DisplayAssociationEndTargetEditPolicy"/>

+              key="org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"

+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.DisplayAssociationEndTargetEditPolicy"/>

           <modelFacet

               xsi:type="gmfgen:FeatureLabelModelFacet"

               parser="/0/@labelParsers/@implementations.0"

@@ -2251,8 +2251,8 @@
           </viewmap>

           <behaviour

               xsi:type="gmfgen:CustomBehaviour"

-              key="org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"

-              editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.DisplayAssociationEndSourceEditPolicy"/>

+              key="org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"

+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.DisplayAssociationEndSourceEditPolicy"/>

           <modelFacet

               xsi:type="gmfgen:FeatureLabelModelFacet"

               parser="/0/@labelParsers/@implementations.0"

@@ -2280,8 +2280,8 @@
           </viewmap>

           <behaviour

               xsi:type="gmfgen:CustomBehaviour"

-              key="org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"

-              editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.DisplayAssociationEndSourceMultiplicityEditPolicy"/>

+              key="org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"

+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.DisplayAssociationEndSourceMultiplicityEditPolicy"/>

           <modelFacet

               xsi:type="gmfgen:FeatureLabelModelFacet"

               parser="/0/@labelParsers/@implementations.0"

@@ -2309,8 +2309,8 @@
           </viewmap>

           <behaviour

               xsi:type="gmfgen:CustomBehaviour"

-              key="org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"

-              editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.DisplayAssociationEndTargetMultiplicityEditPolicy"/>

+              key="org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"

+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.DisplayAssociationEndTargetMultiplicityEditPolicy"/>

           <modelFacet

               xsi:type="gmfgen:FeatureLabelModelFacet"

               parser="/0/@labelParsers/@implementations.0"

@@ -2333,7 +2333,7 @@
             xsi:type="gmfgen:MetamodelType"/>

         <viewmap

             xsi:type="gmfgen:FigureViewmap"

-            figureQualifiedClassName="org.eclipse.papyrus.diagram.common.figure.edge.DashedEdgeFigure"/>

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure"/>

         <modelFacet

             xsi:type="gmfgen:TypeLinkModelFacet">

           <metaClass

@@ -2362,15 +2362,15 @@
             metamodelType="/0/@diagram/@topLevelNodes.1/@elementType"/>

         <viewmap

             xsi:type="gmfgen:FigureViewmap"

-            figureQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.figure.AssociationFigure"/>

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.figure.AssociationFigure"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.SEMANTIC_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.itemsemantic.CustomAssociationBranchItemSemanticEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.itemsemantic.CustomAssociationBranchItemSemanticEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy"/>

         <modelFacet

             xsi:type="gmfgen:TypeLinkModelFacet">

           <metaClass

@@ -2402,8 +2402,8 @@
           </viewmap>

           <behaviour

               xsi:type="gmfgen:CustomBehaviour"

-              key="org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"

-              editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.DisplayAssociationEndTargetEditPolicy"/>

+              key="org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"

+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.DisplayAssociationEndTargetEditPolicy"/>

           <modelFacet

               xsi:type="gmfgen:FeatureLabelModelFacet"

               parser="/0/@labelParsers/@implementations.4"

@@ -2432,8 +2432,8 @@
           </viewmap>

           <behaviour

               xsi:type="gmfgen:CustomBehaviour"

-              key="org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"

-              editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.DisplayAssociationEndTargetMultiplicityEditPolicy"/>

+              key="org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"

+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.DisplayAssociationEndTargetMultiplicityEditPolicy"/>

           <modelFacet

               xsi:type="gmfgen:FeatureLabelModelFacet"

               parser="/0/@labelParsers/@implementations.0"

@@ -2456,19 +2456,19 @@
             xsi:type="gmfgen:MetamodelType"/>

         <viewmap

             xsi:type="gmfgen:FigureViewmap"

-            figureQualifiedClassName="org.eclipse.papyrus.diagram.common.figure.edge.GeneralizationFigure"/>

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.edge.GeneralizationFigure"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.SEMANTIC_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.itemsemantic.CustomGeneralizationItemSemanticEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.itemsemantic.CustomGeneralizationItemSemanticEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy"/>

         <modelFacet

             xsi:type="gmfgen:TypeLinkModelFacet">

           <metaClass

@@ -2518,15 +2518,15 @@
             metamodelType="/0/@diagram/@topLevelNodes.0/@elementType"/>

         <viewmap

             xsi:type="gmfgen:FigureViewmap"

-            figureQualifiedClassName="org.eclipse.papyrus.diagram.common.figure.edge.DashedEdgeFigure"/>

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy"/>

         <modelFacet

             xsi:type="gmfgen:TypeLinkModelFacet">

           <metaClass

@@ -2611,11 +2611,11 @@
             metamodelType="/0/@diagram/@topLevelNodes.0/@elementType"/>

         <viewmap

             xsi:type="gmfgen:FigureViewmap"

-            figureQualifiedClassName="org.eclipse.papyrus.diagram.common.figure.edge.DashedEdgeFigure"/>

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy"/>

         <modelFacet

             xsi:type="gmfgen:TypeLinkModelFacet">

           <metaClass

@@ -2650,15 +2650,15 @@
             xsi:type="gmfgen:MetamodelType"/>

         <viewmap

             xsi:type="gmfgen:FigureViewmap"

-            figureQualifiedClassName="org.eclipse.papyrus.diagram.common.figure.edge.DashedEdgeFigure"/>

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.AppliedStereotypeElementImportLabelDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.AppliedStereotypeElementImportLabelDisplayEditPolicy"/>

         <modelFacet

             xsi:type="gmfgen:TypeLinkModelFacet">

           <metaClass

@@ -2736,15 +2736,15 @@
             xsi:type="gmfgen:MetamodelType"/>

         <viewmap

             xsi:type="gmfgen:FigureViewmap"

-            figureQualifiedClassName="org.eclipse.papyrus.diagram.common.figure.edge.DashedEdgeFigure"/>

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypePackageImportLabelDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypePackageImportLabelDisplayEditPolicy"/>

         <modelFacet

             xsi:type="gmfgen:TypeLinkModelFacet">

           <metaClass

@@ -2805,7 +2805,7 @@
         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy"/>

         <modelFacet

             xsi:type="gmfgen:FeatureLinkModelFacet">

           <metaFeature

@@ -2829,7 +2829,7 @@
         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy"/>

         <modelFacet

             xsi:type="gmfgen:FeatureLinkModelFacet">

           <metaFeature

@@ -2857,19 +2857,19 @@
         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="&quot;RemoveOrphanView&quot;"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.RemoveOrphanViewPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.RemoveOrphanViewPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.ProfileDiagramDragDropEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.ProfileDiagramDragDropEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.CustomContainerEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.CustomCreationRoleEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomCreationRoleEditPolicy"/>

       </compartments>

       <compartments

           visualID="11"

@@ -2890,19 +2890,19 @@
         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="&quot;RemoveOrphanView&quot;"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.RemoveOrphanViewPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.RemoveOrphanViewPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.ProfileDiagramDragDropEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.ProfileDiagramDragDropEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.CustomContainerEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.CustomCreationRoleEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomCreationRoleEditPolicy"/>

       </compartments>

       <compartments

           visualID="1042"

@@ -2923,19 +2923,19 @@
         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="&quot;RemoveOrphanView&quot;"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.RemoveOrphanViewPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.RemoveOrphanViewPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.ProfileDiagramDragDropEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.ProfileDiagramDragDropEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.CustomContainerEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.CustomCreationRoleEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomCreationRoleEditPolicy"/>

       </compartments>

       <compartments

           visualID="1051"

@@ -2956,19 +2956,19 @@
         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="&quot;RemoveOrphanView&quot;"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.RemoveOrphanViewPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.RemoveOrphanViewPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.ProfileDiagramDragDropEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.ProfileDiagramDragDropEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.CustomContainerEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.CustomCreationRoleEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomCreationRoleEditPolicy"/>

       </compartments>

       <compartments

           visualID="1071"

@@ -2987,11 +2987,11 @@
         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="&quot;RemoveOrphanView&quot;"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.RemoveOrphanViewPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.RemoveOrphanViewPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.ProfileDiagramDragDropEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.ProfileDiagramDragDropEditPolicy"/>

       </compartments>

       <compartments

           visualID="1052"

@@ -3010,11 +3010,11 @@
         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="&quot;RemoveOrphanView&quot;"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.RemoveOrphanViewPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.RemoveOrphanViewPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.ProfileDiagramDragDropEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.ProfileDiagramDragDropEditPolicy"/>

       </compartments>

       <compartments

           visualID="1019"

@@ -3033,11 +3033,11 @@
         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="&quot;RemoveOrphanView&quot;"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.RemoveOrphanViewPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.RemoveOrphanViewPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.ProfileDiagramDragDropEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.ProfileDiagramDragDropEditPolicy"/>

       </compartments>

       <compartments

           visualID="1053"

@@ -3056,11 +3056,11 @@
         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="&quot;RemoveOrphanView&quot;"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.RemoveOrphanViewPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.RemoveOrphanViewPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.ProfileDiagramDragDropEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.ProfileDiagramDragDropEditPolicy"/>

       </compartments>

       <compartments

           visualID="1057"

@@ -3081,19 +3081,19 @@
         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="&quot;RemoveOrphanView&quot;"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.RemoveOrphanViewPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.RemoveOrphanViewPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.ProfileDiagramDragDropEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.ProfileDiagramDragDropEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.CustomContainerEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.CustomCreationRoleEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomCreationRoleEditPolicy"/>

       </compartments>

       <compartments

           visualID="1058"

@@ -3114,19 +3114,19 @@
         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="&quot;RemoveOrphanView&quot;"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.RemoveOrphanViewPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.RemoveOrphanViewPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.ProfileDiagramDragDropEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.ProfileDiagramDragDropEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.CustomContainerEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.CustomCreationRoleEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomCreationRoleEditPolicy"/>

       </compartments>

       <compartments

           visualID="1062"

@@ -3145,11 +3145,11 @@
         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="&quot;RemoveOrphanView&quot;"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.RemoveOrphanViewPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.RemoveOrphanViewPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.ProfileDiagramDragDropEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.ProfileDiagramDragDropEditPolicy"/>

       </compartments>

       <compartments

           visualID="1063"

@@ -3168,11 +3168,11 @@
         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="&quot;RemoveOrphanView&quot;"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.RemoveOrphanViewPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.RemoveOrphanViewPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.ProfileDiagramDragDropEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.ProfileDiagramDragDropEditPolicy"/>

       </compartments>

       <compartments

           visualID="1067"

@@ -3191,11 +3191,11 @@
         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="&quot;RemoveOrphanView&quot;"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.RemoveOrphanViewPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.RemoveOrphanViewPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.ProfileDiagramDragDropEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.ProfileDiagramDragDropEditPolicy"/>

       </compartments>

       <compartments

           visualID="1069"

@@ -3214,11 +3214,11 @@
         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="&quot;RemoveOrphanView&quot;"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.RemoveOrphanViewPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.RemoveOrphanViewPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.ProfileDiagramDragDropEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.ProfileDiagramDragDropEditPolicy"/>

       </compartments>

       <compartments

           visualID="1068"

@@ -3237,11 +3237,11 @@
         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="&quot;RemoveOrphanView&quot;"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.RemoveOrphanViewPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.RemoveOrphanViewPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.ProfileDiagramDragDropEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.ProfileDiagramDragDropEditPolicy"/>

       </compartments>

       <compartments

           visualID="1070"

@@ -3260,11 +3260,11 @@
         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="&quot;RemoveOrphanView&quot;"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.RemoveOrphanViewPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.RemoveOrphanViewPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.profile.custom.policies.ProfileDiagramDragDropEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.profile.custom.policies.ProfileDiagramDragDropEditPolicy"/>

       </compartments>

       <palette>

         <groups

@@ -3445,7 +3445,7 @@
       </preferencePages>

     </diagram>

     <plugin

-        iD="org.eclipse.papyrus.diagram.profile"

+        iD="org.eclipse.papyrus.uml.diagram.profile"

         name="PapyrusUMLProfileDiagram"

         provider="CEA LIST"

         version="0.7.0.vqualifier">

@@ -3485,7 +3485,7 @@
         <expressions

             body="return self.getBody();"/>

         <expressions

-            body="return org.eclipse.papyrus.diagram.common.helper.NamedElementHelper.EINSTANCE.getNewUMLElementName(self.getOwner(), self.eClass());"/>

+            body="return org.eclipse.papyrus.uml.diagram.common.helper.NamedElementHelper.EINSTANCE.getNewUMLElementName(self.getOwner(), self.eClass());"/>

         <expressions

             body="//isAbstract = true&#xD;&#xA;return true;"/>

         <expressions

@@ -3494,10 +3494,10 @@
             body="if (self.getImportedElement() != null) {&#xD;&#xA;&#x9;&#x9;&#x9;return (self.getImportedElement().getLabel());&#xD;&#xA;&#x9;&#x9;}&#xD;&#xA;&#x9;&#x9;return &quot;elementimport&quot;;"/>

         <expressions

             xsi:type="gmfgen:GenConstraint"

-            body="//ExtensionSource&#xD;&#xA;/**we can't make a test here, because, the source must be a Property (ExtensionEnd) and it's a Stereotype&#xD;&#xA; * &#xD;&#xA; * @see org.eclipse.papyrus.diagram.profile.custom.policies.CUMLBaseItemSemanticEditPolicy for the good test!&#xD;&#xA;*/"/>

+            body="//ExtensionSource&#xD;&#xA;/**we can't make a test here, because, the source must be a Property (ExtensionEnd) and it's a Stereotype&#xD;&#xA; * &#xD;&#xA; * @see org.eclipse.papyrus.uml.diagram.profile.custom.policies.CUMLBaseItemSemanticEditPolicy for the good test!&#xD;&#xA;*/"/>

         <expressions

             xsi:type="gmfgen:GenConstraint"

-            body="//ExtensionTarget&#xD;&#xA;&#xD;&#xA;/**we can't make a test here, because, the source must be a Property (ExtensionEnd) and it's a Stereotype&#xD;&#xA; * &#xD;&#xA; * @see org.eclipse.papyrus.diagram.profile.custom.policies.CUMLBaseItemSemanticEditPolicy for the good test!&#xD;&#xA;*/"/>

+            body="//ExtensionTarget&#xD;&#xA;&#xD;&#xA;/**we can't make a test here, because, the source must be a Property (ExtensionEnd) and it's a Stereotype&#xD;&#xA; * &#xD;&#xA; * @see org.eclipse.papyrus.uml.diagram.profile.custom.policies.CUMLBaseItemSemanticEditPolicy for the good test!&#xD;&#xA;*/"/>

         <expressions

             body="org.eclipse.uml2.uml.LiteralString literalString=org.eclipse.uml2.uml.UMLFactory.eINSTANCE.createLiteralString();&#xD;&#xA;literalString.setValue(&quot;&quot;);&#xD;&#xA;return literalString;"/>

         <expressions

@@ -3543,22 +3543,22 @@
       <implementations

           xsi:type="gmfgen:CustomParser"

           uses="/0/@diagram/@links.5/@labels.1/@modelFacet /0/@diagram/@links.1/@labels.0/@modelFacet /0/@diagram/@links.7/@labels.1/@modelFacet"

-          qualifiedName="org.eclipse.papyrus.diagram.common.parser.stereotype.AppliedStereotypeParser"/>

+          qualifiedName="org.eclipse.papyrus.uml.diagram.common.parser.stereotype.AppliedStereotypeParser"/>

       <implementations

           xsi:type="gmfgen:CustomParser"

           uses="/0/@diagram/@links.8/@labels.0/@modelFacet"

-          qualifiedName="org.eclipse.papyrus.diagram.common.parser.packageimport.PackageImportVisibilityParser"/>

+          qualifiedName="org.eclipse.papyrus.uml.diagram.common.parser.packageimport.PackageImportVisibilityParser"/>

       <implementations

           xsi:type="gmfgen:CustomParser"

           uses="/0/@diagram/@topLevelNodes.4/@labels.0/@modelFacet /0/@diagram/@childNodes.8/@labels.0/@modelFacet"

-          qualifiedName="org.eclipse.papyrus.diagram.common.parser.CommentParser"/>

+          qualifiedName="org.eclipse.papyrus.uml.diagram.common.parser.CommentParser"/>

       <implementations

           xsi:type="gmfgen:ExternalParser"

           uses="/0/@diagram/@links.3/@labels.0/@modelFacet"/>

       <implementations

           xsi:type="gmfgen:CustomParser"

           uses="/0/@diagram/@childNodes.12/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.5/@labels.1/@modelFacet"

-          qualifiedName="org.eclipse.papyrus.diagram.common.parser.ConstraintParser"/>

+          qualifiedName="org.eclipse.papyrus.uml.diagram.common.parser.ConstraintParser"/>

     </labelParsers>

     <contextMenus

         context="/0/@diagram">

@@ -3578,70 +3578,70 @@
         comment="Manage the class"

         genView="/0/@diagram/@topLevelNodes.3 /0/@diagram/@topLevelNodes.2 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7"

         name="Extended class editpart"

-        superOwnedEditPart="org.eclipse.papyrus.diagram.common.editparts.ClassifierEditPart">

+        superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.ClassifierEditPart">

       <propRefreshHook

           comment="set the figure active when the feature of the of a class is true"

           triggeringCondition="resolveSemanticElement().equals(event.getNotifier()) &amp;&amp; (event.getFeature() instanceof org.eclipse.emf.ecore.EAttribute)&amp;&amp; ((org.eclipse.emf.ecore.EAttribute) (event.getFeature())).getName().equals(&quot;isActive&quot;)"

-          action="((org.eclipse.papyrus.diagram.common.figure.node.ClassifierFigure) getFigure()).setActive(event.getNewBooleanValue())"/>

+          action="((org.eclipse.papyrus.uml.diagram.common.figure.node.ClassifierFigure) getFigure()).setActive(event.getNewBooleanValue())"/>

     </extensionNodes>

     <extensionNodes

         xsi:type="papyrusgmfgenextension:ExtendedGenView"

         comment="Elements that inherits Classifier"

         genView="/0/@diagram/@childNodes.14 /0/@diagram/@topLevelNodes.11 /0/@diagram/@childNodes.0 /0/@diagram/@topLevelNodes.10 /0/@diagram/@topLevelNodes.9 /0/@diagram/@childNodes.13"

         name="Classifier inheritance"

-        superOwnedEditPart="org.eclipse.papyrus.diagram.common.editparts.ClassifierEditPart"/>

+        superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.ClassifierEditPart"/>

     <extensionNodes

         xsi:type="papyrusgmfgenextension:ExtendedGenView"

         comment="adding to manange otherNamedElement"

         genView="/0/@diagram/@topLevelNodes.8 /0/@diagram/@topLevelNodes.7 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.10 /0/@diagram /0/@diagram/@childNodes.9 /0/@diagram/@topLevelNodes.6"

         name="OtherNamedElementEditPart"

-        superOwnedEditPart="org.eclipse.papyrus.diagram.common.editparts.NamedElementEditPart"/>

+        superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart"/>

     <extensionNodes

         xsi:type="papyrusgmfgenextension:ExtendedGenView"

         comment="Label in charge to display applied stereotypes on links"

         genView="/0/@diagram/@links.4 /0/@diagram/@links.0 /0/@diagram/@links.5 /0/@diagram/@links.7 /0/@diagram/@links.8 /0/@diagram/@links.2"

         name="ExtendedUMLLinks"

-        superOwnedEditPart="org.eclipse.papyrus.diagram.common.editparts.UMLConnectionNodeEditPart"/>

+        superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart"/>

     <extensionNodes

         xsi:type="papyrusgmfgenextension:ExtendedGenView"

         comment="add superclass for compartment"

         genView="/0/@diagram/@compartments.4 /0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.5 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.14 /0/@diagram/@compartments.13 /0/@diagram/@compartments.15"

         name="ResizeableListCompartmentEditPart"

-        superOwnedEditPart="org.eclipse.papyrus.diagram.common.editparts.ResizeableListCompartmentEditPart"/>

+        superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.ResizeableListCompartmentEditPart"/>

     <extensionNodes

         xsi:type="papyrusgmfgenextension:ExtendedGenView"

         comment="used to add its own superclass"

         genView="/0/@diagram/@links.1"

         name="AbstractAssociationEditPart"

-        superOwnedEditPart="org.eclipse.papyrus.diagram.profile.custom.edit.parts.AbstractAssociationEditPart"/>

+        superOwnedEditPart="org.eclipse.papyrus.uml.diagram.profile.custom.edit.parts.AbstractAssociationEditPart"/>

     <extensionNodes

         xsi:type="papyrusgmfgenextension:ExtendedGenView"

         comment="add superclass for short cut"

         genView="/0/@diagram/@topLevelNodes.12"

         name="AbstractShortCutDiagramEditPart"

-        superOwnedEditPart="org.eclipse.papyrus.diagram.common.editparts.AbstractShortCutDiagramEditPart"/>

+        superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.AbstractShortCutDiagramEditPart"/>

     <extensionNodes

         xsi:type="papyrusgmfgenextension:ExtendedGenView"

         comment="abstract association branch for the association"

         genView="/0/@diagram/@links.3"

         name="AbstractAssociationBranchEditPart"

-        superOwnedEditPart="org.eclipse.papyrus.diagram.profile.custom.edit.parts.AbstractAssociationBranchEditPart"/>

+        superOwnedEditPart="org.eclipse.papyrus.uml.diagram.profile.custom.edit.parts.AbstractAssociationBranchEditPart"/>

     <extensionNodes

         xsi:type="papyrusgmfgenextension:ExtendedGenView"

         comment="this is an extension for constraint "

         genView="/0/@diagram/@childNodes.12 /0/@diagram/@topLevelNodes.5"

         name="ConstraintEditPart extension"

-        superOwnedEditPart="org.eclipse.papyrus.diagram.common.editparts.AbstractConstraintEditPart"/>

+        superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.AbstractConstraintEditPart"/>

     <extensionNodes

         xsi:type="papyrusgmfgenextension:ExtendedGenView"

         comment="this is an extension to manage the comment"

         genView="/0/@diagram/@childNodes.8 /0/@diagram/@topLevelNodes.4"

         name="comment extended node"

-        superOwnedEditPart="org.eclipse.papyrus.diagram.common.editparts.AbstractCommentEditPart"/>

+        superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.AbstractCommentEditPart"/>

     <extensionNodes

         xsi:type="papyrusgmfgenextension:AdditionalEditPartCandies"

         comment="add the basic helper to remove all application of stereotypes"

-        baseEditHelperPackage="org.eclipse.papyrus.diagram.common.helper"/>

+        baseEditHelperPackage="org.eclipse.papyrus.uml.diagram.common.helper"/>

     <extensionNodes

         xsi:type="papyrusgmfgenextension:CompartmentTitleVisibilityPreference"

         comment="Hidden Title Compartments"

@@ -3657,39 +3657,39 @@
         xsi:type="papyrusgmfgenextension:LabelVisibilityPreference"

         comment="Name true"

         role="Name"

-        iconPathRole="platform:/plugin/org.eclipse.papyrus.diagram.common/icons/label_role/name.png"

+        iconPathRole="platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/name.png"

         externalNodeLabels="/0/@diagram/@topLevelNodes.12/@labels.0"/>

     <extensionNodes

         xsi:type="papyrusgmfgenextension:LabelVisibilityPreference"

         comment="SourceMultiplicity"

         role="SourceMultiplicity"

-        iconPathRole="platform:/plugin/org.eclipse.papyrus.diagram.common/icons/label_role/MultiplicityHandler.gif"

+        iconPathRole="platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/MultiplicityHandler.gif"

         linkLabels="/0/@diagram/@links.1/@labels.4"

         visibleByDefault="false"/>

     <extensionNodes

         xsi:type="papyrusgmfgenextension:LabelVisibilityPreference"

         comment="TargetMultiplicity"

         role="TargetMultiplicity"

-        iconPathRole="platform:/plugin/org.eclipse.papyrus.diagram.common/icons/label_role/MultiplicityHandler.gif"

+        iconPathRole="platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/MultiplicityHandler.gif"

         linkLabels="/0/@diagram/@links.1/@labels.5"/>

     <extensionNodes

         xsi:type="papyrusgmfgenextension:LabelVisibilityPreference"

         comment="SourceRole"

         role="SourceRole"

-        iconPathRole="platform:/plugin/org.eclipse.papyrus.diagram.common/icons/label_role/role.gif"

+        iconPathRole="platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/role.gif"

         linkLabels="/0/@diagram/@links.1/@labels.3"

         visibleByDefault="false"/>

     <extensionNodes

         xsi:type="papyrusgmfgenextension:LabelVisibilityPreference"

         comment="TargetRole"

         role="TargetRole"

-        iconPathRole="platform:/plugin/org.eclipse.papyrus.diagram.common/icons/label_role/role.gif"

+        iconPathRole="platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/role.gif"

         linkLabels="/0/@diagram/@links.1/@labels.2"/>

     <extensionNodes

         xsi:type="papyrusgmfgenextension:LabelVisibilityPreference"

         comment="Alias"

         role="Alias"

-        iconPathRole="platform:/plugin/org.eclipse.papyrus.diagram.common/icons/label_role/alias.png"

+        iconPathRole="platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/alias.png"

         linkLabels="/0/@diagram/@links.7/@labels.0"/>

     <extensionNodes

         xsi:type="papyrusgmfgenextension:CompartmentVisibilityPreference"

@@ -3707,7 +3707,7 @@
         xsi:type="papyrusgmfgenextension:LabelVisibilityPreference"

         comment="Name false"

         role="Name"

-        iconPathRole="platform:/plugin/org.eclipse.papyrus.diagram.common/icons/label_role/name.png"

+        iconPathRole="platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/name.png"

         linkLabels="/0/@diagram/@links.1/@labels.1 /0/@diagram/@links.5/@labels.0"

         visibleByDefault="false"/>

   </papyrusgmfgenextension:PapyrusExtensionRootNode>

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/plugin.xml
index 800b66cd58f..8166b66513e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/plugin.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/plugin.xml
@@ -25,7 +25,7 @@
 		<paletteProvider class="org.eclipse.gmf.runtime.diagram.ui.providers.DefaultPaletteProvider">

 			<Priority name="Lowest"/>

       		<contribution

-            	factoryClass="org.eclipse.papyrus.diagram.profile.part.UMLPaletteFactory">

+            	factoryClass="org.eclipse.papyrus.uml.diagram.profile.part.UMLPaletteFactory">

      			<predefinedEntry id="standardGroup/noteStack/noteTool" remove="true"/> 

 				<predefinedEntry id="standardGroup/noteStack/textTool" remove="true"/> 

 				<predefinedEntry id="standardGroup/noteStack/noteattachmentTool" remove="true"/>

@@ -215,7 +215,7 @@
 		<paletteProvider class="org.eclipse.gmf.runtime.diagram.ui.providers.DefaultPaletteProvider">

 			<Priority name="Low"/>

       		<contribution

-            	factoryClass="org.eclipse.papyrus.diagram.profile.part.UMLPaletteFactory">

+            	factoryClass="org.eclipse.papyrus.uml.diagram.profile.part.UMLPaletteFactory">

      			<predefinedEntry id="standardGroup/noteStack/noteTool" remove="true"/> 

 				<predefinedEntry id="standardGroup/noteStack/textTool" remove="true"/> 

 				<predefinedEntry id="standardGroup/noteStack/noteattachmentTool" remove="true"/>

@@ -356,7 +356,7 @@
 

 	<extension point="org.eclipse.core.runtime.preferences">

 		<?gmfgen generated="true"?>

-		<initializer class="org.eclipse.papyrus.diagram.profile.preferences.DiagramPreferenceInitializer"/>

+		<initializer class="org.eclipse.papyrus.uml.diagram.profile.preferences.DiagramPreferenceInitializer"/>

 	</extension>

 
    <extension point="org.eclipse.gmf.runtime.diagram.core.viewProviders" id="view-provider">

@@ -447,7 +447,7 @@
 
    <extension point="org.eclipse.gmf.runtime.emf.ui.modelingAssistantProviders" id="modelassist-provider">

       <?gmfgen generated="true"?>

-      <modelingAssistantProvider class="org.eclipse.papyrus.diagram.profile.providers.UMLModelingAssistantProvider">

+      <modelingAssistantProvider class="org.eclipse.papyrus.uml.diagram.profile.providers.UMLModelingAssistantProvider">

          <Priority name="Lowest"/>

          <object class="org.eclipse.papyrus.diagram.profile.edit.parts.ProfileDiagramEditPart" id="Profile_1000"/>

          <object class="org.eclipse.papyrus.diagram.profile.edit.parts.DependencyNodeEditPart" id="Dependency_2014"/>

@@ -469,7 +469,7 @@
 
    <extension point="org.eclipse.gmf.runtime.common.ui.services.iconProviders" id="icon-provider">

       <?gmfgen generated="true"?>

-      <IconProvider class="org.eclipse.papyrus.diagram.profile.providers.UMLIconProvider">

+      <IconProvider class="org.eclipse.papyrus.uml.diagram.profile.providers.UMLIconProvider">

          <Priority name="Lowest"/>

       </IconProvider>

    </extension>

@@ -482,7 +482,7 @@
                name="%metatype.name.Profile_1000"

                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

                eclass="Profile"

-               edithelper="org.eclipse.papyrus.diagram.profile.edit.helpers.ProfileDiagramEditHelper">

+               edithelper="org.eclipse.papyrus.uml.diagram.profile.edit.helpers.ProfileDiagramEditHelper">

             <param name="semanticHint" value="1000"/>

          </metamodelType>

       </metamodel>

@@ -492,7 +492,7 @@
                name="%metatype.name.Dependency_2014"

                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

                eclass="Dependency"

-               edithelper="org.eclipse.papyrus.diagram.profile.edit.helpers.DependencyEditHelper">

+               edithelper="org.eclipse.papyrus.uml.diagram.profile.edit.helpers.DependencyEditHelper">

             <param name="semanticHint" value="2014"/>

          </metamodelType>

       </metamodel>

@@ -502,7 +502,7 @@
                name="%metatype.name.Association_2015"

                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

                eclass="Association"

-               edithelper="org.eclipse.papyrus.diagram.profile.edit.helpers.AssociationEditHelper">

+               edithelper="org.eclipse.papyrus.uml.diagram.profile.edit.helpers.AssociationEditHelper">

             <param name="semanticHint" value="2015"/>

          </metamodelType>

       </metamodel>

@@ -512,7 +512,7 @@
                name="%metatype.name.Stereotype_1026"

                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

                eclass="Stereotype"

-               edithelper="org.eclipse.papyrus.diagram.profile.edit.helpers.StereotypeEditHelper">

+               edithelper="org.eclipse.papyrus.uml.diagram.profile.edit.helpers.StereotypeEditHelper">

             <param name="semanticHint" value="1026"/>

          </metamodelType>

       </metamodel>

@@ -531,7 +531,7 @@
                name="%metatype.name.Comment_1002"

                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

                eclass="Comment"

-               edithelper="org.eclipse.papyrus.diagram.profile.edit.helpers.CommentEditHelper">

+               edithelper="org.eclipse.papyrus.uml.diagram.profile.edit.helpers.CommentEditHelper">

             <param name="semanticHint" value="1002"/>

          </metamodelType>

       </metamodel>

@@ -541,7 +541,7 @@
                name="%metatype.name.Constraint_1014"

                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

                eclass="Constraint"

-               edithelper="org.eclipse.papyrus.diagram.profile.edit.helpers.ConstraintEditHelper">

+               edithelper="org.eclipse.papyrus.uml.diagram.profile.edit.helpers.ConstraintEditHelper">

             <param name="semanticHint" value="1014"/>

          </metamodelType>

       </metamodel>

@@ -551,7 +551,7 @@
                name="%metatype.name.Model_2005"

                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

                eclass="Model"

-               edithelper="org.eclipse.papyrus.diagram.profile.edit.helpers.ModelEditHelper">

+               edithelper="org.eclipse.papyrus.uml.diagram.profile.edit.helpers.ModelEditHelper">

             <param name="semanticHint" value="2005"/>

          </metamodelType>

       </metamodel>

@@ -561,7 +561,7 @@
                name="%metatype.name.Profile_1030"

                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

                eclass="Profile"

-               edithelper="org.eclipse.papyrus.diagram.profile.edit.helpers.ProfileEditHelper">

+               edithelper="org.eclipse.papyrus.uml.diagram.profile.edit.helpers.ProfileEditHelper">

             <param name="semanticHint" value="1030"/>

          </metamodelType>

       </metamodel>

@@ -571,7 +571,7 @@
                name="%metatype.name.Package_2007"

                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

                eclass="Package"

-               edithelper="org.eclipse.papyrus.diagram.profile.edit.helpers.PackageEditHelper">

+               edithelper="org.eclipse.papyrus.uml.diagram.profile.edit.helpers.PackageEditHelper">

             <param name="semanticHint" value="2007"/>

          </metamodelType>

       </metamodel>

@@ -581,7 +581,7 @@
                name="%metatype.name.Enumeration_2006"

                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

                eclass="Enumeration"

-               edithelper="org.eclipse.papyrus.diagram.profile.edit.helpers.EnumerationEditHelper">

+               edithelper="org.eclipse.papyrus.uml.diagram.profile.edit.helpers.EnumerationEditHelper">

             <param name="semanticHint" value="2006"/>

          </metamodelType>

       </metamodel>

@@ -600,7 +600,7 @@
                name="%metatype.name.DataType_2010"

                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

                eclass="DataType"

-               edithelper="org.eclipse.papyrus.diagram.profile.edit.helpers.DataTypeEditHelper">

+               edithelper="org.eclipse.papyrus.uml.diagram.profile.edit.helpers.DataTypeEditHelper">

             <param name="semanticHint" value="2010"/>

          </metamodelType>

       </metamodel>

@@ -610,7 +610,7 @@
                name="%metatype.name.Diagram_2016"

                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

                eclass="Diagram"

-               edithelper="org.eclipse.papyrus.diagram.profile.edit.helpers.ShortCutDiagramEditHelper">

+               edithelper="org.eclipse.papyrus.uml.diagram.profile.edit.helpers.ShortCutDiagramEditHelper">

             <param name="semanticHint" value="2016"/>

          </metamodelType>

       </metamodel>

@@ -620,7 +620,7 @@
                name="%metatype.name.PrimitiveType_3026"

                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

                eclass="PrimitiveType"

-               edithelper="org.eclipse.papyrus.diagram.profile.edit.helpers.PrimitiveTypeEditHelper">

+               edithelper="org.eclipse.papyrus.uml.diagram.profile.edit.helpers.PrimitiveTypeEditHelper">

             <param name="semanticHint" value="3026"/>

          </metamodelType>

       </metamodel>

@@ -630,7 +630,7 @@
                name="%metatype.name.Operation_3019"

                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

                eclass="Operation"

-               edithelper="org.eclipse.papyrus.diagram.profile.edit.helpers.DataTypeOperationEditHelper">

+               edithelper="org.eclipse.papyrus.uml.diagram.profile.edit.helpers.DataTypeOperationEditHelper">

             <param name="semanticHint" value="3019"/>

          </metamodelType>

       </metamodel>

@@ -640,7 +640,7 @@
                name="%metatype.name.EnumerationLiteral_1037"

                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

                eclass="EnumerationLiteral"

-               edithelper="org.eclipse.papyrus.diagram.profile.edit.helpers.EnumerationLiteralEditHelper">

+               edithelper="org.eclipse.papyrus.uml.diagram.profile.edit.helpers.EnumerationLiteralEditHelper">

             <param name="semanticHint" value="1037"/>

          </metamodelType>

       </metamodel>

@@ -650,7 +650,7 @@
                name="%metatype.name.Property_3018"

                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

                eclass="Property"

-               edithelper="org.eclipse.papyrus.diagram.profile.edit.helpers.DataTypePropertyEditHelper">

+               edithelper="org.eclipse.papyrus.uml.diagram.profile.edit.helpers.DataTypePropertyEditHelper">

             <param name="semanticHint" value="3018"/>

          </metamodelType>

       </metamodel>

@@ -660,7 +660,7 @@
                name="%metatype.name.Property_3002"

                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

                eclass="Property"

-               edithelper="org.eclipse.papyrus.diagram.profile.edit.helpers.ClassPropertyEditHelper">

+               edithelper="org.eclipse.papyrus.uml.diagram.profile.edit.helpers.ClassPropertyEditHelper">

             <param name="semanticHint" value="3002"/>

          </metamodelType>

       </metamodel>

@@ -670,7 +670,7 @@
                name="%metatype.name.Operation_3020"

                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

                eclass="Operation"

-               edithelper="org.eclipse.papyrus.diagram.profile.edit.helpers.ClassOperationEditHelper">

+               edithelper="org.eclipse.papyrus.uml.diagram.profile.edit.helpers.ClassOperationEditHelper">

             <param name="semanticHint" value="3020"/>

          </metamodelType>

       </metamodel>

@@ -680,7 +680,7 @@
                name="%metatype.name.Stereotype_1023"

                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

                eclass="Stereotype"

-               edithelper="org.eclipse.papyrus.diagram.profile.edit.helpers.StereotypeEditHelper">

+               edithelper="org.eclipse.papyrus.uml.diagram.profile.edit.helpers.StereotypeEditHelper">

             <param name="semanticHint" value="1023"/>

          </metamodelType>

       </metamodel>

@@ -690,7 +690,7 @@
                name="%metatype.name.Class_3028"

                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

                eclass="Class"

-               edithelper="org.eclipse.papyrus.diagram.profile.edit.helpers.MetaclassEditHelper">

+               edithelper="org.eclipse.papyrus.uml.diagram.profile.edit.helpers.MetaclassEditHelper">

             <param name="semanticHint" value="3028"/>

          </metamodelType>

       </metamodel>

@@ -700,7 +700,7 @@
                name="%metatype.name.Comment_1007"

                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

                eclass="Comment"

-               edithelper="org.eclipse.papyrus.diagram.profile.edit.helpers.CommentEditHelperCN">

+               edithelper="org.eclipse.papyrus.uml.diagram.profile.edit.helpers.CommentEditHelperCN">

             <param name="semanticHint" value="1007"/>

          </metamodelType>

       </metamodel>

@@ -728,7 +728,7 @@
                name="%metatype.name.Package_1012"

                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

                eclass="Package"

-               edithelper="org.eclipse.papyrus.diagram.profile.edit.helpers.PackageEditHelperCN">

+               edithelper="org.eclipse.papyrus.uml.diagram.profile.edit.helpers.PackageEditHelperCN">

             <param name="semanticHint" value="1012"/>

          </metamodelType>

       </metamodel>

@@ -738,7 +738,7 @@
                name="%metatype.name.Constraint_1028"

                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

                eclass="Constraint"

-               edithelper="org.eclipse.papyrus.diagram.profile.edit.helpers.ConstraintEditHelperCN">

+               edithelper="org.eclipse.papyrus.uml.diagram.profile.edit.helpers.ConstraintEditHelperCN">

             <param name="semanticHint" value="1028"/>

          </metamodelType>

       </metamodel>

@@ -766,7 +766,7 @@
                name="%metatype.name.Extension_1013"

                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

                eclass="Extension"

-               edithelper="org.eclipse.papyrus.diagram.profile.edit.helpers.ExtensionEditHelper">

+               edithelper="org.eclipse.papyrus.uml.diagram.profile.edit.helpers.ExtensionEditHelper">

             <param name="semanticHint" value="1013"/>

          </metamodelType>

       </metamodel>

@@ -785,7 +785,7 @@
                name="%metatype.name.ProfileApplication_1045"

                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

                eclass="ProfileApplication"

-               edithelper="org.eclipse.papyrus.diagram.profile.edit.helpers.ProfileApplicationEditHelper">

+               edithelper="org.eclipse.papyrus.uml.diagram.profile.edit.helpers.ProfileApplicationEditHelper">

             <param name="semanticHint" value="1045"/>

          </metamodelType>

       </metamodel>

@@ -804,7 +804,7 @@
                name="%metatype.name.Generalization_4002"

                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

                eclass="Generalization"

-               edithelper="org.eclipse.papyrus.diagram.profile.edit.helpers.GeneralizationEditHelper">

+               edithelper="org.eclipse.papyrus.uml.diagram.profile.edit.helpers.GeneralizationEditHelper">

             <param name="semanticHint" value="4002"/>

          </metamodelType>

       </metamodel>

@@ -832,7 +832,7 @@
                name="%metatype.name.ElementImport_1064"

                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

                eclass="ElementImport"

-               edithelper="org.eclipse.papyrus.diagram.profile.edit.helpers.ElementImportEditHelper">

+               edithelper="org.eclipse.papyrus.uml.diagram.profile.edit.helpers.ElementImportEditHelper">

             <param name="semanticHint" value="1064"/>

          </metamodelType>

       </metamodel>

@@ -842,7 +842,7 @@
                name="%metatype.name.PackageImport_1065"

                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

                eclass="PackageImport"

-               edithelper="org.eclipse.papyrus.diagram.profile.edit.helpers.PackageImportEditHelper">

+               edithelper="org.eclipse.papyrus.uml.diagram.profile.edit.helpers.PackageImportEditHelper">

             <param name="semanticHint" value="1065"/>

          </metamodelType>

       </metamodel>

@@ -923,7 +923,7 @@
       <?gmfgen generated="true"?>

       <command

          categoryId="org.eclipse.ui.category.edit"

-         defaultHandler="org.eclipse.papyrus.diagram.profile.part.UMLDiagramUpdateCommand"

+         defaultHandler="org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramUpdateCommand"

          description="%update.diagram.description"

          id="org.eclipse.papyrus.diagram.profile.updateDiagram"

          name="%update.diagram.name"/>

@@ -949,7 +949,7 @@
 			style="push"

 			tooltip="Create a new Profile Diagram">

 			<visibleWhen>

-				<reference definitionId="org.eclipse.papyrus.diagram.common.IsPapyrusActiveWithUMLProfile"/>

+				<reference definitionId="org.eclipse.papyrus.uml.diagram.common.IsPapyrusActiveWithUMLProfile"/>

 			</visibleWhen> 

 		</command>

 	</toolbar>

@@ -964,20 +964,20 @@
 			style="push"

 			tooltip="Create a new Profile Diagram">

 			<visibleWhen>

-				<reference definitionId="org.eclipse.papyrus.diagram.common.IsPapyrusActiveWithUMLProfile"/>

+				<reference definitionId="org.eclipse.papyrus.uml.diagram.common.IsPapyrusActiveWithUMLProfile"/>

 			</visibleWhen>                 

 		</command>

 	</menu>

 	</menuContribution>

 

-	<menuContribution locationURI="popup:org.eclipse.papyrus.modelexplorer.popupmenu.creatediagram">

+	<menuContribution locationURI="popup:org.eclipse.papyrus.views.modelexplorer.popupmenu.creatediagram">

 		<command commandId="org.eclipse.papyrus.diagram.profile.CreateProfileDiagramCommand"

 			icon="icons/obj16/Diagram_Profile.gif"

 			label="Create a new Profile Diagram"

 			style="push"

 			tooltip="Create a new Profile Diagram">

 			<visibleWhen>

-				<reference definitionId="org.eclipse.papyrus.diagram.common.IsPapyrusActiveWithUMLProfile"/>

+				<reference definitionId="org.eclipse.papyrus.uml.diagram.common.IsPapyrusActiveWithUMLProfile"/>

 			</visibleWhen>

 		</command>

 	</menuContribution>

@@ -996,7 +996,7 @@
                <and>

                   <with variable="activePartId"><equals value="org.eclipse.papyrus.diagram.profile.part.UMLDiagramEditorID"/></with>

                   <with variable="selection"><iterate ifEmpty="false"> 

-                     <instanceof value="org.eclipse.papyrus.diagram.profile.edit.parts.ProfileDiagramEditPart"/>

+                     <instanceof value="org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart"/>

                   </iterate></with>

                </and>

             </visibleWhen>

@@ -1006,13 +1006,13 @@
    <extension

          point="org.eclipse.papyrus.core.papyrusDiagram">

       <editorDiagram

-            actionBarContributorId="org.eclipse.papyrus.diagram.common.part.UMLDiagramActionBarContributor"

-            factoryClass="org.eclipse.papyrus.diagram.profile.ProfileDiagramEditorFactory"

+            actionBarContributorId="org.eclipse.papyrus.uml.diagram.common.part.UMLDiagramActionBarContributor"

+            factoryClass="org.eclipse.papyrus.uml.diagram.profile.ProfileDiagramEditorFactory"

             icon="icons/obj16/Diagram_Profile.gif">

       </editorDiagram>

       <creationCommand

-            creationCommandClass="org.eclipse.papyrus.diagram.profile.CreateProfileDiagramCommand"

-            creationCondition="org.eclipse.papyrus.diagram.profile.ProfileDiagramCreationCondition"

+            creationCommandClass="org.eclipse.papyrus.uml.diagram.profile.CreateProfileDiagramCommand"

+            creationCondition="org.eclipse.papyrus.uml.diagram.profile.ProfileDiagramCreationCondition"

             icon="icons/obj16/Diagram_Profile.gif"

             id="org.eclipse.papyrus.diagram.profile.CreateProfileDiagramCommand"

             language="profile"

@@ -1023,7 +1023,7 @@
       <?gmfgen generated="true"?>

       <propertyContributor

             contributorId="org.eclipse.papyrus.diagram.profile"

-            labelProvider="org.eclipse.papyrus.diagram.profile.sheet.UMLSheetLabelProvider">

+            labelProvider="org.eclipse.papyrus.uml.diagram.profile.sheet.UMLSheetLabelProvider">

          <propertyCategory category="domain"/>

          <propertyCategory category="visual"/>

          <propertyCategory category="extra"/>

@@ -1055,10 +1055,10 @@
          <propertySection

             id="property.section.domain" 

             tab="property.tab.domain"

-            class="org.eclipse.papyrus.diagram.profile.sheet.UMLPropertySection">

+            class="org.eclipse.papyrus.uml.diagram.profile.sheet.UMLPropertySection">

             <input type="org.eclipse.gmf.runtime.notation.View"/>

             <input type="org.eclipse.gef.EditPart"/>

-            <input type="org.eclipse.papyrus.diagram.profile.navigator.UMLAbstractNavigatorItem"/>

+            <input type="org.eclipse.papyrus.uml.diagram.profile.navigator.UMLAbstractNavigatorItem"/>

          </propertySection>

       </propertySections>

    </extension>

@@ -1069,7 +1069,7 @@
       <command id="org.eclipse.papyrus.diagram.profile.LoadResourceAction"

          name="Load Resource"

          categoryId="org.eclipse.papyrus.diagram.profile.part.UMLDiagramEditorID"

-         defaultHandler="org.eclipse.papyrus.diagram.profile.part.LoadResourceAction"/>

+         defaultHandler="org.eclipse.papyrus.uml.diagram.profile.part.LoadResourceAction"/>

    </extension>

 
 <extension point="org.eclipse.ui.handlers" id="menu-handlers">

@@ -1078,7 +1078,7 @@
 <extension

       point="org.eclipse.papyrus.core.service">

    <service

-         classname="org.eclipse.papyrus.diagram.profile.service.ProfileService"

+         classname="org.eclipse.papyrus.uml.diagram.profile.service.ProfileService"

          priority="1"

          startKind="startup"

          useClassTypeAsKey="true">

@@ -1090,7 +1090,7 @@
             id="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLProfileDiagram"

             name="PapyrusUMLProfileDiagram Diagram"

             category="org.eclipse.papyrus.preferences.diagrams"

-            class="org.eclipse.papyrus.diagram.profile.preferences.DiagramGeneralPreferencePage">

+            class="org.eclipse.papyrus.uml.diagram.profile.preferences.DiagramGeneralPreferencePage">

       </page>

       
 
@@ -1099,14 +1099,14 @@
             id="org.eclipse.papyrus.diagram.profile.preferences.DiagramPrintingPreferencePage"

             name="%prefpage.org.eclipse.uml2.uml.diagram.printing"

             category="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLProfileDiagram"

-            class="org.eclipse.papyrus.diagram.profile.preferences.DiagramPrintingPreferencePage">

+            class="org.eclipse.papyrus.uml.diagram.profile.preferences.DiagramPrintingPreferencePage">

       </page>

 
       <page

             id="org.eclipse.papyrus.diagram.profile.preferences.DiagramRulersAndGridPreferencePage"

             name="%prefpage.org.eclipse.uml2.uml.diagram.rulersAndGrid"

             category="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLProfileDiagram"

-            class="org.eclipse.papyrus.diagram.profile.preferences.DiagramRulersAndGridPreferencePage">

+            class="org.eclipse.papyrus.uml.diagram.profile.preferences.DiagramRulersAndGridPreferencePage">

       </page>

 
 
@@ -1119,7 +1119,7 @@
            type="org.eclipse.emf.common.ui.URIEditorInput"

            namespace="org.eclipse.papyrus.diagram.profile"

            properties="isURIEditorInput"

-           class="org.eclipse.papyrus.diagram.profile.part.UMLUriEditorInputTester">

+           class="org.eclipse.papyrus.uml.diagram.profile.part.UMLUriEditorInputTester">

        </propertyTester>

    </extension>

 
@@ -1145,8 +1145,8 @@
             id="org.eclipse.papyrus.diagram.profile.resourceContent" 

             name="%navigatorContentName" 

             priority="normal" 

-            contentProvider="org.eclipse.papyrus.diagram.profile.navigator.UMLNavigatorContentProvider" 

-            labelProvider="org.eclipse.papyrus.diagram.profile.navigator.UMLNavigatorLabelProvider"

+            contentProvider="org.eclipse.papyrus.uml.diagram.profile.navigator.UMLNavigatorContentProvider" 

+            labelProvider="org.eclipse.papyrus.uml.diagram.profile.navigator.UMLNavigatorLabelProvider"

             icon="icons/obj16/UMLDiagramFile.gif"

             activeByDefault="true">

          <triggerPoints>

@@ -1155,24 +1155,24 @@
     	          <instanceof value="org.eclipse.core.resources.IFile"/>

         	      <test property="org.eclipse.core.resources.extension" value="PapyrusUMLProfile_diagram"/>

                </and>

-               <instanceof value="org.eclipse.papyrus.diagram.profile.navigator.UMLAbstractNavigatorItem"/>

+               <instanceof value="org.eclipse.papyrus.uml.diagram.profile.navigator.UMLAbstractNavigatorItem"/>

             </or>

          </triggerPoints>

          <possibleChildren>

             <or>

-         	   <instanceof value="org.eclipse.papyrus.diagram.profile.navigator.UMLAbstractNavigatorItem"/>

+         	   <instanceof value="org.eclipse.papyrus.uml.diagram.profile.navigator.UMLAbstractNavigatorItem"/>

             </or>

          </possibleChildren>

          <commonSorter 

                id="org.eclipse.papyrus.diagram.profile.navigatorSorter" 

-               class="org.eclipse.papyrus.diagram.profile.navigator.UMLNavigatorSorter">

+               class="org.eclipse.papyrus.uml.diagram.profile.navigator.UMLNavigatorSorter">

             <parentExpression>

                <or>

 	              <and>

     	             <instanceof value="org.eclipse.core.resources.IFile"/>

         	         <test property="org.eclipse.core.resources.extension" value="PapyrusUMLProfile_diagram"/>

                   </and>

-                  <instanceof value="org.eclipse.papyrus.diagram.profile.navigator.UMLAbstractNavigatorItem"/>

+                  <instanceof value="org.eclipse.papyrus.uml.diagram.profile.navigator.UMLAbstractNavigatorItem"/>

                </or>

             </parentExpression>

          </commonSorter>

@@ -1181,8 +1181,8 @@
             id="org.eclipse.papyrus.diagram.profile.domainResourceContent" 

             name="%domainNavigatorContentName" 

             priority="normal" 

-            contentProvider="org.eclipse.papyrus.diagram.profile.navigator.UMLDomainNavigatorContentProvider" 

-            labelProvider="org.eclipse.papyrus.diagram.profile.navigator.UMLDomainNavigatorLabelProvider"

+            contentProvider="org.eclipse.papyrus.uml.diagram.profile.navigator.UMLDomainNavigatorContentProvider" 

+            labelProvider="org.eclipse.papyrus.uml.diagram.profile.navigator.UMLDomainNavigatorLabelProvider"

             icon="icons/obj16/UMLDiagramFile.gif"

             activeByDefault="true">

          <triggerPoints>

@@ -1191,19 +1191,19 @@
     	          <instanceof value="org.eclipse.core.resources.IFile"/>

         	      <test property="org.eclipse.core.resources.extension" value="PapyrusUMLProfile"/>

                </and>

-               <instanceof value="org.eclipse.papyrus.diagram.profile.navigator.UMLDomainNavigatorItem"/>

+               <instanceof value="org.eclipse.papyrus.uml.diagram.profile.navigator.UMLDomainNavigatorItem"/>

             </or>

          </triggerPoints>

          <possibleChildren>

-            <instanceof value="org.eclipse.papyrus.diagram.profile.navigator.UMLDomainNavigatorItem"/>

+            <instanceof value="org.eclipse.papyrus.uml.diagram.profile.navigator.UMLDomainNavigatorItem"/>

          </possibleChildren>

       </navigatorContent>

       <actionProvider

             id="org.eclipse.papyrus.diagram.profile.navigatorActionProvider"

-            class="org.eclipse.papyrus.diagram.profile.navigator.UMLNavigatorActionProvider">

+            class="org.eclipse.papyrus.uml.diagram.profile.navigator.UMLNavigatorActionProvider">

          <enablement>

             <or>

-               <instanceof value="org.eclipse.papyrus.diagram.profile.navigator.UMLAbstractNavigatorItem"/>

+               <instanceof value="org.eclipse.papyrus.uml.diagram.profile.navigator.UMLAbstractNavigatorItem"/>

             </or>

          </enablement>

       </actionProvider>

@@ -1213,7 +1213,7 @@
       <?gmfgen generated="true"?>

       <linkHelper

             id="org.eclipse.papyrus.diagram.profile.navigatorLinkHelper"

-            class="org.eclipse.papyrus.diagram.profile.navigator.UMLNavigatorLinkHelper">

+            class="org.eclipse.papyrus.uml.diagram.profile.navigator.UMLNavigatorLinkHelper">

          <editorInputEnablement>

             <and>

                <instanceof value="org.eclipse.emf.common.ui.URIEditorInput"/>

@@ -1221,7 +1221,7 @@
             </and>

          </editorInputEnablement>

          <selectionEnablement>

-            <instanceof value="org.eclipse.papyrus.diagram.profile.navigator.UMLAbstractNavigatorItem"/>

+            <instanceof value="org.eclipse.papyrus.uml.diagram.profile.navigator.UMLAbstractNavigatorItem"/>

          </selectionEnablement>

       </linkHelper>

    </extension>

@@ -1237,7 +1237,7 @@
 <extension

 	point="org.eclipse.ui.handlers">

 	<handler

-		class="org.eclipse.papyrus.diagram.profile.CreateProfileDiagramWithNavigationHandler"

+		class="org.eclipse.papyrus.uml.diagram.profile.CreateProfileDiagramWithNavigationHandler"

 		commandId="org.eclipse.papyrus.diagram.profile.CreateProfileDiagramCommand">

 		<activeWhen>

 		<with

@@ -1253,7 +1253,7 @@
 <extension

 	point="org.eclipse.papyrus.core.papyrusDiagram">

 	<diagramCategory

-       class="org.eclipse.papyrus.diagram.profile.CreateProfileModelCommand"

+       class="org.eclipse.papyrus.uml.diagram.profile.CreateProfileModelCommand"

        description="Profile diagram"

        extensionPrefix="profile"

        icon="icons/wizban/category_profile.gif"

@@ -1267,112 +1267,112 @@
 		

 	<?gmfgen generated="true"?>

 	<page  	category="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLProfileDiagram"

-			class="org.eclipse.papyrus.diagram.profile.preferences.PropertyPreferencePage"

+			class="org.eclipse.papyrus.uml.diagram.profile.preferences.PropertyPreferencePage"

             id="org.eclipse.papyrus.diagram.profile.preferences.PropertyPreferencePage"

             name="Property Node" />

 	
 		

 	<?gmfgen generated="true"?>

 	<page  	category="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLProfileDiagram"

-			class="org.eclipse.papyrus.diagram.profile.preferences.DataTypePreferencePage"

+			class="org.eclipse.papyrus.uml.diagram.profile.preferences.DataTypePreferencePage"

             id="org.eclipse.papyrus.diagram.profile.preferences.DataTypePreferencePage"

             name="DataType Node" />

 	
 		

 	<?gmfgen generated="true"?>

 	<page  	category="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLProfileDiagram"

-			class="org.eclipse.papyrus.diagram.profile.preferences.CommentPreferencePage"

+			class="org.eclipse.papyrus.uml.diagram.profile.preferences.CommentPreferencePage"

             id="org.eclipse.papyrus.diagram.profile.preferences.CommentPreferencePage"

             name="Comment Node" />

 	
 		

 	<?gmfgen generated="true"?>

 	<page  	category="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLProfileDiagram"

-			class="org.eclipse.papyrus.diagram.profile.preferences.EnumerationLiteralPreferencePage"

+			class="org.eclipse.papyrus.uml.diagram.profile.preferences.EnumerationLiteralPreferencePage"

             id="org.eclipse.papyrus.diagram.profile.preferences.EnumerationLiteralPreferencePage"

             name="EnumerationLiteral Node" />

 	
 		

 	<?gmfgen generated="true"?>

 	<page  	category="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLProfileDiagram"

-			class="org.eclipse.papyrus.diagram.profile.preferences.PackagePreferencePage"

+			class="org.eclipse.papyrus.uml.diagram.profile.preferences.PackagePreferencePage"

             id="org.eclipse.papyrus.diagram.profile.preferences.PackagePreferencePage"

             name="Package Node" />

 	
 		

 	<?gmfgen generated="true"?>

 	<page  	category="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLProfileDiagram"

-			class="org.eclipse.papyrus.diagram.profile.preferences.ShortCutDiagramPreferencePage"

+			class="org.eclipse.papyrus.uml.diagram.profile.preferences.ShortCutDiagramPreferencePage"

             id="org.eclipse.papyrus.diagram.profile.preferences.ShortCutDiagramPreferencePage"

             name="ShortCutDiagram Node" />

 	
 		

 	<?gmfgen generated="true"?>

 	<page  	category="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLProfileDiagram"

-			class="org.eclipse.papyrus.diagram.profile.preferences.DependencyPreferencePage"

+			class="org.eclipse.papyrus.uml.diagram.profile.preferences.DependencyPreferencePage"

             id="org.eclipse.papyrus.diagram.profile.preferences.DependencyPreferencePage"

             name="Dependency Node" />

 	
 		

 	<?gmfgen generated="true"?>

 	<page  	category="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLProfileDiagram"

-			class="org.eclipse.papyrus.diagram.profile.preferences.PrimitiveTypePreferencePage"

+			class="org.eclipse.papyrus.uml.diagram.profile.preferences.PrimitiveTypePreferencePage"

             id="org.eclipse.papyrus.diagram.profile.preferences.PrimitiveTypePreferencePage"

             name="PrimitiveType Node" />

 	
 		

 	<?gmfgen generated="true"?>

 	<page  	category="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLProfileDiagram"

-			class="org.eclipse.papyrus.diagram.profile.preferences.EnumerationPreferencePage"

+			class="org.eclipse.papyrus.uml.diagram.profile.preferences.EnumerationPreferencePage"

             id="org.eclipse.papyrus.diagram.profile.preferences.EnumerationPreferencePage"

             name="Enumeration Node" />

 	
 		

 	<?gmfgen generated="true"?>

 	<page  	category="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLProfileDiagram"

-			class="org.eclipse.papyrus.diagram.profile.preferences.ConstraintPreferencePage"

+			class="org.eclipse.papyrus.uml.diagram.profile.preferences.ConstraintPreferencePage"

             id="org.eclipse.papyrus.diagram.profile.preferences.ConstraintPreferencePage"

             name="Constraint Node" />

 	
 		

 	<?gmfgen generated="true"?>

 	<page  	category="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLProfileDiagram"

-			class="org.eclipse.papyrus.diagram.profile.preferences.OperationPreferencePage"

+			class="org.eclipse.papyrus.uml.diagram.profile.preferences.OperationPreferencePage"

             id="org.eclipse.papyrus.diagram.profile.preferences.OperationPreferencePage"

             name="Operation Node" />

 	
 		

 	<?gmfgen generated="true"?>

 	<page  	category="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLProfileDiagram"

-			class="org.eclipse.papyrus.diagram.profile.preferences.ProfilePreferencePage"

+			class="org.eclipse.papyrus.uml.diagram.profile.preferences.ProfilePreferencePage"

             id="org.eclipse.papyrus.diagram.profile.preferences.ProfilePreferencePage"

             name="Profile Node" />

 	
 		

 	<?gmfgen generated="true"?>

 	<page  	category="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLProfileDiagram"

-			class="org.eclipse.papyrus.diagram.profile.preferences.ModelPreferencePage"

+			class="org.eclipse.papyrus.uml.diagram.profile.preferences.ModelPreferencePage"

             id="org.eclipse.papyrus.diagram.profile.preferences.ModelPreferencePage"

             name="Model Node" />

 	
 		

 	<?gmfgen generated="true"?>

 	<page  	category="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLProfileDiagram"

-			class="org.eclipse.papyrus.diagram.profile.preferences.MetaclassPreferencePage"

+			class="org.eclipse.papyrus.uml.diagram.profile.preferences.MetaclassPreferencePage"

             id="org.eclipse.papyrus.diagram.profile.preferences.MetaclassPreferencePage"

             name="Metaclass Node" />

 	
 		

 	<?gmfgen generated="true"?>

 	<page  	category="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLProfileDiagram"

-			class="org.eclipse.papyrus.diagram.profile.preferences.StereotypePreferencePage"

+			class="org.eclipse.papyrus.uml.diagram.profile.preferences.StereotypePreferencePage"

             id="org.eclipse.papyrus.diagram.profile.preferences.StereotypePreferencePage"

             name="Stereotype Node" />

 	
 		

 	<?gmfgen generated="true"?>

 	<page  	category="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLProfileDiagram"

-			class="org.eclipse.papyrus.diagram.profile.preferences.AssociationNodePreferencePage"

+			class="org.eclipse.papyrus.uml.diagram.profile.preferences.AssociationNodePreferencePage"

             id="org.eclipse.papyrus.diagram.profile.preferences.AssociationNodePreferencePage"

             name="AssociationNode Node" />

 	
@@ -1382,7 +1382,7 @@
 

 	<?gmfgen generated="true"?>

 	<page  	category="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLProfileDiagram"

-			class="org.eclipse.papyrus.diagram.profile.preferences.PackageImportPreferencePage"

+			class="org.eclipse.papyrus.uml.diagram.profile.preferences.PackageImportPreferencePage"

             id="org.eclipse.papyrus.diagram.profile.preferences.PackageImportPreferencePage"

             name="PackageImport Link" />

 		

@@ -1390,7 +1390,7 @@
 

 	<?gmfgen generated="true"?>

 	<page  	category="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLProfileDiagram"

-			class="org.eclipse.papyrus.diagram.profile.preferences.ExtensionPreferencePage"

+			class="org.eclipse.papyrus.uml.diagram.profile.preferences.ExtensionPreferencePage"

             id="org.eclipse.papyrus.diagram.profile.preferences.ExtensionPreferencePage"

             name="Extension Link" />

 		

@@ -1398,7 +1398,7 @@
 

 	<?gmfgen generated="true"?>

 	<page  	category="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLProfileDiagram"

-			class="org.eclipse.papyrus.diagram.profile.preferences.ElementImportPreferencePage"

+			class="org.eclipse.papyrus.uml.diagram.profile.preferences.ElementImportPreferencePage"

             id="org.eclipse.papyrus.diagram.profile.preferences.ElementImportPreferencePage"

             name="ElementImport Link" />

 		

@@ -1406,7 +1406,7 @@
 

 	<?gmfgen generated="true"?>

 	<page  	category="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLProfileDiagram"

-			class="org.eclipse.papyrus.diagram.profile.preferences.DependencyPreferencePage"

+			class="org.eclipse.papyrus.uml.diagram.profile.preferences.DependencyPreferencePage"

             id="org.eclipse.papyrus.diagram.profile.preferences.DependencyPreferencePage"

             name="Dependency Link" />

 		

@@ -1414,7 +1414,7 @@
 

 	<?gmfgen generated="true"?>

 	<page  	category="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLProfileDiagram"

-			class="org.eclipse.papyrus.diagram.profile.preferences.GeneralizationPreferencePage"

+			class="org.eclipse.papyrus.uml.diagram.profile.preferences.GeneralizationPreferencePage"

             id="org.eclipse.papyrus.diagram.profile.preferences.GeneralizationPreferencePage"

             name="Generalization Link" />

 		

@@ -1422,7 +1422,7 @@
 

 	<?gmfgen generated="true"?>

 	<page  	category="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLProfileDiagram"

-			class="org.eclipse.papyrus.diagram.profile.preferences.ProfileApplicationPreferencePage"

+			class="org.eclipse.papyrus.uml.diagram.profile.preferences.ProfileApplicationPreferencePage"

             id="org.eclipse.papyrus.diagram.profile.preferences.ProfileApplicationPreferencePage"

             name="ProfileApplication Link" />

 		

@@ -1432,7 +1432,7 @@
 

 	<?gmfgen generated="true"?>

 	<page  	category="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLProfileDiagram"

-			class="org.eclipse.papyrus.diagram.profile.preferences.AssociationBranchPreferencePage"

+			class="org.eclipse.papyrus.uml.diagram.profile.preferences.AssociationBranchPreferencePage"

             id="org.eclipse.papyrus.diagram.profile.preferences.AssociationBranchPreferencePage"

             name="AssociationBranch Link" />

 		

@@ -1440,7 +1440,7 @@
 

 	<?gmfgen generated="true"?>

 	<page  	category="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLProfileDiagram"

-			class="org.eclipse.papyrus.diagram.profile.preferences.AssociationPreferencePage"

+			class="org.eclipse.papyrus.uml.diagram.profile.preferences.AssociationPreferencePage"

             id="org.eclipse.papyrus.diagram.profile.preferences.AssociationPreferencePage"

             name="Association Link" />

 		

@@ -1448,13 +1448,13 @@
 </extension>

 <extension point="org.eclipse.gmf.runtime.common.ui.services.parserProviders" id="parser-provider">

       <?gmfgen generated="true"?>

-      <ParserProvider class="org.eclipse.papyrus.diagram.profile.providers.UMLParserProvider">

+      <ParserProvider class="org.eclipse.papyrus.uml.diagram.profile.providers.UMLParserProvider">

          <Priority name="Lowest"/>

       </ParserProvider>

    </extension>

 <extension point="org.eclipse.gmf.runtime.common.ui.services.markerNavigationProviders" id="markers-navigation">

       <?gmfgen generated="true"?>

-      <MarkerNavigationProvider class="org.eclipse.papyrus.diagram.profile.providers.UMLMarkerNavigationProvider">

+      <MarkerNavigationProvider class="org.eclipse.papyrus.uml.diagram.profile.providers.UMLMarkerNavigationProvider">

          <MarkerType name="org.eclipse.papyrus.diagram.profile.diagnostic"/>

          <Priority name="Lowest"/>

       </MarkerNavigationProvider>

@@ -1467,7 +1467,7 @@
       <persistent value="true"/>

    </extension><extension id="validationDecoratorProvider" name="ValidationDecorations" point="org.eclipse.gmf.runtime.diagram.ui.decoratorProviders">

       <?gmfgen generated="true"?>

-      <decoratorProvider class="org.eclipse.papyrus.diagram.profile.providers.UMLValidationDecoratorProvider">

+      <decoratorProvider class="org.eclipse.papyrus.uml.diagram.profile.providers.UMLValidationDecoratorProvider">

          <Priority name="Lowest"/>

          <object class="org.eclipse.gmf.runtime.diagram.ui.editparts.IPrimaryEditPart(org.eclipse.gmf.runtime.diagram.ui)" id="PRIMARY_VIEW"/>

          <context decoratorTargets="PRIMARY_VIEW"/>

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/AssociationBranchCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/AssociationBranchCreateCommand.java
index 8ef3d35ea80..b61730d10e7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/AssociationBranchCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/AssociationBranchCreateCommand.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.commands;

+package org.eclipse.papyrus.uml.diagram.profile.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -24,7 +24,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.papyrus.diagram.profile.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.UMLBaseItemSemanticEditPolicy;

 import org.eclipse.uml2.uml.Association;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.Type;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/AssociationBranchReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/AssociationBranchReorientCommand.java
index 59e30d641a3..a60a4aade5d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/AssociationBranchReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/AssociationBranchReorientCommand.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.commands;

+package org.eclipse.papyrus.uml.diagram.profile.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -20,7 +20,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gmf.runtime.common.core.command.CommandResult;

 import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.profile.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.UMLBaseItemSemanticEditPolicy;

 import org.eclipse.uml2.uml.Association;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.Type;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/AssociationCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/AssociationCreateCommand.java
index 42b7cd12fcf..9e4ae80efc1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/AssociationCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/AssociationCreateCommand.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.commands;

+package org.eclipse.papyrus.uml.diagram.profile.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -24,7 +24,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.papyrus.diagram.profile.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.UMLBaseItemSemanticEditPolicy;

 import org.eclipse.uml2.uml.Association;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.Type;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/AssociationNodeCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/AssociationNodeCreateCommand.java
index 42f3c9e8c03..c02a6b7c0bd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/AssociationNodeCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/AssociationNodeCreateCommand.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.commands;

+package org.eclipse.papyrus.uml.diagram.profile.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/AssociationReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/AssociationReorientCommand.java
index 3503874c0a1..b60cc311bdb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/AssociationReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/AssociationReorientCommand.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.commands;

+package org.eclipse.papyrus.uml.diagram.profile.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -20,7 +20,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gmf.runtime.common.core.command.CommandResult;

 import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.profile.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.UMLBaseItemSemanticEditPolicy;

 import org.eclipse.uml2.uml.Association;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.Type;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/ClassOperationCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ClassOperationCreateCommand.java
index 162f75d87cd..46bd0445af4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/ClassOperationCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ClassOperationCreateCommand.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.commands;

+package org.eclipse.papyrus.uml.diagram.profile.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -25,7 +25,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.profile.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.profile.providers.ElementInitializers;

 import org.eclipse.uml2.uml.Class;

 import org.eclipse.uml2.uml.Operation;

 import org.eclipse.uml2.uml.UMLFactory;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/ClassPropertyCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ClassPropertyCreateCommand.java
index 9bdc8184435..dc002530466 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/ClassPropertyCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ClassPropertyCreateCommand.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.commands;

+package org.eclipse.papyrus.uml.diagram.profile.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -25,7 +25,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.profile.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.profile.providers.ElementInitializers;

 import org.eclipse.uml2.uml.Property;

 import org.eclipse.uml2.uml.StructuredClassifier;

 import org.eclipse.uml2.uml.UMLFactory;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/CommentAnnotatedElementCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/CommentAnnotatedElementCreateCommand.java
index 189eed5ec44..c997a153d4f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/CommentAnnotatedElementCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/CommentAnnotatedElementCreateCommand.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.commands;

+package org.eclipse.papyrus.uml.diagram.profile.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -20,7 +20,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gmf.runtime.common.core.command.CommandResult;

 import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.papyrus.diagram.profile.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.UMLBaseItemSemanticEditPolicy;

 import org.eclipse.uml2.uml.Comment;

 import org.eclipse.uml2.uml.Element;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/CommentAnnotatedElementReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/CommentAnnotatedElementReorientCommand.java
index 26bd8d6fc69..8faca7b5d29 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/CommentAnnotatedElementReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/CommentAnnotatedElementReorientCommand.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.commands;

+package org.eclipse.papyrus.uml.diagram.profile.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -21,7 +21,7 @@ import org.eclipse.gmf.runtime.common.core.command.CommandResult;
 import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.profile.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.UMLBaseItemSemanticEditPolicy;

 import org.eclipse.uml2.uml.Comment;

 import org.eclipse.uml2.uml.Element;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/CommentCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/CommentCreateCommandCN.java
index 5e9fddbdfe5..d95aa3fe16f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/CommentCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/CommentCreateCommandCN.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.commands;

+package org.eclipse.papyrus.uml.diagram.profile.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -25,7 +25,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.profile.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.profile.providers.ElementInitializers;

 import org.eclipse.uml2.uml.Comment;

 import org.eclipse.uml2.uml.Element;

 import org.eclipse.uml2.uml.UMLFactory;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/CommentEditPartCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/CommentEditPartCreateCommand.java
index ed1d1617679..38fcbce22cd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/CommentEditPartCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/CommentEditPartCreateCommand.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.commands;

+package org.eclipse.papyrus.uml.diagram.profile.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -25,7 +25,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.profile.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.profile.providers.ElementInitializers;

 import org.eclipse.uml2.uml.Comment;

 import org.eclipse.uml2.uml.Element;

 import org.eclipse.uml2.uml.UMLFactory;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/ConstraintConstrainedElementCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ConstraintConstrainedElementCreateCommand.java
index 2bdee685fcb..a06db3c569a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/ConstraintConstrainedElementCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ConstraintConstrainedElementCreateCommand.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.commands;

+package org.eclipse.papyrus.uml.diagram.profile.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -20,7 +20,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gmf.runtime.common.core.command.CommandResult;

 import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.papyrus.diagram.profile.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.UMLBaseItemSemanticEditPolicy;

 import org.eclipse.uml2.uml.Constraint;

 import org.eclipse.uml2.uml.Element;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/ConstraintConstrainedElementReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ConstraintConstrainedElementReorientCommand.java
index 6956de32348..41735fa593b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/ConstraintConstrainedElementReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ConstraintConstrainedElementReorientCommand.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.commands;

+package org.eclipse.papyrus.uml.diagram.profile.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -21,7 +21,7 @@ import org.eclipse.gmf.runtime.common.core.command.CommandResult;
 import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.profile.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.UMLBaseItemSemanticEditPolicy;

 import org.eclipse.uml2.uml.Constraint;

 import org.eclipse.uml2.uml.Element;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/ConstraintCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ConstraintCreateCommand.java
index 18cd6a4c115..a904b1a1821 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/ConstraintCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ConstraintCreateCommand.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.commands;

+package org.eclipse.papyrus.uml.diagram.profile.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -25,7 +25,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.profile.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.profile.providers.ElementInitializers;

 import org.eclipse.uml2.uml.Constraint;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.UMLFactory;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/ConstraintCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ConstraintCreateCommandCN.java
index d241226fc23..77b85c3e7b2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/ConstraintCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ConstraintCreateCommandCN.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.commands;

+package org.eclipse.papyrus.uml.diagram.profile.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -25,7 +25,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.profile.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.profile.providers.ElementInitializers;

 import org.eclipse.uml2.uml.Constraint;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.UMLFactory;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/DataTypeCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/DataTypeCreateCommand.java
index 25a2b6b4cf7..a0cda915a0f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/DataTypeCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/DataTypeCreateCommand.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.commands;

+package org.eclipse.papyrus.uml.diagram.profile.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -25,7 +25,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.profile.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.profile.providers.ElementInitializers;

 import org.eclipse.uml2.uml.DataType;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.UMLFactory;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/DataTypeCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/DataTypeCreateCommandCN.java
index bd1e6632b45..04b0bf5e337 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/DataTypeCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/DataTypeCreateCommandCN.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.commands;

+package org.eclipse.papyrus.uml.diagram.profile.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -25,7 +25,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.profile.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.profile.providers.ElementInitializers;

 import org.eclipse.uml2.uml.DataType;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.UMLFactory;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/DataTypeOperationCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/DataTypeOperationCreateCommand.java
index 96208cd5e40..b492b87803f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/DataTypeOperationCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/DataTypeOperationCreateCommand.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.commands;

+package org.eclipse.papyrus.uml.diagram.profile.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -25,7 +25,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.profile.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.profile.providers.ElementInitializers;

 import org.eclipse.uml2.uml.DataType;

 import org.eclipse.uml2.uml.Operation;

 import org.eclipse.uml2.uml.UMLFactory;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/DataTypePropertyCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/DataTypePropertyCreateCommand.java
index fdcfc5face4..713aecd8413 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/DataTypePropertyCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/DataTypePropertyCreateCommand.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.commands;

+package org.eclipse.papyrus.uml.diagram.profile.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -25,7 +25,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.profile.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.profile.providers.ElementInitializers;

 import org.eclipse.uml2.uml.DataType;

 import org.eclipse.uml2.uml.Property;

 import org.eclipse.uml2.uml.UMLFactory;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/DependencyBranchCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/DependencyBranchCreateCommand.java
index 2790c450130..2ee7729701a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/DependencyBranchCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/DependencyBranchCreateCommand.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.commands;

+package org.eclipse.papyrus.uml.diagram.profile.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -24,8 +24,8 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.papyrus.diagram.profile.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.profile.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.providers.ElementInitializers;

 import org.eclipse.uml2.uml.Dependency;

 import org.eclipse.uml2.uml.NamedElement;

 import org.eclipse.uml2.uml.Package;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/DependencyBranchReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/DependencyBranchReorientCommand.java
index c606576450d..5acfe327bb7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/DependencyBranchReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/DependencyBranchReorientCommand.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.commands;

+package org.eclipse.papyrus.uml.diagram.profile.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -20,7 +20,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gmf.runtime.common.core.command.CommandResult;

 import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.profile.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.UMLBaseItemSemanticEditPolicy;

 import org.eclipse.uml2.uml.Dependency;

 import org.eclipse.uml2.uml.NamedElement;

 import org.eclipse.uml2.uml.Package;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/DependencyCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/DependencyCreateCommand.java
index a99dae923aa..8ff51d4edd9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/DependencyCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/DependencyCreateCommand.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.commands;

+package org.eclipse.papyrus.uml.diagram.profile.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -24,8 +24,8 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.papyrus.diagram.profile.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.profile.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.providers.ElementInitializers;

 import org.eclipse.uml2.uml.Dependency;

 import org.eclipse.uml2.uml.NamedElement;

 import org.eclipse.uml2.uml.Package;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/DependencyNodeCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/DependencyNodeCreateCommand.java
index 25d368e1cb7..3e04cce7d6b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/DependencyNodeCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/DependencyNodeCreateCommand.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.commands;

+package org.eclipse.papyrus.uml.diagram.profile.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/DependencyReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/DependencyReorientCommand.java
index 8aeb6126537..7d02f7daa3a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/DependencyReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/DependencyReorientCommand.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.commands;

+package org.eclipse.papyrus.uml.diagram.profile.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -20,7 +20,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gmf.runtime.common.core.command.CommandResult;

 import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.profile.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.UMLBaseItemSemanticEditPolicy;

 import org.eclipse.uml2.uml.Dependency;

 import org.eclipse.uml2.uml.NamedElement;

 import org.eclipse.uml2.uml.Package;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/ElementImportCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ElementImportCreateCommand.java
index 349866dfc1c..15b83f8a214 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/ElementImportCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ElementImportCreateCommand.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.commands;

+package org.eclipse.papyrus.uml.diagram.profile.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -24,8 +24,8 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.papyrus.diagram.profile.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.profile.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.providers.ElementInitializers;

 import org.eclipse.uml2.uml.ElementImport;

 import org.eclipse.uml2.uml.Namespace;

 import org.eclipse.uml2.uml.PackageableElement;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/ElementImportReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ElementImportReorientCommand.java
index 73fd00d15ba..2b7ab3178b2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/ElementImportReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ElementImportReorientCommand.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.commands;

+package org.eclipse.papyrus.uml.diagram.profile.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -20,7 +20,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gmf.runtime.common.core.command.CommandResult;

 import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.profile.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.UMLBaseItemSemanticEditPolicy;

 import org.eclipse.uml2.uml.ElementImport;

 import org.eclipse.uml2.uml.Namespace;

 import org.eclipse.uml2.uml.PackageableElement;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/EnumerationCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/EnumerationCreateCommand.java
index 94c2dd28dc0..5f9ef640558 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/EnumerationCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/EnumerationCreateCommand.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.commands;

+package org.eclipse.papyrus.uml.diagram.profile.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -25,7 +25,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.profile.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.profile.providers.ElementInitializers;

 import org.eclipse.uml2.uml.Enumeration;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.UMLFactory;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/EnumerationCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/EnumerationCreateCommandCN.java
index d2b81f680bf..8b9150017f5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/EnumerationCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/EnumerationCreateCommandCN.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.commands;

+package org.eclipse.papyrus.uml.diagram.profile.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -25,7 +25,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.profile.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.profile.providers.ElementInitializers;

 import org.eclipse.uml2.uml.Enumeration;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.UMLFactory;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/EnumerationLiteralCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/EnumerationLiteralCreateCommand.java
index 4905c1b48c3..92a5a1800c6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/EnumerationLiteralCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/EnumerationLiteralCreateCommand.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.commands;

+package org.eclipse.papyrus.uml.diagram.profile.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -25,7 +25,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.profile.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.profile.providers.ElementInitializers;

 import org.eclipse.uml2.uml.Enumeration;

 import org.eclipse.uml2.uml.EnumerationLiteral;

 import org.eclipse.uml2.uml.UMLFactory;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/ExtensionCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ExtensionCreateCommand.java
index b730cddfa4b..9ea27790510 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/ExtensionCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ExtensionCreateCommand.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.commands;

+package org.eclipse.papyrus.uml.diagram.profile.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -24,7 +24,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.papyrus.diagram.profile.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.UMLBaseItemSemanticEditPolicy;

 import org.eclipse.uml2.uml.Class;

 import org.eclipse.uml2.uml.Extension;

 import org.eclipse.uml2.uml.Package;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/ExtensionReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ExtensionReorientCommand.java
index 12731e625c7..5843bd40907 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/ExtensionReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ExtensionReorientCommand.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.commands;

+package org.eclipse.papyrus.uml.diagram.profile.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -20,7 +20,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gmf.runtime.common.core.command.CommandResult;

 import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.profile.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.UMLBaseItemSemanticEditPolicy;

 import org.eclipse.uml2.uml.Class;

 import org.eclipse.uml2.uml.Extension;

 import org.eclipse.uml2.uml.Package;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/GeneralizationCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/GeneralizationCreateCommand.java
index 46ed489732b..192b63b7ea7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/GeneralizationCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/GeneralizationCreateCommand.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.commands;

+package org.eclipse.papyrus.uml.diagram.profile.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -24,7 +24,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.papyrus.diagram.profile.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.UMLBaseItemSemanticEditPolicy;

 import org.eclipse.uml2.uml.Classifier;

 import org.eclipse.uml2.uml.Generalization;

 import org.eclipse.uml2.uml.UMLFactory;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/GeneralizationReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/GeneralizationReorientCommand.java
index 795c9984308..5aeaf723f28 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/GeneralizationReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/GeneralizationReorientCommand.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.commands;

+package org.eclipse.papyrus.uml.diagram.profile.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -20,7 +20,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gmf.runtime.common.core.command.CommandResult;

 import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.profile.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.UMLBaseItemSemanticEditPolicy;

 import org.eclipse.uml2.uml.Classifier;

 import org.eclipse.uml2.uml.Generalization;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/MetaclassCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/MetaclassCreateCommand.java
index 1fa2fb3a318..06506088efe 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/MetaclassCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/MetaclassCreateCommand.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.commands;

+package org.eclipse.papyrus.uml.diagram.profile.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -25,7 +25,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.profile.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.profile.providers.ElementInitializers;

 import org.eclipse.uml2.uml.Class;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.UMLFactory;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/MetaclassCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/MetaclassCreateCommandCN.java
index 704502e1628..a7635ada528 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/MetaclassCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/MetaclassCreateCommandCN.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.commands;

+package org.eclipse.papyrus.uml.diagram.profile.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -25,7 +25,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.profile.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.profile.providers.ElementInitializers;

 import org.eclipse.uml2.uml.Class;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.UMLFactory;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/ModelCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ModelCreateCommandCN.java
index eae8c9159d4..bd1bc2b65e6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/ModelCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ModelCreateCommandCN.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.commands;

+package org.eclipse.papyrus.uml.diagram.profile.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -25,7 +25,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.profile.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.profile.providers.ElementInitializers;

 import org.eclipse.uml2.uml.Model;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.UMLFactory;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/ModelCreateCommandTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ModelCreateCommandTN.java
index 04afaadcfa3..d128d539951 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/ModelCreateCommandTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ModelCreateCommandTN.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.commands;

+package org.eclipse.papyrus.uml.diagram.profile.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -25,7 +25,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.profile.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.profile.providers.ElementInitializers;

 import org.eclipse.uml2.uml.Model;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.UMLFactory;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/PackageCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/PackageCreateCommand.java
index 9b47a571229..770a10a9a75 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/PackageCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/PackageCreateCommand.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.commands;

+package org.eclipse.papyrus.uml.diagram.profile.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -25,7 +25,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.profile.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.profile.providers.ElementInitializers;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.UMLFactory;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/PackageCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/PackageCreateCommandCN.java
index a24c7f07b2a..a85de15d82e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/PackageCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/PackageCreateCommandCN.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.commands;

+package org.eclipse.papyrus.uml.diagram.profile.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -25,7 +25,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.profile.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.profile.providers.ElementInitializers;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.UMLFactory;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/PackageImportCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/PackageImportCreateCommand.java
index aa29c7e4e9a..b4ee7190f8f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/PackageImportCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/PackageImportCreateCommand.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.commands;

+package org.eclipse.papyrus.uml.diagram.profile.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -24,7 +24,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.papyrus.diagram.profile.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.UMLBaseItemSemanticEditPolicy;

 import org.eclipse.uml2.uml.Namespace;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.PackageImport;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/PackageImportReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/PackageImportReorientCommand.java
index 1a99b88be96..5436f768dbd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/PackageImportReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/PackageImportReorientCommand.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.commands;

+package org.eclipse.papyrus.uml.diagram.profile.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -20,7 +20,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gmf.runtime.common.core.command.CommandResult;

 import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.profile.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.UMLBaseItemSemanticEditPolicy;

 import org.eclipse.uml2.uml.Namespace;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.PackageImport;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/PrimitiveTypeCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/PrimitiveTypeCreateCommand.java
index 38266c5bbfe..4eb81b6cf90 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/PrimitiveTypeCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/PrimitiveTypeCreateCommand.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.commands;

+package org.eclipse.papyrus.uml.diagram.profile.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -25,7 +25,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.profile.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.profile.providers.ElementInitializers;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.PrimitiveType;

 import org.eclipse.uml2.uml.UMLFactory;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/PrimitiveTypeCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/PrimitiveTypeCreateCommandCN.java
index bf4884aab1f..8f24c0de09d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/PrimitiveTypeCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/PrimitiveTypeCreateCommandCN.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.commands;

+package org.eclipse.papyrus.uml.diagram.profile.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -25,7 +25,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.profile.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.profile.providers.ElementInitializers;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.PrimitiveType;

 import org.eclipse.uml2.uml.UMLFactory;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/ProfileApplicationCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ProfileApplicationCreateCommand.java
index 8e9a38a8771..d234d44aab0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/ProfileApplicationCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ProfileApplicationCreateCommand.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.commands;

+package org.eclipse.papyrus.uml.diagram.profile.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -24,7 +24,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.papyrus.diagram.profile.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.UMLBaseItemSemanticEditPolicy;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.Profile;

 import org.eclipse.uml2.uml.ProfileApplication;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/ProfileApplicationReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ProfileApplicationReorientCommand.java
index 61691f8203f..841b5cf4d6c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/ProfileApplicationReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ProfileApplicationReorientCommand.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.commands;

+package org.eclipse.papyrus.uml.diagram.profile.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -20,7 +20,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gmf.runtime.common.core.command.CommandResult;

 import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.profile.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.UMLBaseItemSemanticEditPolicy;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.Profile;

 import org.eclipse.uml2.uml.ProfileApplication;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/ProfileCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ProfileCreateCommandCN.java
index 165dd6952d1..c95dfd948f5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/ProfileCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ProfileCreateCommandCN.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.commands;

+package org.eclipse.papyrus.uml.diagram.profile.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -25,7 +25,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.profile.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.profile.providers.ElementInitializers;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.Profile;

 import org.eclipse.uml2.uml.UMLFactory;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/ProfileCreateCommandTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ProfileCreateCommandTN.java
index 38ca2ad32f1..6a560320a84 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/ProfileCreateCommandTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ProfileCreateCommandTN.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.commands;

+package org.eclipse.papyrus.uml.diagram.profile.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -25,7 +25,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.profile.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.profile.providers.ElementInitializers;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.Profile;

 import org.eclipse.uml2.uml.UMLFactory;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/ShortCutDiagramCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ShortCutDiagramCreateCommand.java
index 1a9ef92d0e7..09ea5438e27 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/ShortCutDiagramCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ShortCutDiagramCreateCommand.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.commands;

+package org.eclipse.papyrus.uml.diagram.profile.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/StereotypeCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/StereotypeCreateCommand.java
index cd3de598829..a3e4f3b313c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/StereotypeCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/StereotypeCreateCommand.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.commands;

+package org.eclipse.papyrus.uml.diagram.profile.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -25,7 +25,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.profile.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.profile.providers.ElementInitializers;

 import org.eclipse.uml2.uml.Profile;

 import org.eclipse.uml2.uml.Stereotype;

 import org.eclipse.uml2.uml.UMLFactory;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/StereotypeCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/StereotypeCreateCommandCN.java
index 368ba0e43ce..849af64359f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/commands/StereotypeCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/StereotypeCreateCommandCN.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.commands;

+package org.eclipse.papyrus.uml.diagram.profile.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -25,7 +25,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.profile.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.profile.providers.ElementInitializers;

 import org.eclipse.uml2.uml.Profile;

 import org.eclipse.uml2.uml.Stereotype;

 import org.eclipse.uml2.uml.UMLFactory;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/helpers/AssociationEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/AssociationEditHelper.java
index 9d1c3e5a308..0cbd7c124b7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/helpers/AssociationEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/AssociationEditHelper.java
@@ -11,9 +11,9 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.profile.edit.helpers;

 

-import org.eclipse.papyrus.diagram.common.helper.UMLBaseEditHelper;

+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/helpers/ClassOperationEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/ClassOperationEditHelper.java
index ed4c7b0d978..95794b3e8a5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/helpers/ClassOperationEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/ClassOperationEditHelper.java
@@ -11,9 +11,9 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.profile.edit.helpers;

 

-import org.eclipse.papyrus.diagram.common.helper.UMLBaseEditHelper;

+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/helpers/ClassPropertyEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/ClassPropertyEditHelper.java
index e250b33cc79..317fb44281d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/helpers/ClassPropertyEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/ClassPropertyEditHelper.java
@@ -11,9 +11,9 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.profile.edit.helpers;

 

-import org.eclipse.papyrus.diagram.common.helper.UMLBaseEditHelper;

+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/helpers/CommentEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/CommentEditHelper.java
index cd897082677..52375376a44 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/helpers/CommentEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/CommentEditHelper.java
@@ -11,9 +11,9 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.profile.edit.helpers;

 

-import org.eclipse.papyrus.diagram.common.helper.UMLBaseEditHelper;

+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/helpers/CommentEditHelperCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/CommentEditHelperCN.java
index d5025503324..73f085151e7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/helpers/CommentEditHelperCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/CommentEditHelperCN.java
@@ -11,9 +11,9 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.profile.edit.helpers;

 

-import org.eclipse.papyrus.diagram.common.helper.UMLBaseEditHelper;

+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/helpers/ConstraintEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/ConstraintEditHelper.java
index 15b22a55e14..ae1ac9eae02 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/helpers/ConstraintEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/ConstraintEditHelper.java
@@ -11,9 +11,9 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.profile.edit.helpers;

 

-import org.eclipse.papyrus.diagram.common.helper.UMLBaseEditHelper;

+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/helpers/ConstraintEditHelperCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/ConstraintEditHelperCN.java
index d2e0e0da8d7..d6243db7a8d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/helpers/ConstraintEditHelperCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/ConstraintEditHelperCN.java
@@ -11,9 +11,9 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.profile.edit.helpers;

 

-import org.eclipse.papyrus.diagram.common.helper.UMLBaseEditHelper;

+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/helpers/DataTypeEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/DataTypeEditHelper.java
index 699df9085b3..97be3f4db13 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/helpers/DataTypeEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/DataTypeEditHelper.java
@@ -11,9 +11,9 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.profile.edit.helpers;

 

-import org.eclipse.papyrus.diagram.common.helper.UMLBaseEditHelper;

+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/helpers/DataTypeOperationEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/DataTypeOperationEditHelper.java
index 378bdaba058..2ee04a40615 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/helpers/DataTypeOperationEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/DataTypeOperationEditHelper.java
@@ -11,9 +11,9 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.profile.edit.helpers;

 

-import org.eclipse.papyrus.diagram.common.helper.UMLBaseEditHelper;

+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/helpers/DataTypePropertyEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/DataTypePropertyEditHelper.java
index 24b2b9d83a4..0f6be9660c0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/helpers/DataTypePropertyEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/DataTypePropertyEditHelper.java
@@ -11,9 +11,9 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.profile.edit.helpers;

 

-import org.eclipse.papyrus.diagram.common.helper.UMLBaseEditHelper;

+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/helpers/DependencyEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/DependencyEditHelper.java
index 7d7f4b99288..5eda0f68aaa 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/helpers/DependencyEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/DependencyEditHelper.java
@@ -11,9 +11,9 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.profile.edit.helpers;

 

-import org.eclipse.papyrus.diagram.common.helper.UMLBaseEditHelper;

+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/helpers/ElementImportEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/ElementImportEditHelper.java
index 08f2c4b72d1..f11bb354946 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/helpers/ElementImportEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/ElementImportEditHelper.java
@@ -11,9 +11,9 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.profile.edit.helpers;

 

-import org.eclipse.papyrus.diagram.common.helper.UMLBaseEditHelper;

+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/helpers/EnumerationEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/EnumerationEditHelper.java
index d63b0bc251b..f1c3dac15ee 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/helpers/EnumerationEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/EnumerationEditHelper.java
@@ -11,9 +11,9 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.profile.edit.helpers;

 

-import org.eclipse.papyrus.diagram.common.helper.UMLBaseEditHelper;

+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/helpers/EnumerationLiteralEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/EnumerationLiteralEditHelper.java
index defb1bfd104..f7fe6edf502 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/helpers/EnumerationLiteralEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/EnumerationLiteralEditHelper.java
@@ -11,9 +11,9 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.profile.edit.helpers;

 

-import org.eclipse.papyrus.diagram.common.helper.UMLBaseEditHelper;

+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/helpers/ExtensionEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/ExtensionEditHelper.java
index d38e89d49a4..a34e00260c4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/helpers/ExtensionEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/ExtensionEditHelper.java
@@ -11,9 +11,9 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.profile.edit.helpers;

 

-import org.eclipse.papyrus.diagram.common.helper.UMLBaseEditHelper;

+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/helpers/GeneralizationEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/GeneralizationEditHelper.java
index b0a576513ba..9a0c2808672 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/helpers/GeneralizationEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/GeneralizationEditHelper.java
@@ -11,9 +11,9 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.profile.edit.helpers;

 

-import org.eclipse.papyrus.diagram.common.helper.UMLBaseEditHelper;

+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/helpers/MetaclassEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/MetaclassEditHelper.java
index 8dfbfed284d..e2ebfdf123e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/helpers/MetaclassEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/MetaclassEditHelper.java
@@ -11,9 +11,9 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.profile.edit.helpers;

 

-import org.eclipse.papyrus.diagram.common.helper.UMLBaseEditHelper;

+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/helpers/ModelEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/ModelEditHelper.java
index 8ff3d2d3070..56a4e06c547 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/helpers/ModelEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/ModelEditHelper.java
@@ -11,9 +11,9 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.profile.edit.helpers;

 

-import org.eclipse.papyrus.diagram.common.helper.UMLBaseEditHelper;

+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/helpers/PackageEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/PackageEditHelper.java
index 544f92ecb7d..5de2c3952fe 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/helpers/PackageEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/PackageEditHelper.java
@@ -11,9 +11,9 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.profile.edit.helpers;

 

-import org.eclipse.papyrus.diagram.common.helper.UMLBaseEditHelper;

+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/helpers/PackageEditHelperCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/PackageEditHelperCN.java
index 7fe54216d24..703f591eb32 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/helpers/PackageEditHelperCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/PackageEditHelperCN.java
@@ -11,9 +11,9 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.profile.edit.helpers;

 

-import org.eclipse.papyrus.diagram.common.helper.UMLBaseEditHelper;

+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/helpers/PackageImportEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/PackageImportEditHelper.java
index 8c59c19a20c..286300e5d48 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/helpers/PackageImportEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/PackageImportEditHelper.java
@@ -11,9 +11,9 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.profile.edit.helpers;

 

-import org.eclipse.papyrus.diagram.common.helper.UMLBaseEditHelper;

+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/helpers/PrimitiveTypeEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/PrimitiveTypeEditHelper.java
index 631b99badb2..0f68c735c65 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/helpers/PrimitiveTypeEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/PrimitiveTypeEditHelper.java
@@ -11,9 +11,9 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.profile.edit.helpers;

 

-import org.eclipse.papyrus.diagram.common.helper.UMLBaseEditHelper;

+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/helpers/ProfileApplicationEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/ProfileApplicationEditHelper.java
index 2cae28393b4..d4273b5e0d3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/helpers/ProfileApplicationEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/ProfileApplicationEditHelper.java
@@ -11,9 +11,9 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.profile.edit.helpers;

 

-import org.eclipse.papyrus.diagram.common.helper.UMLBaseEditHelper;

+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/helpers/ProfileDiagramEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/ProfileDiagramEditHelper.java
index 387fde14563..917fe43e929 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/helpers/ProfileDiagramEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/ProfileDiagramEditHelper.java
@@ -11,9 +11,9 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.profile.edit.helpers;

 

-import org.eclipse.papyrus.diagram.common.helper.UMLBaseEditHelper;

+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/helpers/ProfileEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/ProfileEditHelper.java
index d623bd3ecb6..b751550697e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/helpers/ProfileEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/ProfileEditHelper.java
@@ -11,9 +11,9 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.profile.edit.helpers;

 

-import org.eclipse.papyrus.diagram.common.helper.UMLBaseEditHelper;

+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/helpers/ShortCutDiagramEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/ShortCutDiagramEditHelper.java
index b39965c5841..f2404b553b1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/helpers/ShortCutDiagramEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/ShortCutDiagramEditHelper.java
@@ -11,9 +11,9 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.profile.edit.helpers;

 

-import org.eclipse.papyrus.diagram.common.helper.UMLBaseEditHelper;

+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/helpers/StereotypeEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/StereotypeEditHelper.java
index c0c7bb49c5a..1aec9a59147 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/helpers/StereotypeEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/StereotypeEditHelper.java
@@ -11,9 +11,9 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.profile.edit.helpers;

 

-import org.eclipse.papyrus.diagram.common.helper.UMLBaseEditHelper;

+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/helpers/UMLBaseEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/UMLBaseEditHelper.java
index 35c659a2933..4ffaf4be8fd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/helpers/UMLBaseEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/UMLBaseEditHelper.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.profile.edit.helpers;

 

 import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;

 import org.eclipse.gmf.runtime.common.core.command.ICommand;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/AppliedStereotypeElementImportEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/AppliedStereotypeElementImportEditPart.java
index 076bdb39235..cd7828350c0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/AppliedStereotypeElementImportEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/AppliedStereotypeElementImportEditPart.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -51,15 +51,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editparts.ILabelRoleProvider;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.profile.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.profile.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.profile.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -69,6 +60,15 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -130,7 +130,7 @@ public class AppliedStereotypeElementImportEditPart extends LabelEditPart implem
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.profile.edit.parts.AppliedStereotypeElementImportEditPart.VISUAL_ID), new Point(0, 60));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.AppliedStereotypeElementImportEditPart.VISUAL_ID), new Point(0, 60));

 	}

 

 	/**

@@ -346,7 +346,7 @@ public class AppliedStereotypeElementImportEditPart extends LabelEditPart implem
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.ElementImport_1064, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.profile.edit.parts.AppliedStereotypeElementImportEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.ElementImport_1064, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.AppliedStereotypeElementImportEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -596,7 +596,7 @@ public class AppliedStereotypeElementImportEditPart extends LabelEditPart implem
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/AssociationAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/AssociationAppliedStereotypeEditPart.java
index f54e788411c..9424941454d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/AssociationAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/AssociationAppliedStereotypeEditPart.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -51,15 +51,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editparts.ILabelRoleProvider;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.profile.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.profile.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.profile.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -69,6 +60,15 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -130,7 +130,7 @@ public class AssociationAppliedStereotypeEditPart extends LabelEditPart implemen
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.profile.edit.parts.AssociationAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 60));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 60));

 	}

 

 	/**

@@ -346,7 +346,7 @@ public class AssociationAppliedStereotypeEditPart extends LabelEditPart implemen
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Association_4001, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.profile.edit.parts.AssociationAppliedStereotypeEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Association_4001, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationAppliedStereotypeEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -596,7 +596,7 @@ public class AssociationAppliedStereotypeEditPart extends LabelEditPart implemen
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/AssociationBranchEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/AssociationBranchEditPart.java
index a5c21fae690..17a7ec57b4e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/AssociationBranchEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/AssociationBranchEditPart.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.edit.parts;

 

 import org.eclipse.draw2d.Connection;

 import org.eclipse.gef.EditPart;

@@ -19,11 +19,11 @@ import org.eclipse.gef.EditPolicy;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.profile.custom.edit.parts.AbstractAssociationBranchEditPart;

-import org.eclipse.papyrus.diagram.profile.custom.figure.AssociationFigure;

-import org.eclipse.papyrus.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.profile.custom.policies.itemsemantic.CustomAssociationBranchItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.profile.edit.policies.AssociationBranchItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.custom.edit.parts.AbstractAssociationBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.custom.figure.AssociationFigure;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.itemsemantic.CustomAssociationBranchItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.AssociationBranchItemSemanticEditPolicy;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/AssociationBranchMultiplicityEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/AssociationBranchMultiplicityEditPart.java
index 4e51671fa90..c5266f4613e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/AssociationBranchMultiplicityEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/AssociationBranchMultiplicityEditPart.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -51,15 +51,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.profile.custom.policies.DisplayAssociationEndTargetMultiplicityEditPolicy;

-import org.eclipse.papyrus.diagram.profile.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.profile.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.profile.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -69,6 +60,15 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.DisplayAssociationEndTargetMultiplicityEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -129,7 +129,7 @@ public class AssociationBranchMultiplicityEditPart extends LabelEditPart impleme
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.profile.edit.parts.AssociationBranchMultiplicityEditPart.VISUAL_ID), new Point(0, 20));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationBranchMultiplicityEditPart.VISUAL_ID), new Point(0, 20));

 	}

 

 	/**

@@ -346,7 +346,7 @@ public class AssociationBranchMultiplicityEditPart extends LabelEditPart impleme
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Association_4019, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.profile.edit.parts.AssociationBranchMultiplicityEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Association_4019, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationBranchMultiplicityEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -596,7 +596,7 @@ public class AssociationBranchMultiplicityEditPart extends LabelEditPart impleme
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/AssociationBranchRoleEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/AssociationBranchRoleEditPart.java
index e1525311ea0..886301827cc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/AssociationBranchRoleEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/AssociationBranchRoleEditPart.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -51,15 +51,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.profile.custom.policies.DisplayAssociationEndTargetEditPolicy;

-import org.eclipse.papyrus.diagram.profile.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.profile.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.profile.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -69,6 +60,15 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.DisplayAssociationEndTargetEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -129,7 +129,7 @@ public class AssociationBranchRoleEditPart extends LabelEditPart implements ITex
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.profile.edit.parts.AssociationBranchRoleEditPart.VISUAL_ID), new Point(0, -20));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationBranchRoleEditPart.VISUAL_ID), new Point(0, -20));

 	}

 

 	/**

@@ -346,7 +346,7 @@ public class AssociationBranchRoleEditPart extends LabelEditPart implements ITex
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Association_4019, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.profile.edit.parts.AssociationBranchRoleEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Association_4019, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationBranchRoleEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -596,7 +596,7 @@ public class AssociationBranchRoleEditPart extends LabelEditPart implements ITex
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/AssociationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/AssociationEditPart.java
index b08a313b632..fd7c59c2543 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/AssociationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/AssociationEditPart.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.edit.parts;

 

 import org.eclipse.draw2d.Connection;

 import org.eclipse.gef.EditPart;

@@ -19,12 +19,12 @@ import org.eclipse.gef.EditPolicy;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.profile.custom.edit.parts.AbstractAssociationEditPart;

-import org.eclipse.papyrus.diagram.profile.custom.figure.AssociationFigure;

-import org.eclipse.papyrus.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.profile.custom.policies.itemsemantic.CustomAssociationItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.profile.edit.policies.AssociationItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.custom.edit.parts.AbstractAssociationEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.custom.figure.AssociationFigure;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.itemsemantic.CustomAssociationItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.AssociationItemSemanticEditPolicy;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/AssociationMultiplicitySourceEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/AssociationMultiplicitySourceEditPart.java
index cd592990ed9..5c422267f39 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/AssociationMultiplicitySourceEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/AssociationMultiplicitySourceEditPart.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -51,16 +51,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editparts.ILabelRoleProvider;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.profile.custom.policies.DisplayAssociationEndSourceMultiplicityEditPolicy;

-import org.eclipse.papyrus.diagram.profile.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.profile.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.profile.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -70,6 +60,16 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.DisplayAssociationEndSourceMultiplicityEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -131,7 +131,7 @@ public class AssociationMultiplicitySourceEditPart extends LabelEditPart impleme
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.profile.edit.parts.AssociationMultiplicitySourceEditPart.VISUAL_ID), new Point(0, 20));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationMultiplicitySourceEditPart.VISUAL_ID), new Point(0, 20));

 	}

 

 	/**

@@ -348,7 +348,7 @@ public class AssociationMultiplicitySourceEditPart extends LabelEditPart impleme
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Association_4001, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.profile.edit.parts.AssociationMultiplicitySourceEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Association_4001, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationMultiplicitySourceEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -598,7 +598,7 @@ public class AssociationMultiplicitySourceEditPart extends LabelEditPart impleme
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

@@ -754,7 +754,7 @@ public class AssociationMultiplicitySourceEditPart extends LabelEditPart impleme
 	 * @generated

 	 */

 	public String getIconPathRole() {

-		return "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/label_role/MultiplicityHandler.gif";//$NON-NLS-1$

+		return "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/MultiplicityHandler.gif";//$NON-NLS-1$

 	}

 

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/AssociationMultiplicityTargetEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/AssociationMultiplicityTargetEditPart.java
index 4e5dd8f21ba..d6c611296fc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/AssociationMultiplicityTargetEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/AssociationMultiplicityTargetEditPart.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -51,16 +51,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editparts.ILabelRoleProvider;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.profile.custom.policies.DisplayAssociationEndTargetMultiplicityEditPolicy;

-import org.eclipse.papyrus.diagram.profile.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.profile.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.profile.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -70,6 +60,16 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.DisplayAssociationEndTargetMultiplicityEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -131,7 +131,7 @@ public class AssociationMultiplicityTargetEditPart extends LabelEditPart impleme
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.profile.edit.parts.AssociationMultiplicityTargetEditPart.VISUAL_ID), new Point(0, -20));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationMultiplicityTargetEditPart.VISUAL_ID), new Point(0, -20));

 	}

 

 	/**

@@ -348,7 +348,7 @@ public class AssociationMultiplicityTargetEditPart extends LabelEditPart impleme
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Association_4001, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.profile.edit.parts.AssociationMultiplicityTargetEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Association_4001, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationMultiplicityTargetEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -598,7 +598,7 @@ public class AssociationMultiplicityTargetEditPart extends LabelEditPart impleme
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

@@ -754,7 +754,7 @@ public class AssociationMultiplicityTargetEditPart extends LabelEditPart impleme
 	 * @generated

 	 */

 	public String getIconPathRole() {

-		return "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/label_role/MultiplicityHandler.gif";//$NON-NLS-1$

+		return "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/MultiplicityHandler.gif";//$NON-NLS-1$

 	}

 

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/AssociationNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/AssociationNameEditPart.java
index 9f3f8bbd961..63e950fc355 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/AssociationNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/AssociationNameEditPart.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -51,15 +51,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editparts.ILabelRoleProvider;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.profile.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.profile.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.profile.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -69,6 +60,15 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -130,7 +130,7 @@ public class AssociationNameEditPart extends LabelEditPart implements ITextAware
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.profile.edit.parts.AssociationNameEditPart.VISUAL_ID), new Point(0, 20));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationNameEditPart.VISUAL_ID), new Point(0, 20));

 	}

 

 	/**

@@ -346,7 +346,7 @@ public class AssociationNameEditPart extends LabelEditPart implements ITextAware
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Association_4001, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.profile.edit.parts.AssociationNameEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Association_4001, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationNameEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -596,7 +596,7 @@ public class AssociationNameEditPart extends LabelEditPart implements ITextAware
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

@@ -752,7 +752,7 @@ public class AssociationNameEditPart extends LabelEditPart implements ITextAware
 	 * @generated

 	 */

 	public String getIconPathRole() {

-		return "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/label_role/name.png";//$NON-NLS-1$

+		return "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/name.png";//$NON-NLS-1$

 	}

 

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/AssociationNodeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/AssociationNodeEditPart.java
index 7fe5a9eec50..9f17d05abdd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/AssociationNodeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/AssociationNodeEditPart.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.edit.parts;

 

 import java.util.ArrayList;

 import java.util.LinkedList;

@@ -44,14 +44,14 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.common.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.papyrus.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.profile.custom.policies.itemsemantic.CustomAssociationNodeItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.profile.edit.policies.AssociationNodeItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.profile.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.itemsemantic.CustomAssociationNodeItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.AssociationNodeItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 import org.eclipse.swt.graphics.Color;

 

 /**

@@ -240,7 +240,7 @@ ShapeNodeEditPart {
 	 */

 	public List<IElementType> getMARelTypesOnSourceAndTarget(IGraphicalEditPart targetEditPart) {

 		LinkedList<IElementType> types = new LinkedList<IElementType>();

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.AssociationNodeEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationNodeEditPart) {

 			types.add(UMLElementTypes.Association_4001);

 		}

 		if(targetEditPart instanceof StereotypeEditPart) {

@@ -273,7 +273,7 @@ ShapeNodeEditPart {
 		if(targetEditPart instanceof DataTypeEditPartCN) {

 			types.add(UMLElementTypes.Association_4001);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.AssociationNodeEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationNodeEditPart) {

 			types.add(UMLElementTypes.Association_4019);

 		}

 		if(targetEditPart instanceof StereotypeEditPart) {

@@ -306,7 +306,7 @@ ShapeNodeEditPart {
 		if(targetEditPart instanceof DataTypeEditPartCN) {

 			types.add(UMLElementTypes.Association_4019);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.AssociationNodeEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationNodeEditPart) {

 			types.add(UMLElementTypes.Generalization_4002);

 		}

 		if(targetEditPart instanceof StereotypeEditPart) {

@@ -342,7 +342,7 @@ ShapeNodeEditPart {
 		if(targetEditPart instanceof DependencyNodeEditPart) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.AssociationNodeEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationNodeEditPart) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

 		if(targetEditPart instanceof StereotypeEditPart) {

@@ -402,7 +402,7 @@ ShapeNodeEditPart {
 		if(targetEditPart instanceof DependencyNodeEditPart) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.AssociationNodeEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationNodeEditPart) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

 		if(targetEditPart instanceof StereotypeEditPart) {

@@ -462,7 +462,7 @@ ShapeNodeEditPart {
 		if(targetEditPart instanceof DependencyNodeEditPart) {

 			types.add(UMLElementTypes.ElementImport_1064);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.AssociationNodeEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationNodeEditPart) {

 			types.add(UMLElementTypes.ElementImport_1064);

 		}

 		if(targetEditPart instanceof StereotypeEditPart) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/AssociationRoleSourceEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/AssociationRoleSourceEditPart.java
index 9f4c76d3c4c..af62f8ff00b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/AssociationRoleSourceEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/AssociationRoleSourceEditPart.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -51,16 +51,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editparts.ILabelRoleProvider;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.profile.custom.policies.DisplayAssociationEndSourceEditPolicy;

-import org.eclipse.papyrus.diagram.profile.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.profile.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.profile.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -70,6 +60,16 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.DisplayAssociationEndSourceEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -131,7 +131,7 @@ public class AssociationRoleSourceEditPart extends LabelEditPart implements ITex
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.profile.edit.parts.AssociationRoleSourceEditPart.VISUAL_ID), new Point(0, -20));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationRoleSourceEditPart.VISUAL_ID), new Point(0, -20));

 	}

 

 	/**

@@ -348,7 +348,7 @@ public class AssociationRoleSourceEditPart extends LabelEditPart implements ITex
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Association_4001, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.profile.edit.parts.AssociationRoleSourceEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Association_4001, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationRoleSourceEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -598,7 +598,7 @@ public class AssociationRoleSourceEditPart extends LabelEditPart implements ITex
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

@@ -746,7 +746,7 @@ public class AssociationRoleSourceEditPart extends LabelEditPart implements ITex
 	 * @generated

 	 */

 	public String getIconPathRole() {

-		return "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/label_role/role.gif";//$NON-NLS-1$

+		return "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/role.gif";//$NON-NLS-1$

 	}

 

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/AssociationRoleTargetEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/AssociationRoleTargetEditPart.java
index 25b26387932..e28749a2272 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/AssociationRoleTargetEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/AssociationRoleTargetEditPart.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -51,16 +51,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editparts.ILabelRoleProvider;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.profile.custom.policies.DisplayAssociationEndTargetEditPolicy;

-import org.eclipse.papyrus.diagram.profile.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.profile.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.profile.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -70,6 +60,16 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.DisplayAssociationEndTargetEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -131,7 +131,7 @@ public class AssociationRoleTargetEditPart extends LabelEditPart implements ITex
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.profile.edit.parts.AssociationRoleTargetEditPart.VISUAL_ID), new Point(0, 20));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationRoleTargetEditPart.VISUAL_ID), new Point(0, 20));

 	}

 

 	/**

@@ -348,7 +348,7 @@ public class AssociationRoleTargetEditPart extends LabelEditPart implements ITex
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Association_4001, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.profile.edit.parts.AssociationRoleTargetEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Association_4001, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationRoleTargetEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -598,7 +598,7 @@ public class AssociationRoleTargetEditPart extends LabelEditPart implements ITex
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

@@ -746,7 +746,7 @@ public class AssociationRoleTargetEditPart extends LabelEditPart implements ITex
 	 * @generated

 	 */

 	public String getIconPathRole() {

-		return "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/label_role/role.gif";//$NON-NLS-1$

+		return "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/role.gif";//$NON-NLS-1$

 	}

 

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/ClassOperationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ClassOperationEditPart.java
index 0dc6057b7d2..c6d64fab7ff 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/ClassOperationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ClassOperationEditPart.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -56,19 +56,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.profile.custom.policies.AppliedStereotypeOperationDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.profile.custom.policies.OperationLabelEditPolicy;

-import org.eclipse.papyrus.diagram.profile.edit.policies.ClassOperationItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.profile.edit.policies.UMLTextNonResizableEditPolicy;

-import org.eclipse.papyrus.diagram.profile.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.profile.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.profile.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -78,6 +65,19 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.AppliedStereotypeOperationDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.OperationLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.ClassOperationItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.UMLTextNonResizableEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -358,7 +358,7 @@ implements ITextAwareEditPart, IPrimaryEditPart {
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Operation_3020, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.profile.edit.parts.ClassOperationEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Operation_3020, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.ClassOperationEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -608,7 +608,7 @@ implements ITextAwareEditPart, IPrimaryEditPart {
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/ClassPropertyEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ClassPropertyEditPart.java
index 1838d12accb..e78965bd1cd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/ClassPropertyEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ClassPropertyEditPart.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -56,19 +56,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.profile.custom.policies.AppliedStereotypePropertyDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.profile.custom.policies.PropertyLabelEditPolicy;

-import org.eclipse.papyrus.diagram.profile.edit.policies.ClassPropertyItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.profile.edit.policies.UMLTextNonResizableEditPolicy;

-import org.eclipse.papyrus.diagram.profile.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.profile.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.profile.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -78,6 +65,19 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.AppliedStereotypePropertyDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.PropertyLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.ClassPropertyItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.UMLTextNonResizableEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -358,7 +358,7 @@ implements ITextAwareEditPart, IPrimaryEditPart {
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Property_3002, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.profile.edit.parts.ClassPropertyEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Property_3002, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.ClassPropertyEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -608,7 +608,7 @@ implements ITextAwareEditPart, IPrimaryEditPart {
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/CommentAnnotatedElementEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/CommentAnnotatedElementEditPart.java
index 5bf30325c23..3e387e4a564 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/CommentAnnotatedElementEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/CommentAnnotatedElementEditPart.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.edit.parts;

 

 import org.eclipse.draw2d.Connection;

 import org.eclipse.draw2d.Graphics;

@@ -21,8 +21,8 @@ import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.profile.edit.policies.CommentAnnotatedElementItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.CommentAnnotatedElementItemSemanticEditPolicy;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/CommentBodyEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/CommentBodyEditPart.java
index c3e451ec340..940f2016fe9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/CommentBodyEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/CommentBodyEditPart.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -50,15 +50,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.HTMLCornerBentFigure;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.profile.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.profile.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.profile.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -68,6 +59,15 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.HTMLCornerBentFigure;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -327,7 +327,7 @@ public class CommentBodyEditPart extends CompartmentEditPart implements ITextAwa
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Comment_1002, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.profile.edit.parts.CommentBodyEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Comment_1002, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.CommentBodyEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -577,7 +577,7 @@ public class CommentBodyEditPart extends CompartmentEditPart implements ITextAwa
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/CommentBodyEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/CommentBodyEditPartCN.java
index 13c73d3ff8a..1e650242e44 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/CommentBodyEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/CommentBodyEditPartCN.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -50,15 +50,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.HTMLCornerBentFigure;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.profile.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.profile.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.profile.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -68,6 +59,15 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.HTMLCornerBentFigure;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -327,7 +327,7 @@ public class CommentBodyEditPartCN extends CompartmentEditPart implements ITextA
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Comment_1007, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.profile.edit.parts.CommentBodyEditPartCN.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Comment_1007, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.CommentBodyEditPartCN.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -577,7 +577,7 @@ public class CommentBodyEditPartCN extends CompartmentEditPart implements ITextA
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/CommentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/CommentEditPart.java
index f17e03207c3..445debbba99 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/CommentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/CommentEditPart.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.edit.parts;

 

 import java.util.ArrayList;

 import java.util.LinkedList;

@@ -40,18 +40,18 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.common.editparts.AbstractCommentEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.HTMLCornerBentFigure;

-import org.eclipse.papyrus.diagram.common.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.papyrus.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.profile.edit.policies.CommentEditPartItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.profile.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.profile.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractCommentEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.HTMLCornerBentFigure;

+import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.CommentEditPartItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 import org.eclipse.swt.graphics.Color;

 

 /**

@@ -320,7 +320,7 @@ AbstractCommentEditPart {
 		if(targetEditPart instanceof MetaclassEditPart) {

 			types.add(UMLElementTypes.CommentAnnotatedElement_1022);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.CommentEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.CommentEditPart) {

 			types.add(UMLElementTypes.CommentAnnotatedElement_1022);

 		}

 		if(targetEditPart instanceof ConstraintEditPart) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/CommentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/CommentEditPartCN.java
index fbaaac5dd24..485d7d70479 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/CommentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/CommentEditPartCN.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.edit.parts;

 

 import java.util.ArrayList;

 import java.util.LinkedList;

@@ -40,18 +40,18 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.common.editparts.AbstractCommentEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.HTMLCornerBentFigure;

-import org.eclipse.papyrus.diagram.common.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.papyrus.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.profile.edit.policies.CommentItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.diagram.profile.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.profile.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractCommentEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.HTMLCornerBentFigure;

+import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.CommentItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 import org.eclipse.swt.graphics.Color;

 

 /**

@@ -353,7 +353,7 @@ AbstractCommentEditPart {
 		if(targetEditPart instanceof MetaclassEditPartCN) {

 			types.add(UMLElementTypes.CommentAnnotatedElement_1022);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.CommentEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.CommentEditPartCN) {

 			types.add(UMLElementTypes.CommentAnnotatedElement_1022);

 		}

 		if(targetEditPart instanceof ModelEditPartCN) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/ConstraintBodyEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ConstraintBodyEditPart.java
index 30a6942f8fa..f3a4554e577 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/ConstraintBodyEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ConstraintBodyEditPart.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -50,15 +50,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ConstraintFigure;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.profile.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.profile.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.profile.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -68,6 +59,15 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -327,7 +327,7 @@ public class ConstraintBodyEditPart extends CompartmentEditPart implements IText
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Constraint_1014, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.profile.edit.parts.ConstraintBodyEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Constraint_1014, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.ConstraintBodyEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -577,7 +577,7 @@ public class ConstraintBodyEditPart extends CompartmentEditPart implements IText
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/ConstraintBondyEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ConstraintBondyEditPartCN.java
index 8a0c24482f0..2d0e39501e8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/ConstraintBondyEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ConstraintBondyEditPartCN.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -50,15 +50,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ConstraintFigure;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.profile.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.profile.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.profile.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -68,6 +59,15 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -327,7 +327,7 @@ public class ConstraintBondyEditPartCN extends CompartmentEditPart implements IT
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Constraint_1028, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.profile.edit.parts.ConstraintBondyEditPartCN.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Constraint_1028, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.ConstraintBondyEditPartCN.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -577,7 +577,7 @@ public class ConstraintBondyEditPartCN extends CompartmentEditPart implements IT
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/ConstraintConstrainedElementEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ConstraintConstrainedElementEditPart.java
index 6f222b67137..414ccc9a67e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/ConstraintConstrainedElementEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ConstraintConstrainedElementEditPart.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.edit.parts;

 

 import org.eclipse.draw2d.Connection;

 import org.eclipse.draw2d.Graphics;

@@ -21,8 +21,8 @@ import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.profile.edit.policies.ConstraintConstrainedElementItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.ConstraintConstrainedElementItemSemanticEditPolicy;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/ConstraintEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ConstraintEditPart.java
index 133bdd5a73e..8ea8c44d8e3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/ConstraintEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ConstraintEditPart.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.edit.parts;

 

 import java.util.ArrayList;

 import java.util.LinkedList;

@@ -40,18 +40,18 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.common.editparts.AbstractConstraintEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ConstraintFigure;

-import org.eclipse.papyrus.diagram.common.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.papyrus.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.profile.edit.policies.ConstraintItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.profile.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.profile.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractConstraintEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure;

+import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.ConstraintItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 import org.eclipse.swt.graphics.Color;

 

 /**

@@ -330,7 +330,7 @@ AbstractConstraintEditPart {
 		if(targetEditPart instanceof MetaclassEditPart) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.ConstraintEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.ConstraintEditPart) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

 		if(targetEditPart instanceof ModelEditPartTN) {

@@ -390,7 +390,7 @@ AbstractConstraintEditPart {
 		if(targetEditPart instanceof MetaclassEditPart) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.ConstraintEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.ConstraintEditPart) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

 		if(targetEditPart instanceof ModelEditPartTN) {

@@ -453,7 +453,7 @@ AbstractConstraintEditPart {
 		if(targetEditPart instanceof CommentEditPart) {

 			types.add(UMLElementTypes.ConstraintConstrainedElement_4014);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.ConstraintEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.ConstraintEditPart) {

 			types.add(UMLElementTypes.ConstraintConstrainedElement_4014);

 		}

 		if(targetEditPart instanceof ModelEditPartTN) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/ConstraintEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ConstraintEditPartCN.java
index 0efe0affe1b..1c01d6315cc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/ConstraintEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ConstraintEditPartCN.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.edit.parts;

 

 import java.util.ArrayList;

 import java.util.LinkedList;

@@ -40,16 +40,16 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.common.editparts.AbstractConstraintEditPart;

-import org.eclipse.papyrus.diagram.common.figure.node.ConstraintFigure;

-import org.eclipse.papyrus.diagram.common.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.papyrus.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.profile.edit.policies.ConstraintItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.diagram.profile.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.profile.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractConstraintEditPart;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure;

+import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.ConstraintItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 import org.eclipse.swt.graphics.Color;

 

 /**

@@ -365,7 +365,7 @@ AbstractConstraintEditPart {
 		if(targetEditPart instanceof PackageEditPartCN) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.ConstraintEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.ConstraintEditPartCN) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

 		if(targetEditPart instanceof EnumerationEditPartCN) {

@@ -425,7 +425,7 @@ AbstractConstraintEditPart {
 		if(targetEditPart instanceof PackageEditPartCN) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.ConstraintEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.ConstraintEditPartCN) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

 		if(targetEditPart instanceof EnumerationEditPartCN) {

@@ -491,7 +491,7 @@ AbstractConstraintEditPart {
 		if(targetEditPart instanceof PackageEditPartCN) {

 			types.add(UMLElementTypes.ConstraintConstrainedElement_4014);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.ConstraintEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.ConstraintEditPartCN) {

 			types.add(UMLElementTypes.ConstraintConstrainedElement_4014);

 		}

 		if(targetEditPart instanceof EnumerationEditPartCN) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/ConstraintNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ConstraintNameEditPart.java
index a9348f306ca..3f93d8379c4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/ConstraintNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ConstraintNameEditPart.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -50,14 +50,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.profile.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.profile.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.profile.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -67,6 +59,14 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -326,7 +326,7 @@ public class ConstraintNameEditPart extends CompartmentEditPart implements IText
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Constraint_1014, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.profile.edit.parts.ConstraintNameEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Constraint_1014, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.ConstraintNameEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -576,7 +576,7 @@ public class ConstraintNameEditPart extends CompartmentEditPart implements IText
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/ConstraintNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ConstraintNameEditPartCN.java
index 5ca7db229a7..cc84cd789d6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/ConstraintNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ConstraintNameEditPartCN.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -50,14 +50,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.profile.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.profile.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.profile.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -67,6 +59,14 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -326,7 +326,7 @@ public class ConstraintNameEditPartCN extends CompartmentEditPart implements ITe
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Constraint_1028, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.profile.edit.parts.ConstraintNameEditPartCN.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Constraint_1028, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.ConstraintNameEditPartCN.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -576,7 +576,7 @@ public class ConstraintNameEditPartCN extends CompartmentEditPart implements ITe
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/DataTypeAttributeCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DataTypeAttributeCompartmentEditPart.java
index bce959b3123..a06c4aa2278 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/DataTypeAttributeCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DataTypeAttributeCompartmentEditPart.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.edit.parts;

 

 import org.eclipse.draw2d.geometry.Dimension;

 import org.eclipse.draw2d.geometry.Point;

@@ -26,12 +26,12 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditP
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.editparts.ResizeableListCompartmentEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.DuplicatePasteEditPolicy;

-import org.eclipse.papyrus.diagram.profile.custom.policies.ProfileDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.diagram.profile.custom.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.diagram.profile.edit.policies.DataTypeAttributeCompartmentItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.profile.part.Messages;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ResizeableListCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.ProfileDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.DataTypeAttributeCompartmentItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.part.Messages;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/DataTypeAttributeCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DataTypeAttributeCompartmentEditPartCN.java
index 2941f158432..151698fac29 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/DataTypeAttributeCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DataTypeAttributeCompartmentEditPartCN.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.edit.parts;

 

 import org.eclipse.draw2d.geometry.Dimension;

 import org.eclipse.draw2d.geometry.Point;

@@ -26,12 +26,12 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditP
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.editparts.ResizeableListCompartmentEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.DuplicatePasteEditPolicy;

-import org.eclipse.papyrus.diagram.profile.custom.policies.ProfileDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.diagram.profile.custom.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.diagram.profile.edit.policies.DataTypeAttributeCompartmentItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.diagram.profile.part.Messages;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ResizeableListCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.ProfileDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.DataTypeAttributeCompartmentItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.profile.part.Messages;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/DataTypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DataTypeEditPart.java
index 0ae743a811b..b2666243790 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/DataTypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DataTypeEditPart.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.edit.parts;

 

 import java.util.ArrayList;

 import java.util.LinkedList;

@@ -43,23 +43,23 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.common.editparts.ClassifierEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.DataTypeFigure;

-import org.eclipse.papyrus.diagram.common.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.papyrus.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.profile.custom.policies.itemsemantic.CustomDataTypeItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.profile.edit.policies.DataTypeItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.profile.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.profile.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ClassifierEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.DataTypeFigure;

+import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.itemsemantic.CustomDataTypeItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.DataTypeItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 import org.eclipse.swt.graphics.Color;

 

 /**

@@ -375,7 +375,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof PrimitiveTypeEditPart) {

 			types.add(UMLElementTypes.Association_4001);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.DataTypeEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.DataTypeEditPart) {

 			types.add(UMLElementTypes.Association_4001);

 		}

 		if(targetEditPart instanceof PrimitiveTypeEditPartCN) {

@@ -408,7 +408,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof PrimitiveTypeEditPart) {

 			types.add(UMLElementTypes.Association_4019);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.DataTypeEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.DataTypeEditPart) {

 			types.add(UMLElementTypes.Association_4019);

 		}

 		if(targetEditPart instanceof PrimitiveTypeEditPartCN) {

@@ -441,7 +441,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof PrimitiveTypeEditPart) {

 			types.add(UMLElementTypes.Generalization_4002);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.DataTypeEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.DataTypeEditPart) {

 			types.add(UMLElementTypes.Generalization_4002);

 		}

 		if(targetEditPart instanceof PrimitiveTypeEditPartCN) {

@@ -489,7 +489,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof PrimitiveTypeEditPart) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.DataTypeEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.DataTypeEditPart) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

 		if(targetEditPart instanceof PrimitiveTypeEditPartCN) {

@@ -549,7 +549,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof PrimitiveTypeEditPart) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.DataTypeEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.DataTypeEditPart) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

 		if(targetEditPart instanceof PrimitiveTypeEditPartCN) {

@@ -609,7 +609,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof PrimitiveTypeEditPart) {

 			types.add(UMLElementTypes.ElementImport_1064);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.DataTypeEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.DataTypeEditPart) {

 			types.add(UMLElementTypes.ElementImport_1064);

 		}

 		if(targetEditPart instanceof PrimitiveTypeEditPartCN) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/DataTypeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DataTypeEditPartCN.java
index b0647f16647..c6852db24cc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/DataTypeEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DataTypeEditPartCN.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.edit.parts;

 

 import java.util.ArrayList;

 import java.util.LinkedList;

@@ -43,23 +43,23 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.common.editparts.ClassifierEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.DataTypeFigure;

-import org.eclipse.papyrus.diagram.common.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.papyrus.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.profile.custom.policies.itemsemantic.CustomDataTypeItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.diagram.profile.edit.policies.DataTypeItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.diagram.profile.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.profile.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ClassifierEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.DataTypeFigure;

+import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.itemsemantic.CustomDataTypeItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.DataTypeItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 import org.eclipse.swt.graphics.Color;

 

 /**

@@ -390,7 +390,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof EnumerationEditPartCN) {

 			types.add(UMLElementTypes.Association_4001);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.DataTypeEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.DataTypeEditPartCN) {

 			types.add(UMLElementTypes.Association_4001);

 		}

 		if(targetEditPart instanceof AssociationNodeEditPart) {

@@ -423,7 +423,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof EnumerationEditPartCN) {

 			types.add(UMLElementTypes.Association_4019);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.DataTypeEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.DataTypeEditPartCN) {

 			types.add(UMLElementTypes.Association_4019);

 		}

 		if(targetEditPart instanceof AssociationNodeEditPart) {

@@ -456,7 +456,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof EnumerationEditPartCN) {

 			types.add(UMLElementTypes.Generalization_4002);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.DataTypeEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.DataTypeEditPartCN) {

 			types.add(UMLElementTypes.Generalization_4002);

 		}

 		if(targetEditPart instanceof DependencyNodeEditPart) {

@@ -516,7 +516,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof EnumerationEditPartCN) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.DataTypeEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.DataTypeEditPartCN) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

 		if(targetEditPart instanceof DependencyNodeEditPart) {

@@ -576,7 +576,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof EnumerationEditPartCN) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.DataTypeEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.DataTypeEditPartCN) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

 		if(targetEditPart instanceof DependencyNodeEditPart) {

@@ -636,7 +636,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof EnumerationEditPartCN) {

 			types.add(UMLElementTypes.ElementImport_1064);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.DataTypeEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.DataTypeEditPartCN) {

 			types.add(UMLElementTypes.ElementImport_1064);

 		}

 		if(targetEditPart instanceof ModelEditPartTN) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/DataTypeNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DataTypeNameEditPart.java
index 2e005b16bbe..8250c631d44 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/DataTypeNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DataTypeNameEditPart.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -50,14 +50,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.profile.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.profile.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.profile.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -67,6 +59,14 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -326,7 +326,7 @@ public class DataTypeNameEditPart extends CompartmentEditPart implements ITextAw
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.DataType_2010, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.profile.edit.parts.DataTypeNameEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.DataType_2010, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.DataTypeNameEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -576,7 +576,7 @@ public class DataTypeNameEditPart extends CompartmentEditPart implements ITextAw
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/DataTypeNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DataTypeNameEditPartCN.java
index 9b7ff03d539..28abb49250d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/DataTypeNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DataTypeNameEditPartCN.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -50,14 +50,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.profile.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.profile.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.profile.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -67,6 +59,14 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -326,7 +326,7 @@ public class DataTypeNameEditPartCN extends CompartmentEditPart implements IText
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.DataType_3027, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.profile.edit.parts.DataTypeNameEditPartCN.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.DataType_3027, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.DataTypeNameEditPartCN.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -576,7 +576,7 @@ public class DataTypeNameEditPartCN extends CompartmentEditPart implements IText
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/DataTypeOperationCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DataTypeOperationCompartmentEditPart.java
index a28ecf02bba..1487acd5138 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/DataTypeOperationCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DataTypeOperationCompartmentEditPart.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.edit.parts;

 

 import org.eclipse.draw2d.geometry.Dimension;

 import org.eclipse.draw2d.geometry.Point;

@@ -26,12 +26,12 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditP
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.editparts.ResizeableListCompartmentEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.DuplicatePasteEditPolicy;

-import org.eclipse.papyrus.diagram.profile.custom.policies.ProfileDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.diagram.profile.custom.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.diagram.profile.edit.policies.DataTypeOperationCompartmentItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.profile.part.Messages;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ResizeableListCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.ProfileDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.DataTypeOperationCompartmentItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.part.Messages;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/DataTypeOperationCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DataTypeOperationCompartmentEditPartCN.java
index 70ddcc4071c..f9b528cde3a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/DataTypeOperationCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DataTypeOperationCompartmentEditPartCN.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.edit.parts;

 

 import org.eclipse.draw2d.geometry.Dimension;

 import org.eclipse.draw2d.geometry.Point;

@@ -26,12 +26,12 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditP
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.editparts.ResizeableListCompartmentEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.DuplicatePasteEditPolicy;

-import org.eclipse.papyrus.diagram.profile.custom.policies.ProfileDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.diagram.profile.custom.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.diagram.profile.edit.policies.DataTypeOperationCompartmentItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.diagram.profile.part.Messages;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ResizeableListCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.ProfileDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.DataTypeOperationCompartmentItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.profile.part.Messages;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/DataTypeOperationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DataTypeOperationEditPart.java
index dbef441f35c..43fe034c10a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/DataTypeOperationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DataTypeOperationEditPart.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -56,19 +56,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.profile.custom.policies.AppliedStereotypeOperationDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.profile.custom.policies.OperationLabelEditPolicy;

-import org.eclipse.papyrus.diagram.profile.edit.policies.DataTypeOperationItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.profile.edit.policies.UMLTextNonResizableEditPolicy;

-import org.eclipse.papyrus.diagram.profile.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.profile.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.profile.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -78,6 +65,19 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.AppliedStereotypeOperationDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.OperationLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.DataTypeOperationItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.UMLTextNonResizableEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -358,7 +358,7 @@ implements ITextAwareEditPart, IPrimaryEditPart {
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Operation_3019, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.profile.edit.parts.DataTypeOperationEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Operation_3019, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.DataTypeOperationEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -608,7 +608,7 @@ implements ITextAwareEditPart, IPrimaryEditPart {
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/DataTypePropertyEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DataTypePropertyEditPart.java
index 82e40c30703..4ed085ca9eb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/DataTypePropertyEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DataTypePropertyEditPart.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -56,19 +56,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.profile.custom.policies.AppliedStereotypePropertyDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.profile.custom.policies.PropertyLabelEditPolicy;

-import org.eclipse.papyrus.diagram.profile.edit.policies.DataTypePropertyItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.profile.edit.policies.UMLTextNonResizableEditPolicy;

-import org.eclipse.papyrus.diagram.profile.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.profile.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.profile.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -78,6 +65,19 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.AppliedStereotypePropertyDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.PropertyLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.DataTypePropertyItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.UMLTextNonResizableEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -358,7 +358,7 @@ implements ITextAwareEditPart, IPrimaryEditPart {
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Property_3018, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.profile.edit.parts.DataTypePropertyEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Property_3018, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.DataTypePropertyEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -608,7 +608,7 @@ implements ITextAwareEditPart, IPrimaryEditPart {
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/DependencyAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DependencyAppliedStereotypeEditPart.java
index 8356f29e0fc..16d8c42aa01 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/DependencyAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DependencyAppliedStereotypeEditPart.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -51,15 +51,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editparts.ILabelRoleProvider;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.profile.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.profile.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.profile.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -69,6 +60,15 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -130,7 +130,7 @@ public class DependencyAppliedStereotypeEditPart extends LabelEditPart implement
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.profile.edit.parts.DependencyAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 60));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 60));

 	}

 

 	/**

@@ -346,7 +346,7 @@ public class DependencyAppliedStereotypeEditPart extends LabelEditPart implement
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Dependency_4008, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.profile.edit.parts.DependencyAppliedStereotypeEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Dependency_4008, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyAppliedStereotypeEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -596,7 +596,7 @@ public class DependencyAppliedStereotypeEditPart extends LabelEditPart implement
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/DependencyBranchEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DependencyBranchEditPart.java
index 6d1ccbf97bc..df653289dda 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/DependencyBranchEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DependencyBranchEditPart.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.edit.parts;

 

 import org.eclipse.draw2d.Connection;

 import org.eclipse.gef.EditPolicy;

@@ -19,9 +19,9 @@ import org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionNodeEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.figure.edge.DashedEdgeFigure;

-import org.eclipse.papyrus.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.profile.edit.policies.DependencyBranchItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.DependencyBranchItemSemanticEditPolicy;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/DependencyEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DependencyEditPart.java
index db832a457e7..896b50becf8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/DependencyEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DependencyEditPart.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.edit.parts;

 

 import org.eclipse.draw2d.Connection;

 import org.eclipse.gef.EditPart;

@@ -19,11 +19,11 @@ import org.eclipse.gef.EditPolicy;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.editparts.UMLConnectionNodeEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.edge.DashedEdgeFigure;

-import org.eclipse.papyrus.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.profile.edit.policies.DependencyItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.DependencyItemSemanticEditPolicy;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/DependencyNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DependencyNameEditPart.java
index 0127483628f..44fa30b3a1c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/DependencyNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DependencyNameEditPart.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -51,15 +51,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editparts.ILabelRoleProvider;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.profile.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.profile.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.profile.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -69,6 +60,15 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -130,7 +130,7 @@ public class DependencyNameEditPart extends LabelEditPart implements ITextAwareE
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.profile.edit.parts.DependencyNameEditPart.VISUAL_ID), new Point(0, 40));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyNameEditPart.VISUAL_ID), new Point(0, 40));

 	}

 

 	/**

@@ -346,7 +346,7 @@ public class DependencyNameEditPart extends LabelEditPart implements ITextAwareE
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Dependency_4008, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.profile.edit.parts.DependencyNameEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Dependency_4008, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyNameEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -596,7 +596,7 @@ public class DependencyNameEditPart extends LabelEditPart implements ITextAwareE
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

@@ -752,7 +752,7 @@ public class DependencyNameEditPart extends LabelEditPart implements ITextAwareE
 	 * @generated

 	 */

 	public String getIconPathRole() {

-		return "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/label_role/name.png";//$NON-NLS-1$

+		return "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/name.png";//$NON-NLS-1$

 	}

 

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/DependencyNodeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DependencyNodeEditPart.java
index bdc2cf01f89..d447e2f7ffd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/DependencyNodeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DependencyNodeEditPart.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.edit.parts;

 

 import java.util.ArrayList;

 import java.util.Collections;

@@ -49,14 +49,14 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.common.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.papyrus.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.profile.edit.policies.DependencyNodeItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.profile.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.profile.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.DependencyNodeItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 import org.eclipse.swt.graphics.Color;

 

 /**

@@ -269,7 +269,7 @@ AbstractBorderedShapeEditPart {
 	 */

 	public List<IElementType> getMARelTypesOnSourceAndTarget(IGraphicalEditPart targetEditPart) {

 		LinkedList<IElementType> types = new LinkedList<IElementType>();

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.DependencyNodeEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyNodeEditPart) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

 		if(targetEditPart instanceof AssociationNodeEditPart) {

@@ -329,7 +329,7 @@ AbstractBorderedShapeEditPart {
 		if(targetEditPart instanceof DataTypeEditPartCN) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.DependencyNodeEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyNodeEditPart) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

 		if(targetEditPart instanceof AssociationNodeEditPart) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/DiagramNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DiagramNameEditPart.java
index 65f28a0c167..bce46611a02 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/DiagramNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DiagramNameEditPart.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -53,15 +53,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editparts.ILabelRoleProvider;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.profile.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.profile.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.profile.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -71,6 +62,15 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -138,7 +138,7 @@ implements ITextAwareEditPart, IBorderItemEditPart
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.profile.edit.parts.DiagramNameEditPart.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.DiagramNameEditPart.VISUAL_ID), new Point(0, 0));

 	}

 

 	/**

@@ -369,7 +369,7 @@ implements ITextAwareEditPart, IBorderItemEditPart
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Diagram_2016, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.profile.edit.parts.DiagramNameEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Diagram_2016, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.DiagramNameEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -619,7 +619,7 @@ implements ITextAwareEditPart, IBorderItemEditPart
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

@@ -778,7 +778,7 @@ implements ITextAwareEditPart, IBorderItemEditPart
 	 * @generated

 	 */

 	public String getIconPathRole() {

-		return "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/label_role/name.png";//$NON-NLS-1$

+		return "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/name.png";//$NON-NLS-1$

 	}

 

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/ElementImportAliasEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ElementImportAliasEditPart.java
index db48431b0e8..63b85e97a31 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/ElementImportAliasEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ElementImportAliasEditPart.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -51,15 +51,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editparts.ILabelRoleProvider;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.profile.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.profile.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.profile.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -69,6 +60,15 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -130,7 +130,7 @@ public class ElementImportAliasEditPart extends LabelEditPart implements ITextAw
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.profile.edit.parts.ElementImportAliasEditPart.VISUAL_ID), new Point(0, 40));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.ElementImportAliasEditPart.VISUAL_ID), new Point(0, 40));

 	}

 

 	/**

@@ -346,7 +346,7 @@ public class ElementImportAliasEditPart extends LabelEditPart implements ITextAw
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.ElementImport_1064, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.profile.edit.parts.ElementImportAliasEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.ElementImport_1064, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.ElementImportAliasEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -596,7 +596,7 @@ public class ElementImportAliasEditPart extends LabelEditPart implements ITextAw
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

@@ -752,7 +752,7 @@ public class ElementImportAliasEditPart extends LabelEditPart implements ITextAw
 	 * @generated

 	 */

 	public String getIconPathRole() {

-		return "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/label_role/alias.png";//$NON-NLS-1$

+		return "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/alias.png";//$NON-NLS-1$

 	}

 

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/ElementImportEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ElementImportEditPart.java
index cc1fc194bd3..1d1e0a0d396 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/ElementImportEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ElementImportEditPart.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.edit.parts;

 

 import org.eclipse.draw2d.Connection;

 import org.eclipse.gef.EditPart;

@@ -19,12 +19,12 @@ import org.eclipse.gef.EditPolicy;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.editparts.UMLConnectionNodeEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.edge.DashedEdgeFigure;

-import org.eclipse.papyrus.diagram.profile.custom.policies.AppliedStereotypeElementImportLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.profile.edit.policies.ElementImportItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.AppliedStereotypeElementImportLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.ElementImportItemSemanticEditPolicy;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/EnumerationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/EnumerationEditPart.java
index 9e9d92bcbad..376e5702186 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/EnumerationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/EnumerationEditPart.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.edit.parts;

 

 import java.util.ArrayList;

 import java.util.LinkedList;

@@ -43,23 +43,23 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.common.editparts.ClassifierEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.EnumerationFigure;

-import org.eclipse.papyrus.diagram.common.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.papyrus.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.profile.custom.policies.itemsemantic.CustomEnumerationItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.profile.edit.policies.EnumerationItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.profile.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.profile.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ClassifierEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.EnumerationFigure;

+import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.itemsemantic.CustomEnumerationItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.EnumerationItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 import org.eclipse.swt.graphics.Color;

 

 /**

@@ -353,7 +353,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof MetaclassEditPart) {

 			types.add(UMLElementTypes.Association_4001);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.EnumerationEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.EnumerationEditPart) {

 			types.add(UMLElementTypes.Association_4001);

 		}

 		if(targetEditPart instanceof PrimitiveTypeEditPart) {

@@ -386,7 +386,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof MetaclassEditPart) {

 			types.add(UMLElementTypes.Association_4019);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.EnumerationEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.EnumerationEditPart) {

 			types.add(UMLElementTypes.Association_4019);

 		}

 		if(targetEditPart instanceof PrimitiveTypeEditPart) {

@@ -419,7 +419,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof MetaclassEditPart) {

 			types.add(UMLElementTypes.Generalization_4002);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.EnumerationEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.EnumerationEditPart) {

 			types.add(UMLElementTypes.Generalization_4002);

 		}

 		if(targetEditPart instanceof PrimitiveTypeEditPart) {

@@ -467,7 +467,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof PackageEditPart) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.EnumerationEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.EnumerationEditPart) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

 		if(targetEditPart instanceof PrimitiveTypeEditPart) {

@@ -527,7 +527,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof PackageEditPart) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.EnumerationEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.EnumerationEditPart) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

 		if(targetEditPart instanceof PrimitiveTypeEditPart) {

@@ -587,7 +587,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof PackageEditPart) {

 			types.add(UMLElementTypes.ElementImport_1064);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.EnumerationEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.EnumerationEditPart) {

 			types.add(UMLElementTypes.ElementImport_1064);

 		}

 		if(targetEditPart instanceof PrimitiveTypeEditPart) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/EnumerationEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/EnumerationEditPartCN.java
index acf216f774f..6efb617377b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/EnumerationEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/EnumerationEditPartCN.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.edit.parts;

 

 import java.util.ArrayList;

 import java.util.LinkedList;

@@ -43,22 +43,22 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.common.editparts.ClassifierEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.EnumerationFigure;

-import org.eclipse.papyrus.diagram.common.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.papyrus.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.profile.custom.policies.itemsemantic.CustomEnumerationItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.diagram.profile.edit.policies.EnumerationItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.diagram.profile.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.profile.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ClassifierEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.EnumerationFigure;

+import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.itemsemantic.CustomEnumerationItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.EnumerationItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 import org.eclipse.swt.graphics.Color;

 

 /**

@@ -369,7 +369,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof MetaclassEditPartCN) {

 			types.add(UMLElementTypes.Association_4001);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.EnumerationEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.EnumerationEditPartCN) {

 			types.add(UMLElementTypes.Association_4001);

 		}

 		if(targetEditPart instanceof DataTypeEditPartCN) {

@@ -402,7 +402,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof MetaclassEditPartCN) {

 			types.add(UMLElementTypes.Association_4019);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.EnumerationEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.EnumerationEditPartCN) {

 			types.add(UMLElementTypes.Association_4019);

 		}

 		if(targetEditPart instanceof DataTypeEditPartCN) {

@@ -435,7 +435,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof MetaclassEditPartCN) {

 			types.add(UMLElementTypes.Generalization_4002);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.EnumerationEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.EnumerationEditPartCN) {

 			types.add(UMLElementTypes.Generalization_4002);

 		}

 		if(targetEditPart instanceof DataTypeEditPartCN) {

@@ -495,7 +495,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof ConstraintEditPartCN) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.EnumerationEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.EnumerationEditPartCN) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

 		if(targetEditPart instanceof DataTypeEditPartCN) {

@@ -555,7 +555,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof ConstraintEditPartCN) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.EnumerationEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.EnumerationEditPartCN) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

 		if(targetEditPart instanceof DataTypeEditPartCN) {

@@ -615,7 +615,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof ConstraintEditPartCN) {

 			types.add(UMLElementTypes.ElementImport_1064);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.EnumerationEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.EnumerationEditPartCN) {

 			types.add(UMLElementTypes.ElementImport_1064);

 		}

 		if(targetEditPart instanceof DataTypeEditPartCN) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/EnumerationEnumerationLiteralCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/EnumerationEnumerationLiteralCompartmentEditPart.java
index 48c72c4e937..d30e4acf328 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/EnumerationEnumerationLiteralCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/EnumerationEnumerationLiteralCompartmentEditPart.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.edit.parts;

 

 import org.eclipse.draw2d.geometry.Dimension;

 import org.eclipse.draw2d.geometry.Point;

@@ -26,12 +26,12 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditP
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.editparts.ResizeableListCompartmentEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.DuplicatePasteEditPolicy;

-import org.eclipse.papyrus.diagram.profile.custom.policies.ProfileDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.diagram.profile.custom.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.diagram.profile.edit.policies.EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.profile.part.Messages;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ResizeableListCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.ProfileDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.part.Messages;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/EnumerationEnumerationLiteralCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/EnumerationEnumerationLiteralCompartmentEditPartCN.java
index f8e5651ea9b..8447e93a890 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/EnumerationEnumerationLiteralCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/EnumerationEnumerationLiteralCompartmentEditPartCN.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.edit.parts;

 

 import org.eclipse.draw2d.geometry.Dimension;

 import org.eclipse.draw2d.geometry.Point;

@@ -26,12 +26,12 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditP
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.editparts.ResizeableListCompartmentEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.DuplicatePasteEditPolicy;

-import org.eclipse.papyrus.diagram.profile.custom.policies.ProfileDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.diagram.profile.custom.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.diagram.profile.edit.policies.EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.diagram.profile.part.Messages;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ResizeableListCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.ProfileDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.profile.part.Messages;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/EnumerationLiteralEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/EnumerationLiteralEditPart.java
index 7b12f640fd7..96251f2666c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/EnumerationLiteralEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/EnumerationLiteralEditPart.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -56,16 +56,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.profile.edit.policies.EnumerationLiteralItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.profile.edit.policies.UMLTextNonResizableEditPolicy;

-import org.eclipse.papyrus.diagram.profile.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.profile.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.profile.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -75,6 +65,16 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.EnumerationLiteralItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.UMLTextNonResizableEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -353,7 +353,7 @@ implements ITextAwareEditPart, IPrimaryEditPart {
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.EnumerationLiteral_1037, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.profile.edit.parts.EnumerationLiteralEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.EnumerationLiteral_1037, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.EnumerationLiteralEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -603,7 +603,7 @@ implements ITextAwareEditPart, IPrimaryEditPart {
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/EnumerationNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/EnumerationNameEditPart.java
index 3bc398c0379..be996ed6078 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/EnumerationNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/EnumerationNameEditPart.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -50,14 +50,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.profile.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.profile.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.profile.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -67,6 +59,14 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -326,7 +326,7 @@ public class EnumerationNameEditPart extends CompartmentEditPart implements ITex
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Enumeration_2006, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.profile.edit.parts.EnumerationNameEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Enumeration_2006, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.EnumerationNameEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -576,7 +576,7 @@ public class EnumerationNameEditPart extends CompartmentEditPart implements ITex
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/EnumerationNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/EnumerationNameEditPartCN.java
index b994fbf92a5..a9a05b7d855 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/EnumerationNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/EnumerationNameEditPartCN.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -50,14 +50,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.profile.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.profile.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.profile.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -67,6 +59,14 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -326,7 +326,7 @@ public class EnumerationNameEditPartCN extends CompartmentEditPart implements IT
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Enumeration_3025, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.profile.edit.parts.EnumerationNameEditPartCN.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Enumeration_3025, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.EnumerationNameEditPartCN.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -576,7 +576,7 @@ public class EnumerationNameEditPartCN extends CompartmentEditPart implements IT
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/ExtensionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ExtensionEditPart.java
index afed4bc912a..95e711519c8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/ExtensionEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ExtensionEditPart.java
@@ -11,17 +11,17 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.edit.parts;

 

 import org.eclipse.draw2d.Connection;

 import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.editparts.UMLConnectionNodeEditPart;

-import org.eclipse.papyrus.diagram.profile.custom.figure.ExtensionFigure;

-import org.eclipse.papyrus.diagram.profile.custom.policies.ExtensionCustomNameEditPolicy;

-import org.eclipse.papyrus.diagram.profile.custom.policies.itemsemantic.CustomExtensionItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.profile.edit.policies.ExtensionItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.custom.figure.ExtensionFigure;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.ExtensionCustomNameEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.itemsemantic.CustomExtensionItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.ExtensionItemSemanticEditPolicy;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/GeneralizationAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/GeneralizationAppliedStereotypeEditPart.java
index 69f52c3fd88..58e93cbcac5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/GeneralizationAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/GeneralizationAppliedStereotypeEditPart.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -51,15 +51,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editparts.ILabelRoleProvider;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.profile.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.profile.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.profile.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -69,6 +60,15 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -130,7 +130,7 @@ public class GeneralizationAppliedStereotypeEditPart extends LabelEditPart imple
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.profile.edit.parts.GeneralizationAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 60));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.GeneralizationAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 60));

 	}

 

 	/**

@@ -346,7 +346,7 @@ public class GeneralizationAppliedStereotypeEditPart extends LabelEditPart imple
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Generalization_4002, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.profile.edit.parts.GeneralizationAppliedStereotypeEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Generalization_4002, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.GeneralizationAppliedStereotypeEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -596,7 +596,7 @@ public class GeneralizationAppliedStereotypeEditPart extends LabelEditPart imple
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/GeneralizationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/GeneralizationEditPart.java
index 9aa0cd40093..ed1d8c32470 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/GeneralizationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/GeneralizationEditPart.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.edit.parts;

 

 import org.eclipse.draw2d.Connection;

 import org.eclipse.gef.EditPart;

@@ -19,12 +19,12 @@ import org.eclipse.gef.EditPolicy;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.editparts.UMLConnectionNodeEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.edge.GeneralizationFigure;

-import org.eclipse.papyrus.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.profile.custom.policies.itemsemantic.CustomGeneralizationItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.profile.edit.policies.GeneralizationItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.edge.GeneralizationFigure;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.itemsemantic.CustomGeneralizationItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.GeneralizationItemSemanticEditPolicy;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/MetaclassEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/MetaclassEditPart.java
index 64e29a4d8e7..f3c68da2b3b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/MetaclassEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/MetaclassEditPart.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.edit.parts;

 

 import java.util.ArrayList;

 import java.util.LinkedList;

@@ -41,20 +41,20 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.common.editparts.ClassifierEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ClassifierFigure;

-import org.eclipse.papyrus.diagram.common.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.papyrus.diagram.profile.custom.policies.itemsemantic.CustomMetaclassItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.profile.edit.policies.MetaclassItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.profile.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.profile.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ClassifierEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ClassifierFigure;

+import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.itemsemantic.CustomMetaclassItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.MetaclassItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 import org.eclipse.swt.graphics.Color;

 

 /**

@@ -332,7 +332,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof StereotypeEditPart) {

 			types.add(UMLElementTypes.Association_4001);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.MetaclassEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.MetaclassEditPart) {

 			types.add(UMLElementTypes.Association_4001);

 		}

 		if(targetEditPart instanceof EnumerationEditPart) {

@@ -365,7 +365,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof StereotypeEditPart) {

 			types.add(UMLElementTypes.Association_4019);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.MetaclassEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.MetaclassEditPart) {

 			types.add(UMLElementTypes.Association_4019);

 		}

 		if(targetEditPart instanceof EnumerationEditPart) {

@@ -398,7 +398,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof StereotypeEditPart) {

 			types.add(UMLElementTypes.Generalization_4002);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.MetaclassEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.MetaclassEditPart) {

 			types.add(UMLElementTypes.Generalization_4002);

 		}

 		if(targetEditPart instanceof EnumerationEditPart) {

@@ -434,7 +434,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof StereotypeEditPart) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.MetaclassEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.MetaclassEditPart) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

 		if(targetEditPart instanceof ConstraintEditPart) {

@@ -494,7 +494,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof StereotypeEditPart) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.MetaclassEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.MetaclassEditPart) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

 		if(targetEditPart instanceof ConstraintEditPart) {

@@ -554,7 +554,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof StereotypeEditPart) {

 			types.add(UMLElementTypes.ElementImport_1064);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.MetaclassEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.MetaclassEditPart) {

 			types.add(UMLElementTypes.ElementImport_1064);

 		}

 		if(targetEditPart instanceof ConstraintEditPart) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/MetaclassEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/MetaclassEditPartCN.java
index 253bf484769..9b2e01792db 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/MetaclassEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/MetaclassEditPartCN.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.edit.parts;

 

 import java.util.ArrayList;

 import java.util.LinkedList;

@@ -41,20 +41,20 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.common.editparts.ClassifierEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ClassifierFigure;

-import org.eclipse.papyrus.diagram.common.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.papyrus.diagram.profile.custom.policies.itemsemantic.CustomMetaclassItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.diagram.profile.edit.policies.MetaclassItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.diagram.profile.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.profile.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ClassifierEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ClassifierFigure;

+import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.itemsemantic.CustomMetaclassItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.MetaclassItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 import org.eclipse.swt.graphics.Color;

 

 /**

@@ -350,7 +350,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof StereotypeEditPartCN) {

 			types.add(UMLElementTypes.Association_4001);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.MetaclassEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.MetaclassEditPartCN) {

 			types.add(UMLElementTypes.Association_4001);

 		}

 		if(targetEditPart instanceof EnumerationEditPartCN) {

@@ -383,7 +383,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof StereotypeEditPartCN) {

 			types.add(UMLElementTypes.Association_4019);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.MetaclassEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.MetaclassEditPartCN) {

 			types.add(UMLElementTypes.Association_4019);

 		}

 		if(targetEditPart instanceof EnumerationEditPartCN) {

@@ -416,7 +416,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof StereotypeEditPartCN) {

 			types.add(UMLElementTypes.Generalization_4002);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.MetaclassEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.MetaclassEditPartCN) {

 			types.add(UMLElementTypes.Generalization_4002);

 		}

 		if(targetEditPart instanceof EnumerationEditPartCN) {

@@ -464,7 +464,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof StereotypeEditPartCN) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.MetaclassEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.MetaclassEditPartCN) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

 		if(targetEditPart instanceof ModelEditPartCN) {

@@ -524,7 +524,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof StereotypeEditPartCN) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.MetaclassEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.MetaclassEditPartCN) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

 		if(targetEditPart instanceof ModelEditPartCN) {

@@ -584,7 +584,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof StereotypeEditPartCN) {

 			types.add(UMLElementTypes.ElementImport_1064);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.MetaclassEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.MetaclassEditPartCN) {

 			types.add(UMLElementTypes.ElementImport_1064);

 		}

 		if(targetEditPart instanceof ModelEditPartCN) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/MetaclassNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/MetaclassNameEditPart.java
index b01ac1dab80..43c80956784 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/MetaclassNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/MetaclassNameEditPart.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -50,14 +50,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.profile.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.profile.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.profile.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -67,6 +59,14 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -326,7 +326,7 @@ public class MetaclassNameEditPart extends CompartmentEditPart implements ITextA
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Class_1031, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.profile.edit.parts.MetaclassNameEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Class_1031, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.MetaclassNameEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -576,7 +576,7 @@ public class MetaclassNameEditPart extends CompartmentEditPart implements ITextA
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/MetaclassNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/MetaclassNameEditPartCN.java
index 4e78b782803..93d9d9a292a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/MetaclassNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/MetaclassNameEditPartCN.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -50,14 +50,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.profile.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.profile.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.profile.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -67,6 +59,14 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -326,7 +326,7 @@ public class MetaclassNameEditPartCN extends CompartmentEditPart implements ITex
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Class_3028, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.profile.edit.parts.MetaclassNameEditPartCN.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Class_3028, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.MetaclassNameEditPartCN.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -576,7 +576,7 @@ public class MetaclassNameEditPartCN extends CompartmentEditPart implements ITex
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/ModelEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ModelEditPartCN.java
index 9b1fed1dc82..aa6fd6544ad 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/ModelEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ModelEditPartCN.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.edit.parts;

 

 import java.util.ArrayList;

 import java.util.LinkedList;

@@ -40,22 +40,22 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.common.editparts.NamedElementEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.PackageFigure;

-import org.eclipse.papyrus.diagram.common.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.papyrus.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.profile.edit.policies.ModelItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.diagram.profile.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.profile.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.PackageFigure;

+import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.ModelItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 import org.eclipse.swt.graphics.Color;

 

 /**

@@ -384,7 +384,7 @@ NamedElementEditPart {
 		if(targetEditPart instanceof MetaclassEditPartCN) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.ModelEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.ModelEditPartCN) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

 		if(targetEditPart instanceof ProfileEditPartCN) {

@@ -444,7 +444,7 @@ NamedElementEditPart {
 		if(targetEditPart instanceof MetaclassEditPartCN) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.ModelEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.ModelEditPartCN) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

 		if(targetEditPart instanceof ProfileEditPartCN) {

@@ -504,7 +504,7 @@ NamedElementEditPart {
 		if(targetEditPart instanceof MetaclassEditPartCN) {

 			types.add(UMLElementTypes.ElementImport_1064);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.ModelEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.ModelEditPartCN) {

 			types.add(UMLElementTypes.ElementImport_1064);

 		}

 		if(targetEditPart instanceof ProfileEditPartCN) {

@@ -531,7 +531,7 @@ NamedElementEditPart {
 		if(targetEditPart instanceof PackageEditPart) {

 			types.add(UMLElementTypes.PackageImport_1065);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.ModelEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.ModelEditPartCN) {

 			types.add(UMLElementTypes.PackageImport_1065);

 		}

 		if(targetEditPart instanceof ProfileEditPartCN) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/ModelEditPartTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ModelEditPartTN.java
index 517d08ca217..0cdae75c6d9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/ModelEditPartTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ModelEditPartTN.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.edit.parts;

 

 import java.util.ArrayList;

 import java.util.LinkedList;

@@ -40,22 +40,22 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.common.editparts.NamedElementEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.PackageFigure;

-import org.eclipse.papyrus.diagram.common.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.papyrus.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.profile.edit.policies.ModelItemSemanticEditPolicyTN;

-import org.eclipse.papyrus.diagram.profile.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.profile.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.PackageFigure;

+import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.ModelItemSemanticEditPolicyTN;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 import org.eclipse.swt.graphics.Color;

 

 /**

@@ -357,7 +357,7 @@ NamedElementEditPart {
 		if(targetEditPart instanceof ConstraintEditPart) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.ModelEditPartTN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.ModelEditPartTN) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

 		if(targetEditPart instanceof ProfileEditPartTN) {

@@ -417,7 +417,7 @@ NamedElementEditPart {
 		if(targetEditPart instanceof ConstraintEditPart) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.ModelEditPartTN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.ModelEditPartTN) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

 		if(targetEditPart instanceof ProfileEditPartTN) {

@@ -477,7 +477,7 @@ NamedElementEditPart {
 		if(targetEditPart instanceof ConstraintEditPart) {

 			types.add(UMLElementTypes.ElementImport_1064);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.ModelEditPartTN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.ModelEditPartTN) {

 			types.add(UMLElementTypes.ElementImport_1064);

 		}

 		if(targetEditPart instanceof ProfileEditPartTN) {

@@ -522,7 +522,7 @@ NamedElementEditPart {
 		if(targetEditPart instanceof DataTypeEditPartCN) {

 			types.add(UMLElementTypes.ElementImport_1064);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.ModelEditPartTN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.ModelEditPartTN) {

 			types.add(UMLElementTypes.PackageImport_1065);

 		}

 		if(targetEditPart instanceof ProfileEditPartTN) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/ModelNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ModelNameEditPart.java
index 35398c5d3f7..2b4291402ad 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/ModelNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ModelNameEditPart.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -50,14 +50,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.profile.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.profile.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.profile.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -67,6 +59,14 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -326,7 +326,7 @@ public class ModelNameEditPart extends CompartmentEditPart implements ITextAware
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Model_2005, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.profile.edit.parts.ModelNameEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Model_2005, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.ModelNameEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -576,7 +576,7 @@ public class ModelNameEditPart extends CompartmentEditPart implements ITextAware
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/ModelNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ModelNameEditPartCN.java
index 7a05c35368f..2bccae0fa1f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/ModelNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ModelNameEditPartCN.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -50,14 +50,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.profile.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.profile.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.profile.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -67,6 +59,14 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -326,7 +326,7 @@ public class ModelNameEditPartCN extends CompartmentEditPart implements ITextAwa
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Model_1027, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.profile.edit.parts.ModelNameEditPartCN.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Model_1027, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.ModelNameEditPartCN.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -576,7 +576,7 @@ public class ModelNameEditPartCN extends CompartmentEditPart implements ITextAwa
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/ModelPackageableElementCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ModelPackageableElementCompartmentEditPartCN.java
index 815d7353e74..22a074e0de2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/ModelPackageableElementCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ModelPackageableElementCompartmentEditPartCN.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.edit.parts;

 

 import org.eclipse.draw2d.geometry.Dimension;

 import org.eclipse.draw2d.geometry.Point;

@@ -26,13 +26,13 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.editpolicies.CustomContainerEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.DuplicatePasteEditPolicy;

-import org.eclipse.papyrus.diagram.profile.custom.policies.CustomCreationRoleEditPolicy;

-import org.eclipse.papyrus.diagram.profile.custom.policies.ProfileDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.diagram.profile.custom.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.diagram.profile.edit.policies.ModelPackageableElementCompartmentItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.diagram.profile.part.Messages;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomCreationRoleEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.ProfileDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.ModelPackageableElementCompartmentItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.profile.part.Messages;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/ModelPackageableElementCompartmentEditPartTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ModelPackageableElementCompartmentEditPartTN.java
index 1598a7d9f18..c3eb525965a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/ModelPackageableElementCompartmentEditPartTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ModelPackageableElementCompartmentEditPartTN.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.edit.parts;

 

 import org.eclipse.draw2d.geometry.Dimension;

 import org.eclipse.draw2d.geometry.Point;

@@ -26,13 +26,13 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.editpolicies.CustomContainerEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.DuplicatePasteEditPolicy;

-import org.eclipse.papyrus.diagram.profile.custom.policies.CustomCreationRoleEditPolicy;

-import org.eclipse.papyrus.diagram.profile.custom.policies.ProfileDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.diagram.profile.custom.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.diagram.profile.edit.policies.ModelPackageableElementCompartmentItemSemanticEditPolicyTN;

-import org.eclipse.papyrus.diagram.profile.part.Messages;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomCreationRoleEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.ProfileDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.ModelPackageableElementCompartmentItemSemanticEditPolicyTN;

+import org.eclipse.papyrus.uml.diagram.profile.part.Messages;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/MultiDependencyLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/MultiDependencyLabelEditPart.java
index 73ec25aa2dd..12e4fea3267 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/MultiDependencyLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/MultiDependencyLabelEditPart.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -53,14 +53,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.profile.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.profile.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.profile.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -70,6 +62,14 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -136,7 +136,7 @@ implements ITextAwareEditPart, IBorderItemEditPart
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.profile.edit.parts.MultiDependencyLabelEditPart.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.MultiDependencyLabelEditPart.VISUAL_ID), new Point(0, 0));

 	}

 

 	/**

@@ -367,7 +367,7 @@ implements ITextAwareEditPart, IBorderItemEditPart
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Dependency_2014, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.profile.edit.parts.MultiDependencyLabelEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Dependency_2014, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.MultiDependencyLabelEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -617,7 +617,7 @@ implements ITextAwareEditPart, IBorderItemEditPart
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/PackageEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PackageEditPart.java
index 30358676c38..8b6a9139bd9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/PackageEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PackageEditPart.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.edit.parts;

 

 import java.util.ArrayList;

 import java.util.LinkedList;

@@ -40,22 +40,22 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.common.editparts.NamedElementEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.PackageFigure;

-import org.eclipse.papyrus.diagram.common.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.papyrus.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.profile.edit.policies.PackageItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.profile.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.profile.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.PackageFigure;

+import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.PackageItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 import org.eclipse.swt.graphics.Color;

 

 /**

@@ -363,7 +363,7 @@ NamedElementEditPart {
 		if(targetEditPart instanceof ProfileEditPartTN) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.PackageEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.PackageEditPart) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

 		if(targetEditPart instanceof EnumerationEditPart) {

@@ -423,7 +423,7 @@ NamedElementEditPart {
 		if(targetEditPart instanceof ProfileEditPartTN) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.PackageEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.PackageEditPart) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

 		if(targetEditPart instanceof EnumerationEditPart) {

@@ -483,7 +483,7 @@ NamedElementEditPart {
 		if(targetEditPart instanceof ProfileEditPartTN) {

 			types.add(UMLElementTypes.ElementImport_1064);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.PackageEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.PackageEditPart) {

 			types.add(UMLElementTypes.ElementImport_1064);

 		}

 		if(targetEditPart instanceof EnumerationEditPart) {

@@ -528,7 +528,7 @@ NamedElementEditPart {
 		if(targetEditPart instanceof ProfileEditPartTN) {

 			types.add(UMLElementTypes.PackageImport_1065);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.PackageEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.PackageEditPart) {

 			types.add(UMLElementTypes.PackageImport_1065);

 		}

 		if(targetEditPart instanceof ModelEditPartCN) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/PackageEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PackageEditPartCN.java
index 1e14ec542ec..676b4291c3f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/PackageEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PackageEditPartCN.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.edit.parts;

 

 import java.util.ArrayList;

 import java.util.LinkedList;

@@ -42,22 +42,22 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.common.editparts.NamedElementEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.PackageFigure;

-import org.eclipse.papyrus.diagram.common.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.papyrus.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.profile.edit.policies.PackageItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.diagram.profile.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.profile.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.PackageFigure;

+import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.PackageItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 import org.eclipse.swt.graphics.Color;

 

 /**

@@ -394,7 +394,7 @@ NamedElementEditPart {
 		if(targetEditPart instanceof ProfileEditPartCN) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.PackageEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.PackageEditPartCN) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

 		if(targetEditPart instanceof ConstraintEditPartCN) {

@@ -454,7 +454,7 @@ NamedElementEditPart {
 		if(targetEditPart instanceof ProfileEditPartCN) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.PackageEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.PackageEditPartCN) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

 		if(targetEditPart instanceof ConstraintEditPartCN) {

@@ -514,7 +514,7 @@ NamedElementEditPart {
 		if(targetEditPart instanceof ProfileEditPartCN) {

 			types.add(UMLElementTypes.ElementImport_1064);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.PackageEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.PackageEditPartCN) {

 			types.add(UMLElementTypes.ElementImport_1064);

 		}

 		if(targetEditPart instanceof ConstraintEditPartCN) {

@@ -541,7 +541,7 @@ NamedElementEditPart {
 		if(targetEditPart instanceof ProfileEditPartCN) {

 			types.add(UMLElementTypes.PackageImport_1065);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.PackageEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.PackageEditPartCN) {

 			types.add(UMLElementTypes.PackageImport_1065);

 		}

 		return types;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/PackageImportAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PackageImportAppliedStereotypeEditPart.java
index cf4861baa81..f213269e3bd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/PackageImportAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PackageImportAppliedStereotypeEditPart.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -51,15 +51,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editparts.ILabelRoleProvider;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.profile.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.profile.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.profile.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -69,6 +60,15 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -130,7 +130,7 @@ public class PackageImportAppliedStereotypeEditPart extends LabelEditPart implem
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.profile.edit.parts.PackageImportAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 60));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.PackageImportAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 60));

 	}

 

 	/**

@@ -346,7 +346,7 @@ public class PackageImportAppliedStereotypeEditPart extends LabelEditPart implem
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.PackageImport_1065, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.profile.edit.parts.PackageImportAppliedStereotypeEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.PackageImport_1065, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.PackageImportAppliedStereotypeEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -596,7 +596,7 @@ public class PackageImportAppliedStereotypeEditPart extends LabelEditPart implem
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/PackageImportEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PackageImportEditPart.java
index 3e62ce58a89..4d10ba8d2b7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/PackageImportEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PackageImportEditPart.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.edit.parts;

 

 import org.eclipse.draw2d.Connection;

 import org.eclipse.gef.EditPart;

@@ -19,12 +19,12 @@ import org.eclipse.gef.EditPolicy;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.editparts.UMLConnectionNodeEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypePackageImportLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.edge.DashedEdgeFigure;

-import org.eclipse.papyrus.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.profile.edit.policies.PackageImportItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypePackageImportLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.PackageImportItemSemanticEditPolicy;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/PackageNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PackageNameEditPart.java
index bb1ee7cbb6a..ef18d1c7650 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/PackageNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PackageNameEditPart.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -50,14 +50,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.profile.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.profile.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.profile.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -67,6 +59,14 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -326,7 +326,7 @@ public class PackageNameEditPart extends CompartmentEditPart implements ITextAwa
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Package_2007, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.profile.edit.parts.PackageNameEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Package_2007, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.PackageNameEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -576,7 +576,7 @@ public class PackageNameEditPart extends CompartmentEditPart implements ITextAwa
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/PackageNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PackageNameEditPartCN.java
index 25cd48096a5..0d807c132d4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/PackageNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PackageNameEditPartCN.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -50,14 +50,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.profile.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.profile.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.profile.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -67,6 +59,14 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -326,7 +326,7 @@ public class PackageNameEditPartCN extends CompartmentEditPart implements ITextA
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Package_1012, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.profile.edit.parts.PackageNameEditPartCN.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Package_1012, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.PackageNameEditPartCN.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -576,7 +576,7 @@ public class PackageNameEditPartCN extends CompartmentEditPart implements ITextA
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/PackagePackageableElementCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PackagePackageableElementCompartmentEditPart.java
index 3fc544a91fa..9b38e011107 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/PackagePackageableElementCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PackagePackageableElementCompartmentEditPart.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.edit.parts;

 

 import org.eclipse.draw2d.geometry.Dimension;

 import org.eclipse.draw2d.geometry.Point;

@@ -26,13 +26,13 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.editpolicies.CustomContainerEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.DuplicatePasteEditPolicy;

-import org.eclipse.papyrus.diagram.profile.custom.policies.CustomCreationRoleEditPolicy;

-import org.eclipse.papyrus.diagram.profile.custom.policies.ProfileDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.diagram.profile.custom.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.diagram.profile.edit.policies.PackagePackageableElementCompartmentItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.profile.part.Messages;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomCreationRoleEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.ProfileDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.PackagePackageableElementCompartmentItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.part.Messages;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/PackagePackageableElementCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PackagePackageableElementCompartmentEditPartCN.java
index 7c6e29a894b..1ac431d4247 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/PackagePackageableElementCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PackagePackageableElementCompartmentEditPartCN.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.edit.parts;

 

 import org.eclipse.draw2d.geometry.Dimension;

 import org.eclipse.draw2d.geometry.Point;

@@ -26,13 +26,13 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.editpolicies.CustomContainerEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.DuplicatePasteEditPolicy;

-import org.eclipse.papyrus.diagram.profile.custom.policies.CustomCreationRoleEditPolicy;

-import org.eclipse.papyrus.diagram.profile.custom.policies.ProfileDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.diagram.profile.custom.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.diagram.profile.edit.policies.PackagePackageableElementCompartmentItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.diagram.profile.part.Messages;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomCreationRoleEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.ProfileDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.PackagePackageableElementCompartmentItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.profile.part.Messages;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/PrimitiveTypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PrimitiveTypeEditPart.java
index b97f618cf66..ca6660c382c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/PrimitiveTypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PrimitiveTypeEditPart.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.edit.parts;

 

 import java.util.ArrayList;

 import java.util.LinkedList;

@@ -40,21 +40,21 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.common.editparts.ClassifierEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.PrimitiveTypeFigure;

-import org.eclipse.papyrus.diagram.common.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.papyrus.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.profile.custom.policies.itemsemantic.CustomPrimitiveTypeItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.profile.edit.policies.PrimitiveTypeItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.profile.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.profile.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ClassifierEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.PrimitiveTypeFigure;

+import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.itemsemantic.CustomPrimitiveTypeItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.PrimitiveTypeItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 import org.eclipse.swt.graphics.Color;

 

 /**

@@ -332,7 +332,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof EnumerationEditPart) {

 			types.add(UMLElementTypes.Association_4001);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.PrimitiveTypeEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.PrimitiveTypeEditPart) {

 			types.add(UMLElementTypes.Association_4001);

 		}

 		if(targetEditPart instanceof DataTypeEditPart) {

@@ -365,7 +365,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof EnumerationEditPart) {

 			types.add(UMLElementTypes.Association_4019);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.PrimitiveTypeEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.PrimitiveTypeEditPart) {

 			types.add(UMLElementTypes.Association_4019);

 		}

 		if(targetEditPart instanceof DataTypeEditPart) {

@@ -398,7 +398,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof EnumerationEditPart) {

 			types.add(UMLElementTypes.Generalization_4002);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.PrimitiveTypeEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.PrimitiveTypeEditPart) {

 			types.add(UMLElementTypes.Generalization_4002);

 		}

 		if(targetEditPart instanceof DataTypeEditPart) {

@@ -446,7 +446,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof EnumerationEditPart) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.PrimitiveTypeEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.PrimitiveTypeEditPart) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

 		if(targetEditPart instanceof DataTypeEditPart) {

@@ -506,7 +506,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof EnumerationEditPart) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.PrimitiveTypeEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.PrimitiveTypeEditPart) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

 		if(targetEditPart instanceof DataTypeEditPart) {

@@ -566,7 +566,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof EnumerationEditPart) {

 			types.add(UMLElementTypes.ElementImport_1064);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.PrimitiveTypeEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.PrimitiveTypeEditPart) {

 			types.add(UMLElementTypes.ElementImport_1064);

 		}

 		if(targetEditPart instanceof DataTypeEditPart) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/PrimitiveTypeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PrimitiveTypeEditPartCN.java
index 4c2bcffe3f3..93532146af5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/PrimitiveTypeEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PrimitiveTypeEditPartCN.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.edit.parts;

 

 import java.util.ArrayList;

 import java.util.LinkedList;

@@ -40,21 +40,21 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.common.editparts.ClassifierEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.PrimitiveTypeFigure;

-import org.eclipse.papyrus.diagram.common.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.papyrus.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.profile.custom.policies.itemsemantic.CustomPrimitiveTypeItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.diagram.profile.edit.policies.PrimitiveTypeItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.diagram.profile.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.profile.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ClassifierEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.PrimitiveTypeFigure;

+import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.itemsemantic.CustomPrimitiveTypeItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.PrimitiveTypeItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 import org.eclipse.swt.graphics.Color;

 

 /**

@@ -338,7 +338,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof DataTypeEditPart) {

 			types.add(UMLElementTypes.Association_4001);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.PrimitiveTypeEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.PrimitiveTypeEditPartCN) {

 			types.add(UMLElementTypes.Association_4001);

 		}

 		if(targetEditPart instanceof StereotypeEditPartCN) {

@@ -371,7 +371,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof DataTypeEditPart) {

 			types.add(UMLElementTypes.Association_4019);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.PrimitiveTypeEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.PrimitiveTypeEditPartCN) {

 			types.add(UMLElementTypes.Association_4019);

 		}

 		if(targetEditPart instanceof StereotypeEditPartCN) {

@@ -404,7 +404,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof DataTypeEditPart) {

 			types.add(UMLElementTypes.Generalization_4002);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.PrimitiveTypeEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.PrimitiveTypeEditPartCN) {

 			types.add(UMLElementTypes.Generalization_4002);

 		}

 		if(targetEditPart instanceof StereotypeEditPartCN) {

@@ -452,7 +452,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof DataTypeEditPart) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.PrimitiveTypeEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.PrimitiveTypeEditPartCN) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

 		if(targetEditPart instanceof StereotypeEditPartCN) {

@@ -512,7 +512,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof DataTypeEditPart) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.PrimitiveTypeEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.PrimitiveTypeEditPartCN) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

 		if(targetEditPart instanceof StereotypeEditPartCN) {

@@ -572,7 +572,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof DataTypeEditPart) {

 			types.add(UMLElementTypes.ElementImport_1064);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.PrimitiveTypeEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.PrimitiveTypeEditPartCN) {

 			types.add(UMLElementTypes.ElementImport_1064);

 		}

 		if(targetEditPart instanceof StereotypeEditPartCN) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/PrimitiveTypeNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PrimitiveTypeNameEditPart.java
index eb855f690f9..e2b831d7414 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/PrimitiveTypeNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PrimitiveTypeNameEditPart.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -51,15 +51,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.common.util.DiagramEditPartsUtil;

-import org.eclipse.papyrus.diagram.profile.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.profile.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.profile.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -69,8 +60,17 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

-import org.eclipse.papyrus.umlutils.ui.VisualInformationPapyrusConstant;

-import org.eclipse.papyrus.umlutils.ui.helper.NameLabelIconHelper;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.tools.utils.ui.VisualInformationPapyrusConstant;

+import org.eclipse.papyrus.uml.tools.utils.ui.helper.NameLabelIconHelper;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -342,7 +342,7 @@ public class PrimitiveTypeNameEditPart extends CompartmentEditPart implements IT
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.PrimitiveType_2009, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.profile.edit.parts.PrimitiveTypeNameEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.PrimitiveType_2009, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.PrimitiveTypeNameEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -592,7 +592,7 @@ public class PrimitiveTypeNameEditPart extends CompartmentEditPart implements IT
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/PrimitiveTypeNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PrimitiveTypeNameEditPartCN.java
index d5cac8b79e4..82a167a87e3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/PrimitiveTypeNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PrimitiveTypeNameEditPartCN.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -51,15 +51,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.common.util.DiagramEditPartsUtil;

-import org.eclipse.papyrus.diagram.profile.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.profile.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.profile.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -69,8 +60,17 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

-import org.eclipse.papyrus.umlutils.ui.VisualInformationPapyrusConstant;

-import org.eclipse.papyrus.umlutils.ui.helper.NameLabelIconHelper;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.tools.utils.ui.VisualInformationPapyrusConstant;

+import org.eclipse.papyrus.uml.tools.utils.ui.helper.NameLabelIconHelper;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -342,7 +342,7 @@ public class PrimitiveTypeNameEditPartCN extends CompartmentEditPart implements
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.PrimitiveType_3026, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.profile.edit.parts.PrimitiveTypeNameEditPartCN.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.PrimitiveType_3026, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.PrimitiveTypeNameEditPartCN.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -592,7 +592,7 @@ public class PrimitiveTypeNameEditPartCN extends CompartmentEditPart implements
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/ProfileApplicationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ProfileApplicationEditPart.java
index b0294847235..b13385edd77 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/ProfileApplicationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ProfileApplicationEditPart.java
@@ -11,15 +11,15 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.edit.parts;

 

 import org.eclipse.draw2d.Connection;

 import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.editparts.UMLConnectionNodeEditPart;

-import org.eclipse.papyrus.diagram.common.figure.edge.DashedEdgeFigure;

-import org.eclipse.papyrus.diagram.profile.edit.policies.ProfileApplicationItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;

+import org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.ProfileApplicationItemSemanticEditPolicy;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/ProfileDiagramEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ProfileDiagramEditPart.java
index 88bf12b82d7..03e24a28bb0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/ProfileDiagramEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ProfileDiagramEditPart.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -31,14 +31,14 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.NonResizableLabelEditPolicy;

 import org.eclipse.gmf.runtime.diagram.ui.figures.BorderedNodeFigure;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.editpolicies.DuplicatePasteEditPolicy;

-import org.eclipse.papyrus.diagram.common.providers.ViewInfo;

-import org.eclipse.papyrus.diagram.common.util.MDTUtil;

-import org.eclipse.papyrus.diagram.profile.custom.policies.CustomCreationRoleEditPolicy;

-import org.eclipse.papyrus.diagram.profile.custom.policies.ProfileDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.diagram.profile.custom.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.diagram.profile.edit.policies.ProfileDiagramItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.profile.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.providers.ViewInfo;

+import org.eclipse.papyrus.uml.diagram.common.util.MDTUtil;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomCreationRoleEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.ProfileDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.ProfileDiagramItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/ProfileEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ProfileEditPartCN.java
index f002a4d0ad1..b97d7c00a7d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/ProfileEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ProfileEditPartCN.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.edit.parts;

 

 import java.util.ArrayList;

 import java.util.LinkedList;

@@ -40,22 +40,22 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.common.editparts.NamedElementEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ProfileFigure;

-import org.eclipse.papyrus.diagram.common.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.papyrus.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.profile.edit.policies.ProfileItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.diagram.profile.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.profile.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ProfileFigure;

+import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.ProfileItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 import org.eclipse.swt.graphics.Color;

 

 /**

@@ -339,7 +339,7 @@ NamedElementEditPart {
 		if(targetEditPart instanceof ProfileEditPartTN) {

 			types.add(UMLElementTypes.ProfileApplication_1045);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.ProfileEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileEditPartCN) {

 			types.add(UMLElementTypes.ProfileApplication_1045);

 		}

 		if(targetEditPart instanceof DependencyNodeEditPart) {

@@ -387,7 +387,7 @@ NamedElementEditPart {
 		if(targetEditPart instanceof ModelEditPartCN) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.ProfileEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileEditPartCN) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

 		if(targetEditPart instanceof PackageEditPartCN) {

@@ -447,7 +447,7 @@ NamedElementEditPart {
 		if(targetEditPart instanceof ModelEditPartCN) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.ProfileEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileEditPartCN) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

 		if(targetEditPart instanceof PackageEditPartCN) {

@@ -507,7 +507,7 @@ NamedElementEditPart {
 		if(targetEditPart instanceof ModelEditPartCN) {

 			types.add(UMLElementTypes.ElementImport_1064);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.ProfileEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileEditPartCN) {

 			types.add(UMLElementTypes.ElementImport_1064);

 		}

 		if(targetEditPart instanceof PackageEditPartCN) {

@@ -534,7 +534,7 @@ NamedElementEditPart {
 		if(targetEditPart instanceof ModelEditPartCN) {

 			types.add(UMLElementTypes.PackageImport_1065);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.ProfileEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileEditPartCN) {

 			types.add(UMLElementTypes.PackageImport_1065);

 		}

 		if(targetEditPart instanceof PackageEditPartCN) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/ProfileEditPartTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ProfileEditPartTN.java
index 4a5780687d4..e899a4ef8cb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/ProfileEditPartTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ProfileEditPartTN.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.edit.parts;

 

 import java.util.ArrayList;

 import java.util.LinkedList;

@@ -40,22 +40,22 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.common.editparts.NamedElementEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ProfileFigure;

-import org.eclipse.papyrus.diagram.common.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.papyrus.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.profile.edit.policies.ProfileItemSemanticEditPolicyTN;

-import org.eclipse.papyrus.diagram.profile.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.profile.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ProfileFigure;

+import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.ProfileItemSemanticEditPolicyTN;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 import org.eclipse.swt.graphics.Color;

 

 /**

@@ -336,7 +336,7 @@ NamedElementEditPart {
 	 */

 	public List<IElementType> getMARelTypesOnSourceAndTarget(IGraphicalEditPart targetEditPart) {

 		LinkedList<IElementType> types = new LinkedList<IElementType>();

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.ProfileEditPartTN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileEditPartTN) {

 			types.add(UMLElementTypes.ProfileApplication_1045);

 		}

 		if(targetEditPart instanceof ProfileEditPartCN) {

@@ -360,7 +360,7 @@ NamedElementEditPart {
 		if(targetEditPart instanceof ModelEditPartTN) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.ProfileEditPartTN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileEditPartTN) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

 		if(targetEditPart instanceof PackageEditPart) {

@@ -420,7 +420,7 @@ NamedElementEditPart {
 		if(targetEditPart instanceof ModelEditPartTN) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.ProfileEditPartTN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileEditPartTN) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

 		if(targetEditPart instanceof PackageEditPart) {

@@ -480,7 +480,7 @@ NamedElementEditPart {
 		if(targetEditPart instanceof ModelEditPartTN) {

 			types.add(UMLElementTypes.ElementImport_1064);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.ProfileEditPartTN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileEditPartTN) {

 			types.add(UMLElementTypes.ElementImport_1064);

 		}

 		if(targetEditPart instanceof PackageEditPart) {

@@ -525,7 +525,7 @@ NamedElementEditPart {
 		if(targetEditPart instanceof ModelEditPartTN) {

 			types.add(UMLElementTypes.PackageImport_1065);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.ProfileEditPartTN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileEditPartTN) {

 			types.add(UMLElementTypes.PackageImport_1065);

 		}

 		if(targetEditPart instanceof PackageEditPart) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/ProfileNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ProfileNameEditPartCN.java
index cdfde4acbd5..923ebef96d1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/ProfileNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ProfileNameEditPartCN.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -50,14 +50,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.profile.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.profile.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.profile.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -67,6 +59,14 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -326,7 +326,7 @@ public class ProfileNameEditPartCN extends CompartmentEditPart implements ITextA
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Profile_1024, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.profile.edit.parts.ProfileNameEditPartCN.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Profile_1024, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileNameEditPartCN.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -576,7 +576,7 @@ public class ProfileNameEditPartCN extends CompartmentEditPart implements ITextA
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/ProfileNameEditPartTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ProfileNameEditPartTN.java
index 553b99f9f56..f6c554ba59d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/ProfileNameEditPartTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ProfileNameEditPartTN.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -50,14 +50,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.profile.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.profile.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.profile.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -67,6 +59,14 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -326,7 +326,7 @@ public class ProfileNameEditPartTN extends CompartmentEditPart implements ITextA
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Profile_1030, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.profile.edit.parts.ProfileNameEditPartTN.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Profile_1030, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileNameEditPartTN.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -576,7 +576,7 @@ public class ProfileNameEditPartTN extends CompartmentEditPart implements ITextA
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/ProfilePackageableElementCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ProfilePackageableElementCompartmentEditPartCN.java
index 0b4097882fa..67f6bdf8a7e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/ProfilePackageableElementCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ProfilePackageableElementCompartmentEditPartCN.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.edit.parts;

 

 import org.eclipse.draw2d.geometry.Dimension;

 import org.eclipse.draw2d.geometry.Point;

@@ -26,13 +26,13 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.editpolicies.CustomContainerEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.DuplicatePasteEditPolicy;

-import org.eclipse.papyrus.diagram.profile.custom.policies.CustomCreationRoleEditPolicy;

-import org.eclipse.papyrus.diagram.profile.custom.policies.ProfileDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.diagram.profile.custom.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.diagram.profile.edit.policies.ProfilePackageableElementCompartmentItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.diagram.profile.part.Messages;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomCreationRoleEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.ProfileDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.ProfilePackageableElementCompartmentItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.profile.part.Messages;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/ProfilePackageableElementCompartmentEditPartTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ProfilePackageableElementCompartmentEditPartTN.java
index e2ec39d3e90..e1e18c8b67f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/ProfilePackageableElementCompartmentEditPartTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ProfilePackageableElementCompartmentEditPartTN.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.edit.parts;

 

 import org.eclipse.draw2d.geometry.Dimension;

 import org.eclipse.draw2d.geometry.Point;

@@ -26,13 +26,13 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.editpolicies.CustomContainerEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.DuplicatePasteEditPolicy;

-import org.eclipse.papyrus.diagram.profile.custom.policies.CustomCreationRoleEditPolicy;

-import org.eclipse.papyrus.diagram.profile.custom.policies.ProfileDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.diagram.profile.custom.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.diagram.profile.edit.policies.ProfilePackageableElementCompartmentItemSemanticEditPolicyTN;

-import org.eclipse.papyrus.diagram.profile.part.Messages;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomCreationRoleEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.ProfileDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.ProfilePackageableElementCompartmentItemSemanticEditPolicyTN;

+import org.eclipse.papyrus.uml.diagram.profile.part.Messages;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/ShortCutDiagramEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ShortCutDiagramEditPart.java
index 76ec6eea7eb..e67cd6f0b5a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/ShortCutDiagramEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ShortCutDiagramEditPart.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -44,17 +44,17 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.common.editparts.AbstractShortCutDiagramEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.ShortCutDiagramEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.ShowHideLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.DiagramNodeFigure;

-import org.eclipse.papyrus.diagram.common.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.papyrus.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.profile.edit.policies.ShortCutDiagramItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.profile.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.profile.part.UMLVisualIDRegistry;

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractShortCutDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShortCutDiagramEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.DiagramNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.ShortCutDiagramItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry;

 import org.eclipse.swt.graphics.Color;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/StereotypeAttributeCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/StereotypeAttributeCompartmentEditPart.java
index 53fb6884855..96342c1b4a2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/StereotypeAttributeCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/StereotypeAttributeCompartmentEditPart.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.edit.parts;

 

 import org.eclipse.draw2d.geometry.Dimension;

 import org.eclipse.draw2d.geometry.Point;

@@ -26,12 +26,12 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditP
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.editparts.ResizeableListCompartmentEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.DuplicatePasteEditPolicy;

-import org.eclipse.papyrus.diagram.profile.custom.policies.ProfileDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.diagram.profile.custom.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.diagram.profile.edit.policies.StereotypeAttributeCompartmentItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.profile.part.Messages;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ResizeableListCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.ProfileDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.StereotypeAttributeCompartmentItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.part.Messages;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/StereotypeAttributeCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/StereotypeAttributeCompartmentEditPartCN.java
index 3df18ed1a65..f45771e5c44 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/StereotypeAttributeCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/StereotypeAttributeCompartmentEditPartCN.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.edit.parts;

 

 import org.eclipse.draw2d.geometry.Dimension;

 import org.eclipse.draw2d.geometry.Point;

@@ -26,12 +26,12 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditP
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.editparts.ResizeableListCompartmentEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.DuplicatePasteEditPolicy;

-import org.eclipse.papyrus.diagram.profile.custom.policies.ProfileDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.diagram.profile.custom.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.diagram.profile.edit.policies.StereotypeAttributeCompartmentItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.diagram.profile.part.Messages;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ResizeableListCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.ProfileDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.StereotypeAttributeCompartmentItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.profile.part.Messages;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/StereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/StereotypeEditPart.java
index 90cf3b1488a..bc0e4a3f071 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/StereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/StereotypeEditPart.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.edit.parts;

 

 import java.util.ArrayList;

 import java.util.LinkedList;

@@ -44,23 +44,23 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.common.editparts.ClassifierEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ClassifierFigure;

-import org.eclipse.papyrus.diagram.common.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.papyrus.diagram.profile.custom.figure.StereotypeFigure;

-import org.eclipse.papyrus.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.profile.custom.policies.itemsemantic.CustomStereotypeItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.profile.edit.policies.StereotypeItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.profile.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.profile.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ClassifierEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ClassifierFigure;

+import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

+import org.eclipse.papyrus.uml.diagram.profile.custom.figure.StereotypeFigure;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.itemsemantic.CustomStereotypeItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.StereotypeItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 import org.eclipse.swt.graphics.Color;

 

 /**

@@ -371,7 +371,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof AssociationNodeEditPart) {

 			types.add(UMLElementTypes.Association_4001);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.StereotypeEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.StereotypeEditPart) {

 			types.add(UMLElementTypes.Association_4001);

 		}

 		if(targetEditPart instanceof MetaclassEditPart) {

@@ -404,7 +404,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof AssociationNodeEditPart) {

 			types.add(UMLElementTypes.Association_4019);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.StereotypeEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.StereotypeEditPart) {

 			types.add(UMLElementTypes.Association_4019);

 		}

 		if(targetEditPart instanceof MetaclassEditPart) {

@@ -437,7 +437,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof AssociationNodeEditPart) {

 			types.add(UMLElementTypes.Generalization_4002);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.StereotypeEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.StereotypeEditPart) {

 			types.add(UMLElementTypes.Generalization_4002);

 		}

 		if(targetEditPart instanceof MetaclassEditPart) {

@@ -473,7 +473,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof AssociationNodeEditPart) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.StereotypeEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.StereotypeEditPart) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

 		if(targetEditPart instanceof MetaclassEditPart) {

@@ -533,7 +533,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof AssociationNodeEditPart) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.StereotypeEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.StereotypeEditPart) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

 		if(targetEditPart instanceof MetaclassEditPart) {

@@ -593,7 +593,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof AssociationNodeEditPart) {

 			types.add(UMLElementTypes.ElementImport_1064);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.StereotypeEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.StereotypeEditPart) {

 			types.add(UMLElementTypes.ElementImport_1064);

 		}

 		if(targetEditPart instanceof MetaclassEditPart) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/StereotypeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/StereotypeEditPartCN.java
index dacec442432..85f18c18894 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/StereotypeEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/StereotypeEditPartCN.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.edit.parts;

 

 import java.util.ArrayList;

 import java.util.LinkedList;

@@ -44,23 +44,23 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.common.editparts.ClassifierEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ClassifierFigure;

-import org.eclipse.papyrus.diagram.common.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.papyrus.diagram.profile.custom.figure.StereotypeFigure;

-import org.eclipse.papyrus.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.profile.custom.policies.itemsemantic.CustomStereotypeItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.diagram.profile.edit.policies.StereotypeItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.diagram.profile.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.profile.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ClassifierEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ClassifierFigure;

+import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

+import org.eclipse.papyrus.uml.diagram.profile.custom.figure.StereotypeFigure;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.itemsemantic.CustomStereotypeItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.StereotypeItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 import org.eclipse.swt.graphics.Color;

 

 /**

@@ -389,7 +389,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof PrimitiveTypeEditPartCN) {

 			types.add(UMLElementTypes.Association_4001);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.StereotypeEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.StereotypeEditPartCN) {

 			types.add(UMLElementTypes.Association_4001);

 		}

 		if(targetEditPart instanceof MetaclassEditPartCN) {

@@ -422,7 +422,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof PrimitiveTypeEditPartCN) {

 			types.add(UMLElementTypes.Association_4019);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.StereotypeEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.StereotypeEditPartCN) {

 			types.add(UMLElementTypes.Association_4019);

 		}

 		if(targetEditPart instanceof MetaclassEditPartCN) {

@@ -455,7 +455,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof PrimitiveTypeEditPartCN) {

 			types.add(UMLElementTypes.Generalization_4002);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.StereotypeEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.StereotypeEditPartCN) {

 			types.add(UMLElementTypes.Generalization_4002);

 		}

 		if(targetEditPart instanceof MetaclassEditPartCN) {

@@ -503,7 +503,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof PrimitiveTypeEditPartCN) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.StereotypeEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.StereotypeEditPartCN) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

 		if(targetEditPart instanceof MetaclassEditPartCN) {

@@ -563,7 +563,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof PrimitiveTypeEditPartCN) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.StereotypeEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.StereotypeEditPartCN) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

 		if(targetEditPart instanceof MetaclassEditPartCN) {

@@ -623,7 +623,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof PrimitiveTypeEditPartCN) {

 			types.add(UMLElementTypes.ElementImport_1064);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.profile.edit.parts.StereotypeEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.profile.edit.parts.StereotypeEditPartCN) {

 			types.add(UMLElementTypes.ElementImport_1064);

 		}

 		if(targetEditPart instanceof MetaclassEditPartCN) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/StereotypeNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/StereotypeNameEditPart.java
index 9fe55d300d2..74336baf6dc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/StereotypeNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/StereotypeNameEditPart.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -50,14 +50,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.profile.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.profile.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.profile.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -67,6 +59,14 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -326,7 +326,7 @@ public class StereotypeNameEditPart extends CompartmentEditPart implements IText
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Stereotype_1026, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.profile.edit.parts.StereotypeNameEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Stereotype_1026, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.StereotypeNameEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -576,7 +576,7 @@ public class StereotypeNameEditPart extends CompartmentEditPart implements IText
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/StereotypeNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/StereotypeNameEditPartCN.java
index cfd7634d8cf..7e085a8d46a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/StereotypeNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/StereotypeNameEditPartCN.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -50,14 +50,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.profile.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.profile.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.profile.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -67,6 +59,14 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -326,7 +326,7 @@ public class StereotypeNameEditPartCN extends CompartmentEditPart implements ITe
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Stereotype_1023, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.profile.edit.parts.StereotypeNameEditPartCN.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Stereotype_1023, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.profile.edit.parts.StereotypeNameEditPartCN.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -576,7 +576,7 @@ public class StereotypeNameEditPartCN extends CompartmentEditPart implements ITe
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/StereotypeOperationCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/StereotypeOperationCompartmentEditPart.java
index 32353021bb2..a45ca0e65f2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/StereotypeOperationCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/StereotypeOperationCompartmentEditPart.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.edit.parts;

 

 import org.eclipse.draw2d.geometry.Dimension;

 import org.eclipse.draw2d.geometry.Point;

@@ -26,12 +26,12 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditP
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.editparts.ResizeableListCompartmentEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.DuplicatePasteEditPolicy;

-import org.eclipse.papyrus.diagram.profile.custom.policies.ProfileDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.diagram.profile.custom.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.diagram.profile.edit.policies.StereotypeOperationCompartmentItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.profile.part.Messages;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ResizeableListCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.ProfileDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.StereotypeOperationCompartmentItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.part.Messages;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/StereotypeOperationCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/StereotypeOperationCompartmentEditPartCN.java
index fdc3f60b18b..2dc11a61fef 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/StereotypeOperationCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/StereotypeOperationCompartmentEditPartCN.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.edit.parts;

 

 import org.eclipse.draw2d.geometry.Dimension;

 import org.eclipse.draw2d.geometry.Point;

@@ -26,12 +26,12 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditP
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.editparts.ResizeableListCompartmentEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.DuplicatePasteEditPolicy;

-import org.eclipse.papyrus.diagram.profile.custom.policies.ProfileDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.diagram.profile.custom.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.diagram.profile.edit.policies.StereotypeOperationCompartmentItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.diagram.profile.part.Messages;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ResizeableListCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.ProfileDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.custom.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.StereotypeOperationCompartmentItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.profile.part.Messages;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/UMLEditPartFactory.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/UMLEditPartFactory.java
index 2d62efe07b4..6caf268df9f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/UMLEditPartFactory.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/UMLEditPartFactory.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.parts;

+package org.eclipse.papyrus.uml.diagram.profile.edit.parts;

 

 import org.eclipse.draw2d.FigureUtilities;

 import org.eclipse.draw2d.Label;

@@ -24,8 +24,8 @@ import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.viewers.CellEditor;

-import org.eclipse.papyrus.diagram.common.figure.node.IMultilineEditableFigure;

-import org.eclipse.papyrus.diagram.profile.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.IMultilineEditableFigure;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.widgets.Text;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/AssociationBranchItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/AssociationBranchItemSemanticEditPolicy.java
index 396b8dc925f..097b8ba4248 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/AssociationBranchItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/AssociationBranchItemSemanticEditPolicy.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.policies;

+package org.eclipse.papyrus.uml.diagram.profile.edit.policies;

 

 import java.util.ArrayList;

 import java.util.List;

@@ -25,34 +25,34 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

 import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

-import org.eclipse.papyrus.diagram.profile.edit.commands.AssociationBranchCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.AssociationBranchReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.AssociationCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.AssociationReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyBranchCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyBranchReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.GeneralizationReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.PackageImportCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.PackageImportReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationBranchEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.AssociationBranchCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.AssociationBranchReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.AssociationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.AssociationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyBranchCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyBranchReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ElementImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ElementImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.GeneralizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.GeneralizationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.PackageImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.PackageImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ElementImportEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PackageImportEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/AssociationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/AssociationItemSemanticEditPolicy.java
index 46356531172..1c66007886d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/AssociationItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/AssociationItemSemanticEditPolicy.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.policies;

+package org.eclipse.papyrus.uml.diagram.profile.edit.policies;

 

 import java.util.ArrayList;

 import java.util.List;

@@ -25,34 +25,34 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

 import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

-import org.eclipse.papyrus.diagram.profile.edit.commands.AssociationBranchCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.AssociationBranchReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.AssociationCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.AssociationReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyBranchCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyBranchReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.GeneralizationReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.PackageImportCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.PackageImportReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationBranchEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.AssociationBranchCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.AssociationBranchReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.AssociationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.AssociationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyBranchCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyBranchReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ElementImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ElementImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.GeneralizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.GeneralizationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.PackageImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.PackageImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ElementImportEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PackageImportEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/AssociationNodeItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/AssociationNodeItemSemanticEditPolicy.java
index cac4d06b322..160381bc9fd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/AssociationNodeItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/AssociationNodeItemSemanticEditPolicy.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.policies;

+package org.eclipse.papyrus.uml.diagram.profile.edit.policies;

 

 import java.util.ArrayList;

 import java.util.List;

@@ -27,34 +27,34 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelations
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

-import org.eclipse.papyrus.diagram.profile.edit.commands.AssociationBranchCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.AssociationBranchReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.AssociationCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.AssociationReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyBranchCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyBranchReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.GeneralizationReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.PackageImportCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.PackageImportReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationBranchEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.AssociationBranchCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.AssociationBranchReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.AssociationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.AssociationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyBranchCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyBranchReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ElementImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ElementImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.GeneralizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.GeneralizationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.PackageImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.PackageImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ElementImportEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PackageImportEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/ClassOperationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ClassOperationItemSemanticEditPolicy.java
index 9eb77658a95..f4930acd491 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/ClassOperationItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ClassOperationItemSemanticEditPolicy.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.policies;

+package org.eclipse.papyrus.uml.diagram.profile.edit.policies;

 

 import java.util.ArrayList;

 import java.util.List;

@@ -24,7 +24,7 @@ import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalC
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/ClassPropertyItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ClassPropertyItemSemanticEditPolicy.java
index 1909aedd6be..27b5726ffe5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/ClassPropertyItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ClassPropertyItemSemanticEditPolicy.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.policies;

+package org.eclipse.papyrus.uml.diagram.profile.edit.policies;

 

 import java.util.ArrayList;

 import java.util.List;

@@ -24,7 +24,7 @@ import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalC
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/CommentAnnotatedElementItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/CommentAnnotatedElementItemSemanticEditPolicy.java
index 4c27e35278e..1e958d09c8c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/CommentAnnotatedElementItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/CommentAnnotatedElementItemSemanticEditPolicy.java
@@ -11,12 +11,12 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.policies;

+package org.eclipse.papyrus.uml.diagram.profile.edit.policies;

 

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/CommentEditPartItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/CommentEditPartItemSemanticEditPolicy.java
index 8f83270e368..f3d34bcbba6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/CommentEditPartItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/CommentEditPartItemSemanticEditPolicy.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.policies;

+package org.eclipse.papyrus.uml.diagram.profile.edit.policies;

 

 import java.util.ArrayList;

 import java.util.List;

@@ -26,13 +26,13 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

-import org.eclipse.papyrus.diagram.profile.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/CommentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/CommentItemSemanticEditPolicyCN.java
index 794ec15e64f..3ac486437a4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/CommentItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/CommentItemSemanticEditPolicyCN.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.policies;

+package org.eclipse.papyrus.uml.diagram.profile.edit.policies;

 

 import java.util.ArrayList;

 import java.util.List;

@@ -26,13 +26,13 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

-import org.eclipse.papyrus.diagram.profile.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/ConstraintConstrainedElementItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ConstraintConstrainedElementItemSemanticEditPolicy.java
index 19d26332374..bb5d3a5c6a5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/ConstraintConstrainedElementItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ConstraintConstrainedElementItemSemanticEditPolicy.java
@@ -11,12 +11,12 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.policies;

+package org.eclipse.papyrus.uml.diagram.profile.edit.policies;

 

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/ConstraintItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ConstraintItemSemanticEditPolicy.java
index d0e7281ad29..936556ace78 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/ConstraintItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ConstraintItemSemanticEditPolicy.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.policies;

+package org.eclipse.papyrus.uml.diagram.profile.edit.policies;

 

 import java.util.ArrayList;

 import java.util.List;

@@ -27,22 +27,22 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelations
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

-import org.eclipse.papyrus.diagram.profile.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyBranchCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyBranchReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyBranchCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyBranchReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ElementImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ElementImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ElementImportEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/ConstraintItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ConstraintItemSemanticEditPolicyCN.java
index da9a08dc191..a3e9477dd9d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/ConstraintItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ConstraintItemSemanticEditPolicyCN.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.policies;

+package org.eclipse.papyrus.uml.diagram.profile.edit.policies;

 

 import java.util.ArrayList;

 import java.util.List;

@@ -27,22 +27,22 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelations
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

-import org.eclipse.papyrus.diagram.profile.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyBranchCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyBranchReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyBranchCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyBranchReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ElementImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ElementImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ElementImportEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/DataTypeAttributeCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/DataTypeAttributeCompartmentItemSemanticEditPolicy.java
index e2927ad3404..73bb1c20cab 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/DataTypeAttributeCompartmentItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/DataTypeAttributeCompartmentItemSemanticEditPolicy.java
@@ -11,12 +11,12 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.policies;

+package org.eclipse.papyrus.uml.diagram.profile.edit.policies;

 

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DataTypePropertyCreateCommand;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DataTypePropertyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/DataTypeAttributeCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/DataTypeAttributeCompartmentItemSemanticEditPolicyCN.java
index dffcfc3f29a..d8ac0071848 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/DataTypeAttributeCompartmentItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/DataTypeAttributeCompartmentItemSemanticEditPolicyCN.java
@@ -11,12 +11,12 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.policies;

+package org.eclipse.papyrus.uml.diagram.profile.edit.policies;

 

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DataTypePropertyCreateCommand;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DataTypePropertyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/DataTypeItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/DataTypeItemSemanticEditPolicy.java
index 71cbdac297b..dd30b9790e8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/DataTypeItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/DataTypeItemSemanticEditPolicy.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.policies;

+package org.eclipse.papyrus.uml.diagram.profile.edit.policies;

 

 import java.util.ArrayList;

 import java.util.Iterator;

@@ -31,39 +31,39 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipReques
 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

-import org.eclipse.papyrus.diagram.profile.edit.commands.AssociationBranchCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.AssociationBranchReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.AssociationCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.AssociationReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyBranchCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyBranchReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.GeneralizationReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.PackageImportCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.PackageImportReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationBranchEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DataTypeAttributeCompartmentEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DataTypeOperationCompartmentEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DataTypeOperationEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DataTypePropertyEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.diagram.profile.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.AssociationBranchCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.AssociationBranchReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.AssociationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.AssociationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyBranchCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyBranchReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ElementImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ElementImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.GeneralizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.GeneralizationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.PackageImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.PackageImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DataTypeAttributeCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DataTypeOperationCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DataTypeOperationEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DataTypePropertyEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ElementImportEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PackageImportEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/DataTypeItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/DataTypeItemSemanticEditPolicyCN.java
index e009bea97ab..8b133b4183d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/DataTypeItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/DataTypeItemSemanticEditPolicyCN.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.policies;

+package org.eclipse.papyrus.uml.diagram.profile.edit.policies;

 

 import java.util.ArrayList;

 import java.util.Iterator;

@@ -31,39 +31,39 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipReques
 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

-import org.eclipse.papyrus.diagram.profile.edit.commands.AssociationBranchCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.AssociationBranchReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.AssociationCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.AssociationReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyBranchCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyBranchReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.GeneralizationReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.PackageImportCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.PackageImportReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationBranchEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DataTypeAttributeCompartmentEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DataTypeOperationCompartmentEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DataTypeOperationEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DataTypePropertyEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.diagram.profile.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.AssociationBranchCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.AssociationBranchReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.AssociationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.AssociationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyBranchCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyBranchReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ElementImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ElementImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.GeneralizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.GeneralizationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.PackageImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.PackageImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DataTypeAttributeCompartmentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DataTypeOperationCompartmentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DataTypeOperationEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DataTypePropertyEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ElementImportEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PackageImportEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/DataTypeOperationCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/DataTypeOperationCompartmentItemSemanticEditPolicy.java
index 004b96f7d4e..44d14b7082b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/DataTypeOperationCompartmentItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/DataTypeOperationCompartmentItemSemanticEditPolicy.java
@@ -11,12 +11,12 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.policies;

+package org.eclipse.papyrus.uml.diagram.profile.edit.policies;

 

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DataTypeOperationCreateCommand;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DataTypeOperationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/DataTypeOperationCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/DataTypeOperationCompartmentItemSemanticEditPolicyCN.java
index 7ee29da5eb7..6dabd3f303e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/DataTypeOperationCompartmentItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/DataTypeOperationCompartmentItemSemanticEditPolicyCN.java
@@ -11,12 +11,12 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.policies;

+package org.eclipse.papyrus.uml.diagram.profile.edit.policies;

 

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DataTypeOperationCreateCommand;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DataTypeOperationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/DataTypeOperationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/DataTypeOperationItemSemanticEditPolicy.java
index 10b0b13dd9e..dd8d7bbc33d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/DataTypeOperationItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/DataTypeOperationItemSemanticEditPolicy.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.policies;

+package org.eclipse.papyrus.uml.diagram.profile.edit.policies;

 

 import java.util.ArrayList;

 import java.util.List;

@@ -24,7 +24,7 @@ import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalC
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/DataTypePropertyItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/DataTypePropertyItemSemanticEditPolicy.java
index 33a2956389c..cf00ab13fb4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/DataTypePropertyItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/DataTypePropertyItemSemanticEditPolicy.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.policies;

+package org.eclipse.papyrus.uml.diagram.profile.edit.policies;

 

 import java.util.ArrayList;

 import java.util.List;

@@ -24,7 +24,7 @@ import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalC
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/DependencyBranchItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/DependencyBranchItemSemanticEditPolicy.java
index 00cb224d6a5..7819023f50a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/DependencyBranchItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/DependencyBranchItemSemanticEditPolicy.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.policies;

+package org.eclipse.papyrus.uml.diagram.profile.edit.policies;

 

 import java.util.ArrayList;

 import java.util.List;

@@ -25,22 +25,22 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

 import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

-import org.eclipse.papyrus.diagram.profile.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyBranchCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyBranchReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyBranchCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyBranchReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ElementImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ElementImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ElementImportEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/DependencyItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/DependencyItemSemanticEditPolicy.java
index fa81fbc24c4..67ae5bbccd4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/DependencyItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/DependencyItemSemanticEditPolicy.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.policies;

+package org.eclipse.papyrus.uml.diagram.profile.edit.policies;

 

 import java.util.ArrayList;

 import java.util.List;

@@ -25,22 +25,22 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

 import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

-import org.eclipse.papyrus.diagram.profile.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyBranchCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyBranchReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyBranchCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyBranchReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ElementImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ElementImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ElementImportEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/DependencyNodeItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/DependencyNodeItemSemanticEditPolicy.java
index d5c299c5d05..6a5e3b1705e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/DependencyNodeItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/DependencyNodeItemSemanticEditPolicy.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.policies;

+package org.eclipse.papyrus.uml.diagram.profile.edit.policies;

 

 import java.util.ArrayList;

 import java.util.List;

@@ -27,22 +27,22 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelations
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

-import org.eclipse.papyrus.diagram.profile.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyBranchCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyBranchReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyBranchCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyBranchReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ElementImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ElementImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ElementImportEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/ElementImportItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ElementImportItemSemanticEditPolicy.java
index c2fc112dc73..bae076fdc22 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/ElementImportItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ElementImportItemSemanticEditPolicy.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.policies;

+package org.eclipse.papyrus.uml.diagram.profile.edit.policies;

 

 import java.util.ArrayList;

 import java.util.List;

@@ -24,13 +24,13 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

-import org.eclipse.papyrus.diagram.profile.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicy.java
index 3dff5cfb62f..51cbbee7c1d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicy.java
@@ -11,12 +11,12 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.policies;

+package org.eclipse.papyrus.uml.diagram.profile.edit.policies;

 

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.diagram.profile.edit.commands.EnumerationLiteralCreateCommand;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.EnumerationLiteralCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicyCN.java
index 971354c04f7..83278f1e896 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicyCN.java
@@ -11,12 +11,12 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.policies;

+package org.eclipse.papyrus.uml.diagram.profile.edit.policies;

 

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.diagram.profile.edit.commands.EnumerationLiteralCreateCommand;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.EnumerationLiteralCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/EnumerationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/EnumerationItemSemanticEditPolicy.java
index 1ba52842a2e..1241e70a86b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/EnumerationItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/EnumerationItemSemanticEditPolicy.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.policies;

+package org.eclipse.papyrus.uml.diagram.profile.edit.policies;

 

 import java.util.ArrayList;

 import java.util.Iterator;

@@ -31,37 +31,37 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipReques
 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

-import org.eclipse.papyrus.diagram.profile.edit.commands.AssociationBranchCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.AssociationBranchReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.AssociationCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.AssociationReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyBranchCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyBranchReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.GeneralizationReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.PackageImportCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.PackageImportReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationBranchEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.EnumerationEnumerationLiteralCompartmentEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.EnumerationLiteralEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.diagram.profile.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.AssociationBranchCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.AssociationBranchReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.AssociationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.AssociationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyBranchCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyBranchReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ElementImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ElementImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.GeneralizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.GeneralizationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.PackageImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.PackageImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ElementImportEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.EnumerationEnumerationLiteralCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.EnumerationLiteralEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PackageImportEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/EnumerationItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/EnumerationItemSemanticEditPolicyCN.java
index e4cec2b9e40..4508ead89da 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/EnumerationItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/EnumerationItemSemanticEditPolicyCN.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.policies;

+package org.eclipse.papyrus.uml.diagram.profile.edit.policies;

 

 import java.util.ArrayList;

 import java.util.Iterator;

@@ -31,37 +31,37 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipReques
 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

-import org.eclipse.papyrus.diagram.profile.edit.commands.AssociationBranchCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.AssociationBranchReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.AssociationCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.AssociationReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyBranchCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyBranchReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.GeneralizationReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.PackageImportCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.PackageImportReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationBranchEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.EnumerationEnumerationLiteralCompartmentEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.EnumerationLiteralEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.diagram.profile.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.AssociationBranchCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.AssociationBranchReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.AssociationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.AssociationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyBranchCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyBranchReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ElementImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ElementImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.GeneralizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.GeneralizationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.PackageImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.PackageImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ElementImportEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.EnumerationEnumerationLiteralCompartmentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.EnumerationLiteralEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PackageImportEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/EnumerationLiteralItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/EnumerationLiteralItemSemanticEditPolicy.java
index 4449270bef7..3865bf1a243 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/EnumerationLiteralItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/EnumerationLiteralItemSemanticEditPolicy.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.policies;

+package org.eclipse.papyrus.uml.diagram.profile.edit.policies;

 

 import java.util.ArrayList;

 import java.util.List;

@@ -24,7 +24,7 @@ import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalC
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/ExtensionItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ExtensionItemSemanticEditPolicy.java
index 8955b13700e..f536cf5665b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/ExtensionItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ExtensionItemSemanticEditPolicy.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.policies;

+package org.eclipse.papyrus.uml.diagram.profile.edit.policies;

 

 import java.util.ArrayList;

 import java.util.List;

@@ -25,34 +25,34 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

 import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

-import org.eclipse.papyrus.diagram.profile.edit.commands.AssociationBranchCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.AssociationBranchReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.AssociationCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.AssociationReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyBranchCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyBranchReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.GeneralizationReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.PackageImportCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.PackageImportReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationBranchEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.AssociationBranchCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.AssociationBranchReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.AssociationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.AssociationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyBranchCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyBranchReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ElementImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ElementImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.GeneralizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.GeneralizationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.PackageImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.PackageImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ElementImportEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PackageImportEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/GeneralizationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/GeneralizationItemSemanticEditPolicy.java
index f8ecc08a799..f70b3440912 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/GeneralizationItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/GeneralizationItemSemanticEditPolicy.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.policies;

+package org.eclipse.papyrus.uml.diagram.profile.edit.policies;

 

 import java.util.ArrayList;

 import java.util.List;

@@ -24,13 +24,13 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

-import org.eclipse.papyrus.diagram.profile.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/MetaclassItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/MetaclassItemSemanticEditPolicy.java
index 15bbe196a80..d25ea33fae6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/MetaclassItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/MetaclassItemSemanticEditPolicy.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.policies;

+package org.eclipse.papyrus.uml.diagram.profile.edit.policies;

 

 import java.util.ArrayList;

 import java.util.List;

@@ -27,37 +27,37 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelations
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

-import org.eclipse.papyrus.diagram.profile.edit.commands.AssociationBranchCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.AssociationBranchReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.AssociationCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.AssociationReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyBranchCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyBranchReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ExtensionCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ExtensionReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.GeneralizationReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.PackageImportCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.PackageImportReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationBranchEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ExtensionEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.AssociationBranchCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.AssociationBranchReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.AssociationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.AssociationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyBranchCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyBranchReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ElementImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ElementImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ExtensionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ExtensionReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.GeneralizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.GeneralizationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.PackageImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.PackageImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ElementImportEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ExtensionEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PackageImportEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/MetaclassItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/MetaclassItemSemanticEditPolicyCN.java
index 984c8327e8d..8de5dd370f8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/MetaclassItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/MetaclassItemSemanticEditPolicyCN.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.policies;

+package org.eclipse.papyrus.uml.diagram.profile.edit.policies;

 

 import java.util.ArrayList;

 import java.util.List;

@@ -27,37 +27,37 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelations
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

-import org.eclipse.papyrus.diagram.profile.edit.commands.AssociationBranchCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.AssociationBranchReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.AssociationCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.AssociationReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyBranchCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyBranchReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ExtensionCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ExtensionReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.GeneralizationReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.PackageImportCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.PackageImportReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationBranchEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ExtensionEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.AssociationBranchCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.AssociationBranchReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.AssociationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.AssociationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyBranchCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyBranchReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ElementImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ElementImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ExtensionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ExtensionReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.GeneralizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.GeneralizationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.PackageImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.PackageImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ElementImportEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ExtensionEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PackageImportEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/ModelItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ModelItemSemanticEditPolicyCN.java
index 338abc1bfe0..48893093cba 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/ModelItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ModelItemSemanticEditPolicyCN.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.policies;

+package org.eclipse.papyrus.uml.diagram.profile.edit.policies;

 

 import java.util.ArrayList;

 import java.util.Iterator;

@@ -34,41 +34,41 @@ import org.eclipse.gmf.runtime.notation.Edge;
 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

-import org.eclipse.papyrus.diagram.profile.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyBranchCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyBranchReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.PackageImportCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.PackageImportReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ProfileApplicationCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ProfileApplicationReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationBranchEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.CommentEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ConstraintEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DataTypeEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.EnumerationEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ModelEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ModelPackageableElementCompartmentEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.PackageEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.PrimitiveTypeEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfileApplicationEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfileEditPartCN;

-import org.eclipse.papyrus.diagram.profile.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyBranchCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyBranchReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ElementImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ElementImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.PackageImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.PackageImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ProfileApplicationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ProfileApplicationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.CommentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ConstraintEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DataTypeEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ElementImportEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.EnumerationEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ModelEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ModelPackageableElementCompartmentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PackageEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PackageImportEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PrimitiveTypeEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileApplicationEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/ModelItemSemanticEditPolicyTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ModelItemSemanticEditPolicyTN.java
index 26c8633490b..5f7a4f36070 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/ModelItemSemanticEditPolicyTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ModelItemSemanticEditPolicyTN.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.policies;

+package org.eclipse.papyrus.uml.diagram.profile.edit.policies;

 

 import java.util.ArrayList;

 import java.util.Iterator;

@@ -34,41 +34,41 @@ import org.eclipse.gmf.runtime.notation.Edge;
 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

-import org.eclipse.papyrus.diagram.profile.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyBranchCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyBranchReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.PackageImportCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.PackageImportReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ProfileApplicationCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ProfileApplicationReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationBranchEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.CommentEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ConstraintEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DataTypeEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.EnumerationEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ModelEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ModelPackageableElementCompartmentEditPartTN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.PackageEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.PrimitiveTypeEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfileApplicationEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfileEditPartCN;

-import org.eclipse.papyrus.diagram.profile.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyBranchCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyBranchReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ElementImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ElementImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.PackageImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.PackageImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ProfileApplicationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ProfileApplicationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.CommentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ConstraintEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DataTypeEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ElementImportEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.EnumerationEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ModelEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ModelPackageableElementCompartmentEditPartTN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PackageEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PackageImportEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PrimitiveTypeEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileApplicationEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/ModelPackageableElementCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ModelPackageableElementCompartmentItemSemanticEditPolicyCN.java
index cbc7fe138bd..0b1c5ac9ab3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/ModelPackageableElementCompartmentItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ModelPackageableElementCompartmentItemSemanticEditPolicyCN.java
@@ -11,19 +11,19 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.policies;

+package org.eclipse.papyrus.uml.diagram.profile.edit.policies;

 

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.diagram.profile.edit.commands.CommentCreateCommandCN;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ConstraintCreateCommandCN;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DataTypeCreateCommandCN;

-import org.eclipse.papyrus.diagram.profile.edit.commands.EnumerationCreateCommandCN;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ModelCreateCommandCN;

-import org.eclipse.papyrus.diagram.profile.edit.commands.PackageCreateCommandCN;

-import org.eclipse.papyrus.diagram.profile.edit.commands.PrimitiveTypeCreateCommandCN;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ProfileCreateCommandCN;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.CommentCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DataTypeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.EnumerationCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ModelCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.PackageCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.PrimitiveTypeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ProfileCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/ModelPackageableElementCompartmentItemSemanticEditPolicyTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ModelPackageableElementCompartmentItemSemanticEditPolicyTN.java
index daaf77d1af8..484f5c42ab6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/ModelPackageableElementCompartmentItemSemanticEditPolicyTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ModelPackageableElementCompartmentItemSemanticEditPolicyTN.java
@@ -11,19 +11,19 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.policies;

+package org.eclipse.papyrus.uml.diagram.profile.edit.policies;

 

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.diagram.profile.edit.commands.CommentCreateCommandCN;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ConstraintCreateCommandCN;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DataTypeCreateCommandCN;

-import org.eclipse.papyrus.diagram.profile.edit.commands.EnumerationCreateCommandCN;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ModelCreateCommandCN;

-import org.eclipse.papyrus.diagram.profile.edit.commands.PackageCreateCommandCN;

-import org.eclipse.papyrus.diagram.profile.edit.commands.PrimitiveTypeCreateCommandCN;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ProfileCreateCommandCN;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.CommentCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DataTypeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.EnumerationCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ModelCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.PackageCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.PrimitiveTypeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ProfileCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/PackageImportItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/PackageImportItemSemanticEditPolicy.java
index 64170c46db2..c77f9376b4d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/PackageImportItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/PackageImportItemSemanticEditPolicy.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.policies;

+package org.eclipse.papyrus.uml.diagram.profile.edit.policies;

 

 import java.util.ArrayList;

 import java.util.List;

@@ -24,13 +24,13 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

-import org.eclipse.papyrus.diagram.profile.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/PackageItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/PackageItemSemanticEditPolicy.java
index fb42d13d9e5..145870282a0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/PackageItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/PackageItemSemanticEditPolicy.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.policies;

+package org.eclipse.papyrus.uml.diagram.profile.edit.policies;

 

 import java.util.ArrayList;

 import java.util.Iterator;

@@ -34,41 +34,41 @@ import org.eclipse.gmf.runtime.notation.Edge;
 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

-import org.eclipse.papyrus.diagram.profile.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyBranchCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyBranchReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.PackageImportCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.PackageImportReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ProfileApplicationCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ProfileApplicationReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationBranchEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.CommentEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ConstraintEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DataTypeEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.EnumerationEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ModelEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.PackageEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.PackagePackageableElementCompartmentEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.PrimitiveTypeEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfileApplicationEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfileEditPartCN;

-import org.eclipse.papyrus.diagram.profile.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyBranchCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyBranchReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ElementImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ElementImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.PackageImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.PackageImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ProfileApplicationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ProfileApplicationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.CommentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ConstraintEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DataTypeEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ElementImportEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.EnumerationEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ModelEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PackageEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PackageImportEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PackagePackageableElementCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PrimitiveTypeEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileApplicationEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/PackageItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/PackageItemSemanticEditPolicyCN.java
index b3e6b3c9f58..6218010064f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/PackageItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/PackageItemSemanticEditPolicyCN.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.policies;

+package org.eclipse.papyrus.uml.diagram.profile.edit.policies;

 

 import java.util.ArrayList;

 import java.util.Iterator;

@@ -35,42 +35,42 @@ import org.eclipse.gmf.runtime.notation.Edge;
 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

-import org.eclipse.papyrus.diagram.profile.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyBranchCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyBranchReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.PackageCreateCommandCN;

-import org.eclipse.papyrus.diagram.profile.edit.commands.PackageImportCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.PackageImportReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ProfileApplicationCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ProfileApplicationReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationBranchEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.CommentEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ConstraintEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DataTypeEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.EnumerationEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ModelEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.PackageEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.PackagePackageableElementCompartmentEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.PrimitiveTypeEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfileApplicationEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfileEditPartCN;

-import org.eclipse.papyrus.diagram.profile.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyBranchCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyBranchReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ElementImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ElementImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.PackageCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.PackageImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.PackageImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ProfileApplicationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ProfileApplicationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.CommentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ConstraintEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DataTypeEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ElementImportEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.EnumerationEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ModelEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PackageEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PackageImportEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PackagePackageableElementCompartmentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PrimitiveTypeEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileApplicationEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/PackagePackageableElementCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/PackagePackageableElementCompartmentItemSemanticEditPolicy.java
index 29b31fa75a3..bac6f249a71 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/PackagePackageableElementCompartmentItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/PackagePackageableElementCompartmentItemSemanticEditPolicy.java
@@ -11,19 +11,19 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.policies;

+package org.eclipse.papyrus.uml.diagram.profile.edit.policies;

 

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.diagram.profile.edit.commands.CommentCreateCommandCN;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ConstraintCreateCommandCN;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DataTypeCreateCommandCN;

-import org.eclipse.papyrus.diagram.profile.edit.commands.EnumerationCreateCommandCN;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ModelCreateCommandCN;

-import org.eclipse.papyrus.diagram.profile.edit.commands.PackageCreateCommandCN;

-import org.eclipse.papyrus.diagram.profile.edit.commands.PrimitiveTypeCreateCommandCN;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ProfileCreateCommandCN;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.CommentCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DataTypeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.EnumerationCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ModelCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.PackageCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.PrimitiveTypeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ProfileCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/PackagePackageableElementCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/PackagePackageableElementCompartmentItemSemanticEditPolicyCN.java
index 576d0e4d124..195148d30c6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/PackagePackageableElementCompartmentItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/PackagePackageableElementCompartmentItemSemanticEditPolicyCN.java
@@ -11,19 +11,19 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.policies;

+package org.eclipse.papyrus.uml.diagram.profile.edit.policies;

 

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.diagram.profile.edit.commands.CommentCreateCommandCN;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ConstraintCreateCommandCN;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DataTypeCreateCommandCN;

-import org.eclipse.papyrus.diagram.profile.edit.commands.EnumerationCreateCommandCN;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ModelCreateCommandCN;

-import org.eclipse.papyrus.diagram.profile.edit.commands.PackageCreateCommandCN;

-import org.eclipse.papyrus.diagram.profile.edit.commands.PrimitiveTypeCreateCommandCN;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ProfileCreateCommandCN;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.CommentCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DataTypeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.EnumerationCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ModelCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.PackageCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.PrimitiveTypeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ProfileCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/PrimitiveTypeItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/PrimitiveTypeItemSemanticEditPolicy.java
index 234d56c00c3..ba403cb6e75 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/PrimitiveTypeItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/PrimitiveTypeItemSemanticEditPolicy.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.policies;

+package org.eclipse.papyrus.uml.diagram.profile.edit.policies;

 

 import java.util.ArrayList;

 import java.util.List;

@@ -27,34 +27,34 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelations
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

-import org.eclipse.papyrus.diagram.profile.edit.commands.AssociationBranchCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.AssociationBranchReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.AssociationCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.AssociationReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyBranchCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyBranchReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.GeneralizationReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.PackageImportCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.PackageImportReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationBranchEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.AssociationBranchCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.AssociationBranchReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.AssociationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.AssociationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyBranchCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyBranchReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ElementImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ElementImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.GeneralizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.GeneralizationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.PackageImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.PackageImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ElementImportEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PackageImportEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/PrimitiveTypeItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/PrimitiveTypeItemSemanticEditPolicyCN.java
index 3a6ff7ca238..320cba53417 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/PrimitiveTypeItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/PrimitiveTypeItemSemanticEditPolicyCN.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.policies;

+package org.eclipse.papyrus.uml.diagram.profile.edit.policies;

 

 import java.util.ArrayList;

 import java.util.List;

@@ -27,34 +27,34 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelations
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

-import org.eclipse.papyrus.diagram.profile.edit.commands.AssociationBranchCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.AssociationBranchReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.AssociationCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.AssociationReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyBranchCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyBranchReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.GeneralizationReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.PackageImportCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.PackageImportReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationBranchEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.AssociationBranchCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.AssociationBranchReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.AssociationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.AssociationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyBranchCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyBranchReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ElementImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ElementImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.GeneralizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.GeneralizationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.PackageImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.PackageImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ElementImportEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PackageImportEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/ProfileApplicationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ProfileApplicationItemSemanticEditPolicy.java
index 8ebf62c4b34..8bf7d6f285c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/ProfileApplicationItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ProfileApplicationItemSemanticEditPolicy.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.policies;

+package org.eclipse.papyrus.uml.diagram.profile.edit.policies;

 

 import java.util.ArrayList;

 import java.util.List;

@@ -24,13 +24,13 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

-import org.eclipse.papyrus.diagram.profile.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/ProfileDiagramItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ProfileDiagramItemSemanticEditPolicy.java
index c50ce0ecf45..869743f68a3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/ProfileDiagramItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ProfileDiagramItemSemanticEditPolicy.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.policies;

+package org.eclipse.papyrus.uml.diagram.profile.edit.policies;

 

 import org.eclipse.emf.transaction.TransactionalEditingDomain;

 import org.eclipse.gef.commands.Command;

@@ -19,21 +19,21 @@ import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DuplicateElementsRequest;

 import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.papyrus.diagram.common.commands.DuplicateNamedElementCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.AssociationNodeCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.CommentEditPartCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ConstraintCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DataTypeCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyNodeCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.EnumerationCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.MetaclassCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ModelCreateCommandTN;

-import org.eclipse.papyrus.diagram.profile.edit.commands.PackageCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.PrimitiveTypeCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ProfileCreateCommandTN;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ShortCutDiagramCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.StereotypeCreateCommand;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.common.commands.DuplicateNamedElementCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.AssociationNodeCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.CommentEditPartCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ConstraintCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DataTypeCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyNodeCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.EnumerationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.MetaclassCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ModelCreateCommandTN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.PackageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.PrimitiveTypeCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ProfileCreateCommandTN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ShortCutDiagramCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.StereotypeCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/ProfileItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ProfileItemSemanticEditPolicyCN.java
index 67835048815..e672d2be8e4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/ProfileItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ProfileItemSemanticEditPolicyCN.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.policies;

+package org.eclipse.papyrus.uml.diagram.profile.edit.policies;

 

 import java.util.ArrayList;

 import java.util.Iterator;

@@ -34,44 +34,44 @@ import org.eclipse.gmf.runtime.notation.Edge;
 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

-import org.eclipse.papyrus.diagram.profile.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyBranchCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyBranchReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.PackageImportCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.PackageImportReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ProfileApplicationCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ProfileApplicationReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationBranchEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.CommentEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ConstraintEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DataTypeEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.EnumerationEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ExtensionEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.MetaclassEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ModelEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.PackageEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.PrimitiveTypeEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfileApplicationEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfileEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfilePackageableElementCompartmentEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.StereotypeEditPartCN;

-import org.eclipse.papyrus.diagram.profile.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyBranchCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyBranchReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ElementImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ElementImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.PackageImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.PackageImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ProfileApplicationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ProfileApplicationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.CommentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ConstraintEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DataTypeEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ElementImportEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.EnumerationEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ExtensionEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.MetaclassEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ModelEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PackageEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PackageImportEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PrimitiveTypeEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileApplicationEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfilePackageableElementCompartmentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.StereotypeEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/ProfileItemSemanticEditPolicyTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ProfileItemSemanticEditPolicyTN.java
index 5d5e1729199..f80d4e03496 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/ProfileItemSemanticEditPolicyTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ProfileItemSemanticEditPolicyTN.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.policies;

+package org.eclipse.papyrus.uml.diagram.profile.edit.policies;

 

 import java.util.ArrayList;

 import java.util.Iterator;

@@ -34,44 +34,44 @@ import org.eclipse.gmf.runtime.notation.Edge;
 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

-import org.eclipse.papyrus.diagram.profile.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyBranchCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyBranchReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.PackageImportCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.PackageImportReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ProfileApplicationCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ProfileApplicationReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationBranchEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.CommentEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ConstraintEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DataTypeEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.EnumerationEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ExtensionEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.MetaclassEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ModelEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.PackageEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.PrimitiveTypeEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfileApplicationEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfileEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfilePackageableElementCompartmentEditPartTN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.StereotypeEditPartCN;

-import org.eclipse.papyrus.diagram.profile.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyBranchCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyBranchReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ElementImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ElementImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.PackageImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.PackageImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ProfileApplicationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ProfileApplicationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.CommentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ConstraintEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DataTypeEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ElementImportEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.EnumerationEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ExtensionEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.MetaclassEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ModelEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PackageEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PackageImportEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PrimitiveTypeEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileApplicationEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfilePackageableElementCompartmentEditPartTN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.StereotypeEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/ProfilePackageableElementCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ProfilePackageableElementCompartmentItemSemanticEditPolicyCN.java
index 852af2ffda4..0a51501e618 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/ProfilePackageableElementCompartmentItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ProfilePackageableElementCompartmentItemSemanticEditPolicyCN.java
@@ -11,21 +11,21 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.policies;

+package org.eclipse.papyrus.uml.diagram.profile.edit.policies;

 

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.diagram.profile.edit.commands.CommentCreateCommandCN;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ConstraintCreateCommandCN;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DataTypeCreateCommandCN;

-import org.eclipse.papyrus.diagram.profile.edit.commands.EnumerationCreateCommandCN;

-import org.eclipse.papyrus.diagram.profile.edit.commands.MetaclassCreateCommandCN;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ModelCreateCommandCN;

-import org.eclipse.papyrus.diagram.profile.edit.commands.PackageCreateCommandCN;

-import org.eclipse.papyrus.diagram.profile.edit.commands.PrimitiveTypeCreateCommandCN;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ProfileCreateCommandCN;

-import org.eclipse.papyrus.diagram.profile.edit.commands.StereotypeCreateCommandCN;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.CommentCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DataTypeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.EnumerationCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.MetaclassCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ModelCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.PackageCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.PrimitiveTypeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ProfileCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.StereotypeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/ProfilePackageableElementCompartmentItemSemanticEditPolicyTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ProfilePackageableElementCompartmentItemSemanticEditPolicyTN.java
index 05f412fc261..aa2ced70074 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/ProfilePackageableElementCompartmentItemSemanticEditPolicyTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ProfilePackageableElementCompartmentItemSemanticEditPolicyTN.java
@@ -11,21 +11,21 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.policies;

+package org.eclipse.papyrus.uml.diagram.profile.edit.policies;

 

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.diagram.profile.edit.commands.CommentCreateCommandCN;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ConstraintCreateCommandCN;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DataTypeCreateCommandCN;

-import org.eclipse.papyrus.diagram.profile.edit.commands.EnumerationCreateCommandCN;

-import org.eclipse.papyrus.diagram.profile.edit.commands.MetaclassCreateCommandCN;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ModelCreateCommandCN;

-import org.eclipse.papyrus.diagram.profile.edit.commands.PackageCreateCommandCN;

-import org.eclipse.papyrus.diagram.profile.edit.commands.PrimitiveTypeCreateCommandCN;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ProfileCreateCommandCN;

-import org.eclipse.papyrus.diagram.profile.edit.commands.StereotypeCreateCommandCN;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.CommentCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DataTypeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.EnumerationCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.MetaclassCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ModelCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.PackageCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.PrimitiveTypeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ProfileCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.StereotypeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/ShortCutDiagramItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ShortCutDiagramItemSemanticEditPolicy.java
index 401fc25eb4d..e33b4578752 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/ShortCutDiagramItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ShortCutDiagramItemSemanticEditPolicy.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.policies;

+package org.eclipse.papyrus.uml.diagram.profile.edit.policies;

 

 import java.util.ArrayList;

 import java.util.List;

@@ -24,7 +24,7 @@ import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalC
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/StereotypeAttributeCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/StereotypeAttributeCompartmentItemSemanticEditPolicy.java
index e06d5fe2880..3801b442efe 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/StereotypeAttributeCompartmentItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/StereotypeAttributeCompartmentItemSemanticEditPolicy.java
@@ -11,12 +11,12 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.policies;

+package org.eclipse.papyrus.uml.diagram.profile.edit.policies;

 

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ClassPropertyCreateCommand;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ClassPropertyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/StereotypeAttributeCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/StereotypeAttributeCompartmentItemSemanticEditPolicyCN.java
index be192e9ef71..4c06657a01d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/StereotypeAttributeCompartmentItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/StereotypeAttributeCompartmentItemSemanticEditPolicyCN.java
@@ -11,12 +11,12 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.policies;

+package org.eclipse.papyrus.uml.diagram.profile.edit.policies;

 

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ClassPropertyCreateCommand;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ClassPropertyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/StereotypeItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/StereotypeItemSemanticEditPolicy.java
index 25f7f298cae..c8b406d52bd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/StereotypeItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/StereotypeItemSemanticEditPolicy.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.policies;

+package org.eclipse.papyrus.uml.diagram.profile.edit.policies;

 

 import java.util.ArrayList;

 import java.util.Iterator;

@@ -31,42 +31,42 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipReques
 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

-import org.eclipse.papyrus.diagram.profile.edit.commands.AssociationBranchCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.AssociationBranchReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.AssociationCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.AssociationReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyBranchCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyBranchReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ExtensionCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ExtensionReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.GeneralizationReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.PackageImportCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.PackageImportReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationBranchEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ClassOperationEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ClassPropertyEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ExtensionEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.StereotypeAttributeCompartmentEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.StereotypeOperationCompartmentEditPart;

-import org.eclipse.papyrus.diagram.profile.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.AssociationBranchCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.AssociationBranchReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.AssociationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.AssociationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyBranchCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyBranchReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ElementImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ElementImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ExtensionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ExtensionReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.GeneralizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.GeneralizationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.PackageImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.PackageImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ClassOperationEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ClassPropertyEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ElementImportEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ExtensionEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PackageImportEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.StereotypeAttributeCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.StereotypeOperationCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/StereotypeItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/StereotypeItemSemanticEditPolicyCN.java
index 877ab8bc677..44e60fc11e0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/StereotypeItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/StereotypeItemSemanticEditPolicyCN.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.policies;

+package org.eclipse.papyrus.uml.diagram.profile.edit.policies;

 

 import java.util.ArrayList;

 import java.util.Iterator;

@@ -31,42 +31,42 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipReques
 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

-import org.eclipse.papyrus.diagram.profile.edit.commands.AssociationBranchCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.AssociationBranchReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.AssociationCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.AssociationReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyBranchCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyBranchReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ExtensionCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ExtensionReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.GeneralizationReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.PackageImportCreateCommand;

-import org.eclipse.papyrus.diagram.profile.edit.commands.PackageImportReorientCommand;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationBranchEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ClassOperationEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ClassPropertyEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ExtensionEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.StereotypeAttributeCompartmentEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.StereotypeOperationCompartmentEditPartCN;

-import org.eclipse.papyrus.diagram.profile.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.AssociationBranchCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.AssociationBranchReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.AssociationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.AssociationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyBranchCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyBranchReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DependencyReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ElementImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ElementImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ExtensionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ExtensionReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.GeneralizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.GeneralizationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.PackageImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.PackageImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ClassOperationEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ClassPropertyEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ElementImportEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ExtensionEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PackageImportEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.StereotypeAttributeCompartmentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.StereotypeOperationCompartmentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/StereotypeOperationCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/StereotypeOperationCompartmentItemSemanticEditPolicy.java
index ba57044f2bd..a1523ef35c1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/StereotypeOperationCompartmentItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/StereotypeOperationCompartmentItemSemanticEditPolicy.java
@@ -11,12 +11,12 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.policies;

+package org.eclipse.papyrus.uml.diagram.profile.edit.policies;

 

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ClassOperationCreateCommand;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ClassOperationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/StereotypeOperationCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/StereotypeOperationCompartmentItemSemanticEditPolicyCN.java
index 69fd29a869a..93410712214 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/StereotypeOperationCompartmentItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/StereotypeOperationCompartmentItemSemanticEditPolicyCN.java
@@ -11,12 +11,12 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.policies;

+package org.eclipse.papyrus.uml.diagram.profile.edit.policies;

 

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.diagram.profile.edit.commands.ClassOperationCreateCommand;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ClassOperationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/UMLBaseItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/UMLBaseItemSemanticEditPolicy.java
index c117c14bbb4..16a13fa4034 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/UMLBaseItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/UMLBaseItemSemanticEditPolicy.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.policies;

+package org.eclipse.papyrus.uml.diagram.profile.edit.policies;

 

 import java.util.Iterator;

 

@@ -44,14 +44,14 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelations
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.helper.UMLBaseEditHelper;

-import org.eclipse.papyrus.diagram.profile.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.profile.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

 import org.eclipse.papyrus.extendedtypes.types.IExtendedHintedElementType;

 import org.eclipse.papyrus.profile.utils.Util;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 import org.eclipse.uml2.uml.Association;

 import org.eclipse.uml2.uml.Class;

 import org.eclipse.uml2.uml.Classifier;

@@ -485,13 +485,13 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy {
 				//ExtensionSource

 				/**we can't make a test here, because, the source must be a Property (ExtensionEnd) and it's a Stereotype

 				 * 

-				 * @see org.eclipse.papyrus.diagram.profile.custom.policies.CUMLBaseItemSemanticEditPolicy for the good test!

+				 * @see org.eclipse.papyrus.uml.diagram.profile.custom.policies.CUMLBaseItemSemanticEditPolicy for the good test!

 				 */

 				//ExtensionTarget

 

 				/**we can't make a test here, because, the source must be a Property (ExtensionEnd) and it's a Stereotype

 				 * 

-				 * @see org.eclipse.papyrus.diagram.profile.custom.policies.CUMLBaseItemSemanticEditPolicy for the good test!

+				 * @see org.eclipse.papyrus.uml.diagram.profile.custom.policies.CUMLBaseItemSemanticEditPolicy for the good test!

 				 */

 				return true;

 			} catch (Exception e) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/UMLTextNonResizableEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/UMLTextNonResizableEditPolicy.java
index 732d38d8a97..7048d99de38 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/UMLTextNonResizableEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/UMLTextNonResizableEditPolicy.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.policies;

+package org.eclipse.papyrus.uml.diagram.profile.edit.policies;

 

 import java.util.Collections;

 import java.util.List;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/UMLTextSelectionEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/UMLTextSelectionEditPolicy.java
index c762a1a7d7a..36182db9155 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/UMLTextSelectionEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/UMLTextSelectionEditPolicy.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.edit.policies;

+package org.eclipse.papyrus.uml.diagram.profile.edit.policies;

 

 import org.eclipse.draw2d.ColorConstants;

 import org.eclipse.draw2d.Figure;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/navigator/UMLAbstractNavigatorItem.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/navigator/UMLAbstractNavigatorItem.java
index a8ce851e800..856ec699c38 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/navigator/UMLAbstractNavigatorItem.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/navigator/UMLAbstractNavigatorItem.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.navigator;

+package org.eclipse.papyrus.uml.diagram.profile.navigator;

 

 import org.eclipse.core.runtime.IAdapterFactory;

 import org.eclipse.core.runtime.Platform;

@@ -32,13 +32,13 @@ public abstract class UMLAbstractNavigatorItem extends PlatformObject {
 		final ITabbedPropertySheetPageContributor propertySheetPageContributor = new ITabbedPropertySheetPageContributor() {

 

 			public String getContributorId() {

-				return "org.eclipse.papyrus.diagram.profile"; //$NON-NLS-1$

+				return "org.eclipse.papyrus.uml.diagram.profile"; //$NON-NLS-1$

 			}

 		};

 		Platform.getAdapterManager().registerAdapters(new IAdapterFactory() {

 

 			public Object getAdapter(Object adaptableObject, Class adapterType) {

-				if(adaptableObject instanceof org.eclipse.papyrus.diagram.profile.navigator.UMLAbstractNavigatorItem && adapterType == ITabbedPropertySheetPageContributor.class) {

+				if(adaptableObject instanceof org.eclipse.papyrus.uml.diagram.profile.navigator.UMLAbstractNavigatorItem && adapterType == ITabbedPropertySheetPageContributor.class) {

 					return propertySheetPageContributor;

 				}

 				return null;

@@ -47,7 +47,7 @@ public abstract class UMLAbstractNavigatorItem extends PlatformObject {
 			public Class[] getAdapterList() {

 				return supportedTypes;

 			}

-		}, org.eclipse.papyrus.diagram.profile.navigator.UMLAbstractNavigatorItem.class);

+		}, org.eclipse.papyrus.uml.diagram.profile.navigator.UMLAbstractNavigatorItem.class);

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/navigator/UMLDomainNavigatorContentProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/navigator/UMLDomainNavigatorContentProvider.java
index 4e16821d914..11e0c7926f6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/navigator/UMLDomainNavigatorContentProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/navigator/UMLDomainNavigatorContentProvider.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.navigator;

+package org.eclipse.papyrus.uml.diagram.profile.navigator;

 

 import java.util.ArrayList;

 import java.util.Collection;

@@ -28,7 +28,7 @@ import org.eclipse.emf.transaction.TransactionalEditingDomain;
 import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;

 import org.eclipse.gmf.runtime.emf.core.GMFEditingDomainFactory;

 import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.papyrus.diagram.profile.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;

 import org.eclipse.ui.IMemento;

 import org.eclipse.ui.navigator.ICommonContentExtensionSite;

 import org.eclipse.ui.navigator.ICommonContentProvider;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/navigator/UMLDomainNavigatorItem.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/navigator/UMLDomainNavigatorItem.java
index e238838aa43..bc6d879a6f5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/navigator/UMLDomainNavigatorItem.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/navigator/UMLDomainNavigatorItem.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.navigator;

+package org.eclipse.papyrus.uml.diagram.profile.navigator;

 

 import org.eclipse.core.runtime.IAdapterFactory;

 import org.eclipse.core.runtime.Platform;

@@ -34,8 +34,8 @@ public class UMLDomainNavigatorItem extends PlatformObject {
 		Platform.getAdapterManager().registerAdapters(new IAdapterFactory() {

 

 			public Object getAdapter(Object adaptableObject, Class adapterType) {

-				if(adaptableObject instanceof org.eclipse.papyrus.diagram.profile.navigator.UMLDomainNavigatorItem) {

-					org.eclipse.papyrus.diagram.profile.navigator.UMLDomainNavigatorItem domainNavigatorItem = (org.eclipse.papyrus.diagram.profile.navigator.UMLDomainNavigatorItem)adaptableObject;

+				if(adaptableObject instanceof org.eclipse.papyrus.uml.diagram.profile.navigator.UMLDomainNavigatorItem) {

+					org.eclipse.papyrus.uml.diagram.profile.navigator.UMLDomainNavigatorItem domainNavigatorItem = (org.eclipse.papyrus.uml.diagram.profile.navigator.UMLDomainNavigatorItem)adaptableObject;

 					EObject eObject = domainNavigatorItem.getEObject();

 					if(adapterType == EObject.class) {

 						return eObject;

@@ -51,7 +51,7 @@ public class UMLDomainNavigatorItem extends PlatformObject {
 			public Class[] getAdapterList() {

 				return supportedTypes;

 			}

-		}, org.eclipse.papyrus.diagram.profile.navigator.UMLDomainNavigatorItem.class);

+		}, org.eclipse.papyrus.uml.diagram.profile.navigator.UMLDomainNavigatorItem.class);

 	}

 

 	/**

@@ -103,8 +103,8 @@ public class UMLDomainNavigatorItem extends PlatformObject {
 	 * @generated

 	 */

 	public boolean equals(Object obj) {

-		if(obj instanceof org.eclipse.papyrus.diagram.profile.navigator.UMLDomainNavigatorItem) {

-			return EcoreUtil.getURI(getEObject()).equals(EcoreUtil.getURI(((org.eclipse.papyrus.diagram.profile.navigator.UMLDomainNavigatorItem)obj).getEObject()));

+		if(obj instanceof org.eclipse.papyrus.uml.diagram.profile.navigator.UMLDomainNavigatorItem) {

+			return EcoreUtil.getURI(getEObject()).equals(EcoreUtil.getURI(((org.eclipse.papyrus.uml.diagram.profile.navigator.UMLDomainNavigatorItem)obj).getEObject()));

 		}

 		return super.equals(obj);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/navigator/UMLDomainNavigatorLabelProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/navigator/UMLDomainNavigatorLabelProvider.java
index 7588f149d41..e2625e06992 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/navigator/UMLDomainNavigatorLabelProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/navigator/UMLDomainNavigatorLabelProvider.java
@@ -11,11 +11,11 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.navigator;

+package org.eclipse.papyrus.uml.diagram.profile.navigator;

 

 import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;

 import org.eclipse.jface.viewers.ILabelProviderListener;

-import org.eclipse.papyrus.diagram.profile.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;

 import org.eclipse.swt.graphics.Image;

 import org.eclipse.ui.IMemento;

 import org.eclipse.ui.navigator.ICommonContentExtensionSite;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/navigator/UMLNavigatorActionProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/navigator/UMLNavigatorActionProvider.java
index 79516e82b2d..bc86e76b708 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/navigator/UMLNavigatorActionProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/navigator/UMLNavigatorActionProvider.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.navigator;

+package org.eclipse.papyrus.uml.diagram.profile.navigator;

 

 import org.eclipse.core.runtime.IAdaptable;

 import org.eclipse.emf.common.ui.URIEditorInput;

@@ -25,11 +25,11 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.action.Action;

 import org.eclipse.jface.action.IMenuManager;

 import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfileDiagramEditPart;

-import org.eclipse.papyrus.diagram.profile.part.Messages;

-import org.eclipse.papyrus.diagram.profile.part.UMLDiagramEditor;

-import org.eclipse.papyrus.diagram.profile.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.profile.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.part.Messages;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditor;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry;

 import org.eclipse.ui.IActionBars;

 import org.eclipse.ui.IEditorInput;

 import org.eclipse.ui.IWorkbenchPage;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/navigator/UMLNavigatorContentProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/navigator/UMLNavigatorContentProvider.java
index 37380d88d0a..28039aa4dbe 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/navigator/UMLNavigatorContentProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/navigator/UMLNavigatorContentProvider.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.navigator;

+package org.eclipse.papyrus.uml.diagram.profile.navigator;

 

 import java.util.ArrayList;

 import java.util.Collection;

@@ -29,8 +29,8 @@ import org.eclipse.gmf.runtime.notation.Diagram;
 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfileDiagramEditPart;

-import org.eclipse.papyrus.diagram.profile.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry;

 import org.eclipse.ui.IMemento;

 import org.eclipse.ui.navigator.ICommonContentExtensionSite;

 import org.eclipse.ui.navigator.ICommonContentProvider;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/navigator/UMLNavigatorGroup.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/navigator/UMLNavigatorGroup.java
index 703a545e96c..7d014395058 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/navigator/UMLNavigatorGroup.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/navigator/UMLNavigatorGroup.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.navigator;

+package org.eclipse.papyrus.uml.diagram.profile.navigator;

 

 import java.util.Collection;

 import java.util.LinkedList;

@@ -91,8 +91,8 @@ public class UMLNavigatorGroup extends UMLAbstractNavigatorItem {
 	 * @generated

 	 */

 	public boolean equals(Object obj) {

-		if(obj instanceof org.eclipse.papyrus.diagram.profile.navigator.UMLNavigatorGroup) {

-			org.eclipse.papyrus.diagram.profile.navigator.UMLNavigatorGroup anotherGroup = (org.eclipse.papyrus.diagram.profile.navigator.UMLNavigatorGroup)obj;

+		if(obj instanceof org.eclipse.papyrus.uml.diagram.profile.navigator.UMLNavigatorGroup) {

+			org.eclipse.papyrus.uml.diagram.profile.navigator.UMLNavigatorGroup anotherGroup = (org.eclipse.papyrus.uml.diagram.profile.navigator.UMLNavigatorGroup)obj;

 			if(getGroupName().equals(anotherGroup.getGroupName())) {

 				return getParent().equals(anotherGroup.getParent());

 			}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/navigator/UMLNavigatorItem.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/navigator/UMLNavigatorItem.java
index 08fd0c54de9..d2b0ad2c776 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/navigator/UMLNavigatorItem.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/navigator/UMLNavigatorItem.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.navigator;

+package org.eclipse.papyrus.uml.diagram.profile.navigator;

 

 import org.eclipse.core.runtime.IAdapterFactory;

 import org.eclipse.core.runtime.Platform;

@@ -32,8 +32,8 @@ public class UMLNavigatorItem extends UMLAbstractNavigatorItem {
 		Platform.getAdapterManager().registerAdapters(new IAdapterFactory() {

 

 			public Object getAdapter(Object adaptableObject, Class adapterType) {

-				if(adaptableObject instanceof org.eclipse.papyrus.diagram.profile.navigator.UMLNavigatorItem && (adapterType == View.class || adapterType == EObject.class)) {

-					return ((org.eclipse.papyrus.diagram.profile.navigator.UMLNavigatorItem)adaptableObject).getView();

+				if(adaptableObject instanceof org.eclipse.papyrus.uml.diagram.profile.navigator.UMLNavigatorItem && (adapterType == View.class || adapterType == EObject.class)) {

+					return ((org.eclipse.papyrus.uml.diagram.profile.navigator.UMLNavigatorItem)adaptableObject).getView();

 				}

 				return null;

 			}

@@ -41,7 +41,7 @@ public class UMLNavigatorItem extends UMLAbstractNavigatorItem {
 			public Class[] getAdapterList() {

 				return supportedTypes;

 			}

-		}, org.eclipse.papyrus.diagram.profile.navigator.UMLNavigatorItem.class);

+		}, org.eclipse.papyrus.uml.diagram.profile.navigator.UMLNavigatorItem.class);

 	}

 

 	/**

@@ -81,8 +81,8 @@ public class UMLNavigatorItem extends UMLAbstractNavigatorItem {
 	 * @generated

 	 */

 	public boolean equals(Object obj) {

-		if(obj instanceof org.eclipse.papyrus.diagram.profile.navigator.UMLNavigatorItem) {

-			return EcoreUtil.getURI(getView()).equals(EcoreUtil.getURI(((org.eclipse.papyrus.diagram.profile.navigator.UMLNavigatorItem)obj).getView()));

+		if(obj instanceof org.eclipse.papyrus.uml.diagram.profile.navigator.UMLNavigatorItem) {

+			return EcoreUtil.getURI(getView()).equals(EcoreUtil.getURI(((org.eclipse.papyrus.uml.diagram.profile.navigator.UMLNavigatorItem)obj).getView()));

 		}

 		return super.equals(obj);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/navigator/UMLNavigatorLabelProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/navigator/UMLNavigatorLabelProvider.java
index 02796fb22c2..34935a1ed0a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/navigator/UMLNavigatorLabelProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/navigator/UMLNavigatorLabelProvider.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.navigator;

+package org.eclipse.papyrus.uml.diagram.profile.navigator;

 

 import org.eclipse.gmf.runtime.emf.type.core.IElementType;

 import org.eclipse.gmf.runtime.notation.View;

@@ -21,10 +21,10 @@ import org.eclipse.jface.viewers.ITreePathLabelProvider;
 import org.eclipse.jface.viewers.LabelProvider;

 import org.eclipse.jface.viewers.TreePath;

 import org.eclipse.jface.viewers.ViewerLabel;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfileDiagramEditPart;

-import org.eclipse.papyrus.diagram.profile.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.profile.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 import org.eclipse.swt.graphics.Image;

 import org.eclipse.ui.IMemento;

 import org.eclipse.ui.navigator.ICommonContentExtensionSite;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/navigator/UMLNavigatorLinkHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/navigator/UMLNavigatorLinkHelper.java
index bc15ee1ef7d..b707e9b0886 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/navigator/UMLNavigatorLinkHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/navigator/UMLNavigatorLinkHelper.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.navigator;

+package org.eclipse.papyrus.uml.diagram.profile.navigator;

 

 import org.eclipse.emf.common.ui.URIEditorInput;

 import org.eclipse.emf.common.util.URI;

@@ -28,7 +28,7 @@ import org.eclipse.gmf.runtime.notation.Diagram;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.viewers.IStructuredSelection;

 import org.eclipse.jface.viewers.StructuredSelection;

-import org.eclipse.papyrus.diagram.profile.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;

 import org.eclipse.ui.IEditorInput;

 import org.eclipse.ui.IEditorPart;

 import org.eclipse.ui.IWorkbenchPage;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/navigator/UMLNavigatorSorter.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/navigator/UMLNavigatorSorter.java
index 7a673d88637..c70a008e5bc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/navigator/UMLNavigatorSorter.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/navigator/UMLNavigatorSorter.java
@@ -11,10 +11,10 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.navigator;

+package org.eclipse.papyrus.uml.diagram.profile.navigator;

 

 import org.eclipse.jface.viewers.ViewerSorter;

-import org.eclipse.papyrus.diagram.profile.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/parsers/AbstractParser.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/parsers/AbstractParser.java
index d4caa5f3878..d594e872e65 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/parsers/AbstractParser.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/parsers/AbstractParser.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.parsers;

+package org.eclipse.papyrus.uml.diagram.profile.parsers;

 

 import java.util.Arrays;

 

@@ -35,8 +35,8 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.SetValueCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;

 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.osgi.util.NLS;

-import org.eclipse.papyrus.diagram.profile.part.Messages;

-import org.eclipse.papyrus.diagram.profile.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.profile.part.Messages;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/parsers/MessageFormatParser.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/parsers/MessageFormatParser.java
index ef17629953b..20fb5845d44 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/parsers/MessageFormatParser.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/parsers/MessageFormatParser.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.parsers;

+package org.eclipse.papyrus.uml.diagram.profile.parsers;

 

 import java.text.FieldPosition;

 import java.text.MessageFormat;

@@ -24,8 +24,8 @@ import org.eclipse.gmf.runtime.common.core.command.ICommand;
 import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

 import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

 import org.eclipse.osgi.util.NLS;

-import org.eclipse.papyrus.diagram.profile.part.Messages;

-import org.eclipse.papyrus.diagram.profile.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.profile.part.Messages;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/part/DeleteElementAction.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/DeleteElementAction.java
index 8205c3b72f5..7426f3a3180 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/part/DeleteElementAction.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/DeleteElementAction.java
@@ -1,2 +1,3 @@
+package org.eclipse.papyrus.uml.diagram.profile.part;

 //This file is not used. 

 //The DeleteElementAction is removed from the plugin and replaced by DeleteFromModelAction in the plugin org.eclipse.diagram.common.

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/part/DiagramEditorContextMenuProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/DiagramEditorContextMenuProvider.java
index 8536b63fd3a..6c46841e5d0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/part/DiagramEditorContextMenuProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/DiagramEditorContextMenuProvider.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.part;

+package org.eclipse.papyrus.uml.diagram.profile.part;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.transaction.util.TransactionUtil;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/part/LoadResourceAction.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/LoadResourceAction.java
index 56209d72158..9038eaee319 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/part/LoadResourceAction.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/LoadResourceAction.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.part;

+package org.eclipse.papyrus.uml.diagram.profile.part;

 

 import org.eclipse.core.commands.AbstractHandler;

 import org.eclipse.core.commands.ExecutionEvent;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/part/Messages.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/Messages.java
index d4e22cc569c..822c98684ff 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/part/Messages.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/Messages.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.part;

+package org.eclipse.papyrus.uml.diagram.profile.part;

 

 import org.eclipse.osgi.util.NLS;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/part/ModelElementSelectionPage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/ModelElementSelectionPage.java
index f3f9c0497f7..9be5c15ed5f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/part/ModelElementSelectionPage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/ModelElementSelectionPage.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.part;

+package org.eclipse.papyrus.uml.diagram.profile.part;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.ecore.util.FeatureMap;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/part/UMLCreationWizard.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLCreationWizard.java
index c72bec31f93..b1588f8e9a6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/part/UMLCreationWizard.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLCreationWizard.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.part;

+package org.eclipse.papyrus.uml.diagram.profile.part;

 

 import java.lang.reflect.InvocationTargetException;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/part/UMLCreationWizardPage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLCreationWizardPage.java
index 7e0bf3917ff..5ade3b10aa2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/part/UMLCreationWizardPage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLCreationWizardPage.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.part;

+package org.eclipse.papyrus.uml.diagram.profile.part;

 

 import org.eclipse.core.runtime.IPath;

 import org.eclipse.core.runtime.Path;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/part/UMLDiagramActionBarContributor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLDiagramActionBarContributor.java
index 07c806446a9..2e471df42b0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/part/UMLDiagramActionBarContributor.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLDiagramActionBarContributor.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.part;

+package org.eclipse.papyrus.uml.diagram.profile.part;

 

 import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramActionBarContributor;

 import org.eclipse.jface.action.GroupMarker;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/part/UMLDiagramContentInitializer.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLDiagramContentInitializer.java
index 1a76dc0a7b8..bd4bec83823 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/part/UMLDiagramContentInitializer.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLDiagramContentInitializer.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.part;

+package org.eclipse.papyrus.uml.diagram.profile.part;

 

 import java.util.Collection;

 import java.util.HashMap;

@@ -25,60 +25,60 @@ import org.eclipse.gmf.runtime.notation.Diagram;
 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationBranchEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationNodeEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ClassOperationEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ClassPropertyEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.CommentEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.CommentEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ConstraintEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ConstraintEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DataTypeAttributeCompartmentEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DataTypeAttributeCompartmentEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DataTypeEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DataTypeEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DataTypeOperationCompartmentEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DataTypeOperationCompartmentEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DataTypeOperationEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DataTypePropertyEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DependencyNodeEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.EnumerationEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.EnumerationEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.EnumerationEnumerationLiteralCompartmentEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.EnumerationEnumerationLiteralCompartmentEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.EnumerationLiteralEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ExtensionEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.MetaclassEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.MetaclassEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ModelEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ModelEditPartTN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ModelPackageableElementCompartmentEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ModelPackageableElementCompartmentEditPartTN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.PackageEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.PackageEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.PackagePackageableElementCompartmentEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.PackagePackageableElementCompartmentEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.PrimitiveTypeEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.PrimitiveTypeEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfileApplicationEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfileDiagramEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfileEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfileEditPartTN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfilePackageableElementCompartmentEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfilePackageableElementCompartmentEditPartTN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ShortCutDiagramEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.StereotypeAttributeCompartmentEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.StereotypeAttributeCompartmentEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.StereotypeEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.StereotypeEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.StereotypeOperationCompartmentEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.StereotypeOperationCompartmentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationNodeEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ClassOperationEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ClassPropertyEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.CommentEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.CommentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ConstraintEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ConstraintEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DataTypeAttributeCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DataTypeAttributeCompartmentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DataTypeEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DataTypeEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DataTypeOperationCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DataTypeOperationCompartmentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DataTypeOperationEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DataTypePropertyEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyNodeEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ElementImportEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.EnumerationEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.EnumerationEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.EnumerationEnumerationLiteralCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.EnumerationEnumerationLiteralCompartmentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.EnumerationLiteralEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ExtensionEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.MetaclassEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.MetaclassEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ModelEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ModelEditPartTN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ModelPackageableElementCompartmentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ModelPackageableElementCompartmentEditPartTN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PackageEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PackageEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PackageImportEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PackagePackageableElementCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PackagePackageableElementCompartmentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PrimitiveTypeEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PrimitiveTypeEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileApplicationEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileEditPartTN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfilePackageableElementCompartmentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfilePackageableElementCompartmentEditPartTN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ShortCutDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.StereotypeAttributeCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.StereotypeAttributeCompartmentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.StereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.StereotypeEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.StereotypeOperationCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.StereotypeOperationCompartmentEditPartCN;

 import org.eclipse.uml2.uml.Profile;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/part/UMLDiagramEditor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLDiagramEditor.java
index 1359984440b..7144b1f939e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/part/UMLDiagramEditor.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLDiagramEditor.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.part;

+package org.eclipse.papyrus.uml.diagram.profile.part;

 

 import java.util.EventObject;

 

@@ -43,11 +43,11 @@ import org.eclipse.papyrus.core.adaptor.gmf.GmfMultiDiagramDocumentProvider;
 import org.eclipse.papyrus.core.editor.IMultiDiagramEditor;

 import org.eclipse.papyrus.core.services.ServiceException;

 import org.eclipse.papyrus.core.services.ServicesRegistry;

-import org.eclipse.papyrus.diagram.common.listeners.DropTargetListener;

-import org.eclipse.papyrus.diagram.common.part.PapyrusPaletteContextMenuProvider;

-import org.eclipse.papyrus.diagram.common.part.PapyrusPaletteViewer;

-import org.eclipse.papyrus.diagram.common.part.UmlGmfDiagramEditor;

-import org.eclipse.papyrus.diagram.common.service.PapyrusPaletteService;

+import org.eclipse.papyrus.uml.diagram.common.listeners.DropTargetListener;

+import org.eclipse.papyrus.uml.diagram.common.part.PapyrusPaletteContextMenuProvider;

+import org.eclipse.papyrus.uml.diagram.common.part.PapyrusPaletteViewer;

+import org.eclipse.papyrus.uml.diagram.common.part.UmlGmfDiagramEditor;

+import org.eclipse.papyrus.uml.diagram.common.service.PapyrusPaletteService;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.dnd.TransferData;

 import org.eclipse.swt.events.KeyEvent;

@@ -70,12 +70,12 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh
 	/**

 	 * @generated

 	 */

-	public static final String ID = "org.eclipse.papyrus.diagram.profile.part.UMLDiagramEditorID"; //$NON-NLS-1$

+	public static final String ID = "org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorID"; //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final String CONTEXT_ID = "org.eclipse.papyrus.diagram.profile.ui.diagramContext"; //$NON-NLS-1$

+	public static final String CONTEXT_ID = "org.eclipse.papyrus.uml.diagram.profile.ui.diagramContext"; //$NON-NLS-1$

 

 

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/part/UMLDiagramEditorPlugin.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLDiagramEditorPlugin.java
index 7fdd8536583..f152e10f28b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/part/UMLDiagramEditorPlugin.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLDiagramEditorPlugin.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.part;

+package org.eclipse.papyrus.uml.diagram.profile.part;

 

 import java.util.ArrayList;

 import java.util.List;

@@ -31,10 +31,10 @@ import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;
 import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.resource.ImageDescriptor;

-import org.eclipse.papyrus.diagram.profile.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.profile.preferences.DiagramPreferenceInitializer;

-import org.eclipse.papyrus.diagram.profile.providers.ElementInitializers;

 import org.eclipse.papyrus.preferences.Activator;

+import org.eclipse.papyrus.uml.diagram.profile.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.profile.preferences.DiagramPreferenceInitializer;

+import org.eclipse.papyrus.uml.diagram.profile.providers.ElementInitializers;

 import org.eclipse.swt.graphics.Image;

 import org.eclipse.ui.plugin.AbstractUIPlugin;

 import org.eclipse.uml2.uml.edit.providers.UMLItemProviderAdapterFactory;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/part/UMLDiagramEditorUtil.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLDiagramEditorUtil.java
index 3c5ffb34c75..cf7f118a967 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/part/UMLDiagramEditorUtil.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLDiagramEditorUtil.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.part;

+package org.eclipse.papyrus.uml.diagram.profile.part;

 

 import java.io.IOException;

 import java.util.Collections;

@@ -56,7 +56,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.dialogs.IDialogSettings;

 import org.eclipse.jface.wizard.Wizard;

 import org.eclipse.jface.wizard.WizardDialog;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfileDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart;

 import org.eclipse.swt.widgets.Shell;

 import org.eclipse.ui.IWorkbenchPage;

 import org.eclipse.ui.PartInitException;

@@ -178,8 +178,8 @@ public class UMLDiagramEditorUtil {
 				}

 

 				try {

-					modelResource.save(org.eclipse.papyrus.diagram.profile.part.UMLDiagramEditorUtil.getSaveOptions());

-					diagramResource.save(org.eclipse.papyrus.diagram.profile.part.UMLDiagramEditorUtil.getSaveOptions());

+					modelResource.save(org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorUtil.getSaveOptions());

+					diagramResource.save(org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorUtil.getSaveOptions());

 				} catch (IOException e) {

 

 					UMLDiagramEditorPlugin.getInstance().logError("Unable to store model and diagram resources", e); //$NON-NLS-1$

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/part/UMLDiagramUpdateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLDiagramUpdateCommand.java
index f28525c2a0e..a35e3754f40 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/part/UMLDiagramUpdateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLDiagramUpdateCommand.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.part;

+package org.eclipse.papyrus.uml.diagram.profile.part;

 

 import java.util.Iterator;

 import java.util.List;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/part/UMLDiagramUpdater.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLDiagramUpdater.java
index 9f15a451643..34e1e843bfb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/part/UMLDiagramUpdater.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLDiagramUpdater.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.part;

+package org.eclipse.papyrus.uml.diagram.profile.part;

 

 import java.util.Collection;

 import java.util.Collections;

@@ -25,63 +25,63 @@ import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.resource.Resource;

 import org.eclipse.emf.ecore.util.EcoreUtil;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationBranchEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationNodeEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ClassOperationEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ClassPropertyEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.CommentEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.CommentEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ConstraintEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ConstraintEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DataTypeAttributeCompartmentEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DataTypeAttributeCompartmentEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DataTypeEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DataTypeEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DataTypeOperationCompartmentEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DataTypeOperationCompartmentEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DataTypeOperationEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DataTypePropertyEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DependencyNodeEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.EnumerationEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.EnumerationEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.EnumerationEnumerationLiteralCompartmentEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.EnumerationEnumerationLiteralCompartmentEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.EnumerationLiteralEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ExtensionEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.MetaclassEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.MetaclassEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ModelEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ModelEditPartTN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ModelPackageableElementCompartmentEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ModelPackageableElementCompartmentEditPartTN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.PackageEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.PackageEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.PackagePackageableElementCompartmentEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.PackagePackageableElementCompartmentEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.PrimitiveTypeEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.PrimitiveTypeEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfileApplicationEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfileDiagramEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfileEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfileEditPartTN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfilePackageableElementCompartmentEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfilePackageableElementCompartmentEditPartTN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ShortCutDiagramEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.StereotypeAttributeCompartmentEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.StereotypeAttributeCompartmentEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.StereotypeEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.StereotypeEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.StereotypeOperationCompartmentEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.StereotypeOperationCompartmentEditPartCN;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationNodeEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ClassOperationEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ClassPropertyEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.CommentEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.CommentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ConstraintEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ConstraintEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DataTypeAttributeCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DataTypeAttributeCompartmentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DataTypeEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DataTypeEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DataTypeOperationCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DataTypeOperationCompartmentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DataTypeOperationEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DataTypePropertyEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyNodeEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ElementImportEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.EnumerationEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.EnumerationEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.EnumerationEnumerationLiteralCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.EnumerationEnumerationLiteralCompartmentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.EnumerationLiteralEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ExtensionEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.MetaclassEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.MetaclassEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ModelEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ModelEditPartTN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ModelPackageableElementCompartmentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ModelPackageableElementCompartmentEditPartTN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PackageEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PackageEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PackageImportEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PackagePackageableElementCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PackagePackageableElementCompartmentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PrimitiveTypeEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PrimitiveTypeEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileApplicationEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileEditPartTN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfilePackageableElementCompartmentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfilePackageableElementCompartmentEditPartTN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ShortCutDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.StereotypeAttributeCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.StereotypeAttributeCompartmentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.StereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.StereotypeEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.StereotypeOperationCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.StereotypeOperationCompartmentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 import org.eclipse.uml2.uml.Association;

 import org.eclipse.uml2.uml.Class;

 import org.eclipse.uml2.uml.Classifier;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/part/UMLDocumentProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLDocumentProvider.java
index 86f0fab8e21..ea9b997a140 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/part/UMLDocumentProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLDocumentProvider.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.part;

+package org.eclipse.papyrus.uml.diagram.profile.part;

 

 import java.io.IOException;

 import java.util.ArrayList;

@@ -149,7 +149,7 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi
 	 */

 	private TransactionalEditingDomain createEditingDomain() {

 		TransactionalEditingDomain editingDomain = DiagramEditingDomainFactory.getInstance().createEditingDomain();

-		editingDomain.setID("org.eclipse.papyrus.diagram.profile.EditingDomain"); //$NON-NLS-1$

+		editingDomain.setID("org.eclipse.papyrus.uml.diagram.profile.EditingDomain"); //$NON-NLS-1$

 		final NotificationFilter diagramResourceModifiedFilter = NotificationFilter.createNotifierFilter(editingDomain.getResourceSet()).and(NotificationFilter.createEventTypeFilter(Notification.ADD)).and(NotificationFilter.createFeatureFilter(ResourceSet.class, ResourceSet.RESOURCE_SET__RESOURCES));

 		editingDomain.getResourceSet().eAdapters().add(new Adapter() {

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/part/UMLInitDiagramFileAction.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLInitDiagramFileAction.java
index 651f44ae043..9fa3bf3aa78 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/part/UMLInitDiagramFileAction.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLInitDiagramFileAction.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.part;

+package org.eclipse.papyrus.uml.diagram.profile.part;

 

 import org.eclipse.core.resources.IFile;

 import org.eclipse.emf.common.util.URI;

@@ -27,7 +27,7 @@ import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;

 import org.eclipse.jface.wizard.Wizard;

 import org.eclipse.osgi.util.NLS;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfileDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart;

 import org.eclipse.swt.widgets.Shell;

 import org.eclipse.ui.IObjectActionDelegate;

 import org.eclipse.ui.IWorkbenchPart;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/part/UMLLinkDescriptor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLLinkDescriptor.java
index e83fb08c3f3..cb4650b95cf 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/part/UMLLinkDescriptor.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLLinkDescriptor.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.part;

+package org.eclipse.papyrus.uml.diagram.profile.part;

 

 import org.eclipse.core.runtime.IAdaptable;

 import org.eclipse.emf.ecore.EObject;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/part/UMLMatchingStrategy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLMatchingStrategy.java
index 2ee7bcdef3b..d5b973428c2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/part/UMLMatchingStrategy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLMatchingStrategy.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.part;

+package org.eclipse.papyrus.uml.diagram.profile.part;

 

 import org.eclipse.emf.common.ui.URIEditorInput;

 import org.eclipse.ui.IEditorInput;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/part/UMLNewDiagramFileWizard.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLNewDiagramFileWizard.java
index 5e47179a04a..c2f829418a0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/part/UMLNewDiagramFileWizard.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLNewDiagramFileWizard.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.part;

+package org.eclipse.papyrus.uml.diagram.profile.part;

 

 import java.io.IOException;

 import java.util.LinkedList;

@@ -38,7 +38,7 @@ import org.eclipse.gmf.runtime.notation.Diagram;
 import org.eclipse.jface.viewers.StructuredSelection;

 import org.eclipse.jface.wizard.Wizard;

 import org.eclipse.osgi.util.NLS;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfileDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart;

 import org.eclipse.ui.PartInitException;

 import org.eclipse.ui.dialogs.WizardNewFileCreationPage;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/part/UMLNodeDescriptor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLNodeDescriptor.java
index 37930ca7651..b29061ab5ab 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/part/UMLNodeDescriptor.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLNodeDescriptor.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.part;

+package org.eclipse.papyrus.uml.diagram.profile.part;

 

 import org.eclipse.emf.ecore.EObject;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/part/UMLPaletteFactory.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLPaletteFactory.java
index 233345a4c8d..310eb8a6abc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/part/UMLPaletteFactory.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLPaletteFactory.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.part;

+package org.eclipse.papyrus.uml.diagram.profile.part;

 

 import java.util.ArrayList;

 import java.util.List;

@@ -19,9 +19,9 @@ import java.util.List;
 import org.eclipse.gef.Tool;

 import org.eclipse.gmf.runtime.diagram.ui.services.palette.PaletteFactory;

 import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.papyrus.diagram.common.service.AspectUnspecifiedTypeConnectionTool;

-import org.eclipse.papyrus.diagram.common.service.AspectUnspecifiedTypeCreationTool;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.common.service.AspectUnspecifiedTypeConnectionTool;

+import org.eclipse.papyrus.uml.diagram.common.service.AspectUnspecifiedTypeCreationTool;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/part/UMLUriEditorInputTester.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLUriEditorInputTester.java
index a4cde237d5e..afd43aeb645 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/part/UMLUriEditorInputTester.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLUriEditorInputTester.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.part;

+package org.eclipse.papyrus.uml.diagram.profile.part;

 

 import org.eclipse.core.expressions.PropertyTester;

 import org.eclipse.emf.common.ui.URIEditorInput;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/part/UMLVisualIDRegistry.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLVisualIDRegistry.java
index d3b361b3833..d488ff16c55 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/part/UMLVisualIDRegistry.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLVisualIDRegistry.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.part;

+package org.eclipse.papyrus.uml.diagram.profile.part;

 

 import org.eclipse.core.runtime.Platform;

 import org.eclipse.emf.ecore.EAnnotation;

@@ -19,100 +19,100 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gmf.runtime.notation.Diagram;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.providers.BaseViewInfo;

-import org.eclipse.papyrus.diagram.common.providers.ViewInfo;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AppliedStereotypeElementImportEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationAppliedStereotypeEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationBranchEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationBranchMultiplicityEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationBranchRoleEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationMultiplicitySourceEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationMultiplicityTargetEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationNameEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationNodeEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationRoleSourceEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationRoleTargetEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ClassOperationEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ClassPropertyEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.CommentBodyEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.CommentBodyEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.CommentEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.CommentEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ConstraintBodyEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ConstraintBondyEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ConstraintEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ConstraintEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ConstraintNameEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ConstraintNameEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DataTypeAttributeCompartmentEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DataTypeAttributeCompartmentEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DataTypeEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DataTypeEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DataTypeNameEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DataTypeNameEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DataTypeOperationCompartmentEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DataTypeOperationCompartmentEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DataTypeOperationEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DataTypePropertyEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DependencyAppliedStereotypeEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DependencyNameEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DependencyNodeEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DiagramNameEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ElementImportAliasEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.EnumerationEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.EnumerationEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.EnumerationEnumerationLiteralCompartmentEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.EnumerationEnumerationLiteralCompartmentEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.EnumerationLiteralEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.EnumerationNameEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.EnumerationNameEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ExtensionEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.GeneralizationAppliedStereotypeEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.MetaclassEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.MetaclassEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.MetaclassNameEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.MetaclassNameEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ModelEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ModelEditPartTN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ModelNameEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ModelNameEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ModelPackageableElementCompartmentEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ModelPackageableElementCompartmentEditPartTN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.MultiDependencyLabelEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.PackageEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.PackageEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.PackageImportAppliedStereotypeEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.PackageNameEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.PackageNameEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.PackagePackageableElementCompartmentEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.PackagePackageableElementCompartmentEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.PrimitiveTypeEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.PrimitiveTypeEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.PrimitiveTypeNameEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.PrimitiveTypeNameEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfileApplicationEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfileDiagramEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfileEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfileEditPartTN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfileNameEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfileNameEditPartTN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfilePackageableElementCompartmentEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfilePackageableElementCompartmentEditPartTN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ShortCutDiagramEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.StereotypeAttributeCompartmentEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.StereotypeAttributeCompartmentEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.StereotypeEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.StereotypeEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.StereotypeNameEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.StereotypeNameEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.StereotypeOperationCompartmentEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.StereotypeOperationCompartmentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.common.providers.BaseViewInfo;

+import org.eclipse.papyrus.uml.diagram.common.providers.ViewInfo;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AppliedStereotypeElementImportEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationAppliedStereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationBranchMultiplicityEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationBranchRoleEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationMultiplicitySourceEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationMultiplicityTargetEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationNameEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationNodeEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationRoleSourceEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationRoleTargetEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ClassOperationEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ClassPropertyEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.CommentBodyEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.CommentBodyEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.CommentEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.CommentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ConstraintBodyEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ConstraintBondyEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ConstraintEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ConstraintEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ConstraintNameEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ConstraintNameEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DataTypeAttributeCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DataTypeAttributeCompartmentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DataTypeEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DataTypeEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DataTypeNameEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DataTypeNameEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DataTypeOperationCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DataTypeOperationCompartmentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DataTypeOperationEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DataTypePropertyEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyAppliedStereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyNameEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyNodeEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DiagramNameEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ElementImportAliasEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ElementImportEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.EnumerationEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.EnumerationEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.EnumerationEnumerationLiteralCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.EnumerationEnumerationLiteralCompartmentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.EnumerationLiteralEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.EnumerationNameEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.EnumerationNameEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ExtensionEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.GeneralizationAppliedStereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.MetaclassEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.MetaclassEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.MetaclassNameEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.MetaclassNameEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ModelEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ModelEditPartTN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ModelNameEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ModelNameEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ModelPackageableElementCompartmentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ModelPackageableElementCompartmentEditPartTN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.MultiDependencyLabelEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PackageEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PackageEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PackageImportAppliedStereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PackageImportEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PackageNameEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PackageNameEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PackagePackageableElementCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PackagePackageableElementCompartmentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PrimitiveTypeEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PrimitiveTypeEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PrimitiveTypeNameEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PrimitiveTypeNameEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileApplicationEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileEditPartTN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileNameEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileNameEditPartTN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfilePackageableElementCompartmentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfilePackageableElementCompartmentEditPartTN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ShortCutDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.StereotypeAttributeCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.StereotypeAttributeCompartmentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.StereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.StereotypeEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.StereotypeNameEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.StereotypeNameEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.StereotypeOperationCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.StereotypeOperationCompartmentEditPartCN;

 import org.eclipse.uml2.uml.Profile;

 import org.eclipse.uml2.uml.UMLPackage;

 

@@ -128,7 +128,7 @@ public class UMLVisualIDRegistry {
 	/**

 	 * @generated

 	 */

-	private static final String DEBUG_KEY = "org.eclipse.papyrus.diagram.profile/debug/visualID"; //$NON-NLS-1$

+	private static final String DEBUG_KEY = "org.eclipse.papyrus.uml.diagram.profile/debug/visualID"; //$NON-NLS-1$

 

 	/**

 	 * @generated

@@ -141,7 +141,7 @@ public class UMLVisualIDRegistry {
 				return -1;

 			}

 		}

-		return org.eclipse.papyrus.diagram.profile.part.UMLVisualIDRegistry.getVisualID(view.getType());

+		return org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry.getVisualID(view.getType());

 	}

 

 	/**

@@ -201,13 +201,13 @@ public class UMLVisualIDRegistry {
 		if(domainElement == null) {

 			return -1;

 		}

-		String containerModelID = org.eclipse.papyrus.diagram.profile.part.UMLVisualIDRegistry.getModelID(containerView);

+		String containerModelID = org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry.getModelID(containerView);

 		if(!ProfileDiagramEditPart.MODEL_ID.equals(containerModelID)) {

 			return -1;

 		}

 		int containerVisualID;

 		if(ProfileDiagramEditPart.MODEL_ID.equals(containerModelID)) {

-			containerVisualID = org.eclipse.papyrus.diagram.profile.part.UMLVisualIDRegistry.getVisualID(containerView);

+			containerVisualID = org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry.getVisualID(containerView);

 		} else {

 			if(containerView instanceof Diagram) {

 				containerVisualID = ProfileDiagramEditPart.VISUAL_ID;

@@ -640,13 +640,13 @@ public class UMLVisualIDRegistry {
 	 * @generated

 	 */

 	public static boolean canCreateNode(View containerView, int nodeVisualID) {

-		String containerModelID = org.eclipse.papyrus.diagram.profile.part.UMLVisualIDRegistry.getModelID(containerView);

+		String containerModelID = org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry.getModelID(containerView);

 		if(!ProfileDiagramEditPart.MODEL_ID.equals(containerModelID)) {

 			return false;

 		}

 		int containerVisualID;

 		if(ProfileDiagramEditPart.MODEL_ID.equals(containerModelID)) {

-			containerVisualID = org.eclipse.papyrus.diagram.profile.part.UMLVisualIDRegistry.getVisualID(containerView);

+			containerVisualID = org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry.getVisualID(containerView);

 		} else {

 			if(containerView instanceof Diagram) {

 				containerVisualID = ProfileDiagramEditPart.VISUAL_ID;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/part/ValidateAction.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/ValidateAction.java
index da64e1d010d..6233fa2d9ee 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/part/ValidateAction.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/ValidateAction.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.part;

+package org.eclipse.papyrus.uml.diagram.profile.part;

 

 import java.lang.reflect.InvocationTargetException;

 import java.util.ArrayList;

@@ -42,8 +42,8 @@ import org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.action.Action;

 import org.eclipse.jface.operation.IRunnableWithProgress;

-import org.eclipse.papyrus.diagram.profile.providers.UMLMarkerNavigationProvider;

-import org.eclipse.papyrus.diagram.profile.providers.UMLValidationProvider;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLMarkerNavigationProvider;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLValidationProvider;

 import org.eclipse.ui.IEditorPart;

 import org.eclipse.ui.IWorkbenchPage;

 import org.eclipse.ui.IWorkbenchPart;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/preferences/AssociationBranchPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/AssociationBranchPreferencePage.java
index ef728840530..9ffa0f175a8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/preferences/AssociationBranchPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/AssociationBranchPreferencePage.java
@@ -11,12 +11,12 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.preferences;

+package org.eclipse.papyrus.uml.diagram.profile.preferences;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfileDiagramEditPart;

-import org.eclipse.papyrus.diagram.profile.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusLinkPreferencePage;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/preferences/AssociationNodePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/AssociationNodePreferencePage.java
index 4d2b21f865d..70b315b286e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/preferences/AssociationNodePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/AssociationNodePreferencePage.java
@@ -11,13 +11,13 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.preferences;

+package org.eclipse.papyrus.uml.diagram.profile.preferences;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfileDiagramEditPart;

-import org.eclipse.papyrus.diagram.profile.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/preferences/AssociationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/AssociationPreferencePage.java
index bda9f948a79..e9dc07b21bf 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/preferences/AssociationPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/AssociationPreferencePage.java
@@ -11,17 +11,17 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.preferences;

+package org.eclipse.papyrus.uml.diagram.profile.preferences;

 

 import java.util.Map;

 import java.util.TreeMap;

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.common.util.StringComparator;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfileDiagramEditPart;

-import org.eclipse.papyrus.diagram.profile.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusLinkPreferencePage;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

@@ -66,11 +66,11 @@ public class AssociationPreferencePage extends AbstractPapyrusLinkPreferencePage
 	private static TreeMap<String, String> getStaticLabelRole() {

 		TreeMap<String, String> map = new TreeMap<String, String>(new StringComparator());

 		map.put("Stereotype", "platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Stereotype.gif");//$NON-NLS-1$ //$NON-NLS-2$

-		map.put("Name", "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/label_role/name.png");//$NON-NLS-1$ //$NON-NLS-2$

-		map.put("TargetRole", "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/label_role/role.gif");//$NON-NLS-1$ //$NON-NLS-2$

-		map.put("SourceRole", "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/label_role/role.gif");//$NON-NLS-1$ //$NON-NLS-2$

-		map.put("SourceMultiplicity", "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/label_role/MultiplicityHandler.gif");//$NON-NLS-1$ //$NON-NLS-2$

-		map.put("TargetMultiplicity", "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/label_role/MultiplicityHandler.gif");//$NON-NLS-1$ //$NON-NLS-2$

+		map.put("Name", "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/name.png");//$NON-NLS-1$ //$NON-NLS-2$

+		map.put("TargetRole", "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/role.gif");//$NON-NLS-1$ //$NON-NLS-2$

+		map.put("SourceRole", "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/role.gif");//$NON-NLS-1$ //$NON-NLS-2$

+		map.put("SourceMultiplicity", "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/MultiplicityHandler.gif");//$NON-NLS-1$ //$NON-NLS-2$

+		map.put("TargetMultiplicity", "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/MultiplicityHandler.gif");//$NON-NLS-1$ //$NON-NLS-2$

 		return map;

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/preferences/CommentPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/CommentPreferencePage.java
index af963c2e3bc..2bb354396f9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/preferences/CommentPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/CommentPreferencePage.java
@@ -11,13 +11,13 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.preferences;

+package org.eclipse.papyrus.uml.diagram.profile.preferences;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfileDiagramEditPart;

-import org.eclipse.papyrus.diagram.profile.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/preferences/ConstraintPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/ConstraintPreferencePage.java
index 6ef5a54e06d..4f213ed3088 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/preferences/ConstraintPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/ConstraintPreferencePage.java
@@ -11,13 +11,13 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.preferences;

+package org.eclipse.papyrus.uml.diagram.profile.preferences;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfileDiagramEditPart;

-import org.eclipse.papyrus.diagram.profile.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/preferences/DataTypePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/DataTypePreferencePage.java
index 86005f70759..3f3ceae5248 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/preferences/DataTypePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/DataTypePreferencePage.java
@@ -11,16 +11,16 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.preferences;

+package org.eclipse.papyrus.uml.diagram.profile.preferences;

 

 import java.util.Map;

 import java.util.TreeMap;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfileDiagramEditPart;

-import org.eclipse.papyrus.diagram.profile.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/preferences/DependencyPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/DependencyPreferencePage.java
index 3712e4a7778..54001b1b813 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/preferences/DependencyPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/DependencyPreferencePage.java
@@ -11,17 +11,17 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.preferences;

+package org.eclipse.papyrus.uml.diagram.profile.preferences;

 

 import java.util.Map;

 import java.util.TreeMap;

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.common.util.StringComparator;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfileDiagramEditPart;

-import org.eclipse.papyrus.diagram.profile.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusLinkPreferencePage;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/preferences/DiagramAppearancePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/DiagramAppearancePreferencePage.java
index c0b27076ede..9d14c2b5f64 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/preferences/DiagramAppearancePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/DiagramAppearancePreferencePage.java
@@ -11,10 +11,10 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.preferences;

+package org.eclipse.papyrus.uml.diagram.profile.preferences;

 

 import org.eclipse.gmf.runtime.diagram.ui.preferences.AppearancePreferencePage;

-import org.eclipse.papyrus.diagram.profile.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/preferences/DiagramConnectionsPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/DiagramConnectionsPreferencePage.java
index 92928fd9799..c40b47dd4fb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/preferences/DiagramConnectionsPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/DiagramConnectionsPreferencePage.java
@@ -11,10 +11,10 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.preferences;

+package org.eclipse.papyrus.uml.diagram.profile.preferences;

 

 import org.eclipse.gmf.runtime.diagram.ui.preferences.ConnectionsPreferencePage;

-import org.eclipse.papyrus.diagram.profile.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/preferences/DiagramGeneralPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/DiagramGeneralPreferencePage.java
index 263790d3b58..17de6e69842 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/preferences/DiagramGeneralPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/DiagramGeneralPreferencePage.java
@@ -11,11 +11,11 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.preferences;

+package org.eclipse.papyrus.uml.diagram.profile.preferences;

 

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfileDiagramEditPart;

-import org.eclipse.papyrus.diagram.profile.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.DiagramPreferencePage;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/preferences/DiagramPreferenceInitializer.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/DiagramPreferenceInitializer.java
index 5a6277b6adb..8000e09906a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/preferences/DiagramPreferenceInitializer.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/DiagramPreferenceInitializer.java
@@ -11,11 +11,11 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.preferences;

+package org.eclipse.papyrus.uml.diagram.profile.preferences;

 

 import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.profile.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/preferences/DiagramPrintingPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/DiagramPrintingPreferencePage.java
index 751406b42db..0135b6d2da7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/preferences/DiagramPrintingPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/DiagramPrintingPreferencePage.java
@@ -11,10 +11,10 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.preferences;

+package org.eclipse.papyrus.uml.diagram.profile.preferences;

 

 import org.eclipse.gmf.runtime.diagram.ui.preferences.PrintingPreferencePage;

-import org.eclipse.papyrus.diagram.profile.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/preferences/DiagramRulersAndGridPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/DiagramRulersAndGridPreferencePage.java
index f4f33fe4b1c..40d1938b37d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/preferences/DiagramRulersAndGridPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/DiagramRulersAndGridPreferencePage.java
@@ -11,10 +11,10 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.preferences;

+package org.eclipse.papyrus.uml.diagram.profile.preferences;

 

 import org.eclipse.gmf.runtime.diagram.ui.preferences.RulerGridPreferencePage;

-import org.eclipse.papyrus.diagram.profile.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/preferences/ElementImportPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/ElementImportPreferencePage.java
index 402314649ef..1a9c190c243 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/preferences/ElementImportPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/ElementImportPreferencePage.java
@@ -11,17 +11,17 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.preferences;

+package org.eclipse.papyrus.uml.diagram.profile.preferences;

 

 import java.util.Map;

 import java.util.TreeMap;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.common.util.StringComparator;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfileDiagramEditPart;

-import org.eclipse.papyrus.diagram.profile.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusLinkPreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

@@ -64,7 +64,7 @@ public class ElementImportPreferencePage extends AbstractPapyrusLinkPreferencePa
 	 */

 	private static TreeMap<String, String> getStaticLabelRole() {

 		TreeMap<String, String> map = new TreeMap<String, String>(new StringComparator());

-		map.put("Alias", "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/label_role/alias.png");//$NON-NLS-1$ //$NON-NLS-2$

+		map.put("Alias", "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/alias.png");//$NON-NLS-1$ //$NON-NLS-2$

 		map.put("Stereotype", "platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Stereotype.gif");//$NON-NLS-1$ //$NON-NLS-2$

 		return map;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/preferences/EnumerationLiteralPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/EnumerationLiteralPreferencePage.java
index 8d47022d1b1..ff72e9da9ff 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/preferences/EnumerationLiteralPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/EnumerationLiteralPreferencePage.java
@@ -11,13 +11,13 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.preferences;

+package org.eclipse.papyrus.uml.diagram.profile.preferences;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfileDiagramEditPart;

-import org.eclipse.papyrus.diagram.profile.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/preferences/EnumerationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/EnumerationPreferencePage.java
index 8c7e58b474f..8f3e876d6b8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/preferences/EnumerationPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/EnumerationPreferencePage.java
@@ -11,16 +11,16 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.preferences;

+package org.eclipse.papyrus.uml.diagram.profile.preferences;

 

 import java.util.Map;

 import java.util.TreeMap;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfileDiagramEditPart;

-import org.eclipse.papyrus.diagram.profile.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/preferences/ExtensionPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/ExtensionPreferencePage.java
index 81d1771911f..5a024c0214c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/preferences/ExtensionPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/ExtensionPreferencePage.java
@@ -11,12 +11,12 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.preferences;

+package org.eclipse.papyrus.uml.diagram.profile.preferences;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfileDiagramEditPart;

-import org.eclipse.papyrus.diagram.profile.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusLinkPreferencePage;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/preferences/GeneralizationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/GeneralizationPreferencePage.java
index 9a05ca4cb60..fed4b274261 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/preferences/GeneralizationPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/GeneralizationPreferencePage.java
@@ -11,17 +11,17 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.preferences;

+package org.eclipse.papyrus.uml.diagram.profile.preferences;

 

 import java.util.Map;

 import java.util.TreeMap;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.common.util.StringComparator;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfileDiagramEditPart;

-import org.eclipse.papyrus.diagram.profile.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusLinkPreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/preferences/MetaclassPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/MetaclassPreferencePage.java
index 4b4b5372dec..18dd1e8b053 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/preferences/MetaclassPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/MetaclassPreferencePage.java
@@ -11,13 +11,13 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.preferences;

+package org.eclipse.papyrus.uml.diagram.profile.preferences;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfileDiagramEditPart;

-import org.eclipse.papyrus.diagram.profile.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/preferences/ModelPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/ModelPreferencePage.java
index ece161922f0..63415c2fb25 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/preferences/ModelPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/ModelPreferencePage.java
@@ -11,16 +11,16 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.preferences;

+package org.eclipse.papyrus.uml.diagram.profile.preferences;

 

 import java.util.Map;

 import java.util.TreeMap;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfileDiagramEditPart;

-import org.eclipse.papyrus.diagram.profile.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/preferences/OperationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/OperationPreferencePage.java
index 58bb8810794..945568eb541 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/preferences/OperationPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/OperationPreferencePage.java
@@ -11,13 +11,13 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.preferences;

+package org.eclipse.papyrus.uml.diagram.profile.preferences;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfileDiagramEditPart;

-import org.eclipse.papyrus.diagram.profile.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/preferences/PackageImportPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/PackageImportPreferencePage.java
index 57c08e94ef9..f56d01ecb26 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/preferences/PackageImportPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/PackageImportPreferencePage.java
@@ -11,17 +11,17 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.preferences;

+package org.eclipse.papyrus.uml.diagram.profile.preferences;

 

 import java.util.Map;

 import java.util.TreeMap;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.common.util.StringComparator;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfileDiagramEditPart;

-import org.eclipse.papyrus.diagram.profile.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusLinkPreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/preferences/PackagePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/PackagePreferencePage.java
index 69528ad6239..4d3d891a04c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/preferences/PackagePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/PackagePreferencePage.java
@@ -11,16 +11,16 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.preferences;

+package org.eclipse.papyrus.uml.diagram.profile.preferences;

 

 import java.util.Map;

 import java.util.TreeMap;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfileDiagramEditPart;

-import org.eclipse.papyrus.diagram.profile.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/preferences/PrimitiveTypePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/PrimitiveTypePreferencePage.java
index 45c8fa93be4..535d3dde069 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/preferences/PrimitiveTypePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/PrimitiveTypePreferencePage.java
@@ -11,13 +11,13 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.preferences;

+package org.eclipse.papyrus.uml.diagram.profile.preferences;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfileDiagramEditPart;

-import org.eclipse.papyrus.diagram.profile.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/preferences/ProfileApplicationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/ProfileApplicationPreferencePage.java
index 1187e568768..3cbc9417594 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/preferences/ProfileApplicationPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/ProfileApplicationPreferencePage.java
@@ -11,12 +11,12 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.preferences;

+package org.eclipse.papyrus.uml.diagram.profile.preferences;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfileDiagramEditPart;

-import org.eclipse.papyrus.diagram.profile.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusLinkPreferencePage;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/preferences/ProfilePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/ProfilePreferencePage.java
index bd85c37f6da..da6b48ce4d3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/preferences/ProfilePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/ProfilePreferencePage.java
@@ -11,16 +11,16 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.preferences;

+package org.eclipse.papyrus.uml.diagram.profile.preferences;

 

 import java.util.Map;

 import java.util.TreeMap;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfileDiagramEditPart;

-import org.eclipse.papyrus.diagram.profile.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/preferences/PropertyPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/PropertyPreferencePage.java
index 92e28a500a6..bb683043adc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/preferences/PropertyPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/PropertyPreferencePage.java
@@ -11,13 +11,13 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.preferences;

+package org.eclipse.papyrus.uml.diagram.profile.preferences;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfileDiagramEditPart;

-import org.eclipse.papyrus.diagram.profile.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/preferences/ShortCutDiagramPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/ShortCutDiagramPreferencePage.java
index 114ec7fbe0d..8cb1754ee2d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/preferences/ShortCutDiagramPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/ShortCutDiagramPreferencePage.java
@@ -11,17 +11,17 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.preferences;

+package org.eclipse.papyrus.uml.diagram.profile.preferences;

 

 import java.util.Map;

 import java.util.TreeMap;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.common.util.StringComparator;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfileDiagramEditPart;

-import org.eclipse.papyrus.diagram.profile.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

@@ -84,7 +84,7 @@ public class ShortCutDiagramPreferencePage extends AbstractPapyrusNodePreference
 	 */

 	private static TreeMap<String, String> getStaticLabelRole() {

 		TreeMap<String, String> map = new TreeMap<String, String>(new StringComparator());

-		map.put("Name", "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/label_role/name.png");//$NON-NLS-1$

+		map.put("Name", "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/name.png");//$NON-NLS-1$

 		return map;

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/preferences/StereotypePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/StereotypePreferencePage.java
index 60053651c71..d1345cbbee0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/preferences/StereotypePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/StereotypePreferencePage.java
@@ -11,16 +11,16 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.preferences;

+package org.eclipse.papyrus.uml.diagram.profile.preferences;

 

 import java.util.Map;

 import java.util.TreeMap;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfileDiagramEditPart;

-import org.eclipse.papyrus.diagram.profile.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/providers/ElementInitializers.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/providers/ElementInitializers.java
index 2aed589130f..68fd5af6e07 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/providers/ElementInitializers.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/providers/ElementInitializers.java
@@ -11,10 +11,10 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.providers;

+package org.eclipse.papyrus.uml.diagram.profile.providers;

 

-import org.eclipse.papyrus.diagram.common.helper.NamedElementHelper;

-import org.eclipse.papyrus.diagram.profile.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.common.helper.NamedElementHelper;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;

 import org.eclipse.uml2.uml.Association;

 import org.eclipse.uml2.uml.Class;

 import org.eclipse.uml2.uml.Comment;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/providers/UMLEditPartProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/providers/UMLEditPartProvider.java
index fc56e2d470a..aafdda673dd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/providers/UMLEditPartProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/providers/UMLEditPartProvider.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.providers;

+package org.eclipse.papyrus.uml.diagram.profile.providers;

 

 import java.lang.ref.WeakReference;

 

@@ -23,9 +23,9 @@ import org.eclipse.gmf.runtime.diagram.ui.services.editpart.AbstractEditPartProv
 import org.eclipse.gmf.runtime.diagram.ui.services.editpart.CreateGraphicEditPartOperation;

 import org.eclipse.gmf.runtime.diagram.ui.services.editpart.IEditPartOperation;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfileDiagramEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.UMLEditPartFactory;

-import org.eclipse.papyrus.diagram.profile.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.UMLEditPartFactory;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/providers/UMLElementTypes.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/providers/UMLElementTypes.java
index e9a9fcf54f1..39e005195ae 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/providers/UMLElementTypes.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/providers/UMLElementTypes.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.providers;

+package org.eclipse.papyrus.uml.diagram.profile.providers;

 

 import java.util.HashSet;

 import java.util.IdentityHashMap;

@@ -28,47 +28,47 @@ import org.eclipse.gmf.runtime.emf.type.core.IElementType;
 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.jface.resource.ImageDescriptor;

 import org.eclipse.jface.resource.ImageRegistry;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationBranchEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationNodeEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ClassOperationEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ClassPropertyEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.CommentEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.CommentEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ConstraintEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ConstraintEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DataTypeEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DataTypeEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DataTypeOperationEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DataTypePropertyEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DependencyNodeEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.EnumerationEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.EnumerationEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.EnumerationLiteralEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ExtensionEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.MetaclassEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.MetaclassEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ModelEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ModelEditPartTN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.PackageEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.PackageEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.PrimitiveTypeEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.PrimitiveTypeEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfileApplicationEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfileDiagramEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfileEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfileEditPartTN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ShortCutDiagramEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.StereotypeEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.StereotypeEditPartCN;

-import org.eclipse.papyrus.diagram.profile.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationNodeEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ClassOperationEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ClassPropertyEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.CommentEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.CommentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ConstraintEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ConstraintEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DataTypeEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DataTypeEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DataTypeOperationEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DataTypePropertyEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyNodeEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ElementImportEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.EnumerationEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.EnumerationEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.EnumerationLiteralEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ExtensionEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.MetaclassEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.MetaclassEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ModelEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ModelEditPartTN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PackageEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PackageEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PackageImportEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PrimitiveTypeEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PrimitiveTypeEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileApplicationEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileEditPartTN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ShortCutDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.StereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.StereotypeEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;

 import org.eclipse.swt.graphics.Image;

 import org.eclipse.uml2.uml.UMLPackage;

 

@@ -101,202 +101,202 @@ public class UMLElementTypes {
 	/**

 	 * @generated

 	 */

-	public static final IElementType Profile_1000 = getElementType("org.eclipse.papyrus.diagram.profile.Profile_1000"); //$NON-NLS-1$

+	public static final IElementType Profile_1000 = getElementType("org.eclipse.papyrus.uml.diagram.profile.Profile_1000"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Dependency_2014 = getElementType("org.eclipse.papyrus.diagram.profile.Dependency_2014"); //$NON-NLS-1$

+	public static final IElementType Dependency_2014 = getElementType("org.eclipse.papyrus.uml.diagram.profile.Dependency_2014"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Association_2015 = getElementType("org.eclipse.papyrus.diagram.profile.Association_2015"); //$NON-NLS-1$

+	public static final IElementType Association_2015 = getElementType("org.eclipse.papyrus.uml.diagram.profile.Association_2015"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Stereotype_1026 = getElementType("org.eclipse.papyrus.diagram.profile.Stereotype_1026"); //$NON-NLS-1$

+	public static final IElementType Stereotype_1026 = getElementType("org.eclipse.papyrus.uml.diagram.profile.Stereotype_1026"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Class_1031 = getElementType("org.eclipse.papyrus.diagram.profile.Metaclass_1031"); //$NON-NLS-1$

+	public static final IElementType Class_1031 = getElementType("org.eclipse.papyrus.uml.diagram.profile.Metaclass_1031"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Comment_1002 = getElementType("org.eclipse.papyrus.diagram.profile.Comment_1002"); //$NON-NLS-1$

+	public static final IElementType Comment_1002 = getElementType("org.eclipse.papyrus.uml.diagram.profile.Comment_1002"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Constraint_1014 = getElementType("org.eclipse.papyrus.diagram.profile.Constraint_1014"); //$NON-NLS-1$

+	public static final IElementType Constraint_1014 = getElementType("org.eclipse.papyrus.uml.diagram.profile.Constraint_1014"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Model_2005 = getElementType("org.eclipse.papyrus.diagram.profile.Model_2005"); //$NON-NLS-1$

+	public static final IElementType Model_2005 = getElementType("org.eclipse.papyrus.uml.diagram.profile.Model_2005"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Profile_1030 = getElementType("org.eclipse.papyrus.diagram.profile.Profile_1030"); //$NON-NLS-1$

+	public static final IElementType Profile_1030 = getElementType("org.eclipse.papyrus.uml.diagram.profile.Profile_1030"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Package_2007 = getElementType("org.eclipse.papyrus.diagram.profile.Package_1004"); //$NON-NLS-1$

+	public static final IElementType Package_2007 = getElementType("org.eclipse.papyrus.uml.diagram.profile.Package_1004"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Enumeration_2006 = getElementType("org.eclipse.papyrus.diagram.profile.Enumeration_2006"); //$NON-NLS-1$

+	public static final IElementType Enumeration_2006 = getElementType("org.eclipse.papyrus.uml.diagram.profile.Enumeration_2006"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType PrimitiveType_2009 = getElementType("org.eclipse.papyrus.diagram.profile.PrimitiveType_2009"); //$NON-NLS-1$

+	public static final IElementType PrimitiveType_2009 = getElementType("org.eclipse.papyrus.uml.diagram.profile.PrimitiveType_2009"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType DataType_2010 = getElementType("org.eclipse.papyrus.diagram.profile.DataType_2010"); //$NON-NLS-1$

+	public static final IElementType DataType_2010 = getElementType("org.eclipse.papyrus.uml.diagram.profile.DataType_2010"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Diagram_2016 = getElementType("org.eclipse.papyrus.diagram.profile.Diagram_2016"); //$NON-NLS-1$

+	public static final IElementType Diagram_2016 = getElementType("org.eclipse.papyrus.uml.diagram.profile.Diagram_2016"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType PrimitiveType_3026 = getElementType("org.eclipse.papyrus.diagram.profile.PrimitiveType_3026"); //$NON-NLS-1$

+	public static final IElementType PrimitiveType_3026 = getElementType("org.eclipse.papyrus.uml.diagram.profile.PrimitiveType_3026"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Operation_3019 = getElementType("org.eclipse.papyrus.diagram.profile.DataTypeOperation_3019"); //$NON-NLS-1$

+	public static final IElementType Operation_3019 = getElementType("org.eclipse.papyrus.uml.diagram.profile.DataTypeOperation_3019"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType EnumerationLiteral_1037 = getElementType("org.eclipse.papyrus.diagram.profile.EnumerationLiteral_1037"); //$NON-NLS-1$

+	public static final IElementType EnumerationLiteral_1037 = getElementType("org.eclipse.papyrus.uml.diagram.profile.EnumerationLiteral_1037"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Property_3018 = getElementType("org.eclipse.papyrus.diagram.profile.DataTypeProperty_3018"); //$NON-NLS-1$

+	public static final IElementType Property_3018 = getElementType("org.eclipse.papyrus.uml.diagram.profile.DataTypeProperty_3018"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Property_3002 = getElementType("org.eclipse.papyrus.diagram.profile.ClassProperty_3002"); //$NON-NLS-1$

+	public static final IElementType Property_3002 = getElementType("org.eclipse.papyrus.uml.diagram.profile.ClassProperty_3002"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Operation_3020 = getElementType("org.eclipse.papyrus.diagram.profile.ClassOperation_3020"); //$NON-NLS-1$

+	public static final IElementType Operation_3020 = getElementType("org.eclipse.papyrus.uml.diagram.profile.ClassOperation_3020"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Stereotype_1023 = getElementType("org.eclipse.papyrus.diagram.profile.Stereotype_1023"); //$NON-NLS-1$

+	public static final IElementType Stereotype_1023 = getElementType("org.eclipse.papyrus.uml.diagram.profile.Stereotype_1023"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Class_3028 = getElementType("org.eclipse.papyrus.diagram.profile.Metaclass_3028"); //$NON-NLS-1$

+	public static final IElementType Class_3028 = getElementType("org.eclipse.papyrus.uml.diagram.profile.Metaclass_3028"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Comment_1007 = getElementType("org.eclipse.papyrus.diagram.profile.CommentCN_1007"); //$NON-NLS-1$

+	public static final IElementType Comment_1007 = getElementType("org.eclipse.papyrus.uml.diagram.profile.CommentCN_1007"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Model_1027 = getElementType("org.eclipse.papyrus.diagram.profile.Model_1027"); //$NON-NLS-1$

+	public static final IElementType Model_1027 = getElementType("org.eclipse.papyrus.uml.diagram.profile.Model_1027"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Profile_1024 = getElementType("org.eclipse.papyrus.diagram.profile.Profile_1024"); //$NON-NLS-1$

+	public static final IElementType Profile_1024 = getElementType("org.eclipse.papyrus.uml.diagram.profile.Profile_1024"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Package_1012 = getElementType("org.eclipse.papyrus.diagram.profile.PackageCN_1012"); //$NON-NLS-1$

+	public static final IElementType Package_1012 = getElementType("org.eclipse.papyrus.uml.diagram.profile.PackageCN_1012"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Constraint_1028 = getElementType("org.eclipse.papyrus.diagram.profile.Constraint_1028"); //$NON-NLS-1$

+	public static final IElementType Constraint_1028 = getElementType("org.eclipse.papyrus.uml.diagram.profile.Constraint_1028"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Enumeration_3025 = getElementType("org.eclipse.papyrus.diagram.profile.Enumeration_3025"); //$NON-NLS-1$

+	public static final IElementType Enumeration_3025 = getElementType("org.eclipse.papyrus.uml.diagram.profile.Enumeration_3025"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType DataType_3027 = getElementType("org.eclipse.papyrus.diagram.profile.DataType_3027"); //$NON-NLS-1$

+	public static final IElementType DataType_3027 = getElementType("org.eclipse.papyrus.uml.diagram.profile.DataType_3027"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Extension_1013 = getElementType("org.eclipse.papyrus.diagram.profile.Extension_1013"); //$NON-NLS-1$

+	public static final IElementType Extension_1013 = getElementType("org.eclipse.papyrus.uml.diagram.profile.Extension_1013"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Association_4001 = getElementType("org.eclipse.papyrus.diagram.profile.Association_4001"); //$NON-NLS-1$

+	public static final IElementType Association_4001 = getElementType("org.eclipse.papyrus.uml.diagram.profile.Association_4001"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType ProfileApplication_1045 = getElementType("org.eclipse.papyrus.diagram.profile.ProfileApplication_1045"); //$NON-NLS-1$

+	public static final IElementType ProfileApplication_1045 = getElementType("org.eclipse.papyrus.uml.diagram.profile.ProfileApplication_1045"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Association_4019 = getElementType("org.eclipse.papyrus.diagram.profile.Association_4019"); //$NON-NLS-1$

+	public static final IElementType Association_4019 = getElementType("org.eclipse.papyrus.uml.diagram.profile.Association_4019"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Generalization_4002 = getElementType("org.eclipse.papyrus.diagram.profile.Generalization_4002"); //$NON-NLS-1$

+	public static final IElementType Generalization_4002 = getElementType("org.eclipse.papyrus.uml.diagram.profile.Generalization_4002"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Dependency_4008 = getElementType("org.eclipse.papyrus.diagram.profile.Dependency_4008"); //$NON-NLS-1$

+	public static final IElementType Dependency_4008 = getElementType("org.eclipse.papyrus.uml.diagram.profile.Dependency_4008"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Dependency_4018 = getElementType("org.eclipse.papyrus.diagram.profile.Dependency_4018"); //$NON-NLS-1$

+	public static final IElementType Dependency_4018 = getElementType("org.eclipse.papyrus.uml.diagram.profile.Dependency_4018"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType ElementImport_1064 = getElementType("org.eclipse.papyrus.diagram.profile.ElementImport_1064"); //$NON-NLS-1$

+	public static final IElementType ElementImport_1064 = getElementType("org.eclipse.papyrus.uml.diagram.profile.ElementImport_1064"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType PackageImport_1065 = getElementType("org.eclipse.papyrus.diagram.profile.PackageImport_1065"); //$NON-NLS-1$

+	public static final IElementType PackageImport_1065 = getElementType("org.eclipse.papyrus.uml.diagram.profile.PackageImport_1065"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType CommentAnnotatedElement_1022 = getElementType("org.eclipse.papyrus.diagram.profile.CommentAnnotatedElement_1022"); //$NON-NLS-1$

+	public static final IElementType CommentAnnotatedElement_1022 = getElementType("org.eclipse.papyrus.uml.diagram.profile.CommentAnnotatedElement_1022"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType ConstraintConstrainedElement_4014 = getElementType("org.eclipse.papyrus.diagram.profile.ConstraintConstrainedElement_4014"); //$NON-NLS-1$

+	public static final IElementType ConstraintConstrainedElement_4014 = getElementType("org.eclipse.papyrus.uml.diagram.profile.ConstraintConstrainedElement_4014"); //$NON-NLS-1$

 

 	/**

 	 * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/providers/UMLIconProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/providers/UMLIconProvider.java
index 9363b09ae7b..46763a596d2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/providers/UMLIconProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/providers/UMLIconProvider.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.providers;

+package org.eclipse.papyrus.uml.diagram.profile.providers;

 

 import org.eclipse.core.runtime.IAdaptable;

 import org.eclipse.gmf.runtime.common.core.service.AbstractProvider;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/providers/UMLMarkerNavigationProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/providers/UMLMarkerNavigationProvider.java
index 17de764324f..4aebf33820f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/providers/UMLMarkerNavigationProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/providers/UMLMarkerNavigationProvider.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.providers;

+package org.eclipse.papyrus.uml.diagram.profile.providers;

 

 import java.util.Arrays;

 import java.util.Map;

@@ -25,8 +25,8 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gef.EditPart;

 import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditor;

 import org.eclipse.gmf.runtime.emf.ui.providers.marker.AbstractModelMarkerNavigationProvider;

-import org.eclipse.papyrus.diagram.profile.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.profile.part.UMLDiagramEditorUtil;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorUtil;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/providers/UMLModelingAssistantProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/providers/UMLModelingAssistantProvider.java
index 15110b70ce9..0a087c83b7b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/providers/UMLModelingAssistantProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/providers/UMLModelingAssistantProvider.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.providers;

+package org.eclipse.papyrus.uml.diagram.profile.providers;

 

 import java.util.ArrayList;

 import java.util.Collection;

@@ -30,37 +30,37 @@ import org.eclipse.gmf.runtime.emf.ui.services.modelingassistant.ModelingAssista
 import org.eclipse.gmf.runtime.notation.Diagram;

 import org.eclipse.jface.viewers.ILabelProvider;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationNodeEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.CommentEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.CommentEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ConstraintEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ConstraintEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DataTypeEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DataTypeEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DependencyNodeEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.EnumerationEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.EnumerationEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.MetaclassEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.MetaclassEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ModelEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ModelEditPartTN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ModelPackageableElementCompartmentEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ModelPackageableElementCompartmentEditPartTN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.PackageEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.PackageEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.PackagePackageableElementCompartmentEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.PackagePackageableElementCompartmentEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.PrimitiveTypeEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.PrimitiveTypeEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfileDiagramEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfileEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfileEditPartTN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfilePackageableElementCompartmentEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfilePackageableElementCompartmentEditPartTN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.StereotypeEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.StereotypeEditPartCN;

-import org.eclipse.papyrus.diagram.profile.part.Messages;

-import org.eclipse.papyrus.diagram.profile.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationNodeEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.CommentEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.CommentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ConstraintEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ConstraintEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DataTypeEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DataTypeEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyNodeEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.EnumerationEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.EnumerationEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.MetaclassEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.MetaclassEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ModelEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ModelEditPartTN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ModelPackageableElementCompartmentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ModelPackageableElementCompartmentEditPartTN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PackageEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PackageEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PackagePackageableElementCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PackagePackageableElementCompartmentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PrimitiveTypeEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PrimitiveTypeEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileEditPartTN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfilePackageableElementCompartmentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfilePackageableElementCompartmentEditPartTN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.StereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.StereotypeEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.part.Messages;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;

 import org.eclipse.swt.widgets.Display;

 import org.eclipse.swt.widgets.Shell;

 import org.eclipse.ui.dialogs.ElementListSelectionDialog;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/providers/UMLParserProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/providers/UMLParserProvider.java
index 554679a6605..3e686ffaafd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/providers/UMLParserProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/providers/UMLParserProvider.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.providers;

+package org.eclipse.papyrus.uml.diagram.profile.providers;

 

 import org.eclipse.core.runtime.IAdaptable;

 import org.eclipse.emf.ecore.EAttribute;

@@ -26,54 +26,54 @@ import org.eclipse.gmf.runtime.emf.type.core.IElementType;
 import org.eclipse.gmf.runtime.emf.ui.services.parser.ParserHintAdapter;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.parser.CommentParser;

-import org.eclipse.papyrus.diagram.common.parser.ConstraintParser;

-import org.eclipse.papyrus.diagram.common.parser.packageimport.PackageImportVisibilityParser;

-import org.eclipse.papyrus.diagram.common.parser.stereotype.AppliedStereotypeParser;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AppliedStereotypeElementImportEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationAppliedStereotypeEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationBranchMultiplicityEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationMultiplicitySourceEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationMultiplicityTargetEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationNameEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationRoleSourceEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationRoleTargetEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ClassOperationEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ClassPropertyEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.CommentBodyEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.CommentBodyEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ConstraintBodyEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ConstraintBondyEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ConstraintNameEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ConstraintNameEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DataTypeNameEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DataTypeNameEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DataTypeOperationEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DataTypePropertyEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DependencyAppliedStereotypeEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DependencyNameEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DiagramNameEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ElementImportAliasEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.EnumerationLiteralEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.EnumerationNameEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.EnumerationNameEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.GeneralizationAppliedStereotypeEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.MetaclassNameEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.MetaclassNameEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ModelNameEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ModelNameEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.MultiDependencyLabelEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.PackageImportAppliedStereotypeEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.PackageNameEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.PackageNameEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.PrimitiveTypeNameEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.PrimitiveTypeNameEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfileNameEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfileNameEditPartTN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.StereotypeNameEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.StereotypeNameEditPartCN;

-import org.eclipse.papyrus.diagram.profile.parsers.MessageFormatParser;

-import org.eclipse.papyrus.diagram.profile.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.common.parser.CommentParser;

+import org.eclipse.papyrus.uml.diagram.common.parser.ConstraintParser;

+import org.eclipse.papyrus.uml.diagram.common.parser.packageimport.PackageImportVisibilityParser;

+import org.eclipse.papyrus.uml.diagram.common.parser.stereotype.AppliedStereotypeParser;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AppliedStereotypeElementImportEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationAppliedStereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationBranchMultiplicityEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationMultiplicitySourceEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationMultiplicityTargetEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationNameEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationRoleSourceEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationRoleTargetEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ClassOperationEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ClassPropertyEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.CommentBodyEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.CommentBodyEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ConstraintBodyEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ConstraintBondyEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ConstraintNameEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ConstraintNameEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DataTypeNameEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DataTypeNameEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DataTypeOperationEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DataTypePropertyEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyAppliedStereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyNameEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DiagramNameEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ElementImportAliasEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.EnumerationLiteralEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.EnumerationNameEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.EnumerationNameEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.GeneralizationAppliedStereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.MetaclassNameEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.MetaclassNameEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ModelNameEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ModelNameEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.MultiDependencyLabelEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PackageImportAppliedStereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PackageNameEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PackageNameEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PrimitiveTypeNameEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PrimitiveTypeNameEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileNameEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileNameEditPartTN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.StereotypeNameEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.StereotypeNameEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.parsers.MessageFormatParser;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry;

 import org.eclipse.uml2.uml.UMLPackage;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/providers/UMLValidationDecoratorProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/providers/UMLValidationDecoratorProvider.java
index 504307ba5d7..a705d40616f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/providers/UMLValidationDecoratorProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/providers/UMLValidationDecoratorProvider.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.providers;

+package org.eclipse.papyrus.uml.diagram.profile.providers;

 

 import org.eclipse.gef.EditDomain;

 import org.eclipse.gef.EditPart;

@@ -24,10 +24,10 @@ import org.eclipse.gmf.runtime.diagram.ui.services.decorator.IDecoratorProvider;
 import org.eclipse.gmf.runtime.diagram.ui.services.decorator.IDecoratorTarget;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.providers.ValidationDecoratorProvider;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfileDiagramEditPart;

-import org.eclipse.papyrus.diagram.profile.part.UMLDiagramEditor;

-import org.eclipse.papyrus.diagram.profile.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.common.providers.ValidationDecoratorProvider;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditor;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/providers/UMLValidationProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/providers/UMLValidationProvider.java
index 5e3a1119179..e22b472981b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/providers/UMLValidationProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/providers/UMLValidationProvider.java
@@ -11,13 +11,13 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.providers;

+package org.eclipse.papyrus.uml.diagram.profile.providers;

 

 import org.eclipse.emf.transaction.TransactionalEditingDomain;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfileDiagramEditPart;

-import org.eclipse.papyrus.diagram.profile.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.profile.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/providers/UMLViewProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/providers/UMLViewProvider.java
index 75f4945de26..c8fc95cbaa3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/providers/UMLViewProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/providers/UMLViewProvider.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.providers;

+package org.eclipse.papyrus.uml.diagram.profile.providers;

 

 import java.util.ArrayList;

 

@@ -52,104 +52,104 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.gmf.runtime.notation.datatype.RelativeBendpoint;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.common.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AppliedStereotypeElementImportEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationAppliedStereotypeEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationBranchEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationBranchMultiplicityEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationBranchRoleEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationMultiplicitySourceEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationMultiplicityTargetEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationNameEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationNodeEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationRoleSourceEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.AssociationRoleTargetEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ClassOperationEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ClassPropertyEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.CommentBodyEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.CommentBodyEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.CommentEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.CommentEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ConstraintBodyEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ConstraintBondyEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ConstraintEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ConstraintEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ConstraintNameEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ConstraintNameEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DataTypeAttributeCompartmentEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DataTypeAttributeCompartmentEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DataTypeEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DataTypeEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DataTypeNameEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DataTypeNameEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DataTypeOperationCompartmentEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DataTypeOperationCompartmentEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DataTypeOperationEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DataTypePropertyEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DependencyAppliedStereotypeEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DependencyNameEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DependencyNodeEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.DiagramNameEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ElementImportAliasEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.EnumerationEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.EnumerationEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.EnumerationEnumerationLiteralCompartmentEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.EnumerationEnumerationLiteralCompartmentEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.EnumerationLiteralEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.EnumerationNameEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.EnumerationNameEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ExtensionEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.GeneralizationAppliedStereotypeEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.MetaclassEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.MetaclassEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.MetaclassNameEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.MetaclassNameEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ModelEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ModelEditPartTN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ModelNameEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ModelNameEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ModelPackageableElementCompartmentEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ModelPackageableElementCompartmentEditPartTN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.MultiDependencyLabelEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.PackageEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.PackageEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.PackageImportAppliedStereotypeEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.PackageNameEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.PackageNameEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.PackagePackageableElementCompartmentEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.PackagePackageableElementCompartmentEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.PrimitiveTypeEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.PrimitiveTypeEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.PrimitiveTypeNameEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.PrimitiveTypeNameEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfileApplicationEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfileDiagramEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfileEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfileEditPartTN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfileNameEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfileNameEditPartTN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfilePackageableElementCompartmentEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ProfilePackageableElementCompartmentEditPartTN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.ShortCutDiagramEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.StereotypeAttributeCompartmentEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.StereotypeAttributeCompartmentEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.StereotypeEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.StereotypeEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.StereotypeNameEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.StereotypeNameEditPartCN;

-import org.eclipse.papyrus.diagram.profile.edit.parts.StereotypeOperationCompartmentEditPart;

-import org.eclipse.papyrus.diagram.profile.edit.parts.StereotypeOperationCompartmentEditPartCN;

-import org.eclipse.papyrus.diagram.profile.part.UMLVisualIDRegistry;

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AppliedStereotypeElementImportEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationAppliedStereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationBranchMultiplicityEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationBranchRoleEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationMultiplicitySourceEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationMultiplicityTargetEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationNameEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationNodeEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationRoleSourceEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationRoleTargetEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ClassOperationEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ClassPropertyEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.CommentBodyEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.CommentBodyEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.CommentEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.CommentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ConstraintBodyEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ConstraintBondyEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ConstraintEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ConstraintEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ConstraintNameEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ConstraintNameEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DataTypeAttributeCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DataTypeAttributeCompartmentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DataTypeEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DataTypeEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DataTypeNameEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DataTypeNameEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DataTypeOperationCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DataTypeOperationCompartmentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DataTypeOperationEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DataTypePropertyEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyAppliedStereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyNameEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyNodeEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DiagramNameEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ElementImportAliasEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ElementImportEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.EnumerationEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.EnumerationEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.EnumerationEnumerationLiteralCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.EnumerationEnumerationLiteralCompartmentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.EnumerationLiteralEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.EnumerationNameEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.EnumerationNameEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ExtensionEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.GeneralizationAppliedStereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.MetaclassEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.MetaclassEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.MetaclassNameEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.MetaclassNameEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ModelEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ModelEditPartTN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ModelNameEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ModelNameEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ModelPackageableElementCompartmentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ModelPackageableElementCompartmentEditPartTN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.MultiDependencyLabelEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PackageEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PackageEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PackageImportAppliedStereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PackageImportEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PackageNameEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PackageNameEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PackagePackageableElementCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PackagePackageableElementCompartmentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PrimitiveTypeEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PrimitiveTypeEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PrimitiveTypeNameEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PrimitiveTypeNameEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileApplicationEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileEditPartTN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileNameEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileNameEditPartTN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfilePackageableElementCompartmentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfilePackageableElementCompartmentEditPartTN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ShortCutDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.StereotypeAttributeCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.StereotypeAttributeCompartmentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.StereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.StereotypeEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.StereotypeNameEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.StereotypeNameEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.StereotypeOperationCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.profile.edit.parts.StereotypeOperationCompartmentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.graphics.FontData;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/sheet/UMLPropertySection.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/sheet/UMLPropertySection.java
index 6e0d27adbc4..a9dc1aeb91d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/sheet/UMLPropertySection.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/sheet/UMLPropertySection.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.sheet;

+package org.eclipse.papyrus.uml.diagram.profile.sheet;

 

 import java.util.ArrayList;

 import java.util.Iterator;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/sheet/UMLSheetLabelProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/sheet/UMLSheetLabelProvider.java
index 7a5ebafa302..cc30bb716f1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/diagram/profile/sheet/UMLSheetLabelProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/sheet/UMLSheetLabelProvider.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.profile.sheet;

+package org.eclipse.papyrus.uml.diagram.profile.sheet;

 

 import org.eclipse.core.runtime.IAdaptable;

 import org.eclipse.gmf.runtime.emf.type.core.IElementType;

@@ -19,9 +19,9 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.viewers.BaseLabelProvider;

 import org.eclipse.jface.viewers.ILabelProvider;

 import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.papyrus.diagram.profile.navigator.UMLNavigatorGroup;

-import org.eclipse.papyrus.diagram.profile.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.profile.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.profile.navigator.UMLNavigatorGroup;

+import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

 import org.eclipse.swt.graphics.Image;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/.options b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/.options
index 2425eeb5892..6b00f7152df 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/.options
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/.options
@@ -1,7 +1,7 @@
-# Tracing options for the org.eclipse.papyrus.diagram.sequence plug-in
+# Tracing options for the org.eclipse.papyrus.uml.diagram.sequence plug-in
 
 # Common issues
-org.eclipse.papyrus.diagram.sequence/debug=false
+org.eclipse.papyrus.uml.diagram.sequence/debug=false
 
 # Visual IDs
-org.eclipse.papyrus.diagram.sequence/debug/visualID=false
+org.eclipse.papyrus.uml.diagram.sequence/debug/visualID=false
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/META-INF/MANIFEST.MF
index 316d600d77a..463455fd366 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.diagram.sequence.edit.parts,

- org.eclipse.papyrus.diagram.sequence.part,

- org.eclipse.papyrus.diagram.sequence.providers

+Export-Package: org.eclipse.papyrus.uml.diagram.sequence.edit.parts,

+ org.eclipse.papyrus.uml.diagram.sequence.part,

+ org.eclipse.papyrus.uml.diagram.sequence.providers

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

 Bundle-Name: %pluginName

@@ -49,7 +49,6 @@ Bundle-Vendor: %providerName
 Eclipse-LazyStart: true

 Bundle-Version: 0.9.0.qualifier

 Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.diagram.sequence.part.UMLDiagram

- EditorPlugin

+Bundle-Activator: org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin

 Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.sequence;singleton:=true

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/CreateSequenceDiagramCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/CreateSequenceDiagramCommand.java
index e4ecf92fd6b..03e5c385d8c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/CreateSequenceDiagramCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/CreateSequenceDiagramCommand.java
@@ -11,13 +11,13 @@
  *   Atos Origin - Initial API and implementation
  *
  *****************************************************************************/
-package org.eclipse.papyrus.diagram.sequence;
+package org.eclipse.papyrus.uml.diagram.sequence;
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.papyrus.diagram.common.commands.CreateBehavioredClassifierDiagramCommand;
-import org.eclipse.papyrus.diagram.sequence.edit.parts.PackageEditPart;
-import org.eclipse.papyrus.diagram.sequence.part.UMLDiagramEditorPlugin;
+import org.eclipse.papyrus.uml.diagram.common.commands.CreateBehavioredClassifierDiagramCommand;
+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.PackageEditPart;
+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin;
 import org.eclipse.uml2.uml.UMLPackage;
 
 /**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/CreateSequenceDiagramWithNavigationHandler.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/CreateSequenceDiagramWithNavigationHandler.java
index 8ea6007ae1a..a3b6e89b303 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/CreateSequenceDiagramWithNavigationHandler.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/CreateSequenceDiagramWithNavigationHandler.java
@@ -11,7 +11,7 @@
  *  Mathieu Velten (Atos Origin) mathieu.velten@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence;

+package org.eclipse.papyrus.uml.diagram.sequence;

 

 import org.eclipse.papyrus.navigation.CreateDiagramWithNavigationHandler;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/SequenceDiagramCreationCondition.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/SequenceDiagramCreationCondition.java
index 0544649eaff..cfb85d7d627 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/SequenceDiagramCreationCondition.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/SequenceDiagramCreationCondition.java
@@ -8,7 +8,7 @@
  * Contributors:

  *  Atos Origin - Initial API and implementation

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence;

+package org.eclipse.papyrus.uml.diagram.sequence;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.papyrus.core.extension.commands.PerspectiveContextDependence;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/SequenceDiagramEditorFactory.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/SequenceDiagramEditorFactory.java
index a06fea1f145..65dc5129b05 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/SequenceDiagramEditorFactory.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/SequenceDiagramEditorFactory.java
@@ -11,10 +11,10 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence;

+package org.eclipse.papyrus.uml.diagram.sequence;

 

 import org.eclipse.papyrus.core.adaptor.gmf.GmfEditorFactory;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.PackageEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.PackageEditPart;

 

 /**

  * The editor factory to launch the sequence diagram.

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/UmlSequenceDiagramForMultiEditor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/UmlSequenceDiagramForMultiEditor.java
index a9382b92eb0..679dfb59161 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/UmlSequenceDiagramForMultiEditor.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/UmlSequenceDiagramForMultiEditor.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence;

+package org.eclipse.papyrus.uml.diagram.sequence;

 

 import org.eclipse.core.runtime.CoreException;

 import org.eclipse.emf.common.ui.URIEditorInput;

@@ -22,8 +22,8 @@ import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.papyrus.core.editor.BackboneException;

 import org.eclipse.papyrus.core.services.ServiceException;

 import org.eclipse.papyrus.core.services.ServicesRegistry;

-import org.eclipse.papyrus.diagram.sequence.part.UMLDiagramEditor;

-import org.eclipse.papyrus.diagram.sequence.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditor;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin;

 import org.eclipse.swt.widgets.Composite;

 import org.eclipse.swt.widgets.Shell;

 import org.eclipse.ui.IEditorInput;

@@ -110,7 +110,7 @@ public class UmlSequenceDiagramForMultiEditor extends UMLDiagramEditor {
 	 * {@inheritDoc}

 	 */

 	public String getEditingDomainID() {

-		return "org.eclipse.papyrus.diagram.sequence.EditingDomain";

+		return "org.eclipse.papyrus.uml.diagram.sequence.EditingDomain";

 	}

 

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/command/ChangeEdgeTargetCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/ChangeEdgeTargetCommand.java
index e6f1c571447..2fe630f70dd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/command/ChangeEdgeTargetCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/ChangeEdgeTargetCommand.java
@@ -11,7 +11,7 @@
  *  Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.command;

+package org.eclipse.papyrus.uml.diagram.sequence.command;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/command/CreateElementAndNodeCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CreateElementAndNodeCommand.java
index 9c7622216d4..81640a8d761 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/command/CreateElementAndNodeCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CreateElementAndNodeCommand.java
@@ -11,7 +11,7 @@
  *  Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.command;

+package org.eclipse.papyrus.uml.diagram.sequence.command;

 

 import java.util.HashMap;

 import java.util.List;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/command/CreateLocatedConnectionViewCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CreateLocatedConnectionViewCommand.java
index ec37445cf27..f02fd42e523 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/command/CreateLocatedConnectionViewCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CreateLocatedConnectionViewCommand.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.sequence.command;

+package org.eclipse.papyrus.uml.diagram.sequence.command;

 

 import java.util.ArrayList;

 import java.util.List;

@@ -24,13 +24,13 @@ import org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil;
 import org.eclipse.gmf.runtime.emf.type.core.IHintedType;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.osgi.util.NLS;

-import org.eclipse.papyrus.diagram.common.commands.CommonDeferredCreateConnectionViewCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.LifelineEditPart;

-import org.eclipse.papyrus.diagram.sequence.part.Messages;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.sequence.util.SequenceUtil;

 import org.eclipse.papyrus.ui.toolbox.notification.Type;

 import org.eclipse.papyrus.ui.toolbox.notification.builders.NotificationBuilder;

+import org.eclipse.papyrus.uml.diagram.common.commands.CommonDeferredCreateConnectionViewCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.part.Messages;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceUtil;

 

 /**

  * This class is used to create a connection view which source and target locations are defined. This is useful for connections linked to an

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/command/CustomZOrderCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomZOrderCommand.java
index 80b3f25d360..3639ea8225b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/command/CustomZOrderCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomZOrderCommand.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.command;

+package org.eclipse.papyrus.uml.diagram.sequence.command;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/draw2d/routers/MessageRouter.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/draw2d/routers/MessageRouter.java
index 41d606596c2..16f51a91fe4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/draw2d/routers/MessageRouter.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/draw2d/routers/MessageRouter.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.draw2d.routers;

+package org.eclipse.papyrus.uml.diagram.sequence.draw2d.routers;

 

 import org.eclipse.draw2d.Connection;

 import org.eclipse.draw2d.IFigure;

@@ -31,8 +31,8 @@ import org.eclipse.gmf.runtime.draw2d.ui.geometry.PointListUtilities;
 import org.eclipse.gmf.runtime.draw2d.ui.internal.routers.ObliqueRouter;

 import org.eclipse.gmf.runtime.draw2d.ui.internal.routers.OrthogonalRouterUtilities;

 import org.eclipse.gmf.runtime.draw2d.ui.mapmode.MapModeUtil;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.LifelineEditPart.LifelineFigure;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message2EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineEditPart.LifelineFigure;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message2EditPart;

 

 /**

  * A multi behavior router which enable to draw message.

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/edit/parts/InteractionFragmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/InteractionFragmentEditPart.java
index 078022d147a..6f738722cd5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/edit/parts/InteractionFragmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/InteractionFragmentEditPart.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.parts;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.parts;

 

 import java.util.ArrayList;

 import java.util.List;

@@ -29,7 +29,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeNodeEditPart;
 import org.eclipse.gmf.runtime.notation.Bounds;

 import org.eclipse.gmf.runtime.notation.Shape;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.sequence.util.CommandHelper;

+import org.eclipse.papyrus.uml.diagram.sequence.util.CommandHelper;

 import org.eclipse.uml2.uml.InteractionFragment;

 import org.eclipse.uml2.uml.Lifeline;

 import org.eclipse.uml2.uml.UMLPackage;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/edit/policies/CombinedFragmentCreationEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/CombinedFragmentCreationEditPolicy.java
index 30efa072cc3..112aed6c6f0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/edit/policies/CombinedFragmentCreationEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/CombinedFragmentCreationEditPolicy.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.policies;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.policies;

 

 import java.util.Set;

 

@@ -22,9 +22,9 @@ import org.eclipse.gef.commands.Command;
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CreationEditPolicy;

 import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewAndElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.IHintedType;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.sequence.util.SequenceRequestConstant;

-import org.eclipse.papyrus.diagram.sequence.util.SequenceUtil;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceRequestConstant;

+import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceUtil;

 import org.eclipse.uml2.uml.InteractionFragment;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/edit/policies/CombinedFragmentItemComponentEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/CombinedFragmentItemComponentEditPolicy.java
index 79afd0c8077..5105afc6d70 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/edit/policies/CombinedFragmentItemComponentEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/CombinedFragmentItemComponentEditPolicy.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.policies;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.policies;

 

 import java.util.List;

 

@@ -26,8 +26,8 @@ import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ComponentEditPolicy;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

-import org.eclipse.papyrus.diagram.sequence.util.SequenceDeleteHelper;

-import org.eclipse.papyrus.diagram.sequence.util.SequenceUtil;

+import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceDeleteHelper;

+import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceUtil;

 import org.eclipse.uml2.uml.CombinedFragment;

 import org.eclipse.uml2.uml.Element;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/edit/policies/CreationOnMessageEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/CreationOnMessageEditPolicy.java
index 41ebf526945..9f32b299a1c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/edit/policies/CreationOnMessageEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/CreationOnMessageEditPolicy.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.policies;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.policies;

 

 import java.util.Collections;

 import java.util.List;

@@ -25,10 +25,10 @@ import org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionNodeEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CreationEditPolicy;

 import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewAndElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.IHintedType;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.LifelineEditPart;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.sequence.util.SequenceRequestConstant;

-import org.eclipse.papyrus.diagram.sequence.util.SequenceUtil;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceRequestConstant;

+import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceUtil;

 import org.eclipse.uml2.uml.OccurrenceSpecification;

 

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/edit/policies/CustomDiagramDragDropEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/CustomDiagramDragDropEditPolicy.java
index 17ededaab11..979bdc59b2e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/edit/policies/CustomDiagramDragDropEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/CustomDiagramDragDropEditPolicy.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.policies;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.policies;

 

 import java.util.ArrayList;

 import java.util.Collection;

@@ -45,35 +45,35 @@ import org.eclipse.gmf.runtime.emf.type.core.IHintedType;
 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.commands.wrappers.CommandProxyWithResult;

-import org.eclipse.papyrus.diagram.common.commands.SemanticAdapter;

-import org.eclipse.papyrus.diagram.common.editpolicies.CommonDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.diagram.common.helper.DurationConstraintHelper;

-import org.eclipse.papyrus.diagram.common.helper.DurationObservationHelper;

-import org.eclipse.papyrus.diagram.common.util.DiagramEditPartsUtil;

-import org.eclipse.papyrus.diagram.sequence.command.CreateLocatedConnectionViewCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.ActionExecutionSpecificationEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.BehaviorExecutionSpecificationEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.ConstraintEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.DestructionEventEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.DurationConstraintEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.DurationConstraintInMessageEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.DurationObservationEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.GeneralOrderingEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.LifelineEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message2EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message3EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message4EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message5EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message6EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message7EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.MessageEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.StateInvariantEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.TimeConstraintEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.TimeObservationEditPart;

-import org.eclipse.papyrus.diagram.sequence.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.sequence.util.SequenceLinkMappingHelper;

-import org.eclipse.papyrus.diagram.sequence.util.SequenceUtil;

+import org.eclipse.papyrus.uml.diagram.common.commands.SemanticAdapter;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.CommonDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.helper.DurationConstraintHelper;

+import org.eclipse.papyrus.uml.diagram.common.helper.DurationObservationHelper;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.sequence.command.CreateLocatedConnectionViewCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ActionExecutionSpecificationEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.BehaviorExecutionSpecificationEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ConstraintEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DestructionEventEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationConstraintEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationConstraintInMessageEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.GeneralOrderingEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message2EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message3EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message4EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message5EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message6EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message7EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.StateInvariantEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.TimeConstraintEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.TimeObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceLinkMappingHelper;

+import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceUtil;

 import org.eclipse.uml2.uml.DestructionEvent;

 import org.eclipse.uml2.uml.DurationConstraint;

 import org.eclipse.uml2.uml.DurationObservation;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/edit/policies/DeleteTimeElementWithoutEventPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/DeleteTimeElementWithoutEventPolicy.java
index 2a2d20183c9..f947157efc8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/edit/policies/DeleteTimeElementWithoutEventPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/DeleteTimeElementWithoutEventPolicy.java
@@ -11,9 +11,9 @@
  *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - additional features

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.policies;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.policies;

 

-import static org.eclipse.papyrus.diagram.common.Activator.log;

+import static org.eclipse.papyrus.uml.diagram.common.Activator.log;

 

 import java.util.ArrayList;

 import java.util.Collections;

@@ -49,13 +49,13 @@ import org.eclipse.gmf.runtime.diagram.ui.util.EditPartUtil;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.core.listenerservice.IPapyrusListener;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.DurationConstraintEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.LifelineEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.TimeConstraintEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.TimeObservationEditPart;

-import org.eclipse.papyrus.diagram.sequence.util.SequenceUtil;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationConstraintEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.TimeConstraintEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.TimeObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceUtil;

 import org.eclipse.uml2.uml.DurationConstraint;

 import org.eclipse.uml2.uml.DurationObservation;

 import org.eclipse.uml2.uml.Element;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/edit/policies/DestructionEventComponentEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/DestructionEventComponentEditPolicy.java
index d62ca599d78..65cd7869dd0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/edit/policies/DestructionEventComponentEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/DestructionEventComponentEditPolicy.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.policies;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.policies;

 

 import org.eclipse.emf.transaction.TransactionalEditingDomain;

 import org.eclipse.gef.commands.Command;

@@ -19,7 +19,7 @@ import org.eclipse.gef.commands.CompoundCommand;
 import org.eclipse.gef.requests.GroupRequest;

 import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeNodeEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ComponentEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.util.SequenceDeleteHelper;

+import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceDeleteHelper;

 

 /**

  * This edit policy also deletes time/duration edit parts which are linked with the deleted edit part.

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/edit/policies/ElementCreationWithMessageEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/ElementCreationWithMessageEditPolicy.java
index 4b41d0ea250..52c0ca3c905 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/edit/policies/ElementCreationWithMessageEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/ElementCreationWithMessageEditPolicy.java
@@ -11,7 +11,7 @@
  *  Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.policies;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.transaction.TransactionalEditingDomain;

@@ -26,13 +26,13 @@ import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeNodeEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewAndElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.IHintedType;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.sequence.command.ChangeEdgeTargetCommand;

-import org.eclipse.papyrus.diagram.sequence.command.CreateElementAndNodeCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.ActionExecutionSpecificationEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.BehaviorExecutionSpecificationEditPart;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.sequence.util.SequenceRequestConstant;

-import org.eclipse.papyrus.diagram.sequence.util.SequenceUtil;

+import org.eclipse.papyrus.uml.diagram.sequence.command.ChangeEdgeTargetCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.command.CreateElementAndNodeCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ActionExecutionSpecificationEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.BehaviorExecutionSpecificationEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceRequestConstant;

+import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceUtil;

 import org.eclipse.uml2.uml.ExecutionSpecification;

 import org.eclipse.uml2.uml.InteractionFragment;

 import org.eclipse.uml2.uml.Lifeline;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/edit/policies/ExecutionSpecificationComponentEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/ExecutionSpecificationComponentEditPolicy.java
index eb2dbbb0a8e..f134ca0ef52 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/edit/policies/ExecutionSpecificationComponentEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/ExecutionSpecificationComponentEditPolicy.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.policies;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.policies;

 

 import org.eclipse.emf.transaction.TransactionalEditingDomain;

 import org.eclipse.gef.commands.Command;

@@ -19,7 +19,7 @@ import org.eclipse.gef.commands.CompoundCommand;
 import org.eclipse.gef.requests.GroupRequest;

 import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeNodeEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ComponentEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.util.SequenceDeleteHelper;

+import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceDeleteHelper;

 

 /**

  * This edit policy also deletes time/duration edit parts which are linked with the deleted edit part.

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/edit/policies/ExternalLabelPrimaryDragRoleEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/ExternalLabelPrimaryDragRoleEditPolicy.java
index 00020c4fe77..644526d13a0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/edit/policies/ExternalLabelPrimaryDragRoleEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/ExternalLabelPrimaryDragRoleEditPolicy.java
@@ -11,7 +11,7 @@
  *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.policies;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.policies;

 

 import java.util.Collections;

 import java.util.List;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/edit/policies/InteractionCompartmentXYLayoutEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/InteractionCompartmentXYLayoutEditPolicy.java
index 4187bacd0b5..1dc8a64188f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/edit/policies/InteractionCompartmentXYLayoutEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/InteractionCompartmentXYLayoutEditPolicy.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation
  *
  *****************************************************************************/
-package org.eclipse.papyrus.diagram.sequence.edit.policies;
+package org.eclipse.papyrus.uml.diagram.sequence.edit.policies;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -50,14 +50,14 @@ import org.eclipse.gmf.runtime.notation.Edge;
 import org.eclipse.gmf.runtime.notation.IdentityAnchor;
 import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.osgi.util.NLS;
-import org.eclipse.papyrus.diagram.common.commands.PreserveAnchorsPositionCommand;
-import org.eclipse.papyrus.diagram.sequence.edit.parts.CombinedFragmentCombinedFragmentCompartmentEditPart;
-import org.eclipse.papyrus.diagram.sequence.edit.parts.CombinedFragmentEditPart;
-import org.eclipse.papyrus.diagram.sequence.edit.parts.InteractionOperandEditPart;
-import org.eclipse.papyrus.diagram.sequence.edit.parts.LifelineEditPart;
-import org.eclipse.papyrus.diagram.sequence.part.Messages;
-import org.eclipse.papyrus.diagram.sequence.util.SequenceUtil;
 import org.eclipse.papyrus.ui.toolbox.notification.builders.NotificationBuilder;
+import org.eclipse.papyrus.uml.diagram.common.commands.PreserveAnchorsPositionCommand;
+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragmentCombinedFragmentCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragmentEditPart;
+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionOperandEditPart;
+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineEditPart;
+import org.eclipse.papyrus.uml.diagram.sequence.part.Messages;
+import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceUtil;
 import org.eclipse.uml2.uml.CombinedFragment;
 import org.eclipse.uml2.uml.ExecutionSpecification;
 import org.eclipse.uml2.uml.Interaction;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/edit/policies/InteractionOperandComponentEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/InteractionOperandComponentEditPolicy.java
index f0da6e464af..db230e352cf 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/edit/policies/InteractionOperandComponentEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/InteractionOperandComponentEditPolicy.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.policies;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.policies;

 

 import java.util.List;

 

@@ -26,8 +26,8 @@ import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ComponentEditPolicy;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

-import org.eclipse.papyrus.diagram.sequence.util.SequenceDeleteHelper;

-import org.eclipse.papyrus.diagram.sequence.util.SequenceUtil;

+import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceDeleteHelper;

+import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceUtil;

 import org.eclipse.uml2.uml.Element;

 import org.eclipse.uml2.uml.InteractionOperand;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/edit/policies/InteractionOperandDragDropEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/InteractionOperandDragDropEditPolicy.java
index 10beca18819..e92dc1dbb3b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/edit/policies/InteractionOperandDragDropEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/InteractionOperandDragDropEditPolicy.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.policies;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.policies;

 

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gef.editpolicies.ResizableEditPolicy;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/edit/policies/InteractionOperandLayoutEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/InteractionOperandLayoutEditPolicy.java
index e8f85922ab8..e3e67bdf88a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/edit/policies/InteractionOperandLayoutEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/InteractionOperandLayoutEditPolicy.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.policies;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.policies;

 

 import org.eclipse.gef.EditPart;

 import org.eclipse.gef.EditPolicy;

@@ -25,8 +25,8 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableShapeEditPolicy;
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.XYLayoutEditPolicy;

 import org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewAndElementRequest;

 import org.eclipse.gmf.runtime.diagram.ui.requests.CreateUnspecifiedTypeRequest;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.CombinedFragmentEditPart;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragmentEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

 

 /**

  * The customn LayoutEditPolicy for InteractionOperandEditPart.

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/edit/policies/LifelineAppliedStereotypeNodeLabelDisplayEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/LifelineAppliedStereotypeNodeLabelDisplayEditPolicy.java
index c3cc18179c1..89d286192d1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/edit/policies/LifelineAppliedStereotypeNodeLabelDisplayEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/LifelineAppliedStereotypeNodeLabelDisplayEditPolicy.java
@@ -11,10 +11,10 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.policies;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.policies;

 

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.LifelineEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineEditPart;

 

 /**

  * This policy is used to automatically move a lifeline when a stereotype is changed.

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/edit/policies/LifelineChildGraphicalNodeEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/LifelineChildGraphicalNodeEditPolicy.java
index 259adcfca21..a0a236c81ae 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/edit/policies/LifelineChildGraphicalNodeEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/LifelineChildGraphicalNodeEditPolicy.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.policies;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.policies;

 

 import java.util.ArrayList;

 import java.util.Iterator;

@@ -32,10 +32,10 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewRequest;
 import org.eclipse.gmf.runtime.diagram.ui.requests.CreateUnspecifiedTypeConnectionRequest;

 import org.eclipse.gmf.runtime.diagram.ui.requests.CreateUnspecifiedTypeRequest;

 import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

-import org.eclipse.papyrus.diagram.sequence.draw2d.routers.MessageRouter;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.sequence.util.OccurrenceSpecificationMoveHelper;

-import org.eclipse.papyrus.diagram.sequence.util.SequenceRequestConstant;

+import org.eclipse.papyrus.uml.diagram.sequence.draw2d.routers.MessageRouter;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.sequence.util.OccurrenceSpecificationMoveHelper;

+import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceRequestConstant;

 

 

 /**

@@ -128,7 +128,7 @@ public class LifelineChildGraphicalNodeEditPolicy extends SequenceGraphicalNodeE
 	/**

 	 * Get the command to reconnect the source and move associated time/duration constraints/observation.

 	 * 

-	 * @see org.eclipse.papyrus.diagram.sequence.edit.policies.SequenceGraphicalNodeEditPolicy#getReconnectSourceCommand(org.eclipse.gef.requests.ReconnectRequest)

+	 * @see org.eclipse.papyrus.uml.diagram.sequence.edit.policies.SequenceGraphicalNodeEditPolicy#getReconnectSourceCommand(org.eclipse.gef.requests.ReconnectRequest)

 	 * 

 	 * @param request

 	 *        the reconnection request

@@ -146,7 +146,7 @@ public class LifelineChildGraphicalNodeEditPolicy extends SequenceGraphicalNodeE
 	/**

 	 * Get the command to reconnect the target and move associated time/duration constraints/observation.

 	 * 

-	 * @see org.eclipse.papyrus.diagram.sequence.edit.policies.SequenceGraphicalNodeEditPolicy#getReconnectTargetCommand(org.eclipse.gef.requests.ReconnectRequest)

+	 * @see org.eclipse.papyrus.uml.diagram.sequence.edit.policies.SequenceGraphicalNodeEditPolicy#getReconnectTargetCommand(org.eclipse.gef.requests.ReconnectRequest)

 	 * 

 	 * @param request

 	 *        the reconnection request

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/edit/policies/LifelineCreationEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/LifelineCreationEditPolicy.java
index 34da683d40b..5ee91f87915 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/edit/policies/LifelineCreationEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/LifelineCreationEditPolicy.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.policies;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.policies;

 

 import java.util.Collections;

 import java.util.List;

@@ -36,10 +36,10 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.RefreshConnectionsRequest;
 import org.eclipse.gmf.runtime.emf.type.core.IHintedType;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.LifelineEditPart;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.sequence.util.SequenceRequestConstant;

-import org.eclipse.papyrus.diagram.sequence.util.SequenceUtil;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceRequestConstant;

+import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceUtil;

 import org.eclipse.uml2.uml.InteractionFragment;

 import org.eclipse.uml2.uml.OccurrenceSpecification;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/edit/policies/LifelineXYLayoutEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/LifelineXYLayoutEditPolicy.java
index 19dc1f1b738..5473fc5ba92 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/edit/policies/LifelineXYLayoutEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/LifelineXYLayoutEditPolicy.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation
  *
  *****************************************************************************/
-package org.eclipse.papyrus.diagram.sequence.edit.policies;
+package org.eclipse.papyrus.uml.diagram.sequence.edit.policies;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -41,17 +41,17 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
 import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest.ViewDescriptor;
 import org.eclipse.gmf.runtime.emf.type.core.IHintedType;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.diagram.common.commands.PreserveAnchorsPositionCommand;
-import org.eclipse.papyrus.diagram.common.draw2d.LifelineDotLineFigure;
-import org.eclipse.papyrus.diagram.sequence.command.CustomZOrderCommand;
-import org.eclipse.papyrus.diagram.sequence.edit.parts.ActionExecutionSpecificationEditPart;
-import org.eclipse.papyrus.diagram.sequence.edit.parts.BehaviorExecutionSpecificationEditPart;
-import org.eclipse.papyrus.diagram.sequence.edit.parts.CombinedFragment2EditPart;
-import org.eclipse.papyrus.diagram.sequence.edit.parts.LifelineEditPart;
-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;
-import org.eclipse.papyrus.diagram.sequence.util.OccurrenceSpecificationMoveHelper;
-import org.eclipse.papyrus.diagram.sequence.util.SequenceRequestConstant;
-import org.eclipse.papyrus.diagram.sequence.util.SequenceUtil;
+import org.eclipse.papyrus.uml.diagram.common.commands.PreserveAnchorsPositionCommand;
+import org.eclipse.papyrus.uml.diagram.common.draw2d.LifelineDotLineFigure;
+import org.eclipse.papyrus.uml.diagram.sequence.command.CustomZOrderCommand;
+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ActionExecutionSpecificationEditPart;
+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.BehaviorExecutionSpecificationEditPart;
+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragment2EditPart;
+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineEditPart;
+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.sequence.util.OccurrenceSpecificationMoveHelper;
+import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceRequestConstant;
+import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceUtil;
 
 /**
  * The custom LayoutEditPolicy for LifelineEditPart.
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/edit/policies/MessageConnectionEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/MessageConnectionEditPolicy.java
index 9656139d27c..25f388f206d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/edit/policies/MessageConnectionEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/MessageConnectionEditPolicy.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.policies;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.policies;

 

 import org.eclipse.emf.transaction.TransactionalEditingDomain;

 import org.eclipse.gef.commands.Command;

@@ -19,7 +19,7 @@ import org.eclipse.gef.commands.CompoundCommand;
 import org.eclipse.gef.requests.GroupRequest;

 import org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionNodeEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.internal.editpolicies.ConnectionEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.util.SequenceDeleteHelper;

+import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceDeleteHelper;

 

 /**

  * This edit policy also deletes time/duration edit parts which are linked with the deleted edit part.

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/edit/policies/MessageConnectionLineSegEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/MessageConnectionLineSegEditPolicy.java
index f0c0e1b42a4..2f0f5998c9a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/edit/policies/MessageConnectionLineSegEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/MessageConnectionLineSegEditPolicy.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.policies;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.policies;

 

 import java.util.Collections;

 import java.util.List;

@@ -32,11 +32,11 @@ import org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionNodeEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ConnectionBendpointEditPolicy;

 import org.eclipse.gmf.runtime.diagram.ui.util.SelectInDiagramHelper;

 import org.eclipse.gmf.runtime.gef.ui.internal.editpolicies.LineMode;

-import org.eclipse.papyrus.diagram.sequence.draw2d.routers.MessageRouter.RouterKind;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.LifelineEditPart;

-import org.eclipse.papyrus.diagram.sequence.part.Messages;

-import org.eclipse.papyrus.diagram.sequence.util.OccurrenceSpecificationMoveHelper;

-import org.eclipse.papyrus.diagram.sequence.util.SequenceUtil;

+import org.eclipse.papyrus.uml.diagram.sequence.draw2d.routers.MessageRouter.RouterKind;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.part.Messages;

+import org.eclipse.papyrus.uml.diagram.sequence.util.OccurrenceSpecificationMoveHelper;

+import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceUtil;

 import org.eclipse.uml2.uml.Message;

 import org.eclipse.uml2.uml.MessageEnd;

 import org.eclipse.uml2.uml.OccurrenceSpecification;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/edit/policies/MoveableNonResizableLabelEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/MoveableNonResizableLabelEditPolicy.java
index da23c9b0f97..4a11a8e80a4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/edit/policies/MoveableNonResizableLabelEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/MoveableNonResizableLabelEditPolicy.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.policies;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.policies;

 

 import java.util.Collections;

 import java.util.List;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/edit/policies/RemoveOrphanViewPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/RemoveOrphanViewPolicy.java
index 873bc26db70..981e3c2e9ce 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/edit/policies/RemoveOrphanViewPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/RemoveOrphanViewPolicy.java
@@ -11,10 +11,10 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.policies;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.policies;

 

-import org.eclipse.papyrus.diagram.common.editpolicies.OrphanViewPolicy;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.LifelineNameEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.OrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineNameEditPart;

 

 /**

  * this policy is used to suppress orphan node view in GMF view the policy to remove orphan

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/edit/policies/SequenceGraphicalNodeEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/SequenceGraphicalNodeEditPolicy.java
index 9ff43445142..f9786206436 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/edit/policies/SequenceGraphicalNodeEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/SequenceGraphicalNodeEditPolicy.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.policies;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.policies;

 

 import java.util.ArrayList;

 import java.util.Collections;

@@ -39,20 +39,20 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewRequest;
 import org.eclipse.gmf.runtime.emf.type.core.IHintedType;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.jface.viewers.ILabelProvider;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.CombinedFragment2EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.LifelineEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message2EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message3EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message4EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message5EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message6EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message7EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.MessageEditPart;

-import org.eclipse.papyrus.diagram.sequence.part.Messages;

-import org.eclipse.papyrus.diagram.sequence.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.sequence.util.SequenceRequestConstant;

-import org.eclipse.papyrus.diagram.sequence.util.SequenceUtil;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragment2EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message2EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message3EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message4EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message5EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message6EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message7EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.part.Messages;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceRequestConstant;

+import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceUtil;

 import org.eclipse.uml2.uml.Message;

 import org.eclipse.uml2.uml.OccurrenceSpecification;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/edit/policies/TimeRelatedSelectionEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/TimeRelatedSelectionEditPolicy.java
index 20292f8cb7a..49163add6b0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/edit/policies/TimeRelatedSelectionEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/TimeRelatedSelectionEditPolicy.java
@@ -11,13 +11,13 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.policies;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.policies;

 

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gef.requests.ChangeBoundsRequest;

 import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.util.OccurrenceSpecificationMoveHelper;

+import org.eclipse.papyrus.uml.diagram.sequence.util.OccurrenceSpecificationMoveHelper;

 

 /**

  * Edit policy to restrict border item movement. This edit policy moves the related events when a Time/Duration Observation/Constraint is moved.

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/figures/CoRegionCombinedFragmentFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/CoRegionCombinedFragmentFigure.java
index ff582c1268a..1f58b6d97a4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/figures/CoRegionCombinedFragmentFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/CoRegionCombinedFragmentFigure.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.figures;

+package org.eclipse.papyrus.uml.diagram.sequence.figures;

 

 import java.util.List;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/figures/CombinedFragmentFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/CombinedFragmentFigure.java
index a45e2cabc09..97c1ee6a8da 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/figures/CombinedFragmentFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/CombinedFragmentFigure.java
@@ -11,9 +11,9 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.figures;

+package org.eclipse.papyrus.uml.diagram.sequence.figures;

 

-import org.eclipse.papyrus.diagram.common.figure.node.InteractionRectangleFigure;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.InteractionRectangleFigure;

 

 public class CombinedFragmentFigure extends InteractionRectangleFigure {

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/figures/DestructionEventFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/DestructionEventFigure.java
index 455ea693a23..182786eceaa 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/figures/DestructionEventFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/DestructionEventFigure.java
@@ -10,7 +10,7 @@
  * implementation

  ******************************************************************************/

 

-package org.eclipse.papyrus.diagram.sequence.figures;

+package org.eclipse.papyrus.uml.diagram.sequence.figures;

 

 import org.eclipse.draw2d.Graphics;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/figures/EllipseDecoration.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/EllipseDecoration.java
index 44943e9bf18..3f422fc08b1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/figures/EllipseDecoration.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/EllipseDecoration.java
@@ -9,7 +9,7 @@
  * Contributors:

  *    Michael Golubev (Borland) - initial API and implementation

  */

-package org.eclipse.papyrus.diagram.sequence.figures;

+package org.eclipse.papyrus.uml.diagram.sequence.figures;

 

 import org.eclipse.draw2d.Ellipse;

 import org.eclipse.draw2d.Graphics;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/figures/InteractionOperandFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/InteractionOperandFigure.java
index 890b9d8a3b9..848238f617a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/figures/InteractionOperandFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/InteractionOperandFigure.java
@@ -11,10 +11,10 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.figures;

+package org.eclipse.papyrus.uml.diagram.sequence.figures;

 

 import org.eclipse.draw2d.Graphics;

-import org.eclipse.papyrus.diagram.common.figure.node.PapyrusNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.PapyrusNodeFigure;

 

 public class InteractionOperandFigure extends PapyrusNodeFigure {

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/figures/InteractionUseRectangleFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/InteractionUseRectangleFigure.java
index 86416b63021..27bf1932f18 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/figures/InteractionUseRectangleFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/InteractionUseRectangleFigure.java
@@ -11,13 +11,13 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.figures;

+package org.eclipse.papyrus.uml.diagram.sequence.figures;

 

 import org.eclipse.draw2d.PositionConstants;

 import org.eclipse.draw2d.RectangleFigure;

 import org.eclipse.draw2d.StackLayout;

 import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

-import org.eclipse.papyrus.diagram.common.figure.node.InteractionRectangleFigure;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.InteractionRectangleFigure;

 

 /**

  * The figure of the InteractionUse

@@ -31,7 +31,7 @@ public class InteractionUseRectangleFigure extends InteractionRectangleFigure {
 	 * (non-Javadoc)

 	 * 

 	 * @see

-	 * org.eclipse.papyrus.diagram.sequence.figures.InteractionRectangleFigure#createContentPane()

+	 * org.eclipse.papyrus.uml.diagram.sequence.figures.InteractionRectangleFigure#createContentPane()

 	 */

 	@Override

 	protected RectangleFigure createContentPane() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/figures/LifelineDotLineCustomFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/LifelineDotLineCustomFigure.java
index a6541e53ec7..84b1614ab48 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/figures/LifelineDotLineCustomFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/LifelineDotLineCustomFigure.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.figures;

+package org.eclipse.papyrus.uml.diagram.sequence.figures;

 

 import org.eclipse.draw2d.Figure;

 import org.eclipse.draw2d.FlowLayout;

@@ -20,7 +20,7 @@ import org.eclipse.draw2d.IFigure;
 import org.eclipse.draw2d.LayoutManager;

 import org.eclipse.draw2d.XYLayout;

 import org.eclipse.draw2d.geometry.Dimension;

-import org.eclipse.papyrus.diagram.common.draw2d.LifelineDotLineFigure;

+import org.eclipse.papyrus.uml.diagram.common.draw2d.LifelineDotLineFigure;

 

 /**

  * The figure of the LifelineDotLine

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/locator/CenterLocator.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/locator/CenterLocator.java
index 52165479128..19ba1b61f27 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/locator/CenterLocator.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/locator/CenterLocator.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.locator;

+package org.eclipse.papyrus.uml.diagram.sequence.locator;

 

 import org.eclipse.draw2d.IFigure;

 import org.eclipse.draw2d.geometry.Dimension;

@@ -20,9 +20,9 @@ import org.eclipse.draw2d.geometry.Rectangle;
 import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;

 import org.eclipse.gmf.runtime.diagram.ui.internal.figures.BorderItemContainerFigure;

 import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.LifelineEditPart.LifelineFigure;

-import org.eclipse.papyrus.diagram.sequence.figures.DestructionEventFigure;

-import org.eclipse.papyrus.diagram.sequence.figures.LifelineDotLineCustomFigure;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineEditPart.LifelineFigure;

+import org.eclipse.papyrus.uml.diagram.sequence.figures.DestructionEventFigure;

+import org.eclipse.papyrus.uml.diagram.sequence.figures.LifelineDotLineCustomFigure;

 

 

 public class CenterLocator extends BorderItemLocator {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/locator/ContinuationLocator.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/locator/ContinuationLocator.java
index 9a2e9d56b53..62d6d068400 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/locator/ContinuationLocator.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/locator/ContinuationLocator.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.locator;

+package org.eclipse.papyrus.uml.diagram.sequence.locator;

 

 import org.eclipse.draw2d.IFigure;

 import org.eclipse.draw2d.PositionConstants;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/locator/TimeMarkElementPositionLocator.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/locator/TimeMarkElementPositionLocator.java
index e7290ac560f..72757b24ab7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/locator/TimeMarkElementPositionLocator.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/locator/TimeMarkElementPositionLocator.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.locator;

+package org.eclipse.papyrus.uml.diagram.sequence.locator;

 

 import java.util.Collections;

 import java.util.List;

@@ -27,15 +27,15 @@ import org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeNodeEditPart;

 import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

-import org.eclipse.papyrus.diagram.common.locator.AdvancedBorderItemLocator;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.DestructionEventEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.DurationConstraintEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.LifelineEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.LifelineEditPart.LifelineFigure;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.TimeConstraintEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.TimeObservationEditPart;

-import org.eclipse.papyrus.diagram.sequence.figures.LifelineDotLineCustomFigure;

-import org.eclipse.papyrus.diagram.sequence.util.SequenceUtil;

+import org.eclipse.papyrus.uml.diagram.common.locator.AdvancedBorderItemLocator;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DestructionEventEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationConstraintEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineEditPart.LifelineFigure;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.TimeConstraintEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.TimeObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.figures.LifelineDotLineCustomFigure;

+import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceUtil;

 import org.eclipse.uml2.uml.DestructionEvent;

 import org.eclipse.uml2.uml.DurationConstraint;

 import org.eclipse.uml2.uml.Element;

@@ -321,7 +321,7 @@ public class TimeMarkElementPositionLocator extends AdvancedBorderItemLocator {
 	/**

 	 * Relocate the child border item within the parent

 	 * 

-	 * @see org.eclipse.papyrus.diagram.common.locator.AdvancedBorderItemLocator#relocate(org.eclipse.draw2d.IFigure)

+	 * @see org.eclipse.papyrus.uml.diagram.common.locator.AdvancedBorderItemLocator#relocate(org.eclipse.draw2d.IFigure)

 	 * 

 	 * @param borderItem

 	 *        the item to relocate

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/parser/custom/DurationObservationParser.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/parser/custom/DurationObservationParser.java
index 0a0f89dac3b..9d3e75c3a76 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/parser/custom/DurationObservationParser.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/parser/custom/DurationObservationParser.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.parser.custom;

+package org.eclipse.papyrus.uml.diagram.sequence.parser.custom;

 

 import java.util.ArrayList;

 import java.util.List;

@@ -22,8 +22,8 @@ import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.ecore.EStructuralFeature;

 import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

-import org.eclipse.papyrus.diagram.common.helper.DurationObservationHelper;

-import org.eclipse.papyrus.diagram.sequence.parsers.MessageFormatParser;

+import org.eclipse.papyrus.uml.diagram.common.helper.DurationObservationHelper;

+import org.eclipse.papyrus.uml.diagram.sequence.parsers.MessageFormatParser;

 import org.eclipse.uml2.uml.DurationObservation;

 import org.eclipse.uml2.uml.Element;

 import org.eclipse.uml2.uml.UMLPackage;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/parser/custom/InteractionUseCustomParsers.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/parser/custom/InteractionUseCustomParsers.java
index 5072c6023ac..0eb25997237 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/parser/custom/InteractionUseCustomParsers.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/parser/custom/InteractionUseCustomParsers.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.parser.custom;

+package org.eclipse.papyrus.uml.diagram.sequence.parser.custom;

 

 import java.util.ArrayList;

 import java.util.List;

@@ -22,7 +22,7 @@ import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.ecore.EStructuralFeature;

 import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

-import org.eclipse.papyrus.diagram.sequence.parsers.MessageFormatParser;

+import org.eclipse.papyrus.uml.diagram.sequence.parsers.MessageFormatParser;

 import org.eclipse.uml2.uml.Element;

 import org.eclipse.uml2.uml.Interaction;

 import org.eclipse.uml2.uml.InteractionUse;

@@ -62,7 +62,7 @@ public class InteractionUseCustomParsers extends MessageFormatParser implements
 	 * (non-Javadoc)

 	 * 

 	 * @see

-	 * org.eclipse.papyrus.diagram.sequence.parsers.AbstractParser#isAffectingEvent(java.lang.Object

+	 * org.eclipse.papyrus.uml.diagram.sequence.parsers.AbstractParser#isAffectingEvent(java.lang.Object

 	 * , int)

 	 */

 	public boolean isAffectingEvent(Object event, int flags) {

@@ -75,7 +75,7 @@ public class InteractionUseCustomParsers extends MessageFormatParser implements
 	 * (non-Javadoc)

 	 * 

 	 * @see

-	 * org.eclipse.papyrus.diagram.sequence.parsers.MessageFormatParser#getPrintString(org.eclipse

+	 * org.eclipse.papyrus.uml.diagram.sequence.parsers.MessageFormatParser#getPrintString(org.eclipse

 	 * .core.runtime.IAdaptable, int)

 	 */

 	public String getPrintString(IAdaptable element, int flags) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/parser/custom/LifelineCustomParsers.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/parser/custom/LifelineCustomParsers.java
index 57797a7723e..e4ad3e6508e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/parser/custom/LifelineCustomParsers.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/parser/custom/LifelineCustomParsers.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.parser.custom;

+package org.eclipse.papyrus.uml.diagram.sequence.parser.custom;

 

 import java.util.ArrayList;

 import java.util.List;

@@ -22,8 +22,8 @@ import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.ecore.EStructuralFeature;

 import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

-import org.eclipse.papyrus.diagram.sequence.parsers.MessageFormatParser;

-import org.eclipse.papyrus.umlutils.ValueSpecificationUtil;

+import org.eclipse.papyrus.uml.diagram.sequence.parsers.MessageFormatParser;

+import org.eclipse.papyrus.uml.tools.utils.ValueSpecificationUtil;

 import org.eclipse.uml2.uml.ConnectableElement;

 import org.eclipse.uml2.uml.Element;

 import org.eclipse.uml2.uml.Expression;

@@ -74,7 +74,7 @@ public class LifelineCustomParsers extends MessageFormatParser implements ISeman
 	/**

 	 * Information identifying the lifeline displayed inside the rectangle

 	 * 

-	 * @see org.eclipse.papyrus.diagram.sequence.parsers.MessageFormatParser#getPrintString(org.eclipse.core.runtime.IAdaptable, int)

+	 * @see org.eclipse.papyrus.uml.diagram.sequence.parsers.MessageFormatParser#getPrintString(org.eclipse.core.runtime.IAdaptable, int)

 	 */

 	public String getPrintString(IAdaptable element, int flags) {

 		Object obj = element.getAdapter(EObject.class);

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/parser/custom/MessageCustomParser.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/parser/custom/MessageCustomParser.java
index a86cafeb1e7..4272425d703 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/parser/custom/MessageCustomParser.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/parser/custom/MessageCustomParser.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.parser.custom;

+package org.eclipse.papyrus.uml.diagram.sequence.parser.custom;

 

 import java.util.ArrayList;

 import java.util.List;

@@ -20,10 +20,10 @@ import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.emf.ecore.EAttribute;

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

-import org.eclipse.papyrus.diagram.sequence.parsers.MessageFormatParser;

-import org.eclipse.papyrus.umlutils.ICustomAppearence;

-import org.eclipse.papyrus.umlutils.OperationUtil;

-import org.eclipse.papyrus.umlutils.SignalUtil;

+import org.eclipse.papyrus.uml.diagram.sequence.parsers.MessageFormatParser;

+import org.eclipse.papyrus.uml.tools.utils.ICustomAppearence;

+import org.eclipse.papyrus.uml.tools.utils.OperationUtil;

+import org.eclipse.papyrus.uml.tools.utils.SignalUtil;

 import org.eclipse.uml2.uml.Element;

 import org.eclipse.uml2.uml.Message;

 import org.eclipse.uml2.uml.MessageSort;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/parser/custom/TimeConstraintParser.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/parser/custom/TimeConstraintParser.java
index cf72e25f4fe..4cedbe02f5c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/parser/custom/TimeConstraintParser.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/parser/custom/TimeConstraintParser.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.parser.custom;

+package org.eclipse.papyrus.uml.diagram.sequence.parser.custom;

 

 import java.util.ArrayList;

 import java.util.HashSet;

@@ -23,9 +23,9 @@ import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.ecore.EStructuralFeature;

 import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

-import org.eclipse.papyrus.diagram.common.helper.DurationConstraintHelper;

-import org.eclipse.papyrus.diagram.sequence.parsers.MessageFormatParser;

-import org.eclipse.papyrus.umlutils.ValueSpecificationUtil;

+import org.eclipse.papyrus.uml.diagram.common.helper.DurationConstraintHelper;

+import org.eclipse.papyrus.uml.diagram.sequence.parsers.MessageFormatParser;

+import org.eclipse.papyrus.uml.tools.utils.ValueSpecificationUtil;

 import org.eclipse.uml2.uml.Constraint;

 import org.eclipse.uml2.uml.DurationConstraint;

 import org.eclipse.uml2.uml.Element;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/parser/custom/TimeObservationParser.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/parser/custom/TimeObservationParser.java
index 70a99dfe56c..90ea480b526 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/parser/custom/TimeObservationParser.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/parser/custom/TimeObservationParser.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.parser.custom;

+package org.eclipse.papyrus.uml.diagram.sequence.parser.custom;

 

 import java.util.ArrayList;

 import java.util.List;

@@ -22,7 +22,7 @@ import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.ecore.EStructuralFeature;

 import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

-import org.eclipse.papyrus.diagram.sequence.parsers.MessageFormatParser;

+import org.eclipse.papyrus.uml.diagram.sequence.parsers.MessageFormatParser;

 import org.eclipse.uml2.uml.Element;

 import org.eclipse.uml2.uml.TimeObservation;

 import org.eclipse.uml2.uml.UMLPackage;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/providers/CustomEditPolicyProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/providers/CustomEditPolicyProvider.java
index 697017435f3..58381ca36d1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/providers/CustomEditPolicyProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/providers/CustomEditPolicyProvider.java
@@ -11,7 +11,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.providers;

+package org.eclipse.papyrus.uml.diagram.sequence.providers;

 

 import org.eclipse.gef.EditPart;

 import org.eclipse.gmf.runtime.common.core.service.IOperation;

@@ -21,9 +21,9 @@ import org.eclipse.gmf.runtime.diagram.ui.editparts.IPrimaryEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.diagram.ui.services.editpolicy.CreateEditPoliciesOperation;

 import org.eclipse.gmf.runtime.diagram.ui.services.editpolicy.IEditPolicyProvider;

-import org.eclipse.papyrus.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.NavigationEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.PackageEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.NavigationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.PackageEditPart;

 

 /**

  * this is an editpolicy provider in charge to install a policy to navigate between diagrams and elements

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/service/DurationCreationTool.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/service/DurationCreationTool.java
index 52dd446929f..51fcd7071c2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/service/DurationCreationTool.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/service/DurationCreationTool.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.service;

+package org.eclipse.papyrus.uml.diagram.sequence.service;

 

 import java.util.Collections;

 import java.util.List;

@@ -37,11 +37,11 @@ import org.eclipse.gmf.runtime.diagram.ui.editparts.CompartmentEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionNodeEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;

 import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.papyrus.diagram.common.helper.DurationConstraintHelper;

-import org.eclipse.papyrus.diagram.common.service.AspectUnspecifiedTypeCreationTool;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.LifelineEditPart;

-import org.eclipse.papyrus.diagram.sequence.util.SequenceRequestConstant;

-import org.eclipse.papyrus.diagram.sequence.util.SequenceUtil;

+import org.eclipse.papyrus.uml.diagram.common.helper.DurationConstraintHelper;

+import org.eclipse.papyrus.uml.diagram.common.service.AspectUnspecifiedTypeCreationTool;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceRequestConstant;

+import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceUtil;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.graphics.Cursor;

 import org.eclipse.swt.widgets.Control;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/util/CommandHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/CommandHelper.java
index 36725c1aa69..84c18d7c58d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/util/CommandHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/CommandHelper.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.util;

+package org.eclipse.papyrus.uml.diagram.sequence.util;

 

 import java.util.ArrayList;

 import java.util.Collection;

@@ -37,12 +37,11 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
 import org.eclipse.jface.dialogs.MessageDialog;

 import org.eclipse.jface.viewers.ILabelProvider;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.core.modelsetquery.ModelSetQuery;

 import org.eclipse.papyrus.core.utils.EditorUtils;

-import org.eclipse.papyrus.diagram.common.util.MessageDirection;

-import org.eclipse.papyrus.diagram.sequence.part.Messages;

-import org.eclipse.papyrus.diagram.sequence.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.sequence.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.common.util.MessageDirection;

+import org.eclipse.papyrus.uml.diagram.sequence.part.Messages;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.ElementInitializers;

 import org.eclipse.swt.widgets.Display;

 import org.eclipse.swt.widgets.Shell;

 import org.eclipse.ui.dialogs.ElementListSelectionDialog;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/util/EventHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/EventHelper.java
index 5bd6a647f2b..3abac98b80d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/util/EventHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/EventHelper.java
@@ -11,10 +11,10 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.util;

+package org.eclipse.papyrus.uml.diagram.sequence.util;

 

 import org.eclipse.emf.ecore.EClass;

-import org.eclipse.papyrus.diagram.sequence.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.ElementInitializers;

 import org.eclipse.uml2.uml.CallEvent;

 import org.eclipse.uml2.uml.CreationEvent;

 import org.eclipse.uml2.uml.DestructionEvent;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/util/NotificationHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/NotificationHelper.java
index a6266484fd4..116a4cdaf9a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/util/NotificationHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/NotificationHelper.java
@@ -11,13 +11,13 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.util;

+package org.eclipse.papyrus.uml.diagram.sequence.util;

 

 import java.util.ArrayList;

 import java.util.List;

 

 import org.eclipse.emf.common.notify.Notifier;

-import org.eclipse.papyrus.diagram.common.providers.UIAdapterImpl;

+import org.eclipse.papyrus.uml.diagram.common.providers.UIAdapterImpl;

 

 public class NotificationHelper {

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/util/OccurrenceSpecificationMoveHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/OccurrenceSpecificationMoveHelper.java
index be609d68094..105ce9cd99f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/util/OccurrenceSpecificationMoveHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/OccurrenceSpecificationMoveHelper.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.util;

+package org.eclipse.papyrus.uml.diagram.sequence.util;

 

 import java.util.ArrayList;

 import java.util.Collection;

@@ -45,9 +45,9 @@ import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramUIMessages;
 import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.helper.InteractionFragmentHelper;

-import org.eclipse.papyrus.diagram.common.util.DiagramEditPartsUtil;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.LifelineEditPart;

+import org.eclipse.papyrus.uml.diagram.common.helper.InteractionFragmentHelper;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineEditPart;

 import org.eclipse.uml2.common.util.CacheAdapter;

 import org.eclipse.uml2.uml.DestructionEvent;

 import org.eclipse.uml2.uml.DurationConstraint;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/util/ReconnectMessageHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/ReconnectMessageHelper.java
index e58ae338194..2302671f76e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/util/ReconnectMessageHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/ReconnectMessageHelper.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.util;

+package org.eclipse.papyrus.uml.diagram.sequence.util;

 

 import org.eclipse.uml2.uml.CombinedFragment;

 import org.eclipse.uml2.uml.Element;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/util/SelectOrCreateDialog.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/SelectOrCreateDialog.java
index 0c6162527a9..f2ef29f367e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/util/SelectOrCreateDialog.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/SelectOrCreateDialog.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.util;

+package org.eclipse.papyrus.uml.diagram.sequence.util;

 

 import java.util.Collection;

 import java.util.Collections;

@@ -31,8 +31,8 @@ import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.jface.viewers.ISelection;

 import org.eclipse.jface.viewers.StructuredSelection;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.sequence.part.Messages;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.sequence.part.Messages;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.events.ModifyEvent;

 import org.eclipse.swt.events.ModifyListener;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/util/SequenceDeleteHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/SequenceDeleteHelper.java
index 96ba1f0b8ae..73a490cc34f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/util/SequenceDeleteHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/SequenceDeleteHelper.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.util;

+package org.eclipse.papyrus.uml.diagram.sequence.util;

 

 import java.util.List;

 

@@ -28,8 +28,8 @@ import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.util.DiagramEditPartsUtil;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.LifelineEditPart;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineEditPart;

 import org.eclipse.uml2.uml.DestructionEvent;

 import org.eclipse.uml2.uml.Element;

 import org.eclipse.uml2.uml.ExecutionSpecification;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/util/SequenceLinkMappingHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/SequenceLinkMappingHelper.java
index 9b4a3eb7dbc..6c149c10354 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/util/SequenceLinkMappingHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/SequenceLinkMappingHelper.java
@@ -11,17 +11,17 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.util;

+package org.eclipse.papyrus.uml.diagram.sequence.util;

 

 import java.util.ArrayList;

 import java.util.Collection;

 import java.util.Collections;

 

-import org.eclipse.papyrus.diagram.common.helper.ILinkMappingHelper;

-import org.eclipse.papyrus.diagram.common.helper.LinkMappingHelper;

-import org.eclipse.papyrus.diagram.common.helper.LinkMappingHelper.CommonSourceUMLSwitch;

-import org.eclipse.papyrus.diagram.common.helper.LinkMappingHelper.CommonTargetUMLSwitch;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.helper.ILinkMappingHelper;

+import org.eclipse.papyrus.uml.diagram.common.helper.LinkMappingHelper;

+import org.eclipse.papyrus.uml.diagram.common.helper.LinkMappingHelper.CommonSourceUMLSwitch;

+import org.eclipse.papyrus.uml.diagram.common.helper.LinkMappingHelper.CommonTargetUMLSwitch;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.CustomDiagramDragDropEditPolicy;

 import org.eclipse.uml2.uml.Element;

 import org.eclipse.uml2.uml.Gate;

 import org.eclipse.uml2.uml.GeneralOrdering;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/util/SequenceRequestConstant.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/SequenceRequestConstant.java
index 91059471c7e..3fa52fed927 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/util/SequenceRequestConstant.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/SequenceRequestConstant.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.util;

+package org.eclipse.papyrus.uml.diagram.sequence.util;

 

 /**

  * Constants used in the sequence diagram

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/util/SequenceUtil.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/SequenceUtil.java
index 23e9e2a13b5..84f14ef0666 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/util/SequenceUtil.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/SequenceUtil.java
@@ -12,7 +12,7 @@
  *   Camille Letavernier (camille.letavernier@cea.fr) - Loosen the MessageSortChange restriction

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.util;

+package org.eclipse.papyrus.uml.diagram.sequence.util;

 

 import java.util.ArrayList;

 import java.util.Collection;

@@ -68,20 +68,20 @@ import org.eclipse.gmf.runtime.notation.Node;
 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.dialogs.MessageDialog;

-import org.eclipse.papyrus.diagram.common.helper.DurationConstraintHelper;

-import org.eclipse.papyrus.diagram.common.helper.InteractionFragmentHelper;

-import org.eclipse.papyrus.diagram.common.util.DiagramEditPartsUtil;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.ActionExecutionSpecificationEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.BehaviorExecutionSpecificationEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.CombinedFragment2EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.CombinedFragmentEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.ContinuationEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.DestructionEventEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.InteractionEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.InteractionOperandEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.InteractionUseEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.LifelineEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.StateInvariantEditPart;

+import org.eclipse.papyrus.uml.diagram.common.helper.DurationConstraintHelper;

+import org.eclipse.papyrus.uml.diagram.common.helper.InteractionFragmentHelper;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ActionExecutionSpecificationEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.BehaviorExecutionSpecificationEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragment2EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragmentEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ContinuationEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DestructionEventEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionOperandEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionUseEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.StateInvariantEditPart;

 import org.eclipse.swt.widgets.Display;

 import org.eclipse.uml2.common.util.CacheAdapter;

 import org.eclipse.uml2.uml.CombinedFragment;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/validation/FragmentOrderingKeeper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/validation/FragmentOrderingKeeper.java
index 2c26b884a0c..d533d07a66d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/validation/FragmentOrderingKeeper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/validation/FragmentOrderingKeeper.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.sequence.validation;

+package org.eclipse.papyrus.uml.diagram.sequence.validation;

 

 import java.util.ArrayList;

 import java.util.Arrays;

@@ -22,13 +22,12 @@ import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.osgi.util.NLS;

-import org.eclipse.papyrus.diagram.common.util.DiagramEditPartsUtil;

-import org.eclipse.papyrus.diagram.common.util.MDTUtil;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.LifelineEditPart;

-import org.eclipse.papyrus.diagram.sequence.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.sequence.util.SequenceUtil;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.common.util.MDTUtil;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceUtil;

 import org.eclipse.ui.IEditorPart;

-import org.eclipse.uml2.uml.CombinedFragment;

 import org.eclipse.uml2.uml.DestructionEvent;

 import org.eclipse.uml2.uml.ExecutionOccurrenceSpecification;

 import org.eclipse.uml2.uml.ExecutionSpecification;

@@ -36,7 +35,6 @@ import org.eclipse.uml2.uml.GeneralOrdering;
 import org.eclipse.uml2.uml.Interaction;

 import org.eclipse.uml2.uml.InteractionFragment;

 import org.eclipse.uml2.uml.InteractionOperand;

-import org.eclipse.uml2.uml.InteractionOperatorKind;

 import org.eclipse.uml2.uml.Lifeline;

 import org.eclipse.uml2.uml.Message;

 import org.eclipse.uml2.uml.MessageEnd;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/validation/UMLValidationHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/validation/UMLValidationHelper.java
index 345092fdcbb..d70a88a4bfd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/diagram/sequence/validation/UMLValidationHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/validation/UMLValidationHelper.java
@@ -1,12 +1,12 @@
-package org.eclipse.papyrus.diagram.sequence.validation;

+package org.eclipse.papyrus.uml.diagram.sequence.validation;

 

 import org.eclipse.core.runtime.IStatus;

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.validation.IValidationContext;

 import org.eclipse.gmf.runtime.notation.Bounds;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.sequence.part.Messages;

-import org.eclipse.papyrus.diagram.sequence.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.sequence.part.Messages;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin;

 import org.eclipse.uml2.uml.Interaction;

 import org.eclipse.uml2.uml.InteractionFragment;

 import org.eclipse.uml2.uml.InteractionOperand;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/model/sequenceDiagram.gmfgen b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/model/sequenceDiagram.gmfgen
index 46456471d3f..e9548cdaea2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/model/sequenceDiagram.gmfgen
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/model/sequenceDiagram.gmfgen
@@ -5,7 +5,7 @@
     xmlns:gmfgen="http://www.eclipse.org/gmf/2009/GenModel"

     xmlns:papyrusgmfgenextension="http://www.eclipse.org/papyrus/2009/papyrusgmfgenextension">

   <gmfgen:GenEditorGenerator

-      packageNamePrefix="org.eclipse.papyrus.diagram.sequence"

+      packageNamePrefix="org.eclipse.papyrus.uml.diagram.sequence"

       modelID="PapyrusUMLSequenceDiagram"

       domainFileExtension="PapyrusUMLSequence"

       dynamicTemplates="true"

@@ -17,7 +17,7 @@
           description="Validate the UML model"

           path="/0/@audits/@categories.0"/>

       <categories

-          id="org.eclipse.papyrus.diagram.sequence.validation.FragmentOrderingKeeper"

+          id="org.eclipse.papyrus.uml.diagram.sequence.validation.FragmentOrderingKeeper"

           name="fragmentsOrder"

           description="Fragments order"

           path="/0/@audits/@categories.0 /0/@audits/@categories.1"

@@ -92,11 +92,11 @@
       <behaviour

           xsi:type="gmfgen:CustomBehaviour"

           key="&quot;RemoveOrphanView&quot;"

-          editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.sequence.edit.policies.RemoveOrphanViewPolicy"/>

+          editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.policies.RemoveOrphanViewPolicy"/>

       <behaviour

           xsi:type="gmfgen:CustomBehaviour"

           key="EditPolicyRoles.DRAG_DROP_ROLE"

-          editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.sequence.edit.policies.CustomDiagramDragDropEditPolicy"/>

+          editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.policies.CustomDiagramDragDropEditPolicy"/>

       <domainDiagramElement

           href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package"/>

       <childNodes

@@ -115,15 +115,15 @@
             editHelperClassName="ConsiderIgnoreFragmentEditHelper"/>

         <viewmap

             xsi:type="gmfgen:FigureViewmap"

-            figureQualifiedClassName="org.eclipse.papyrus.diagram.sequence.figures.CombinedFragmentFigure"/>

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.sequence.figures.CombinedFragmentFigure"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="EditPolicy.COMPONENT_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.sequence.edit.policies.CombinedFragmentItemComponentEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.policies.CombinedFragmentItemComponentEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

         <modelFacet>

           <metaClass

               href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/ConsiderIgnoreFragment"/>

@@ -159,19 +159,19 @@
             editHelperClassName="CombinedFragmentEditHelper"/>

         <viewmap

             xsi:type="gmfgen:FigureViewmap"

-            figureQualifiedClassName="org.eclipse.papyrus.diagram.sequence.figures.CombinedFragmentFigure"/>

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.sequence.figures.CombinedFragmentFigure"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="EditPolicy.COMPONENT_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.sequence.edit.policies.CombinedFragmentItemComponentEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.policies.CombinedFragmentItemComponentEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="EditPolicy.GRAPHICAL_NODE_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.sequence.edit.policies.SequenceGraphicalNodeEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.policies.SequenceGraphicalNodeEditPolicy"/>

         <modelFacet>

           <metaClass

               href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/CombinedFragment"/>

@@ -209,7 +209,7 @@
             xsi:type="gmfgen:InnerClassViewmap"

             layoutType="XY_LAYOUT"

             className="CustomInteractionOperandFigure"

-            classBody="&#xA;/**&#xA; * @generated&#xA; */&#xA;public class CustomInteractionOperandFigure extends org.eclipse.papyrus.diagram.sequence.figures.InteractionOperandFigure {&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel fInteractionConstraintLabel; &#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public CustomInteractionOperandFigure() {&#xA;&#x9;&#x9;this.setLayoutManager(new org.eclipse.draw2d.XYLayout());&#xA;&#x9;&#x9;&#xA;&#xA;&#xA;&#xA;this.setLineStyle(&#xA;Graphics.LINE_DASH);&#xA;&#xA;&#xA;&#xA;&#xA;this.setBorder(&#xA;null);&#xA;&#xA;&#xA;&#xA;&#xA;this.setLineSeparator(&#xA;!firstOperand);&#xA;&#xA;&#xA;&#x9;&#x9;createContents();&#xA;&#x9;}&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private void createContents(){&#xA;&#xA;&#xA;fInteractionConstraintLabel = new org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel();&#xA;fInteractionConstraintLabel.setText(&quot;&quot;);&#xA;&#xA;this.add(fInteractionConstraintLabel, &#xA;new org.eclipse.draw2d.geometry.Rectangle(getMapMode().DPtoLP(10)&#xA;, getMapMode().DPtoLP(10)&#xA;, getMapMode().DPtoLP(200)&#xA;, getMapMode().DPtoLP(20)&#xA;)&#xA;);&#xA;&#xA;&#xA;&#x9;}&#xA;&#xA;&#xA;&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel getInteractionConstraintLabel() {&#xA;&#x9;&#x9;return fInteractionConstraintLabel;&#xA;&#x9;}&#xA;&#xA;&#xA;}&#xA;&#xA;">

+            classBody="&#xA;/**&#xA; * @generated&#xA; */&#xA;public class CustomInteractionOperandFigure extends org.eclipse.papyrus.uml.diagram.sequence.figures.InteractionOperandFigure {&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel fInteractionConstraintLabel; &#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public CustomInteractionOperandFigure() {&#xA;&#x9;&#x9;this.setLayoutManager(new org.eclipse.draw2d.XYLayout());&#xA;&#x9;&#x9;&#xA;&#xA;&#xA;&#xA;this.setLineStyle(&#xA;Graphics.LINE_DASH);&#xA;&#xA;&#xA;&#xA;&#xA;this.setBorder(&#xA;null);&#xA;&#xA;&#xA;&#xA;&#xA;this.setLineSeparator(&#xA;!firstOperand);&#xA;&#xA;&#xA;&#x9;&#x9;createContents();&#xA;&#x9;}&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private void createContents(){&#xA;&#xA;&#xA;fInteractionConstraintLabel = new org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel();&#xA;fInteractionConstraintLabel.setText(&quot;&quot;);&#xA;&#xA;this.add(fInteractionConstraintLabel, &#xA;new org.eclipse.draw2d.geometry.Rectangle(getMapMode().DPtoLP(10)&#xA;, getMapMode().DPtoLP(10)&#xA;, getMapMode().DPtoLP(200)&#xA;, getMapMode().DPtoLP(20)&#xA;)&#xA;);&#xA;&#xA;&#xA;&#x9;}&#xA;&#xA;&#xA;&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel getInteractionConstraintLabel() {&#xA;&#x9;&#x9;return fInteractionConstraintLabel;&#xA;&#x9;}&#xA;&#xA;&#xA;}&#xA;&#xA;">

           <attributes

               xsi:type="gmfgen:ResizeConstraints"

               resizeHandles="4"/>

@@ -217,23 +217,23 @@
         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="EditPolicy.LAYOUT_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.sequence.edit.policies.InteractionOperandLayoutEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.policies.InteractionOperandLayoutEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="EditPolicy.PRIMARY_DRAG_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.sequence.edit.policies.InteractionOperandDragDropEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.policies.InteractionOperandDragDropEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="EditPolicy.COMPONENT_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.sequence.edit.policies.InteractionOperandComponentEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.policies.InteractionOperandComponentEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="EditPolicyRoles.CREATION_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.sequence.edit.policies.CombinedFragmentCreationEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.policies.CombinedFragmentCreationEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="EditPolicy.GRAPHICAL_NODE_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.sequence.edit.policies.SequenceGraphicalNodeEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.policies.SequenceGraphicalNodeEditPolicy"/>

         <modelFacet>

           <metaClass

               href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/InteractionOperand"/>

@@ -259,7 +259,7 @@
             editHelperClassName="InteractionUseEditHelper"/>

         <viewmap

             xsi:type="gmfgen:FigureViewmap"

-            figureQualifiedClassName="org.eclipse.papyrus.diagram.sequence.figures.InteractionUseRectangleFigure"/>

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.sequence.figures.InteractionUseRectangleFigure"/>

         <behaviour

             xsi:type="gmfgen:OpenDiagramBehaviour"/>

         <modelFacet>

@@ -341,7 +341,7 @@
         <viewmap

             xsi:type="gmfgen:InnerClassViewmap"

             className="ContinuationFigure"

-            classBody="&#xA;/**&#xA; * @generated&#xA; */&#xA;public class ContinuationFigure extends org.eclipse.draw2d.RoundedRectangle {&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private org.eclipse.papyrus.diagram.common.figure.node.CenteredWrappedLabel fFigureContinuationNameLabel; &#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public ContinuationFigure() {&#xA;&#x9;&#x9;&#xA;&#x9;org.eclipse.papyrus.diagram.common.draw2d.CenterLayout layoutThis = new org.eclipse.papyrus.diagram.common.draw2d.CenterLayout();&#xA;&#xA;&#xA;&#x9;this.setLayoutManager(layoutThis);&#xA;&#xA;&#x9;&#x9;this.setCornerDimensions(new org.eclipse.draw2d.geometry.Dimension(getMapMode().DPtoLP(50)&#xA;, getMapMode().DPtoLP(50)&#xA;));&#xA;&#x9;&#x9;createContents();&#xA;&#x9;}&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private void createContents(){&#xA;&#xA;&#xA;fFigureContinuationNameLabel = new org.eclipse.papyrus.diagram.common.figure.node.CenteredWrappedLabel();&#xA;&#xA;&#xA;&#xA;this.add(fFigureContinuationNameLabel);&#xA;&#xA;&#xA;&#x9;}&#xA;&#xA;&#xA;&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public org.eclipse.papyrus.diagram.common.figure.node.CenteredWrappedLabel getFigureContinuationNameLabel() {&#xA;&#x9;&#x9;return fFigureContinuationNameLabel;&#xA;&#x9;}&#xA;&#xA;&#xA;}&#xA;&#xA;"/>

+            classBody="&#xA;/**&#xA; * @generated&#xA; */&#xA;public class ContinuationFigure extends org.eclipse.draw2d.RoundedRectangle {&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private org.eclipse.papyrus.uml.diagram.common.figure.node.CenteredWrappedLabel fFigureContinuationNameLabel; &#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public ContinuationFigure() {&#xA;&#x9;&#x9;&#xA;&#x9;org.eclipse.papyrus.uml.diagram.common.draw2d.CenterLayout layoutThis = new org.eclipse.papyrus.uml.diagram.common.draw2d.CenterLayout();&#xA;&#xA;&#xA;&#x9;this.setLayoutManager(layoutThis);&#xA;&#xA;&#x9;&#x9;this.setCornerDimensions(new org.eclipse.draw2d.geometry.Dimension(getMapMode().DPtoLP(50)&#xA;, getMapMode().DPtoLP(50)&#xA;));&#xA;&#x9;&#x9;createContents();&#xA;&#x9;}&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private void createContents(){&#xA;&#xA;&#xA;fFigureContinuationNameLabel = new org.eclipse.papyrus.uml.diagram.common.figure.node.CenteredWrappedLabel();&#xA;&#xA;&#xA;&#xA;this.add(fFigureContinuationNameLabel);&#xA;&#xA;&#xA;&#x9;}&#xA;&#xA;&#xA;&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public org.eclipse.papyrus.uml.diagram.common.figure.node.CenteredWrappedLabel getFigureContinuationNameLabel() {&#xA;&#x9;&#x9;return fFigureContinuationNameLabel;&#xA;&#x9;}&#xA;&#xA;&#xA;}&#xA;&#xA;"/>

         <modelFacet>

           <metaClass

               href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Continuation"/>

@@ -370,7 +370,7 @@
           <viewmap

               xsi:type="gmfgen:ParentAssignedViewmap"

               getterName="getFigureContinuationNameLabel"

-              figureQualifiedClassName="org.eclipse.papyrus.diagram.common.figure.node.CenteredWrappedLabel"/>

+              figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.CenteredWrappedLabel"/>

           <modelFacet

               xsi:type="gmfgen:FeatureLabelModelFacet"

               parser="/0/@labelParsers/@implementations.0"

@@ -398,7 +398,7 @@
         <viewmap

             xsi:type="gmfgen:InnerClassViewmap"

             className="LifelineFigure"

-            classBody="&#xA;/**&#xA; * @generated&#xA; */&#xA;public class LifelineFigure extends org.eclipse.papyrus.diagram.common.figure.node.NodeNamedElementFigure {&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel fFigureLifelineLabelFigure; &#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private org.eclipse.draw2d.RectangleFigure fFigureLifelineNameContainerFigure; &#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private org.eclipse.draw2d.RectangleFigure fFigureExecutionsContainerFigure; &#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private org.eclipse.papyrus.diagram.sequence.figures.LifelineDotLineCustomFigure fFigureLifelineDotLineFigure; &#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public LifelineFigure() {&#xA;&#x9;&#x9;&#xA;&#x9;org.eclipse.draw2d.BorderLayout layoutThis = new org.eclipse.draw2d.BorderLayout();&#xA;&#x9;this.setLayoutManager(layoutThis);&#xA;&#xA;&#x9;&#x9;&#xA;&#xA;this.setMaximumSize(new org.eclipse.draw2d.geometry.Dimension(getMapMode().DPtoLP(100)&#xA;, getMapMode().DPtoLP(200)&#xA;));&#xA;&#x9;&#x9;createContents();&#xA;&#x9;}&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private void createContents(){&#xA;&#xA;&#xA;fFigureLifelineNameContainerFigure = new org.eclipse.draw2d.RectangleFigure();&#xA;&#xA;fFigureLifelineNameContainerFigure.setBorder(new org.eclipse.draw2d.MarginBorder(getMapMode().DPtoLP(7)&#xA;, getMapMode().DPtoLP(7)&#xA;, getMapMode().DPtoLP(7)&#xA;, getMapMode().DPtoLP(7)&#xA;));&#xA;&#xA;this.add(fFigureLifelineNameContainerFigure, org.eclipse.draw2d.BorderLayout.TOP);&#xA;fFigureLifelineNameContainerFigure.setLayoutManager(new org.eclipse.draw2d.StackLayout());&#xA;&#xA;&#xA;fFigureLifelineLabelFigure = new org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel();&#xA;&#xA;&#xA;&#xA;&#xA;fFigureLifelineLabelFigure.setText(&#xA;&quot;&lt;...>&quot;);&#xA;&#xA;&#xA;&#xA;&#xA;fFigureLifelineLabelFigure.setTextWrap(&#xA;true);&#xA;&#xA;&#xA;&#xA;&#xA;fFigureLifelineLabelFigure.setAlignment(&#xA;org.eclipse.draw2d.PositionConstants.CENTER);&#xA;&#xA;&#xA;&#xA;fFigureLifelineNameContainerFigure.add(fFigureLifelineLabelFigure);&#xA;&#xA;&#xA;&#xA;&#xA;fFigureExecutionsContainerFigure = new org.eclipse.draw2d.RectangleFigure();&#xA;fFigureExecutionsContainerFigure.setFill(false);&#xA;fFigureExecutionsContainerFigure.setOutline(false);&#xA;&#xA;this.add(fFigureExecutionsContainerFigure, org.eclipse.draw2d.BorderLayout.CENTER);&#xA;fFigureExecutionsContainerFigure.setLayoutManager(new org.eclipse.draw2d.StackLayout());&#xA;&#xA;&#xA;fFigureLifelineDotLineFigure = new org.eclipse.papyrus.diagram.sequence.figures.LifelineDotLineCustomFigure();&#xA;&#xA;&#xA;&#xA;fFigureExecutionsContainerFigure.add(fFigureLifelineDotLineFigure);&#xA;&#xA;&#xA;&#xA;&#x9;}&#xA;&#xA;&#xA;&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel getFigureLifelineLabelFigure() {&#xA;&#x9;&#x9;return fFigureLifelineLabelFigure;&#xA;&#x9;}&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public org.eclipse.draw2d.RectangleFigure getFigureLifelineNameContainerFigure() {&#xA;&#x9;&#x9;return fFigureLifelineNameContainerFigure;&#xA;&#x9;}&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public org.eclipse.draw2d.RectangleFigure getFigureExecutionsContainerFigure() {&#xA;&#x9;&#x9;return fFigureExecutionsContainerFigure;&#xA;&#x9;}&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public org.eclipse.papyrus.diagram.sequence.figures.LifelineDotLineCustomFigure getFigureLifelineDotLineFigure() {&#xA;&#x9;&#x9;return fFigureLifelineDotLineFigure;&#xA;&#x9;}&#xA;&#xA;&#xA;}&#xA;&#xA;">

+            classBody="&#xA;/**&#xA; * @generated&#xA; */&#xA;public class LifelineFigure extends org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure {&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel fFigureLifelineLabelFigure; &#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private org.eclipse.draw2d.RectangleFigure fFigureLifelineNameContainerFigure; &#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private org.eclipse.draw2d.RectangleFigure fFigureExecutionsContainerFigure; &#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private org.eclipse.papyrus.uml.diagram.sequence.figures.LifelineDotLineCustomFigure fFigureLifelineDotLineFigure; &#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public LifelineFigure() {&#xA;&#x9;&#x9;&#xA;&#x9;org.eclipse.draw2d.BorderLayout layoutThis = new org.eclipse.draw2d.BorderLayout();&#xA;&#x9;this.setLayoutManager(layoutThis);&#xA;&#xA;&#x9;&#x9;&#xA;&#xA;this.setMaximumSize(new org.eclipse.draw2d.geometry.Dimension(getMapMode().DPtoLP(100)&#xA;, getMapMode().DPtoLP(200)&#xA;));&#xA;&#x9;&#x9;createContents();&#xA;&#x9;}&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private void createContents(){&#xA;&#xA;&#xA;fFigureLifelineNameContainerFigure = new org.eclipse.draw2d.RectangleFigure();&#xA;&#xA;fFigureLifelineNameContainerFigure.setBorder(new org.eclipse.draw2d.MarginBorder(getMapMode().DPtoLP(7)&#xA;, getMapMode().DPtoLP(7)&#xA;, getMapMode().DPtoLP(7)&#xA;, getMapMode().DPtoLP(7)&#xA;));&#xA;&#xA;this.add(fFigureLifelineNameContainerFigure, org.eclipse.draw2d.BorderLayout.TOP);&#xA;fFigureLifelineNameContainerFigure.setLayoutManager(new org.eclipse.draw2d.StackLayout());&#xA;&#xA;&#xA;fFigureLifelineLabelFigure = new org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel();&#xA;&#xA;&#xA;&#xA;&#xA;fFigureLifelineLabelFigure.setText(&#xA;&quot;&lt;...>&quot;);&#xA;&#xA;&#xA;&#xA;&#xA;fFigureLifelineLabelFigure.setTextWrap(&#xA;true);&#xA;&#xA;&#xA;&#xA;&#xA;fFigureLifelineLabelFigure.setAlignment(&#xA;org.eclipse.draw2d.PositionConstants.CENTER);&#xA;&#xA;&#xA;&#xA;fFigureLifelineNameContainerFigure.add(fFigureLifelineLabelFigure);&#xA;&#xA;&#xA;&#xA;&#xA;fFigureExecutionsContainerFigure = new org.eclipse.draw2d.RectangleFigure();&#xA;fFigureExecutionsContainerFigure.setFill(false);&#xA;fFigureExecutionsContainerFigure.setOutline(false);&#xA;&#xA;this.add(fFigureExecutionsContainerFigure, org.eclipse.draw2d.BorderLayout.CENTER);&#xA;fFigureExecutionsContainerFigure.setLayoutManager(new org.eclipse.draw2d.StackLayout());&#xA;&#xA;&#xA;fFigureLifelineDotLineFigure = new org.eclipse.papyrus.uml.diagram.sequence.figures.LifelineDotLineCustomFigure();&#xA;&#xA;&#xA;&#xA;fFigureExecutionsContainerFigure.add(fFigureLifelineDotLineFigure);&#xA;&#xA;&#xA;&#xA;&#x9;}&#xA;&#xA;&#xA;&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel getFigureLifelineLabelFigure() {&#xA;&#x9;&#x9;return fFigureLifelineLabelFigure;&#xA;&#x9;}&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public org.eclipse.draw2d.RectangleFigure getFigureLifelineNameContainerFigure() {&#xA;&#x9;&#x9;return fFigureLifelineNameContainerFigure;&#xA;&#x9;}&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public org.eclipse.draw2d.RectangleFigure getFigureExecutionsContainerFigure() {&#xA;&#x9;&#x9;return fFigureExecutionsContainerFigure;&#xA;&#x9;}&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public org.eclipse.papyrus.uml.diagram.sequence.figures.LifelineDotLineCustomFigure getFigureLifelineDotLineFigure() {&#xA;&#x9;&#x9;return fFigureLifelineDotLineFigure;&#xA;&#x9;}&#xA;&#xA;&#xA;}&#xA;&#xA;">

           <attributes

               xsi:type="gmfgen:DefaultSizeAttributes"

               width="100"

@@ -407,27 +407,27 @@
         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="EditPolicy.LAYOUT_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.sequence.edit.policies.LifelineXYLayoutEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.policies.LifelineXYLayoutEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="EditPolicyRoles.DRAG_DROP_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.sequence.edit.policies.CustomDiagramDragDropEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.policies.CustomDiagramDragDropEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="EditPolicyRoles.CREATION_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.sequence.edit.policies.LifelineCreationEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.policies.LifelineCreationEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="EditPolicy.GRAPHICAL_NODE_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.sequence.edit.policies.ElementCreationWithMessageEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.policies.ElementCreationWithMessageEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="&quot;RemoveOrphanView&quot;"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.sequence.edit.policies.RemoveOrphanViewPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.policies.RemoveOrphanViewPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.sequence.edit.policies.LifelineAppliedStereotypeNodeLabelDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.policies.LifelineAppliedStereotypeNodeLabelDisplayEditPolicy"/>

         <modelFacet>

           <metaClass

               href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Lifeline"/>

@@ -500,11 +500,11 @@
         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="EditPolicy.GRAPHICAL_NODE_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.sequence.edit.policies.ElementCreationWithMessageEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.policies.ElementCreationWithMessageEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="EditPolicy.COMPONENT_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.sequence.edit.policies.ExecutionSpecificationComponentEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.policies.ExecutionSpecificationComponentEditPolicy"/>

         <modelFacet>

           <metaClass

               href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/ActionExecutionSpecification"/>

@@ -543,11 +543,11 @@
         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="EditPolicy.GRAPHICAL_NODE_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.sequence.edit.policies.ElementCreationWithMessageEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.policies.ElementCreationWithMessageEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="EditPolicy.COMPONENT_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.sequence.edit.policies.ExecutionSpecificationComponentEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.policies.ExecutionSpecificationComponentEditPolicy"/>

         <modelFacet>

           <metaClass

               href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/BehaviorExecutionSpecification"/>

@@ -575,7 +575,7 @@
         <viewmap

             xsi:type="gmfgen:InnerClassViewmap"

             className="ContinuationFigure"

-            classBody="&#xA;/**&#xA; * @generated&#xA; */&#xA;public class ContinuationFigure extends org.eclipse.draw2d.RoundedRectangle {&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private org.eclipse.papyrus.diagram.common.figure.node.CenteredWrappedLabel fFigureContinuationNameLabel; &#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public ContinuationFigure() {&#xA;&#x9;&#x9;&#xA;&#x9;org.eclipse.papyrus.diagram.common.draw2d.CenterLayout layoutThis = new org.eclipse.papyrus.diagram.common.draw2d.CenterLayout();&#xA;&#xA;&#xA;&#x9;this.setLayoutManager(layoutThis);&#xA;&#xA;&#x9;&#x9;this.setCornerDimensions(new org.eclipse.draw2d.geometry.Dimension(getMapMode().DPtoLP(50)&#xA;, getMapMode().DPtoLP(50)&#xA;));&#xA;&#x9;&#x9;createContents();&#xA;&#x9;}&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private void createContents(){&#xA;&#xA;&#xA;fFigureContinuationNameLabel = new org.eclipse.papyrus.diagram.common.figure.node.CenteredWrappedLabel();&#xA;&#xA;&#xA;&#xA;this.add(fFigureContinuationNameLabel);&#xA;&#xA;&#xA;&#x9;}&#xA;&#xA;&#xA;&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public org.eclipse.papyrus.diagram.common.figure.node.CenteredWrappedLabel getFigureContinuationNameLabel() {&#xA;&#x9;&#x9;return fFigureContinuationNameLabel;&#xA;&#x9;}&#xA;&#xA;&#xA;}&#xA;&#xA;"/>

+            classBody="&#xA;/**&#xA; * @generated&#xA; */&#xA;public class ContinuationFigure extends org.eclipse.draw2d.RoundedRectangle {&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private org.eclipse.papyrus.uml.diagram.common.figure.node.CenteredWrappedLabel fFigureContinuationNameLabel; &#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public ContinuationFigure() {&#xA;&#x9;&#x9;&#xA;&#x9;org.eclipse.papyrus.uml.diagram.common.draw2d.CenterLayout layoutThis = new org.eclipse.papyrus.uml.diagram.common.draw2d.CenterLayout();&#xA;&#xA;&#xA;&#x9;this.setLayoutManager(layoutThis);&#xA;&#xA;&#x9;&#x9;this.setCornerDimensions(new org.eclipse.draw2d.geometry.Dimension(getMapMode().DPtoLP(50)&#xA;, getMapMode().DPtoLP(50)&#xA;));&#xA;&#x9;&#x9;createContents();&#xA;&#x9;}&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private void createContents(){&#xA;&#xA;&#xA;fFigureContinuationNameLabel = new org.eclipse.papyrus.uml.diagram.common.figure.node.CenteredWrappedLabel();&#xA;&#xA;&#xA;&#xA;this.add(fFigureContinuationNameLabel);&#xA;&#xA;&#xA;&#x9;}&#xA;&#xA;&#xA;&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public org.eclipse.papyrus.uml.diagram.common.figure.node.CenteredWrappedLabel getFigureContinuationNameLabel() {&#xA;&#x9;&#x9;return fFigureContinuationNameLabel;&#xA;&#x9;}&#xA;&#xA;&#xA;}&#xA;&#xA;"/>

         <modelFacet>

           <metaClass

               href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/StateInvariant"/>

@@ -604,7 +604,7 @@
           <viewmap

               xsi:type="gmfgen:ParentAssignedViewmap"

               getterName="getFigureContinuationNameLabel"

-              figureQualifiedClassName="org.eclipse.papyrus.diagram.common.figure.node.CenteredWrappedLabel"/>

+              figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.CenteredWrappedLabel"/>

           <modelFacet

               xsi:type="gmfgen:FeatureLabelModelFacet"

               parser="/0/@labelParsers/@implementations.0">

@@ -629,11 +629,11 @@
             metamodelType="/0/@diagram/@childNodes.1/@elementType"/>

         <viewmap

             xsi:type="gmfgen:FigureViewmap"

-            figureQualifiedClassName="org.eclipse.papyrus.diagram.sequence.figures.CoRegionCombinedFragmentFigure"/>

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.sequence.figures.CoRegionCombinedFragmentFigure"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="EditPolicy.GRAPHICAL_NODE_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.sequence.edit.policies.LifelineChildGraphicalNodeEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.policies.LifelineChildGraphicalNodeEditPolicy"/>

         <modelFacet>

           <metaClass

               href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/CombinedFragment"/>

@@ -674,7 +674,7 @@
         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="DeleteTimeElementWithoutEventPolicy.KEY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.sequence.edit.policies.DeleteTimeElementWithoutEventPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.policies.DeleteTimeElementWithoutEventPolicy"/>

         <modelFacet>

           <metaClass

               href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/TimeConstraint"/>

@@ -739,15 +739,15 @@
               href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

           <viewmap

               xsi:type="gmfgen:FigureViewmap"

-              figureQualifiedClassName="org.eclipse.papyrus.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure">

+              figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure">

             <attributes

                 xsi:type="gmfgen:LabelOffsetAttributes"

                 y="-22"/>

           </viewmap>

           <behaviour

               xsi:type="gmfgen:CustomBehaviour"

-              key="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-              editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy"/>

+              key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy"/>

           <modelFacet

               parser="/0/@labelParsers/@implementations.8"/>

         </labels>

@@ -774,7 +774,7 @@
         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="DeleteTimeElementWithoutEventPolicy.KEY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.sequence.edit.policies.DeleteTimeElementWithoutEventPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.policies.DeleteTimeElementWithoutEventPolicy"/>

         <modelFacet>

           <metaClass

               href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/TimeObservation"/>

@@ -824,15 +824,15 @@
               href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

           <viewmap

               xsi:type="gmfgen:FigureViewmap"

-              figureQualifiedClassName="org.eclipse.papyrus.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure">

+              figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure">

             <attributes

                 xsi:type="gmfgen:LabelOffsetAttributes"

                 y="-22"/>

           </viewmap>

           <behaviour

               xsi:type="gmfgen:CustomBehaviour"

-              key="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-              editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy"/>

+              key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy"/>

           <modelFacet

               parser="/0/@labelParsers/@implementations.8"/>

         </labels>

@@ -855,7 +855,7 @@
         <viewmap

             xsi:type="gmfgen:InnerClassViewmap"

             className="DurationConstraintFigure"

-            classBody="&#xA;/**&#xA; * @generated&#xA; */&#xA;public class DurationConstraintFigure extends org.eclipse.draw2d.RectangleFigure {&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private org.eclipse.draw2d.PolylineShape fDurationArrow; &#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public DurationConstraintFigure() {&#xA;&#x9;&#x9;&#xA;&#x9;org.eclipse.papyrus.diagram.common.draw2d.CenterLayout layoutThis = new org.eclipse.papyrus.diagram.common.draw2d.CenterLayout();&#xA;&#xA;&#xA;&#x9;this.setLayoutManager(layoutThis);&#xA;&#xA;&#x9;&#x9;this.setFill(false);&#xA;this.setOutline(false);&#xA;this.setPreferredSize(new org.eclipse.draw2d.geometry.Dimension(getMapMode().DPtoLP(40)&#xA;, getMapMode().DPtoLP(-1)&#xA;));&#xA;this.setBorder(createBorder0());&#xA;&#x9;&#x9;createContents();&#xA;&#x9;}&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private void createContents(){&#xA;&#xA;&#xA;fDurationArrow = new org.eclipse.draw2d.PolylineShape();&#xA;fDurationArrow.addPoint(new org.eclipse.draw2d.geometry.Point(getMapMode().DPtoLP(0)&#xA;, getMapMode().DPtoLP(0)&#xA;));&#xA;fDurationArrow.addPoint(new org.eclipse.draw2d.geometry.Point(getMapMode().DPtoLP(10)&#xA;, getMapMode().DPtoLP(0)&#xA;));&#xA;&#xA;this.add(fDurationArrow);&#xA;&#xA;&#xA;&#x9;}&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private org.eclipse.draw2d.Border createBorder0() {&#xA;&#x9;&#x9;org.eclipse.papyrus.diagram.common.draw2d.LinesBorder result = new org.eclipse.papyrus.diagram.common.draw2d.LinesBorder();&#xA;&#x9;&#x9;&#xA;&#xA;&#xA;&#xA;result.setSides(&#xA;PositionConstants.TOP | PositionConstants.BOTTOM);&#xA;&#xA;&#xA;&#xA;&#x9;&#x9;return result;&#xA;&#x9;}&#xA;&#xA;&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public org.eclipse.draw2d.PolylineShape getDurationArrow() {&#xA;&#x9;&#x9;return fDurationArrow;&#xA;&#x9;}&#xA;&#xA;&#xA;}&#xA;&#xA;">

+            classBody="&#xA;/**&#xA; * @generated&#xA; */&#xA;public class DurationConstraintFigure extends org.eclipse.draw2d.RectangleFigure {&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private org.eclipse.draw2d.PolylineShape fDurationArrow; &#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public DurationConstraintFigure() {&#xA;&#x9;&#x9;&#xA;&#x9;org.eclipse.papyrus.uml.diagram.common.draw2d.CenterLayout layoutThis = new org.eclipse.papyrus.uml.diagram.common.draw2d.CenterLayout();&#xA;&#xA;&#xA;&#x9;this.setLayoutManager(layoutThis);&#xA;&#xA;&#x9;&#x9;this.setFill(false);&#xA;this.setOutline(false);&#xA;this.setPreferredSize(new org.eclipse.draw2d.geometry.Dimension(getMapMode().DPtoLP(40)&#xA;, getMapMode().DPtoLP(-1)&#xA;));&#xA;this.setBorder(createBorder0());&#xA;&#x9;&#x9;createContents();&#xA;&#x9;}&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private void createContents(){&#xA;&#xA;&#xA;fDurationArrow = new org.eclipse.draw2d.PolylineShape();&#xA;fDurationArrow.addPoint(new org.eclipse.draw2d.geometry.Point(getMapMode().DPtoLP(0)&#xA;, getMapMode().DPtoLP(0)&#xA;));&#xA;fDurationArrow.addPoint(new org.eclipse.draw2d.geometry.Point(getMapMode().DPtoLP(10)&#xA;, getMapMode().DPtoLP(0)&#xA;));&#xA;&#xA;this.add(fDurationArrow);&#xA;&#xA;&#xA;&#x9;}&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private org.eclipse.draw2d.Border createBorder0() {&#xA;&#x9;&#x9;org.eclipse.papyrus.uml.diagram.common.draw2d.LinesBorder result = new org.eclipse.papyrus.uml.diagram.common.draw2d.LinesBorder();&#xA;&#x9;&#x9;&#xA;&#xA;&#xA;&#xA;result.setSides(&#xA;PositionConstants.TOP | PositionConstants.BOTTOM);&#xA;&#xA;&#xA;&#xA;&#x9;&#x9;return result;&#xA;&#x9;}&#xA;&#xA;&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public org.eclipse.draw2d.PolylineShape getDurationArrow() {&#xA;&#x9;&#x9;return fDurationArrow;&#xA;&#x9;}&#xA;&#xA;&#xA;}&#xA;&#xA;">

           <attributes

               xsi:type="gmfgen:DefaultSizeAttributes"

               width="-1"

@@ -864,7 +864,7 @@
         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="DeleteTimeElementWithoutEventPolicy.KEY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.sequence.edit.policies.DeleteTimeElementWithoutEventPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.policies.DeleteTimeElementWithoutEventPolicy"/>

         <modelFacet>

           <metaClass

               href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/DurationConstraint"/>

@@ -929,15 +929,15 @@
               href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

           <viewmap

               xsi:type="gmfgen:FigureViewmap"

-              figureQualifiedClassName="org.eclipse.papyrus.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure">

+              figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure">

             <attributes

                 xsi:type="gmfgen:LabelOffsetAttributes"

                 y="-22"/>

           </viewmap>

           <behaviour

               xsi:type="gmfgen:CustomBehaviour"

-              key="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-              editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy"/>

+              key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy"/>

           <modelFacet

               parser="/0/@labelParsers/@implementations.8"/>

         </labels>

@@ -960,14 +960,14 @@
             editHelperClassName="DestructionEventEditHelper"/>

         <viewmap

             xsi:type="gmfgen:FigureViewmap"

-            figureQualifiedClassName="org.eclipse.papyrus.diagram.sequence.figures.DestructionEventFigure">

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.sequence.figures.DestructionEventFigure">

           <attributes

               xsi:type="gmfgen:ResizeConstraints"/>

         </viewmap>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="EditPolicy.COMPONENT_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.sequence.edit.policies.DestructionEventComponentEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.policies.DestructionEventComponentEditPolicy"/>

         <modelFacet>

           <metaClass

               href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/DestructionEvent"/>

@@ -1002,11 +1002,11 @@
             editHelperClassName="ConstraintEditHelper"/>

         <viewmap

             xsi:type="gmfgen:FigureViewmap"

-            figureQualifiedClassName="org.eclipse.papyrus.diagram.common.figure.node.ConstraintFigure"/>

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

         <modelFacet>

           <metaClass

               href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint"/>

@@ -1066,7 +1066,7 @@
           <viewmap

               xsi:type="gmfgen:ParentAssignedViewmap"

               getterName="getConstraintFigure"

-              figureQualifiedClassName="org.eclipse.papyrus.diagram.common.figure.node.ConstraintFigure"/>

+              figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure"/>

           <modelFacet

               parser="/0/@labelParsers/@implementations.9"/>

         </labels>

@@ -1087,15 +1087,15 @@
             editHelperClassName="CommentEditHelper"/>

         <viewmap

             xsi:type="gmfgen:FigureViewmap"

-            figureQualifiedClassName="org.eclipse.papyrus.diagram.common.figure.node.HTMLCornerBentFigure"/>

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.HTMLCornerBentFigure"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

         <modelFacet>

           <metaClass

               href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Comment"/>

@@ -1123,7 +1123,7 @@
           <viewmap

               xsi:type="gmfgen:ParentAssignedViewmap"

               getterName="getCornerBentFigure"

-              figureQualifiedClassName="org.eclipse.papyrus.diagram.common.figure.node.HTMLCornerBentFigure">

+              figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.HTMLCornerBentFigure">

             <attributes

                 xsi:type="gmfgen:StyleAttributes"

                 fixedFont="true"/>

@@ -1171,11 +1171,11 @@
         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="EditPolicy.PRIMARY_DRAG_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.sequence.edit.policies.MoveableNonResizableLabelEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.policies.MoveableNonResizableLabelEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="DeleteTimeElementWithoutEventPolicy.KEY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.sequence.edit.policies.DeleteTimeElementWithoutEventPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.policies.DeleteTimeElementWithoutEventPolicy"/>

         <modelFacet>

           <metaClass

               href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/DurationConstraint"/>

@@ -1227,7 +1227,7 @@
           <behaviour

               xsi:type="gmfgen:CustomBehaviour"

               key="EditPolicy.SELECTION_FEEDBACK_ROLE"

-              editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.sequence.edit.policies.UMLTextSelectionEditPolicy"/>

+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.policies.UMLTextSelectionEditPolicy"/>

           <modelFacet

               parser="/0/@labelParsers/@implementations.6"/>

         </labels>

@@ -1243,15 +1243,15 @@
               href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

           <viewmap

               xsi:type="gmfgen:FigureViewmap"

-              figureQualifiedClassName="org.eclipse.papyrus.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure">

+              figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure">

             <attributes

                 xsi:type="gmfgen:LabelOffsetAttributes"

                 y="-22"/>

           </viewmap>

           <behaviour

               xsi:type="gmfgen:CustomBehaviour"

-              key="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-              editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy"/>

+              key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy"/>

           <modelFacet

               parser="/0/@labelParsers/@implementations.8"/>

         </labels>

@@ -1290,11 +1290,11 @@
         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="EditPolicy.PRIMARY_DRAG_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.sequence.edit.policies.MoveableNonResizableLabelEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.policies.MoveableNonResizableLabelEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="DeleteTimeElementWithoutEventPolicy.KEY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.sequence.edit.policies.DeleteTimeElementWithoutEventPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.policies.DeleteTimeElementWithoutEventPolicy"/>

         <modelFacet>

           <metaClass

               href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/DurationObservation"/>

@@ -1331,7 +1331,7 @@
           <behaviour

               xsi:type="gmfgen:CustomBehaviour"

               key="EditPolicy.SELECTION_FEEDBACK_ROLE"

-              editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.sequence.edit.policies.UMLTextSelectionEditPolicy"/>

+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.policies.UMLTextSelectionEditPolicy"/>

           <modelFacet

               parser="/0/@labelParsers/@implementations.5"/>

         </labels>

@@ -1347,15 +1347,15 @@
               href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

           <viewmap

               xsi:type="gmfgen:FigureViewmap"

-              figureQualifiedClassName="org.eclipse.papyrus.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure">

+              figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure">

             <attributes

                 xsi:type="gmfgen:LabelOffsetAttributes"

                 y="-22"/>

           </viewmap>

           <behaviour

               xsi:type="gmfgen:CustomBehaviour"

-              key="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-              editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy"/>

+              key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy"/>

           <modelFacet

               parser="/0/@labelParsers/@implementations.8"/>

         </labels>

@@ -1377,7 +1377,7 @@
             editHelperClassName="InteractionEditHelper"/>

         <viewmap

             xsi:type="gmfgen:FigureViewmap"

-            figureQualifiedClassName="org.eclipse.papyrus.diagram.common.figure.node.InteractionRectangleFigure">

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.InteractionRectangleFigure">

           <attributes

               xsi:type="gmfgen:DefaultSizeAttributes"

               width="857"

@@ -1386,11 +1386,11 @@
         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="EditPolicy.GRAPHICAL_NODE_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.sequence.edit.policies.SequenceGraphicalNodeEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.policies.SequenceGraphicalNodeEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

         <modelFacet>

           <metaClass

               href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interaction"/>

@@ -1453,19 +1453,19 @@
         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="EditPolicyRoles.CREATION_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.sequence.edit.policies.CreationOnMessageEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.policies.CreationOnMessageEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="EditPolicy.CONNECTION_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.sequence.edit.policies.MessageConnectionEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.policies.MessageConnectionEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="EditPolicy.CONNECTION_BENDPOINTS_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.sequence.edit.policies.MessageConnectionLineSegEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.policies.MessageConnectionLineSegEditPolicy"/>

         <modelFacet

             xsi:type="gmfgen:TypeLinkModelFacet"

             modelElementSelector="/0/@expressionProviders/@providers.1/@expressions.1">

@@ -1558,19 +1558,19 @@
         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="EditPolicyRoles.CREATION_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.sequence.edit.policies.CreationOnMessageEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.policies.CreationOnMessageEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="EditPolicy.CONNECTION_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.sequence.edit.policies.MessageConnectionEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.policies.MessageConnectionEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="EditPolicy.CONNECTION_BENDPOINTS_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.sequence.edit.policies.MessageConnectionLineSegEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.policies.MessageConnectionLineSegEditPolicy"/>

         <modelFacet

             xsi:type="gmfgen:TypeLinkModelFacet"

             modelElementSelector="/0/@expressionProviders/@providers.1/@expressions.4">

@@ -1664,19 +1664,19 @@
         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="EditPolicyRoles.CREATION_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.sequence.edit.policies.CreationOnMessageEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.policies.CreationOnMessageEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="EditPolicy.CONNECTION_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.sequence.edit.policies.MessageConnectionEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.policies.MessageConnectionEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="EditPolicy.CONNECTION_BENDPOINTS_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.sequence.edit.policies.MessageConnectionLineSegEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.policies.MessageConnectionLineSegEditPolicy"/>

         <modelFacet

             xsi:type="gmfgen:TypeLinkModelFacet"

             modelElementSelector="/0/@expressionProviders/@providers.1/@expressions.7">

@@ -1768,19 +1768,19 @@
         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="EditPolicyRoles.CREATION_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.sequence.edit.policies.CreationOnMessageEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.policies.CreationOnMessageEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="EditPolicy.CONNECTION_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.sequence.edit.policies.MessageConnectionEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.policies.MessageConnectionEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="EditPolicy.CONNECTION_BENDPOINTS_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.sequence.edit.policies.MessageConnectionLineSegEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.policies.MessageConnectionLineSegEditPolicy"/>

         <modelFacet

             xsi:type="gmfgen:TypeLinkModelFacet"

             modelElementSelector="/0/@expressionProviders/@providers.1/@expressions.10">

@@ -1873,19 +1873,19 @@
         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="EditPolicyRoles.CREATION_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.sequence.edit.policies.CreationOnMessageEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.policies.CreationOnMessageEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="EditPolicy.CONNECTION_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.sequence.edit.policies.MessageConnectionEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.policies.MessageConnectionEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="EditPolicy.CONNECTION_BENDPOINTS_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.sequence.edit.policies.MessageConnectionLineSegEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.policies.MessageConnectionLineSegEditPolicy"/>

         <modelFacet

             xsi:type="gmfgen:TypeLinkModelFacet"

             modelElementSelector="/0/@expressionProviders/@providers.1/@expressions.13">

@@ -1969,7 +1969,7 @@
         <viewmap

             xsi:type="gmfgen:InnerClassViewmap"

             className="MessageLost"

-            classBody="&#xA;/**&#xA; * @generated&#xA; */&#xA;public class MessageLost extends org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx {&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel fFigureMessageLostLabelFigure; &#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel fAppliedStereotypeLabel; &#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public MessageLost() {&#xA;&#x9;&#x9;&#x9;this.setForegroundColor(org.eclipse.draw2d.ColorConstants.black);&#xA;&#xA;&#x9;&#x9;createContents();&#xA;&#x9;&#x9;setTargetDecoration(createTargetDecoration());&#xA;&#x9;}&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private void createContents(){&#xA;&#xA;&#xA;fFigureMessageLostLabelFigure = new org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel();&#xA;fFigureMessageLostLabelFigure.setText(&quot;&quot;);&#xA;&#xA;fFigureMessageLostLabelFigure.setFont(FFIGUREMESSAGELOSTLABELFIGURE_FONT);&#xA;&#xA;&#xA;&#xA;this.add(fFigureMessageLostLabelFigure);&#xA;&#xA;&#xA;&#x9;}&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private org.eclipse.draw2d.RotatableDecoration createTargetDecoration() {&#xA;&#x9;&#x9;org.eclipse.papyrus.diagram.sequence.figures.EllipseDecoration df = new org.eclipse.papyrus.diagram.sequence.figures.EllipseDecoration();&#xA;&#xA;&#xA;&#xA;&#xA;df.setAlwaysFill(&#xA;true);&#xA;&#xA;&#xA;&#xA;&#xA;df.setPreferredSize(&#xA;new org.eclipse.draw2d.geometry.Dimension(10,10));&#xA;&#xA;&#xA;&#xA;&#x9;&#x9;return df;&#xA;&#x9;}&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel getFigureMessageLostLabelFigure() {&#xA;&#x9;&#x9;return fFigureMessageLostLabelFigure;&#xA;&#x9;}&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel getAppliedStereotypeLabel() {&#xA;&#x9;&#x9;return fAppliedStereotypeLabel;&#xA;&#x9;}&#xA;&#xA;&#xA;}&#xA;&#xA;/**&#xA; * @generated&#xA; */&#xA;static final org.eclipse.swt.graphics.Font FFIGUREMESSAGELOSTLABELFIGURE_FONT = new org.eclipse.swt.graphics.Font(org.eclipse.swt.widgets.Display.getCurrent(), &quot;SANS&quot;, 9, org.eclipse.swt.SWT.NORMAL);&#xA;&#xA;">

+            classBody="&#xA;/**&#xA; * @generated&#xA; */&#xA;public class MessageLost extends org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx {&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel fFigureMessageLostLabelFigure; &#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel fAppliedStereotypeLabel; &#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public MessageLost() {&#xA;&#x9;&#x9;&#x9;this.setForegroundColor(org.eclipse.draw2d.ColorConstants.black);&#xA;&#xA;&#x9;&#x9;createContents();&#xA;&#x9;&#x9;setTargetDecoration(createTargetDecoration());&#xA;&#x9;}&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private void createContents(){&#xA;&#xA;&#xA;fFigureMessageLostLabelFigure = new org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel();&#xA;fFigureMessageLostLabelFigure.setText(&quot;&quot;);&#xA;&#xA;fFigureMessageLostLabelFigure.setFont(FFIGUREMESSAGELOSTLABELFIGURE_FONT);&#xA;&#xA;&#xA;&#xA;this.add(fFigureMessageLostLabelFigure);&#xA;&#xA;&#xA;&#x9;}&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private org.eclipse.draw2d.RotatableDecoration createTargetDecoration() {&#xA;&#x9;&#x9;org.eclipse.papyrus.uml.diagram.sequence.figures.EllipseDecoration df = new org.eclipse.papyrus.uml.diagram.sequence.figures.EllipseDecoration();&#xA;&#xA;&#xA;&#xA;&#xA;df.setAlwaysFill(&#xA;true);&#xA;&#xA;&#xA;&#xA;&#xA;df.setPreferredSize(&#xA;new org.eclipse.draw2d.geometry.Dimension(10,10));&#xA;&#xA;&#xA;&#xA;&#x9;&#x9;return df;&#xA;&#x9;}&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel getFigureMessageLostLabelFigure() {&#xA;&#x9;&#x9;return fFigureMessageLostLabelFigure;&#xA;&#x9;}&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel getAppliedStereotypeLabel() {&#xA;&#x9;&#x9;return fAppliedStereotypeLabel;&#xA;&#x9;}&#xA;&#xA;&#xA;}&#xA;&#xA;/**&#xA; * @generated&#xA; */&#xA;static final org.eclipse.swt.graphics.Font FFIGUREMESSAGELOSTLABELFIGURE_FONT = new org.eclipse.swt.graphics.Font(org.eclipse.swt.widgets.Display.getCurrent(), &quot;SANS&quot;, 9, org.eclipse.swt.SWT.NORMAL);&#xA;&#xA;">

           <attributes

               xsi:type="gmfgen:StyleAttributes"

               fixedForeground="true"/>

@@ -1977,19 +1977,19 @@
         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="EditPolicyRoles.CREATION_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.sequence.edit.policies.CreationOnMessageEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.policies.CreationOnMessageEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="EditPolicy.CONNECTION_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.sequence.edit.policies.MessageConnectionEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.policies.MessageConnectionEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="EditPolicy.CONNECTION_BENDPOINTS_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.sequence.edit.policies.MessageConnectionLineSegEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.policies.MessageConnectionLineSegEditPolicy"/>

         <modelFacet

             xsi:type="gmfgen:TypeLinkModelFacet"

             modelElementSelector="/0/@expressionProviders/@providers.1/@expressions.16">

@@ -2074,7 +2074,7 @@
         <viewmap

             xsi:type="gmfgen:InnerClassViewmap"

             className="MessageFound"

-            classBody="&#xA;/**&#xA; * @generated&#xA; */&#xA;public class MessageFound extends org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx {&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel fFigureMessageFoundLabelFigure; &#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel fAppliedStereotypeLabel; &#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public MessageFound() {&#xA;&#x9;&#x9;&#x9;this.setForegroundColor(org.eclipse.draw2d.ColorConstants.black);&#xA;&#xA;&#x9;&#x9;createContents();&#xA;&#x9;&#x9;setSourceDecoration(createSourceDecoration());&#xA;&#x9;&#x9;setTargetDecoration(createTargetDecoration());&#xA;&#x9;}&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private void createContents(){&#xA;&#xA;&#xA;fFigureMessageFoundLabelFigure = new org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel();&#xA;fFigureMessageFoundLabelFigure.setText(&quot;&quot;);&#xA;&#xA;fFigureMessageFoundLabelFigure.setFont(FFIGUREMESSAGEFOUNDLABELFIGURE_FONT);&#xA;&#xA;&#xA;&#xA;this.add(fFigureMessageFoundLabelFigure);&#xA;&#xA;&#xA;&#x9;}&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private org.eclipse.draw2d.RotatableDecoration createSourceDecoration() {&#xA;&#x9;&#x9;org.eclipse.papyrus.diagram.sequence.figures.EllipseDecoration df = new org.eclipse.papyrus.diagram.sequence.figures.EllipseDecoration();&#xA;&#xA;&#xA;&#xA;&#xA;df.setAlwaysFill(&#xA;true);&#xA;&#xA;&#xA;&#xA;&#xA;df.setPreferredSize(&#xA;new org.eclipse.draw2d.geometry.Dimension(10,10));&#xA;&#xA;&#xA;&#xA;&#x9;&#x9;return df;&#xA;&#x9;}&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private org.eclipse.draw2d.RotatableDecoration createTargetDecoration() {&#xA;&#x9;&#x9;org.eclipse.draw2d.PolylineDecoration df = new org.eclipse.draw2d.PolylineDecoration();&#xA;&#x9;df.setForegroundColor(org.eclipse.draw2d.ColorConstants.black);&#xA;org.eclipse.draw2d.geometry.PointList pl = new org.eclipse.draw2d.geometry.PointList();&#xA;pl.addPoint(getMapMode().DPtoLP(-2)&#xA;, getMapMode().DPtoLP(2)&#xA;);&#xA;pl.addPoint(getMapMode().DPtoLP(0)&#xA;, getMapMode().DPtoLP(0)&#xA;);&#xA;pl.addPoint(getMapMode().DPtoLP(-2)&#xA;, getMapMode().DPtoLP(-2)&#xA;);&#xA;df.setTemplate(pl);&#xA;df.setScale(getMapMode().DPtoLP(7)&#xA;, getMapMode().DPtoLP(3)&#xA;);&#xA;&#x9;&#x9;return df;&#xA;&#x9;}&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel getFigureMessageFoundLabelFigure() {&#xA;&#x9;&#x9;return fFigureMessageFoundLabelFigure;&#xA;&#x9;}&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel getAppliedStereotypeLabel() {&#xA;&#x9;&#x9;return fAppliedStereotypeLabel;&#xA;&#x9;}&#xA;&#xA;&#xA;}&#xA;&#xA;/**&#xA; * @generated&#xA; */&#xA;static final org.eclipse.swt.graphics.Font FFIGUREMESSAGEFOUNDLABELFIGURE_FONT = new org.eclipse.swt.graphics.Font(org.eclipse.swt.widgets.Display.getCurrent(), &quot;SANS&quot;, 9, org.eclipse.swt.SWT.NORMAL);&#xA;&#xA;">

+            classBody="&#xA;/**&#xA; * @generated&#xA; */&#xA;public class MessageFound extends org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx {&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel fFigureMessageFoundLabelFigure; &#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel fAppliedStereotypeLabel; &#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public MessageFound() {&#xA;&#x9;&#x9;&#x9;this.setForegroundColor(org.eclipse.draw2d.ColorConstants.black);&#xA;&#xA;&#x9;&#x9;createContents();&#xA;&#x9;&#x9;setSourceDecoration(createSourceDecoration());&#xA;&#x9;&#x9;setTargetDecoration(createTargetDecoration());&#xA;&#x9;}&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private void createContents(){&#xA;&#xA;&#xA;fFigureMessageFoundLabelFigure = new org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel();&#xA;fFigureMessageFoundLabelFigure.setText(&quot;&quot;);&#xA;&#xA;fFigureMessageFoundLabelFigure.setFont(FFIGUREMESSAGEFOUNDLABELFIGURE_FONT);&#xA;&#xA;&#xA;&#xA;this.add(fFigureMessageFoundLabelFigure);&#xA;&#xA;&#xA;&#x9;}&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private org.eclipse.draw2d.RotatableDecoration createSourceDecoration() {&#xA;&#x9;&#x9;org.eclipse.papyrus.uml.diagram.sequence.figures.EllipseDecoration df = new org.eclipse.papyrus.uml.diagram.sequence.figures.EllipseDecoration();&#xA;&#xA;&#xA;&#xA;&#xA;df.setAlwaysFill(&#xA;true);&#xA;&#xA;&#xA;&#xA;&#xA;df.setPreferredSize(&#xA;new org.eclipse.draw2d.geometry.Dimension(10,10));&#xA;&#xA;&#xA;&#xA;&#x9;&#x9;return df;&#xA;&#x9;}&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private org.eclipse.draw2d.RotatableDecoration createTargetDecoration() {&#xA;&#x9;&#x9;org.eclipse.draw2d.PolylineDecoration df = new org.eclipse.draw2d.PolylineDecoration();&#xA;&#x9;df.setForegroundColor(org.eclipse.draw2d.ColorConstants.black);&#xA;org.eclipse.draw2d.geometry.PointList pl = new org.eclipse.draw2d.geometry.PointList();&#xA;pl.addPoint(getMapMode().DPtoLP(-2)&#xA;, getMapMode().DPtoLP(2)&#xA;);&#xA;pl.addPoint(getMapMode().DPtoLP(0)&#xA;, getMapMode().DPtoLP(0)&#xA;);&#xA;pl.addPoint(getMapMode().DPtoLP(-2)&#xA;, getMapMode().DPtoLP(-2)&#xA;);&#xA;df.setTemplate(pl);&#xA;df.setScale(getMapMode().DPtoLP(7)&#xA;, getMapMode().DPtoLP(3)&#xA;);&#xA;&#x9;&#x9;return df;&#xA;&#x9;}&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel getFigureMessageFoundLabelFigure() {&#xA;&#x9;&#x9;return fFigureMessageFoundLabelFigure;&#xA;&#x9;}&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel getAppliedStereotypeLabel() {&#xA;&#x9;&#x9;return fAppliedStereotypeLabel;&#xA;&#x9;}&#xA;&#xA;&#xA;}&#xA;&#xA;/**&#xA; * @generated&#xA; */&#xA;static final org.eclipse.swt.graphics.Font FFIGUREMESSAGEFOUNDLABELFIGURE_FONT = new org.eclipse.swt.graphics.Font(org.eclipse.swt.widgets.Display.getCurrent(), &quot;SANS&quot;, 9, org.eclipse.swt.SWT.NORMAL);&#xA;&#xA;">

           <attributes

               xsi:type="gmfgen:StyleAttributes"

               fixedForeground="true"/>

@@ -2082,19 +2082,19 @@
         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="EditPolicyRoles.CREATION_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.sequence.edit.policies.CreationOnMessageEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.policies.CreationOnMessageEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="EditPolicy.CONNECTION_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.sequence.edit.policies.MessageConnectionEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.policies.MessageConnectionEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="EditPolicy.CONNECTION_BENDPOINTS_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.sequence.edit.policies.MessageConnectionLineSegEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.policies.MessageConnectionLineSegEditPolicy"/>

         <modelFacet

             xsi:type="gmfgen:TypeLinkModelFacet"

             modelElementSelector="/0/@expressionProviders/@providers.1/@expressions.19">

@@ -2228,8 +2228,8 @@
         </viewmap>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy"/>

         <modelFacet

             xsi:type="gmfgen:TypeLinkModelFacet">

           <metaClass

@@ -2299,19 +2299,19 @@
         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="EditPolicy.LAYOUT_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.sequence.edit.policies.InteractionCompartmentXYLayoutEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.policies.InteractionCompartmentXYLayoutEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="&quot;RemoveOrphanView&quot;"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.sequence.edit.policies.RemoveOrphanViewPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.policies.RemoveOrphanViewPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="EditPolicyRoles.DRAG_DROP_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.sequence.edit.policies.CustomDiagramDragDropEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.policies.CustomDiagramDragDropEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="EditPolicyRoles.CREATION_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.sequence.edit.policies.CombinedFragmentCreationEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.policies.CombinedFragmentCreationEditPolicy"/>

       </compartments>

       <compartments

           visualID="7004"

@@ -2556,11 +2556,11 @@
       </preferencePages>

     </diagram>

     <plugin

-        iD="org.eclipse.papyrus.diagram.sequence"

+        iD="org.eclipse.papyrus.uml.diagram.sequence"

         provider="CEA"

         version="0.7.1.qualifier">

       <requiredPlugins>org.eclipse.draw2d</requiredPlugins>

-      <requiredPlugins>org.eclipse.papyrus.diagram.common</requiredPlugins>

+      <requiredPlugins>org.eclipse.papyrus.uml.diagram.common</requiredPlugins>

       <requiredPlugins>org.eclipse.gmf.runtime.draw2d.ui</requiredPlugins>

     </plugin>

     <editor/>

@@ -7383,39 +7383,39 @@
       <implementations

           xsi:type="gmfgen:CustomParser"

           uses="/0/@diagram/@childNodes.5/@labels.0/@modelFacet"

-          qualifiedName="org.eclipse.papyrus.diagram.sequence.parser.custom.LifelineCustomParsers"/>

+          qualifiedName="org.eclipse.papyrus.uml.diagram.sequence.parser.custom.LifelineCustomParsers"/>

       <implementations

           xsi:type="gmfgen:CustomParser"

           uses="/0/@diagram/@childNodes.3/@labels.1/@modelFacet"

-          qualifiedName=" org.eclipse.papyrus.diagram.sequence.parser.custom.InteractionUseCustomParsers"/>

+          qualifiedName=" org.eclipse.papyrus.uml.diagram.sequence.parser.custom.InteractionUseCustomParsers"/>

       <implementations

           xsi:type="gmfgen:CustomParser"

           uses="/0/@diagram/@links.0/@labels.0/@modelFacet /0/@diagram/@links.1/@labels.0/@modelFacet /0/@diagram/@links.5/@labels.0/@modelFacet /0/@diagram/@links.4/@labels.0/@modelFacet /0/@diagram/@links.2/@labels.0/@modelFacet /0/@diagram/@links.6/@labels.0/@modelFacet /0/@diagram/@links.3/@labels.0/@modelFacet"

-          qualifiedName=" org.eclipse.papyrus.diagram.sequence.parser.custom.MessageCustomParser"/>

+          qualifiedName=" org.eclipse.papyrus.uml.diagram.sequence.parser.custom.MessageCustomParser"/>

       <implementations

           xsi:type="gmfgen:CustomParser"

           uses="/0/@diagram/@childNodes.15/@labels.0/@modelFacet"

-          qualifiedName="org.eclipse.papyrus.diagram.common.parser.CommentParser"/>

+          qualifiedName="org.eclipse.papyrus.uml.diagram.common.parser.CommentParser"/>

       <implementations

           xsi:type="gmfgen:CustomParser"

           uses="/0/@diagram/@childNodes.17/@labels.0/@modelFacet"

-          qualifiedName="org.eclipse.papyrus.diagram.sequence.parser.custom.DurationObservationParser"/>

+          qualifiedName="org.eclipse.papyrus.uml.diagram.sequence.parser.custom.DurationObservationParser"/>

       <implementations

           xsi:type="gmfgen:CustomParser"

           uses="/0/@diagram/@childNodes.12/@labels.0/@modelFacet /0/@diagram/@childNodes.16/@labels.0/@modelFacet /0/@diagram/@childNodes.10/@labels.0/@modelFacet"

-          qualifiedName="org.eclipse.papyrus.diagram.sequence.parser.custom.TimeConstraintParser"/>

+          qualifiedName="org.eclipse.papyrus.uml.diagram.sequence.parser.custom.TimeConstraintParser"/>

       <implementations

           xsi:type="gmfgen:CustomParser"

           uses="/0/@diagram/@childNodes.11/@labels.0/@modelFacet"

-          qualifiedName="org.eclipse.papyrus.diagram.sequence.parser.custom.TimeObservationParser"/>

+          qualifiedName="org.eclipse.papyrus.uml.diagram.sequence.parser.custom.TimeObservationParser"/>

       <implementations

           xsi:type="gmfgen:CustomParser"

           uses="/0/@diagram/@links.2/@labels.1/@modelFacet /0/@diagram/@childNodes.12/@labels.1/@modelFacet /0/@diagram/@links.9/@labels.0/@modelFacet /0/@diagram/@links.1/@labels.1/@modelFacet /0/@diagram/@childNodes.17/@labels.1/@modelFacet /0/@diagram/@childNodes.10/@labels.1/@modelFacet /0/@diagram/@childNodes.16/@labels.1/@modelFacet /0/@diagram/@links.0/@labels.1/@modelFacet /0/@diagram/@childNodes.11/@labels.1/@modelFacet /0/@diagram/@links.6/@labels.1/@modelFacet /0/@diagram/@links.5/@labels.1/@modelFacet /0/@diagram/@links.3/@labels.1/@modelFacet /0/@diagram/@links.4/@labels.1/@modelFacet"

-          qualifiedName="org.eclipse.papyrus.diagram.common.parser.stereotype.AppliedStereotypeParser"/>

+          qualifiedName="org.eclipse.papyrus.uml.diagram.common.parser.stereotype.AppliedStereotypeParser"/>

       <implementations

           xsi:type="gmfgen:CustomParser"

           uses="/0/@diagram/@childNodes.14/@labels.1/@modelFacet"

-          qualifiedName="org.eclipse.papyrus.diagram.common.parser.ConstraintParser"/>

+          qualifiedName="org.eclipse.papyrus.uml.diagram.common.parser.ConstraintParser"/>

     </labelParsers>

     <contextMenus

         context="/0/@diagram">

@@ -7428,22 +7428,22 @@
         xsi:type="papyrusgmfgenextension:ExtendedGenView"

         genView="/0/@diagram/@childNodes.1 /0/@diagram/@childNodes.3"

         name="InteractionFragmentEditPart"

-        superOwnedEditPart="org.eclipse.papyrus.diagram.sequence.edit.parts.InteractionFragmentEditPart"/>

+        superOwnedEditPart="org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionFragmentEditPart"/>

     <extensionNodes

         xsi:type="papyrusgmfgenextension:ExtendedGenView"

         genView="/0/@diagram/@childNodes.0"

         superGenViews="/0/@diagram/@childNodes.1"

         name="CombinedFragmentEditPart"

-        superOwnedEditPart="org.eclipse.papyrus.diagram.sequence.edit.parts.CombinedFragmentEditPart"/>

+        superOwnedEditPart="org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragmentEditPart"/>

     <extensionNodes

         xsi:type="papyrusgmfgenextension:SpecificLocator"

         comment="Affixed locator for Lifelines to place element with a time bar"

-        classpath="org.eclipse.papyrus.diagram.sequence.locator.TimeMarkElementPositionLocator"

+        classpath="org.eclipse.papyrus.uml.diagram.sequence.locator.TimeMarkElementPositionLocator"

         genChildSideAffixedNode="/0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.12"/>

     <extensionNodes

         xsi:type="papyrusgmfgenextension:SpecificLocator"

         comment="Specific locator for the itemBorder of the lifeline."

-        classpath="org.eclipse.papyrus.diagram.sequence.locator.CenterLocator"

+        classpath="org.eclipse.papyrus.uml.diagram.sequence.locator.CenterLocator"

         genChildSideAffixedNode="/0/@diagram/@childNodes.13 /0/@diagram/@childNodes.8"/>

     <extensionNodes

         xsi:type="papyrusgmfgenextension:ExtendedGenView"

@@ -7455,19 +7455,19 @@
         comment="Node with label for named element"

         genView="/0/@diagram/@childNodes.5"

         name="NamedElementEditPart"

-        superOwnedEditPart="org.eclipse.papyrus.diagram.common.editparts.NamedElementEditPart"/>

+        superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart"/>

     <extensionNodes

         xsi:type="papyrusgmfgenextension:ExtendedGenView"

         comment="this is an extension to manage the comment"

         genView="/0/@diagram/@childNodes.15"

         name="comment extended node"

-        superOwnedEditPart="org.eclipse.papyrus.diagram.common.editparts.AbstractCommentEditPart"/>

+        superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.AbstractCommentEditPart"/>

     <extensionNodes

         xsi:type="papyrusgmfgenextension:ExtendedGenView"

         comment="ConstraintEditPart extension"

         genView="/0/@diagram/@childNodes.14"

         name="ConstraintEditPart extension"

-        superOwnedEditPart="org.eclipse.papyrus.diagram.common.editparts.AbstractConstraintEditPart"/>

+        superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.AbstractConstraintEditPart"/>

     <extensionNodes

         xsi:type="papyrusgmfgenextension:EditPartUsingDeleteService"

         comment=""

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/model/sequenceDiagram.gmfgraph b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/model/sequenceDiagram.gmfgraph
index d8e4c8b6056..09aeeb2e580 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/model/sequenceDiagram.gmfgraph
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/model/sequenceDiagram.gmfgraph
@@ -5,11 +5,11 @@
     xmlns:gmfgraph="http://www.eclipse.org/gmf/2006/GraphicalDefinition" name="uml">

   <figures

       name="Sequence Gallery"

-      implementationBundle="org.eclipse.papyrus.diagram.common">

+      implementationBundle="org.eclipse.papyrus.uml.diagram.common">

     <figures

         xsi:type="gmfgraph:CustomDecoration"

         name="RoundedArrow"

-        qualifiedClassName="org.eclipse.papyrus.diagram.sequence.figures.EllipseDecoration">

+        qualifiedClassName="org.eclipse.papyrus.uml.diagram.sequence.figures.EllipseDecoration">

       <attributes

           name="alwaysFill"

           value="true"/>

@@ -56,7 +56,7 @@
       <actualFigure

           xsi:type="gmfgraph:CustomFigure"

           name="CustomInteractionRectangleFigure"

-          qualifiedClassName="org.eclipse.papyrus.diagram.common.figure.node.InteractionRectangleFigure">

+          qualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.InteractionRectangleFigure">

         <customChildren

             accessor="getHeaderLabel()">

           <typedFigure

@@ -82,7 +82,7 @@
       <actualFigure

           xsi:type="gmfgraph:CustomFigure"

           name="LifelineFigure"

-          qualifiedClassName="org.eclipse.papyrus.diagram.common.figure.node.NodeNamedElementFigure">

+          qualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure">

         <layout

             xsi:type="gmfgraph:BorderLayout"/>

         <maximumSize

@@ -130,7 +130,7 @@
           <children

               xsi:type="gmfgraph:CustomFigure"

               name="LifelineDotLineFigure"

-              qualifiedClassName="org.eclipse.papyrus.diagram.sequence.figures.LifelineDotLineCustomFigure"/>

+              qualifiedClassName="org.eclipse.papyrus.uml.diagram.sequence.figures.LifelineDotLineCustomFigure"/>

         </children>

       </actualFigure>

       <accessors

@@ -162,7 +162,7 @@
       <actualFigure

           xsi:type="gmfgraph:CustomFigure"

           name="CustomInteractionUseFigure"

-          qualifiedClassName="org.eclipse.papyrus.diagram.sequence.figures.InteractionUseRectangleFigure">

+          qualifiedClassName="org.eclipse.papyrus.uml.diagram.sequence.figures.InteractionUseRectangleFigure">

         <customChildren

             accessor="getCenterLabel()">

           <typedFigure

@@ -182,7 +182,7 @@
       <actualFigure

           xsi:type="gmfgraph:CustomFigure"

           name="CustomCombinedFragmentFigure"

-          qualifiedClassName="org.eclipse.papyrus.diagram.sequence.figures.CombinedFragmentFigure">

+          qualifiedClassName="org.eclipse.papyrus.uml.diagram.sequence.figures.CombinedFragmentFigure">

         <customChildren

             accessor="getCompartmentFigure()">

           <typedFigure

@@ -201,7 +201,7 @@
       <actualFigure

           xsi:type="gmfgraph:CustomFigure"

           name="CustomInteractionOperandFigure"

-          qualifiedClassName="org.eclipse.papyrus.diagram.sequence.figures.InteractionOperandFigure">

+          qualifiedClassName="org.eclipse.papyrus.uml.diagram.sequence.figures.InteractionOperandFigure">

         <layout

             xsi:type="gmfgraph:XYLayout"/>

         <children

@@ -409,11 +409,11 @@
           cornerHeight="50">

         <layout

             xsi:type="gmfgraph:CustomLayout"

-            qualifiedClassName="org.eclipse.papyrus.diagram.common.draw2d.CenterLayout"/>

+            qualifiedClassName="org.eclipse.papyrus.uml.diagram.common.draw2d.CenterLayout"/>

         <children

             xsi:type="gmfgraph:CustomFigure"

             name="ContinuationNameLabel"

-            qualifiedClassName="org.eclipse.papyrus.diagram.common.figure.node.CenteredWrappedLabel"/>

+            qualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.CenteredWrappedLabel"/>

       </actualFigure>

       <accessors

           figure="//@figures.0/@descriptors.13/@actualFigure/@children.0"/>

@@ -423,7 +423,7 @@
       <actualFigure

           xsi:type="gmfgraph:CustomFigure"

           name="CustomCoregionFigure"

-          qualifiedClassName="org.eclipse.papyrus.diagram.sequence.figures.CoRegionCombinedFragmentFigure"/>

+          qualifiedClassName="org.eclipse.papyrus.uml.diagram.sequence.figures.CoRegionCombinedFragmentFigure"/>

     </descriptors>

     <descriptors

         name="DurationObservationConstraint">

@@ -468,13 +468,13 @@
           fill="false">

         <layout

             xsi:type="gmfgraph:CustomLayout"

-            qualifiedClassName="org.eclipse.papyrus.diagram.common.draw2d.CenterLayout"/>

+            qualifiedClassName="org.eclipse.papyrus.uml.diagram.common.draw2d.CenterLayout"/>

         <preferredSize

             dx="40"

             dy="-1"/>

         <border

             xsi:type="gmfgraph:CustomBorder"

-            qualifiedClassName="org.eclipse.papyrus.diagram.common.draw2d.LinesBorder">

+            qualifiedClassName="org.eclipse.papyrus.uml.diagram.common.draw2d.LinesBorder">

           <attributes

               name="sides"

               value="PositionConstants.TOP | PositionConstants.BOTTOM"/>

@@ -496,7 +496,7 @@
       <actualFigure

           xsi:type="gmfgraph:CustomFigure"

           name="DestructionEventFigure"

-          qualifiedClassName="org.eclipse.papyrus.diagram.sequence.figures.DestructionEventFigure"/>

+          qualifiedClassName="org.eclipse.papyrus.uml.diagram.sequence.figures.DestructionEventFigure"/>

     </descriptors>

     <descriptors

         name="MultilineLabelFigure">

@@ -526,7 +526,7 @@
       <actualFigure

           xsi:type="gmfgraph:CustomFigure"

           name="AppliedStereotypeWrappingLabel"

-          qualifiedClassName="org.eclipse.papyrus.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure"/>

+          qualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure"/>

     </descriptors>

     <descriptors

         name="GeneralOrderingDescriptor">

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/model/sequenceDiagram.gmfmap b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/model/sequenceDiagram.gmfmap
index ffc522ed543..b03da760d05 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/model/sequenceDiagram.gmfmap
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/model/sequenceDiagram.gmfmap
@@ -524,19 +524,19 @@
               xsi:type="gmfmap:FeatureLabelMapping"

               editPattern="">

             <diagramLabel

-                href="../../org.eclipse.papyrus.diagram.common/model/Constraint.gmfgraph#ConstraintNameDiagramLabel"/>

+                href="../../org.eclipse.papyrus.uml.diagram.common/model/Constraint.gmfgraph#ConstraintNameDiagramLabel"/>

             <features

                 href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//NamedElement/name"/>

           </labelMappings>

           <labelMappings>

             <diagramLabel

-                href="../../org.eclipse.papyrus.diagram.common/model/Constraint.gmfgraph#ConstraintBodyDiagramLabel"/>

+                href="../../org.eclipse.papyrus.uml.diagram.common/model/Constraint.gmfgraph#ConstraintBodyDiagramLabel"/>

           </labelMappings>

           <tool

               xsi:type="gmftool:CreationTool"

               href="sequenceDiagram.gmftool#//@palette/@tools.0/@tools.9"/>

           <diagramNode

-              href="../../org.eclipse.papyrus.diagram.common/model/Constraint.gmfgraph#ConstraintNode"/>

+              href="../../org.eclipse.papyrus.uml.diagram.common/model/Constraint.gmfgraph#ConstraintNode"/>

         </ownedChild>

       </children>

       <children

@@ -561,7 +561,7 @@
               xsi:type="gmfmap:FeatureLabelMapping"

               editPattern="">

             <diagramLabel

-                href="../../org.eclipse.papyrus.diagram.common/model/Comment.gmfgraph#CornerBentContentDiagramLabel"/>

+                href="../../org.eclipse.papyrus.uml.diagram.common/model/Comment.gmfgraph#CornerBentContentDiagramLabel"/>

             <features

                 href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//Comment/body"/>

           </labelMappings>

@@ -569,7 +569,7 @@
               xsi:type="gmftool:CreationTool"

               href="sequenceDiagram.gmftool#//@palette/@tools.0/@tools.8"/>

           <diagramNode

-              href="../../org.eclipse.papyrus.diagram.common/model/Comment.gmfgraph#CornerBentNode"/>

+              href="../../org.eclipse.papyrus.uml.diagram.common/model/Comment.gmfgraph#CornerBentNode"/>

         </ownedChild>

       </children>

       <children>

@@ -948,7 +948,7 @@
         xsi:type="gmftool:CreationTool"

         href="sequenceDiagram.gmftool#//@palette/@tools.1/@tools.8"/>

     <diagramLink

-        href="../../org.eclipse.papyrus.diagram.common/model/Comment.gmfgraph#CommentLinkConnection"/>

+        href="../../org.eclipse.papyrus.uml.diagram.common/model/Comment.gmfgraph#CommentLinkConnection"/>

     <linkMetaFeature

         xsi:type="ecore:EReference"

         href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//Comment/annotatedElement"/>

@@ -959,7 +959,7 @@
         xsi:type="gmftool:CreationTool"

         href="sequenceDiagram.gmftool#//@palette/@tools.1/@tools.9"/>

     <diagramLink

-        href="../../org.eclipse.papyrus.diagram.common/model/Constraint.gmfgraph#ConstraintLinkConnection"/>

+        href="../../org.eclipse.papyrus.uml.diagram.common/model/Constraint.gmfgraph#ConstraintLinkConnection"/>

     <linkMetaFeature

         xsi:type="ecore:EReference"

         href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//Constraint/constrainedElement"/>

@@ -1014,7 +1014,7 @@
       name="validateUMLModel"

       description="Validate the UML model">

     <childContainers

-        id="org.eclipse.papyrus.diagram.sequence.validation.FragmentOrderingKeeper"

+        id="org.eclipse.papyrus.uml.diagram.sequence.validation.FragmentOrderingKeeper"

         name="fragmentsOrder"

         description="Fragments order">

       <audits

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/plugin.xml
index 9bfcd8f701b..3e00a26305a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/plugin.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/plugin.xml
@@ -25,7 +25,7 @@
    <extension

          point="org.eclipse.ui.handlers">

       <handler

-            class="org.eclipse.papyrus.diagram.sequence.CreateSequenceDiagramWithNavigationHandler"

+            class="org.eclipse.papyrus.uml.diagram.sequence.CreateSequenceDiagramWithNavigationHandler"

             commandId="org.eclipse.papyrus.diagram.sequence.CreateSequenceDiagramCommand">

          <activeWhen>

             <or>

@@ -54,7 +54,7 @@
                   style="push"

                   tooltip="Create a new Sequence Diagram">

                   <visibleWhen>

-                  	<reference definitionId="org.eclipse.papyrus.diagram.common.IsPapyrusActiveWithUMLModel"/>

+                  	<reference definitionId="org.eclipse.papyrus.uml.diagram.common.IsPapyrusActiveWithUMLModel"/>

                   </visibleWhen>

             </command>

          </toolbar>

@@ -72,14 +72,14 @@
                   style="push"

                   tooltip="Create a new Sequence Diagram">

                   <visibleWhen>

-                  	<reference definitionId="org.eclipse.papyrus.diagram.common.IsPapyrusActiveWithUMLModel"/>

+                  	<reference definitionId="org.eclipse.papyrus.uml.diagram.common.IsPapyrusActiveWithUMLModel"/>

                   </visibleWhen>                  

             </command>

          </menu>

       </menuContribution>

 

 	<menuContribution

-			locationURI="popup:org.eclipse.papyrus.modelexplorer.popupmenu.creatediagram">

+			locationURI="popup:org.eclipse.papyrus.views.modelexplorer.popupmenu.creatediagram">

 		<command 

 			commandId="org.eclipse.papyrus.diagram.sequence.CreateSequenceDiagramCommand"

 			icon="icons/obj16/Diagram_Sequence.gif"

@@ -87,7 +87,7 @@
 			style="push"

 			tooltip="Create a new Sequence Diagram">

 			<visibleWhen>

-				<reference definitionId="org.eclipse.papyrus.diagram.common.IsPapyrusActiveWithUMLModel"/>

+				<reference definitionId="org.eclipse.papyrus.uml.diagram.common.IsPapyrusActiveWithUMLModel"/>

 			</visibleWhen>

 		</command>

 	</menuContribution>      

@@ -97,14 +97,14 @@
    <extension

          point="org.eclipse.papyrus.core.papyrusDiagram">

       <editorDiagram

-    	    actionBarContributorId="org.eclipse.papyrus.diagram.common.part.UMLDiagramActionBarContributor"

+    	    actionBarContributorId="org.eclipse.papyrus.uml.diagram.common.part.UMLDiagramActionBarContributor"

             contextId="com.cea.papyrus.gmf.editor.context"

-            factoryClass="org.eclipse.papyrus.diagram.sequence.SequenceDiagramEditorFactory"

+            factoryClass="org.eclipse.papyrus.uml.diagram.sequence.SequenceDiagramEditorFactory"

             icon="icons/obj16/Diagram_Sequence.gif">

       </editorDiagram>

       <creationCommand

-            creationCommandClass="org.eclipse.papyrus.diagram.sequence.CreateSequenceDiagramCommand"

-            creationCondition="org.eclipse.papyrus.diagram.sequence.SequenceDiagramCreationCondition"

+            creationCommandClass="org.eclipse.papyrus.uml.diagram.sequence.CreateSequenceDiagramCommand"

+            creationCondition="org.eclipse.papyrus.uml.diagram.sequence.SequenceDiagramCreationCondition"

             icon="icons/obj16/Diagram_Sequence.gif"

             id="org.eclipse.papyrus.diagram.sequence.CreateSequenceDiagramCommand"

             label="UML Sequence Diagram"

@@ -119,7 +119,7 @@
       <?gmfgen generated="true"?>
       <propertyContributor
             contributorId="org.eclipse.papyrus.diagram.sequence"
-            labelProvider="org.eclipse.papyrus.diagram.sequence.sheet.UMLSheetLabelProvider">
+            labelProvider="org.eclipse.papyrus.uml.diagram.sequence.sheet.UMLSheetLabelProvider">
          <propertyCategory category="domain"/>
          <propertyCategory category="visual"/>
          <propertyCategory category="extra"/>
@@ -170,10 +170,10 @@
          <propertySection
             id="property.section.domain" 
             tab="property.tab.domain"
-            class="org.eclipse.papyrus.diagram.sequence.sheet.UMLPropertySection">
+            class="org.eclipse.papyrus.uml.diagram.sequence.sheet.UMLPropertySection">
             <input type="org.eclipse.gmf.runtime.notation.View"/>
             <input type="org.eclipse.gef.EditPart"/>
-            <input type="org.eclipse.papyrus.diagram.sequence.navigator.UMLAbstractNavigatorItem"/>
+            <input type="org.eclipse.papyrus.uml.diagram.sequence.navigator.UMLAbstractNavigatorItem"/>
          </propertySection>
       </propertySections>
    </extension>
@@ -183,7 +183,7 @@
 

 	<extension point="org.eclipse.core.runtime.preferences">

 		<?gmfgen generated="true"?>

-		<initializer class="org.eclipse.papyrus.diagram.sequence.preferences.DiagramPreferenceInitializer"/>

+		<initializer class="org.eclipse.papyrus.uml.diagram.sequence.preferences.DiagramPreferenceInitializer"/>

 	</extension>

 
    <extension point="org.eclipse.gmf.runtime.diagram.core.viewProviders" id="view-provider">
@@ -221,7 +221,7 @@
 
    <extension point="org.eclipse.gmf.runtime.emf.ui.modelingAssistantProviders" id="modelassist-provider">
       <?gmfgen generated="true"?>
-      <modelingAssistantProvider class="org.eclipse.papyrus.diagram.sequence.providers.UMLModelingAssistantProvider">
+      <modelingAssistantProvider class="org.eclipse.papyrus.uml.diagram.sequence.providers.UMLModelingAssistantProvider">
          <Priority name="Lowest"/>
          <object class="org.eclipse.papyrus.diagram.sequence.edit.parts.PackageEditPart" id="Package_1000"/>
          <object class="org.eclipse.papyrus.diagram.sequence.edit.parts.InteractionEditPart" id="Interaction_2001"/>
@@ -231,14 +231,14 @@
 
    <extension point="org.eclipse.gmf.runtime.common.ui.services.iconProviders" id="icon-provider">
       <?gmfgen generated="true"?>
-      <IconProvider class="org.eclipse.papyrus.diagram.sequence.providers.UMLIconProvider">
+      <IconProvider class="org.eclipse.papyrus.uml.diagram.sequence.providers.UMLIconProvider">
          <Priority name="Low"/>
       </IconProvider>
    </extension>
 
    <extension point="org.eclipse.gmf.runtime.common.ui.services.parserProviders" id="parser-provider">
       <?gmfgen generated="true"?>
-      <ParserProvider class="org.eclipse.papyrus.diagram.sequence.providers.UMLParserProvider">
+      <ParserProvider class="org.eclipse.papyrus.uml.diagram.sequence.providers.UMLParserProvider">
          <Priority name="Lowest"/>
       </ParserProvider>
    </extension>
@@ -251,7 +251,7 @@
                name="%metatype.name.Package_1000"
                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
                eclass="Package"
-               edithelper="org.eclipse.papyrus.diagram.sequence.edit.helpers.PackageEditHelper">
+               edithelper="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.PackageEditHelper">
             <param name="semanticHint" value="1000"/>
          </metamodelType>
       </metamodel>
@@ -261,7 +261,7 @@
                name="%metatype.name.Interaction_2001"
                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
                eclass="Interaction"
-               edithelper="org.eclipse.papyrus.diagram.sequence.edit.helpers.InteractionEditHelper">
+               edithelper="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.InteractionEditHelper">
             <param name="semanticHint" value="2001"/>
          </metamodelType>
       </metamodel>
@@ -271,7 +271,7 @@
                name="%metatype.name.ConsiderIgnoreFragment_3007"
                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
                eclass="ConsiderIgnoreFragment"
-               edithelper="org.eclipse.papyrus.diagram.sequence.edit.helpers.ConsiderIgnoreFragmentEditHelper">
+               edithelper="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.ConsiderIgnoreFragmentEditHelper">
             <param name="semanticHint" value="3007"/>
          </metamodelType>
       </metamodel>
@@ -281,7 +281,7 @@
                name="%metatype.name.CombinedFragment_3004"
                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
                eclass="CombinedFragment"
-               edithelper="org.eclipse.papyrus.diagram.sequence.edit.helpers.CombinedFragmentEditHelper">
+               edithelper="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.CombinedFragmentEditHelper">
             <param name="semanticHint" value="3004"/>
          </metamodelType>
       </metamodel>
@@ -291,7 +291,7 @@
                name="%metatype.name.InteractionOperand_3005"
                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
                eclass="InteractionOperand"
-               edithelper="org.eclipse.papyrus.diagram.sequence.edit.helpers.InteractionOperandEditHelper">
+               edithelper="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.InteractionOperandEditHelper">
             <param name="semanticHint" value="3005"/>
          </metamodelType>
       </metamodel>
@@ -301,7 +301,7 @@
                name="%metatype.name.InteractionUse_3002"
                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
                eclass="InteractionUse"
-               edithelper="org.eclipse.papyrus.diagram.sequence.edit.helpers.InteractionUseEditHelper">
+               edithelper="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.InteractionUseEditHelper">
             <param name="semanticHint" value="3002"/>
          </metamodelType>
       </metamodel>
@@ -311,7 +311,7 @@
                name="%metatype.name.Continuation_3016"
                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
                eclass="Continuation"
-               edithelper="org.eclipse.papyrus.diagram.sequence.edit.helpers.ContinuationEditHelper">
+               edithelper="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.ContinuationEditHelper">
             <param name="semanticHint" value="3016"/>
          </metamodelType>
       </metamodel>
@@ -321,7 +321,7 @@
                name="%metatype.name.Lifeline_3001"
                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
                eclass="Lifeline"
-               edithelper="org.eclipse.papyrus.diagram.sequence.edit.helpers.LifelineEditHelper">
+               edithelper="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.LifelineEditHelper">
             <param name="semanticHint" value="3001"/>
          </metamodelType>
       </metamodel>
@@ -331,7 +331,7 @@
                name="%metatype.name.ActionExecutionSpecification_3006"
                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
                eclass="ActionExecutionSpecification"
-               edithelper="org.eclipse.papyrus.diagram.sequence.edit.helpers.ActionExecutionSpecificationEditHelper">
+               edithelper="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.ActionExecutionSpecificationEditHelper">
             <param name="semanticHint" value="3006"/>
          </metamodelType>
       </metamodel>
@@ -341,7 +341,7 @@
                name="%metatype.name.BehaviorExecutionSpecification_3003"
                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
                eclass="BehaviorExecutionSpecification"
-               edithelper="org.eclipse.papyrus.diagram.sequence.edit.helpers.BehaviorExecutionSpecificationEditHelper">
+               edithelper="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.BehaviorExecutionSpecificationEditHelper">
             <param name="semanticHint" value="3003"/>
          </metamodelType>
       </metamodel>
@@ -351,7 +351,7 @@
                name="%metatype.name.StateInvariant_3017"
                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
                eclass="StateInvariant"
-               edithelper="org.eclipse.papyrus.diagram.sequence.edit.helpers.StateInvariantEditHelper">
+               edithelper="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.StateInvariantEditHelper">
             <param name="semanticHint" value="3017"/>
          </metamodelType>
       </metamodel>
@@ -370,7 +370,7 @@
                name="%metatype.name.TimeConstraint_3019"
                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
                eclass="TimeConstraint"
-               edithelper="org.eclipse.papyrus.diagram.sequence.edit.helpers.TimeConstraintEditHelper">
+               edithelper="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.TimeConstraintEditHelper">
             <param name="semanticHint" value="3019"/>
          </metamodelType>
       </metamodel>
@@ -380,7 +380,7 @@
                name="%metatype.name.TimeObservation_3020"
                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
                eclass="TimeObservation"
-               edithelper="org.eclipse.papyrus.diagram.sequence.edit.helpers.TimeObservationEditHelper">
+               edithelper="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.TimeObservationEditHelper">
             <param name="semanticHint" value="3020"/>
          </metamodelType>
       </metamodel>
@@ -390,7 +390,7 @@
                name="%metatype.name.DurationConstraint_3021"
                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
                eclass="DurationConstraint"
-               edithelper="org.eclipse.papyrus.diagram.sequence.edit.helpers.DurationConstraintEditHelper">
+               edithelper="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.DurationConstraintEditHelper">
             <param name="semanticHint" value="3021"/>
          </metamodelType>
       </metamodel>
@@ -400,7 +400,7 @@
                name="%metatype.name.DestructionEvent_3022"
                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
                eclass="DestructionEvent"
-               edithelper="org.eclipse.papyrus.diagram.sequence.edit.helpers.DestructionEventEditHelper">
+               edithelper="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.DestructionEventEditHelper">
             <param name="semanticHint" value="3022"/>
          </metamodelType>
       </metamodel>
@@ -410,7 +410,7 @@
                name="%metatype.name.Constraint_3008"
                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
                eclass="Constraint"
-               edithelper="org.eclipse.papyrus.diagram.sequence.edit.helpers.ConstraintEditHelper">
+               edithelper="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.ConstraintEditHelper">
             <param name="semanticHint" value="3008"/>
          </metamodelType>
       </metamodel>
@@ -420,7 +420,7 @@
                name="%metatype.name.Comment_3009"
                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
                eclass="Comment"
-               edithelper="org.eclipse.papyrus.diagram.sequence.edit.helpers.CommentEditHelper">
+               edithelper="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.CommentEditHelper">
             <param name="semanticHint" value="3009"/>
          </metamodelType>
       </metamodel>
@@ -439,7 +439,7 @@
                name="%metatype.name.DurationObservation_3024"
                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
                eclass="DurationObservation"
-               edithelper="org.eclipse.papyrus.diagram.sequence.edit.helpers.DurationObservationEditHelper">
+               edithelper="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.DurationObservationEditHelper">
             <param name="semanticHint" value="3024"/>
          </metamodelType>
       </metamodel>
@@ -449,7 +449,7 @@
                name="%metatype.name.Message_4003"
                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
                eclass="Message"
-               edithelper="org.eclipse.papyrus.diagram.sequence.edit.helpers.MessageEditHelper">
+               edithelper="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.MessageEditHelper">
             <param name="semanticHint" value="4003"/>
          </metamodelType>
       </metamodel>
@@ -531,7 +531,7 @@
                name="%metatype.name.GeneralOrdering_4012"
                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
                eclass="GeneralOrdering"
-               edithelper="org.eclipse.papyrus.diagram.sequence.edit.helpers.GeneralOrderingEditHelper">
+               edithelper="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.GeneralOrderingEditHelper">
             <param name="semanticHint" value="4012"/>
          </metamodelType>
       </metamodel>
@@ -587,7 +587,7 @@
            type="org.eclipse.emf.common.ui.URIEditorInput"
            namespace="org.eclipse.papyrus.diagram.sequence"
            properties="isURIEditorInput"
-           class="org.eclipse.papyrus.diagram.sequence.part.UMLUriEditorInputTester">
+           class="org.eclipse.papyrus.uml.diagram.sequence.part.UMLUriEditorInputTester">
        </propertyTester>
    </extension>
 
@@ -613,8 +613,8 @@
             id="org.eclipse.papyrus.diagram.sequence.resourceContent" 
             name="%navigatorContentName" 
             priority="normal" 
-            contentProvider="org.eclipse.papyrus.diagram.sequence.navigator.UMLNavigatorContentProvider" 
-            labelProvider="org.eclipse.papyrus.diagram.sequence.navigator.UMLNavigatorLabelProvider"
+            contentProvider="org.eclipse.papyrus.uml.diagram.sequence.navigator.UMLNavigatorContentProvider" 
+            labelProvider="org.eclipse.papyrus.uml.diagram.sequence.navigator.UMLNavigatorLabelProvider"
             icon="icons/obj16/UMLDiagramFile.gif"
             activeByDefault="true">
          <triggerPoints>
@@ -623,24 +623,24 @@
     	          <instanceof value="org.eclipse.core.resources.IFile"/>
         	      <test property="org.eclipse.core.resources.extension" value="PapyrusUMLSequence_diagram"/>
                </and>
-               <instanceof value="org.eclipse.papyrus.diagram.sequence.navigator.UMLAbstractNavigatorItem"/>
+               <instanceof value="org.eclipse.papyrus.uml.diagram.sequence.navigator.UMLAbstractNavigatorItem"/>
             </or>
          </triggerPoints>
          <possibleChildren>
             <or>
-         	   <instanceof value="org.eclipse.papyrus.diagram.sequence.navigator.UMLAbstractNavigatorItem"/>
+         	   <instanceof value="org.eclipse.papyrus.uml.diagram.sequence.navigator.UMLAbstractNavigatorItem"/>
             </or>
          </possibleChildren>
          <commonSorter 
                id="org.eclipse.papyrus.diagram.sequence.navigatorSorter" 
-               class="org.eclipse.papyrus.diagram.sequence.navigator.UMLNavigatorSorter">
+               class="org.eclipse.papyrus.uml.diagram.sequence.navigator.UMLNavigatorSorter">
             <parentExpression>
                <or>
 	              <and>
     	             <instanceof value="org.eclipse.core.resources.IFile"/>
         	         <test property="org.eclipse.core.resources.extension" value="PapyrusUMLSequence_diagram"/>
                   </and>
-                  <instanceof value="org.eclipse.papyrus.diagram.sequence.navigator.UMLAbstractNavigatorItem"/>
+                  <instanceof value="org.eclipse.papyrus.uml.diagram.sequence.navigator.UMLAbstractNavigatorItem"/>
                </or>
             </parentExpression>
          </commonSorter>
@@ -649,8 +649,8 @@
             id="org.eclipse.papyrus.diagram.sequence.domainResourceContent" 
             name="%domainNavigatorContentName" 
             priority="normal" 
-            contentProvider="org.eclipse.papyrus.diagram.sequence.navigator.UMLDomainNavigatorContentProvider" 
-            labelProvider="org.eclipse.papyrus.diagram.sequence.navigator.UMLDomainNavigatorLabelProvider"
+            contentProvider="org.eclipse.papyrus.uml.diagram.sequence.navigator.UMLDomainNavigatorContentProvider" 
+            labelProvider="org.eclipse.papyrus.uml.diagram.sequence.navigator.UMLDomainNavigatorLabelProvider"
             icon="icons/obj16/UMLDiagramFile.gif"
             activeByDefault="true">
          <triggerPoints>
@@ -659,19 +659,19 @@
     	          <instanceof value="org.eclipse.core.resources.IFile"/>
         	      <test property="org.eclipse.core.resources.extension" value="PapyrusUMLSequence"/>
                </and>
-               <instanceof value="org.eclipse.papyrus.diagram.sequence.navigator.UMLDomainNavigatorItem"/>
+               <instanceof value="org.eclipse.papyrus.uml.diagram.sequence.navigator.UMLDomainNavigatorItem"/>
             </or>
          </triggerPoints>
          <possibleChildren>
-            <instanceof value="org.eclipse.papyrus.diagram.sequence.navigator.UMLDomainNavigatorItem"/>
+            <instanceof value="org.eclipse.papyrus.uml.diagram.sequence.navigator.UMLDomainNavigatorItem"/>
          </possibleChildren>
       </navigatorContent>
       <actionProvider
             id="org.eclipse.papyrus.diagram.sequence.navigatorActionProvider"
-            class="org.eclipse.papyrus.diagram.sequence.navigator.UMLNavigatorActionProvider">
+            class="org.eclipse.papyrus.uml.diagram.sequence.navigator.UMLNavigatorActionProvider">
          <enablement>
             <or>
-               <instanceof value="org.eclipse.papyrus.diagram.sequence.navigator.UMLAbstractNavigatorItem"/>
+               <instanceof value="org.eclipse.papyrus.uml.diagram.sequence.navigator.UMLAbstractNavigatorItem"/>
             </or>
          </enablement>
       </actionProvider>
@@ -681,7 +681,7 @@
       <?gmfgen generated="true"?>
       <linkHelper
             id="org.eclipse.papyrus.diagram.sequence.navigatorLinkHelper"
-            class="org.eclipse.papyrus.diagram.sequence.navigator.UMLNavigatorLinkHelper">
+            class="org.eclipse.papyrus.uml.diagram.sequence.navigator.UMLNavigatorLinkHelper">
          <editorInputEnablement>
             <and>
                <instanceof value="org.eclipse.emf.common.ui.URIEditorInput"/>
@@ -689,7 +689,7 @@
             </and>
          </editorInputEnablement>
          <selectionEnablement>
-            <instanceof value="org.eclipse.papyrus.diagram.sequence.navigator.UMLAbstractNavigatorItem"/>
+            <instanceof value="org.eclipse.papyrus.uml.diagram.sequence.navigator.UMLAbstractNavigatorItem"/>
          </selectionEnablement>
       </linkHelper>
    </extension>
@@ -697,7 +697,7 @@
       <?gmfgen generated="true"?>
       <command
          categoryId="org.eclipse.ui.category.edit"
-         defaultHandler="org.eclipse.papyrus.diagram.sequence.part.UMLDiagramUpdateCommand"
+         defaultHandler="org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramUpdateCommand"
          description="%update.diagram.description"
          id="org.eclipse.papyrus.diagram.sequence.updateDiagram"
          name="%update.diagram.name"/>
@@ -724,7 +724,7 @@
                <and>
                   <with variable="activePartId"><equals value="org.eclipse.papyrus.diagram.sequence.part.UMLDiagramEditorID"/></with>
                   <with variable="selection"><iterate ifEmpty="false"> 
-                     <instanceof value="org.eclipse.papyrus.diagram.sequence.edit.parts.PackageEditPart"/>
+                     <instanceof value="org.eclipse.papyrus.uml.diagram.sequence.edit.parts.PackageEditPart"/>
                   </iterate></with>
                </and>
             </visibleWhen>
@@ -738,7 +738,7 @@
       <command id="org.eclipse.papyrus.diagram.sequence.LoadResourceAction"
          name="Load Resource"
          categoryId="org.eclipse.papyrus.diagram.sequence.part.UMLDiagramEditorID"
-         defaultHandler="org.eclipse.papyrus.diagram.sequence.part.LoadResourceAction"/>
+         defaultHandler="org.eclipse.papyrus.uml.diagram.sequence.part.LoadResourceAction"/>
    </extension>
 
    <extension point="org.eclipse.ui.handlers" id="menu-handlers">
@@ -751,7 +751,7 @@
             id="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLSequenceDiagram"

             name="PapyrusUMLSequenceDiagram Diagram"

             category="org.eclipse.papyrus.preferences.diagrams"

-            class="org.eclipse.papyrus.diagram.sequence.preferences.DiagramGeneralPreferencePage">

+            class="org.eclipse.papyrus.uml.diagram.sequence.preferences.DiagramGeneralPreferencePage">

       </page>

       
 
@@ -760,14 +760,14 @@
             id="org.eclipse.papyrus.diagram.sequence.preferences.DiagramPrintingPreferencePage"

             name="%prefpage.org.eclipse.uml2.uml.diagram.printing"

             category="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLSequenceDiagram"

-            class="org.eclipse.papyrus.diagram.sequence.preferences.DiagramPrintingPreferencePage">

+            class="org.eclipse.papyrus.uml.diagram.sequence.preferences.DiagramPrintingPreferencePage">

       </page>

 
       <page

             id="org.eclipse.papyrus.diagram.sequence.preferences.DiagramRulersAndGridPreferencePage"

             name="%prefpage.org.eclipse.uml2.uml.diagram.rulersAndGrid"

             category="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLSequenceDiagram"

-            class="org.eclipse.papyrus.diagram.sequence.preferences.DiagramRulersAndGridPreferencePage">

+            class="org.eclipse.papyrus.uml.diagram.sequence.preferences.DiagramRulersAndGridPreferencePage">

       </page>

 
    </extension>

@@ -778,119 +778,119 @@
 		

 	<?gmfgen generated="true"?>

 	<page  	category="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLSequenceDiagram"

-			class="org.eclipse.papyrus.diagram.sequence.preferences.TimeObservationPreferencePage"

+			class="org.eclipse.papyrus.uml.diagram.sequence.preferences.TimeObservationPreferencePage"

             id="org.eclipse.papyrus.diagram.sequence.preferences.TimeObservationPreferencePage"

             name="TimeObservation Node" />

 	
 		

 	<?gmfgen generated="true"?>

 	<page  	category="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLSequenceDiagram"

-			class="org.eclipse.papyrus.diagram.sequence.preferences.CommentPreferencePage"

+			class="org.eclipse.papyrus.uml.diagram.sequence.preferences.CommentPreferencePage"

             id="org.eclipse.papyrus.diagram.sequence.preferences.CommentPreferencePage"

             name="Comment Node" />

 	
 		

 	<?gmfgen generated="true"?>

 	<page  	category="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLSequenceDiagram"

-			class="org.eclipse.papyrus.diagram.sequence.preferences.StateInvariantPreferencePage"

+			class="org.eclipse.papyrus.uml.diagram.sequence.preferences.StateInvariantPreferencePage"

             id="org.eclipse.papyrus.diagram.sequence.preferences.StateInvariantPreferencePage"

             name="StateInvariant Node" />

 	
 		

 	<?gmfgen generated="true"?>

 	<page  	category="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLSequenceDiagram"

-			class="org.eclipse.papyrus.diagram.sequence.preferences.CombinedFragmentPreferencePage"

+			class="org.eclipse.papyrus.uml.diagram.sequence.preferences.CombinedFragmentPreferencePage"

             id="org.eclipse.papyrus.diagram.sequence.preferences.CombinedFragmentPreferencePage"

             name="CombinedFragment Node" />

 	
 		

 	<?gmfgen generated="true"?>

 	<page  	category="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLSequenceDiagram"

-			class="org.eclipse.papyrus.diagram.sequence.preferences.ConstraintPreferencePage"

+			class="org.eclipse.papyrus.uml.diagram.sequence.preferences.ConstraintPreferencePage"

             id="org.eclipse.papyrus.diagram.sequence.preferences.ConstraintPreferencePage"

             name="Constraint Node" />

 	
 		

 	<?gmfgen generated="true"?>

 	<page  	category="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLSequenceDiagram"

-			class="org.eclipse.papyrus.diagram.sequence.preferences.ActionExecutionSpecificationPreferencePage"

+			class="org.eclipse.papyrus.uml.diagram.sequence.preferences.ActionExecutionSpecificationPreferencePage"

             id="org.eclipse.papyrus.diagram.sequence.preferences.ActionExecutionSpecificationPreferencePage"

             name="ActionExecutionSpecification Node" />

 	
 		

 	<?gmfgen generated="true"?>

 	<page  	category="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLSequenceDiagram"

-			class="org.eclipse.papyrus.diagram.sequence.preferences.InteractionOperandPreferencePage"

+			class="org.eclipse.papyrus.uml.diagram.sequence.preferences.InteractionOperandPreferencePage"

             id="org.eclipse.papyrus.diagram.sequence.preferences.InteractionOperandPreferencePage"

             name="InteractionOperand Node" />

 	
 		

 	<?gmfgen generated="true"?>

 	<page  	category="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLSequenceDiagram"

-			class="org.eclipse.papyrus.diagram.sequence.preferences.DestructionEventPreferencePage"

+			class="org.eclipse.papyrus.uml.diagram.sequence.preferences.DestructionEventPreferencePage"

             id="org.eclipse.papyrus.diagram.sequence.preferences.DestructionEventPreferencePage"

             name="DestructionEvent Node" />

 	
 		

 	<?gmfgen generated="true"?>

 	<page  	category="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLSequenceDiagram"

-			class="org.eclipse.papyrus.diagram.sequence.preferences.InteractionPreferencePage"

+			class="org.eclipse.papyrus.uml.diagram.sequence.preferences.InteractionPreferencePage"

             id="org.eclipse.papyrus.diagram.sequence.preferences.InteractionPreferencePage"

             name="Interaction Node" />

 	
 		

 	<?gmfgen generated="true"?>

 	<page  	category="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLSequenceDiagram"

-			class="org.eclipse.papyrus.diagram.sequence.preferences.DurationConstraintPreferencePage"

+			class="org.eclipse.papyrus.uml.diagram.sequence.preferences.DurationConstraintPreferencePage"

             id="org.eclipse.papyrus.diagram.sequence.preferences.DurationConstraintPreferencePage"

             name="DurationConstraint Node" />

 	
 		

 	<?gmfgen generated="true"?>

 	<page  	category="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLSequenceDiagram"

-			class="org.eclipse.papyrus.diagram.sequence.preferences.InteractionUsePreferencePage"

+			class="org.eclipse.papyrus.uml.diagram.sequence.preferences.InteractionUsePreferencePage"

             id="org.eclipse.papyrus.diagram.sequence.preferences.InteractionUsePreferencePage"

             name="InteractionUse Node" />

 	
 		

 	<?gmfgen generated="true"?>

 	<page  	category="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLSequenceDiagram"

-			class="org.eclipse.papyrus.diagram.sequence.preferences.ContinuationPreferencePage"

+			class="org.eclipse.papyrus.uml.diagram.sequence.preferences.ContinuationPreferencePage"

             id="org.eclipse.papyrus.diagram.sequence.preferences.ContinuationPreferencePage"

             name="Continuation Node" />

 	
 		

 	<?gmfgen generated="true"?>

 	<page  	category="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLSequenceDiagram"

-			class="org.eclipse.papyrus.diagram.sequence.preferences.ConsiderIgnoreFragmentPreferencePage"

+			class="org.eclipse.papyrus.uml.diagram.sequence.preferences.ConsiderIgnoreFragmentPreferencePage"

             id="org.eclipse.papyrus.diagram.sequence.preferences.ConsiderIgnoreFragmentPreferencePage"

             name="ConsiderIgnoreFragment Node" />

 	
 		

 	<?gmfgen generated="true"?>

 	<page  	category="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLSequenceDiagram"

-			class="org.eclipse.papyrus.diagram.sequence.preferences.DurationObservationPreferencePage"

+			class="org.eclipse.papyrus.uml.diagram.sequence.preferences.DurationObservationPreferencePage"

             id="org.eclipse.papyrus.diagram.sequence.preferences.DurationObservationPreferencePage"

             name="DurationObservation Node" />

 	
 		

 	<?gmfgen generated="true"?>

 	<page  	category="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLSequenceDiagram"

-			class="org.eclipse.papyrus.diagram.sequence.preferences.TimeConstraintPreferencePage"

+			class="org.eclipse.papyrus.uml.diagram.sequence.preferences.TimeConstraintPreferencePage"

             id="org.eclipse.papyrus.diagram.sequence.preferences.TimeConstraintPreferencePage"

             name="TimeConstraint Node" />

 	
 		

 	<?gmfgen generated="true"?>

 	<page  	category="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLSequenceDiagram"

-			class="org.eclipse.papyrus.diagram.sequence.preferences.LifelinePreferencePage"

+			class="org.eclipse.papyrus.uml.diagram.sequence.preferences.LifelinePreferencePage"

             id="org.eclipse.papyrus.diagram.sequence.preferences.LifelinePreferencePage"

             name="Lifeline Node" />

 	
 		

 	<?gmfgen generated="true"?>

 	<page  	category="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLSequenceDiagram"

-			class="org.eclipse.papyrus.diagram.sequence.preferences.BehaviorExecutionSpecificationPreferencePage"

+			class="org.eclipse.papyrus.uml.diagram.sequence.preferences.BehaviorExecutionSpecificationPreferencePage"

             id="org.eclipse.papyrus.diagram.sequence.preferences.BehaviorExecutionSpecificationPreferencePage"

             name="BehaviorExecutionSpecification Node" />

 	
@@ -902,7 +902,7 @@
 

 	<?gmfgen generated="true"?>

 	<page  	category="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLSequenceDiagram"

-			class="org.eclipse.papyrus.diagram.sequence.preferences.MessagePreferencePage"

+			class="org.eclipse.papyrus.uml.diagram.sequence.preferences.MessagePreferencePage"

             id="org.eclipse.papyrus.diagram.sequence.preferences.MessagePreferencePage"

             name="Message Link" />

 		

@@ -910,7 +910,7 @@
 

 	<?gmfgen generated="true"?>

 	<page  	category="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLSequenceDiagram"

-			class="org.eclipse.papyrus.diagram.sequence.preferences.GeneralOrderingPreferencePage"

+			class="org.eclipse.papyrus.uml.diagram.sequence.preferences.GeneralOrderingPreferencePage"

             id="org.eclipse.papyrus.diagram.sequence.preferences.GeneralOrderingPreferencePage"

             name="GeneralOrdering Link" />

 		

@@ -925,7 +925,7 @@
 		<paletteProvider class="org.eclipse.gmf.runtime.diagram.ui.providers.DefaultPaletteProvider">

 			<Priority name="Lowest"/>

       		<contribution

-            	factoryClass="org.eclipse.papyrus.diagram.sequence.part.UMLPaletteFactory">

+            	factoryClass="org.eclipse.papyrus.uml.diagram.sequence.part.UMLPaletteFactory">

      			<predefinedEntry id="standardGroup/noteStack/noteTool" remove="true"/> 

 				<predefinedEntry id="standardGroup/noteStack/textTool" remove="true"/> 

 				<predefinedEntry id="standardGroup/noteStack/noteattachmentTool" remove="true"/>

@@ -1204,7 +1204,7 @@
 		<paletteProvider class="org.eclipse.gmf.runtime.diagram.ui.providers.DefaultPaletteProvider">

 			<Priority name="Low"/>

       		<contribution

-            	factoryClass="org.eclipse.papyrus.diagram.sequence.part.UMLPaletteFactory">

+            	factoryClass="org.eclipse.papyrus.uml.diagram.sequence.part.UMLPaletteFactory">

      			<predefinedEntry id="standardGroup/noteStack/noteTool" remove="true"/> 

 				<predefinedEntry id="standardGroup/noteStack/textTool" remove="true"/> 

 				<predefinedEntry id="standardGroup/noteStack/noteattachmentTool" remove="true"/>

@@ -1351,7 +1351,7 @@
 <extension

       point="org.eclipse.gmf.runtime.emf.ui.modelingAssistantProviders">

    <modelingAssistantProvider

-         class="org.eclipse.papyrus.diagram.sequence.providers.UMLModelingAssistantProvider">

+         class="org.eclipse.papyrus.uml.diagram.sequence.providers.UMLModelingAssistantProvider">

       <Priority

             name="Lowest">

       </Priority>

@@ -1359,7 +1359,7 @@
 </extension>

 <extension point="org.eclipse.gmf.runtime.common.ui.services.markerNavigationProviders" id="markers-navigation">

       <?gmfgen generated="true"?>

-      <MarkerNavigationProvider class="org.eclipse.papyrus.diagram.sequence.providers.UMLMarkerNavigationProvider">

+      <MarkerNavigationProvider class="org.eclipse.papyrus.uml.diagram.sequence.providers.UMLMarkerNavigationProvider">

          <MarkerType name="org.eclipse.papyrus.diagram.sequence.diagnostic"/>

          <Priority name="Lowest"/>

       </MarkerNavigationProvider>

@@ -1386,7 +1386,7 @@
                   </constraints>

          <constraints categories="org.eclipse.uml2.uml.util.UMLValidator.validate/org.eclipse.papyrus.diagram.sequence.validation.FragmentOrderingKeeper">

                   <constraint id="FragmentOrderingKeeper.Interaction"

-            lang="Java" class="org.eclipse.papyrus.diagram.sequence.providers.UMLValidationProvider$Adapter1"

+            lang="Java" class="org.eclipse.papyrus.uml.diagram.sequence.providers.UMLValidationProvider$Adapter1"

             name="Interaction fragment ordering"

             mode="Live"

             severity="ERROR" statusCode="200">

@@ -1396,7 +1396,7 @@
             <target class="uml.Interaction"/>

          </constraint>

                   <constraint id="FragmentOrderingKeeper.InteractionOperand"

-            lang="Java" class="org.eclipse.papyrus.diagram.sequence.providers.UMLValidationProvider$Adapter2"

+            lang="Java" class="org.eclipse.papyrus.uml.diagram.sequence.providers.UMLValidationProvider$Adapter2"

             name="InteractionOperand fragment ordering"

             mode="Live"

             severity="ERROR" statusCode="200">

@@ -1406,7 +1406,7 @@
             <target class="uml.InteractionOperand"/>

          </constraint>

                   <constraint id="FragmentOrderingKeeper.LifelineFigure"

-            lang="Java" class="org.eclipse.papyrus.diagram.sequence.providers.UMLValidationProvider$Adapter3"

+            lang="Java" class="org.eclipse.papyrus.uml.diagram.sequence.providers.UMLValidationProvider$Adapter3"

             name="Fragment ordering"

             mode="Live"

             severity="ERROR" statusCode="200">

@@ -1424,7 +1424,7 @@
 <extension point="org.eclipse.emf.validation.constraintBindings">
       <?gmfgen generated="true"?>
       <clientContext default="false" id="org.eclipse.papyrus.diagram.sequenceDefaultCtx">
-         <selector class="org.eclipse.papyrus.diagram.sequence.providers.UMLValidationProvider$DefaultCtx"/>
+         <selector class="org.eclipse.papyrus.uml.diagram.sequence.providers.UMLValidationProvider$DefaultCtx"/>
       </clientContext>
       <binding context="org.eclipse.papyrus.diagram.sequenceDefaultCtx">
                   <constraint ref="org.eclipse.papyrus.diagram.sequence.FragmentOrderingKeeper.Interaction"/>
@@ -1432,7 +1432,7 @@
                </binding>
 
       <clientContext default="false" id="org.eclipse.papyrus.diagram.sequenceCtx_3001">
-         <selector class="org.eclipse.papyrus.diagram.sequence.providers.UMLValidationProvider$Ctx_3001"/>
+         <selector class="org.eclipse.papyrus.uml.diagram.sequence.providers.UMLValidationProvider$Ctx_3001"/>
       </clientContext>
       <binding context="org.eclipse.papyrus.diagram.sequenceCtx_3001">
                   <constraint ref="org.eclipse.papyrus.diagram.sequence.FragmentOrderingKeeper.LifelineFigure"/>
@@ -1441,7 +1441,7 @@
    </extension>
 <extension id="validationDecoratorProvider" name="ValidationDecorations" point="org.eclipse.gmf.runtime.diagram.ui.decoratorProviders">

       <?gmfgen generated="true"?>

-      <decoratorProvider class="org.eclipse.papyrus.diagram.sequence.providers.UMLValidationDecoratorProvider">

+      <decoratorProvider class="org.eclipse.papyrus.uml.diagram.sequence.providers.UMLValidationDecoratorProvider">

          <Priority name="Lowest"/>

          <object class="org.eclipse.gmf.runtime.diagram.ui.editparts.IPrimaryEditPart(org.eclipse.gmf.runtime.diagram.ui)" id="PRIMARY_VIEW"/>

          <context decoratorTargets="PRIMARY_VIEW"/>

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/Activator.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/Activator.java
index d13c7b48082..af8fc74988e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/Activator.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/Activator.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence;

+package org.eclipse.papyrus.uml.diagram.sequence;

 

 import org.eclipse.ui.plugin.AbstractUIPlugin;

 import org.osgi.framework.BundleContext;

@@ -22,7 +22,7 @@ import org.osgi.framework.BundleContext;
 public class Activator extends AbstractUIPlugin {

 

 	// The plug-in ID

-	public static final String PLUGIN_ID = "org.eclipse.papyrus.diagram.sequence";

+	public static final String PLUGIN_ID = "org.eclipse.papyrus.uml.diagram.sequence";

 

 	// The shared instance

 	private static Activator plugin;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/commands/ActionExecutionSpecificationCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/ActionExecutionSpecificationCreateCommand.java
index 122e93b0658..00c862129b9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/commands/ActionExecutionSpecificationCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/ActionExecutionSpecificationCreateCommand.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.commands;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -25,8 +25,8 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.sequence.util.CommandHelper;

-import org.eclipse.papyrus.diagram.sequence.util.SequenceRequestConstant;

+import org.eclipse.papyrus.uml.diagram.sequence.util.CommandHelper;

+import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceRequestConstant;

 import org.eclipse.uml2.uml.ActionExecutionSpecification;

 import org.eclipse.uml2.uml.Lifeline;

 import org.eclipse.uml2.uml.UMLFactory;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/commands/BehaviorExecutionSpecificationCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/BehaviorExecutionSpecificationCreateCommand.java
index 774f8ab65fb..ad214a22cd9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/commands/BehaviorExecutionSpecificationCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/BehaviorExecutionSpecificationCreateCommand.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.commands;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -25,8 +25,8 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.sequence.util.CommandHelper;

-import org.eclipse.papyrus.diagram.sequence.util.SequenceRequestConstant;

+import org.eclipse.papyrus.uml.diagram.sequence.util.CommandHelper;

+import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceRequestConstant;

 import org.eclipse.uml2.uml.BehaviorExecutionSpecification;

 import org.eclipse.uml2.uml.Lifeline;

 import org.eclipse.uml2.uml.UMLFactory;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/commands/CombinedFragment2CreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/CombinedFragment2CreateCommand.java
index 3b8aa4db58a..baa3cfae085 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/commands/CombinedFragment2CreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/CombinedFragment2CreateCommand.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.commands;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -25,8 +25,8 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.sequence.util.CommandHelper;

-import org.eclipse.papyrus.diagram.sequence.util.SequenceRequestConstant;

+import org.eclipse.papyrus.uml.diagram.sequence.util.CommandHelper;

+import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceRequestConstant;

 import org.eclipse.uml2.uml.CombinedFragment;

 import org.eclipse.uml2.uml.Lifeline;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/commands/CombinedFragmentCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/CombinedFragmentCreateCommand.java
index ecfe9893541..0ded32554e8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/commands/CombinedFragmentCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/CombinedFragmentCreateCommand.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.commands;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.commands;

 

 import java.util.Set;

 

@@ -27,8 +27,8 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.sequence.providers.ElementInitializers;

-import org.eclipse.papyrus.diagram.sequence.util.SequenceRequestConstant;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceRequestConstant;

 import org.eclipse.uml2.uml.CombinedFragment;

 import org.eclipse.uml2.uml.Interaction;

 import org.eclipse.uml2.uml.InteractionFragment;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/commands/CommentAnnotatedElementCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/CommentAnnotatedElementCreateCommand.java
index 88490b66717..cbe70f29b36 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/commands/CommentAnnotatedElementCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/CommentAnnotatedElementCreateCommand.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.commands;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -20,7 +20,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gmf.runtime.common.core.command.CommandResult;

 import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.UMLBaseItemSemanticEditPolicy;

 import org.eclipse.uml2.uml.Comment;

 import org.eclipse.uml2.uml.Element;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/commands/CommentAnnotatedElementReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/CommentAnnotatedElementReorientCommand.java
index 76b41075885..d64689f4783 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/commands/CommentAnnotatedElementReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/CommentAnnotatedElementReorientCommand.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.commands;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -21,7 +21,7 @@ import org.eclipse.gmf.runtime.common.core.command.CommandResult;
 import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.UMLBaseItemSemanticEditPolicy;

 import org.eclipse.uml2.uml.Comment;

 import org.eclipse.uml2.uml.Element;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/commands/CommentCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/CommentCreateCommand.java
index b01b16477e4..624f3d80a57 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/commands/CommentCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/CommentCreateCommand.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.commands;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -25,7 +25,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.sequence.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.ElementInitializers;

 import org.eclipse.uml2.uml.Comment;

 import org.eclipse.uml2.uml.Element;

 import org.eclipse.uml2.uml.UMLFactory;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/commands/ConsiderIgnoreFragmentCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/ConsiderIgnoreFragmentCreateCommand.java
index 5c964ab1c68..b4b036f425b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/commands/ConsiderIgnoreFragmentCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/ConsiderIgnoreFragmentCreateCommand.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.commands;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.commands;

 

 import java.util.Set;

 

@@ -27,8 +27,8 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.sequence.providers.ElementInitializers;

-import org.eclipse.papyrus.diagram.sequence.util.SequenceRequestConstant;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceRequestConstant;

 import org.eclipse.uml2.uml.ConsiderIgnoreFragment;

 import org.eclipse.uml2.uml.Interaction;

 import org.eclipse.uml2.uml.InteractionFragment;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/commands/ConstraintConstrainedElementCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/ConstraintConstrainedElementCreateCommand.java
index 2f09caa01fc..f8fcc68e626 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/commands/ConstraintConstrainedElementCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/ConstraintConstrainedElementCreateCommand.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.commands;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -20,7 +20,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gmf.runtime.common.core.command.CommandResult;

 import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.UMLBaseItemSemanticEditPolicy;

 import org.eclipse.uml2.uml.Constraint;

 import org.eclipse.uml2.uml.Element;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/commands/ConstraintConstrainedElementReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/ConstraintConstrainedElementReorientCommand.java
index 12d06b06bd6..55252c71e2e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/commands/ConstraintConstrainedElementReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/ConstraintConstrainedElementReorientCommand.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.commands;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -21,7 +21,7 @@ import org.eclipse.gmf.runtime.common.core.command.CommandResult;
 import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.UMLBaseItemSemanticEditPolicy;

 import org.eclipse.uml2.uml.Constraint;

 import org.eclipse.uml2.uml.Element;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/commands/ConstraintCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/ConstraintCreateCommand.java
index 7ed789acd77..5b54a704d99 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/commands/ConstraintCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/ConstraintCreateCommand.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.commands;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -25,7 +25,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.sequence.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.ElementInitializers;

 import org.eclipse.uml2.uml.Constraint;

 import org.eclipse.uml2.uml.Namespace;

 import org.eclipse.uml2.uml.UMLFactory;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/commands/ContinuationCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/ContinuationCreateCommand.java
index e7435cf908e..5ff80b55489 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/commands/ContinuationCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/ContinuationCreateCommand.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.commands;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -25,7 +25,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.sequence.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.ElementInitializers;

 import org.eclipse.uml2.uml.CombinedFragment;

 import org.eclipse.uml2.uml.Continuation;

 import org.eclipse.uml2.uml.InteractionFragment;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/commands/DestructionEventCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/DestructionEventCreateCommand.java
index 4018b0f555a..1c3c9d2a554 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/commands/DestructionEventCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/DestructionEventCreateCommand.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.commands;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -25,9 +25,9 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.sequence.providers.ElementInitializers;

-import org.eclipse.papyrus.diagram.sequence.util.CommandHelper;

-import org.eclipse.papyrus.diagram.sequence.util.SequenceRequestConstant;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.sequence.util.CommandHelper;

+import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceRequestConstant;

 import org.eclipse.uml2.uml.DestructionEvent;

 import org.eclipse.uml2.uml.InteractionFragment;

 import org.eclipse.uml2.uml.Lifeline;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/commands/DurationConstraintCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/DurationConstraintCreateCommand.java
index 82406ad90f1..937454dbd21 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/commands/DurationConstraintCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/DurationConstraintCreateCommand.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.commands;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.commands;

 

 import java.util.Collections;

 import java.util.List;

@@ -28,10 +28,10 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.helper.DurationConstraintHelper;

-import org.eclipse.papyrus.diagram.sequence.providers.ElementInitializers;

-import org.eclipse.papyrus.diagram.sequence.util.SequenceRequestConstant;

-import org.eclipse.papyrus.diagram.sequence.util.SequenceUtil;

+import org.eclipse.papyrus.uml.diagram.common.helper.DurationConstraintHelper;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceRequestConstant;

+import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceUtil;

 import org.eclipse.uml2.uml.DurationConstraint;

 import org.eclipse.uml2.uml.Namespace;

 import org.eclipse.uml2.uml.OccurrenceSpecification;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/commands/DurationConstraintInMessageCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/DurationConstraintInMessageCreateCommand.java
index e06c8d2dbc9..60ff4394c77 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/commands/DurationConstraintInMessageCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/DurationConstraintInMessageCreateCommand.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.commands;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -25,7 +25,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.sequence.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.ElementInitializers;

 import org.eclipse.uml2.uml.DurationConstraint;

 import org.eclipse.uml2.uml.Namespace;

 import org.eclipse.uml2.uml.UMLFactory;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/commands/DurationObservationCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/DurationObservationCreateCommand.java
index e31bceaf1a3..39687ee20d3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/commands/DurationObservationCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/DurationObservationCreateCommand.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.commands;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.commands;

 

 import java.util.Collections;

 import java.util.List;

@@ -28,10 +28,10 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.helper.DurationObservationHelper;

-import org.eclipse.papyrus.diagram.sequence.providers.ElementInitializers;

-import org.eclipse.papyrus.diagram.sequence.util.SequenceRequestConstant;

-import org.eclipse.papyrus.diagram.sequence.util.SequenceUtil;

+import org.eclipse.papyrus.uml.diagram.common.helper.DurationObservationHelper;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceRequestConstant;

+import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceUtil;

 import org.eclipse.uml2.uml.DurationObservation;

 import org.eclipse.uml2.uml.Message;

 import org.eclipse.uml2.uml.MessageOccurrenceSpecification;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/commands/GeneralOrderingCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/GeneralOrderingCreateCommand.java
index b7a704d62a9..c059e76283c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/commands/GeneralOrderingCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/GeneralOrderingCreateCommand.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.sequence.edit.commands;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.commands;

 

 import java.util.Collections;

 import java.util.List;

@@ -14,10 +14,10 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.providers.ElementInitializers;

-import org.eclipse.papyrus.diagram.sequence.util.SequenceRequestConstant;

-import org.eclipse.papyrus.diagram.sequence.util.SequenceUtil;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceRequestConstant;

+import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceUtil;

 import org.eclipse.uml2.uml.GeneralOrdering;

 import org.eclipse.uml2.uml.InteractionFragment;

 import org.eclipse.uml2.uml.OccurrenceSpecification;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/commands/GeneralOrderingReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/GeneralOrderingReorientCommand.java
index 1cbf5fb3da1..2fad8bf5376 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/commands/GeneralOrderingReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/GeneralOrderingReorientCommand.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.sequence.edit.commands;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -7,7 +7,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gmf.runtime.common.core.command.CommandResult;

 import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.UMLBaseItemSemanticEditPolicy;

 import org.eclipse.uml2.uml.GeneralOrdering;

 import org.eclipse.uml2.uml.InteractionFragment;

 import org.eclipse.uml2.uml.OccurrenceSpecification;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/commands/InteractionCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/InteractionCreateCommand.java
index 16c8676efac..c8f3ae702b6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/commands/InteractionCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/InteractionCreateCommand.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.commands;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -25,7 +25,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.sequence.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.ElementInitializers;

 import org.eclipse.uml2.uml.BehavioredClassifier;

 import org.eclipse.uml2.uml.Interaction;

 import org.eclipse.uml2.uml.Package;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/commands/InteractionOperandCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/InteractionOperandCreateCommand.java
index daab0449d7e..36b3dde8bfb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/commands/InteractionOperandCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/InteractionOperandCreateCommand.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.commands;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.commands;

 

 import java.util.Set;

 

@@ -28,8 +28,8 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.sequence.providers.ElementInitializers;

-import org.eclipse.papyrus.diagram.sequence.util.SequenceRequestConstant;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceRequestConstant;

 import org.eclipse.uml2.uml.CombinedFragment;

 import org.eclipse.uml2.uml.InteractionConstraint;

 import org.eclipse.uml2.uml.InteractionFragment;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/commands/InteractionUseCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/InteractionUseCreateCommand.java
index cbbd1f06ecb..f2f53ed3701 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/commands/InteractionUseCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/InteractionUseCreateCommand.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.commands;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -25,7 +25,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.sequence.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.ElementInitializers;

 import org.eclipse.uml2.uml.Interaction;

 import org.eclipse.uml2.uml.InteractionOperand;

 import org.eclipse.uml2.uml.InteractionUse;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/commands/LifelineCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/LifelineCreateCommand.java
index c0a260f7049..d80d8c34aa0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/commands/LifelineCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/LifelineCreateCommand.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.commands;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.commands;

 

 import java.util.List;

 

@@ -27,8 +27,8 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.sequence.providers.ElementInitializers;

-import org.eclipse.papyrus.diagram.sequence.util.CommandHelper;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.sequence.util.CommandHelper;

 import org.eclipse.uml2.uml.Interaction;

 import org.eclipse.uml2.uml.InteractionFragment;

 import org.eclipse.uml2.uml.InteractionOperand;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/commands/Message2CreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/Message2CreateCommand.java
index ab1a8e91760..b3799fa4a64 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/commands/Message2CreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/Message2CreateCommand.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.commands;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.commands;

 

 import java.util.Map;

 

@@ -26,8 +26,8 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.util.CommandHelper;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.util.CommandHelper;

 import org.eclipse.uml2.uml.Element;

 import org.eclipse.uml2.uml.Interaction;

 import org.eclipse.uml2.uml.Message;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/commands/Message2ReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/Message2ReorientCommand.java
index 89628ac5b0c..c5cc3688a8b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/commands/Message2ReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/Message2ReorientCommand.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.commands;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -20,8 +20,8 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gmf.runtime.common.core.command.CommandResult;

 import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.util.ReconnectMessageHelper;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.util.ReconnectMessageHelper;

 import org.eclipse.uml2.uml.Element;

 import org.eclipse.uml2.uml.Interaction;

 import org.eclipse.uml2.uml.Message;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/commands/Message3CreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/Message3CreateCommand.java
index ce3dd8814f9..11eae7d7cdc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/commands/Message3CreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/Message3CreateCommand.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.commands;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -24,9 +24,9 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.util.CommandHelper;

-import org.eclipse.papyrus.diagram.sequence.util.SequenceRequestConstant;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.util.CommandHelper;

+import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceRequestConstant;

 import org.eclipse.uml2.uml.Element;

 import org.eclipse.uml2.uml.Interaction;

 import org.eclipse.uml2.uml.InteractionFragment;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/commands/Message3ReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/Message3ReorientCommand.java
index c346497318d..eb3f866f7e8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/commands/Message3ReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/Message3ReorientCommand.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.commands;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -20,8 +20,8 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gmf.runtime.common.core.command.CommandResult;

 import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.util.ReconnectMessageHelper;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.util.ReconnectMessageHelper;

 import org.eclipse.uml2.uml.Element;

 import org.eclipse.uml2.uml.Interaction;

 import org.eclipse.uml2.uml.Message;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/commands/Message4CreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/Message4CreateCommand.java
index a8f5ed65875..773207b32e7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/commands/Message4CreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/Message4CreateCommand.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.commands;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -24,9 +24,9 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.util.CommandHelper;

-import org.eclipse.papyrus.diagram.sequence.util.SequenceRequestConstant;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.util.CommandHelper;

+import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceRequestConstant;

 import org.eclipse.uml2.uml.Element;

 import org.eclipse.uml2.uml.Interaction;

 import org.eclipse.uml2.uml.InteractionFragment;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/commands/Message4ReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/Message4ReorientCommand.java
index 2b84abdd125..99ec7ba3497 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/commands/Message4ReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/Message4ReorientCommand.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.commands;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -20,8 +20,8 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gmf.runtime.common.core.command.CommandResult;

 import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.util.ReconnectMessageHelper;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.util.ReconnectMessageHelper;

 import org.eclipse.uml2.uml.Element;

 import org.eclipse.uml2.uml.Interaction;

 import org.eclipse.uml2.uml.Message;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/commands/Message5CreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/Message5CreateCommand.java
index 52f9134c933..f35fde29d30 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/commands/Message5CreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/Message5CreateCommand.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.commands;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.commands;

 

 import java.util.Collection;

 

@@ -28,10 +28,10 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.papyrus.diagram.common.commands.EObjectInheritanceCopyCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.util.CommandHelper;

-import org.eclipse.papyrus.diagram.sequence.util.SequenceRequestConstant;

+import org.eclipse.papyrus.uml.diagram.common.commands.EObjectInheritanceCopyCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.util.CommandHelper;

+import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceRequestConstant;

 import org.eclipse.uml2.uml.DestructionEvent;

 import org.eclipse.uml2.uml.Element;

 import org.eclipse.uml2.uml.Interaction;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/commands/Message5ReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/Message5ReorientCommand.java
index a38ed5b413a..8eda001f848 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/commands/Message5ReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/Message5ReorientCommand.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.commands;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -20,8 +20,8 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gmf.runtime.common.core.command.CommandResult;

 import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.util.ReconnectMessageHelper;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.util.ReconnectMessageHelper;

 import org.eclipse.uml2.uml.Element;

 import org.eclipse.uml2.uml.Interaction;

 import org.eclipse.uml2.uml.Message;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/commands/Message6CreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/Message6CreateCommand.java
index 6359e75497e..17967b2fb0d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/commands/Message6CreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/Message6CreateCommand.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.commands;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -24,9 +24,9 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.util.CommandHelper;

-import org.eclipse.papyrus.diagram.sequence.util.SequenceRequestConstant;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.util.CommandHelper;

+import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceRequestConstant;

 import org.eclipse.uml2.uml.Element;

 import org.eclipse.uml2.uml.Interaction;

 import org.eclipse.uml2.uml.InteractionFragment;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/commands/Message6ReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/Message6ReorientCommand.java
index 2a0ecea84de..9460f3f796a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/commands/Message6ReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/Message6ReorientCommand.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.commands;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -20,7 +20,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gmf.runtime.common.core.command.CommandResult;

 import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.UMLBaseItemSemanticEditPolicy;

 import org.eclipse.uml2.uml.Element;

 import org.eclipse.uml2.uml.Interaction;

 import org.eclipse.uml2.uml.Message;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/commands/Message7CreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/Message7CreateCommand.java
index cca69bb501e..d0ac59f1435 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/commands/Message7CreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/Message7CreateCommand.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.commands;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -24,9 +24,9 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.util.CommandHelper;

-import org.eclipse.papyrus.diagram.sequence.util.SequenceRequestConstant;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.util.CommandHelper;

+import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceRequestConstant;

 import org.eclipse.uml2.uml.Element;

 import org.eclipse.uml2.uml.Interaction;

 import org.eclipse.uml2.uml.InteractionFragment;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/commands/Message7ReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/Message7ReorientCommand.java
index 5b07eedd49c..b6c15c53d9f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/commands/Message7ReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/Message7ReorientCommand.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.commands;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -20,7 +20,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gmf.runtime.common.core.command.CommandResult;

 import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.UMLBaseItemSemanticEditPolicy;

 import org.eclipse.uml2.uml.Element;

 import org.eclipse.uml2.uml.Interaction;

 import org.eclipse.uml2.uml.Message;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/commands/MessageCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/MessageCreateCommand.java
index 76c4a8f2ea9..5e62881f04e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/commands/MessageCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/MessageCreateCommand.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.commands;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -24,9 +24,9 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.util.CommandHelper;

-import org.eclipse.papyrus.diagram.sequence.util.SequenceRequestConstant;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.util.CommandHelper;

+import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceRequestConstant;

 import org.eclipse.uml2.uml.Element;

 import org.eclipse.uml2.uml.Interaction;

 import org.eclipse.uml2.uml.InteractionFragment;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/commands/MessageReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/MessageReorientCommand.java
index 4052cc2d99c..607273eccf5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/commands/MessageReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/MessageReorientCommand.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.commands;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -20,8 +20,8 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gmf.runtime.common.core.command.CommandResult;

 import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.util.ReconnectMessageHelper;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.util.ReconnectMessageHelper;

 import org.eclipse.uml2.uml.Element;

 import org.eclipse.uml2.uml.Interaction;

 import org.eclipse.uml2.uml.Message;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/commands/StateInvariantCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/StateInvariantCreateCommand.java
index db81cd982f6..d854ca44a1f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/commands/StateInvariantCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/StateInvariantCreateCommand.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.commands;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -25,8 +25,8 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.sequence.util.CommandHelper;

-import org.eclipse.papyrus.diagram.sequence.util.SequenceRequestConstant;

+import org.eclipse.papyrus.uml.diagram.sequence.util.CommandHelper;

+import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceRequestConstant;

 import org.eclipse.uml2.uml.Lifeline;

 import org.eclipse.uml2.uml.StateInvariant;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/commands/TimeConstraintCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/TimeConstraintCreateCommand.java
index 757ab295601..abfb16990fa 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/commands/TimeConstraintCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/TimeConstraintCreateCommand.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.commands;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.commands;

 

 import java.util.List;

 

@@ -27,9 +27,9 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.sequence.providers.ElementInitializers;

-import org.eclipse.papyrus.diagram.sequence.util.SequenceRequestConstant;

-import org.eclipse.papyrus.diagram.sequence.util.SequenceUtil;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceRequestConstant;

+import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceUtil;

 import org.eclipse.uml2.uml.Message;

 import org.eclipse.uml2.uml.MessageOccurrenceSpecification;

 import org.eclipse.uml2.uml.MessageSort;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/commands/TimeObservationCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/TimeObservationCreateCommand.java
index 2e2d54d0e93..3be5979a50e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/commands/TimeObservationCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/TimeObservationCreateCommand.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.commands;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.commands;

 

 import java.util.List;

 

@@ -27,9 +27,9 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.sequence.providers.ElementInitializers;

-import org.eclipse.papyrus.diagram.sequence.util.SequenceRequestConstant;

-import org.eclipse.papyrus.diagram.sequence.util.SequenceUtil;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceRequestConstant;

+import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceUtil;

 import org.eclipse.uml2.uml.Message;

 import org.eclipse.uml2.uml.MessageOccurrenceSpecification;

 import org.eclipse.uml2.uml.MessageSort;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/commands/UMLReorientConnectionViewCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/UMLReorientConnectionViewCommand.java
index 20fd1f80c48..91a4bc44e46 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/commands/UMLReorientConnectionViewCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/UMLReorientConnectionViewCommand.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.commands;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.commands;

 

 import java.util.List;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/helpers/ActionExecutionSpecificationEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/helpers/ActionExecutionSpecificationEditHelper.java
index 8a4d022903b..1f7e2033b0f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/helpers/ActionExecutionSpecificationEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/helpers/ActionExecutionSpecificationEditHelper.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.helpers;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/helpers/BehaviorExecutionSpecificationEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/helpers/BehaviorExecutionSpecificationEditHelper.java
index 52f9c335fc8..632e5169635 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/helpers/BehaviorExecutionSpecificationEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/helpers/BehaviorExecutionSpecificationEditHelper.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.helpers;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/helpers/CombinedFragmentEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/helpers/CombinedFragmentEditHelper.java
index a2f1fe156f2..bd95d17d287 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/helpers/CombinedFragmentEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/helpers/CombinedFragmentEditHelper.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.helpers;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/helpers/CommentEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/helpers/CommentEditHelper.java
index 31c4e8be981..14b0ed26794 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/helpers/CommentEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/helpers/CommentEditHelper.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.helpers;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/helpers/ConsiderIgnoreFragmentEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/helpers/ConsiderIgnoreFragmentEditHelper.java
index 4723353d435..820de4da51d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/helpers/ConsiderIgnoreFragmentEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/helpers/ConsiderIgnoreFragmentEditHelper.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.helpers;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/helpers/ConstraintEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/helpers/ConstraintEditHelper.java
index cbe794ca683..146c842b412 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/helpers/ConstraintEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/helpers/ConstraintEditHelper.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.helpers;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/helpers/ContinuationEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/helpers/ContinuationEditHelper.java
index 4c7fd42fb7a..beb13efa889 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/helpers/ContinuationEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/helpers/ContinuationEditHelper.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.helpers;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/helpers/DestructionEventEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/helpers/DestructionEventEditHelper.java
index 03ce2e33ba2..89f03153df4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/helpers/DestructionEventEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/helpers/DestructionEventEditHelper.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.helpers;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/helpers/DurationConstraintEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/helpers/DurationConstraintEditHelper.java
index 0648c366197..bfc2643c00c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/helpers/DurationConstraintEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/helpers/DurationConstraintEditHelper.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.helpers;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/helpers/DurationConstraintInMessageEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/helpers/DurationConstraintInMessageEditHelper.java
index 9448fc973cd..925b55aa640 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/helpers/DurationConstraintInMessageEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/helpers/DurationConstraintInMessageEditHelper.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.helpers;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/helpers/DurationObservationEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/helpers/DurationObservationEditHelper.java
index f8eb5f76971..63c6e4e092b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/helpers/DurationObservationEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/helpers/DurationObservationEditHelper.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.helpers;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/helpers/GeneralOrderingEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/helpers/GeneralOrderingEditHelper.java
index ac0995cd087..2d5b1e6efe1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/helpers/GeneralOrderingEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/helpers/GeneralOrderingEditHelper.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.sequence.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.helpers;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/helpers/InteractionEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/helpers/InteractionEditHelper.java
index c35704a11a4..9859e4b0b9c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/helpers/InteractionEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/helpers/InteractionEditHelper.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.helpers;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/helpers/InteractionOperandEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/helpers/InteractionOperandEditHelper.java
index ab1054435bf..a4e911c7042 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/helpers/InteractionOperandEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/helpers/InteractionOperandEditHelper.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.helpers;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/helpers/InteractionUseEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/helpers/InteractionUseEditHelper.java
index fdf5fabb50b..df0a5499ac6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/helpers/InteractionUseEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/helpers/InteractionUseEditHelper.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.helpers;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/helpers/LifelineEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/helpers/LifelineEditHelper.java
index aedc625480b..96b9be45a9e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/helpers/LifelineEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/helpers/LifelineEditHelper.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.helpers;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/helpers/MessageEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/helpers/MessageEditHelper.java
index 60e48dbce5c..de5e06b32c7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/helpers/MessageEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/helpers/MessageEditHelper.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.helpers;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/helpers/MessageOccurrenceSpecificationEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/helpers/MessageOccurrenceSpecificationEditHelper.java
index 860ae607d70..8dc9947252d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/helpers/MessageOccurrenceSpecificationEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/helpers/MessageOccurrenceSpecificationEditHelper.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.helpers;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/helpers/PackageEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/helpers/PackageEditHelper.java
index 105e97cb96e..71336a0a8a5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/helpers/PackageEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/helpers/PackageEditHelper.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.helpers;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/helpers/StateInvariantEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/helpers/StateInvariantEditHelper.java
index e65caa362a4..f33dc2536d6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/helpers/StateInvariantEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/helpers/StateInvariantEditHelper.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.helpers;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/helpers/TimeConstraintEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/helpers/TimeConstraintEditHelper.java
index 0c9ddb0645b..3991142022f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/helpers/TimeConstraintEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/helpers/TimeConstraintEditHelper.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.helpers;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/helpers/TimeObservationEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/helpers/TimeObservationEditHelper.java
index d03cc6a7e5b..418bc5d6a01 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/helpers/TimeObservationEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/helpers/TimeObservationEditHelper.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.helpers;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/helpers/UMLBaseEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/helpers/UMLBaseEditHelper.java
index 2d31bce83de..88d30b19638 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/helpers/UMLBaseEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/helpers/UMLBaseEditHelper.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.helpers;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;

@@ -25,7 +25,7 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

-import org.eclipse.papyrus.diagram.common.commands.UnapplyAllStereotypesCommand;

+import org.eclipse.papyrus.uml.diagram.common.commands.UnapplyAllStereotypesCommand;

 import org.eclipse.uml2.uml.Element;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/ActionExecutionSpecificationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/ActionExecutionSpecificationEditPart.java
index 1030c08afa6..eae9980f1f9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/ActionExecutionSpecificationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/ActionExecutionSpecificationEditPart.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.parts;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.parts;

 

 import java.util.ArrayList;

 import java.util.LinkedList;

@@ -49,13 +49,13 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.common.draw2d.anchors.FixedAnchor;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.ActionExecutionSpecificationItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.ElementCreationWithMessageEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.ExecutionSpecificationComponentEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.common.draw2d.anchors.FixedAnchor;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.ActionExecutionSpecificationItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.ElementCreationWithMessageEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.ExecutionSpecificationComponentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

 import org.eclipse.swt.graphics.Color;

 

 /**

@@ -286,7 +286,7 @@ ShapeNodeEditPart {
 		if(targetEditPart instanceof LifelineEditPart) {

 			types.add(UMLElementTypes.Message_4003);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.ActionExecutionSpecificationEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ActionExecutionSpecificationEditPart) {

 			types.add(UMLElementTypes.Message_4003);

 		}

 		if(targetEditPart instanceof BehaviorExecutionSpecificationEditPart) {

@@ -343,7 +343,7 @@ ShapeNodeEditPart {
 		if(targetEditPart instanceof LifelineEditPart) {

 			types.add(UMLElementTypes.Message_4004);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.ActionExecutionSpecificationEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ActionExecutionSpecificationEditPart) {

 			types.add(UMLElementTypes.Message_4004);

 		}

 		if(targetEditPart instanceof BehaviorExecutionSpecificationEditPart) {

@@ -400,7 +400,7 @@ ShapeNodeEditPart {
 		if(targetEditPart instanceof LifelineEditPart) {

 			types.add(UMLElementTypes.Message_4005);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.ActionExecutionSpecificationEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ActionExecutionSpecificationEditPart) {

 			types.add(UMLElementTypes.Message_4005);

 		}

 		if(targetEditPart instanceof BehaviorExecutionSpecificationEditPart) {

@@ -457,7 +457,7 @@ ShapeNodeEditPart {
 		if(targetEditPart instanceof LifelineEditPart) {

 			types.add(UMLElementTypes.Message_4006);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.ActionExecutionSpecificationEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ActionExecutionSpecificationEditPart) {

 			types.add(UMLElementTypes.Message_4006);

 		}

 		if(targetEditPart instanceof BehaviorExecutionSpecificationEditPart) {

@@ -514,7 +514,7 @@ ShapeNodeEditPart {
 		if(targetEditPart instanceof LifelineEditPart) {

 			types.add(UMLElementTypes.Message_4007);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.ActionExecutionSpecificationEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ActionExecutionSpecificationEditPart) {

 			types.add(UMLElementTypes.Message_4007);

 		}

 		if(targetEditPart instanceof BehaviorExecutionSpecificationEditPart) {

@@ -571,7 +571,7 @@ ShapeNodeEditPart {
 		if(targetEditPart instanceof LifelineEditPart) {

 			types.add(UMLElementTypes.Message_4008);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.ActionExecutionSpecificationEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ActionExecutionSpecificationEditPart) {

 			types.add(UMLElementTypes.Message_4008);

 		}

 		if(targetEditPart instanceof BehaviorExecutionSpecificationEditPart) {

@@ -628,7 +628,7 @@ ShapeNodeEditPart {
 		if(targetEditPart instanceof LifelineEditPart) {

 			types.add(UMLElementTypes.Message_4009);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.ActionExecutionSpecificationEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ActionExecutionSpecificationEditPart) {

 			types.add(UMLElementTypes.Message_4009);

 		}

 		if(targetEditPart instanceof BehaviorExecutionSpecificationEditPart) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/ActionExecutionSpecificationNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/ActionExecutionSpecificationNameEditPart.java
index 33bbf3e6f34..13623fdcae3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/ActionExecutionSpecificationNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/ActionExecutionSpecificationNameEditPart.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.parts;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.parts;

 

 import java.util.ArrayList;

 import java.util.Collections;

@@ -55,17 +55,17 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -324,7 +324,7 @@ public class ActionExecutionSpecificationNameEditPart extends CompartmentEditPar
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.ActionExecutionSpecification_3006, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.sequence.edit.parts.ActionExecutionSpecificationNameEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.ActionExecutionSpecification_3006, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ActionExecutionSpecificationNameEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -560,7 +560,7 @@ public class ActionExecutionSpecificationNameEditPart extends CompartmentEditPar
 	 * Returns the kind of associated editor for direct edition.

 	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see

-	 *         org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 *         org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/BehaviorExecutionSpecificationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/BehaviorExecutionSpecificationEditPart.java
index 91702325fd0..ab5630d1299 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/BehaviorExecutionSpecificationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/BehaviorExecutionSpecificationEditPart.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.parts;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.parts;

 

 import java.util.ArrayList;

 import java.util.LinkedList;

@@ -49,13 +49,13 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.common.draw2d.anchors.FixedAnchor;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.BehaviorExecutionSpecificationItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.ElementCreationWithMessageEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.ExecutionSpecificationComponentEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.common.draw2d.anchors.FixedAnchor;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.BehaviorExecutionSpecificationItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.ElementCreationWithMessageEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.ExecutionSpecificationComponentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

 import org.eclipse.swt.graphics.Color;

 

 /**

@@ -287,7 +287,7 @@ public class BehaviorExecutionSpecificationEditPart extends ShapeNodeEditPart {
 		if(targetEditPart instanceof ActionExecutionSpecificationEditPart) {

 			types.add(UMLElementTypes.Message_4003);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.BehaviorExecutionSpecificationEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.BehaviorExecutionSpecificationEditPart) {

 			types.add(UMLElementTypes.Message_4003);

 		}

 		if(targetEditPart instanceof StateInvariantEditPart) {

@@ -344,7 +344,7 @@ public class BehaviorExecutionSpecificationEditPart extends ShapeNodeEditPart {
 		if(targetEditPart instanceof ActionExecutionSpecificationEditPart) {

 			types.add(UMLElementTypes.Message_4004);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.BehaviorExecutionSpecificationEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.BehaviorExecutionSpecificationEditPart) {

 			types.add(UMLElementTypes.Message_4004);

 		}

 		if(targetEditPart instanceof StateInvariantEditPart) {

@@ -401,7 +401,7 @@ public class BehaviorExecutionSpecificationEditPart extends ShapeNodeEditPart {
 		if(targetEditPart instanceof ActionExecutionSpecificationEditPart) {

 			types.add(UMLElementTypes.Message_4005);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.BehaviorExecutionSpecificationEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.BehaviorExecutionSpecificationEditPart) {

 			types.add(UMLElementTypes.Message_4005);

 		}

 		if(targetEditPart instanceof StateInvariantEditPart) {

@@ -458,7 +458,7 @@ public class BehaviorExecutionSpecificationEditPart extends ShapeNodeEditPart {
 		if(targetEditPart instanceof ActionExecutionSpecificationEditPart) {

 			types.add(UMLElementTypes.Message_4006);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.BehaviorExecutionSpecificationEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.BehaviorExecutionSpecificationEditPart) {

 			types.add(UMLElementTypes.Message_4006);

 		}

 		if(targetEditPart instanceof StateInvariantEditPart) {

@@ -515,7 +515,7 @@ public class BehaviorExecutionSpecificationEditPart extends ShapeNodeEditPart {
 		if(targetEditPart instanceof ActionExecutionSpecificationEditPart) {

 			types.add(UMLElementTypes.Message_4007);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.BehaviorExecutionSpecificationEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.BehaviorExecutionSpecificationEditPart) {

 			types.add(UMLElementTypes.Message_4007);

 		}

 		if(targetEditPart instanceof StateInvariantEditPart) {

@@ -572,7 +572,7 @@ public class BehaviorExecutionSpecificationEditPart extends ShapeNodeEditPart {
 		if(targetEditPart instanceof ActionExecutionSpecificationEditPart) {

 			types.add(UMLElementTypes.Message_4008);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.BehaviorExecutionSpecificationEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.BehaviorExecutionSpecificationEditPart) {

 			types.add(UMLElementTypes.Message_4008);

 		}

 		if(targetEditPart instanceof StateInvariantEditPart) {

@@ -629,7 +629,7 @@ public class BehaviorExecutionSpecificationEditPart extends ShapeNodeEditPart {
 		if(targetEditPart instanceof ActionExecutionSpecificationEditPart) {

 			types.add(UMLElementTypes.Message_4009);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.BehaviorExecutionSpecificationEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.BehaviorExecutionSpecificationEditPart) {

 			types.add(UMLElementTypes.Message_4009);

 		}

 		if(targetEditPart instanceof StateInvariantEditPart) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/CombinedFragment2EditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CombinedFragment2EditPart.java
index 514bf3ba866..9bf8610cbe8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/CombinedFragment2EditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CombinedFragment2EditPart.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.parts;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.parts;

 

 import java.util.ArrayList;

 import java.util.LinkedList;

@@ -39,14 +39,14 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.common.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.CombinedFragment2ItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.LifelineChildGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.figures.CoRegionCombinedFragmentFigure;

-import org.eclipse.papyrus.diagram.sequence.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.CombinedFragment2ItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.LifelineChildGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.figures.CoRegionCombinedFragmentFigure;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

 import org.eclipse.swt.graphics.Color;

 import org.eclipse.uml2.uml.Lifeline;

 

@@ -259,7 +259,7 @@ ShapeNodeEditPart {
 		if(targetEditPart instanceof StateInvariantEditPart) {

 			types.add(UMLElementTypes.Message_4003);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.CombinedFragment2EditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragment2EditPart) {

 			types.add(UMLElementTypes.Message_4003);

 		}

 		if(targetEditPart instanceof TimeConstraintEditPart) {

@@ -316,7 +316,7 @@ ShapeNodeEditPart {
 		if(targetEditPart instanceof StateInvariantEditPart) {

 			types.add(UMLElementTypes.Message_4004);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.CombinedFragment2EditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragment2EditPart) {

 			types.add(UMLElementTypes.Message_4004);

 		}

 		if(targetEditPart instanceof TimeConstraintEditPart) {

@@ -373,7 +373,7 @@ ShapeNodeEditPart {
 		if(targetEditPart instanceof StateInvariantEditPart) {

 			types.add(UMLElementTypes.Message_4005);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.CombinedFragment2EditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragment2EditPart) {

 			types.add(UMLElementTypes.Message_4005);

 		}

 		if(targetEditPart instanceof TimeConstraintEditPart) {

@@ -430,7 +430,7 @@ ShapeNodeEditPart {
 		if(targetEditPart instanceof StateInvariantEditPart) {

 			types.add(UMLElementTypes.Message_4006);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.CombinedFragment2EditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragment2EditPart) {

 			types.add(UMLElementTypes.Message_4006);

 		}

 		if(targetEditPart instanceof TimeConstraintEditPart) {

@@ -487,7 +487,7 @@ ShapeNodeEditPart {
 		if(targetEditPart instanceof StateInvariantEditPart) {

 			types.add(UMLElementTypes.Message_4007);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.CombinedFragment2EditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragment2EditPart) {

 			types.add(UMLElementTypes.Message_4007);

 		}

 		if(targetEditPart instanceof TimeConstraintEditPart) {

@@ -544,7 +544,7 @@ ShapeNodeEditPart {
 		if(targetEditPart instanceof StateInvariantEditPart) {

 			types.add(UMLElementTypes.Message_4008);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.CombinedFragment2EditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragment2EditPart) {

 			types.add(UMLElementTypes.Message_4008);

 		}

 		if(targetEditPart instanceof TimeConstraintEditPart) {

@@ -601,7 +601,7 @@ ShapeNodeEditPart {
 		if(targetEditPart instanceof StateInvariantEditPart) {

 			types.add(UMLElementTypes.Message_4009);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.CombinedFragment2EditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragment2EditPart) {

 			types.add(UMLElementTypes.Message_4009);

 		}

 		if(targetEditPart instanceof TimeConstraintEditPart) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/CombinedFragmentCombinedFragmentCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CombinedFragmentCombinedFragmentCompartmentEditPart.java
index 859f4153623..7c6f66b584e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/CombinedFragmentCombinedFragmentCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CombinedFragmentCombinedFragmentCompartmentEditPart.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.parts;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.parts;

 

 import java.util.List;

 

@@ -32,10 +32,10 @@ import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.editpolicies.DuplicatePasteEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.CombinedFragmentCombinedFragmentCompartmentItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.diagram.sequence.part.Messages;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.CombinedFragmentCombinedFragmentCompartmentItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.part.Messages;

 

 /**

  * @generated

@@ -110,7 +110,7 @@ public class CombinedFragmentCombinedFragmentCompartmentEditPart extends ListCom
 		installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

 

 		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.diagram.sequence.edit.policies.CombinedFragmentCombinedFragmentCompartmentCanonicalEditPolicy());

+		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.sequence.edit.policies.CombinedFragmentCombinedFragmentCompartmentCanonicalEditPolicy());

 

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/CombinedFragmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CombinedFragmentEditPart.java
index 6cd5191d98a..e60ac78acd8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/CombinedFragmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CombinedFragmentEditPart.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.parts;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.parts;

 

 import java.util.ArrayList;

 import java.util.LinkedList;

@@ -49,18 +49,18 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.dialogs.MessageDialog;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

-import org.eclipse.papyrus.diagram.common.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.CombinedFragmentItemComponentEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.CombinedFragmentItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.SequenceGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.figures.CombinedFragmentFigure;

-import org.eclipse.papyrus.diagram.sequence.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.sequence.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.sequence.util.CommandHelper;

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.CombinedFragmentItemComponentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.CombinedFragmentItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.SequenceGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.figures.CombinedFragmentFigure;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.sequence.util.CommandHelper;

 import org.eclipse.swt.graphics.Color;

 import org.eclipse.swt.widgets.Display;

 import org.eclipse.uml2.uml.CombinedFragment;

@@ -377,7 +377,7 @@ public class CombinedFragmentEditPart extends InteractionFragmentEditPart {
 		if(targetEditPart instanceof ConsiderIgnoreFragmentEditPart) {

 			types.add(UMLElementTypes.Message_4003);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.CombinedFragmentEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragmentEditPart) {

 			types.add(UMLElementTypes.Message_4003);

 		}

 		if(targetEditPart instanceof InteractionOperandEditPart) {

@@ -434,7 +434,7 @@ public class CombinedFragmentEditPart extends InteractionFragmentEditPart {
 		if(targetEditPart instanceof ConsiderIgnoreFragmentEditPart) {

 			types.add(UMLElementTypes.Message_4004);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.CombinedFragmentEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragmentEditPart) {

 			types.add(UMLElementTypes.Message_4004);

 		}

 		if(targetEditPart instanceof InteractionOperandEditPart) {

@@ -491,7 +491,7 @@ public class CombinedFragmentEditPart extends InteractionFragmentEditPart {
 		if(targetEditPart instanceof ConsiderIgnoreFragmentEditPart) {

 			types.add(UMLElementTypes.Message_4005);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.CombinedFragmentEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragmentEditPart) {

 			types.add(UMLElementTypes.Message_4005);

 		}

 		if(targetEditPart instanceof InteractionOperandEditPart) {

@@ -548,7 +548,7 @@ public class CombinedFragmentEditPart extends InteractionFragmentEditPart {
 		if(targetEditPart instanceof ConsiderIgnoreFragmentEditPart) {

 			types.add(UMLElementTypes.Message_4006);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.CombinedFragmentEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragmentEditPart) {

 			types.add(UMLElementTypes.Message_4006);

 		}

 		if(targetEditPart instanceof InteractionOperandEditPart) {

@@ -605,7 +605,7 @@ public class CombinedFragmentEditPart extends InteractionFragmentEditPart {
 		if(targetEditPart instanceof ConsiderIgnoreFragmentEditPart) {

 			types.add(UMLElementTypes.Message_4007);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.CombinedFragmentEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragmentEditPart) {

 			types.add(UMLElementTypes.Message_4007);

 		}

 		if(targetEditPart instanceof InteractionOperandEditPart) {

@@ -662,7 +662,7 @@ public class CombinedFragmentEditPart extends InteractionFragmentEditPart {
 		if(targetEditPart instanceof ConsiderIgnoreFragmentEditPart) {

 			types.add(UMLElementTypes.Message_4008);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.CombinedFragmentEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragmentEditPart) {

 			types.add(UMLElementTypes.Message_4008);

 		}

 		if(targetEditPart instanceof InteractionOperandEditPart) {

@@ -719,7 +719,7 @@ public class CombinedFragmentEditPart extends InteractionFragmentEditPart {
 		if(targetEditPart instanceof ConsiderIgnoreFragmentEditPart) {

 			types.add(UMLElementTypes.Message_4009);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.CombinedFragmentEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragmentEditPart) {

 			types.add(UMLElementTypes.Message_4009);

 		}

 		if(targetEditPart instanceof InteractionOperandEditPart) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/CommentAnnotatedElementEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CommentAnnotatedElementEditPart.java
index 2fa08f43208..8d418333249 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/CommentAnnotatedElementEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CommentAnnotatedElementEditPart.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.parts;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.parts;

 

 import org.eclipse.draw2d.Connection;

 import org.eclipse.draw2d.Graphics;

@@ -20,7 +20,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.CommentAnnotatedElementItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.CommentAnnotatedElementItemSemanticEditPolicy;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/CommentBodyEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CommentBodyEditPart.java
index 72411ba36ad..5c9f31c264e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/CommentBodyEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CommentBodyEditPart.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.parts;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -50,15 +50,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.HTMLCornerBentFigure;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -68,6 +59,15 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.HTMLCornerBentFigure;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -317,7 +317,7 @@ public class CommentBodyEditPart extends CompartmentEditPart implements ITextAwa
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Comment_3009, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.sequence.edit.parts.CommentBodyEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Comment_3009, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CommentBodyEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -565,7 +565,7 @@ public class CommentBodyEditPart extends CompartmentEditPart implements ITextAwa
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/CommentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CommentEditPart.java
index 06f38da4e46..cb98c2d0851 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/CommentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CommentEditPart.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.parts;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.parts;

 

 import java.util.ArrayList;

 import java.util.LinkedList;

@@ -40,17 +40,17 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.common.editparts.AbstractCommentEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.HTMLCornerBentFigure;

-import org.eclipse.papyrus.diagram.common.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.CommentItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.sequence.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractCommentEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.HTMLCornerBentFigure;

+import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.CommentItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

 import org.eclipse.swt.graphics.Color;

 

 /**

@@ -354,7 +354,7 @@ AbstractCommentEditPart {
 		if(targetEditPart instanceof ConstraintEditPart) {

 			types.add(UMLElementTypes.Message_4003);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.CommentEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CommentEditPart) {

 			types.add(UMLElementTypes.Message_4003);

 		}

 		if(targetEditPart instanceof DurationConstraintInMessageEditPart) {

@@ -411,7 +411,7 @@ AbstractCommentEditPart {
 		if(targetEditPart instanceof ConstraintEditPart) {

 			types.add(UMLElementTypes.Message_4004);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.CommentEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CommentEditPart) {

 			types.add(UMLElementTypes.Message_4004);

 		}

 		if(targetEditPart instanceof DurationConstraintInMessageEditPart) {

@@ -468,7 +468,7 @@ AbstractCommentEditPart {
 		if(targetEditPart instanceof ConstraintEditPart) {

 			types.add(UMLElementTypes.Message_4005);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.CommentEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CommentEditPart) {

 			types.add(UMLElementTypes.Message_4005);

 		}

 		if(targetEditPart instanceof DurationConstraintInMessageEditPart) {

@@ -525,7 +525,7 @@ AbstractCommentEditPart {
 		if(targetEditPart instanceof ConstraintEditPart) {

 			types.add(UMLElementTypes.Message_4006);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.CommentEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CommentEditPart) {

 			types.add(UMLElementTypes.Message_4006);

 		}

 		if(targetEditPart instanceof DurationConstraintInMessageEditPart) {

@@ -582,7 +582,7 @@ AbstractCommentEditPart {
 		if(targetEditPart instanceof ConstraintEditPart) {

 			types.add(UMLElementTypes.Message_4007);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.CommentEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CommentEditPart) {

 			types.add(UMLElementTypes.Message_4007);

 		}

 		if(targetEditPart instanceof DurationConstraintInMessageEditPart) {

@@ -639,7 +639,7 @@ AbstractCommentEditPart {
 		if(targetEditPart instanceof ConstraintEditPart) {

 			types.add(UMLElementTypes.Message_4008);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.CommentEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CommentEditPart) {

 			types.add(UMLElementTypes.Message_4008);

 		}

 		if(targetEditPart instanceof DurationConstraintInMessageEditPart) {

@@ -696,7 +696,7 @@ AbstractCommentEditPart {
 		if(targetEditPart instanceof ConstraintEditPart) {

 			types.add(UMLElementTypes.Message_4009);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.CommentEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CommentEditPart) {

 			types.add(UMLElementTypes.Message_4009);

 		}

 		if(targetEditPart instanceof DurationConstraintInMessageEditPart) {

@@ -753,7 +753,7 @@ AbstractCommentEditPart {
 		if(targetEditPart instanceof ConstraintEditPart) {

 			types.add(UMLElementTypes.CommentAnnotatedElement_4010);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.CommentEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CommentEditPart) {

 			types.add(UMLElementTypes.CommentAnnotatedElement_4010);

 		}

 		if(targetEditPart instanceof DurationConstraintInMessageEditPart) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/ConsiderIgnoreFragmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/ConsiderIgnoreFragmentEditPart.java
index d10f241e104..28cecf35432 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/ConsiderIgnoreFragmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/ConsiderIgnoreFragmentEditPart.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.parts;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.parts;

 

 import java.util.ArrayList;

 import java.util.LinkedList;

@@ -41,17 +41,17 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

-import org.eclipse.papyrus.diagram.common.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.papyrus.diagram.common.providers.UIAdapterImpl;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.CombinedFragmentItemComponentEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.ConsiderIgnoreFragmentItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.figures.CombinedFragmentFigure;

-import org.eclipse.papyrus.diagram.sequence.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.sequence.util.NotificationHelper;

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

+import org.eclipse.papyrus.uml.diagram.common.providers.UIAdapterImpl;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.CombinedFragmentItemComponentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.ConsiderIgnoreFragmentItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.figures.CombinedFragmentFigure;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.sequence.util.NotificationHelper;

 import org.eclipse.swt.graphics.Color;

 import org.eclipse.uml2.uml.ConsiderIgnoreFragment;

 import org.eclipse.uml2.uml.InteractionOperatorKind;

@@ -258,7 +258,7 @@ public class ConsiderIgnoreFragmentEditPart extends CombinedFragmentEditPart {
 		if(targetEditPart instanceof InteractionEditPart) {

 			types.add(UMLElementTypes.Message_4003);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.ConsiderIgnoreFragmentEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ConsiderIgnoreFragmentEditPart) {

 			types.add(UMLElementTypes.Message_4003);

 		}

 		if(targetEditPart instanceof CombinedFragmentEditPart) {

@@ -315,7 +315,7 @@ public class ConsiderIgnoreFragmentEditPart extends CombinedFragmentEditPart {
 		if(targetEditPart instanceof InteractionEditPart) {

 			types.add(UMLElementTypes.Message_4004);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.ConsiderIgnoreFragmentEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ConsiderIgnoreFragmentEditPart) {

 			types.add(UMLElementTypes.Message_4004);

 		}

 		if(targetEditPart instanceof CombinedFragmentEditPart) {

@@ -372,7 +372,7 @@ public class ConsiderIgnoreFragmentEditPart extends CombinedFragmentEditPart {
 		if(targetEditPart instanceof InteractionEditPart) {

 			types.add(UMLElementTypes.Message_4005);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.ConsiderIgnoreFragmentEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ConsiderIgnoreFragmentEditPart) {

 			types.add(UMLElementTypes.Message_4005);

 		}

 		if(targetEditPart instanceof CombinedFragmentEditPart) {

@@ -429,7 +429,7 @@ public class ConsiderIgnoreFragmentEditPart extends CombinedFragmentEditPart {
 		if(targetEditPart instanceof InteractionEditPart) {

 			types.add(UMLElementTypes.Message_4006);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.ConsiderIgnoreFragmentEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ConsiderIgnoreFragmentEditPart) {

 			types.add(UMLElementTypes.Message_4006);

 		}

 		if(targetEditPart instanceof CombinedFragmentEditPart) {

@@ -486,7 +486,7 @@ public class ConsiderIgnoreFragmentEditPart extends CombinedFragmentEditPart {
 		if(targetEditPart instanceof InteractionEditPart) {

 			types.add(UMLElementTypes.Message_4007);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.ConsiderIgnoreFragmentEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ConsiderIgnoreFragmentEditPart) {

 			types.add(UMLElementTypes.Message_4007);

 		}

 		if(targetEditPart instanceof CombinedFragmentEditPart) {

@@ -543,7 +543,7 @@ public class ConsiderIgnoreFragmentEditPart extends CombinedFragmentEditPart {
 		if(targetEditPart instanceof InteractionEditPart) {

 			types.add(UMLElementTypes.Message_4008);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.ConsiderIgnoreFragmentEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ConsiderIgnoreFragmentEditPart) {

 			types.add(UMLElementTypes.Message_4008);

 		}

 		if(targetEditPart instanceof CombinedFragmentEditPart) {

@@ -600,7 +600,7 @@ public class ConsiderIgnoreFragmentEditPart extends CombinedFragmentEditPart {
 		if(targetEditPart instanceof InteractionEditPart) {

 			types.add(UMLElementTypes.Message_4009);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.ConsiderIgnoreFragmentEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ConsiderIgnoreFragmentEditPart) {

 			types.add(UMLElementTypes.Message_4009);

 		}

 		if(targetEditPart instanceof CombinedFragmentEditPart) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/Constraint2EditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/Constraint2EditPart.java
index 7e02734aa58..e45a7c85cb2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/Constraint2EditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/Constraint2EditPart.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.sequence.edit.parts;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -37,15 +37,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ConstraintFigure;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -55,6 +46,15 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -312,7 +312,7 @@ public class Constraint2EditPart extends CompartmentEditPart implements ITextAwa
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Constraint_3008, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.sequence.edit.parts.Constraint2EditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Constraint_3008, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Constraint2EditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -560,7 +560,7 @@ public class Constraint2EditPart extends CompartmentEditPart implements ITextAwa
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/ConstraintConstrainedElementEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/ConstraintConstrainedElementEditPart.java
index 8fdf38b46d4..747f47fb28d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/ConstraintConstrainedElementEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/ConstraintConstrainedElementEditPart.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.parts;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.parts;

 

 import org.eclipse.draw2d.Connection;

 import org.eclipse.draw2d.Graphics;

@@ -20,7 +20,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.ConstraintConstrainedElementItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.ConstraintConstrainedElementItemSemanticEditPolicy;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/ConstraintEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/ConstraintEditPart.java
index 5ff18dea043..6b7ddd930ca 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/ConstraintEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/ConstraintEditPart.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.parts;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.parts;

 

 import java.util.ArrayList;

 import java.util.LinkedList;

@@ -40,17 +40,17 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.common.editparts.AbstractConstraintEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ConstraintFigure;

-import org.eclipse.papyrus.diagram.common.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.ConstraintItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.sequence.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractConstraintEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure;

+import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.ConstraintItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

 import org.eclipse.swt.graphics.Color;

 

 /**

@@ -357,7 +357,7 @@ AbstractConstraintEditPart {
 		if(targetEditPart instanceof DestructionEventEditPart) {

 			types.add(UMLElementTypes.Message_4003);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.ConstraintEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ConstraintEditPart) {

 			types.add(UMLElementTypes.Message_4003);

 		}

 		if(targetEditPart instanceof CommentEditPart) {

@@ -414,7 +414,7 @@ AbstractConstraintEditPart {
 		if(targetEditPart instanceof DestructionEventEditPart) {

 			types.add(UMLElementTypes.Message_4004);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.ConstraintEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ConstraintEditPart) {

 			types.add(UMLElementTypes.Message_4004);

 		}

 		if(targetEditPart instanceof CommentEditPart) {

@@ -471,7 +471,7 @@ AbstractConstraintEditPart {
 		if(targetEditPart instanceof DestructionEventEditPart) {

 			types.add(UMLElementTypes.Message_4005);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.ConstraintEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ConstraintEditPart) {

 			types.add(UMLElementTypes.Message_4005);

 		}

 		if(targetEditPart instanceof CommentEditPart) {

@@ -528,7 +528,7 @@ AbstractConstraintEditPart {
 		if(targetEditPart instanceof DestructionEventEditPart) {

 			types.add(UMLElementTypes.Message_4006);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.ConstraintEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ConstraintEditPart) {

 			types.add(UMLElementTypes.Message_4006);

 		}

 		if(targetEditPart instanceof CommentEditPart) {

@@ -585,7 +585,7 @@ AbstractConstraintEditPart {
 		if(targetEditPart instanceof DestructionEventEditPart) {

 			types.add(UMLElementTypes.Message_4007);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.ConstraintEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ConstraintEditPart) {

 			types.add(UMLElementTypes.Message_4007);

 		}

 		if(targetEditPart instanceof CommentEditPart) {

@@ -642,7 +642,7 @@ AbstractConstraintEditPart {
 		if(targetEditPart instanceof DestructionEventEditPart) {

 			types.add(UMLElementTypes.Message_4008);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.ConstraintEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ConstraintEditPart) {

 			types.add(UMLElementTypes.Message_4008);

 		}

 		if(targetEditPart instanceof CommentEditPart) {

@@ -699,7 +699,7 @@ AbstractConstraintEditPart {
 		if(targetEditPart instanceof DestructionEventEditPart) {

 			types.add(UMLElementTypes.Message_4009);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.ConstraintEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ConstraintEditPart) {

 			types.add(UMLElementTypes.Message_4009);

 		}

 		if(targetEditPart instanceof CommentEditPart) {

@@ -756,7 +756,7 @@ AbstractConstraintEditPart {
 		if(targetEditPart instanceof DestructionEventEditPart) {

 			types.add(UMLElementTypes.ConstraintConstrainedElement_4011);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.ConstraintEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ConstraintEditPart) {

 			types.add(UMLElementTypes.ConstraintConstrainedElement_4011);

 		}

 		if(targetEditPart instanceof CommentEditPart) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/ConstraintNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/ConstraintNameEditPart.java
index b34c91285b2..c8aabe09b52 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/ConstraintNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/ConstraintNameEditPart.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.parts;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -50,14 +50,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -67,6 +59,14 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -316,7 +316,7 @@ public class ConstraintNameEditPart extends CompartmentEditPart implements IText
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Constraint_3008, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.sequence.edit.parts.ConstraintNameEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Constraint_3008, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ConstraintNameEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -564,7 +564,7 @@ public class ConstraintNameEditPart extends CompartmentEditPart implements IText
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/ContinuationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/ContinuationEditPart.java
index 140a67e28f7..1c554adb645 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/ContinuationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/ContinuationEditPart.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.parts;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.parts;

 

 import java.util.ArrayList;

 import java.util.LinkedList;

@@ -45,16 +45,16 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.common.draw2d.CenterLayout;

-import org.eclipse.papyrus.diagram.common.figure.node.CenteredWrappedLabel;

-import org.eclipse.papyrus.diagram.common.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.ContinuationItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.locator.ContinuationLocator;

-import org.eclipse.papyrus.diagram.sequence.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.sequence.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.common.draw2d.CenterLayout;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.CenteredWrappedLabel;

+import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.ContinuationItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.locator.ContinuationLocator;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

 import org.eclipse.swt.graphics.Color;

 import org.eclipse.uml2.uml.UMLPackage;

 

@@ -327,7 +327,7 @@ AbstractBorderItemEditPart {
 		if(targetEditPart instanceof InteractionUseEditPart) {

 			types.add(UMLElementTypes.Message_4003);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.ContinuationEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ContinuationEditPart) {

 			types.add(UMLElementTypes.Message_4003);

 		}

 		if(targetEditPart instanceof LifelineEditPart) {

@@ -384,7 +384,7 @@ AbstractBorderItemEditPart {
 		if(targetEditPart instanceof InteractionUseEditPart) {

 			types.add(UMLElementTypes.Message_4004);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.ContinuationEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ContinuationEditPart) {

 			types.add(UMLElementTypes.Message_4004);

 		}

 		if(targetEditPart instanceof LifelineEditPart) {

@@ -441,7 +441,7 @@ AbstractBorderItemEditPart {
 		if(targetEditPart instanceof InteractionUseEditPart) {

 			types.add(UMLElementTypes.Message_4005);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.ContinuationEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ContinuationEditPart) {

 			types.add(UMLElementTypes.Message_4005);

 		}

 		if(targetEditPart instanceof LifelineEditPart) {

@@ -498,7 +498,7 @@ AbstractBorderItemEditPart {
 		if(targetEditPart instanceof InteractionUseEditPart) {

 			types.add(UMLElementTypes.Message_4006);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.ContinuationEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ContinuationEditPart) {

 			types.add(UMLElementTypes.Message_4006);

 		}

 		if(targetEditPart instanceof LifelineEditPart) {

@@ -555,7 +555,7 @@ AbstractBorderItemEditPart {
 		if(targetEditPart instanceof InteractionUseEditPart) {

 			types.add(UMLElementTypes.Message_4007);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.ContinuationEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ContinuationEditPart) {

 			types.add(UMLElementTypes.Message_4007);

 		}

 		if(targetEditPart instanceof LifelineEditPart) {

@@ -612,7 +612,7 @@ AbstractBorderItemEditPart {
 		if(targetEditPart instanceof InteractionUseEditPart) {

 			types.add(UMLElementTypes.Message_4008);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.ContinuationEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ContinuationEditPart) {

 			types.add(UMLElementTypes.Message_4008);

 		}

 		if(targetEditPart instanceof LifelineEditPart) {

@@ -669,7 +669,7 @@ AbstractBorderItemEditPart {
 		if(targetEditPart instanceof InteractionUseEditPart) {

 			types.add(UMLElementTypes.Message_4009);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.ContinuationEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ContinuationEditPart) {

 			types.add(UMLElementTypes.Message_4009);

 		}

 		if(targetEditPart instanceof LifelineEditPart) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/ContinuationNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/ContinuationNameEditPart.java
index b8b7c13e8b0..66789c35b4b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/ContinuationNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/ContinuationNameEditPart.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.parts;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -51,16 +51,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.CenteredWrappedLabel;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.common.util.DiagramEditPartsUtil;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -70,8 +60,18 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

-import org.eclipse.papyrus.umlutils.ui.VisualInformationPapyrusConstant;

-import org.eclipse.papyrus.umlutils.ui.helper.NameLabelIconHelper;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.CenteredWrappedLabel;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.tools.utils.ui.VisualInformationPapyrusConstant;

+import org.eclipse.papyrus.uml.tools.utils.ui.helper.NameLabelIconHelper;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -333,7 +333,7 @@ public class ContinuationNameEditPart extends CompartmentEditPart implements ITe
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Continuation_3016, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.sequence.edit.parts.ContinuationNameEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Continuation_3016, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ContinuationNameEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -581,7 +581,7 @@ public class ContinuationNameEditPart extends CompartmentEditPart implements ITe
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/DestructionEventEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/DestructionEventEditPart.java
index 70f199568a8..a97dd6d7ba5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/DestructionEventEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/DestructionEventEditPart.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.parts;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.parts;

 

 import java.util.ArrayList;

 import java.util.LinkedList;

@@ -46,15 +46,15 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.common.draw2d.anchors.CenterAnchor;

-import org.eclipse.papyrus.diagram.common.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.DestructionEventComponentEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.DestructionEventItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.figures.DestructionEventFigure;

-import org.eclipse.papyrus.diagram.sequence.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.common.draw2d.anchors.CenterAnchor;

+import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.DestructionEventComponentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.DestructionEventItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.figures.DestructionEventFigure;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

 import org.eclipse.swt.graphics.Color;

 

 /**

@@ -294,7 +294,7 @@ AbstractBorderItemEditPart {
 		if(targetEditPart instanceof DurationConstraintEditPart) {

 			types.add(UMLElementTypes.Message_4003);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.DestructionEventEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DestructionEventEditPart) {

 			types.add(UMLElementTypes.Message_4003);

 		}

 		if(targetEditPart instanceof ConstraintEditPart) {

@@ -351,7 +351,7 @@ AbstractBorderItemEditPart {
 		if(targetEditPart instanceof DurationConstraintEditPart) {

 			types.add(UMLElementTypes.Message_4004);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.DestructionEventEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DestructionEventEditPart) {

 			types.add(UMLElementTypes.Message_4004);

 		}

 		if(targetEditPart instanceof ConstraintEditPart) {

@@ -408,7 +408,7 @@ AbstractBorderItemEditPart {
 		if(targetEditPart instanceof DurationConstraintEditPart) {

 			types.add(UMLElementTypes.Message_4005);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.DestructionEventEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DestructionEventEditPart) {

 			types.add(UMLElementTypes.Message_4005);

 		}

 		if(targetEditPart instanceof ConstraintEditPart) {

@@ -465,7 +465,7 @@ AbstractBorderItemEditPart {
 		if(targetEditPart instanceof DurationConstraintEditPart) {

 			types.add(UMLElementTypes.Message_4006);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.DestructionEventEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DestructionEventEditPart) {

 			types.add(UMLElementTypes.Message_4006);

 		}

 		if(targetEditPart instanceof ConstraintEditPart) {

@@ -522,7 +522,7 @@ AbstractBorderItemEditPart {
 		if(targetEditPart instanceof DurationConstraintEditPart) {

 			types.add(UMLElementTypes.Message_4007);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.DestructionEventEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DestructionEventEditPart) {

 			types.add(UMLElementTypes.Message_4007);

 		}

 		if(targetEditPart instanceof ConstraintEditPart) {

@@ -579,7 +579,7 @@ AbstractBorderItemEditPart {
 		if(targetEditPart instanceof DurationConstraintEditPart) {

 			types.add(UMLElementTypes.Message_4008);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.DestructionEventEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DestructionEventEditPart) {

 			types.add(UMLElementTypes.Message_4008);

 		}

 		if(targetEditPart instanceof ConstraintEditPart) {

@@ -636,7 +636,7 @@ AbstractBorderItemEditPart {
 		if(targetEditPart instanceof DurationConstraintEditPart) {

 			types.add(UMLElementTypes.Message_4009);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.DestructionEventEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DestructionEventEditPart) {

 			types.add(UMLElementTypes.Message_4009);

 		}

 		if(targetEditPart instanceof ConstraintEditPart) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/DurationConstraintAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/DurationConstraintAppliedStereotypeEditPart.java
index f1172b0cdad..ca7e9b122cd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/DurationConstraintAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/DurationConstraintAppliedStereotypeEditPart.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.parts;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -53,19 +53,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editparts.IPapyrusEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.common.util.DiagramEditPartsUtil;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -75,7 +62,20 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

-import org.eclipse.papyrus.umlutils.ui.helper.NameLabelIconHelper;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.IPapyrusEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.tools.utils.ui.helper.NameLabelIconHelper;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -135,7 +135,7 @@ implements ITextAwareEditPart, IBorderItemEditPart, IPapyrusEditPart {
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.sequence.edit.parts.DurationConstraintAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationConstraintAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 0));

 	}

 

 	/**

@@ -379,7 +379,7 @@ implements ITextAwareEditPart, IBorderItemEditPart, IPapyrusEditPart {
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.DurationConstraint_3021, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.sequence.edit.parts.DurationConstraintAppliedStereotypeEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.DurationConstraint_3021, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationConstraintAppliedStereotypeEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -627,7 +627,7 @@ implements ITextAwareEditPart, IBorderItemEditPart, IPapyrusEditPart {
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/DurationConstraintEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/DurationConstraintEditPart.java
index 06c20313500..bdc9b55c5ed 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/DurationConstraintEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/DurationConstraintEditPart.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.parts;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.parts;

 

 import java.util.ArrayList;

 import java.util.LinkedList;

@@ -51,19 +51,19 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.common.draw2d.CenterLayout;

-import org.eclipse.papyrus.diagram.common.draw2d.LinesBorder;

-import org.eclipse.papyrus.diagram.common.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.papyrus.diagram.common.locator.ExternalLabelPositionLocator;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.DeleteTimeElementWithoutEventPolicy;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.DurationConstraintItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.ExternalLabelPrimaryDragRoleEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.TimeRelatedSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.sequence.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.common.draw2d.CenterLayout;

+import org.eclipse.papyrus.uml.diagram.common.draw2d.LinesBorder;

+import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

+import org.eclipse.papyrus.uml.diagram.common.locator.ExternalLabelPositionLocator;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.DeleteTimeElementWithoutEventPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.DurationConstraintItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.ExternalLabelPrimaryDragRoleEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.TimeRelatedSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

 import org.eclipse.swt.graphics.Color;

 

 /**

@@ -329,7 +329,7 @@ BorderedBorderItemEditPart {
 		if(targetEditPart instanceof TimeObservationEditPart) {

 			types.add(UMLElementTypes.Message_4003);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.DurationConstraintEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationConstraintEditPart) {

 			types.add(UMLElementTypes.Message_4003);

 		}

 		if(targetEditPart instanceof DestructionEventEditPart) {

@@ -386,7 +386,7 @@ BorderedBorderItemEditPart {
 		if(targetEditPart instanceof TimeObservationEditPart) {

 			types.add(UMLElementTypes.Message_4004);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.DurationConstraintEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationConstraintEditPart) {

 			types.add(UMLElementTypes.Message_4004);

 		}

 		if(targetEditPart instanceof DestructionEventEditPart) {

@@ -443,7 +443,7 @@ BorderedBorderItemEditPart {
 		if(targetEditPart instanceof TimeObservationEditPart) {

 			types.add(UMLElementTypes.Message_4005);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.DurationConstraintEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationConstraintEditPart) {

 			types.add(UMLElementTypes.Message_4005);

 		}

 		if(targetEditPart instanceof DestructionEventEditPart) {

@@ -500,7 +500,7 @@ BorderedBorderItemEditPart {
 		if(targetEditPart instanceof TimeObservationEditPart) {

 			types.add(UMLElementTypes.Message_4006);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.DurationConstraintEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationConstraintEditPart) {

 			types.add(UMLElementTypes.Message_4006);

 		}

 		if(targetEditPart instanceof DestructionEventEditPart) {

@@ -557,7 +557,7 @@ BorderedBorderItemEditPart {
 		if(targetEditPart instanceof TimeObservationEditPart) {

 			types.add(UMLElementTypes.Message_4007);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.DurationConstraintEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationConstraintEditPart) {

 			types.add(UMLElementTypes.Message_4007);

 		}

 		if(targetEditPart instanceof DestructionEventEditPart) {

@@ -614,7 +614,7 @@ BorderedBorderItemEditPart {
 		if(targetEditPart instanceof TimeObservationEditPart) {

 			types.add(UMLElementTypes.Message_4008);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.DurationConstraintEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationConstraintEditPart) {

 			types.add(UMLElementTypes.Message_4008);

 		}

 		if(targetEditPart instanceof DestructionEventEditPart) {

@@ -671,7 +671,7 @@ BorderedBorderItemEditPart {
 		if(targetEditPart instanceof TimeObservationEditPart) {

 			types.add(UMLElementTypes.Message_4009);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.DurationConstraintEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationConstraintEditPart) {

 			types.add(UMLElementTypes.Message_4009);

 		}

 		if(targetEditPart instanceof DestructionEventEditPart) {

@@ -728,7 +728,7 @@ BorderedBorderItemEditPart {
 		if(targetEditPart instanceof TimeObservationEditPart) {

 			types.add(UMLElementTypes.ConstraintConstrainedElement_4011);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.DurationConstraintEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationConstraintEditPart) {

 			types.add(UMLElementTypes.ConstraintConstrainedElement_4011);

 		}

 		if(targetEditPart instanceof DestructionEventEditPart) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/DurationConstraintInMessageAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/DurationConstraintInMessageAppliedStereotypeEditPart.java
index d3793f3fe82..5783b8a0f76 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/DurationConstraintInMessageAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/DurationConstraintInMessageAppliedStereotypeEditPart.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.parts;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -53,19 +53,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editparts.IPapyrusEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.common.util.DiagramEditPartsUtil;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -75,7 +62,20 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

-import org.eclipse.papyrus.umlutils.ui.helper.NameLabelIconHelper;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.IPapyrusEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.tools.utils.ui.helper.NameLabelIconHelper;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -135,7 +135,7 @@ implements ITextAwareEditPart, IBorderItemEditPart, IPapyrusEditPart {
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.sequence.edit.parts.DurationConstraintInMessageAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationConstraintInMessageAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 0));

 	}

 

 	/**

@@ -379,7 +379,7 @@ implements ITextAwareEditPart, IBorderItemEditPart, IPapyrusEditPart {
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.DurationConstraint_3023, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.sequence.edit.parts.DurationConstraintInMessageAppliedStereotypeEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.DurationConstraint_3023, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationConstraintInMessageAppliedStereotypeEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -627,7 +627,7 @@ implements ITextAwareEditPart, IBorderItemEditPart, IPapyrusEditPart {
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/DurationConstraintInMessageEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/DurationConstraintInMessageEditPart.java
index eb4b2101fb2..5c4f2c57197 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/DurationConstraintInMessageEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/DurationConstraintInMessageEditPart.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.parts;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.parts;

 

 import java.util.ArrayList;

 import java.util.LinkedList;

@@ -51,15 +51,15 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.common.locator.ExternalLabelPositionLocator;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.DeleteTimeElementWithoutEventPolicy;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.DurationConstraintInMessageItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.ExternalLabelPrimaryDragRoleEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.MoveableNonResizableLabelEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.common.locator.ExternalLabelPositionLocator;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.DeleteTimeElementWithoutEventPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.DurationConstraintInMessageItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.ExternalLabelPrimaryDragRoleEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.MoveableNonResizableLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.graphics.Color;

 import org.eclipse.swt.graphics.Font;

@@ -411,7 +411,7 @@ public class DurationConstraintInMessageEditPart extends AbstractBorderedShapeEd
 		if(targetEditPart instanceof CommentEditPart) {

 			types.add(UMLElementTypes.Message_4003);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.DurationConstraintInMessageEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationConstraintInMessageEditPart) {

 			types.add(UMLElementTypes.Message_4003);

 		}

 		if(targetEditPart instanceof DurationObservationEditPart) {

@@ -468,7 +468,7 @@ public class DurationConstraintInMessageEditPart extends AbstractBorderedShapeEd
 		if(targetEditPart instanceof CommentEditPart) {

 			types.add(UMLElementTypes.Message_4004);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.DurationConstraintInMessageEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationConstraintInMessageEditPart) {

 			types.add(UMLElementTypes.Message_4004);

 		}

 		if(targetEditPart instanceof DurationObservationEditPart) {

@@ -525,7 +525,7 @@ public class DurationConstraintInMessageEditPart extends AbstractBorderedShapeEd
 		if(targetEditPart instanceof CommentEditPart) {

 			types.add(UMLElementTypes.Message_4005);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.DurationConstraintInMessageEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationConstraintInMessageEditPart) {

 			types.add(UMLElementTypes.Message_4005);

 		}

 		if(targetEditPart instanceof DurationObservationEditPart) {

@@ -582,7 +582,7 @@ public class DurationConstraintInMessageEditPart extends AbstractBorderedShapeEd
 		if(targetEditPart instanceof CommentEditPart) {

 			types.add(UMLElementTypes.Message_4006);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.DurationConstraintInMessageEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationConstraintInMessageEditPart) {

 			types.add(UMLElementTypes.Message_4006);

 		}

 		if(targetEditPart instanceof DurationObservationEditPart) {

@@ -639,7 +639,7 @@ public class DurationConstraintInMessageEditPart extends AbstractBorderedShapeEd
 		if(targetEditPart instanceof CommentEditPart) {

 			types.add(UMLElementTypes.Message_4007);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.DurationConstraintInMessageEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationConstraintInMessageEditPart) {

 			types.add(UMLElementTypes.Message_4007);

 		}

 		if(targetEditPart instanceof DurationObservationEditPart) {

@@ -696,7 +696,7 @@ public class DurationConstraintInMessageEditPart extends AbstractBorderedShapeEd
 		if(targetEditPart instanceof CommentEditPart) {

 			types.add(UMLElementTypes.Message_4008);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.DurationConstraintInMessageEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationConstraintInMessageEditPart) {

 			types.add(UMLElementTypes.Message_4008);

 		}

 		if(targetEditPart instanceof DurationObservationEditPart) {

@@ -753,7 +753,7 @@ public class DurationConstraintInMessageEditPart extends AbstractBorderedShapeEd
 		if(targetEditPart instanceof CommentEditPart) {

 			types.add(UMLElementTypes.Message_4009);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.DurationConstraintInMessageEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationConstraintInMessageEditPart) {

 			types.add(UMLElementTypes.Message_4009);

 		}

 		if(targetEditPart instanceof DurationObservationEditPart) {

@@ -810,7 +810,7 @@ public class DurationConstraintInMessageEditPart extends AbstractBorderedShapeEd
 		if(targetEditPart instanceof CommentEditPart) {

 			types.add(UMLElementTypes.ConstraintConstrainedElement_4011);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.DurationConstraintInMessageEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationConstraintInMessageEditPart) {

 			types.add(UMLElementTypes.ConstraintConstrainedElement_4011);

 		}

 		if(targetEditPart instanceof DurationObservationEditPart) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/DurationConstraintInMessageLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/DurationConstraintInMessageLabelEditPart.java
index 41e0cd0c8c4..3845a1f8be3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/DurationConstraintInMessageLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/DurationConstraintInMessageLabelEditPart.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.parts;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -50,14 +50,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -67,6 +59,14 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -325,7 +325,7 @@ public class DurationConstraintInMessageLabelEditPart extends CompartmentEditPar
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.DurationConstraint_3023, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.sequence.edit.parts.DurationConstraintInMessageLabelEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.DurationConstraint_3023, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationConstraintInMessageLabelEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -573,7 +573,7 @@ public class DurationConstraintInMessageLabelEditPart extends CompartmentEditPar
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/DurationConstraintLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/DurationConstraintLabelEditPart.java
index b5ae292e845..2957d47d3b1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/DurationConstraintLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/DurationConstraintLabelEditPart.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.parts;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -54,14 +54,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -71,6 +63,14 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -118,7 +118,7 @@ public class DurationConstraintLabelEditPart extends LabelEditPart implements IT
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.sequence.edit.parts.DurationConstraintLabelEditPart.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationConstraintLabelEditPart.VISUAL_ID), new Point(0, 0));

 	}

 

 	/**

@@ -349,7 +349,7 @@ public class DurationConstraintLabelEditPart extends LabelEditPart implements IT
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.DurationConstraint_3021, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.sequence.edit.parts.DurationConstraintLabelEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.DurationConstraint_3021, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationConstraintLabelEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -597,7 +597,7 @@ public class DurationConstraintLabelEditPart extends LabelEditPart implements IT
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/DurationObservationAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/DurationObservationAppliedStereotypeEditPart.java
index e9d4bf2c633..1b951469bcb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/DurationObservationAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/DurationObservationAppliedStereotypeEditPart.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.parts;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -53,19 +53,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editparts.IPapyrusEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.common.util.DiagramEditPartsUtil;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -75,7 +62,20 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

-import org.eclipse.papyrus.umlutils.ui.helper.NameLabelIconHelper;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.IPapyrusEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.tools.utils.ui.helper.NameLabelIconHelper;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -135,7 +135,7 @@ implements ITextAwareEditPart, IBorderItemEditPart, IPapyrusEditPart {
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.sequence.edit.parts.DurationObservationAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationObservationAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 0));

 	}

 

 	/**

@@ -379,7 +379,7 @@ implements ITextAwareEditPart, IBorderItemEditPart, IPapyrusEditPart {
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.DurationObservation_3024, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.sequence.edit.parts.DurationObservationAppliedStereotypeEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.DurationObservation_3024, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationObservationAppliedStereotypeEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -627,7 +627,7 @@ implements ITextAwareEditPart, IBorderItemEditPart, IPapyrusEditPart {
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/DurationObservationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/DurationObservationEditPart.java
index 4439e397815..0c7fc490a6e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/DurationObservationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/DurationObservationEditPart.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.parts;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.parts;

 

 import java.util.ArrayList;

 import java.util.LinkedList;

@@ -51,15 +51,15 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.common.locator.ExternalLabelPositionLocator;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.DeleteTimeElementWithoutEventPolicy;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.DurationObservationItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.ExternalLabelPrimaryDragRoleEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.MoveableNonResizableLabelEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.common.locator.ExternalLabelPositionLocator;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.DeleteTimeElementWithoutEventPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.DurationObservationItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.ExternalLabelPrimaryDragRoleEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.MoveableNonResizableLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.graphics.Color;

 import org.eclipse.swt.graphics.Font;

@@ -415,7 +415,7 @@ AbstractBorderedShapeEditPart {
 		if(targetEditPart instanceof DurationConstraintInMessageEditPart) {

 			types.add(UMLElementTypes.Message_4003);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.DurationObservationEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationObservationEditPart) {

 			types.add(UMLElementTypes.Message_4003);

 		}

 		if(targetEditPart instanceof InteractionEditPart) {

@@ -472,7 +472,7 @@ AbstractBorderedShapeEditPart {
 		if(targetEditPart instanceof DurationConstraintInMessageEditPart) {

 			types.add(UMLElementTypes.Message_4004);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.DurationObservationEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationObservationEditPart) {

 			types.add(UMLElementTypes.Message_4004);

 		}

 		if(targetEditPart instanceof InteractionEditPart) {

@@ -529,7 +529,7 @@ AbstractBorderedShapeEditPart {
 		if(targetEditPart instanceof DurationConstraintInMessageEditPart) {

 			types.add(UMLElementTypes.Message_4005);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.DurationObservationEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationObservationEditPart) {

 			types.add(UMLElementTypes.Message_4005);

 		}

 		if(targetEditPart instanceof InteractionEditPart) {

@@ -586,7 +586,7 @@ AbstractBorderedShapeEditPart {
 		if(targetEditPart instanceof DurationConstraintInMessageEditPart) {

 			types.add(UMLElementTypes.Message_4006);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.DurationObservationEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationObservationEditPart) {

 			types.add(UMLElementTypes.Message_4006);

 		}

 		if(targetEditPart instanceof InteractionEditPart) {

@@ -643,7 +643,7 @@ AbstractBorderedShapeEditPart {
 		if(targetEditPart instanceof DurationConstraintInMessageEditPart) {

 			types.add(UMLElementTypes.Message_4007);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.DurationObservationEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationObservationEditPart) {

 			types.add(UMLElementTypes.Message_4007);

 		}

 		if(targetEditPart instanceof InteractionEditPart) {

@@ -700,7 +700,7 @@ AbstractBorderedShapeEditPart {
 		if(targetEditPart instanceof DurationConstraintInMessageEditPart) {

 			types.add(UMLElementTypes.Message_4008);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.DurationObservationEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationObservationEditPart) {

 			types.add(UMLElementTypes.Message_4008);

 		}

 		if(targetEditPart instanceof InteractionEditPart) {

@@ -757,7 +757,7 @@ AbstractBorderedShapeEditPart {
 		if(targetEditPart instanceof DurationConstraintInMessageEditPart) {

 			types.add(UMLElementTypes.Message_4009);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.DurationObservationEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationObservationEditPart) {

 			types.add(UMLElementTypes.Message_4009);

 		}

 		return types;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/DurationObservationLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/DurationObservationLabelEditPart.java
index ac0e3d2d9ba..eaf6f40ca22 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/DurationObservationLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/DurationObservationLabelEditPart.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.parts;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -50,14 +50,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -67,6 +59,14 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -325,7 +325,7 @@ public class DurationObservationLabelEditPart extends CompartmentEditPart implem
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.DurationObservation_3024, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.sequence.edit.parts.DurationObservationLabelEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.DurationObservation_3024, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationObservationLabelEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -573,7 +573,7 @@ public class DurationObservationLabelEditPart extends CompartmentEditPart implem
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/GeneralOrderingAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/GeneralOrderingAppliedStereotypeEditPart.java
index 541d9d03427..d527efd79a0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/GeneralOrderingAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/GeneralOrderingAppliedStereotypeEditPart.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.sequence.edit.parts;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -39,15 +39,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.common.util.DiagramEditPartsUtil;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -57,8 +48,17 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

-import org.eclipse.papyrus.umlutils.ui.VisualInformationPapyrusConstant;

-import org.eclipse.papyrus.umlutils.ui.helper.NameLabelIconHelper;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.tools.utils.ui.VisualInformationPapyrusConstant;

+import org.eclipse.papyrus.uml.tools.utils.ui.helper.NameLabelIconHelper;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -118,7 +118,7 @@ public class GeneralOrderingAppliedStereotypeEditPart extends LabelEditPart impl
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.sequence.edit.parts.GeneralOrderingAppliedStereotypeEditPart.VISUAL_ID), new Point(1, -33));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.sequence.edit.parts.GeneralOrderingAppliedStereotypeEditPart.VISUAL_ID), new Point(1, -33));

 	}

 

 	/**

@@ -346,7 +346,7 @@ public class GeneralOrderingAppliedStereotypeEditPart extends LabelEditPart impl
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.GeneralOrdering_4012, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.sequence.edit.parts.GeneralOrderingAppliedStereotypeEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.GeneralOrdering_4012, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.sequence.edit.parts.GeneralOrderingAppliedStereotypeEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -596,7 +596,7 @@ public class GeneralOrderingAppliedStereotypeEditPart extends LabelEditPart impl
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/GeneralOrderingEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/GeneralOrderingEditPart.java
index 08f9bf3ab46..559ad59cbfb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/GeneralOrderingEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/GeneralOrderingEditPart.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.sequence.edit.parts;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.parts;

 

 import org.eclipse.draw2d.ArrowLocator;

 import org.eclipse.draw2d.ColorConstants;

@@ -16,9 +16,9 @@ import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.edge.UMLEdgeFigure;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.GeneralOrderingItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.edge.UMLEdgeFigure;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.GeneralOrderingItemSemanticEditPolicy;

 import org.eclipse.swt.graphics.Color;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/InteractionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/InteractionEditPart.java
index 723b0f21775..606ab992c07 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/InteractionEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/InteractionEditPart.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.parts;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.parts;

 

 import java.util.ArrayList;

 import java.util.LinkedList;

@@ -55,19 +55,19 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.InteractionRectangleFigure;

-import org.eclipse.papyrus.diagram.common.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.papyrus.diagram.common.providers.UIAdapterImpl;

-import org.eclipse.papyrus.diagram.common.util.MessageDirection;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.InteractionItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.SequenceGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.sequence.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.sequence.util.NotificationHelper;

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.InteractionRectangleFigure;

+import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

+import org.eclipse.papyrus.uml.diagram.common.providers.UIAdapterImpl;

+import org.eclipse.papyrus.uml.diagram.common.util.MessageDirection;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.InteractionItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.SequenceGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.sequence.util.NotificationHelper;

 import org.eclipse.swt.graphics.Color;

 import org.eclipse.uml2.uml.Gate;

 import org.eclipse.uml2.uml.Interaction;

@@ -122,7 +122,7 @@ public class InteractionEditPart extends ShapeNodeEditPart {
 

 

 		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.diagram.sequence.edit.policies.InteractionCanonicalEditPolicy());

+		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.sequence.edit.policies.InteractionCanonicalEditPolicy());

 

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new SequenceGraphicalNodeEditPolicy());

@@ -366,7 +366,7 @@ public class InteractionEditPart extends ShapeNodeEditPart {
 	 */

 	public List<IElementType> getMARelTypesOnSourceAndTarget(IGraphicalEditPart targetEditPart) {

 		LinkedList<IElementType> types = new LinkedList<IElementType>();

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.InteractionEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionEditPart) {

 			types.add(UMLElementTypes.Message_4003);

 		}

 		if(targetEditPart instanceof ConsiderIgnoreFragmentEditPart) {

@@ -423,7 +423,7 @@ public class InteractionEditPart extends ShapeNodeEditPart {
 		if(targetEditPart instanceof DurationObservationEditPart) {

 			types.add(UMLElementTypes.Message_4003);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.InteractionEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionEditPart) {

 			types.add(UMLElementTypes.Message_4004);

 		}

 		if(targetEditPart instanceof ConsiderIgnoreFragmentEditPart) {

@@ -480,7 +480,7 @@ public class InteractionEditPart extends ShapeNodeEditPart {
 		if(targetEditPart instanceof DurationObservationEditPart) {

 			types.add(UMLElementTypes.Message_4004);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.InteractionEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionEditPart) {

 			types.add(UMLElementTypes.Message_4005);

 		}

 		if(targetEditPart instanceof ConsiderIgnoreFragmentEditPart) {

@@ -537,7 +537,7 @@ public class InteractionEditPart extends ShapeNodeEditPart {
 		if(targetEditPart instanceof DurationObservationEditPart) {

 			types.add(UMLElementTypes.Message_4005);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.InteractionEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionEditPart) {

 			types.add(UMLElementTypes.Message_4006);

 		}

 		if(targetEditPart instanceof ConsiderIgnoreFragmentEditPart) {

@@ -594,7 +594,7 @@ public class InteractionEditPart extends ShapeNodeEditPart {
 		if(targetEditPart instanceof DurationObservationEditPart) {

 			types.add(UMLElementTypes.Message_4006);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.InteractionEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionEditPart) {

 			types.add(UMLElementTypes.Message_4007);

 		}

 		if(targetEditPart instanceof ConsiderIgnoreFragmentEditPart) {

@@ -651,7 +651,7 @@ public class InteractionEditPart extends ShapeNodeEditPart {
 		if(targetEditPart instanceof DurationObservationEditPart) {

 			types.add(UMLElementTypes.Message_4007);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.InteractionEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionEditPart) {

 			types.add(UMLElementTypes.Message_4008);

 		}

 		if(targetEditPart instanceof ConsiderIgnoreFragmentEditPart) {

@@ -708,7 +708,7 @@ public class InteractionEditPart extends ShapeNodeEditPart {
 		if(targetEditPart instanceof DurationObservationEditPart) {

 			types.add(UMLElementTypes.Message_4008);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.InteractionEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionEditPart) {

 			types.add(UMLElementTypes.Message_4009);

 		}

 		if(targetEditPart instanceof ConsiderIgnoreFragmentEditPart) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/InteractionInteractionCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/InteractionInteractionCompartmentEditPart.java
index 2b04f883771..aa93af660da 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/InteractionInteractionCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/InteractionInteractionCompartmentEditPart.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.parts;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.parts;

 

 import org.eclipse.draw2d.IFigure;

 import org.eclipse.draw2d.geometry.Dimension;

@@ -28,12 +28,12 @@ import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.CombinedFragmentCreationEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.CustomDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.InteractionCompartmentXYLayoutEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.InteractionInteractionCompartmentItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.diagram.sequence.part.Messages;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.CombinedFragmentCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.InteractionCompartmentXYLayoutEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.InteractionInteractionCompartmentItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.part.Messages;

 

 /**

  * @generated

@@ -80,7 +80,7 @@ public class InteractionInteractionCompartmentEditPart extends ShapeCompartmentE
 		//in Papyrus diagrams are not strongly synchronised

 		// installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE,

 		// new

-		// org.eclipse.papyrus.diagram.sequence.edit.policies.InteractionInteractionCompartmentCanonicalEditPolicy());

+		// org.eclipse.papyrus.uml.diagram.sequence.edit.policies.InteractionInteractionCompartmentCanonicalEditPolicy());

 

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, new InteractionCompartmentXYLayoutEditPolicy());

 		installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/InteractionNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/InteractionNameEditPart.java
index 68b7e43c917..820bcad9c8a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/InteractionNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/InteractionNameEditPart.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.parts;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -50,14 +50,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -67,6 +59,14 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -316,7 +316,7 @@ public class InteractionNameEditPart extends CompartmentEditPart implements ITex
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Interaction_2001, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.sequence.edit.parts.InteractionNameEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Interaction_2001, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionNameEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -565,7 +565,7 @@ public class InteractionNameEditPart extends CompartmentEditPart implements ITex
 	 * Returns the kind of associated editor for direct edition.

 	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see

-	 *         org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 *         org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/InteractionOperandEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/InteractionOperandEditPart.java
index 36a5c0b2c24..79dc94a32b8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/InteractionOperandEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/InteractionOperandEditPart.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.parts;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.parts;

 

 import java.util.ArrayList;

 import java.util.LinkedList;

@@ -50,23 +50,23 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.common.editpolicies.BorderItemResizableEditPolicy;

-import org.eclipse.papyrus.diagram.common.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.papyrus.diagram.common.providers.UIAdapterImpl;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.CombinedFragmentCreationEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.InteractionOperandComponentEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.InteractionOperandItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.InteractionOperandLayoutEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.SequenceGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.figures.InteractionOperandFigure;

-import org.eclipse.papyrus.diagram.sequence.locator.ContinuationLocator;

-import org.eclipse.papyrus.diagram.sequence.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.sequence.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.sequence.util.CommandHelper;

-import org.eclipse.papyrus.diagram.sequence.util.NotificationHelper;

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

+import org.eclipse.papyrus.uml.diagram.common.providers.UIAdapterImpl;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.CombinedFragmentCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.InteractionOperandComponentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.InteractionOperandItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.InteractionOperandLayoutEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.SequenceGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.figures.InteractionOperandFigure;

+import org.eclipse.papyrus.uml.diagram.sequence.locator.ContinuationLocator;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.sequence.util.CommandHelper;

+import org.eclipse.papyrus.uml.diagram.sequence.util.NotificationHelper;

 import org.eclipse.swt.graphics.Color;

 import org.eclipse.uml2.uml.CombinedFragment;

 import org.eclipse.uml2.uml.Continuation;

@@ -139,7 +139,7 @@ AbstractBorderedShapeEditPart {
 		//installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

 

 		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.diagram.sequence.edit.policies.InteractionOperandCanonicalEditPolicy());

+		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.sequence.edit.policies.InteractionOperandCanonicalEditPolicy());

 

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, new InteractionOperandLayoutEditPolicy());

@@ -561,7 +561,7 @@ AbstractBorderedShapeEditPart {
 		if(targetEditPart instanceof CombinedFragmentEditPart) {

 			types.add(UMLElementTypes.Message_4003);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.InteractionOperandEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionOperandEditPart) {

 			types.add(UMLElementTypes.Message_4003);

 		}

 		if(targetEditPart instanceof InteractionUseEditPart) {

@@ -618,7 +618,7 @@ AbstractBorderedShapeEditPart {
 		if(targetEditPart instanceof CombinedFragmentEditPart) {

 			types.add(UMLElementTypes.Message_4004);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.InteractionOperandEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionOperandEditPart) {

 			types.add(UMLElementTypes.Message_4004);

 		}

 		if(targetEditPart instanceof InteractionUseEditPart) {

@@ -675,7 +675,7 @@ AbstractBorderedShapeEditPart {
 		if(targetEditPart instanceof CombinedFragmentEditPart) {

 			types.add(UMLElementTypes.Message_4005);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.InteractionOperandEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionOperandEditPart) {

 			types.add(UMLElementTypes.Message_4005);

 		}

 		if(targetEditPart instanceof InteractionUseEditPart) {

@@ -732,7 +732,7 @@ AbstractBorderedShapeEditPart {
 		if(targetEditPart instanceof CombinedFragmentEditPart) {

 			types.add(UMLElementTypes.Message_4006);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.InteractionOperandEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionOperandEditPart) {

 			types.add(UMLElementTypes.Message_4006);

 		}

 		if(targetEditPart instanceof InteractionUseEditPart) {

@@ -789,7 +789,7 @@ AbstractBorderedShapeEditPart {
 		if(targetEditPart instanceof CombinedFragmentEditPart) {

 			types.add(UMLElementTypes.Message_4007);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.InteractionOperandEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionOperandEditPart) {

 			types.add(UMLElementTypes.Message_4007);

 		}

 		if(targetEditPart instanceof InteractionUseEditPart) {

@@ -846,7 +846,7 @@ AbstractBorderedShapeEditPart {
 		if(targetEditPart instanceof CombinedFragmentEditPart) {

 			types.add(UMLElementTypes.Message_4008);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.InteractionOperandEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionOperandEditPart) {

 			types.add(UMLElementTypes.Message_4008);

 		}

 		if(targetEditPart instanceof InteractionUseEditPart) {

@@ -903,7 +903,7 @@ AbstractBorderedShapeEditPart {
 		if(targetEditPart instanceof CombinedFragmentEditPart) {

 			types.add(UMLElementTypes.Message_4009);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.InteractionOperandEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionOperandEditPart) {

 			types.add(UMLElementTypes.Message_4009);

 		}

 		if(targetEditPart instanceof InteractionUseEditPart) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/InteractionUseEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/InteractionUseEditPart.java
index d1e41ea2691..f88e39a4d68 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/InteractionUseEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/InteractionUseEditPart.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.parts;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.parts;

 

 import java.util.ArrayList;

 import java.util.LinkedList;

@@ -44,18 +44,18 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.dialogs.MessageDialog;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.common.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.papyrus.diagram.common.providers.UIAdapterImpl;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.InteractionUseItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.OpenDiagramEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.figures.InteractionUseRectangleFigure;

-import org.eclipse.papyrus.diagram.sequence.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.sequence.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.sequence.util.CommandHelper;

-import org.eclipse.papyrus.diagram.sequence.util.NotificationHelper;

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

+import org.eclipse.papyrus.uml.diagram.common.providers.UIAdapterImpl;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.InteractionUseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.OpenDiagramEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.figures.InteractionUseRectangleFigure;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.sequence.util.CommandHelper;

+import org.eclipse.papyrus.uml.diagram.sequence.util.NotificationHelper;

 import org.eclipse.swt.graphics.Color;

 import org.eclipse.swt.widgets.Display;

 import org.eclipse.uml2.uml.Gate;

@@ -397,7 +397,7 @@ public class InteractionUseEditPart extends InteractionFragmentEditPart {
 		if(targetEditPart instanceof InteractionOperandEditPart) {

 			types.add(UMLElementTypes.Message_4003);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.InteractionUseEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionUseEditPart) {

 			types.add(UMLElementTypes.Message_4003);

 		}

 		if(targetEditPart instanceof ContinuationEditPart) {

@@ -454,7 +454,7 @@ public class InteractionUseEditPart extends InteractionFragmentEditPart {
 		if(targetEditPart instanceof InteractionOperandEditPart) {

 			types.add(UMLElementTypes.Message_4004);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.InteractionUseEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionUseEditPart) {

 			types.add(UMLElementTypes.Message_4004);

 		}

 		if(targetEditPart instanceof ContinuationEditPart) {

@@ -511,7 +511,7 @@ public class InteractionUseEditPart extends InteractionFragmentEditPart {
 		if(targetEditPart instanceof InteractionOperandEditPart) {

 			types.add(UMLElementTypes.Message_4005);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.InteractionUseEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionUseEditPart) {

 			types.add(UMLElementTypes.Message_4005);

 		}

 		if(targetEditPart instanceof ContinuationEditPart) {

@@ -568,7 +568,7 @@ public class InteractionUseEditPart extends InteractionFragmentEditPart {
 		if(targetEditPart instanceof InteractionOperandEditPart) {

 			types.add(UMLElementTypes.Message_4006);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.InteractionUseEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionUseEditPart) {

 			types.add(UMLElementTypes.Message_4006);

 		}

 		if(targetEditPart instanceof ContinuationEditPart) {

@@ -625,7 +625,7 @@ public class InteractionUseEditPart extends InteractionFragmentEditPart {
 		if(targetEditPart instanceof InteractionOperandEditPart) {

 			types.add(UMLElementTypes.Message_4007);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.InteractionUseEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionUseEditPart) {

 			types.add(UMLElementTypes.Message_4007);

 		}

 		if(targetEditPart instanceof ContinuationEditPart) {

@@ -682,7 +682,7 @@ public class InteractionUseEditPart extends InteractionFragmentEditPart {
 		if(targetEditPart instanceof InteractionOperandEditPart) {

 			types.add(UMLElementTypes.Message_4008);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.InteractionUseEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionUseEditPart) {

 			types.add(UMLElementTypes.Message_4008);

 		}

 		if(targetEditPart instanceof ContinuationEditPart) {

@@ -739,7 +739,7 @@ public class InteractionUseEditPart extends InteractionFragmentEditPart {
 		if(targetEditPart instanceof InteractionOperandEditPart) {

 			types.add(UMLElementTypes.Message_4009);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.InteractionUseEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionUseEditPart) {

 			types.add(UMLElementTypes.Message_4009);

 		}

 		if(targetEditPart instanceof ContinuationEditPart) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/InteractionUseName2EditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/InteractionUseName2EditPart.java
index 9d88b19e51f..0343371c7c4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/InteractionUseName2EditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/InteractionUseName2EditPart.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.parts;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -50,14 +50,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -67,6 +59,14 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -316,7 +316,7 @@ public class InteractionUseName2EditPart extends CompartmentEditPart implements
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.InteractionUse_3002, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.sequence.edit.parts.InteractionUseName2EditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.InteractionUse_3002, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionUseName2EditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -565,7 +565,7 @@ public class InteractionUseName2EditPart extends CompartmentEditPart implements
 	 * Returns the kind of associated editor for direct edition.

 	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see

-	 *         org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 *         org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/InteractionUseNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/InteractionUseNameEditPart.java
index 9ddd8917c71..6d14988b0ba 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/InteractionUseNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/InteractionUseNameEditPart.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.parts;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -50,14 +50,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -67,6 +59,14 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -316,7 +316,7 @@ public class InteractionUseNameEditPart extends CompartmentEditPart implements I
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.InteractionUse_3002, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.sequence.edit.parts.InteractionUseNameEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.InteractionUse_3002, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionUseNameEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -565,7 +565,7 @@ public class InteractionUseNameEditPart extends CompartmentEditPart implements I
 	 * Returns the kind of associated editor for direct edition.

 	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see

-	 *         org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 *         org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/LifelineEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/LifelineEditPart.java
index e1a4c5bde74..ff33f024b47 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/LifelineEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/LifelineEditPart.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.parts;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.parts;

 

 import java.util.ArrayList;

 import java.util.LinkedList;

@@ -71,28 +71,28 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.gmf.runtime.notation.datatype.GradientData;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.common.draw2d.anchors.LifelineAnchor;

-import org.eclipse.papyrus.diagram.common.editparts.NamedElementEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.BorderItemResizableEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.NodeNamedElementFigure;

-import org.eclipse.papyrus.diagram.common.providers.UIAdapterImpl;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.CustomDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.ElementCreationWithMessageEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.LifelineAppliedStereotypeNodeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.LifelineCreationEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.LifelineItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.LifelineXYLayoutEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.diagram.sequence.figures.LifelineDotLineCustomFigure;

-import org.eclipse.papyrus.diagram.sequence.locator.CenterLocator;

-import org.eclipse.papyrus.diagram.sequence.locator.TimeMarkElementPositionLocator;

-import org.eclipse.papyrus.diagram.sequence.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.sequence.util.CommandHelper;

-import org.eclipse.papyrus.diagram.sequence.util.NotificationHelper;

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.common.draw2d.anchors.LifelineAnchor;

+import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure;

+import org.eclipse.papyrus.uml.diagram.common.providers.UIAdapterImpl;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.ElementCreationWithMessageEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.LifelineAppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.LifelineCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.LifelineItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.LifelineXYLayoutEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.figures.LifelineDotLineCustomFigure;

+import org.eclipse.papyrus.uml.diagram.sequence.locator.CenterLocator;

+import org.eclipse.papyrus.uml.diagram.sequence.locator.TimeMarkElementPositionLocator;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.sequence.util.CommandHelper;

+import org.eclipse.papyrus.uml.diagram.sequence.util.NotificationHelper;

 import org.eclipse.swt.graphics.Color;

 import org.eclipse.uml2.uml.ConnectableElement;

 import org.eclipse.uml2.uml.InteractionFragment;

@@ -173,7 +173,7 @@ public class LifelineEditPart extends NamedElementEditPart {
 

 

 		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.diagram.sequence.edit.policies.LifelineCanonicalEditPolicy());

+		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.sequence.edit.policies.LifelineCanonicalEditPolicy());

 

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, new LifelineXYLayoutEditPolicy());

@@ -504,7 +504,7 @@ public class LifelineEditPart extends NamedElementEditPart {
 		if(targetEditPart instanceof ContinuationEditPart) {

 			types.add(UMLElementTypes.Message_4003);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.LifelineEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineEditPart) {

 			types.add(UMLElementTypes.Message_4003);

 		}

 		if(targetEditPart instanceof ActionExecutionSpecificationEditPart) {

@@ -561,7 +561,7 @@ public class LifelineEditPart extends NamedElementEditPart {
 		if(targetEditPart instanceof ContinuationEditPart) {

 			types.add(UMLElementTypes.Message_4004);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.LifelineEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineEditPart) {

 			types.add(UMLElementTypes.Message_4004);

 		}

 		if(targetEditPart instanceof ActionExecutionSpecificationEditPart) {

@@ -618,7 +618,7 @@ public class LifelineEditPart extends NamedElementEditPart {
 		if(targetEditPart instanceof ContinuationEditPart) {

 			types.add(UMLElementTypes.Message_4005);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.LifelineEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineEditPart) {

 			types.add(UMLElementTypes.Message_4005);

 		}

 		if(targetEditPart instanceof ActionExecutionSpecificationEditPart) {

@@ -675,7 +675,7 @@ public class LifelineEditPart extends NamedElementEditPart {
 		if(targetEditPart instanceof ContinuationEditPart) {

 			types.add(UMLElementTypes.Message_4006);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.LifelineEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineEditPart) {

 			types.add(UMLElementTypes.Message_4006);

 		}

 		if(targetEditPart instanceof ActionExecutionSpecificationEditPart) {

@@ -732,7 +732,7 @@ public class LifelineEditPart extends NamedElementEditPart {
 		if(targetEditPart instanceof ContinuationEditPart) {

 			types.add(UMLElementTypes.Message_4007);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.LifelineEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineEditPart) {

 			types.add(UMLElementTypes.Message_4007);

 		}

 		if(targetEditPart instanceof ActionExecutionSpecificationEditPart) {

@@ -789,7 +789,7 @@ public class LifelineEditPart extends NamedElementEditPart {
 		if(targetEditPart instanceof ContinuationEditPart) {

 			types.add(UMLElementTypes.Message_4008);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.LifelineEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineEditPart) {

 			types.add(UMLElementTypes.Message_4008);

 		}

 		if(targetEditPart instanceof ActionExecutionSpecificationEditPart) {

@@ -846,7 +846,7 @@ public class LifelineEditPart extends NamedElementEditPart {
 		if(targetEditPart instanceof ContinuationEditPart) {

 			types.add(UMLElementTypes.Message_4009);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.LifelineEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineEditPart) {

 			types.add(UMLElementTypes.Message_4009);

 		}

 		if(targetEditPart instanceof ActionExecutionSpecificationEditPart) {

@@ -1257,7 +1257,7 @@ public class LifelineEditPart extends NamedElementEditPart {
 		/**

 		 * Get the rectangle which contains all labels

 		 * 

-		 * @see org.eclipse.papyrus.diagram.common.figure.node.NodeNamedElementFigure#getDefaultLabelsContainer()

+		 * @see org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure#getDefaultLabelsContainer()

 		 * @return lifeline labels rectangle

 		 */

 		@Override

@@ -1268,7 +1268,7 @@ public class LifelineEditPart extends NamedElementEditPart {
 		/**

 		 * Create the composite structure.

 		 * 

-		 * @see org.eclipse.papyrus.diagram.common.figure.node.PapyrusNodeFigure#createCompositeFigureStructure()

+		 * @see org.eclipse.papyrus.uml.diagram.common.figure.node.PapyrusNodeFigure#createCompositeFigureStructure()

 		 */

 		@Override

 		protected void createCompositeFigureStructure() {

@@ -1282,7 +1282,7 @@ public class LifelineEditPart extends NamedElementEditPart {
 		/**

 		 * Paint the label rectangle as background instead of the whole figure

 		 * 

-		 * @see org.eclipse.papyrus.diagram.common.figure.node.PapyrusNodeFigure#paintBackground(org.eclipse.draw2d.Graphics,

+		 * @see org.eclipse.papyrus.uml.diagram.common.figure.node.PapyrusNodeFigure#paintBackground(org.eclipse.draw2d.Graphics,

 		 *      org.eclipse.draw2d.geometry.Rectangle)

 		 * @param graphics

 		 *        graphics tool

@@ -1297,7 +1297,7 @@ public class LifelineEditPart extends NamedElementEditPart {
 		/**

 		 * Get the figure on which the border must be drawn.

 		 * 

-		 * @see org.eclipse.papyrus.diagram.common.figure.node.PapyrusNodeFigure#getBorderedFigure()

+		 * @see org.eclipse.papyrus.uml.diagram.common.figure.node.PapyrusNodeFigure#getBorderedFigure()

 		 * @return the rectangle containing labels

 		 */

 		@Override

@@ -1308,7 +1308,7 @@ public class LifelineEditPart extends NamedElementEditPart {
 		/**

 		 * Construct the appropriate border

 		 * 

-		 * @see org.eclipse.papyrus.diagram.common.figure.node.PapyrusNodeFigure#getDefaultBorder(org.eclipse.swt.graphics.Color)

+		 * @see org.eclipse.papyrus.uml.diagram.common.figure.node.PapyrusNodeFigure#getDefaultBorder(org.eclipse.swt.graphics.Color)

 		 * @param borderColor

 		 *        the color of the border

 		 * @return the border

@@ -1334,7 +1334,7 @@ public class LifelineEditPart extends NamedElementEditPart {
 		/**

 		 * Create the name label with width wrap

 		 * 

-		 * @see org.eclipse.papyrus.diagram.common.figure.node.NodeNamedElementFigure#createNameLabel()

+		 * @see org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure#createNameLabel()

 		 */

 		@Override

 		protected void createNameLabel() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/LifelineNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/LifelineNameEditPart.java
index 21d8c538483..82148de70aa 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/LifelineNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/LifelineNameEditPart.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.parts;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -50,19 +50,19 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -318,7 +318,7 @@ public class LifelineNameEditPart extends CompartmentEditPart implements ITextAw
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Lifeline_3001, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.sequence.edit.parts.LifelineNameEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Lifeline_3001, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineNameEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -562,7 +562,7 @@ public class LifelineNameEditPart extends CompartmentEditPart implements ITextAw
 	 * Returns the kind of associated editor for direct edition.

 	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see

-	 *         org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 *         org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/Message2EditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/Message2EditPart.java
index af3b28ac2c4..f91b1eb1a7f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/Message2EditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/Message2EditPart.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.parts;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.parts;

 

 import org.eclipse.draw2d.ColorConstants;

 import org.eclipse.draw2d.Connection;

@@ -28,14 +28,14 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.diagram.ui.requests.CreateUnspecifiedTypeRequest;

 import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.edge.UMLEdgeFigure;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.CreationOnMessageEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.LifelineChildGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.Message2ItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.MessageConnectionEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.MessageConnectionLineSegEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.util.SequenceUtil;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.edge.UMLEdgeFigure;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.CreationOnMessageEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.LifelineChildGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.Message2ItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.MessageConnectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.MessageConnectionLineSegEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceUtil;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.graphics.Font;

 import org.eclipse.swt.widgets.Display;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/Message3EditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/Message3EditPart.java
index 25427a72610..28af012ac11 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/Message3EditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/Message3EditPart.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.parts;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.parts;

 

 import org.eclipse.draw2d.ColorConstants;

 import org.eclipse.draw2d.Connection;

@@ -30,14 +30,14 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.diagram.ui.requests.CreateUnspecifiedTypeRequest;

 import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.edge.UMLEdgeFigure;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.CreationOnMessageEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.LifelineChildGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.Message3ItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.MessageConnectionEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.MessageConnectionLineSegEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.util.SequenceUtil;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.edge.UMLEdgeFigure;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.CreationOnMessageEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.LifelineChildGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.Message3ItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.MessageConnectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.MessageConnectionLineSegEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceUtil;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.graphics.Font;

 import org.eclipse.swt.widgets.Display;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/Message4EditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/Message4EditPart.java
index c6d29bdc035..04a2625b5c2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/Message4EditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/Message4EditPart.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.parts;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.parts;

 

 import org.eclipse.draw2d.ColorConstants;

 import org.eclipse.draw2d.Connection;

@@ -30,14 +30,14 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.diagram.ui.requests.CreateUnspecifiedTypeRequest;

 import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.edge.UMLEdgeFigure;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.CreationOnMessageEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.LifelineChildGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.Message4ItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.MessageConnectionEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.MessageConnectionLineSegEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.util.SequenceUtil;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.edge.UMLEdgeFigure;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.CreationOnMessageEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.LifelineChildGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.Message4ItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.MessageConnectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.MessageConnectionLineSegEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceUtil;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.graphics.Font;

 import org.eclipse.swt.widgets.Display;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/Message5EditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/Message5EditPart.java
index 652be306645..3b962c8db9e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/Message5EditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/Message5EditPart.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.parts;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.parts;

 

 import org.eclipse.draw2d.ColorConstants;

 import org.eclipse.draw2d.Connection;

@@ -29,14 +29,14 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.diagram.ui.requests.CreateUnspecifiedTypeRequest;

 import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.edge.UMLEdgeFigure;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.CreationOnMessageEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.LifelineChildGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.Message5ItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.MessageConnectionEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.MessageConnectionLineSegEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.util.SequenceUtil;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.edge.UMLEdgeFigure;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.CreationOnMessageEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.LifelineChildGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.Message5ItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.MessageConnectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.MessageConnectionLineSegEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceUtil;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.graphics.Font;

 import org.eclipse.swt.widgets.Display;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/Message6EditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/Message6EditPart.java
index a68e98fd0bb..9d218cbb1c2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/Message6EditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/Message6EditPart.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.parts;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.parts;

 

 import org.eclipse.draw2d.ColorConstants;

 import org.eclipse.draw2d.Connection;

@@ -28,15 +28,15 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.diagram.ui.requests.CreateUnspecifiedTypeRequest;

 import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.edge.UMLEdgeFigure;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.CreationOnMessageEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.LifelineChildGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.Message6ItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.MessageConnectionEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.MessageConnectionLineSegEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.figures.EllipseDecoration;

-import org.eclipse.papyrus.diagram.sequence.util.SequenceUtil;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.edge.UMLEdgeFigure;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.CreationOnMessageEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.LifelineChildGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.Message6ItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.MessageConnectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.MessageConnectionLineSegEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.figures.EllipseDecoration;

+import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceUtil;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.graphics.Font;

 import org.eclipse.swt.widgets.Display;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/Message7EditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/Message7EditPart.java
index 825f19ddbe8..7d6407f3af8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/Message7EditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/Message7EditPart.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.parts;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.parts;

 

 import org.eclipse.draw2d.ColorConstants;

 import org.eclipse.draw2d.Connection;

@@ -30,15 +30,15 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.diagram.ui.requests.CreateUnspecifiedTypeRequest;

 import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.edge.UMLEdgeFigure;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.CreationOnMessageEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.LifelineChildGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.Message7ItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.MessageConnectionEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.MessageConnectionLineSegEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.figures.EllipseDecoration;

-import org.eclipse.papyrus.diagram.sequence.util.SequenceUtil;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.edge.UMLEdgeFigure;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.CreationOnMessageEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.LifelineChildGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.Message7ItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.MessageConnectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.MessageConnectionLineSegEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.figures.EllipseDecoration;

+import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceUtil;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.graphics.Font;

 import org.eclipse.swt.widgets.Display;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/MessageAsyncAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/MessageAsyncAppliedStereotypeEditPart.java
index 1f15e04eeb3..cc9017aba32 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/MessageAsyncAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/MessageAsyncAppliedStereotypeEditPart.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.parts;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -51,14 +51,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -68,6 +60,14 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -123,7 +123,7 @@ public class MessageAsyncAppliedStereotypeEditPart extends LabelEditPart impleme
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.sequence.edit.parts.MessageAsyncAppliedStereotypeEditPart.VISUAL_ID), new Point(1, -33));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageAsyncAppliedStereotypeEditPart.VISUAL_ID), new Point(1, -33));

 	}

 

 	/**

@@ -339,7 +339,7 @@ public class MessageAsyncAppliedStereotypeEditPart extends LabelEditPart impleme
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Message_4004, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.sequence.edit.parts.MessageAsyncAppliedStereotypeEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Message_4004, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageAsyncAppliedStereotypeEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -587,7 +587,7 @@ public class MessageAsyncAppliedStereotypeEditPart extends LabelEditPart impleme
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/MessageCreateAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/MessageCreateAppliedStereotypeEditPart.java
index 8ba153daf12..f07d129a864 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/MessageCreateAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/MessageCreateAppliedStereotypeEditPart.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.parts;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -51,14 +51,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -68,6 +60,14 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -123,7 +123,7 @@ public class MessageCreateAppliedStereotypeEditPart extends LabelEditPart implem
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.sequence.edit.parts.MessageCreateAppliedStereotypeEditPart.VISUAL_ID), new Point(1, -33));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageCreateAppliedStereotypeEditPart.VISUAL_ID), new Point(1, -33));

 	}

 

 	/**

@@ -339,7 +339,7 @@ public class MessageCreateAppliedStereotypeEditPart extends LabelEditPart implem
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Message_4006, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.sequence.edit.parts.MessageCreateAppliedStereotypeEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Message_4006, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageCreateAppliedStereotypeEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -587,7 +587,7 @@ public class MessageCreateAppliedStereotypeEditPart extends LabelEditPart implem
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/MessageDeleteAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/MessageDeleteAppliedStereotypeEditPart.java
index 5558fd7bbbc..47376cb14af 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/MessageDeleteAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/MessageDeleteAppliedStereotypeEditPart.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.parts;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -51,14 +51,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -68,6 +60,14 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -123,7 +123,7 @@ public class MessageDeleteAppliedStereotypeEditPart extends LabelEditPart implem
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.sequence.edit.parts.MessageDeleteAppliedStereotypeEditPart.VISUAL_ID), new Point(1, -33));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageDeleteAppliedStereotypeEditPart.VISUAL_ID), new Point(1, -33));

 	}

 

 	/**

@@ -339,7 +339,7 @@ public class MessageDeleteAppliedStereotypeEditPart extends LabelEditPart implem
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Message_4007, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.sequence.edit.parts.MessageDeleteAppliedStereotypeEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Message_4007, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageDeleteAppliedStereotypeEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -587,7 +587,7 @@ public class MessageDeleteAppliedStereotypeEditPart extends LabelEditPart implem
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/MessageEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/MessageEditPart.java
index 218f87bad7d..17a348e7e45 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/MessageEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/MessageEditPart.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.parts;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.parts;

 

 import org.eclipse.draw2d.ColorConstants;

 import org.eclipse.draw2d.Connection;

@@ -30,14 +30,14 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.diagram.ui.requests.CreateUnspecifiedTypeRequest;

 import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.edge.UMLEdgeFigure;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.CreationOnMessageEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.LifelineChildGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.MessageConnectionEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.MessageConnectionLineSegEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.MessageItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.util.SequenceUtil;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.edge.UMLEdgeFigure;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.CreationOnMessageEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.LifelineChildGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.MessageConnectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.MessageConnectionLineSegEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.MessageItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceUtil;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.graphics.Font;

 import org.eclipse.swt.widgets.Display;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/MessageFoundAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/MessageFoundAppliedStereotypeEditPart.java
index 2b943cbef22..77dfe84084e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/MessageFoundAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/MessageFoundAppliedStereotypeEditPart.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.parts;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -52,15 +52,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.common.util.DiagramEditPartsUtil;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -70,8 +61,17 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

-import org.eclipse.papyrus.umlutils.ui.VisualInformationPapyrusConstant;

-import org.eclipse.papyrus.umlutils.ui.helper.NameLabelIconHelper;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.tools.utils.ui.VisualInformationPapyrusConstant;

+import org.eclipse.papyrus.uml.tools.utils.ui.helper.NameLabelIconHelper;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -127,7 +127,7 @@ public class MessageFoundAppliedStereotypeEditPart extends LabelEditPart impleme
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.sequence.edit.parts.MessageFoundAppliedStereotypeEditPart.VISUAL_ID), new Point(1, -33));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageFoundAppliedStereotypeEditPart.VISUAL_ID), new Point(1, -33));

 	}

 

 	/**

@@ -355,7 +355,7 @@ public class MessageFoundAppliedStereotypeEditPart extends LabelEditPart impleme
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Message_4009, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.sequence.edit.parts.MessageFoundAppliedStereotypeEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Message_4009, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageFoundAppliedStereotypeEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -603,7 +603,7 @@ public class MessageFoundAppliedStereotypeEditPart extends LabelEditPart impleme
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/MessageLostAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/MessageLostAppliedStereotypeEditPart.java
index ae2a71d7e1a..56520254958 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/MessageLostAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/MessageLostAppliedStereotypeEditPart.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.parts;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -51,14 +51,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -68,6 +60,14 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -123,7 +123,7 @@ public class MessageLostAppliedStereotypeEditPart extends LabelEditPart implemen
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.sequence.edit.parts.MessageLostAppliedStereotypeEditPart.VISUAL_ID), new Point(1, -33));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageLostAppliedStereotypeEditPart.VISUAL_ID), new Point(1, -33));

 	}

 

 	/**

@@ -339,7 +339,7 @@ public class MessageLostAppliedStereotypeEditPart extends LabelEditPart implemen
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Message_4008, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.sequence.edit.parts.MessageLostAppliedStereotypeEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Message_4008, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageLostAppliedStereotypeEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -587,7 +587,7 @@ public class MessageLostAppliedStereotypeEditPart extends LabelEditPart implemen
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/MessageName2EditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/MessageName2EditPart.java
index 813fade8848..7fd912a854d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/MessageName2EditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/MessageName2EditPart.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.parts;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -51,14 +51,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -68,6 +60,14 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -115,7 +115,7 @@ public class MessageName2EditPart extends LabelEditPart implements ITextAwareEdi
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.sequence.edit.parts.MessageName2EditPart.VISUAL_ID), new Point(1, -13));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageName2EditPart.VISUAL_ID), new Point(1, -13));

 	}

 

 	/**

@@ -331,7 +331,7 @@ public class MessageName2EditPart extends LabelEditPart implements ITextAwareEdi
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Message_4004, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.sequence.edit.parts.MessageName2EditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Message_4004, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageName2EditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -580,7 +580,7 @@ public class MessageName2EditPart extends LabelEditPart implements ITextAwareEdi
 	 * Returns the kind of associated editor for direct edition.

 	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see

-	 *         org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 *         org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/MessageName3EditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/MessageName3EditPart.java
index 0ade0f375c1..aa60cd2c81f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/MessageName3EditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/MessageName3EditPart.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.parts;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -51,14 +51,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -68,6 +60,14 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -115,7 +115,7 @@ public class MessageName3EditPart extends LabelEditPart implements ITextAwareEdi
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.sequence.edit.parts.MessageName3EditPart.VISUAL_ID), new Point(1, -13));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageName3EditPart.VISUAL_ID), new Point(1, -13));

 	}

 

 	/**

@@ -331,7 +331,7 @@ public class MessageName3EditPart extends LabelEditPart implements ITextAwareEdi
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Message_4005, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.sequence.edit.parts.MessageName3EditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Message_4005, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageName3EditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -580,7 +580,7 @@ public class MessageName3EditPart extends LabelEditPart implements ITextAwareEdi
 	 * Returns the kind of associated editor for direct edition.

 	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see

-	 *         org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 *         org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/MessageName4EditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/MessageName4EditPart.java
index eeeb3dd0b77..36a55f7178b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/MessageName4EditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/MessageName4EditPart.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.parts;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -51,14 +51,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -68,6 +60,14 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -115,7 +115,7 @@ public class MessageName4EditPart extends LabelEditPart implements ITextAwareEdi
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.sequence.edit.parts.MessageName4EditPart.VISUAL_ID), new Point(1, -13));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageName4EditPart.VISUAL_ID), new Point(1, -13));

 	}

 

 	/**

@@ -331,7 +331,7 @@ public class MessageName4EditPart extends LabelEditPart implements ITextAwareEdi
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Message_4006, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.sequence.edit.parts.MessageName4EditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Message_4006, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageName4EditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -580,7 +580,7 @@ public class MessageName4EditPart extends LabelEditPart implements ITextAwareEdi
 	 * Returns the kind of associated editor for direct edition.

 	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see

-	 *         org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 *         org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/MessageName5EditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/MessageName5EditPart.java
index 897440a2040..6519df48661 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/MessageName5EditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/MessageName5EditPart.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.parts;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -51,14 +51,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -68,6 +60,14 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -115,7 +115,7 @@ public class MessageName5EditPart extends LabelEditPart implements ITextAwareEdi
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.sequence.edit.parts.MessageName5EditPart.VISUAL_ID), new Point(1, -13));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageName5EditPart.VISUAL_ID), new Point(1, -13));

 	}

 

 	/**

@@ -331,7 +331,7 @@ public class MessageName5EditPart extends LabelEditPart implements ITextAwareEdi
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Message_4007, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.sequence.edit.parts.MessageName5EditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Message_4007, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageName5EditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -580,7 +580,7 @@ public class MessageName5EditPart extends LabelEditPart implements ITextAwareEdi
 	 * Returns the kind of associated editor for direct edition.

 	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see

-	 *         org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 *         org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/MessageName6EditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/MessageName6EditPart.java
index 630937be9f5..8c54850ace0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/MessageName6EditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/MessageName6EditPart.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.parts;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -51,14 +51,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -68,6 +60,14 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -115,7 +115,7 @@ public class MessageName6EditPart extends LabelEditPart implements ITextAwareEdi
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.sequence.edit.parts.MessageName6EditPart.VISUAL_ID), new Point(1, -13));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageName6EditPart.VISUAL_ID), new Point(1, -13));

 	}

 

 	/**

@@ -331,7 +331,7 @@ public class MessageName6EditPart extends LabelEditPart implements ITextAwareEdi
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Message_4008, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.sequence.edit.parts.MessageName6EditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Message_4008, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageName6EditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -580,7 +580,7 @@ public class MessageName6EditPart extends LabelEditPart implements ITextAwareEdi
 	 * Returns the kind of associated editor for direct edition.

 	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see

-	 *         org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 *         org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/MessageName7EditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/MessageName7EditPart.java
index 4a08c335221..5b043f38299 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/MessageName7EditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/MessageName7EditPart.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.parts;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -51,14 +51,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -68,6 +60,14 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -115,7 +115,7 @@ public class MessageName7EditPart extends LabelEditPart implements ITextAwareEdi
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.sequence.edit.parts.MessageName7EditPart.VISUAL_ID), new Point(1, -13));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageName7EditPart.VISUAL_ID), new Point(1, -13));

 	}

 

 	/**

@@ -331,7 +331,7 @@ public class MessageName7EditPart extends LabelEditPart implements ITextAwareEdi
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Message_4009, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.sequence.edit.parts.MessageName7EditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Message_4009, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageName7EditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -580,7 +580,7 @@ public class MessageName7EditPart extends LabelEditPart implements ITextAwareEdi
 	 * Returns the kind of associated editor for direct edition.

 	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see

-	 *         org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 *         org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/MessageNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/MessageNameEditPart.java
index cbb95d0daec..403ae8160d1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/MessageNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/MessageNameEditPart.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.parts;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -51,14 +51,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -68,6 +60,14 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -115,7 +115,7 @@ public class MessageNameEditPart extends LabelEditPart implements ITextAwareEdit
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.sequence.edit.parts.MessageNameEditPart.VISUAL_ID), new Point(1, -13));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageNameEditPart.VISUAL_ID), new Point(1, -13));

 	}

 

 	/**

@@ -331,7 +331,7 @@ public class MessageNameEditPart extends LabelEditPart implements ITextAwareEdit
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Message_4003, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.sequence.edit.parts.MessageNameEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Message_4003, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageNameEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -580,7 +580,7 @@ public class MessageNameEditPart extends LabelEditPart implements ITextAwareEdit
 	 * Returns the kind of associated editor for direct edition.

 	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see

-	 *         org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 *         org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/MessageReplyAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/MessageReplyAppliedStereotypeEditPart.java
index 906063def9a..1cb0d92af23 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/MessageReplyAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/MessageReplyAppliedStereotypeEditPart.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.parts;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -51,14 +51,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -68,6 +60,14 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -123,7 +123,7 @@ public class MessageReplyAppliedStereotypeEditPart extends LabelEditPart impleme
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.sequence.edit.parts.MessageReplyAppliedStereotypeEditPart.VISUAL_ID), new Point(1, -33));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageReplyAppliedStereotypeEditPart.VISUAL_ID), new Point(1, -33));

 	}

 

 	/**

@@ -339,7 +339,7 @@ public class MessageReplyAppliedStereotypeEditPart extends LabelEditPart impleme
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Message_4005, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.sequence.edit.parts.MessageReplyAppliedStereotypeEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Message_4005, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageReplyAppliedStereotypeEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -587,7 +587,7 @@ public class MessageReplyAppliedStereotypeEditPart extends LabelEditPart impleme
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/MessageSyncAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/MessageSyncAppliedStereotypeEditPart.java
index ade98b614ed..fd7044fe2cb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/MessageSyncAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/MessageSyncAppliedStereotypeEditPart.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.parts;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -51,14 +51,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -68,6 +60,14 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -123,7 +123,7 @@ public class MessageSyncAppliedStereotypeEditPart extends LabelEditPart implemen
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.sequence.edit.parts.MessageSyncAppliedStereotypeEditPart.VISUAL_ID), new Point(1, -33));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageSyncAppliedStereotypeEditPart.VISUAL_ID), new Point(1, -33));

 	}

 

 	/**

@@ -339,7 +339,7 @@ public class MessageSyncAppliedStereotypeEditPart extends LabelEditPart implemen
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Message_4003, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.sequence.edit.parts.MessageSyncAppliedStereotypeEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Message_4003, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageSyncAppliedStereotypeEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -587,7 +587,7 @@ public class MessageSyncAppliedStereotypeEditPart extends LabelEditPart implemen
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/PackageEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/PackageEditPart.java
index fdbad868592..97a311e3611 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/PackageEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/PackageEditPart.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.parts;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -31,13 +31,13 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.NonResizableLabelEditPolicy;

 import org.eclipse.gmf.runtime.diagram.ui.figures.BorderedNodeFigure;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.editpolicies.DuplicatePasteEditPolicy;

-import org.eclipse.papyrus.diagram.common.providers.ViewInfo;

-import org.eclipse.papyrus.diagram.common.util.MDTUtil;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.CustomDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.PackageItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.diagram.sequence.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.providers.ViewInfo;

+import org.eclipse.papyrus.uml.diagram.common.util.MDTUtil;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.PackageItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLVisualIDRegistry;

 

 /**

  * @generated

@@ -119,7 +119,7 @@ public class PackageEditPart extends DiagramEditPart {
 		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new PackageItemSemanticEditPolicy());

 

 		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.diagram.sequence.edit.policies.PackageCanonicalEditPolicy());

+		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.sequence.edit.policies.PackageCanonicalEditPolicy());

 

 		installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/StateInvariantEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/StateInvariantEditPart.java
index bc1d59a634d..fb311896968 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/StateInvariantEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/StateInvariantEditPart.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.parts;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.parts;

 

 import java.util.ArrayList;

 import java.util.LinkedList;

@@ -42,15 +42,15 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.common.draw2d.CenterLayout;

-import org.eclipse.papyrus.diagram.common.figure.node.CenteredWrappedLabel;

-import org.eclipse.papyrus.diagram.common.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.StateInvariantItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.sequence.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.common.draw2d.CenterLayout;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.CenteredWrappedLabel;

+import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.StateInvariantItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

 import org.eclipse.swt.graphics.Color;

 

 /**

@@ -324,7 +324,7 @@ AbstractBorderItemEditPart {
 		if(targetEditPart instanceof BehaviorExecutionSpecificationEditPart) {

 			types.add(UMLElementTypes.Message_4003);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.StateInvariantEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.StateInvariantEditPart) {

 			types.add(UMLElementTypes.Message_4003);

 		}

 		if(targetEditPart instanceof CombinedFragment2EditPart) {

@@ -381,7 +381,7 @@ AbstractBorderItemEditPart {
 		if(targetEditPart instanceof BehaviorExecutionSpecificationEditPart) {

 			types.add(UMLElementTypes.Message_4004);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.StateInvariantEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.StateInvariantEditPart) {

 			types.add(UMLElementTypes.Message_4004);

 		}

 		if(targetEditPart instanceof CombinedFragment2EditPart) {

@@ -438,7 +438,7 @@ AbstractBorderItemEditPart {
 		if(targetEditPart instanceof BehaviorExecutionSpecificationEditPart) {

 			types.add(UMLElementTypes.Message_4005);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.StateInvariantEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.StateInvariantEditPart) {

 			types.add(UMLElementTypes.Message_4005);

 		}

 		if(targetEditPart instanceof CombinedFragment2EditPart) {

@@ -495,7 +495,7 @@ AbstractBorderItemEditPart {
 		if(targetEditPart instanceof BehaviorExecutionSpecificationEditPart) {

 			types.add(UMLElementTypes.Message_4006);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.StateInvariantEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.StateInvariantEditPart) {

 			types.add(UMLElementTypes.Message_4006);

 		}

 		if(targetEditPart instanceof CombinedFragment2EditPart) {

@@ -552,7 +552,7 @@ AbstractBorderItemEditPart {
 		if(targetEditPart instanceof BehaviorExecutionSpecificationEditPart) {

 			types.add(UMLElementTypes.Message_4007);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.StateInvariantEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.StateInvariantEditPart) {

 			types.add(UMLElementTypes.Message_4007);

 		}

 		if(targetEditPart instanceof CombinedFragment2EditPart) {

@@ -609,7 +609,7 @@ AbstractBorderItemEditPart {
 		if(targetEditPart instanceof BehaviorExecutionSpecificationEditPart) {

 			types.add(UMLElementTypes.Message_4008);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.StateInvariantEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.StateInvariantEditPart) {

 			types.add(UMLElementTypes.Message_4008);

 		}

 		if(targetEditPart instanceof CombinedFragment2EditPart) {

@@ -666,7 +666,7 @@ AbstractBorderItemEditPart {
 		if(targetEditPart instanceof BehaviorExecutionSpecificationEditPart) {

 			types.add(UMLElementTypes.Message_4009);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.StateInvariantEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.StateInvariantEditPart) {

 			types.add(UMLElementTypes.Message_4009);

 		}

 		if(targetEditPart instanceof CombinedFragment2EditPart) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/StateInvariantNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/StateInvariantNameEditPart.java
index 74230b3b61a..6b25a34c20a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/StateInvariantNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/StateInvariantNameEditPart.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.parts;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -51,16 +51,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.CenteredWrappedLabel;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.common.util.DiagramEditPartsUtil;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -70,8 +60,18 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

-import org.eclipse.papyrus.umlutils.ui.VisualInformationPapyrusConstant;

-import org.eclipse.papyrus.umlutils.ui.helper.NameLabelIconHelper;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.CenteredWrappedLabel;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.tools.utils.ui.VisualInformationPapyrusConstant;

+import org.eclipse.papyrus.uml.tools.utils.ui.helper.NameLabelIconHelper;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -333,7 +333,7 @@ public class StateInvariantNameEditPart extends CompartmentEditPart implements I
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.StateInvariant_3017, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.sequence.edit.parts.StateInvariantNameEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.StateInvariant_3017, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.sequence.edit.parts.StateInvariantNameEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -581,7 +581,7 @@ public class StateInvariantNameEditPart extends CompartmentEditPart implements I
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/TimeConstraintAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/TimeConstraintAppliedStereotypeEditPart.java
index 3ed7c7a8fb0..c9f1e437592 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/TimeConstraintAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/TimeConstraintAppliedStereotypeEditPart.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.parts;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -53,19 +53,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editparts.IPapyrusEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.common.util.DiagramEditPartsUtil;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -75,7 +62,20 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

-import org.eclipse.papyrus.umlutils.ui.helper.NameLabelIconHelper;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.IPapyrusEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.tools.utils.ui.helper.NameLabelIconHelper;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -135,7 +135,7 @@ implements ITextAwareEditPart, IBorderItemEditPart, IPapyrusEditPart {
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.sequence.edit.parts.TimeConstraintAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.sequence.edit.parts.TimeConstraintAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 0));

 	}

 

 	/**

@@ -379,7 +379,7 @@ implements ITextAwareEditPart, IBorderItemEditPart, IPapyrusEditPart {
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.TimeConstraint_3019, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.sequence.edit.parts.TimeConstraintAppliedStereotypeEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.TimeConstraint_3019, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.sequence.edit.parts.TimeConstraintAppliedStereotypeEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -627,7 +627,7 @@ implements ITextAwareEditPart, IBorderItemEditPart, IPapyrusEditPart {
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/TimeConstraintEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/TimeConstraintEditPart.java
index 6af57c0a3fe..55942bec103 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/TimeConstraintEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/TimeConstraintEditPart.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.parts;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.parts;

 

 import java.util.ArrayList;

 import java.util.HashMap;

@@ -56,16 +56,16 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.common.locator.ExternalLabelPositionLocator;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.DeleteTimeElementWithoutEventPolicy;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.ExternalLabelPrimaryDragRoleEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.TimeConstraintItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.TimeRelatedSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.sequence.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.common.locator.ExternalLabelPositionLocator;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.DeleteTimeElementWithoutEventPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.ExternalLabelPrimaryDragRoleEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.TimeConstraintItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.TimeRelatedSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

 import org.eclipse.swt.graphics.Color;

 

 /**

@@ -330,7 +330,7 @@ BorderedBorderItemEditPart {
 		if(targetEditPart instanceof CombinedFragment2EditPart) {

 			types.add(UMLElementTypes.Message_4003);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.TimeConstraintEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.TimeConstraintEditPart) {

 			types.add(UMLElementTypes.Message_4003);

 		}

 		if(targetEditPart instanceof TimeObservationEditPart) {

@@ -387,7 +387,7 @@ BorderedBorderItemEditPart {
 		if(targetEditPart instanceof CombinedFragment2EditPart) {

 			types.add(UMLElementTypes.Message_4004);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.TimeConstraintEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.TimeConstraintEditPart) {

 			types.add(UMLElementTypes.Message_4004);

 		}

 		if(targetEditPart instanceof TimeObservationEditPart) {

@@ -444,7 +444,7 @@ BorderedBorderItemEditPart {
 		if(targetEditPart instanceof CombinedFragment2EditPart) {

 			types.add(UMLElementTypes.Message_4005);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.TimeConstraintEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.TimeConstraintEditPart) {

 			types.add(UMLElementTypes.Message_4005);

 		}

 		if(targetEditPart instanceof TimeObservationEditPart) {

@@ -501,7 +501,7 @@ BorderedBorderItemEditPart {
 		if(targetEditPart instanceof CombinedFragment2EditPart) {

 			types.add(UMLElementTypes.Message_4006);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.TimeConstraintEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.TimeConstraintEditPart) {

 			types.add(UMLElementTypes.Message_4006);

 		}

 		if(targetEditPart instanceof TimeObservationEditPart) {

@@ -558,7 +558,7 @@ BorderedBorderItemEditPart {
 		if(targetEditPart instanceof CombinedFragment2EditPart) {

 			types.add(UMLElementTypes.Message_4007);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.TimeConstraintEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.TimeConstraintEditPart) {

 			types.add(UMLElementTypes.Message_4007);

 		}

 		if(targetEditPart instanceof TimeObservationEditPart) {

@@ -615,7 +615,7 @@ BorderedBorderItemEditPart {
 		if(targetEditPart instanceof CombinedFragment2EditPart) {

 			types.add(UMLElementTypes.Message_4008);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.TimeConstraintEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.TimeConstraintEditPart) {

 			types.add(UMLElementTypes.Message_4008);

 		}

 		if(targetEditPart instanceof TimeObservationEditPart) {

@@ -672,7 +672,7 @@ BorderedBorderItemEditPart {
 		if(targetEditPart instanceof CombinedFragment2EditPart) {

 			types.add(UMLElementTypes.Message_4009);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.TimeConstraintEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.TimeConstraintEditPart) {

 			types.add(UMLElementTypes.Message_4009);

 		}

 		if(targetEditPart instanceof TimeObservationEditPart) {

@@ -729,7 +729,7 @@ BorderedBorderItemEditPart {
 		if(targetEditPart instanceof CombinedFragment2EditPart) {

 			types.add(UMLElementTypes.ConstraintConstrainedElement_4011);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.TimeConstraintEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.TimeConstraintEditPart) {

 			types.add(UMLElementTypes.ConstraintConstrainedElement_4011);

 		}

 		if(targetEditPart instanceof TimeObservationEditPart) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/TimeConstraintLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/TimeConstraintLabelEditPart.java
index 74476f739b0..a313cde32c7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/TimeConstraintLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/TimeConstraintLabelEditPart.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.parts;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -54,14 +54,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -71,6 +63,14 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -118,7 +118,7 @@ public class TimeConstraintLabelEditPart extends LabelEditPart implements ITextA
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.sequence.edit.parts.TimeConstraintLabelEditPart.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.sequence.edit.parts.TimeConstraintLabelEditPart.VISUAL_ID), new Point(0, 0));

 	}

 

 	/**

@@ -349,7 +349,7 @@ public class TimeConstraintLabelEditPart extends LabelEditPart implements ITextA
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.TimeConstraint_3019, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.sequence.edit.parts.TimeConstraintLabelEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.TimeConstraint_3019, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.sequence.edit.parts.TimeConstraintLabelEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -597,7 +597,7 @@ public class TimeConstraintLabelEditPart extends LabelEditPart implements ITextA
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/TimeObservationAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/TimeObservationAppliedStereotypeEditPart.java
index 00fb7db35c0..0c2b1693fab 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/TimeObservationAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/TimeObservationAppliedStereotypeEditPart.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.parts;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -53,19 +53,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editparts.IPapyrusEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.common.util.DiagramEditPartsUtil;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -75,7 +62,20 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

-import org.eclipse.papyrus.umlutils.ui.helper.NameLabelIconHelper;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.IPapyrusEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.tools.utils.ui.helper.NameLabelIconHelper;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -135,7 +135,7 @@ implements ITextAwareEditPart, IBorderItemEditPart, IPapyrusEditPart {
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.sequence.edit.parts.TimeObservationAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.sequence.edit.parts.TimeObservationAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 0));

 	}

 

 	/**

@@ -379,7 +379,7 @@ implements ITextAwareEditPart, IBorderItemEditPart, IPapyrusEditPart {
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.TimeObservation_3020, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.sequence.edit.parts.TimeObservationAppliedStereotypeEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.TimeObservation_3020, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.sequence.edit.parts.TimeObservationAppliedStereotypeEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -627,7 +627,7 @@ implements ITextAwareEditPart, IBorderItemEditPart, IPapyrusEditPart {
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/TimeObservationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/TimeObservationEditPart.java
index 57d3dd1c169..a1e3bbea2c9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/TimeObservationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/TimeObservationEditPart.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.parts;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.parts;

 

 import java.util.ArrayList;

 import java.util.HashMap;

@@ -56,16 +56,16 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.common.locator.ExternalLabelPositionLocator;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.DeleteTimeElementWithoutEventPolicy;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.ExternalLabelPrimaryDragRoleEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.TimeObservationItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.TimeRelatedSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.sequence.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.common.locator.ExternalLabelPositionLocator;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.DeleteTimeElementWithoutEventPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.ExternalLabelPrimaryDragRoleEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.TimeObservationItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.TimeRelatedSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

 import org.eclipse.swt.graphics.Color;

 

 /**

@@ -332,7 +332,7 @@ BorderedBorderItemEditPart {
 		if(targetEditPart instanceof TimeConstraintEditPart) {

 			types.add(UMLElementTypes.Message_4003);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.TimeObservationEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.TimeObservationEditPart) {

 			types.add(UMLElementTypes.Message_4003);

 		}

 		if(targetEditPart instanceof DurationConstraintEditPart) {

@@ -389,7 +389,7 @@ BorderedBorderItemEditPart {
 		if(targetEditPart instanceof TimeConstraintEditPart) {

 			types.add(UMLElementTypes.Message_4004);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.TimeObservationEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.TimeObservationEditPart) {

 			types.add(UMLElementTypes.Message_4004);

 		}

 		if(targetEditPart instanceof DurationConstraintEditPart) {

@@ -446,7 +446,7 @@ BorderedBorderItemEditPart {
 		if(targetEditPart instanceof TimeConstraintEditPart) {

 			types.add(UMLElementTypes.Message_4005);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.TimeObservationEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.TimeObservationEditPart) {

 			types.add(UMLElementTypes.Message_4005);

 		}

 		if(targetEditPart instanceof DurationConstraintEditPart) {

@@ -503,7 +503,7 @@ BorderedBorderItemEditPart {
 		if(targetEditPart instanceof TimeConstraintEditPart) {

 			types.add(UMLElementTypes.Message_4006);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.TimeObservationEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.TimeObservationEditPart) {

 			types.add(UMLElementTypes.Message_4006);

 		}

 		if(targetEditPart instanceof DurationConstraintEditPart) {

@@ -560,7 +560,7 @@ BorderedBorderItemEditPart {
 		if(targetEditPart instanceof TimeConstraintEditPart) {

 			types.add(UMLElementTypes.Message_4007);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.TimeObservationEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.TimeObservationEditPart) {

 			types.add(UMLElementTypes.Message_4007);

 		}

 		if(targetEditPart instanceof DurationConstraintEditPart) {

@@ -617,7 +617,7 @@ BorderedBorderItemEditPart {
 		if(targetEditPart instanceof TimeConstraintEditPart) {

 			types.add(UMLElementTypes.Message_4008);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.TimeObservationEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.TimeObservationEditPart) {

 			types.add(UMLElementTypes.Message_4008);

 		}

 		if(targetEditPart instanceof DurationConstraintEditPart) {

@@ -674,7 +674,7 @@ BorderedBorderItemEditPart {
 		if(targetEditPart instanceof TimeConstraintEditPart) {

 			types.add(UMLElementTypes.Message_4009);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.sequence.edit.parts.TimeObservationEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.sequence.edit.parts.TimeObservationEditPart) {

 			types.add(UMLElementTypes.Message_4009);

 		}

 		if(targetEditPart instanceof DurationConstraintEditPart) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/TimeObservationLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/TimeObservationLabelEditPart.java
index 7f6d7d244d1..7031c36fed0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/TimeObservationLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/TimeObservationLabelEditPart.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.parts;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -54,14 +54,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -71,6 +63,14 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -118,7 +118,7 @@ public class TimeObservationLabelEditPart extends LabelEditPart implements IText
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.sequence.edit.parts.TimeObservationLabelEditPart.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.sequence.edit.parts.TimeObservationLabelEditPart.VISUAL_ID), new Point(0, 0));

 	}

 

 	/**

@@ -349,7 +349,7 @@ public class TimeObservationLabelEditPart extends LabelEditPart implements IText
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.TimeObservation_3020, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.sequence.edit.parts.TimeObservationLabelEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.TimeObservation_3020, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.sequence.edit.parts.TimeObservationLabelEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -597,7 +597,7 @@ public class TimeObservationLabelEditPart extends LabelEditPart implements IText
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/UMLEditPartFactory.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/UMLEditPartFactory.java
index 9b37fe1dc5e..126a495ee57 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/parts/UMLEditPartFactory.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/UMLEditPartFactory.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.parts;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.parts;

 

 import org.eclipse.draw2d.FigureUtilities;

 import org.eclipse.draw2d.Label;

@@ -24,8 +24,8 @@ import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.viewers.CellEditor;

-import org.eclipse.papyrus.diagram.common.figure.node.IMultilineEditableFigure;

-import org.eclipse.papyrus.diagram.sequence.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.IMultilineEditableFigure;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLVisualIDRegistry;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.widgets.Text;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/policies/ActionExecutionSpecificationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/ActionExecutionSpecificationItemSemanticEditPolicy.java
index f3818db4af1..7cb7f42e2af 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/policies/ActionExecutionSpecificationItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/ActionExecutionSpecificationItemSemanticEditPolicy.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.policies;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -26,40 +26,40 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.GeneralOrderingCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.GeneralOrderingReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message2CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message2ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message3CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message3ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message4CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message4ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message5CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message5ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message6CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message6ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message7CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message7ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.MessageCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.MessageReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.GeneralOrderingEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message2EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message3EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message4EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message5EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message6EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message7EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.MessageEditPart;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.sequence.util.SequenceDeleteHelper;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.GeneralOrderingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.GeneralOrderingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message2CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message2ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message3CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message3ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message4CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message4ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message5CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message5ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message6CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message6ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message7CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message7ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.MessageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.MessageReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.GeneralOrderingEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message2EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message3EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message4EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message5EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message6EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message7EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceDeleteHelper;

 import org.eclipse.uml2.uml.OccurrenceSpecification;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/policies/BehaviorExecutionSpecificationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/BehaviorExecutionSpecificationItemSemanticEditPolicy.java
index b69910d0483..02c362bac11 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/policies/BehaviorExecutionSpecificationItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/BehaviorExecutionSpecificationItemSemanticEditPolicy.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.policies;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -26,40 +26,40 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.GeneralOrderingCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.GeneralOrderingReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message2CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message2ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message3CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message3ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message4CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message4ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message5CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message5ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message6CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message6ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message7CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message7ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.MessageCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.MessageReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.GeneralOrderingEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message2EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message3EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message4EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message5EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message6EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message7EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.MessageEditPart;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.sequence.util.SequenceDeleteHelper;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.GeneralOrderingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.GeneralOrderingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message2CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message2ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message3CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message3ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message4CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message4ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message5CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message5ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message6CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message6ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message7CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message7ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.MessageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.MessageReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.GeneralOrderingEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message2EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message3EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message4EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message5EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message6EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message7EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceDeleteHelper;

 import org.eclipse.uml2.uml.OccurrenceSpecification;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/policies/CombinedFragment2ItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/CombinedFragment2ItemSemanticEditPolicy.java
index 0e53bac19d0..646637ec9f0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/policies/CombinedFragment2ItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/CombinedFragment2ItemSemanticEditPolicy.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.policies;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -22,39 +22,39 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.GeneralOrderingCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.GeneralOrderingReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message2CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message2ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message3CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message3ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message4CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message4ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message5CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message5ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message6CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message6ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message7CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message7ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.MessageCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.MessageReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.GeneralOrderingEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message2EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message3EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message4EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message5EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message6EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message7EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.MessageEditPart;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.GeneralOrderingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.GeneralOrderingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message2CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message2ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message3CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message3ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message4CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message4ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message5CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message5ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message6CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message6ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message7CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message7ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.MessageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.MessageReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.GeneralOrderingEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message2EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message3EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message4EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message5EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message6EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message7EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

 import org.eclipse.uml2.uml.OccurrenceSpecification;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/policies/CombinedFragmentCombinedFragmentCompartmentCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/CombinedFragmentCombinedFragmentCompartmentCanonicalEditPolicy.java
index d87c4e55b99..858547a613d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/policies/CombinedFragmentCombinedFragmentCompartmentCanonicalEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/CombinedFragmentCombinedFragmentCompartmentCanonicalEditPolicy.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.policies;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.policies;

 

 import java.util.ArrayList;

 import java.util.Collection;

@@ -32,10 +32,10 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
 import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.InteractionOperandEditPart;

-import org.eclipse.papyrus.diagram.sequence.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.diagram.sequence.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.diagram.sequence.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionOperandEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramUpdater;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLNodeDescriptor;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLVisualIDRegistry;

 import org.eclipse.uml2.uml.UMLPackage;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/policies/CombinedFragmentCombinedFragmentCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/CombinedFragmentCombinedFragmentCompartmentItemSemanticEditPolicy.java
index 8fa9ebe51c5..71469b25680 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/policies/CombinedFragmentCombinedFragmentCompartmentItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/CombinedFragmentCombinedFragmentCompartmentItemSemanticEditPolicy.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.policies;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.policies;

 

 import org.eclipse.emf.common.util.EList;

 import org.eclipse.emf.ecore.EObject;

@@ -20,10 +20,10 @@ import org.eclipse.gef.commands.CompoundCommand;
 import org.eclipse.gef.commands.UnexecutableCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.osgi.util.NLS;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.InteractionOperandCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.part.Messages;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

 import org.eclipse.papyrus.ui.toolbox.notification.builders.NotificationBuilder;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.InteractionOperandCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.part.Messages;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

 import org.eclipse.uml2.uml.CombinedFragment;

 import org.eclipse.uml2.uml.InteractionOperand;

 import org.eclipse.uml2.uml.InteractionOperatorKind;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/policies/CombinedFragmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/CombinedFragmentItemSemanticEditPolicy.java
index 784d48b49fb..ec05f9cf411 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/policies/CombinedFragmentItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/CombinedFragmentItemSemanticEditPolicy.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.policies;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -22,36 +22,36 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message2CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message2ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message3CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message3ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message4CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message4ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message5CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message5ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message6CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message6ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message7CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message7ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.MessageCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.MessageReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message2EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message3EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message4EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message5EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message6EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message7EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.MessageEditPart;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message2CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message2ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message3CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message3ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message4CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message4ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message5CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message5ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message6CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message6ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message7CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message7ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.MessageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.MessageReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message2EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message3EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message4EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message5EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message6EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message7EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/policies/CommentAnnotatedElementItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/CommentAnnotatedElementItemSemanticEditPolicy.java
index 2d39f969137..4b4b31ffd56 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/policies/CommentAnnotatedElementItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/CommentAnnotatedElementItemSemanticEditPolicy.java
@@ -11,12 +11,12 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.policies;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.policies;

 

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/policies/CommentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/CommentItemSemanticEditPolicy.java
index cd19bc3bc28..cb12920c628 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/policies/CommentItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/CommentItemSemanticEditPolicy.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.policies;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.policies;

 

 import java.util.ArrayList;

 import java.util.List;

@@ -27,34 +27,34 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelations
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message2CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message2ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message3CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message3ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message4CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message4ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message5CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message5ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message6CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message6ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message7CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message7ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.MessageCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.MessageReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message2EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message3EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message4EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message5EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message6EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message7EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.MessageEditPart;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message2CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message2ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message3CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message3ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message4CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message4ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message5CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message5ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message6CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message6ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message7CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message7ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.MessageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.MessageReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message2EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message3EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message4EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message5EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message6EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message7EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/policies/ConsiderIgnoreFragmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/ConsiderIgnoreFragmentItemSemanticEditPolicy.java
index 339ece139fb..707426ee87f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/policies/ConsiderIgnoreFragmentItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/ConsiderIgnoreFragmentItemSemanticEditPolicy.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.policies;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -22,36 +22,36 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message2CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message2ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message3CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message3ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message4CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message4ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message5CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message5ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message6CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message6ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message7CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message7ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.MessageCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.MessageReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message2EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message3EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message4EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message5EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message6EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message7EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.MessageEditPart;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message2CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message2ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message3CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message3ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message4CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message4ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message5CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message5ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message6CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message6ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message7CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message7ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.MessageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.MessageReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message2EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message3EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message4EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message5EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message6EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message7EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/policies/ConstraintConstrainedElementItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/ConstraintConstrainedElementItemSemanticEditPolicy.java
index f443125319a..6761dd07183 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/policies/ConstraintConstrainedElementItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/ConstraintConstrainedElementItemSemanticEditPolicy.java
@@ -11,12 +11,12 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.policies;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.policies;

 

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/policies/ConstraintItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/ConstraintItemSemanticEditPolicy.java
index cdda0631847..1d7eaa96dc5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/policies/ConstraintItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/ConstraintItemSemanticEditPolicy.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.policies;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.policies;

 

 import java.util.ArrayList;

 import java.util.List;

@@ -27,34 +27,34 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelations
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message2CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message2ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message3CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message3ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message4CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message4ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message5CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message5ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message6CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message6ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message7CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message7ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.MessageCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.MessageReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message2EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message3EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message4EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message5EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message6EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message7EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.MessageEditPart;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message2CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message2ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message3CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message3ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message4CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message4ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message5CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message5ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message6CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message6ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message7CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message7ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.MessageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.MessageReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message2EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message3EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message4EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message5EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message6EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message7EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/policies/ContinuationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/ContinuationItemSemanticEditPolicy.java
index 93d70997925..afaeb831e18 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/policies/ContinuationItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/ContinuationItemSemanticEditPolicy.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.policies;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.policies;

 

 import java.util.ArrayList;

 import java.util.List;

@@ -27,34 +27,34 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelations
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message2CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message2ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message3CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message3ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message4CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message4ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message5CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message5ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message6CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message6ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message7CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message7ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.MessageCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.MessageReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message2EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message3EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message4EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message5EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message6EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message7EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.MessageEditPart;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message2CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message2ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message3CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message3ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message4CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message4ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message5CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message5ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message6CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message6ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message7CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message7ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.MessageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.MessageReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message2EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message3EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message4EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message5EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message6EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message7EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/policies/DestructionEventItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/DestructionEventItemSemanticEditPolicy.java
index 87f2a2990f6..ffc4c5c3b2e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/policies/DestructionEventItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/DestructionEventItemSemanticEditPolicy.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.policies;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -26,37 +26,37 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message2CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message2ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message3CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message3ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message4CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message4ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message5CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message5ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message6CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message6ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message7CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message7ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.MessageCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.MessageReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message2EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message3EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message4EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message5EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message6EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message7EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.MessageEditPart;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.sequence.util.SequenceDeleteHelper;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message2CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message2ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message3CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message3ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message4CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message4ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message5CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message5ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message6CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message6ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message7CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message7ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.MessageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.MessageReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message2EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message3EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message4EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message5EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message6EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message7EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceDeleteHelper;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/policies/DurationConstraintInMessageItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/DurationConstraintInMessageItemSemanticEditPolicy.java
index 8290433d607..8b0f6f99e5f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/policies/DurationConstraintInMessageItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/DurationConstraintInMessageItemSemanticEditPolicy.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.policies;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.policies;

 

 import java.util.ArrayList;

 import java.util.List;

@@ -27,34 +27,34 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelations
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message2CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message2ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message3CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message3ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message4CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message4ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message5CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message5ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message6CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message6ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message7CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message7ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.MessageCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.MessageReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message2EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message3EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message4EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message5EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message6EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message7EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.MessageEditPart;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message2CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message2ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message3CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message3ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message4CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message4ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message5CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message5ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message6CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message6ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message7CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message7ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.MessageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.MessageReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message2EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message3EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message4EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message5EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message6EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message7EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/policies/DurationConstraintItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/DurationConstraintItemSemanticEditPolicy.java
index ba986b1835b..8dd7120bdde 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/policies/DurationConstraintItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/DurationConstraintItemSemanticEditPolicy.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.policies;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.policies;

 

 import java.util.ArrayList;

 import java.util.List;

@@ -27,34 +27,34 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelations
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message2CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message2ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message3CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message3ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message4CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message4ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message5CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message5ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message6CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message6ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message7CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message7ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.MessageCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.MessageReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message2EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message3EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message4EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message5EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message6EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message7EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.MessageEditPart;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message2CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message2ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message3CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message3ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message4CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message4ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message5CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message5ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message6CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message6ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message7CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message7ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.MessageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.MessageReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message2EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message3EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message4EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message5EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message6EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message7EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/policies/DurationObservationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/DurationObservationItemSemanticEditPolicy.java
index 39e2579ecad..25ae76329dc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/policies/DurationObservationItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/DurationObservationItemSemanticEditPolicy.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.policies;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.policies;

 

 import java.util.ArrayList;

 import java.util.List;

@@ -27,34 +27,34 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelations
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message2CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message2ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message3CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message3ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message4CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message4ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message5CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message5ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message6CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message6ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message7CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message7ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.MessageCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.MessageReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message2EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message3EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message4EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message5EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message6EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message7EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.MessageEditPart;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message2CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message2ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message3CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message3ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message4CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message4ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message5CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message5ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message6CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message6ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message7CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message7ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.MessageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.MessageReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message2EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message3EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message4EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message5EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message6EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message7EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/policies/GeneralOrderingItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/GeneralOrderingItemSemanticEditPolicy.java
index 269492bfc35..57fb9c07dec 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/policies/GeneralOrderingItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/GeneralOrderingItemSemanticEditPolicy.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.sequence.edit.policies;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.policies;

 

 import java.util.ArrayList;

 import java.util.List;

@@ -12,34 +12,34 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

 import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message2CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message2ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message3CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message3ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message4CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message4ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message5CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message5ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message6CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message6ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message7CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message7ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.MessageCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.MessageReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message2EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message3EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message4EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message5EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message6EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message7EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.MessageEditPart;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message2CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message2ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message3CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message3ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message4CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message4ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message5CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message5ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message6CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message6ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message7CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message7ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.MessageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.MessageReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message2EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message3EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message4EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message5EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message6EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message7EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/policies/InteractionCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/InteractionCanonicalEditPolicy.java
index 2d31f6f6516..1f1c22e8e75 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/policies/InteractionCanonicalEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/InteractionCanonicalEditPolicy.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.policies;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.policies;

 

 import java.util.ArrayList;

 import java.util.Collection;

@@ -34,11 +34,11 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
 import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.DurationConstraintInMessageEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.DurationObservationEditPart;

-import org.eclipse.papyrus.diagram.sequence.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.diagram.sequence.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.diagram.sequence.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationConstraintInMessageEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramUpdater;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLNodeDescriptor;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLVisualIDRegistry;

 import org.eclipse.uml2.uml.UMLPackage;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/policies/InteractionInteractionCompartmentCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/InteractionInteractionCompartmentCanonicalEditPolicy.java
index 66ae6479344..452d8d6a7ef 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/policies/InteractionInteractionCompartmentCanonicalEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/InteractionInteractionCompartmentCanonicalEditPolicy.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.policies;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.policies;

 

 import java.util.ArrayList;

 import java.util.Collection;

@@ -34,15 +34,15 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
 import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.CombinedFragmentEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.CommentEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.ConsiderIgnoreFragmentEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.ConstraintEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.InteractionUseEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.LifelineEditPart;

-import org.eclipse.papyrus.diagram.sequence.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.diagram.sequence.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.diagram.sequence.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragmentEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CommentEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ConsiderIgnoreFragmentEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ConstraintEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionUseEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramUpdater;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLNodeDescriptor;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLVisualIDRegistry;

 import org.eclipse.uml2.uml.UMLPackage;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/policies/InteractionInteractionCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/InteractionInteractionCompartmentItemSemanticEditPolicy.java
index f59d59ba452..3af8ff471bb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/policies/InteractionInteractionCompartmentItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/InteractionInteractionCompartmentItemSemanticEditPolicy.java
@@ -11,17 +11,17 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.policies;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.policies;

 

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.CombinedFragmentCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.CommentCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.ConsiderIgnoreFragmentCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.ConstraintCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.InteractionUseCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.LifelineCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CombinedFragmentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.ConsiderIgnoreFragmentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.ConstraintCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.InteractionUseCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.LifelineCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/policies/InteractionItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/InteractionItemSemanticEditPolicy.java
index d2f280c10f2..4937cdc64de 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/policies/InteractionItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/InteractionItemSemanticEditPolicy.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.policies;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -23,38 +23,38 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.DurationConstraintInMessageCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.DurationObservationCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message2CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message2ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message3CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message3ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message4CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message4ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message5CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message5ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message6CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message6ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message7CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message7ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.MessageCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.MessageReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message2EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message3EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message4EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message5EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message6EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message7EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.MessageEditPart;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.DurationConstraintInMessageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.DurationObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message2CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message2ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message3CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message3ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message4CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message4ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message5CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message5ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message6CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message6ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message7CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message7ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.MessageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.MessageReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message2EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message3EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message4EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message5EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message6EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message7EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/policies/InteractionOperandCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/InteractionOperandCanonicalEditPolicy.java
index d8d079919d1..c52b8e79dce 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/policies/InteractionOperandCanonicalEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/InteractionOperandCanonicalEditPolicy.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.policies;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.policies;

 

 import java.util.ArrayList;

 import java.util.Collection;

@@ -34,13 +34,13 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
 import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.CombinedFragmentEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.ConsiderIgnoreFragmentEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.ContinuationEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.InteractionUseEditPart;

-import org.eclipse.papyrus.diagram.sequence.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.diagram.sequence.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.diagram.sequence.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragmentEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ConsiderIgnoreFragmentEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ContinuationEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionUseEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramUpdater;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLNodeDescriptor;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLVisualIDRegistry;

 import org.eclipse.uml2.uml.UMLPackage;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/policies/InteractionOperandItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/InteractionOperandItemSemanticEditPolicy.java
index 9b9f7bd6ff7..70aa7ce75e9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/policies/InteractionOperandItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/InteractionOperandItemSemanticEditPolicy.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.policies;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.EditPart;

@@ -27,40 +27,40 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.CombinedFragmentCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.ConsiderIgnoreFragmentCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.ContinuationCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.InteractionUseCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message2CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message2ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message3CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message3ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message4CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message4ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message5CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message5ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message6CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message6ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message7CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message7ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.MessageCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.MessageReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message2EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message3EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message4EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message5EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message6EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message7EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.MessageEditPart;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CombinedFragmentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.ConsiderIgnoreFragmentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.ContinuationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.InteractionUseCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message2CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message2ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message3CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message3ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message4CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message4ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message5CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message5ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message6CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message6ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message7CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message7ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.MessageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.MessageReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message2EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message3EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message4EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message5EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message6EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message7EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/policies/InteractionUseItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/InteractionUseItemSemanticEditPolicy.java
index a1f594c6923..3d26bc27631 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/policies/InteractionUseItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/InteractionUseItemSemanticEditPolicy.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.policies;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.policies;

 

 import java.util.ArrayList;

 import java.util.List;

@@ -27,34 +27,34 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelations
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message2CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message2ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message3CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message3ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message4CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message4ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message5CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message5ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message6CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message6ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message7CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message7ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.MessageCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.MessageReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message2EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message3EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message4EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message5EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message6EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message7EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.MessageEditPart;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message2CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message2ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message3CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message3ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message4CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message4ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message5CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message5ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message6CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message6ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message7CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message7ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.MessageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.MessageReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message2EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message3EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message4EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message5EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message6EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message7EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/policies/LifelineCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/LifelineCanonicalEditPolicy.java
index c0f26e9f470..94f46372a0f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/policies/LifelineCanonicalEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/LifelineCanonicalEditPolicy.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.policies;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.policies;

 

 import java.util.ArrayList;

 import java.util.Collection;

@@ -34,17 +34,17 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
 import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.ActionExecutionSpecificationEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.BehaviorExecutionSpecificationEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.CombinedFragment2EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.DestructionEventEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.DurationConstraintEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.StateInvariantEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.TimeConstraintEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.TimeObservationEditPart;

-import org.eclipse.papyrus.diagram.sequence.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.diagram.sequence.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.diagram.sequence.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ActionExecutionSpecificationEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.BehaviorExecutionSpecificationEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragment2EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DestructionEventEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationConstraintEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.StateInvariantEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.TimeConstraintEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.TimeObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramUpdater;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLNodeDescriptor;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLVisualIDRegistry;

 import org.eclipse.uml2.uml.UMLPackage;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/policies/LifelineItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/LifelineItemSemanticEditPolicy.java
index a0037b3844f..263186744f3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/policies/LifelineItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/LifelineItemSemanticEditPolicy.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.policies;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -23,50 +23,50 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.ActionExecutionSpecificationCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.BehaviorExecutionSpecificationCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.CombinedFragment2CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.DestructionEventCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.DurationConstraintCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.DurationObservationCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.GeneralOrderingCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.GeneralOrderingReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.LifelineCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message2CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message2ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message3CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message3ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message4CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message4ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message5CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message5ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message6CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message6ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message7CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message7ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.MessageCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.MessageReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.StateInvariantCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.TimeConstraintCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.TimeObservationCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.GeneralOrderingEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.LifelineEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message2EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message3EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message4EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message5EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message6EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message7EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.MessageEditPart;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.ActionExecutionSpecificationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.BehaviorExecutionSpecificationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CombinedFragment2CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.DestructionEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.DurationConstraintCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.DurationObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.GeneralOrderingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.GeneralOrderingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.LifelineCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message2CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message2ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message3CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message3ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message4CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message4ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message5CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message5ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message6CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message6ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message7CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message7ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.MessageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.MessageReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.StateInvariantCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.TimeConstraintCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.TimeObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.GeneralOrderingEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message2EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message3EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message4EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message5EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message6EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message7EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

 import org.eclipse.uml2.uml.OccurrenceSpecification;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/policies/Message2ItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/Message2ItemSemanticEditPolicy.java
index 46a869bb936..be3af0926e8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/policies/Message2ItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/Message2ItemSemanticEditPolicy.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.policies;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -27,39 +27,39 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.DurationConstraintCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.DurationObservationCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message2CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message2ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message3CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message3ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message4CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message4ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message5CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message5ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message6CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message6ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message7CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message7ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.MessageCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.MessageReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message2EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message3EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message4EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message5EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message6EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message7EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.MessageEditPart;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.sequence.util.SequenceDeleteHelper;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.DurationConstraintCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.DurationObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message2CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message2ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message3CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message3ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message4CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message4ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message5CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message5ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message6CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message6ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message7CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message7ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.MessageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.MessageReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message2EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message3EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message4EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message5EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message6EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message7EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceDeleteHelper;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/policies/Message3ItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/Message3ItemSemanticEditPolicy.java
index 3804dcbb866..dde2c63fe57 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/policies/Message3ItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/Message3ItemSemanticEditPolicy.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.policies;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -27,39 +27,39 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.DurationConstraintCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.DurationObservationCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message2CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message2ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message3CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message3ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message4CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message4ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message5CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message5ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message6CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message6ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message7CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message7ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.MessageCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.MessageReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message2EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message3EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message4EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message5EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message6EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message7EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.MessageEditPart;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.sequence.util.SequenceDeleteHelper;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.DurationConstraintCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.DurationObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message2CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message2ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message3CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message3ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message4CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message4ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message5CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message5ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message6CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message6ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message7CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message7ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.MessageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.MessageReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message2EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message3EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message4EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message5EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message6EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message7EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceDeleteHelper;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/policies/Message4ItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/Message4ItemSemanticEditPolicy.java
index 8179912e4c2..db2bf70b4fe 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/policies/Message4ItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/Message4ItemSemanticEditPolicy.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.policies;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -27,39 +27,39 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.DurationConstraintCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.DurationObservationCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message2CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message2ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message3CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message3ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message4CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message4ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message5CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message5ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message6CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message6ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message7CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message7ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.MessageCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.MessageReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message2EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message3EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message4EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message5EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message6EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message7EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.MessageEditPart;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.sequence.util.SequenceDeleteHelper;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.DurationConstraintCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.DurationObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message2CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message2ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message3CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message3ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message4CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message4ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message5CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message5ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message6CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message6ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message7CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message7ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.MessageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.MessageReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message2EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message3EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message4EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message5EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message6EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message7EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceDeleteHelper;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/policies/Message5ItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/Message5ItemSemanticEditPolicy.java
index b8d106a5285..05a0e42d463 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/policies/Message5ItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/Message5ItemSemanticEditPolicy.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.policies;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -27,39 +27,39 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.DurationConstraintCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.DurationObservationCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message2CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message2ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message3CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message3ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message4CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message4ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message5CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message5ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message6CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message6ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message7CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message7ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.MessageCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.MessageReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message2EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message3EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message4EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message5EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message6EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message7EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.MessageEditPart;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.sequence.util.SequenceDeleteHelper;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.DurationConstraintCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.DurationObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message2CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message2ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message3CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message3ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message4CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message4ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message5CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message5ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message6CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message6ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message7CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message7ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.MessageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.MessageReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message2EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message3EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message4EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message5EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message6EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message7EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceDeleteHelper;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/policies/Message6ItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/Message6ItemSemanticEditPolicy.java
index 698b39e8270..5d79e09a652 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/policies/Message6ItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/Message6ItemSemanticEditPolicy.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.policies;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -27,39 +27,39 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.DurationConstraintCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.DurationObservationCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message2CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message2ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message3CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message3ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message4CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message4ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message5CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message5ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message6CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message6ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message7CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message7ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.MessageCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.MessageReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message2EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message3EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message4EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message5EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message6EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message7EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.MessageEditPart;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.sequence.util.SequenceDeleteHelper;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.DurationConstraintCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.DurationObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message2CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message2ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message3CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message3ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message4CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message4ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message5CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message5ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message6CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message6ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message7CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message7ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.MessageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.MessageReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message2EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message3EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message4EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message5EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message6EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message7EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceDeleteHelper;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/policies/Message7ItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/Message7ItemSemanticEditPolicy.java
index 5713416649c..b6f1ade113f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/policies/Message7ItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/Message7ItemSemanticEditPolicy.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.policies;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -27,39 +27,39 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.DurationConstraintCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.DurationObservationCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message2CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message2ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message3CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message3ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message4CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message4ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message5CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message5ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message6CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message6ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message7CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message7ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.MessageCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.MessageReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message2EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message3EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message4EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message5EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message6EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message7EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.MessageEditPart;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.sequence.util.SequenceDeleteHelper;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.DurationConstraintCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.DurationObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message2CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message2ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message3CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message3ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message4CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message4ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message5CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message5ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message6CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message6ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message7CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message7ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.MessageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.MessageReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message2EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message3EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message4EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message5EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message6EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message7EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceDeleteHelper;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/policies/MessageItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/MessageItemSemanticEditPolicy.java
index 0ed32eba871..1d7bf91009c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/policies/MessageItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/MessageItemSemanticEditPolicy.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.policies;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -27,39 +27,39 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.DurationConstraintCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.DurationObservationCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message2CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message2ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message3CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message3ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message4CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message4ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message5CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message5ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message6CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message6ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message7CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message7ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.MessageCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.MessageReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message2EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message3EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message4EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message5EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message6EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message7EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.MessageEditPart;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.sequence.util.SequenceDeleteHelper;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.DurationConstraintCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.DurationObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message2CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message2ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message3CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message3ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message4CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message4ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message5CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message5ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message6CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message6ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message7CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message7ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.MessageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.MessageReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message2EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message3EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message4EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message5EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message6EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message7EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceDeleteHelper;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/policies/OpenDiagramEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/OpenDiagramEditPolicy.java
index cc268757cb4..8df57947c57 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/policies/OpenDiagramEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/OpenDiagramEditPolicy.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.policies;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.policies;

 

 import java.io.IOException;

 import java.lang.reflect.InvocationTargetException;

@@ -41,11 +41,11 @@ import org.eclipse.gmf.runtime.notation.HintedDiagramLinkStyle;
 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.Style;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.PackageEditPart;

-import org.eclipse.papyrus.diagram.sequence.part.Messages;

-import org.eclipse.papyrus.diagram.sequence.part.UMLDiagramEditor;

-import org.eclipse.papyrus.diagram.sequence.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.sequence.part.UMLDiagramEditorUtil;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.PackageEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.part.Messages;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditor;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorUtil;

 import org.eclipse.ui.IEditorInput;

 import org.eclipse.ui.IWorkbenchPage;

 import org.eclipse.ui.PlatformUI;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/policies/PackageCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/PackageCanonicalEditPolicy.java
index a9bf746e420..2bce4638cd9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/policies/PackageCanonicalEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/PackageCanonicalEditPolicy.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.policies;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.policies;

 

 import java.util.ArrayList;

 import java.util.Collection;

@@ -41,38 +41,38 @@ import org.eclipse.gmf.runtime.notation.Diagram;
 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.ActionExecutionSpecificationEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.BehaviorExecutionSpecificationEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.CombinedFragment2EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.CombinedFragmentEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.CommentEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.ConsiderIgnoreFragmentEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.ConstraintEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.ContinuationEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.DestructionEventEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.DurationConstraintEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.DurationConstraintInMessageEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.DurationObservationEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.GeneralOrderingEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.InteractionEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.InteractionOperandEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.InteractionUseEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.LifelineEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message2EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message3EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message4EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message5EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message6EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message7EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.MessageEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.PackageEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.StateInvariantEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.TimeConstraintEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.TimeObservationEditPart;

-import org.eclipse.papyrus.diagram.sequence.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.diagram.sequence.part.UMLLinkDescriptor;

-import org.eclipse.papyrus.diagram.sequence.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.diagram.sequence.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ActionExecutionSpecificationEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.BehaviorExecutionSpecificationEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragment2EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragmentEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CommentEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ConsiderIgnoreFragmentEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ConstraintEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ContinuationEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DestructionEventEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationConstraintEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationConstraintInMessageEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.GeneralOrderingEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionOperandEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionUseEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message2EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message3EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message4EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message5EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message6EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message7EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.PackageEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.StateInvariantEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.TimeConstraintEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.TimeObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramUpdater;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLLinkDescriptor;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLNodeDescriptor;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLVisualIDRegistry;

 import org.eclipse.uml2.uml.UMLPackage;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/policies/PackageItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/PackageItemSemanticEditPolicy.java
index ea36d1ae798..7e614003286 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/policies/PackageItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/PackageItemSemanticEditPolicy.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.policies;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.policies;

 

 import org.eclipse.emf.transaction.TransactionalEditingDomain;

 import org.eclipse.gef.commands.Command;

@@ -19,9 +19,9 @@ import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DuplicateElementsRequest;

 import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.papyrus.diagram.common.commands.DuplicateNamedElementCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.InteractionCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.common.commands.DuplicateNamedElementCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.InteractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/policies/StateInvariantItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/StateInvariantItemSemanticEditPolicy.java
index 48eb46ac0b5..b93da929700 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/policies/StateInvariantItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/StateInvariantItemSemanticEditPolicy.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.policies;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.policies;

 

 import java.util.ArrayList;

 import java.util.List;

@@ -27,34 +27,34 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelations
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message2CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message2ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message3CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message3ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message4CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message4ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message5CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message5ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message6CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message6ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message7CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message7ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.MessageCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.MessageReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message2EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message3EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message4EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message5EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message6EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message7EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.MessageEditPart;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message2CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message2ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message3CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message3ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message4CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message4ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message5CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message5ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message6CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message6ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message7CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message7ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.MessageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.MessageReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message2EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message3EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message4EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message5EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message6EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message7EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/policies/TimeConstraintItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/TimeConstraintItemSemanticEditPolicy.java
index 06506723f36..ef932e71bff 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/policies/TimeConstraintItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/TimeConstraintItemSemanticEditPolicy.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.policies;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.policies;

 

 import java.util.ArrayList;

 import java.util.List;

@@ -27,34 +27,34 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelations
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message2CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message2ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message3CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message3ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message4CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message4ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message5CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message5ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message6CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message6ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message7CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message7ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.MessageCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.MessageReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message2EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message3EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message4EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message5EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message6EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message7EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.MessageEditPart;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message2CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message2ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message3CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message3ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message4CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message4ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message5CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message5ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message6CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message6ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message7CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message7ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.MessageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.MessageReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message2EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message3EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message4EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message5EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message6EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message7EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/policies/TimeObservationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/TimeObservationItemSemanticEditPolicy.java
index 8f239d1e8ad..073ed46416f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/policies/TimeObservationItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/TimeObservationItemSemanticEditPolicy.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.policies;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.policies;

 

 import java.util.ArrayList;

 import java.util.List;

@@ -27,34 +27,34 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelations
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message2CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message2ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message3CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message3ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message4CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message4ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message5CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message5ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message6CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message6ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message7CreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.Message7ReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.MessageCreateCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.commands.MessageReorientCommand;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message2EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message3EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message4EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message5EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message6EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message7EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.MessageEditPart;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message2CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message2ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message3CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message3ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message4CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message4ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message5CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message5ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message6CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message6ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message7CreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.Message7ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.MessageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.MessageReorientCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message2EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message3EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message4EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message5EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message6EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message7EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/policies/UMLBaseItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/UMLBaseItemSemanticEditPolicy.java
index 819c2691cfc..3ed4d64db79 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/policies/UMLBaseItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/UMLBaseItemSemanticEditPolicy.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.policies;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.policies;

 

 import java.util.Collections;

 import java.util.Iterator;

@@ -47,14 +47,14 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelations
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.sequence.edit.helpers.UMLBaseEditHelper;

-import org.eclipse.papyrus.diagram.sequence.expressions.UMLOCLFactory;

-import org.eclipse.papyrus.diagram.sequence.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.sequence.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

 import org.eclipse.papyrus.extendedtypes.types.IExtendedHintedElementType;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.UMLBaseEditHelper;

+import org.eclipse.papyrus.uml.diagram.sequence.expressions.UMLOCLFactory;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

 import org.eclipse.uml2.uml.Comment;

 import org.eclipse.uml2.uml.Constraint;

 import org.eclipse.uml2.uml.Element;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/policies/UMLTextNonResizableEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/UMLTextNonResizableEditPolicy.java
index 53bd4a2b145..f945bd54676 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/policies/UMLTextNonResizableEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/UMLTextNonResizableEditPolicy.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.policies;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.policies;

 

 import java.util.Collections;

 import java.util.List;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/policies/UMLTextSelectionEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/UMLTextSelectionEditPolicy.java
index da1de4527ac..6d28b48b256 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/edit/policies/UMLTextSelectionEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/UMLTextSelectionEditPolicy.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.policies;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.policies;

 

 import org.eclipse.draw2d.ColorConstants;

 import org.eclipse.draw2d.Figure;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/expressions/UMLAbstractExpression.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/expressions/UMLAbstractExpression.java
index ac904188df9..3bce130c2aa 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/expressions/UMLAbstractExpression.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/expressions/UMLAbstractExpression.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.expressions;

+package org.eclipse.papyrus.uml.diagram.sequence.expressions;

 

 import java.math.BigDecimal;

 import java.math.BigInteger;

@@ -25,7 +25,7 @@ import org.eclipse.emf.ecore.EDataType;
 import org.eclipse.emf.ecore.EEnum;

 import org.eclipse.emf.ecore.EEnumLiteral;

 import org.eclipse.emf.ecore.util.EcoreUtil;

-import org.eclipse.papyrus.diagram.sequence.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/expressions/UMLOCLFactory.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/expressions/UMLOCLFactory.java
index 7846e8ce980..eb9460978a9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/expressions/UMLOCLFactory.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/expressions/UMLOCLFactory.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.expressions;

+package org.eclipse.papyrus.uml.diagram.sequence.expressions;

 

 import java.util.Collections;

 import java.util.Map;

@@ -28,7 +28,7 @@ import org.eclipse.ocl.ecore.OCL.Helper;
 import org.eclipse.ocl.ecore.OCLExpression;

 import org.eclipse.ocl.ecore.Variable;

 import org.eclipse.ocl.options.ParsingOptions;

-import org.eclipse.papyrus.diagram.sequence.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/navigator/UMLAbstractNavigatorItem.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/navigator/UMLAbstractNavigatorItem.java
index 1ff2d4926ae..7d55f586e68 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/navigator/UMLAbstractNavigatorItem.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/navigator/UMLAbstractNavigatorItem.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.navigator;

+package org.eclipse.papyrus.uml.diagram.sequence.navigator;

 

 import org.eclipse.core.runtime.IAdapterFactory;

 import org.eclipse.core.runtime.Platform;

@@ -31,13 +31,13 @@ public abstract class UMLAbstractNavigatorItem extends PlatformObject {
 		final ITabbedPropertySheetPageContributor propertySheetPageContributor = new ITabbedPropertySheetPageContributor() {

 

 			public String getContributorId() {

-				return "org.eclipse.papyrus.diagram.sequence"; //$NON-NLS-1$

+				return "org.eclipse.papyrus.uml.diagram.sequence"; //$NON-NLS-1$

 			}

 		};

 		Platform.getAdapterManager().registerAdapters(new IAdapterFactory() {

 

 			public Object getAdapter(Object adaptableObject, Class adapterType) {

-				if(adaptableObject instanceof org.eclipse.papyrus.diagram.sequence.navigator.UMLAbstractNavigatorItem && adapterType == ITabbedPropertySheetPageContributor.class) {

+				if(adaptableObject instanceof org.eclipse.papyrus.uml.diagram.sequence.navigator.UMLAbstractNavigatorItem && adapterType == ITabbedPropertySheetPageContributor.class) {

 					return propertySheetPageContributor;

 				}

 				return null;

@@ -46,7 +46,7 @@ public abstract class UMLAbstractNavigatorItem extends PlatformObject {
 			public Class[] getAdapterList() {

 				return supportedTypes;

 			}

-		}, org.eclipse.papyrus.diagram.sequence.navigator.UMLAbstractNavigatorItem.class);

+		}, org.eclipse.papyrus.uml.diagram.sequence.navigator.UMLAbstractNavigatorItem.class);

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/navigator/UMLDomainNavigatorContentProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/navigator/UMLDomainNavigatorContentProvider.java
index 8dde8d4b445..58b7017800f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/navigator/UMLDomainNavigatorContentProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/navigator/UMLDomainNavigatorContentProvider.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.navigator;

+package org.eclipse.papyrus.uml.diagram.sequence.navigator;

 

 import java.util.ArrayList;

 import java.util.Collection;

@@ -28,7 +28,7 @@ import org.eclipse.emf.transaction.TransactionalEditingDomain;
 import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;

 import org.eclipse.gmf.runtime.emf.core.GMFEditingDomainFactory;

 import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.papyrus.diagram.sequence.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin;

 import org.eclipse.ui.IMemento;

 import org.eclipse.ui.navigator.ICommonContentExtensionSite;

 import org.eclipse.ui.navigator.ICommonContentProvider;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/navigator/UMLDomainNavigatorItem.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/navigator/UMLDomainNavigatorItem.java
index 086d3d6c4d6..7d7b9f7e04a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/navigator/UMLDomainNavigatorItem.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/navigator/UMLDomainNavigatorItem.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.navigator;

+package org.eclipse.papyrus.uml.diagram.sequence.navigator;

 

 import org.eclipse.core.runtime.IAdapterFactory;

 import org.eclipse.core.runtime.Platform;

@@ -34,8 +34,8 @@ public class UMLDomainNavigatorItem extends PlatformObject {
 		Platform.getAdapterManager().registerAdapters(new IAdapterFactory() {

 

 			public Object getAdapter(Object adaptableObject, Class adapterType) {

-				if(adaptableObject instanceof org.eclipse.papyrus.diagram.sequence.navigator.UMLDomainNavigatorItem) {

-					org.eclipse.papyrus.diagram.sequence.navigator.UMLDomainNavigatorItem domainNavigatorItem = (org.eclipse.papyrus.diagram.sequence.navigator.UMLDomainNavigatorItem)adaptableObject;

+				if(adaptableObject instanceof org.eclipse.papyrus.uml.diagram.sequence.navigator.UMLDomainNavigatorItem) {

+					org.eclipse.papyrus.uml.diagram.sequence.navigator.UMLDomainNavigatorItem domainNavigatorItem = (org.eclipse.papyrus.uml.diagram.sequence.navigator.UMLDomainNavigatorItem)adaptableObject;

 					EObject eObject = domainNavigatorItem.getEObject();

 					if(adapterType == EObject.class) {

 						return eObject;

@@ -51,7 +51,7 @@ public class UMLDomainNavigatorItem extends PlatformObject {
 			public Class[] getAdapterList() {

 				return supportedTypes;

 			}

-		}, org.eclipse.papyrus.diagram.sequence.navigator.UMLDomainNavigatorItem.class);

+		}, org.eclipse.papyrus.uml.diagram.sequence.navigator.UMLDomainNavigatorItem.class);

 	}

 

 	/**

@@ -103,8 +103,8 @@ public class UMLDomainNavigatorItem extends PlatformObject {
 	 * @generated

 	 */

 	public boolean equals(Object obj) {

-		if(obj instanceof org.eclipse.papyrus.diagram.sequence.navigator.UMLDomainNavigatorItem) {

-			return EcoreUtil.getURI(getEObject()).equals(EcoreUtil.getURI(((org.eclipse.papyrus.diagram.sequence.navigator.UMLDomainNavigatorItem)obj).getEObject()));

+		if(obj instanceof org.eclipse.papyrus.uml.diagram.sequence.navigator.UMLDomainNavigatorItem) {

+			return EcoreUtil.getURI(getEObject()).equals(EcoreUtil.getURI(((org.eclipse.papyrus.uml.diagram.sequence.navigator.UMLDomainNavigatorItem)obj).getEObject()));

 		}

 		return super.equals(obj);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/navigator/UMLDomainNavigatorLabelProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/navigator/UMLDomainNavigatorLabelProvider.java
index 04957629ce2..1445e909fbf 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/navigator/UMLDomainNavigatorLabelProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/navigator/UMLDomainNavigatorLabelProvider.java
@@ -11,11 +11,11 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.navigator;

+package org.eclipse.papyrus.uml.diagram.sequence.navigator;

 

 import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;

 import org.eclipse.jface.viewers.ILabelProviderListener;

-import org.eclipse.papyrus.diagram.sequence.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin;

 import org.eclipse.swt.graphics.Image;

 import org.eclipse.ui.IMemento;

 import org.eclipse.ui.navigator.ICommonContentExtensionSite;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/navigator/UMLNavigatorActionProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/navigator/UMLNavigatorActionProvider.java
index 271978a2c40..dd7a81b4be8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/navigator/UMLNavigatorActionProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/navigator/UMLNavigatorActionProvider.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.navigator;

+package org.eclipse.papyrus.uml.diagram.sequence.navigator;

 

 import org.eclipse.core.runtime.IAdaptable;

 import org.eclipse.emf.common.ui.URIEditorInput;

@@ -25,11 +25,11 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.action.Action;

 import org.eclipse.jface.action.IMenuManager;

 import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.PackageEditPart;

-import org.eclipse.papyrus.diagram.sequence.part.Messages;

-import org.eclipse.papyrus.diagram.sequence.part.UMLDiagramEditor;

-import org.eclipse.papyrus.diagram.sequence.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.sequence.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.PackageEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.part.Messages;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditor;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLVisualIDRegistry;

 import org.eclipse.ui.IActionBars;

 import org.eclipse.ui.IEditorInput;

 import org.eclipse.ui.IWorkbenchPage;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/navigator/UMLNavigatorContentProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/navigator/UMLNavigatorContentProvider.java
index 1c030af370a..a4d63abceda 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/navigator/UMLNavigatorContentProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/navigator/UMLNavigatorContentProvider.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.navigator;

+package org.eclipse.papyrus.uml.diagram.sequence.navigator;

 

 import java.util.ArrayList;

 import java.util.Collection;

@@ -30,40 +30,40 @@ import org.eclipse.gmf.runtime.notation.Diagram;
 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.ActionExecutionSpecificationEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.BehaviorExecutionSpecificationEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.CombinedFragment2EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.CombinedFragmentCombinedFragmentCompartmentEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.CombinedFragmentEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.CommentEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.ConsiderIgnoreFragmentEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.ConstraintEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.ContinuationEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.DestructionEventEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.DurationConstraintEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.DurationConstraintInMessageEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.DurationObservationEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.GeneralOrderingEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.InteractionEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.InteractionInteractionCompartmentEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.InteractionOperandEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.InteractionUseEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.LifelineEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message2EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message3EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message4EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message5EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message6EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message7EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.MessageEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.PackageEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.StateInvariantEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.TimeConstraintEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.TimeObservationEditPart;

-import org.eclipse.papyrus.diagram.sequence.part.Messages;

-import org.eclipse.papyrus.diagram.sequence.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ActionExecutionSpecificationEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.BehaviorExecutionSpecificationEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragment2EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragmentCombinedFragmentCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragmentEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CommentEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ConsiderIgnoreFragmentEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ConstraintEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ContinuationEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DestructionEventEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationConstraintEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationConstraintInMessageEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.GeneralOrderingEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionInteractionCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionOperandEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionUseEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message2EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message3EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message4EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message5EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message6EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message7EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.PackageEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.StateInvariantEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.TimeConstraintEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.TimeObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.part.Messages;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLVisualIDRegistry;

 import org.eclipse.ui.IMemento;

 import org.eclipse.ui.navigator.ICommonContentExtensionSite;

 import org.eclipse.ui.navigator.ICommonContentProvider;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/navigator/UMLNavigatorGroup.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/navigator/UMLNavigatorGroup.java
index a4695b8dee3..2b6f3e97e38 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/navigator/UMLNavigatorGroup.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/navigator/UMLNavigatorGroup.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.navigator;

+package org.eclipse.papyrus.uml.diagram.sequence.navigator;

 

 import java.util.Collection;

 import java.util.LinkedList;

@@ -91,8 +91,8 @@ public class UMLNavigatorGroup extends UMLAbstractNavigatorItem {
 	 * @generated

 	 */

 	public boolean equals(Object obj) {

-		if(obj instanceof org.eclipse.papyrus.diagram.sequence.navigator.UMLNavigatorGroup) {

-			org.eclipse.papyrus.diagram.sequence.navigator.UMLNavigatorGroup anotherGroup = (org.eclipse.papyrus.diagram.sequence.navigator.UMLNavigatorGroup)obj;

+		if(obj instanceof org.eclipse.papyrus.uml.diagram.sequence.navigator.UMLNavigatorGroup) {

+			org.eclipse.papyrus.uml.diagram.sequence.navigator.UMLNavigatorGroup anotherGroup = (org.eclipse.papyrus.uml.diagram.sequence.navigator.UMLNavigatorGroup)obj;

 			if(getGroupName().equals(anotherGroup.getGroupName())) {

 				return getParent().equals(anotherGroup.getParent());

 			}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/navigator/UMLNavigatorItem.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/navigator/UMLNavigatorItem.java
index 3d4a04dac41..7b90ca14143 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/navigator/UMLNavigatorItem.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/navigator/UMLNavigatorItem.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.navigator;

+package org.eclipse.papyrus.uml.diagram.sequence.navigator;

 

 import org.eclipse.core.runtime.IAdapterFactory;

 import org.eclipse.core.runtime.Platform;

@@ -32,8 +32,8 @@ public class UMLNavigatorItem extends UMLAbstractNavigatorItem {
 		Platform.getAdapterManager().registerAdapters(new IAdapterFactory() {

 

 			public Object getAdapter(Object adaptableObject, Class adapterType) {

-				if(adaptableObject instanceof org.eclipse.papyrus.diagram.sequence.navigator.UMLNavigatorItem && (adapterType == View.class || adapterType == EObject.class)) {

-					return ((org.eclipse.papyrus.diagram.sequence.navigator.UMLNavigatorItem)adaptableObject).getView();

+				if(adaptableObject instanceof org.eclipse.papyrus.uml.diagram.sequence.navigator.UMLNavigatorItem && (adapterType == View.class || adapterType == EObject.class)) {

+					return ((org.eclipse.papyrus.uml.diagram.sequence.navigator.UMLNavigatorItem)adaptableObject).getView();

 				}

 				return null;

 			}

@@ -41,7 +41,7 @@ public class UMLNavigatorItem extends UMLAbstractNavigatorItem {
 			public Class[] getAdapterList() {

 				return supportedTypes;

 			}

-		}, org.eclipse.papyrus.diagram.sequence.navigator.UMLNavigatorItem.class);

+		}, org.eclipse.papyrus.uml.diagram.sequence.navigator.UMLNavigatorItem.class);

 	}

 

 	/**

@@ -81,8 +81,8 @@ public class UMLNavigatorItem extends UMLAbstractNavigatorItem {
 	 * @generated

 	 */

 	public boolean equals(Object obj) {

-		if(obj instanceof org.eclipse.papyrus.diagram.sequence.navigator.UMLNavigatorItem) {

-			return EcoreUtil.getURI(getView()).equals(EcoreUtil.getURI(((org.eclipse.papyrus.diagram.sequence.navigator.UMLNavigatorItem)obj).getView()));

+		if(obj instanceof org.eclipse.papyrus.uml.diagram.sequence.navigator.UMLNavigatorItem) {

+			return EcoreUtil.getURI(getView()).equals(EcoreUtil.getURI(((org.eclipse.papyrus.uml.diagram.sequence.navigator.UMLNavigatorItem)obj).getView()));

 		}

 		return super.equals(obj);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/navigator/UMLNavigatorLabelProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/navigator/UMLNavigatorLabelProvider.java
index 8dab0e5992a..49d966efeb2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/navigator/UMLNavigatorLabelProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/navigator/UMLNavigatorLabelProvider.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.navigator;

+package org.eclipse.papyrus.uml.diagram.sequence.navigator;

 

 import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

 import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

@@ -24,60 +24,60 @@ import org.eclipse.jface.viewers.ITreePathLabelProvider;
 import org.eclipse.jface.viewers.LabelProvider;

 import org.eclipse.jface.viewers.TreePath;

 import org.eclipse.jface.viewers.ViewerLabel;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.ActionExecutionSpecificationEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.BehaviorExecutionSpecificationEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.CombinedFragment2EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.CombinedFragmentEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.CommentBodyEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.CommentEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.ConsiderIgnoreFragmentEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.ConstraintEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.ConstraintNameEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.ContinuationEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.ContinuationNameEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.DestructionEventEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.DurationConstraintEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.DurationConstraintInMessageEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.DurationConstraintInMessageLabelEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.DurationConstraintLabelEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.DurationObservationEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.DurationObservationLabelEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.GeneralOrderingAppliedStereotypeEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.GeneralOrderingEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.InteractionEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.InteractionNameEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.InteractionOperandEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.InteractionUseEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.InteractionUseNameEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.LifelineEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.LifelineNameEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message2EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message3EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message4EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message5EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message6EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message7EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.MessageEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.MessageName2EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.MessageName3EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.MessageName4EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.MessageName5EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.MessageName6EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.MessageName7EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.MessageNameEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.PackageEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.StateInvariantEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.StateInvariantNameEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.TimeConstraintEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.TimeConstraintLabelEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.TimeObservationEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.TimeObservationLabelEditPart;

-import org.eclipse.papyrus.diagram.sequence.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.sequence.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ActionExecutionSpecificationEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.BehaviorExecutionSpecificationEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragment2EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragmentEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CommentBodyEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CommentEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ConsiderIgnoreFragmentEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ConstraintEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ConstraintNameEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ContinuationEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ContinuationNameEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DestructionEventEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationConstraintEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationConstraintInMessageEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationConstraintInMessageLabelEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationConstraintLabelEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationObservationLabelEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.GeneralOrderingAppliedStereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.GeneralOrderingEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionNameEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionOperandEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionUseEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionUseNameEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineNameEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message2EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message3EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message4EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message5EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message6EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message7EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageName2EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageName3EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageName4EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageName5EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageName6EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageName7EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageNameEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.PackageEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.StateInvariantEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.StateInvariantNameEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.TimeConstraintEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.TimeConstraintLabelEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.TimeObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.TimeObservationLabelEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLParserProvider;

 import org.eclipse.swt.graphics.Image;

 import org.eclipse.ui.IMemento;

 import org.eclipse.ui.navigator.ICommonContentExtensionSite;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/navigator/UMLNavigatorLinkHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/navigator/UMLNavigatorLinkHelper.java
index 8ce594dbbd5..80134e64993 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/navigator/UMLNavigatorLinkHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/navigator/UMLNavigatorLinkHelper.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.navigator;

+package org.eclipse.papyrus.uml.diagram.sequence.navigator;

 

 import org.eclipse.core.resources.IFile;

 import org.eclipse.emf.common.ui.URIEditorInput;

@@ -29,7 +29,7 @@ import org.eclipse.gmf.runtime.notation.Diagram;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.viewers.IStructuredSelection;

 import org.eclipse.jface.viewers.StructuredSelection;

-import org.eclipse.papyrus.diagram.sequence.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin;

 import org.eclipse.ui.IEditorInput;

 import org.eclipse.ui.IEditorPart;

 import org.eclipse.ui.IWorkbenchPage;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/navigator/UMLNavigatorSorter.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/navigator/UMLNavigatorSorter.java
index 6523a1cf235..b4508b040e8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/navigator/UMLNavigatorSorter.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/navigator/UMLNavigatorSorter.java
@@ -11,10 +11,10 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.navigator;

+package org.eclipse.papyrus.uml.diagram.sequence.navigator;

 

 import org.eclipse.jface.viewers.ViewerSorter;

-import org.eclipse.papyrus.diagram.sequence.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLVisualIDRegistry;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/parsers/AbstractParser.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/parsers/AbstractParser.java
index 32771395f5a..92be26757b4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/parsers/AbstractParser.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/parsers/AbstractParser.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.parsers;

+package org.eclipse.papyrus.uml.diagram.sequence.parsers;

 

 import java.util.Arrays;

 

@@ -35,8 +35,8 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.SetValueCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;

 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.osgi.util.NLS;

-import org.eclipse.papyrus.diagram.sequence.part.Messages;

-import org.eclipse.papyrus.diagram.sequence.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.sequence.part.Messages;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/parsers/MessageFormatParser.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/parsers/MessageFormatParser.java
index b9add0c6795..8fed8a06008 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/parsers/MessageFormatParser.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/parsers/MessageFormatParser.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.parsers;

+package org.eclipse.papyrus.uml.diagram.sequence.parsers;

 

 import java.text.FieldPosition;

 import java.text.MessageFormat;

@@ -24,8 +24,8 @@ import org.eclipse.gmf.runtime.common.core.command.ICommand;
 import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

 import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

 import org.eclipse.osgi.util.NLS;

-import org.eclipse.papyrus.diagram.sequence.part.Messages;

-import org.eclipse.papyrus.diagram.sequence.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.sequence.part.Messages;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/part/DeleteElementAction.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/part/DeleteElementAction.java
index 8205c3b72f5..736fa6a14b3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/part/DeleteElementAction.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/part/DeleteElementAction.java
@@ -1,2 +1,3 @@
+package org.eclipse.papyrus.uml.diagram.sequence.part;

 //This file is not used. 

 //The DeleteElementAction is removed from the plugin and replaced by DeleteFromModelAction in the plugin org.eclipse.diagram.common.

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/part/DiagramEditorContextMenuProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/part/DiagramEditorContextMenuProvider.java
index e48c265986c..ae57b74112a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/part/DiagramEditorContextMenuProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/part/DiagramEditorContextMenuProvider.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.part;

+package org.eclipse.papyrus.uml.diagram.sequence.part;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.transaction.util.TransactionUtil;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/part/LoadResourceAction.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/part/LoadResourceAction.java
index 51aebbc34f1..891713b4434 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/part/LoadResourceAction.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/part/LoadResourceAction.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.part;

+package org.eclipse.papyrus.uml.diagram.sequence.part;

 

 import org.eclipse.core.commands.AbstractHandler;

 import org.eclipse.core.commands.ExecutionEvent;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/part/Messages.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/part/Messages.java
index c1d07f6c81c..c56efefd082 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/part/Messages.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/part/Messages.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.part;

+package org.eclipse.papyrus.uml.diagram.sequence.part;

 

 import org.eclipse.osgi.util.NLS;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/part/ModelElementSelectionPage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/part/ModelElementSelectionPage.java
index ec6375db1f5..61c2872aa0e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/part/ModelElementSelectionPage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/part/ModelElementSelectionPage.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.part;

+package org.eclipse.papyrus.uml.diagram.sequence.part;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.ecore.util.FeatureMap;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/part/UMLCreationWizard.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/part/UMLCreationWizard.java
index eaa97ec6ac9..a2e08ea119a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/part/UMLCreationWizard.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/part/UMLCreationWizard.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.part;

+package org.eclipse.papyrus.uml.diagram.sequence.part;

 

 import java.lang.reflect.InvocationTargetException;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/part/UMLCreationWizardPage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/part/UMLCreationWizardPage.java
index f3776f7cf76..d7d12ac356f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/part/UMLCreationWizardPage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/part/UMLCreationWizardPage.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.part;

+package org.eclipse.papyrus.uml.diagram.sequence.part;

 

 import org.eclipse.core.runtime.IPath;

 import org.eclipse.core.runtime.Path;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/part/UMLDiagramActionBarContributor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/part/UMLDiagramActionBarContributor.java
index 80352a93290..aa4fe69c5ac 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/part/UMLDiagramActionBarContributor.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/part/UMLDiagramActionBarContributor.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.part;

+package org.eclipse.papyrus.uml.diagram.sequence.part;

 

 import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramActionBarContributor;

 import org.eclipse.jface.action.GroupMarker;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/part/UMLDiagramEditor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/part/UMLDiagramEditor.java
index 930cc610868..38a34d129fa 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/part/UMLDiagramEditor.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/part/UMLDiagramEditor.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.part;

+package org.eclipse.papyrus.uml.diagram.sequence.part;

 

 import java.util.EventObject;

 

@@ -46,12 +46,12 @@ import org.eclipse.papyrus.core.adaptor.gmf.GmfMultiDiagramDocumentProvider;
 import org.eclipse.papyrus.core.editor.IMultiDiagramEditor;

 import org.eclipse.papyrus.core.services.ServiceException;

 import org.eclipse.papyrus.core.services.ServicesRegistry;

-import org.eclipse.papyrus.diagram.common.listeners.DropTargetListener;

-import org.eclipse.papyrus.diagram.common.part.PapyrusPaletteContextMenuProvider;

-import org.eclipse.papyrus.diagram.common.part.PapyrusPaletteViewer;

-import org.eclipse.papyrus.diagram.common.part.UmlGmfDiagramEditor;

-import org.eclipse.papyrus.diagram.common.service.PapyrusPaletteService;

-import org.eclipse.papyrus.diagram.sequence.navigator.UMLNavigatorItem;

+import org.eclipse.papyrus.uml.diagram.common.listeners.DropTargetListener;

+import org.eclipse.papyrus.uml.diagram.common.part.PapyrusPaletteContextMenuProvider;

+import org.eclipse.papyrus.uml.diagram.common.part.PapyrusPaletteViewer;

+import org.eclipse.papyrus.uml.diagram.common.part.UmlGmfDiagramEditor;

+import org.eclipse.papyrus.uml.diagram.common.service.PapyrusPaletteService;

+import org.eclipse.papyrus.uml.diagram.sequence.navigator.UMLNavigatorItem;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.dnd.TransferData;

 import org.eclipse.swt.events.KeyEvent;

@@ -73,12 +73,12 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh
 	/**

 	 * @generated

 	 */

-	public static final String ID = "org.eclipse.papyrus.diagram.sequence.part.UMLDiagramEditorID"; //$NON-NLS-1$

+	public static final String ID = "org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorID"; //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final String CONTEXT_ID = "org.eclipse.papyrus.diagram.sequence.ui.diagramContext"; //$NON-NLS-1$

+	public static final String CONTEXT_ID = "org.eclipse.papyrus.uml.diagram.sequence.ui.diagramContext"; //$NON-NLS-1$

 

 	/**

 	 * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/part/UMLDiagramEditorPlugin.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/part/UMLDiagramEditorPlugin.java
index fae89024ad6..4d8741926d2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/part/UMLDiagramEditorPlugin.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/part/UMLDiagramEditorPlugin.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.part;

+package org.eclipse.papyrus.uml.diagram.sequence.part;

 

 import java.util.ArrayList;

 import java.util.List;

@@ -31,12 +31,12 @@ import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;
 import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.resource.ImageDescriptor;

-import org.eclipse.papyrus.diagram.sequence.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.sequence.expressions.UMLOCLFactory;

-import org.eclipse.papyrus.diagram.sequence.preferences.DiagramPreferenceInitializer;

-import org.eclipse.papyrus.diagram.sequence.providers.ElementInitializers;

 import org.eclipse.papyrus.log.LogHelper;

 import org.eclipse.papyrus.preferences.Activator;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.sequence.expressions.UMLOCLFactory;

+import org.eclipse.papyrus.uml.diagram.sequence.preferences.DiagramPreferenceInitializer;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.ElementInitializers;

 import org.eclipse.swt.graphics.Image;

 import org.eclipse.ui.plugin.AbstractUIPlugin;

 import org.eclipse.uml2.uml.edit.providers.UMLItemProviderAdapterFactory;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/part/UMLDiagramEditorUtil.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/part/UMLDiagramEditorUtil.java
index dc94c2c5557..de1c7576660 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/part/UMLDiagramEditorUtil.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/part/UMLDiagramEditorUtil.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.part;

+package org.eclipse.papyrus.uml.diagram.sequence.part;

 

 import java.io.IOException;

 import java.util.Collections;

@@ -56,7 +56,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.dialogs.IDialogSettings;

 import org.eclipse.jface.wizard.Wizard;

 import org.eclipse.jface.wizard.WizardDialog;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.PackageEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.PackageEditPart;

 import org.eclipse.swt.widgets.Shell;

 import org.eclipse.ui.IWorkbenchPage;

 import org.eclipse.ui.PartInitException;

@@ -177,8 +177,8 @@ public class UMLDiagramEditorUtil {
 				}

 

 				try {

-					modelResource.save(org.eclipse.papyrus.diagram.sequence.part.UMLDiagramEditorUtil.getSaveOptions());

-					diagramResource.save(org.eclipse.papyrus.diagram.sequence.part.UMLDiagramEditorUtil.getSaveOptions());

+					modelResource.save(org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorUtil.getSaveOptions());

+					diagramResource.save(org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorUtil.getSaveOptions());

 				} catch (IOException e) {

 

 					UMLDiagramEditorPlugin.getInstance().logError("Unable to store model and diagram resources", e); //$NON-NLS-1$

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/part/UMLDiagramUpdateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/part/UMLDiagramUpdateCommand.java
index be2baec660b..498836c2518 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/part/UMLDiagramUpdateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/part/UMLDiagramUpdateCommand.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.part;

+package org.eclipse.papyrus.uml.diagram.sequence.part;

 

 import java.util.Iterator;

 import java.util.List;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/part/UMLDiagramUpdater.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/part/UMLDiagramUpdater.java
index 3d66edb1577..7c64a3a5780 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/part/UMLDiagramUpdater.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/part/UMLDiagramUpdater.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.part;

+package org.eclipse.papyrus.uml.diagram.sequence.part;

 

 import java.util.Collection;

 import java.util.Collections;

@@ -24,42 +24,42 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EStructuralFeature;

 import org.eclipse.emf.ecore.util.EcoreUtil;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.helper.DurationConstraintHelper;

-import org.eclipse.papyrus.diagram.common.helper.TimeConstraintHelper;

-import org.eclipse.papyrus.diagram.common.helper.TimeObservationHelper;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.ActionExecutionSpecificationEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.BehaviorExecutionSpecificationEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.CombinedFragment2EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.CombinedFragmentCombinedFragmentCompartmentEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.CombinedFragmentEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.CommentEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.ConsiderIgnoreFragmentEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.ConstraintEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.ContinuationEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.DestructionEventEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.DurationConstraintEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.DurationConstraintInMessageEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.DurationObservationEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.GeneralOrderingEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.InteractionEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.InteractionInteractionCompartmentEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.InteractionOperandEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.InteractionUseEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.LifelineEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message2EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message3EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message4EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message5EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message6EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message7EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.MessageEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.PackageEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.StateInvariantEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.TimeConstraintEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.TimeObservationEditPart;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.common.helper.DurationConstraintHelper;

+import org.eclipse.papyrus.uml.diagram.common.helper.TimeConstraintHelper;

+import org.eclipse.papyrus.uml.diagram.common.helper.TimeObservationHelper;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ActionExecutionSpecificationEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.BehaviorExecutionSpecificationEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragment2EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragmentCombinedFragmentCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragmentEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CommentEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ConsiderIgnoreFragmentEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ConstraintEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ContinuationEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DestructionEventEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationConstraintEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationConstraintInMessageEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.GeneralOrderingEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionInteractionCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionOperandEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionUseEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message2EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message3EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message4EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message5EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message6EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message7EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.PackageEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.StateInvariantEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.TimeConstraintEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.TimeObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

 import org.eclipse.uml2.uml.ActionExecutionSpecification;

 import org.eclipse.uml2.uml.BehaviorExecutionSpecification;

 import org.eclipse.uml2.uml.CombinedFragment;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/part/UMLDocumentProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/part/UMLDocumentProvider.java
index b78294068e5..4615f6f46fc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/part/UMLDocumentProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/part/UMLDocumentProvider.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.part;

+package org.eclipse.papyrus.uml.diagram.sequence.part;

 

 import java.io.IOException;

 import java.util.ArrayList;

@@ -150,7 +150,7 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi
 	 */

 	private TransactionalEditingDomain createEditingDomain() {

 		TransactionalEditingDomain editingDomain = DiagramEditingDomainFactory.getInstance().createEditingDomain();

-		editingDomain.setID("org.eclipse.papyrus.diagram.sequence.EditingDomain"); //$NON-NLS-1$

+		editingDomain.setID("org.eclipse.papyrus.uml.diagram.sequence.EditingDomain"); //$NON-NLS-1$

 		final NotificationFilter diagramResourceModifiedFilter = NotificationFilter.createNotifierFilter(editingDomain.getResourceSet()).and(NotificationFilter.createEventTypeFilter(Notification.ADD)).and(NotificationFilter.createFeatureFilter(ResourceSet.class, ResourceSet.RESOURCE_SET__RESOURCES));

 		editingDomain.getResourceSet().eAdapters().add(new Adapter() {

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/part/UMLInitDiagramFileAction.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/part/UMLInitDiagramFileAction.java
index bc41de11f0c..be4ce7a1c2a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/part/UMLInitDiagramFileAction.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/part/UMLInitDiagramFileAction.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.part;

+package org.eclipse.papyrus.uml.diagram.sequence.part;

 

 import org.eclipse.core.resources.IFile;

 import org.eclipse.emf.common.util.URI;

@@ -27,7 +27,7 @@ import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;

 import org.eclipse.jface.wizard.Wizard;

 import org.eclipse.osgi.util.NLS;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.PackageEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.PackageEditPart;

 import org.eclipse.swt.widgets.Shell;

 import org.eclipse.ui.IObjectActionDelegate;

 import org.eclipse.ui.IWorkbenchPart;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/part/UMLLinkDescriptor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/part/UMLLinkDescriptor.java
index c1451c50a93..f51caad72ba 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/part/UMLLinkDescriptor.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/part/UMLLinkDescriptor.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.part;

+package org.eclipse.papyrus.uml.diagram.sequence.part;

 

 import org.eclipse.core.runtime.IAdaptable;

 import org.eclipse.emf.ecore.EObject;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/part/UMLMatchingStrategy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/part/UMLMatchingStrategy.java
index aa359fab803..e74663bc888 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/part/UMLMatchingStrategy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/part/UMLMatchingStrategy.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.part;

+package org.eclipse.papyrus.uml.diagram.sequence.part;

 

 import org.eclipse.emf.common.ui.URIEditorInput;

 import org.eclipse.ui.IEditorInput;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/part/UMLNewDiagramFileWizard.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/part/UMLNewDiagramFileWizard.java
index 4421ae1dd38..1c79dc40f7b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/part/UMLNewDiagramFileWizard.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/part/UMLNewDiagramFileWizard.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.part;

+package org.eclipse.papyrus.uml.diagram.sequence.part;

 

 import java.io.IOException;

 import java.util.LinkedList;

@@ -38,7 +38,7 @@ import org.eclipse.gmf.runtime.notation.Diagram;
 import org.eclipse.jface.viewers.StructuredSelection;

 import org.eclipse.jface.wizard.Wizard;

 import org.eclipse.osgi.util.NLS;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.PackageEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.PackageEditPart;

 import org.eclipse.ui.PartInitException;

 import org.eclipse.ui.dialogs.WizardNewFileCreationPage;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/part/UMLNodeDescriptor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/part/UMLNodeDescriptor.java
index abd6a81f091..fd0e58a80d7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/part/UMLNodeDescriptor.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/part/UMLNodeDescriptor.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.part;

+package org.eclipse.papyrus.uml.diagram.sequence.part;

 

 import org.eclipse.emf.ecore.EObject;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/part/UMLPaletteFactory.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/part/UMLPaletteFactory.java
index 0745e87fec8..94c4a81d969 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/part/UMLPaletteFactory.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/part/UMLPaletteFactory.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.part;

+package org.eclipse.papyrus.uml.diagram.sequence.part;

 

 import java.util.ArrayList;

 import java.util.List;

@@ -19,10 +19,10 @@ import java.util.List;
 import org.eclipse.gef.Tool;

 import org.eclipse.gmf.runtime.diagram.ui.services.palette.PaletteFactory;

 import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.papyrus.diagram.common.service.AspectUnspecifiedTypeConnectionTool;

-import org.eclipse.papyrus.diagram.common.service.AspectUnspecifiedTypeCreationTool;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.sequence.service.DurationCreationTool;

+import org.eclipse.papyrus.uml.diagram.common.service.AspectUnspecifiedTypeConnectionTool;

+import org.eclipse.papyrus.uml.diagram.common.service.AspectUnspecifiedTypeCreationTool;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.sequence.service.DurationCreationTool;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/part/UMLUriEditorInputTester.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/part/UMLUriEditorInputTester.java
index b00e3c0b79e..fd4ab1f5603 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/part/UMLUriEditorInputTester.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/part/UMLUriEditorInputTester.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.part;

+package org.eclipse.papyrus.uml.diagram.sequence.part;

 

 import org.eclipse.core.expressions.PropertyTester;

 import org.eclipse.emf.common.ui.URIEditorInput;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/part/UMLVisualIDRegistry.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/part/UMLVisualIDRegistry.java
index 01f1d51f810..89664a66804 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/part/UMLVisualIDRegistry.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/part/UMLVisualIDRegistry.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.part;

+package org.eclipse.papyrus.uml.diagram.sequence.part;

 

 import java.util.List;

 

@@ -20,75 +20,75 @@ import org.eclipse.emf.ecore.EAnnotation;
 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gmf.runtime.notation.Diagram;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.helper.DurationConstraintHelper;

-import org.eclipse.papyrus.diagram.common.helper.DurationObservationHelper;

-import org.eclipse.papyrus.diagram.common.providers.BaseViewInfo;

-import org.eclipse.papyrus.diagram.common.providers.ViewInfo;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.ActionExecutionSpecificationEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.BehaviorExecutionSpecificationEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.CombinedFragment2EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.CombinedFragmentCombinedFragmentCompartmentEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.CombinedFragmentEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.CommentBodyEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.CommentEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.ConsiderIgnoreFragmentEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Constraint2EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.ConstraintEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.ConstraintNameEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.ContinuationEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.ContinuationNameEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.DestructionEventEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.DurationConstraintAppliedStereotypeEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.DurationConstraintEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.DurationConstraintInMessageAppliedStereotypeEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.DurationConstraintInMessageEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.DurationConstraintInMessageLabelEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.DurationConstraintLabelEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.DurationObservationAppliedStereotypeEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.DurationObservationEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.DurationObservationLabelEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.GeneralOrderingAppliedStereotypeEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.GeneralOrderingEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.InteractionEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.InteractionInteractionCompartmentEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.InteractionNameEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.InteractionOperandEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.InteractionUseEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.InteractionUseName2EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.InteractionUseNameEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.LifelineEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.LifelineNameEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message2EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message3EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message4EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message5EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message6EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message7EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.MessageAsyncAppliedStereotypeEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.MessageCreateAppliedStereotypeEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.MessageDeleteAppliedStereotypeEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.MessageEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.MessageFoundAppliedStereotypeEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.MessageLostAppliedStereotypeEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.MessageName2EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.MessageName3EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.MessageName4EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.MessageName5EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.MessageName6EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.MessageName7EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.MessageNameEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.MessageReplyAppliedStereotypeEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.MessageSyncAppliedStereotypeEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.PackageEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.StateInvariantEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.StateInvariantNameEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.TimeConstraintAppliedStereotypeEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.TimeConstraintEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.TimeConstraintLabelEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.TimeObservationAppliedStereotypeEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.TimeObservationEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.TimeObservationLabelEditPart;

-import org.eclipse.papyrus.diagram.sequence.expressions.UMLOCLFactory;

+import org.eclipse.papyrus.uml.diagram.common.helper.DurationConstraintHelper;

+import org.eclipse.papyrus.uml.diagram.common.helper.DurationObservationHelper;

+import org.eclipse.papyrus.uml.diagram.common.providers.BaseViewInfo;

+import org.eclipse.papyrus.uml.diagram.common.providers.ViewInfo;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ActionExecutionSpecificationEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.BehaviorExecutionSpecificationEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragment2EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragmentCombinedFragmentCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragmentEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CommentBodyEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CommentEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ConsiderIgnoreFragmentEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Constraint2EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ConstraintEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ConstraintNameEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ContinuationEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ContinuationNameEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DestructionEventEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationConstraintAppliedStereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationConstraintEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationConstraintInMessageAppliedStereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationConstraintInMessageEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationConstraintInMessageLabelEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationConstraintLabelEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationObservationAppliedStereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationObservationLabelEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.GeneralOrderingAppliedStereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.GeneralOrderingEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionInteractionCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionNameEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionOperandEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionUseEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionUseName2EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionUseNameEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineNameEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message2EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message3EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message4EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message5EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message6EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message7EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageAsyncAppliedStereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageCreateAppliedStereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageDeleteAppliedStereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageFoundAppliedStereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageLostAppliedStereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageName2EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageName3EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageName4EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageName5EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageName6EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageName7EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageNameEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageReplyAppliedStereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageSyncAppliedStereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.PackageEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.StateInvariantEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.StateInvariantNameEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.TimeConstraintAppliedStereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.TimeConstraintEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.TimeConstraintLabelEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.TimeObservationAppliedStereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.TimeObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.TimeObservationLabelEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.expressions.UMLOCLFactory;

 import org.eclipse.uml2.uml.DurationConstraint;

 import org.eclipse.uml2.uml.DurationObservation;

 import org.eclipse.uml2.uml.Element;

@@ -109,7 +109,7 @@ public class UMLVisualIDRegistry {
 	/**

 	 * @generated

 	 */

-	private static final String DEBUG_KEY = "org.eclipse.papyrus.diagram.sequence/debug/visualID"; //$NON-NLS-1$

+	private static final String DEBUG_KEY = "org.eclipse.papyrus.uml.diagram.sequence/debug/visualID"; //$NON-NLS-1$

 

 	/**

 	 * @generated

@@ -122,7 +122,7 @@ public class UMLVisualIDRegistry {
 				return -1;

 			}

 		}

-		return org.eclipse.papyrus.diagram.sequence.part.UMLVisualIDRegistry.getVisualID(view.getType());

+		return org.eclipse.papyrus.uml.diagram.sequence.part.UMLVisualIDRegistry.getVisualID(view.getType());

 	}

 

 	/**

@@ -184,13 +184,13 @@ public class UMLVisualIDRegistry {
 		if(domainElement == null) {

 			return -1;

 		}

-		String containerModelID = org.eclipse.papyrus.diagram.sequence.part.UMLVisualIDRegistry.getModelID(containerView);

+		String containerModelID = org.eclipse.papyrus.uml.diagram.sequence.part.UMLVisualIDRegistry.getModelID(containerView);

 		if(!PackageEditPart.MODEL_ID.equals(containerModelID)) {

 			return -1;

 		}

 		int containerVisualID;

 		if(PackageEditPart.MODEL_ID.equals(containerModelID)) {

-			containerVisualID = org.eclipse.papyrus.diagram.sequence.part.UMLVisualIDRegistry.getVisualID(containerView);

+			containerVisualID = org.eclipse.papyrus.uml.diagram.sequence.part.UMLVisualIDRegistry.getVisualID(containerView);

 		} else {

 			if(containerView instanceof Diagram) {

 				containerVisualID = PackageEditPart.VISUAL_ID;

@@ -368,13 +368,13 @@ public class UMLVisualIDRegistry {
 	 * @generated

 	 */

 	public static boolean canCreateNode(View containerView, int nodeVisualID) {

-		String containerModelID = org.eclipse.papyrus.diagram.sequence.part.UMLVisualIDRegistry.getModelID(containerView);

+		String containerModelID = org.eclipse.papyrus.uml.diagram.sequence.part.UMLVisualIDRegistry.getModelID(containerView);

 		if(!PackageEditPart.MODEL_ID.equals(containerModelID)) {

 			return false;

 		}

 		int containerVisualID;

 		if(PackageEditPart.MODEL_ID.equals(containerModelID)) {

-			containerVisualID = org.eclipse.papyrus.diagram.sequence.part.UMLVisualIDRegistry.getVisualID(containerView);

+			containerVisualID = org.eclipse.papyrus.uml.diagram.sequence.part.UMLVisualIDRegistry.getVisualID(containerView);

 		} else {

 			if(containerView instanceof Diagram) {

 				containerVisualID = PackageEditPart.VISUAL_ID;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/part/ValidateAction.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/part/ValidateAction.java
index 5471c5b69d4..62fdbccc682 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/part/ValidateAction.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/part/ValidateAction.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.sequence.part;

+package org.eclipse.papyrus.uml.diagram.sequence.part;

 

 import java.lang.reflect.InvocationTargetException;

 import java.util.ArrayList;

@@ -29,8 +29,8 @@ import org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.action.Action;

 import org.eclipse.jface.operation.IRunnableWithProgress;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLMarkerNavigationProvider;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLValidationProvider;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLMarkerNavigationProvider;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLValidationProvider;

 import org.eclipse.ui.IEditorPart;

 import org.eclipse.ui.IWorkbenchPage;

 import org.eclipse.ui.IWorkbenchPart;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/preferences/ActionExecutionSpecificationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/ActionExecutionSpecificationPreferencePage.java
index 598043a6811..ee5c4c1605b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/preferences/ActionExecutionSpecificationPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/ActionExecutionSpecificationPreferencePage.java
@@ -11,13 +11,13 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.preferences;

+package org.eclipse.papyrus.uml.diagram.sequence.preferences;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.PackageEditPart;

-import org.eclipse.papyrus.diagram.sequence.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.PackageEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/preferences/BehaviorExecutionSpecificationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/BehaviorExecutionSpecificationPreferencePage.java
index b588d01a7b1..5ad56718d4c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/preferences/BehaviorExecutionSpecificationPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/BehaviorExecutionSpecificationPreferencePage.java
@@ -11,13 +11,13 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.preferences;

+package org.eclipse.papyrus.uml.diagram.sequence.preferences;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.PackageEditPart;

-import org.eclipse.papyrus.diagram.sequence.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.PackageEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/preferences/CombinedFragmentPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/CombinedFragmentPreferencePage.java
index 7ef512dc960..da684b4f0a4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/preferences/CombinedFragmentPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/CombinedFragmentPreferencePage.java
@@ -11,14 +11,14 @@
  *   Atos Origin - Initial API and implementation

  *   Vincent Lorenzo - vincent.lorenzo@cea.fr - CEA - LIST

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.preferences;

+package org.eclipse.papyrus.uml.diagram.sequence.preferences;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.PackageEditPart;

-import org.eclipse.papyrus.diagram.sequence.part.Messages;

-import org.eclipse.papyrus.diagram.sequence.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.PackageEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.part.Messages;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/preferences/CommentPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/CommentPreferencePage.java
index 0250782ce9b..08ff26a383a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/preferences/CommentPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/CommentPreferencePage.java
@@ -11,13 +11,13 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.preferences;

+package org.eclipse.papyrus.uml.diagram.sequence.preferences;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.PackageEditPart;

-import org.eclipse.papyrus.diagram.sequence.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.PackageEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/preferences/ConsiderIgnoreFragmentPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/ConsiderIgnoreFragmentPreferencePage.java
index bcb968d0aba..d9a07722881 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/preferences/ConsiderIgnoreFragmentPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/ConsiderIgnoreFragmentPreferencePage.java
@@ -11,14 +11,14 @@
  *   Atos Origin - Initial API and implementation

  *   Vincent Lorenzo - vincent.lorenzo@cea.fr - CEA - LIST

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.preferences;

+package org.eclipse.papyrus.uml.diagram.sequence.preferences;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.PackageEditPart;

-import org.eclipse.papyrus.diagram.sequence.part.Messages;

-import org.eclipse.papyrus.diagram.sequence.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.PackageEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.part.Messages;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/preferences/ConstraintPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/ConstraintPreferencePage.java
index 376a8fdd28f..49c09d4ccb1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/preferences/ConstraintPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/ConstraintPreferencePage.java
@@ -11,13 +11,13 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.preferences;

+package org.eclipse.papyrus.uml.diagram.sequence.preferences;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.PackageEditPart;

-import org.eclipse.papyrus.diagram.sequence.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.PackageEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/preferences/ContinuationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/ContinuationPreferencePage.java
index 56c24b78aba..bf75631f9b2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/preferences/ContinuationPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/ContinuationPreferencePage.java
@@ -11,13 +11,13 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.preferences;

+package org.eclipse.papyrus.uml.diagram.sequence.preferences;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.PackageEditPart;

-import org.eclipse.papyrus.diagram.sequence.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.PackageEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/preferences/DestructionEventPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/DestructionEventPreferencePage.java
index 285a419eb61..5782e249721 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/preferences/DestructionEventPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/DestructionEventPreferencePage.java
@@ -11,13 +11,13 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.preferences;

+package org.eclipse.papyrus.uml.diagram.sequence.preferences;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.PackageEditPart;

-import org.eclipse.papyrus.diagram.sequence.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.PackageEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/preferences/DiagramAppearancePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/DiagramAppearancePreferencePage.java
index 927459d022f..8823b546c25 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/preferences/DiagramAppearancePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/DiagramAppearancePreferencePage.java
@@ -11,10 +11,10 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.preferences;

+package org.eclipse.papyrus.uml.diagram.sequence.preferences;

 

 import org.eclipse.gmf.runtime.diagram.ui.preferences.AppearancePreferencePage;

-import org.eclipse.papyrus.diagram.sequence.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/preferences/DiagramConnectionsPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/DiagramConnectionsPreferencePage.java
index cf36c8291eb..edb12fdb1d1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/preferences/DiagramConnectionsPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/DiagramConnectionsPreferencePage.java
@@ -11,10 +11,10 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.preferences;

+package org.eclipse.papyrus.uml.diagram.sequence.preferences;

 

 import org.eclipse.gmf.runtime.diagram.ui.preferences.ConnectionsPreferencePage;

-import org.eclipse.papyrus.diagram.sequence.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/preferences/DiagramGeneralPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/DiagramGeneralPreferencePage.java
index 463ee2f6d4a..efef62fbd4f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/preferences/DiagramGeneralPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/DiagramGeneralPreferencePage.java
@@ -11,11 +11,11 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.preferences;

+package org.eclipse.papyrus.uml.diagram.sequence.preferences;

 

-import org.eclipse.papyrus.diagram.sequence.edit.parts.PackageEditPart;

-import org.eclipse.papyrus.diagram.sequence.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.DiagramPreferencePage;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.PackageEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/preferences/DiagramPreferenceInitializer.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/DiagramPreferenceInitializer.java
index 394bf723864..c78b7e7328a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/preferences/DiagramPreferenceInitializer.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/DiagramPreferenceInitializer.java
@@ -11,11 +11,11 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.preferences;

+package org.eclipse.papyrus.uml.diagram.sequence.preferences;

 

 import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.sequence.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/preferences/DiagramPrintingPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/DiagramPrintingPreferencePage.java
index 4600c0f15bc..c1cdac5af75 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/preferences/DiagramPrintingPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/DiagramPrintingPreferencePage.java
@@ -11,10 +11,10 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.preferences;

+package org.eclipse.papyrus.uml.diagram.sequence.preferences;

 

 import org.eclipse.gmf.runtime.diagram.ui.preferences.PrintingPreferencePage;

-import org.eclipse.papyrus.diagram.sequence.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/preferences/DiagramRulersAndGridPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/DiagramRulersAndGridPreferencePage.java
index fb4accf65df..d72d136f704 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/preferences/DiagramRulersAndGridPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/DiagramRulersAndGridPreferencePage.java
@@ -11,10 +11,10 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.preferences;

+package org.eclipse.papyrus.uml.diagram.sequence.preferences;

 

 import org.eclipse.gmf.runtime.diagram.ui.preferences.RulerGridPreferencePage;

-import org.eclipse.papyrus.diagram.sequence.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/preferences/DurationConstraintInMessagePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/DurationConstraintInMessagePreferencePage.java
index 00bf1542f08..e84ad254381 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/preferences/DurationConstraintInMessagePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/DurationConstraintInMessagePreferencePage.java
@@ -11,14 +11,14 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.preferences;

+package org.eclipse.papyrus.uml.diagram.sequence.preferences;

 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.sequence.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/preferences/DurationConstraintPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/DurationConstraintPreferencePage.java
index 9f58c16b27e..c422a7432d4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/preferences/DurationConstraintPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/DurationConstraintPreferencePage.java
@@ -11,13 +11,13 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.preferences;

+package org.eclipse.papyrus.uml.diagram.sequence.preferences;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.PackageEditPart;

-import org.eclipse.papyrus.diagram.sequence.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.PackageEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/preferences/DurationObservationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/DurationObservationPreferencePage.java
index bc81935da02..14c0ad1b7c9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/preferences/DurationObservationPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/DurationObservationPreferencePage.java
@@ -11,13 +11,13 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.preferences;

+package org.eclipse.papyrus.uml.diagram.sequence.preferences;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.PackageEditPart;

-import org.eclipse.papyrus.diagram.sequence.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.PackageEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/preferences/GeneralOrderingPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/GeneralOrderingPreferencePage.java
index 154c03d91f8..2a52e235ef1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/preferences/GeneralOrderingPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/GeneralOrderingPreferencePage.java
@@ -1,9 +1,9 @@
-package org.eclipse.papyrus.diagram.sequence.preferences;

+package org.eclipse.papyrus.uml.diagram.sequence.preferences;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.PackageEditPart;

-import org.eclipse.papyrus.diagram.sequence.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusLinkPreferencePage;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.PackageEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/preferences/InteractionOperandPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/InteractionOperandPreferencePage.java
index 056ba38d871..d61a7bba8a8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/preferences/InteractionOperandPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/InteractionOperandPreferencePage.java
@@ -11,13 +11,13 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.preferences;

+package org.eclipse.papyrus.uml.diagram.sequence.preferences;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.PackageEditPart;

-import org.eclipse.papyrus.diagram.sequence.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.PackageEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/preferences/InteractionPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/InteractionPreferencePage.java
index 80d33be21cf..8f81721397c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/preferences/InteractionPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/InteractionPreferencePage.java
@@ -11,13 +11,13 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.preferences;

+package org.eclipse.papyrus.uml.diagram.sequence.preferences;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.PackageEditPart;

-import org.eclipse.papyrus.diagram.sequence.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.PackageEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/preferences/InteractionUsePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/InteractionUsePreferencePage.java
index 12b557ac2c7..ca0155e9e58 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/preferences/InteractionUsePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/InteractionUsePreferencePage.java
@@ -11,13 +11,13 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.preferences;

+package org.eclipse.papyrus.uml.diagram.sequence.preferences;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.PackageEditPart;

-import org.eclipse.papyrus.diagram.sequence.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.PackageEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/preferences/LifelinePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/LifelinePreferencePage.java
index b1f74972e1c..a14d98516ce 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/preferences/LifelinePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/LifelinePreferencePage.java
@@ -11,13 +11,13 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.preferences;

+package org.eclipse.papyrus.uml.diagram.sequence.preferences;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.PackageEditPart;

-import org.eclipse.papyrus.diagram.sequence.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.PackageEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/preferences/MessageOccurrenceSpecificationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/MessageOccurrenceSpecificationPreferencePage.java
index 51e96096723..c2435fafff9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/preferences/MessageOccurrenceSpecificationPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/MessageOccurrenceSpecificationPreferencePage.java
@@ -11,11 +11,11 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.preferences;

+package org.eclipse.papyrus.uml.diagram.sequence.preferences;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.sequence.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusLinkPreferencePage;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/preferences/MessagePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/MessagePreferencePage.java
index fa7345c2683..cc0cd08436f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/preferences/MessagePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/MessagePreferencePage.java
@@ -11,12 +11,12 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.preferences;

+package org.eclipse.papyrus.uml.diagram.sequence.preferences;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.PackageEditPart;

-import org.eclipse.papyrus.diagram.sequence.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusLinkPreferencePage;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.PackageEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/preferences/StateInvariantPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/StateInvariantPreferencePage.java
index 604ca0342cb..8d4c615d7f2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/preferences/StateInvariantPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/StateInvariantPreferencePage.java
@@ -11,13 +11,13 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.preferences;

+package org.eclipse.papyrus.uml.diagram.sequence.preferences;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.PackageEditPart;

-import org.eclipse.papyrus.diagram.sequence.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.PackageEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/preferences/TimeConstraintPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/TimeConstraintPreferencePage.java
index 3995ffb3c05..2c86301ca81 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/preferences/TimeConstraintPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/TimeConstraintPreferencePage.java
@@ -11,13 +11,13 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.preferences;

+package org.eclipse.papyrus.uml.diagram.sequence.preferences;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.PackageEditPart;

-import org.eclipse.papyrus.diagram.sequence.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.PackageEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/preferences/TimeObservationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/TimeObservationPreferencePage.java
index 42a8772189b..50696e1a708 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/preferences/TimeObservationPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/TimeObservationPreferencePage.java
@@ -11,13 +11,13 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.preferences;

+package org.eclipse.papyrus.uml.diagram.sequence.preferences;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.PackageEditPart;

-import org.eclipse.papyrus.diagram.sequence.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.PackageEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/providers/ElementInitializers.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/providers/ElementInitializers.java
index 7eb4618f57c..423bc6f5253 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/providers/ElementInitializers.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/providers/ElementInitializers.java
@@ -11,14 +11,14 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.providers;

+package org.eclipse.papyrus.uml.diagram.sequence.providers;

 

 import java.util.Collection;

 import java.util.HashSet;

 import java.util.Set;

 

-import org.eclipse.papyrus.diagram.sequence.expressions.UMLOCLFactory;

-import org.eclipse.papyrus.diagram.sequence.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.sequence.expressions.UMLOCLFactory;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin;

 import org.eclipse.uml2.uml.CombinedFragment;

 import org.eclipse.uml2.uml.Comment;

 import org.eclipse.uml2.uml.ConsiderIgnoreFragment;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/providers/UMLEditPartProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/providers/UMLEditPartProvider.java
index 26edafd8475..15e275de349 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/providers/UMLEditPartProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/providers/UMLEditPartProvider.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.providers;

+package org.eclipse.papyrus.uml.diagram.sequence.providers;

 

 import java.lang.ref.WeakReference;

 

@@ -23,9 +23,9 @@ import org.eclipse.gmf.runtime.diagram.ui.services.editpart.AbstractEditPartProv
 import org.eclipse.gmf.runtime.diagram.ui.services.editpart.CreateGraphicEditPartOperation;

 import org.eclipse.gmf.runtime.diagram.ui.services.editpart.IEditPartOperation;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.PackageEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.UMLEditPartFactory;

-import org.eclipse.papyrus.diagram.sequence.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.PackageEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.UMLEditPartFactory;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLVisualIDRegistry;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/providers/UMLElementTypes.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/providers/UMLElementTypes.java
index aa17fe33845..b6145e30679 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/providers/UMLElementTypes.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/providers/UMLElementTypes.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.providers;

+package org.eclipse.papyrus.uml.diagram.sequence.providers;

 

 import java.util.HashSet;

 import java.util.IdentityHashMap;

@@ -27,37 +27,37 @@ import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
 import org.eclipse.gmf.runtime.emf.type.core.IElementType;

 import org.eclipse.jface.resource.ImageDescriptor;

 import org.eclipse.jface.resource.ImageRegistry;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.ActionExecutionSpecificationEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.BehaviorExecutionSpecificationEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.CombinedFragment2EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.CombinedFragmentEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.CommentEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.ConsiderIgnoreFragmentEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.ConstraintEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.ContinuationEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.DestructionEventEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.DurationConstraintEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.DurationConstraintInMessageEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.DurationObservationEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.GeneralOrderingEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.InteractionEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.InteractionOperandEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.InteractionUseEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.LifelineEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message2EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message3EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message4EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message5EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message6EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message7EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.MessageEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.PackageEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.StateInvariantEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.TimeConstraintEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.TimeObservationEditPart;

-import org.eclipse.papyrus.diagram.sequence.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ActionExecutionSpecificationEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.BehaviorExecutionSpecificationEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragment2EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragmentEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CommentEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ConsiderIgnoreFragmentEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ConstraintEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ContinuationEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DestructionEventEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationConstraintEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationConstraintInMessageEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.GeneralOrderingEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionOperandEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionUseEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message2EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message3EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message4EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message5EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message6EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message7EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.PackageEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.StateInvariantEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.TimeConstraintEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.TimeObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin;

 import org.eclipse.swt.graphics.Image;

 import org.eclipse.uml2.uml.UMLPackage;

 

@@ -90,152 +90,152 @@ public class UMLElementTypes {
 	/**

 	 * @generated

 	 */

-	public static final IElementType Package_1000 = getElementType("org.eclipse.papyrus.diagram.sequence.Package_1000"); //$NON-NLS-1$

+	public static final IElementType Package_1000 = getElementType("org.eclipse.papyrus.uml.diagram.sequence.Package_1000"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Interaction_2001 = getElementType("org.eclipse.papyrus.diagram.sequence.Interaction_2001"); //$NON-NLS-1$

+	public static final IElementType Interaction_2001 = getElementType("org.eclipse.papyrus.uml.diagram.sequence.Interaction_2001"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Lifeline_3001 = getElementType("org.eclipse.papyrus.diagram.sequence.Lifeline_3001"); //$NON-NLS-1$

+	public static final IElementType Lifeline_3001 = getElementType("org.eclipse.papyrus.uml.diagram.sequence.Lifeline_3001"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType BehaviorExecutionSpecification_3003 = getElementType("org.eclipse.papyrus.diagram.sequence.BehaviorExecutionSpecification_3003"); //$NON-NLS-1$

+	public static final IElementType BehaviorExecutionSpecification_3003 = getElementType("org.eclipse.papyrus.uml.diagram.sequence.BehaviorExecutionSpecification_3003"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType StateInvariant_3017 = getElementType("org.eclipse.papyrus.diagram.sequence.StateInvariant_3017"); //$NON-NLS-1$

+	public static final IElementType StateInvariant_3017 = getElementType("org.eclipse.papyrus.uml.diagram.sequence.StateInvariant_3017"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType CombinedFragment_3018 = getElementType("org.eclipse.papyrus.diagram.sequence.CombinedFragment_3018"); //$NON-NLS-1$

+	public static final IElementType CombinedFragment_3018 = getElementType("org.eclipse.papyrus.uml.diagram.sequence.CombinedFragment_3018"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType TimeConstraint_3019 = getElementType("org.eclipse.papyrus.diagram.sequence.TimeConstraint_3019"); //$NON-NLS-1$

+	public static final IElementType TimeConstraint_3019 = getElementType("org.eclipse.papyrus.uml.diagram.sequence.TimeConstraint_3019"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType TimeObservation_3020 = getElementType("org.eclipse.papyrus.diagram.sequence.TimeObservation_3020"); //$NON-NLS-1$

+	public static final IElementType TimeObservation_3020 = getElementType("org.eclipse.papyrus.uml.diagram.sequence.TimeObservation_3020"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType DurationConstraint_3021 = getElementType("org.eclipse.papyrus.diagram.sequence.DurationConstraint_3021"); //$NON-NLS-1$

+	public static final IElementType DurationConstraint_3021 = getElementType("org.eclipse.papyrus.uml.diagram.sequence.DurationConstraint_3021"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType DestructionEvent_3022 = getElementType("org.eclipse.papyrus.diagram.sequence.DestructionEvent_3022"); //$NON-NLS-1$

+	public static final IElementType DestructionEvent_3022 = getElementType("org.eclipse.papyrus.uml.diagram.sequence.DestructionEvent_3022"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType ActionExecutionSpecification_3006 = getElementType("org.eclipse.papyrus.diagram.sequence.ActionExecutionSpecification_3006"); //$NON-NLS-1$

+	public static final IElementType ActionExecutionSpecification_3006 = getElementType("org.eclipse.papyrus.uml.diagram.sequence.ActionExecutionSpecification_3006"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType InteractionUse_3002 = getElementType("org.eclipse.papyrus.diagram.sequence.InteractionUse_3002"); //$NON-NLS-1$

+	public static final IElementType InteractionUse_3002 = getElementType("org.eclipse.papyrus.uml.diagram.sequence.InteractionUse_3002"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType CombinedFragment_3004 = getElementType("org.eclipse.papyrus.diagram.sequence.CombinedFragment_3004"); //$NON-NLS-1$

+	public static final IElementType CombinedFragment_3004 = getElementType("org.eclipse.papyrus.uml.diagram.sequence.CombinedFragment_3004"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType InteractionOperand_3005 = getElementType("org.eclipse.papyrus.diagram.sequence.InteractionOperand_3005"); //$NON-NLS-1$

+	public static final IElementType InteractionOperand_3005 = getElementType("org.eclipse.papyrus.uml.diagram.sequence.InteractionOperand_3005"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Continuation_3016 = getElementType("org.eclipse.papyrus.diagram.sequence.Continuation_3016"); //$NON-NLS-1$

+	public static final IElementType Continuation_3016 = getElementType("org.eclipse.papyrus.uml.diagram.sequence.Continuation_3016"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Constraint_3008 = getElementType("org.eclipse.papyrus.diagram.sequence.Constraint_3008"); //$NON-NLS-1$

+	public static final IElementType Constraint_3008 = getElementType("org.eclipse.papyrus.uml.diagram.sequence.Constraint_3008"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Comment_3009 = getElementType("org.eclipse.papyrus.diagram.sequence.Comment_3009"); //$NON-NLS-1$

+	public static final IElementType Comment_3009 = getElementType("org.eclipse.papyrus.uml.diagram.sequence.Comment_3009"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType DurationConstraint_3023 = getElementType("org.eclipse.papyrus.diagram.sequence.DurationConstraint_3023"); //$NON-NLS-1$

+	public static final IElementType DurationConstraint_3023 = getElementType("org.eclipse.papyrus.uml.diagram.sequence.DurationConstraint_3023"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType DurationObservation_3024 = getElementType("org.eclipse.papyrus.diagram.sequence.DurationObservation_3024"); //$NON-NLS-1$

+	public static final IElementType DurationObservation_3024 = getElementType("org.eclipse.papyrus.uml.diagram.sequence.DurationObservation_3024"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType ConsiderIgnoreFragment_3007 = getElementType("org.eclipse.papyrus.diagram.sequence.ConsiderIgnoreFragment_3007"); //$NON-NLS-1$

+	public static final IElementType ConsiderIgnoreFragment_3007 = getElementType("org.eclipse.papyrus.uml.diagram.sequence.ConsiderIgnoreFragment_3007"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Message_4003 = getElementType("org.eclipse.papyrus.diagram.sequence.Message_4003"); //$NON-NLS-1$

+	public static final IElementType Message_4003 = getElementType("org.eclipse.papyrus.uml.diagram.sequence.Message_4003"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Message_4004 = getElementType("org.eclipse.papyrus.diagram.sequence.Message_4004"); //$NON-NLS-1$

+	public static final IElementType Message_4004 = getElementType("org.eclipse.papyrus.uml.diagram.sequence.Message_4004"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Message_4005 = getElementType("org.eclipse.papyrus.diagram.sequence.Message_4005"); //$NON-NLS-1$

+	public static final IElementType Message_4005 = getElementType("org.eclipse.papyrus.uml.diagram.sequence.Message_4005"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Message_4006 = getElementType("org.eclipse.papyrus.diagram.sequence.Message_4006"); //$NON-NLS-1$

+	public static final IElementType Message_4006 = getElementType("org.eclipse.papyrus.uml.diagram.sequence.Message_4006"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Message_4007 = getElementType("org.eclipse.papyrus.diagram.sequence.Message_4007"); //$NON-NLS-1$

+	public static final IElementType Message_4007 = getElementType("org.eclipse.papyrus.uml.diagram.sequence.Message_4007"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Message_4008 = getElementType("org.eclipse.papyrus.diagram.sequence.Message_4008"); //$NON-NLS-1$

+	public static final IElementType Message_4008 = getElementType("org.eclipse.papyrus.uml.diagram.sequence.Message_4008"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Message_4009 = getElementType("org.eclipse.papyrus.diagram.sequence.Message_4009"); //$NON-NLS-1$

+	public static final IElementType Message_4009 = getElementType("org.eclipse.papyrus.uml.diagram.sequence.Message_4009"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType CommentAnnotatedElement_4010 = getElementType("org.eclipse.papyrus.diagram.sequence.CommentAnnotatedElement_4010"); //$NON-NLS-1$

+	public static final IElementType CommentAnnotatedElement_4010 = getElementType("org.eclipse.papyrus.uml.diagram.sequence.CommentAnnotatedElement_4010"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType ConstraintConstrainedElement_4011 = getElementType("org.eclipse.papyrus.diagram.sequence.ConstraintConstrainedElement_4011"); //$NON-NLS-1$

+	public static final IElementType ConstraintConstrainedElement_4011 = getElementType("org.eclipse.papyrus.uml.diagram.sequence.ConstraintConstrainedElement_4011"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType GeneralOrdering_4012 = getElementType("org.eclipse.papyrus.diagram.sequence.GeneralOrdering_4012"); //$NON-NLS-1$

+	public static final IElementType GeneralOrdering_4012 = getElementType("org.eclipse.papyrus.uml.diagram.sequence.GeneralOrdering_4012"); //$NON-NLS-1$

 

 	/**

 	 * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/providers/UMLIconProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/providers/UMLIconProvider.java
index a76a103ba71..8b6a7d393e5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/providers/UMLIconProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/providers/UMLIconProvider.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.providers;

+package org.eclipse.papyrus.uml.diagram.sequence.providers;

 

 import org.eclipse.core.runtime.IAdaptable;

 import org.eclipse.gmf.runtime.common.core.service.AbstractProvider;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/providers/UMLMarkerNavigationProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/providers/UMLMarkerNavigationProvider.java
index c9e6f5240a0..9cd15e5ff17 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/providers/UMLMarkerNavigationProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/providers/UMLMarkerNavigationProvider.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.sequence.providers;

+package org.eclipse.papyrus.uml.diagram.sequence.providers;

 

 import java.util.Arrays;

 import java.util.Map;

@@ -12,8 +12,8 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gef.EditPart;

 import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditor;

 import org.eclipse.gmf.runtime.emf.ui.providers.marker.AbstractModelMarkerNavigationProvider;

-import org.eclipse.papyrus.diagram.sequence.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.sequence.part.UMLDiagramEditorUtil;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorUtil;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/providers/UMLModelingAssistantProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/providers/UMLModelingAssistantProvider.java
index af0412319d3..9a13d90a2a6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/providers/UMLModelingAssistantProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/providers/UMLModelingAssistantProvider.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.providers;

+package org.eclipse.papyrus.uml.diagram.sequence.providers;

 

 import java.util.ArrayList;

 import java.util.Collection;

@@ -30,29 +30,29 @@ import org.eclipse.gmf.runtime.emf.ui.services.modelingassistant.ModelingAssista
 import org.eclipse.gmf.runtime.notation.Diagram;

 import org.eclipse.jface.viewers.ILabelProvider;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.ActionExecutionSpecificationEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.BehaviorExecutionSpecificationEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.CombinedFragment2EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.CombinedFragmentEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.CommentEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.ConsiderIgnoreFragmentEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.ConstraintEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.ContinuationEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.DestructionEventEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.DurationConstraintEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.DurationConstraintInMessageEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.DurationObservationEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.InteractionEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.InteractionInteractionCompartmentEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.InteractionOperandEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.InteractionUseEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.LifelineEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.PackageEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.StateInvariantEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.TimeConstraintEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.TimeObservationEditPart;

-import org.eclipse.papyrus.diagram.sequence.part.Messages;

-import org.eclipse.papyrus.diagram.sequence.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ActionExecutionSpecificationEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.BehaviorExecutionSpecificationEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragment2EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragmentEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CommentEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ConsiderIgnoreFragmentEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ConstraintEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ContinuationEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DestructionEventEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationConstraintEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationConstraintInMessageEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionInteractionCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionOperandEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionUseEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.PackageEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.StateInvariantEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.TimeConstraintEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.TimeObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.part.Messages;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin;

 import org.eclipse.swt.widgets.Display;

 import org.eclipse.swt.widgets.Shell;

 import org.eclipse.ui.dialogs.ElementListSelectionDialog;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/providers/UMLParserProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/providers/UMLParserProvider.java
index cd669440a2b..007bc1d93a3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/providers/UMLParserProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/providers/UMLParserProvider.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.providers;

+package org.eclipse.papyrus.uml.diagram.sequence.providers;

 

 import org.eclipse.core.runtime.IAdaptable;

 import org.eclipse.emf.ecore.EAttribute;

@@ -25,51 +25,51 @@ import org.eclipse.gmf.runtime.common.ui.services.parser.ParserService;
 import org.eclipse.gmf.runtime.emf.type.core.IElementType;

 import org.eclipse.gmf.runtime.emf.ui.services.parser.ParserHintAdapter;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.parser.CommentParser;

-import org.eclipse.papyrus.diagram.common.parser.ConstraintParser;

-import org.eclipse.papyrus.diagram.common.parser.stereotype.AppliedStereotypeParser;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.CommentBodyEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Constraint2EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.ConstraintNameEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.ContinuationNameEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.DurationConstraintAppliedStereotypeEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.DurationConstraintInMessageAppliedStereotypeEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.DurationConstraintInMessageLabelEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.DurationConstraintLabelEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.DurationObservationAppliedStereotypeEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.DurationObservationLabelEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.GeneralOrderingAppliedStereotypeEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.InteractionNameEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.InteractionUseName2EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.InteractionUseNameEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.LifelineNameEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.MessageAsyncAppliedStereotypeEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.MessageCreateAppliedStereotypeEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.MessageDeleteAppliedStereotypeEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.MessageFoundAppliedStereotypeEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.MessageLostAppliedStereotypeEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.MessageName2EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.MessageName3EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.MessageName4EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.MessageName5EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.MessageName6EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.MessageName7EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.MessageNameEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.MessageReplyAppliedStereotypeEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.MessageSyncAppliedStereotypeEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.StateInvariantNameEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.TimeConstraintAppliedStereotypeEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.TimeConstraintLabelEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.TimeObservationAppliedStereotypeEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.TimeObservationLabelEditPart;

-import org.eclipse.papyrus.diagram.sequence.parser.custom.DurationObservationParser;

-import org.eclipse.papyrus.diagram.sequence.parser.custom.InteractionUseCustomParsers;

-import org.eclipse.papyrus.diagram.sequence.parser.custom.LifelineCustomParsers;

-import org.eclipse.papyrus.diagram.sequence.parser.custom.MessageCustomParser;

-import org.eclipse.papyrus.diagram.sequence.parser.custom.TimeConstraintParser;

-import org.eclipse.papyrus.diagram.sequence.parser.custom.TimeObservationParser;

-import org.eclipse.papyrus.diagram.sequence.parsers.MessageFormatParser;

-import org.eclipse.papyrus.diagram.sequence.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.common.parser.CommentParser;

+import org.eclipse.papyrus.uml.diagram.common.parser.ConstraintParser;

+import org.eclipse.papyrus.uml.diagram.common.parser.stereotype.AppliedStereotypeParser;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CommentBodyEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Constraint2EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ConstraintNameEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ContinuationNameEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationConstraintAppliedStereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationConstraintInMessageAppliedStereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationConstraintInMessageLabelEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationConstraintLabelEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationObservationAppliedStereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationObservationLabelEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.GeneralOrderingAppliedStereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionNameEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionUseName2EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionUseNameEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineNameEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageAsyncAppliedStereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageCreateAppliedStereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageDeleteAppliedStereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageFoundAppliedStereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageLostAppliedStereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageName2EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageName3EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageName4EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageName5EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageName6EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageName7EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageNameEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageReplyAppliedStereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageSyncAppliedStereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.StateInvariantNameEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.TimeConstraintAppliedStereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.TimeConstraintLabelEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.TimeObservationAppliedStereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.TimeObservationLabelEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.parser.custom.DurationObservationParser;

+import org.eclipse.papyrus.uml.diagram.sequence.parser.custom.InteractionUseCustomParsers;

+import org.eclipse.papyrus.uml.diagram.sequence.parser.custom.LifelineCustomParsers;

+import org.eclipse.papyrus.uml.diagram.sequence.parser.custom.MessageCustomParser;

+import org.eclipse.papyrus.uml.diagram.sequence.parser.custom.TimeConstraintParser;

+import org.eclipse.papyrus.uml.diagram.sequence.parser.custom.TimeObservationParser;

+import org.eclipse.papyrus.uml.diagram.sequence.parsers.MessageFormatParser;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLVisualIDRegistry;

 import org.eclipse.uml2.uml.UMLPackage;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/providers/UMLValidationDecoratorProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/providers/UMLValidationDecoratorProvider.java
index f4bcee36324..39b951f8af0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/providers/UMLValidationDecoratorProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/providers/UMLValidationDecoratorProvider.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.sequence.providers;

+package org.eclipse.papyrus.uml.diagram.sequence.providers;

 

 import org.eclipse.gef.EditDomain;

 import org.eclipse.gef.EditPart;

@@ -11,10 +11,10 @@ import org.eclipse.gmf.runtime.diagram.ui.services.decorator.IDecoratorProvider;
 import org.eclipse.gmf.runtime.diagram.ui.services.decorator.IDecoratorTarget;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.providers.ValidationDecoratorProvider;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.PackageEditPart;

-import org.eclipse.papyrus.diagram.sequence.part.UMLDiagramEditor;

-import org.eclipse.papyrus.diagram.sequence.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.common.providers.ValidationDecoratorProvider;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.PackageEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditor;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLVisualIDRegistry;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/providers/UMLValidationProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/providers/UMLValidationProvider.java
index 14aecc5c0f2..7f02cb7a667 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/providers/UMLValidationProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/providers/UMLValidationProvider.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.sequence.providers;

+package org.eclipse.papyrus.uml.diagram.sequence.providers;

 

 import java.util.Arrays;

 import java.util.Collection;

@@ -15,23 +15,23 @@ import org.eclipse.emf.validation.service.ITraversalStrategy;
 import org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil;

 import org.eclipse.gmf.runtime.notation.Bounds;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.ActionExecutionSpecificationEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.BehaviorExecutionSpecificationEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.CombinedFragment2EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.CombinedFragmentEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.InteractionOperandEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.LifelineEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message2EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message3EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message4EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message5EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message6EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message7EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.MessageEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.PackageEditPart;

-import org.eclipse.papyrus.diagram.sequence.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.sequence.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.sequence.validation.UMLValidationHelper;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ActionExecutionSpecificationEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.BehaviorExecutionSpecificationEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragment2EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragmentEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionOperandEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message2EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message3EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message4EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message5EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message6EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message7EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.PackageEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.sequence.validation.UMLValidationHelper;

 import org.eclipse.uml2.uml.Interaction;

 import org.eclipse.uml2.uml.InteractionOperand;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/providers/UMLViewProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/providers/UMLViewProvider.java
index 2795ac39c85..d68c3151748 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/providers/UMLViewProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/providers/UMLViewProvider.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *   Vincent Lorenzo - vincent.lorenzo@cea.fr - CEA - LIST

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.providers;

+package org.eclipse.papyrus.uml.diagram.sequence.providers;

 

 import java.util.ArrayList;

 

@@ -52,77 +52,77 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.gmf.runtime.notation.datatype.RelativeBendpoint;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.common.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.ActionExecutionSpecificationEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.BehaviorExecutionSpecificationEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.CombinedFragment2EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.CombinedFragmentCombinedFragmentCompartmentEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.CombinedFragmentEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.CommentBodyEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.CommentEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.ConsiderIgnoreFragmentEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Constraint2EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.ConstraintEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.ConstraintNameEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.ContinuationEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.ContinuationNameEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.DestructionEventEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.DurationConstraintAppliedStereotypeEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.DurationConstraintEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.DurationConstraintInMessageAppliedStereotypeEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.DurationConstraintInMessageEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.DurationConstraintInMessageLabelEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.DurationConstraintLabelEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.DurationObservationAppliedStereotypeEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.DurationObservationEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.DurationObservationLabelEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.GeneralOrderingAppliedStereotypeEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.GeneralOrderingEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.InteractionEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.InteractionInteractionCompartmentEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.InteractionNameEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.InteractionOperandEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.InteractionUseEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.InteractionUseName2EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.InteractionUseNameEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.LifelineEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.LifelineNameEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message2EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message3EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message4EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message5EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message6EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.Message7EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.MessageAsyncAppliedStereotypeEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.MessageCreateAppliedStereotypeEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.MessageDeleteAppliedStereotypeEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.MessageEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.MessageFoundAppliedStereotypeEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.MessageLostAppliedStereotypeEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.MessageName2EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.MessageName3EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.MessageName4EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.MessageName5EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.MessageName6EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.MessageName7EditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.MessageNameEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.MessageReplyAppliedStereotypeEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.MessageSyncAppliedStereotypeEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.PackageEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.StateInvariantEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.StateInvariantNameEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.TimeConstraintAppliedStereotypeEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.TimeConstraintEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.TimeConstraintLabelEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.TimeObservationAppliedStereotypeEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.TimeObservationEditPart;

-import org.eclipse.papyrus.diagram.sequence.edit.parts.TimeObservationLabelEditPart;

-import org.eclipse.papyrus.diagram.sequence.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.sequence.part.UMLVisualIDRegistry;

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ActionExecutionSpecificationEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.BehaviorExecutionSpecificationEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragment2EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragmentCombinedFragmentCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragmentEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CommentBodyEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CommentEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ConsiderIgnoreFragmentEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Constraint2EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ConstraintEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ConstraintNameEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ContinuationEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ContinuationNameEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DestructionEventEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationConstraintAppliedStereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationConstraintEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationConstraintInMessageAppliedStereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationConstraintInMessageEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationConstraintInMessageLabelEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationConstraintLabelEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationObservationAppliedStereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationObservationLabelEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.GeneralOrderingAppliedStereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.GeneralOrderingEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionInteractionCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionNameEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionOperandEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionUseEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionUseName2EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionUseNameEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineNameEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message2EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message3EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message4EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message5EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message6EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message7EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageAsyncAppliedStereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageCreateAppliedStereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageDeleteAppliedStereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageFoundAppliedStereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageLostAppliedStereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageName2EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageName3EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageName4EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageName5EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageName6EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageName7EditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageNameEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageReplyAppliedStereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageSyncAppliedStereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.PackageEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.StateInvariantEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.StateInvariantNameEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.TimeConstraintAppliedStereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.TimeConstraintEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.TimeConstraintLabelEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.TimeObservationAppliedStereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.TimeObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.TimeObservationLabelEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLVisualIDRegistry;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.graphics.FontData;

 import org.eclipse.uml2.uml.CombinedFragment;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/sheet/UMLPropertySection.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/sheet/UMLPropertySection.java
index e7a7bffe817..db3ef9af0be 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/sheet/UMLPropertySection.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/sheet/UMLPropertySection.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.sheet;

+package org.eclipse.papyrus.uml.diagram.sequence.sheet;

 

 import java.util.ArrayList;

 import java.util.Iterator;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/sheet/UMLSheetLabelProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/sheet/UMLSheetLabelProvider.java
index a0ae8e27f75..96a9cb484b5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/diagram/sequence/sheet/UMLSheetLabelProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/sheet/UMLSheetLabelProvider.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.sheet;

+package org.eclipse.papyrus.uml.diagram.sequence.sheet;

 

 import org.eclipse.core.runtime.IAdaptable;

 import org.eclipse.gmf.runtime.emf.type.core.IElementType;

@@ -19,9 +19,9 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.viewers.BaseLabelProvider;

 import org.eclipse.jface.viewers.ILabelProvider;

 import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.papyrus.diagram.sequence.navigator.UMLNavigatorGroup;

-import org.eclipse.papyrus.diagram.sequence.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.sequence.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.sequence.navigator.UMLNavigatorGroup;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

 import org.eclipse.swt.graphics.Image;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/test/org/eclipse/papyrus/diagram/sequence/edit/policies/LifelineXYLayoutEditPolicyTest.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/test/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/LifelineXYLayoutEditPolicyTest.java
index fdbc60bd870..4d0ac2f6cc6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/test/org/eclipse/papyrus/diagram/sequence/edit/policies/LifelineXYLayoutEditPolicyTest.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/test/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/LifelineXYLayoutEditPolicyTest.java
@@ -11,7 +11,7 @@
  *   Atos Origin - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.sequence.edit.policies;

+package org.eclipse.papyrus.uml.diagram.sequence.edit.policies;

 

 import static org.junit.Assert.assertEquals;

 import static org.junit.Assert.assertFalse;

@@ -20,6 +20,7 @@ import static org.junit.Assert.assertTrue;
 import org.eclipse.draw2d.Figure;

 import org.eclipse.draw2d.geometry.Dimension;

 import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.LifelineXYLayoutEditPolicy;

 import org.junit.Test;

 

 public class LifelineXYLayoutEditPolicyTest {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/.options b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/.options
index 3e7bace4006..35607526f8d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/.options
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/.options
@@ -1,7 +1,7 @@
-# Tracing options for the org.eclipse.papyrus.diagram.statemachine plug-in
+# Tracing options for the org.eclipse.papyrus.uml.diagram.statemachine plug-in
 
 # Common issues
-org.eclipse.papyrus.diagram.statemachine/debug=false
+org.eclipse.papyrus.uml.diagram.statemachine/debug=false
 
 # Visual IDs
-org.eclipse.papyrus.diagram.statemachine/debug/visualID=false
+org.eclipse.papyrus.uml.diagram.statemachine/debug/visualID=false
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/META-INF/MANIFEST.MF
index a932ba25101..695bf6360ad 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/META-INF/MANIFEST.MF
@@ -1,25 +1,25 @@
 Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.diagram.statemachine,

- org.eclipse.papyrus.diagram.statemachine.custom.commands,

- org.eclipse.papyrus.diagram.statemachine.custom.edit.part,

- org.eclipse.papyrus.diagram.statemachine.custom.expressions,

- org.eclipse.papyrus.diagram.statemachine.custom.factory,

- org.eclipse.papyrus.diagram.statemachine.custom.figures,

- org.eclipse.papyrus.diagram.statemachine.custom.helpers,

- org.eclipse.papyrus.diagram.statemachine.custom.listeners,

- org.eclipse.papyrus.diagram.statemachine.custom.parsers,

- org.eclipse.papyrus.diagram.statemachine.custom.policies,

- org.eclipse.papyrus.diagram.statemachine.custom.providers,

- org.eclipse.papyrus.diagram.statemachine.edit.commands,

- org.eclipse.papyrus.diagram.statemachine.edit.helpers,

- org.eclipse.papyrus.diagram.statemachine.edit.parts,

- org.eclipse.papyrus.diagram.statemachine.edit.policies,

- org.eclipse.papyrus.diagram.statemachine.navigator,

- org.eclipse.papyrus.diagram.statemachine.parsers,

- org.eclipse.papyrus.diagram.statemachine.part,

- org.eclipse.papyrus.diagram.statemachine.preferences,

- org.eclipse.papyrus.diagram.statemachine.providers,

- org.eclipse.papyrus.diagram.statemachine.sheet

+Export-Package: org.eclipse.papyrus.uml.diagram.statemachine,

+ org.eclipse.papyrus.uml.diagram.statemachine.custom.commands,

+ org.eclipse.papyrus.uml.diagram.statemachine.custom.edit.part,

+ org.eclipse.papyrus.uml.diagram.statemachine.custom.expressions,

+ org.eclipse.papyrus.uml.diagram.statemachine.custom.factory,

+ org.eclipse.papyrus.uml.diagram.statemachine.custom.figures,

+ org.eclipse.papyrus.uml.diagram.statemachine.custom.helpers,

+ org.eclipse.papyrus.uml.diagram.statemachine.custom.listeners,

+ org.eclipse.papyrus.uml.diagram.statemachine.custom.parsers,

+ org.eclipse.papyrus.uml.diagram.statemachine.custom.policies,

+ org.eclipse.papyrus.uml.diagram.statemachine.custom.providers,

+ org.eclipse.papyrus.uml.diagram.statemachine.edit.commands,

+ org.eclipse.papyrus.uml.diagram.statemachine.edit.helpers,

+ org.eclipse.papyrus.uml.diagram.statemachine.edit.parts,

+ org.eclipse.papyrus.uml.diagram.statemachine.edit.policies,

+ org.eclipse.papyrus.uml.diagram.statemachine.navigator,

+ org.eclipse.papyrus.uml.diagram.statemachine.parsers,

+ org.eclipse.papyrus.uml.diagram.statemachine.part,

+ org.eclipse.papyrus.uml.diagram.statemachine.preferences,

+ org.eclipse.papyrus.uml.diagram.statemachine.providers,

+ org.eclipse.papyrus.uml.diagram.statemachine.sheet

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

 Bundle-Name: %pluginName

@@ -65,7 +65,6 @@ Ant-Version: Apache Ant 1.7.0
 Eclipse-LazyStart: true

 Bundle-Version: 0.9.0.qualifier

 Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.diagram.statemachine.part.UMLDia

- gramEditorPlugin

+Bundle-Activator: org.eclipse.papyrus.uml.diagram.statemachine.part.UMLDiagramEditorPlugin

 Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.statemachine;singleton:=true

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/factory/CustomUMLEditPartFactory.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/factory/CustomUMLEditPartFactory.java
deleted file mode 100644
index 13bd511d28e..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/factory/CustomUMLEditPartFactory.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package org.eclipse.papyrus.diagram.statemachine.custom.factory;
-
-import org.eclipse.gef.EditPart;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.diagram.statemachine.custom.edit.part.CustomConnectionPointReferenceNameEditPart;
-import org.eclipse.papyrus.diagram.statemachine.custom.edit.part.CustomFinalStateEditPart;
-import org.eclipse.papyrus.diagram.statemachine.custom.edit.part.CustomPackageEditPart;
-import org.eclipse.papyrus.diagram.statemachine.custom.edit.part.CustomRegionCompartmentEditPart;
-import org.eclipse.papyrus.diagram.statemachine.custom.edit.part.CustomRegionEditPart;
-import org.eclipse.papyrus.diagram.statemachine.custom.edit.part.CustomStateCompartmentEditPart;
-import org.eclipse.papyrus.diagram.statemachine.custom.edit.part.CustomStateEditPart;
-import org.eclipse.papyrus.diagram.statemachine.custom.edit.part.CustomStateMachineCompartmentEditPart;
-import org.eclipse.papyrus.diagram.statemachine.custom.edit.part.CustomStateMachineEditPart;
-import org.eclipse.papyrus.diagram.statemachine.custom.edit.part.CustomStateMachineNameEditPart;
-import org.eclipse.papyrus.diagram.statemachine.custom.edit.part.CustomStateNameEditPart;
-import org.eclipse.papyrus.diagram.statemachine.custom.edit.part.CustomTransitionGuardEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.ConnectionPointReferenceNameEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.FinalStateEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PackageEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.RegionCompartmentEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.RegionEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.StateCompartmentEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.StateEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.StateMachineCompartmentEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.StateMachineEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.StateMachineNameEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.StateNameEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.TransitionGuardEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.UMLEditPartFactory;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLVisualIDRegistry;
-
-public class CustomUMLEditPartFactory extends UMLEditPartFactory {
-
-	public EditPart createEditPart(EditPart context, Object model) {
-		if(model instanceof View) {
-			View view = (View)model;
-			switch(UMLVisualIDRegistry.getVisualID(view)) {
-			// redefined classes to modify the method createNodePlate
-			case PackageEditPart.VISUAL_ID:
-				return new CustomPackageEditPart(view);
-			case StateMachineEditPart.VISUAL_ID:
-				return new CustomStateMachineEditPart(view);
-			case StateMachineNameEditPart.VISUAL_ID:
-				return new CustomStateMachineNameEditPart(view);
-			case StateMachineCompartmentEditPart.VISUAL_ID:
-				return new CustomStateMachineCompartmentEditPart(view);
-			case RegionCompartmentEditPart.VISUAL_ID:
-				return new CustomRegionCompartmentEditPart(view);
-			case RegionEditPart.VISUAL_ID:
-				return new CustomRegionEditPart(view);
-			case FinalStateEditPart.VISUAL_ID:
-				return new CustomFinalStateEditPart(view);
-			case StateEditPart.VISUAL_ID:
-				return new CustomStateEditPart(view);
-			case StateNameEditPart.VISUAL_ID:
-				return new CustomStateNameEditPart(view);
-			case StateCompartmentEditPart.VISUAL_ID:
-				return new CustomStateCompartmentEditPart(view);
-			case TransitionGuardEditPart.VISUAL_ID:
-				return new CustomTransitionGuardEditPart(view);
-			case ConnectionPointReferenceNameEditPart.VISUAL_ID:
-				return new CustomConnectionPointReferenceNameEditPart(view);
-
-			}
-
-		}
-		return super.createEditPart(context, model);
-	}
-
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/providers/CustomUMLEditPartProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/providers/CustomUMLEditPartProvider.java
deleted file mode 100644
index 66d071631ac..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/providers/CustomUMLEditPartProvider.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.eclipse.papyrus.diagram.statemachine.custom.providers;
-
-import org.eclipse.papyrus.diagram.statemachine.custom.factory.CustomUMLEditPartFactory;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLEditPartProvider;
-
-public class CustomUMLEditPartProvider extends UMLEditPartProvider {
-
-	public CustomUMLEditPartProvider() {
-		setFactory(new CustomUMLEditPartFactory());
-		setAllowCaching(true);
-	}
-
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/CreateStateMachineDiagramCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/CreateStateMachineDiagramCommand.java
index f38687fed4f..c07a7455017 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/CreateStateMachineDiagramCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/CreateStateMachineDiagramCommand.java
@@ -12,7 +12,7 @@
  *  Obeo 
  *
  *****************************************************************************/
-package org.eclipse.papyrus.diagram.statemachine;
+package org.eclipse.papyrus.uml.diagram.statemachine;
 
 import java.util.Iterator;
 
@@ -29,17 +29,17 @@ import org.eclipse.gmf.runtime.notation.Diagram;
 import org.eclipse.gmf.runtime.notation.Node;
 import org.eclipse.gmf.runtime.notation.NotationFactory;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.diagram.common.commands.CreateBehavioredClassifierDiagramCommand;
-import org.eclipse.papyrus.diagram.common.commands.SemanticAdapter;
-import org.eclipse.papyrus.diagram.statemachine.custom.helpers.Zone;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PackageEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.StateMachineCompartmentEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.StateMachineNameEditPart;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLDiagramEditorPlugin;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.diagram.statemachine.providers.ElementInitializers;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLElementTypes;
-import org.eclipse.papyrus.umlutils.NamedElementUtil;
+import org.eclipse.papyrus.uml.diagram.common.commands.CreateBehavioredClassifierDiagramCommand;
+import org.eclipse.papyrus.uml.diagram.common.commands.SemanticAdapter;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.helpers.Zone;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PackageEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.StateMachineCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.StateMachineNameEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLDiagramEditorPlugin;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.ElementInitializers;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.tools.utils.NamedElementUtil;
 import org.eclipse.uml2.uml.BehavioredClassifier;
 import org.eclipse.uml2.uml.Package;
 import org.eclipse.uml2.uml.Region;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/CreateStateMachineDiagramWithNavigationHandler.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/CreateStateMachineDiagramWithNavigationHandler.java
index 4929afd52dc..d78e99750fe 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/CreateStateMachineDiagramWithNavigationHandler.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/CreateStateMachineDiagramWithNavigationHandler.java
@@ -11,7 +11,7 @@
  *  Mathieu Velten (Atos Origin) mathieu.velten@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.statemachine;

+package org.eclipse.papyrus.uml.diagram.statemachine;

 

 import org.eclipse.papyrus.navigation.CreateDiagramWithNavigationHandler;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/StateMachineDiagramCreationCondition.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/StateMachineDiagramCreationCondition.java
index b2c5d9c7945..03145c04622 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/StateMachineDiagramCreationCondition.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/StateMachineDiagramCreationCondition.java
@@ -8,7 +8,7 @@
  * Contributors:

  *  Atos Origin - Initial API and implementation

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.statemachine;

+package org.eclipse.papyrus.uml.diagram.statemachine;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.papyrus.core.extension.commands.PerspectiveContextDependence;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/StateMachineDiagramEditorFactory.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/StateMachineDiagramEditorFactory.java
index a6a1cf28ee9..c5d03bc3a8f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/StateMachineDiagramEditorFactory.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/StateMachineDiagramEditorFactory.java
@@ -12,10 +12,10 @@
  *

  *****************************************************************************/

 

-package org.eclipse.papyrus.diagram.statemachine;

+package org.eclipse.papyrus.uml.diagram.statemachine;

 

 import org.eclipse.papyrus.core.adaptor.gmf.GmfEditorFactory;

-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PackageEditPart;

+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PackageEditPart;

 

 /**

  * @author dumoulin

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/StateMachineDiagramModelListener.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/StateMachineDiagramModelListener.java
index 31d2a6f0d17..e42ba7160c9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/StateMachineDiagramModelListener.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/StateMachineDiagramModelListener.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine;

+package org.eclipse.papyrus.uml.diagram.statemachine;

 

 import org.eclipse.emf.common.notify.Notification;

 import org.eclipse.papyrus.core.listenerservice.IPapyrusListener;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/UmlStateMachineDiagramForMultiEditor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/UmlStateMachineDiagramForMultiEditor.java
index 221ac34df58..f2d28820db9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/UmlStateMachineDiagramForMultiEditor.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/UmlStateMachineDiagramForMultiEditor.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.statemachine;

+package org.eclipse.papyrus.uml.diagram.statemachine;

 

 import org.eclipse.core.runtime.CoreException;

 import org.eclipse.emf.common.ui.URIEditorInput;

@@ -24,9 +24,9 @@ import org.eclipse.jface.util.LocalSelectionTransfer;
 import org.eclipse.papyrus.core.editor.BackboneException;

 import org.eclipse.papyrus.core.services.ServiceException;

 import org.eclipse.papyrus.core.services.ServicesRegistry;

-import org.eclipse.papyrus.diagram.common.listeners.DropTargetListener;

-import org.eclipse.papyrus.diagram.statemachine.part.UMLDiagramEditor;

-import org.eclipse.papyrus.diagram.statemachine.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.common.listeners.DropTargetListener;

+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLDiagramEditor;

+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLDiagramEditorPlugin;

 import org.eclipse.swt.dnd.TransferData;

 import org.eclipse.swt.widgets.Composite;

 import org.eclipse.swt.widgets.Shell;

@@ -82,7 +82,7 @@ public class UmlStateMachineDiagramForMultiEditor extends UMLDiagramEditor {
 	 */

 	@Override

 	public String getEditingDomainID() {

-		return "org.eclipse.papyrus.diagram.statemachine.EditingDomain";

+		return "org.eclipse.papyrus.uml.diagram.statemachine.EditingDomain";

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/commands/CreateViewCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/commands/CreateViewCommand.java
index f0fcfbf76f7..73386f15e9b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/commands/CreateViewCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/commands/CreateViewCommand.java
@@ -11,7 +11,7 @@
  *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation
  *
  *****************************************************************************/
-package org.eclipse.papyrus.diagram.statemachine.custom.commands;
+package org.eclipse.papyrus.uml.diagram.statemachine.custom.commands;
 
 
 import org.eclipse.emf.transaction.TransactionalEditingDomain;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/commands/CustomCompositeStateSetBoundsCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/commands/CustomCompositeStateSetBoundsCommand.java
index f0ebbc28ca7..2f70fbd87e1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/commands/CustomCompositeStateSetBoundsCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/commands/CustomCompositeStateSetBoundsCommand.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.custom.commands;
+package org.eclipse.papyrus.uml.diagram.statemachine.custom.commands;
 
 import java.util.Iterator;
 
@@ -15,11 +15,11 @@ import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCo
 import org.eclipse.gmf.runtime.notation.Node;
 import org.eclipse.gmf.runtime.notation.NotationFactory;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.diagram.statemachine.custom.helpers.Zone;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.RegionEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.StateCompartmentEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.StateNameEditPart;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.helpers.Zone;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.RegionEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.StateCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.StateNameEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLVisualIDRegistry;
 
 public class CustomCompositeStateSetBoundsCommand extends AbstractTransactionalCommand {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/commands/CustomCompositeStateWithDefaultRegionCreateNodeCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/commands/CustomCompositeStateWithDefaultRegionCreateNodeCommand.java
index 5d1f39831d6..cf527c8c2e3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/commands/CustomCompositeStateWithDefaultRegionCreateNodeCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/commands/CustomCompositeStateWithDefaultRegionCreateNodeCommand.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.custom.commands;
+package org.eclipse.papyrus.uml.diagram.statemachine.custom.commands;
 
 import java.util.Iterator;
 import java.util.List;
@@ -16,11 +16,11 @@ import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCo
 import org.eclipse.gmf.runtime.emf.type.core.IHintedType;
 import org.eclipse.gmf.runtime.notation.Node;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.diagram.common.commands.SemanticAdapter;
-import org.eclipse.papyrus.diagram.statemachine.custom.helpers.Zone;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.StateCompartmentEditPart;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.common.commands.SemanticAdapter;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.helpers.Zone;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.StateCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLElementTypes;
 import org.eclipse.uml2.uml.Region;
 import org.eclipse.uml2.uml.State;
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/commands/CustomConnectionPointReferenceCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/commands/CustomConnectionPointReferenceCreateCommand.java
index 1aab9c6f6e9..4c208a9571c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/commands/CustomConnectionPointReferenceCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/commands/CustomConnectionPointReferenceCreateCommand.java
@@ -1,7 +1,7 @@
-package org.eclipse.papyrus.diagram.statemachine.custom.commands;
+package org.eclipse.papyrus.uml.diagram.statemachine.custom.commands;
 
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.papyrus.diagram.statemachine.edit.commands.ConnectionPointReferenceCreateCommand;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.commands.ConnectionPointReferenceCreateCommand;
 import org.eclipse.uml2.uml.State;
 
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/commands/CustomFirstRegionInCompositeStateCreateElementCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/commands/CustomFirstRegionInCompositeStateCreateElementCommand.java
index fb91e04a833..5aea6d326b3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/commands/CustomFirstRegionInCompositeStateCreateElementCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/commands/CustomFirstRegionInCompositeStateCreateElementCommand.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.custom.commands;
+package org.eclipse.papyrus.uml.diagram.statemachine.custom.commands;
 
 import java.util.Iterator;
 
@@ -20,14 +20,14 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
 import org.eclipse.gmf.runtime.notation.Node;
 import org.eclipse.gmf.runtime.notation.NotationFactory;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.diagram.common.commands.SemanticAdapter;
-import org.eclipse.papyrus.diagram.statemachine.custom.helpers.Zone;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.RegionEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.StateCompartmentEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.StateNameEditPart;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.diagram.statemachine.providers.ElementInitializers;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.common.commands.SemanticAdapter;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.helpers.Zone;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.RegionEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.StateCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.StateNameEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.ElementInitializers;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLElementTypes;
 import org.eclipse.uml2.uml.Region;
 import org.eclipse.uml2.uml.State;
 import org.eclipse.uml2.uml.UMLFactory;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/commands/CustomPseudostateEntryPointCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/commands/CustomPseudostateEntryPointCreateCommand.java
index 9adbe48c4c1..f8d564520d5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/commands/CustomPseudostateEntryPointCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/commands/CustomPseudostateEntryPointCreateCommand.java
@@ -1,12 +1,12 @@
-package org.eclipse.papyrus.diagram.statemachine.custom.commands;
+package org.eclipse.papyrus.uml.diagram.statemachine.custom.commands;
 
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.gmf.runtime.common.core.command.CommandResult;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.papyrus.diagram.statemachine.edit.commands.PseudostateEntryPointCreateCommand;
-import org.eclipse.papyrus.diagram.statemachine.providers.ElementInitializers;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.commands.PseudostateEntryPointCreateCommand;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.ElementInitializers;
 import org.eclipse.uml2.uml.Pseudostate;
 import org.eclipse.uml2.uml.State;
 import org.eclipse.uml2.uml.UMLFactory;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/commands/CustomPseudostateExitPointCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/commands/CustomPseudostateExitPointCreateCommand.java
index 3bd8b517445..efa0c40a6c0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/commands/CustomPseudostateExitPointCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/commands/CustomPseudostateExitPointCreateCommand.java
@@ -1,12 +1,12 @@
-package org.eclipse.papyrus.diagram.statemachine.custom.commands;
+package org.eclipse.papyrus.uml.diagram.statemachine.custom.commands;
 
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.gmf.runtime.common.core.command.CommandResult;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.papyrus.diagram.statemachine.edit.commands.PseudostateExitPointCreateCommand;
-import org.eclipse.papyrus.diagram.statemachine.providers.ElementInitializers;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.commands.PseudostateExitPointCreateCommand;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.ElementInitializers;
 import org.eclipse.uml2.uml.Pseudostate;
 import org.eclipse.uml2.uml.State;
 import org.eclipse.uml2.uml.UMLFactory;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/commands/CustomRegionCreateElementCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/commands/CustomRegionCreateElementCommand.java
index ebd01e68f3a..4e87237fbd5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/commands/CustomRegionCreateElementCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/commands/CustomRegionCreateElementCommand.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.custom.commands;
+package org.eclipse.papyrus.uml.diagram.statemachine.custom.commands;
 
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.runtime.IAdaptable;
@@ -16,10 +16,10 @@ import org.eclipse.gmf.runtime.emf.type.core.IHintedType;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.diagram.common.commands.SemanticAdapter;
-import org.eclipse.papyrus.diagram.statemachine.custom.helpers.Zone;
-import org.eclipse.papyrus.diagram.statemachine.providers.ElementInitializers;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.common.commands.SemanticAdapter;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.helpers.Zone;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.ElementInitializers;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLElementTypes;
 import org.eclipse.uml2.uml.Region;
 import org.eclipse.uml2.uml.State;
 import org.eclipse.uml2.uml.StateMachine;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/commands/CustomRegionDeleteCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/commands/CustomRegionDeleteCommand.java
index 8849a8c6372..c53934ad556 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/commands/CustomRegionDeleteCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/commands/CustomRegionDeleteCommand.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.custom.commands;
+package org.eclipse.papyrus.uml.diagram.statemachine.custom.commands;
 
 import java.util.Iterator;
 import java.util.List;
@@ -11,7 +11,7 @@ import org.eclipse.gmf.runtime.common.core.command.CommandResult;
 import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;
 import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.diagram.statemachine.custom.helpers.Zone;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.helpers.Zone;
 import org.eclipse.uml2.uml.StateMachine;
 
 public class CustomRegionDeleteCommand extends DeleteCommand {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/commands/CustomRegionDestroyElementCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/commands/CustomRegionDestroyElementCommand.java
index b6221d701c2..cbffc570770 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/commands/CustomRegionDestroyElementCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/commands/CustomRegionDestroyElementCommand.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.custom.commands;
+package org.eclipse.papyrus.uml.diagram.statemachine.custom.commands;
 
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.runtime.IAdaptable;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/commands/CustomRegionMoveCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/commands/CustomRegionMoveCommand.java
index 8bd0f96ea36..c5b7164b93d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/commands/CustomRegionMoveCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/commands/CustomRegionMoveCommand.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.custom.commands;
+package org.eclipse.papyrus.uml.diagram.statemachine.custom.commands;
 
 import java.util.Iterator;
 import java.util.List;
@@ -13,7 +13,7 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
 import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest.ViewDescriptor;
 import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.diagram.statemachine.custom.helpers.Zone;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.helpers.Zone;
 
 public class CustomRegionMoveCommand extends AbstractTransactionalCommand {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/commands/CustomRegionResizeCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/commands/CustomRegionResizeCommand.java
index 68491a47b0a..2a983f8e139 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/commands/CustomRegionResizeCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/commands/CustomRegionResizeCommand.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.custom.commands;
+package org.eclipse.papyrus.uml.diagram.statemachine.custom.commands;
 
 import java.util.Iterator;
 import java.util.List;
@@ -16,7 +16,7 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
 import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest.ViewDescriptor;
 import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.diagram.statemachine.custom.helpers.Zone;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.helpers.Zone;
 
 public class CustomRegionResizeCommand extends AbstractTransactionalCommand {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/commands/CustomStateMachineResizeCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/commands/CustomStateMachineResizeCommand.java
index 8df97583be4..b6057683875 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/commands/CustomStateMachineResizeCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/commands/CustomStateMachineResizeCommand.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.custom.commands;
+package org.eclipse.papyrus.uml.diagram.statemachine.custom.commands;
 
 import java.util.Iterator;
 
@@ -15,7 +15,7 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
 import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest.ViewDescriptor;
 import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.diagram.statemachine.custom.helpers.Zone;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.helpers.Zone;
 
 public class CustomStateMachineResizeCommand extends AbstractTransactionalCommand {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/commands/CustomStateMachineSetBoundsCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/commands/CustomStateMachineSetBoundsCommand.java
index f26109ef02c..7412c11feb5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/commands/CustomStateMachineSetBoundsCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/commands/CustomStateMachineSetBoundsCommand.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.custom.commands;
+package org.eclipse.papyrus.uml.diagram.statemachine.custom.commands;
 
 import java.util.Iterator;
 
@@ -15,11 +15,11 @@ import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCo
 import org.eclipse.gmf.runtime.notation.Node;
 import org.eclipse.gmf.runtime.notation.NotationFactory;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.diagram.statemachine.custom.helpers.Zone;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.RegionEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.StateMachineCompartmentEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.StateMachineNameEditPart;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.helpers.Zone;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.RegionEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.StateMachineCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.StateMachineNameEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLVisualIDRegistry;
 
 public class CustomStateMachineSetBoundsCommand extends AbstractTransactionalCommand {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/commands/CustomStateMachineWithDefaultRegionCreateNodeCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/commands/CustomStateMachineWithDefaultRegionCreateNodeCommand.java
index cfdfc785c2f..f3e275e4df1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/commands/CustomStateMachineWithDefaultRegionCreateNodeCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/commands/CustomStateMachineWithDefaultRegionCreateNodeCommand.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.custom.commands;
+package org.eclipse.papyrus.uml.diagram.statemachine.custom.commands;
 
 import java.util.Iterator;
 import java.util.List;
@@ -16,11 +16,11 @@ import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCo
 import org.eclipse.gmf.runtime.emf.type.core.IHintedType;
 import org.eclipse.gmf.runtime.notation.Node;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.diagram.common.commands.SemanticAdapter;
-import org.eclipse.papyrus.diagram.statemachine.custom.helpers.Zone;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.StateMachineCompartmentEditPart;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.common.commands.SemanticAdapter;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.helpers.Zone;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.StateMachineCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLElementTypes;
 import org.eclipse.uml2.uml.Region;
 import org.eclipse.uml2.uml.StateMachine;
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/commands/CustomStateResizeCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/commands/CustomStateResizeCommand.java
index f63aa05c6c8..c46ffa1558a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/commands/CustomStateResizeCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/commands/CustomStateResizeCommand.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.custom.commands;
+package org.eclipse.papyrus.uml.diagram.statemachine.custom.commands;
 
 import java.util.Iterator;
 
@@ -17,7 +17,7 @@ import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCo
 import org.eclipse.gmf.runtime.notation.Node;
 import org.eclipse.gmf.runtime.notation.NotationFactory;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.diagram.statemachine.custom.helpers.Zone;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.helpers.Zone;
 
 public class CustomStateResizeCommand extends AbstractTransactionalCommand {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/commands/CustomVertexCreateElementCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/commands/CustomVertexCreateElementCommand.java
index c4508a173b8..6d956eb4e2f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/commands/CustomVertexCreateElementCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/commands/CustomVertexCreateElementCommand.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.custom.commands;
+package org.eclipse.papyrus.uml.diagram.statemachine.custom.commands;
 
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.runtime.IAdaptable;
@@ -16,9 +16,9 @@ import org.eclipse.gmf.runtime.emf.type.core.IHintedType;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.diagram.common.commands.SemanticAdapter;
-import org.eclipse.papyrus.diagram.statemachine.providers.ElementInitializers;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.common.commands.SemanticAdapter;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.ElementInitializers;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLElementTypes;
 import org.eclipse.uml2.uml.FinalState;
 import org.eclipse.uml2.uml.Pseudostate;
 import org.eclipse.uml2.uml.Region;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/edit/part/CustomConnectionPointReferenceNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/edit/part/CustomConnectionPointReferenceNameEditPart.java
index deb65fa55c1..f702a859ae2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/edit/part/CustomConnectionPointReferenceNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/edit/part/CustomConnectionPointReferenceNameEditPart.java
@@ -1,10 +1,10 @@
-package org.eclipse.papyrus.diagram.statemachine.custom.edit.part;
+package org.eclipse.papyrus.uml.diagram.statemachine.custom.edit.part;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.diagram.statemachine.custom.figures.ConnectionPointReferenceFigure;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.ConnectionPointReferenceEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.ConnectionPointReferenceNameEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.figures.ConnectionPointReferenceFigure;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.ConnectionPointReferenceEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.ConnectionPointReferenceNameEditPart;
 import org.eclipse.uml2.uml.ConnectionPointReference;
 import org.eclipse.uml2.uml.Pseudostate;
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/edit/part/CustomFinalStateEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/edit/part/CustomFinalStateEditPart.java
index e835bead979..3b42a284bc1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/edit/part/CustomFinalStateEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/edit/part/CustomFinalStateEditPart.java
@@ -1,8 +1,8 @@
-package org.eclipse.papyrus.diagram.statemachine.custom.edit.part;
+package org.eclipse.papyrus.uml.diagram.statemachine.custom.edit.part;
 
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.FinalStateEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.FinalStateEditPart;
 
 
 public class CustomFinalStateEditPart extends FinalStateEditPart {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/edit/part/CustomPackageEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/edit/part/CustomPackageEditPart.java
index 11f4cde2a68..5c8d8dc8f1f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/edit/part/CustomPackageEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/edit/part/CustomPackageEditPart.java
@@ -1,8 +1,8 @@
-package org.eclipse.papyrus.diagram.statemachine.custom.edit.part;
+package org.eclipse.papyrus.uml.diagram.statemachine.custom.edit.part;
 
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PackageEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PackageEditPart;
 
 public class CustomPackageEditPart extends PackageEditPart {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/edit/part/CustomRegionCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/edit/part/CustomRegionCompartmentEditPart.java
index 78f3b8ec742..325b294cdf2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/edit/part/CustomRegionCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/edit/part/CustomRegionCompartmentEditPart.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.custom.edit.part;
+package org.eclipse.papyrus.uml.diagram.statemachine.custom.edit.part;
 
 import org.eclipse.draw2d.IFigure;
 import org.eclipse.gef.DragTracker;
@@ -8,8 +8,8 @@ import org.eclipse.gef.tools.DeselectAllTracker;
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.diagram.ui.internal.tools.RubberbandDragTracker;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.diagram.statemachine.custom.figures.CustomShapeCompartmentFigure;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.RegionCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.figures.CustomShapeCompartmentFigure;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.RegionCompartmentEditPart;
 import org.eclipse.uml2.uml.Region;
 
 public class CustomRegionCompartmentEditPart extends RegionCompartmentEditPart {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/edit/part/CustomRegionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/edit/part/CustomRegionEditPart.java
index 46952a7346d..2ef125bbb7f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/edit/part/CustomRegionEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/edit/part/CustomRegionEditPart.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.custom.edit.part;
+package org.eclipse.papyrus.uml.diagram.statemachine.custom.edit.part;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.gef.DragTracker;
@@ -6,11 +6,11 @@ import org.eclipse.gef.EditPolicy;
 import org.eclipse.gef.Request;
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.diagram.statemachine.custom.figures.RegionFigure;
-import org.eclipse.papyrus.diagram.statemachine.custom.helpers.Zone;
-import org.eclipse.papyrus.diagram.statemachine.custom.policies.CustomRegionDragTracker;
-import org.eclipse.papyrus.diagram.statemachine.custom.policies.CustomRegionResizableEditPolicy;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.RegionEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.figures.RegionFigure;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.helpers.Zone;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.policies.CustomRegionDragTracker;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.policies.CustomRegionResizableEditPolicy;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.RegionEditPart;
 
 public class CustomRegionEditPart extends RegionEditPart {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/edit/part/CustomStateCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/edit/part/CustomStateCompartmentEditPart.java
index b154c83aea5..668789650de 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/edit/part/CustomStateCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/edit/part/CustomStateCompartmentEditPart.java
@@ -1,11 +1,11 @@
-package org.eclipse.papyrus.diagram.statemachine.custom.edit.part;
+package org.eclipse.papyrus.uml.diagram.statemachine.custom.edit.part;
 
 import org.eclipse.draw2d.IFigure;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.diagram.statemachine.custom.figures.CustomShapeCompartmentFigure;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.StateCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.figures.CustomShapeCompartmentFigure;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.StateCompartmentEditPart;
 import org.eclipse.uml2.uml.State;
 
 public class CustomStateCompartmentEditPart extends StateCompartmentEditPart {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/edit/part/CustomStateEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/edit/part/CustomStateEditPart.java
index 52599bf8e92..4a748359ddd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/edit/part/CustomStateEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/edit/part/CustomStateEditPart.java
@@ -1,8 +1,8 @@
-package org.eclipse.papyrus.diagram.statemachine.custom.edit.part;

+package org.eclipse.papyrus.uml.diagram.statemachine.custom.edit.part;

 

 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.statemachine.edit.parts.StateEditPart;

+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.StateEditPart;

 

 public class CustomStateEditPart extends StateEditPart {

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/edit/part/CustomStateMachineCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/edit/part/CustomStateMachineCompartmentEditPart.java
index eb0f046acf9..18f6fee485c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/edit/part/CustomStateMachineCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/edit/part/CustomStateMachineCompartmentEditPart.java
@@ -1,11 +1,11 @@
-package org.eclipse.papyrus.diagram.statemachine.custom.edit.part;
+package org.eclipse.papyrus.uml.diagram.statemachine.custom.edit.part;
 
 import org.eclipse.draw2d.IFigure;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.diagram.statemachine.custom.figures.CustomShapeCompartmentFigure;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.StateMachineCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.figures.CustomShapeCompartmentFigure;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.StateMachineCompartmentEditPart;
 import org.eclipse.uml2.uml.StateMachine;
 
 public class CustomStateMachineCompartmentEditPart extends StateMachineCompartmentEditPart {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/edit/part/CustomStateMachineEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/edit/part/CustomStateMachineEditPart.java
index f68268c7c58..29dbc26a9aa 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/edit/part/CustomStateMachineEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/edit/part/CustomStateMachineEditPart.java
@@ -1,8 +1,8 @@
-package org.eclipse.papyrus.diagram.statemachine.custom.edit.part;
+package org.eclipse.papyrus.uml.diagram.statemachine.custom.edit.part;
 
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.StateMachineEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.StateMachineEditPart;
 
 public class CustomStateMachineEditPart extends StateMachineEditPart {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/edit/part/CustomStateMachineNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/edit/part/CustomStateMachineNameEditPart.java
index a4df5c43277..cbb43f9c012 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/edit/part/CustomStateMachineNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/edit/part/CustomStateMachineNameEditPart.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.custom.edit.part;
+package org.eclipse.papyrus.uml.diagram.statemachine.custom.edit.part;
 
 import java.util.Collections;
 import java.util.Iterator;
@@ -17,11 +17,11 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramUIMessages;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.diagram.common.commands.SemanticAdapter;
-import org.eclipse.papyrus.diagram.common.figure.node.StereotypePropertiesCompartment;
-import org.eclipse.papyrus.diagram.statemachine.custom.commands.CustomStateMachineResizeCommand;
-import org.eclipse.papyrus.diagram.statemachine.custom.helpers.Zone;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.StateMachineNameEditPart;
+import org.eclipse.papyrus.uml.diagram.common.commands.SemanticAdapter;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.StereotypePropertiesCompartment;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.commands.CustomStateMachineResizeCommand;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.helpers.Zone;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.StateMachineNameEditPart;
 
 public class CustomStateMachineNameEditPart extends StateMachineNameEditPart {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/edit/part/CustomStateNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/edit/part/CustomStateNameEditPart.java
index 166cc734dff..68c7c82ff57 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/edit/part/CustomStateNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/edit/part/CustomStateNameEditPart.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.custom.edit.part;
+package org.eclipse.papyrus.uml.diagram.statemachine.custom.edit.part;
 
 import java.util.Collections;
 import java.util.Iterator;
@@ -17,13 +17,13 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramUIMessages;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.diagram.common.commands.SemanticAdapter;
-import org.eclipse.papyrus.diagram.common.figure.node.StereotypePropertiesCompartment;
-import org.eclipse.papyrus.diagram.statemachine.custom.commands.CustomStateResizeCommand;
-import org.eclipse.papyrus.diagram.statemachine.custom.figures.StateFigure;
-import org.eclipse.papyrus.diagram.statemachine.custom.helpers.Zone;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.StateEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.StateNameEditPart;
+import org.eclipse.papyrus.uml.diagram.common.commands.SemanticAdapter;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.StereotypePropertiesCompartment;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.commands.CustomStateResizeCommand;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.figures.StateFigure;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.helpers.Zone;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.StateEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.StateNameEditPart;
 import org.eclipse.uml2.uml.Activity;
 import org.eclipse.uml2.uml.Behavior;
 import org.eclipse.uml2.uml.OpaqueBehavior;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/edit/part/CustomTransitionGuardEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/edit/part/CustomTransitionGuardEditPart.java
index 2202366dab5..36a8708af47 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/edit/part/CustomTransitionGuardEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/edit/part/CustomTransitionGuardEditPart.java
@@ -1,9 +1,9 @@
-package org.eclipse.papyrus.diagram.statemachine.custom.edit.part;
+package org.eclipse.papyrus.uml.diagram.statemachine.custom.edit.part;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.TransitionGuardEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.TransitionGuardEditPart;
 import org.eclipse.uml2.uml.Activity;
 import org.eclipse.uml2.uml.CallEvent;
 import org.eclipse.uml2.uml.ChangeEvent;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/expressions/UMLAbstractExpression.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/expressions/UMLAbstractExpression.java
index c202e7fc943..718f6705d78 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/expressions/UMLAbstractExpression.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/expressions/UMLAbstractExpression.java
@@ -11,7 +11,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.statemachine.custom.expressions;

+package org.eclipse.papyrus.uml.diagram.statemachine.custom.expressions;

 

 import java.math.BigDecimal;

 import java.math.BigInteger;

@@ -25,7 +25,7 @@ import org.eclipse.emf.ecore.EDataType;
 import org.eclipse.emf.ecore.EEnum;

 import org.eclipse.emf.ecore.EEnumLiteral;

 import org.eclipse.emf.ecore.util.EcoreUtil;

-import org.eclipse.papyrus.diagram.statemachine.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/factory/CustomUMLEditPartFactory.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/factory/CustomUMLEditPartFactory.java
new file mode 100644
index 00000000000..310531011d2
--- /dev/null
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/factory/CustomUMLEditPartFactory.java
@@ -0,0 +1,70 @@
+package org.eclipse.papyrus.uml.diagram.statemachine.custom.factory;
+
+import org.eclipse.gef.EditPart;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.edit.part.CustomConnectionPointReferenceNameEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.edit.part.CustomFinalStateEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.edit.part.CustomPackageEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.edit.part.CustomRegionCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.edit.part.CustomRegionEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.edit.part.CustomStateCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.edit.part.CustomStateEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.edit.part.CustomStateMachineCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.edit.part.CustomStateMachineEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.edit.part.CustomStateMachineNameEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.edit.part.CustomStateNameEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.edit.part.CustomTransitionGuardEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.ConnectionPointReferenceNameEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.FinalStateEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PackageEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.RegionCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.RegionEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.StateCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.StateEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.StateMachineCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.StateMachineEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.StateMachineNameEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.StateNameEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.TransitionGuardEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.UMLEditPartFactory;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLVisualIDRegistry;
+
+public class CustomUMLEditPartFactory extends UMLEditPartFactory {
+
+	public EditPart createEditPart(EditPart context, Object model) {
+		if(model instanceof View) {
+			View view = (View)model;
+			switch(UMLVisualIDRegistry.getVisualID(view)) {
+			// redefined classes to modify the method createNodePlate
+			case PackageEditPart.VISUAL_ID:
+				return new CustomPackageEditPart(view);
+			case StateMachineEditPart.VISUAL_ID:
+				return new CustomStateMachineEditPart(view);
+			case StateMachineNameEditPart.VISUAL_ID:
+				return new CustomStateMachineNameEditPart(view);
+			case StateMachineCompartmentEditPart.VISUAL_ID:
+				return new CustomStateMachineCompartmentEditPart(view);
+			case RegionCompartmentEditPart.VISUAL_ID:
+				return new CustomRegionCompartmentEditPart(view);
+			case RegionEditPart.VISUAL_ID:
+				return new CustomRegionEditPart(view);
+			case FinalStateEditPart.VISUAL_ID:
+				return new CustomFinalStateEditPart(view);
+			case StateEditPart.VISUAL_ID:
+				return new CustomStateEditPart(view);
+			case StateNameEditPart.VISUAL_ID:
+				return new CustomStateNameEditPart(view);
+			case StateCompartmentEditPart.VISUAL_ID:
+				return new CustomStateCompartmentEditPart(view);
+			case TransitionGuardEditPart.VISUAL_ID:
+				return new CustomTransitionGuardEditPart(view);
+			case ConnectionPointReferenceNameEditPart.VISUAL_ID:
+				return new CustomConnectionPointReferenceNameEditPart(view);
+
+			}
+
+		}
+		return super.createEditPart(context, model);
+	}
+
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/figures/ConnectionPointReferenceFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/figures/ConnectionPointReferenceFigure.java
index 3e60817cab1..5b5b9a75402 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/figures/ConnectionPointReferenceFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/figures/ConnectionPointReferenceFigure.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     CEA List - initial API and implementation
  *******************************************************************************/
-package org.eclipse.papyrus.diagram.statemachine.custom.figures;
+package org.eclipse.papyrus.uml.diagram.statemachine.custom.figures;
 
 import java.util.Iterator;
 
@@ -17,7 +17,7 @@ import org.eclipse.draw2d.Graphics;
 import org.eclipse.draw2d.IFigure;
 import org.eclipse.draw2d.geometry.Dimension;
 import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.papyrus.diagram.common.figure.node.AffixedNamedElementFigure;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.AffixedNamedElementFigure;
 
 /**
  * ConnectionPointReferenceFigure.
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/figures/CustomShapeCompartmentFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/figures/CustomShapeCompartmentFigure.java
index 3ccbd0caefc..acf09542b21 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/figures/CustomShapeCompartmentFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/figures/CustomShapeCompartmentFigure.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.custom.figures;
+package org.eclipse.papyrus.uml.diagram.statemachine.custom.figures;
 
 import org.eclipse.draw2d.ScrollPane;
 import org.eclipse.gmf.runtime.diagram.ui.figures.ShapeCompartmentFigure;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/figures/FinalStateFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/figures/FinalStateFigure.java
index 4f07d70c5e8..c9f21a77a78 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/figures/FinalStateFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/figures/FinalStateFigure.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.custom.figures;

+package org.eclipse.papyrus.uml.diagram.statemachine.custom.figures;

 

 import org.eclipse.draw2d.Border;

 import org.eclipse.draw2d.Graphics;

@@ -6,8 +6,8 @@ import org.eclipse.draw2d.Label;
 import org.eclipse.draw2d.geometry.Dimension;

 import org.eclipse.draw2d.geometry.Insets;

 import org.eclipse.draw2d.geometry.Rectangle;

-import org.eclipse.papyrus.diagram.common.figure.node.IPapyrusNodeUMLElementFigure;

-import org.eclipse.papyrus.diagram.common.figure.node.PapyrusNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.IPapyrusNodeUMLElementFigure;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.PapyrusNodeFigure;

 import org.eclipse.swt.graphics.Color;

 import org.eclipse.swt.graphics.Image;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/figures/PseudostateChoiceFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/figures/PseudostateChoiceFigure.java
index 4249dfca478..b663cb24648 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/figures/PseudostateChoiceFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/figures/PseudostateChoiceFigure.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.custom.figures;

+package org.eclipse.papyrus.uml.diagram.statemachine.custom.figures;

 

 import org.eclipse.draw2d.Border;

 import org.eclipse.draw2d.Graphics;

@@ -8,8 +8,8 @@ import org.eclipse.draw2d.geometry.Insets;
 import org.eclipse.draw2d.geometry.PointList;

 import org.eclipse.draw2d.geometry.Rectangle;

 import org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities;

-import org.eclipse.papyrus.diagram.common.figure.node.IPapyrusNodeUMLElementFigure;

-import org.eclipse.papyrus.diagram.common.figure.node.PapyrusNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.IPapyrusNodeUMLElementFigure;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.PapyrusNodeFigure;

 import org.eclipse.swt.graphics.Color;

 import org.eclipse.swt.graphics.Image;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/figures/PseudostateDeepHistoryFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/figures/PseudostateDeepHistoryFigure.java
index ee6247e69e8..aa7ef32465b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/figures/PseudostateDeepHistoryFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/figures/PseudostateDeepHistoryFigure.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.custom.figures;

+package org.eclipse.papyrus.uml.diagram.statemachine.custom.figures;

 

 import org.eclipse.draw2d.Border;

 import org.eclipse.draw2d.Graphics;

@@ -6,8 +6,8 @@ import org.eclipse.draw2d.Label;
 import org.eclipse.draw2d.geometry.Dimension;

 import org.eclipse.draw2d.geometry.Insets;

 import org.eclipse.draw2d.geometry.Rectangle;

-import org.eclipse.papyrus.diagram.common.figure.node.IPapyrusNodeUMLElementFigure;

-import org.eclipse.papyrus.diagram.common.figure.node.PapyrusNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.IPapyrusNodeUMLElementFigure;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.PapyrusNodeFigure;

 import org.eclipse.swt.graphics.Color;

 import org.eclipse.swt.graphics.Image;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/figures/PseudostateEntryPointFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/figures/PseudostateEntryPointFigure.java
index df5ed652330..0ffca900f0c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/figures/PseudostateEntryPointFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/figures/PseudostateEntryPointFigure.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     CEA List - initial API and implementation
  *******************************************************************************/
-package org.eclipse.papyrus.diagram.statemachine.custom.figures;
+package org.eclipse.papyrus.uml.diagram.statemachine.custom.figures;
 
 import java.util.Iterator;
 
@@ -16,7 +16,7 @@ import org.eclipse.draw2d.Graphics;
 import org.eclipse.draw2d.IFigure;
 import org.eclipse.draw2d.geometry.Dimension;
 import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.papyrus.diagram.common.figure.node.AffixedNamedElementFigure;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.AffixedNamedElementFigure;
 
 /**
  * PseudostateEntryPointFigure.
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/figures/PseudostateExitPointFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/figures/PseudostateExitPointFigure.java
index 5dbc665deca..acebc67cf9f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/figures/PseudostateExitPointFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/figures/PseudostateExitPointFigure.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     CEA List - initial API and implementation
  *******************************************************************************/
-package org.eclipse.papyrus.diagram.statemachine.custom.figures;
+package org.eclipse.papyrus.uml.diagram.statemachine.custom.figures;
 
 import java.util.Iterator;
 
@@ -16,7 +16,7 @@ import org.eclipse.draw2d.Graphics;
 import org.eclipse.draw2d.IFigure;
 import org.eclipse.draw2d.geometry.Dimension;
 import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.papyrus.diagram.common.figure.node.AffixedNamedElementFigure;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.AffixedNamedElementFigure;
 
 /**
  * PseudostateExitPointFigure.
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/figures/PseudostateInitialFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/figures/PseudostateInitialFigure.java
index 0c68f43d10c..06082ac3c1e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/figures/PseudostateInitialFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/figures/PseudostateInitialFigure.java
@@ -1,12 +1,12 @@
-package org.eclipse.papyrus.diagram.statemachine.custom.figures;

+package org.eclipse.papyrus.uml.diagram.statemachine.custom.figures;

 

 import org.eclipse.draw2d.Border;

 import org.eclipse.draw2d.Graphics;

 import org.eclipse.draw2d.Label;

 import org.eclipse.draw2d.geometry.Dimension;

 import org.eclipse.draw2d.geometry.Rectangle;

-import org.eclipse.papyrus.diagram.common.figure.node.IPapyrusNodeUMLElementFigure;

-import org.eclipse.papyrus.diagram.common.figure.node.PapyrusNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.IPapyrusNodeUMLElementFigure;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.PapyrusNodeFigure;

 import org.eclipse.swt.graphics.Color;

 import org.eclipse.swt.graphics.Image;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/figures/PseudostateJoinForkFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/figures/PseudostateJoinForkFigure.java
index c47477ea37e..74d876e6d91 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/figures/PseudostateJoinForkFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/figures/PseudostateJoinForkFigure.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.custom.figures;

+package org.eclipse.papyrus.uml.diagram.statemachine.custom.figures;

 

 import org.eclipse.draw2d.Border;

 import org.eclipse.draw2d.Graphics;

@@ -7,8 +7,8 @@ import org.eclipse.draw2d.geometry.Dimension;
 import org.eclipse.draw2d.geometry.Insets;

 import org.eclipse.draw2d.geometry.Rectangle;

 import org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities;

-import org.eclipse.papyrus.diagram.common.figure.node.IPapyrusNodeUMLElementFigure;

-import org.eclipse.papyrus.diagram.common.figure.node.PapyrusNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.IPapyrusNodeUMLElementFigure;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.PapyrusNodeFigure;

 import org.eclipse.swt.graphics.Color;

 import org.eclipse.swt.graphics.Image;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/figures/PseudostateJunctionFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/figures/PseudostateJunctionFigure.java
index 3f99e102147..d8e5a91f626 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/figures/PseudostateJunctionFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/figures/PseudostateJunctionFigure.java
@@ -1,12 +1,12 @@
-package org.eclipse.papyrus.diagram.statemachine.custom.figures;

+package org.eclipse.papyrus.uml.diagram.statemachine.custom.figures;

 

 import org.eclipse.draw2d.Border;

 import org.eclipse.draw2d.Graphics;

 import org.eclipse.draw2d.Label;

 import org.eclipse.draw2d.geometry.Dimension;

 import org.eclipse.draw2d.geometry.Rectangle;

-import org.eclipse.papyrus.diagram.common.figure.node.IPapyrusNodeUMLElementFigure;

-import org.eclipse.papyrus.diagram.common.figure.node.PapyrusNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.IPapyrusNodeUMLElementFigure;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.PapyrusNodeFigure;

 import org.eclipse.swt.graphics.Color;

 import org.eclipse.swt.graphics.Image;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/figures/PseudostateShallowHistoryFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/figures/PseudostateShallowHistoryFigure.java
index 4a6a1afb40f..a1d3bcf13a7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/figures/PseudostateShallowHistoryFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/figures/PseudostateShallowHistoryFigure.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.custom.figures;

+package org.eclipse.papyrus.uml.diagram.statemachine.custom.figures;

 

 import org.eclipse.draw2d.Border;

 import org.eclipse.draw2d.Graphics;

@@ -6,8 +6,8 @@ import org.eclipse.draw2d.Label;
 import org.eclipse.draw2d.geometry.Dimension;

 import org.eclipse.draw2d.geometry.Insets;

 import org.eclipse.draw2d.geometry.Rectangle;

-import org.eclipse.papyrus.diagram.common.figure.node.IPapyrusNodeUMLElementFigure;

-import org.eclipse.papyrus.diagram.common.figure.node.PapyrusNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.IPapyrusNodeUMLElementFigure;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.PapyrusNodeFigure;

 import org.eclipse.swt.graphics.Color;

 import org.eclipse.swt.graphics.Image;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/figures/PseudostateTerminateFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/figures/PseudostateTerminateFigure.java
index 14d90178d45..709fc915050 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/figures/PseudostateTerminateFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/figures/PseudostateTerminateFigure.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     CEA List - initial API and implementation
  *******************************************************************************/
-package org.eclipse.papyrus.diagram.statemachine.custom.figures;
+package org.eclipse.papyrus.uml.diagram.statemachine.custom.figures;
 
 import org.eclipse.draw2d.Border;
 import org.eclipse.draw2d.Graphics;
@@ -17,8 +17,8 @@ import org.eclipse.draw2d.geometry.Dimension;
 import org.eclipse.draw2d.geometry.Insets;
 import org.eclipse.draw2d.geometry.Rectangle;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities;
-import org.eclipse.papyrus.diagram.common.figure.node.IPapyrusNodeUMLElementFigure;
-import org.eclipse.papyrus.diagram.common.figure.node.PapyrusNodeFigure;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.IPapyrusNodeUMLElementFigure;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.PapyrusNodeFigure;
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.Image;
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/figures/RegionFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/figures/RegionFigure.java
index 8baae7161ab..71bdfedec4b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/figures/RegionFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/figures/RegionFigure.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.custom.figures;
+package org.eclipse.papyrus.uml.diagram.statemachine.custom.figures;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -6,8 +6,8 @@ import java.util.List;
 import org.eclipse.draw2d.Graphics;
 import org.eclipse.draw2d.RectangleFigure;
 import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.papyrus.diagram.common.figure.node.AutomaticCompartmentLayoutManager;
-import org.eclipse.papyrus.diagram.common.figure.node.CompartmentFigure;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.AutomaticCompartmentLayoutManager;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.CompartmentFigure;
 import org.eclipse.swt.SWT;
 
 public class RegionFigure extends CompartmentFigure {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/figures/RoundedBorder.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/figures/RoundedBorder.java
index c609bd5995a..b461c7074ff 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/figures/RoundedBorder.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/figures/RoundedBorder.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.custom.figures;
+package org.eclipse.papyrus.uml.diagram.statemachine.custom.figures;
 
 import org.eclipse.draw2d.Graphics;
 import org.eclipse.draw2d.IFigure;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/figures/RoundedShadowBorder.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/figures/RoundedShadowBorder.java
index a16c1f3ef85..6553f7e6251 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/figures/RoundedShadowBorder.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/figures/RoundedShadowBorder.java
@@ -1,10 +1,10 @@
-package org.eclipse.papyrus.diagram.statemachine.custom.figures;
+package org.eclipse.papyrus.uml.diagram.statemachine.custom.figures;
 
 import org.eclipse.draw2d.Graphics;
 import org.eclipse.draw2d.IFigure;
 import org.eclipse.draw2d.geometry.Insets;
 import org.eclipse.gmf.runtime.draw2d.ui.mapmode.MapModeUtil;
-import org.eclipse.papyrus.diagram.common.figure.node.RectangularShadowBorder;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.RectangularShadowBorder;
 import org.eclipse.swt.graphics.Color;
 
 /**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/figures/StateFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/figures/StateFigure.java
index 2132f427d07..ec4312d42ae 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/figures/StateFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/figures/StateFigure.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.custom.figures;

+package org.eclipse.papyrus.uml.diagram.statemachine.custom.figures;

 

 import java.util.ArrayList;

 import java.util.List;

@@ -12,8 +12,8 @@ import org.eclipse.draw2d.geometry.Rectangle;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities;

 import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

 import org.eclipse.gmf.runtime.notation.GradientStyle;

-import org.eclipse.papyrus.diagram.common.figure.node.AutomaticCompartmentLayoutManager;

-import org.eclipse.papyrus.diagram.common.figure.node.CompartmentFigure;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.AutomaticCompartmentLayoutManager;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.CompartmentFigure;

 import org.eclipse.swt.SWT;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/figures/StateMachineFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/figures/StateMachineFigure.java
index 53945aa4991..2ac3d17e8fd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/figures/StateMachineFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/figures/StateMachineFigure.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.custom.figures;
+package org.eclipse.papyrus.uml.diagram.statemachine.custom.figures;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -9,8 +9,8 @@ import org.eclipse.draw2d.geometry.Dimension;
 import org.eclipse.draw2d.geometry.Rectangle;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities;
 import org.eclipse.gmf.runtime.notation.GradientStyle;
-import org.eclipse.papyrus.diagram.common.figure.node.AutomaticCompartmentLayoutManager;
-import org.eclipse.papyrus.diagram.common.figure.node.CompartmentFigure;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.AutomaticCompartmentLayoutManager;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.CompartmentFigure;
 
 /**
  * Represents a classifier.
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/figures/TransitionFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/figures/TransitionFigure.java
index 40b4e30eb14..d20c18c6139 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/figures/TransitionFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/figures/TransitionFigure.java
@@ -1,8 +1,8 @@
-package org.eclipse.papyrus.diagram.statemachine.custom.figures;

+package org.eclipse.papyrus.uml.diagram.statemachine.custom.figures;

 

 import org.eclipse.draw2d.Graphics;

 import org.eclipse.draw2d.PolylineDecoration;

-import org.eclipse.papyrus.diagram.common.figure.edge.DashedEdgeFigure;

+import org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure;

 

 public class TransitionFigure extends DashedEdgeFigure {

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/helpers/StateMachineLinkMappingHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/helpers/StateMachineLinkMappingHelper.java
index 968f9ffa95d..fd89284ea1c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/helpers/StateMachineLinkMappingHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/helpers/StateMachineLinkMappingHelper.java
@@ -1,8 +1,8 @@
-package org.eclipse.papyrus.diagram.statemachine.custom.helpers;
+package org.eclipse.papyrus.uml.diagram.statemachine.custom.helpers;
 
 import java.util.Collection;
 
-import org.eclipse.papyrus.diagram.common.helper.ILinkMappingHelper;
+import org.eclipse.papyrus.uml.diagram.common.helper.ILinkMappingHelper;
 import org.eclipse.uml2.uml.Element;
 
 /**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/helpers/Zone.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/helpers/Zone.java
index 90e30e11ff5..0d9f989338e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/helpers/Zone.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/helpers/Zone.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.custom.helpers;
+package org.eclipse.papyrus.uml.diagram.statemachine.custom.helpers;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -12,9 +12,9 @@ import org.eclipse.emf.ecore.EcoreFactory;
 import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
 import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.RegionEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.StateMachineEditPart;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.RegionEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.StateMachineEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLVisualIDRegistry;
 
 /**
  * Helper class used to manage the encoding of a region position within a state
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/listeners/DropTargetListener.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/listeners/DropTargetListener.java
index dc9281c54fb..938d351ff5e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/listeners/DropTargetListener.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/listeners/DropTargetListener.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Obeo - initial API and implementation
  *******************************************************************************/
-package org.eclipse.papyrus.diagram.statemachine.custom.listeners;
+package org.eclipse.papyrus.uml.diagram.statemachine.custom.listeners;
 
 import java.util.ArrayList;
 import java.util.HashSet;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/locators/CustomEntryExitPointPositionLocator.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/locators/CustomEntryExitPointPositionLocator.java
index d3b6658d0e6..2f615888c7b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/locators/CustomEntryExitPointPositionLocator.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/locators/CustomEntryExitPointPositionLocator.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.custom.locators;
+package org.eclipse.papyrus.uml.diagram.statemachine.custom.locators;
 
 import org.eclipse.draw2d.IFigure;
 import org.eclipse.draw2d.PositionConstants;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/parsers/TransitionPropertiesParser.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/parsers/TransitionPropertiesParser.java
index c9732a22b7a..913cdcc8533 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/parsers/TransitionPropertiesParser.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/parsers/TransitionPropertiesParser.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.custom.parsers;

+package org.eclipse.papyrus.uml.diagram.statemachine.custom.parsers;

 

 import java.util.Iterator;

 import java.util.List;

@@ -118,7 +118,7 @@ public class TransitionPropertiesParser implements IParser {
 

 	public IParserEditStatus isValidEditString(IAdaptable element, String editString) {

 

-		return new ParserEditStatus(org.eclipse.papyrus.diagram.statemachine.part.UMLDiagramEditorPlugin.ID, IParserEditStatus.OK, "");

+		return new ParserEditStatus(org.eclipse.papyrus.uml.diagram.statemachine.part.UMLDiagramEditorPlugin.ID, IParserEditStatus.OK, "");

 	}

 

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/parts/RegionCompartmentDiagramUpdater.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/parts/RegionCompartmentDiagramUpdater.java
index 3fde03f9d5e..2624319f430 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/parts/RegionCompartmentDiagramUpdater.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/parts/RegionCompartmentDiagramUpdater.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.custom.parts;
+package org.eclipse.papyrus.uml.diagram.statemachine.custom.parts;
 
 import java.util.Collections;
 import java.util.Iterator;
@@ -6,21 +6,21 @@ import java.util.LinkedList;
 import java.util.List;
 
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.diagram.common.part.ICustomDiagramUpdater;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.FinalStateEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateChoiceEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateDeepHistoryEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateEntryPointEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateExitPointEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateForkEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateInitialEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateJoinEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateJunctionEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateShallowHistoryEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateTerminateEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.StateEditPart;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLNodeDescriptor;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.common.part.ICustomDiagramUpdater;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.FinalStateEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateChoiceEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateDeepHistoryEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateEntryPointEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateExitPointEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateForkEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateInitialEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateJoinEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateJunctionEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateShallowHistoryEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateTerminateEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.StateEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLNodeDescriptor;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLVisualIDRegistry;
 import org.eclipse.uml2.uml.Region;
 import org.eclipse.uml2.uml.Vertex;
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/policies/CustomPackageCreationEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/policies/CustomPackageCreationEditPolicy.java
index 2c9e30f5d7e..00408991840 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/policies/CustomPackageCreationEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/policies/CustomPackageCreationEditPolicy.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.custom.policies;
+package org.eclipse.papyrus.uml.diagram.statemachine.custom.policies;
 
 import java.util.Iterator;
 
@@ -13,7 +13,7 @@ import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramUIMessages;
 import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.diagram.statemachine.custom.commands.CustomStateMachineWithDefaultRegionCreateNodeCommand;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.commands.CustomStateMachineWithDefaultRegionCreateNodeCommand;
 
 public class CustomPackageCreationEditPolicy extends CreationEditPolicy {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/policies/CustomPackageXYLayoutEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/policies/CustomPackageXYLayoutEditPolicy.java
index 7760f64f746..792407d7f3c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/policies/CustomPackageXYLayoutEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/policies/CustomPackageXYLayoutEditPolicy.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.custom.policies;
+package org.eclipse.papyrus.uml.diagram.statemachine.custom.policies;
 
 import java.util.Iterator;
 
@@ -20,10 +20,10 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
 import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.diagram.common.commands.SemanticAdapter;
-import org.eclipse.papyrus.diagram.statemachine.custom.commands.CustomStateMachineResizeCommand;
-import org.eclipse.papyrus.diagram.statemachine.custom.commands.CustomStateMachineSetBoundsCommand;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.StateMachineEditPart;
+import org.eclipse.papyrus.uml.diagram.common.commands.SemanticAdapter;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.commands.CustomStateMachineResizeCommand;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.commands.CustomStateMachineSetBoundsCommand;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.StateMachineEditPart;
 
 public class CustomPackageXYLayoutEditPolicy extends XYLayoutEditPolicy {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/policies/CustomPseudostateForkJoinResizeEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/policies/CustomPseudostateForkJoinResizeEditPolicy.java
index b603e337319..4b6e94524e7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/policies/CustomPseudostateForkJoinResizeEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/policies/CustomPseudostateForkJoinResizeEditPolicy.java
@@ -11,13 +11,13 @@
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

 

-package org.eclipse.papyrus.diagram.statemachine.custom.policies;

+package org.eclipse.papyrus.uml.diagram.statemachine.custom.policies;

 

 import org.eclipse.draw2d.geometry.Dimension;

 import org.eclipse.gef.RequestConstants;

 import org.eclipse.gef.requests.ChangeBoundsRequest;

 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableShapeEditPolicy;

-import org.eclipse.papyrus.diagram.common.editparts.UMLNodeEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editparts.UMLNodeEditPart;

 

 /**

  * A resizable editpolicy for shape editparts. It ensure that the resize keeps the shape as a fork or a join

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/policies/CustomRegionCompartmentCreationEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/policies/CustomRegionCompartmentCreationEditPolicy.java
index a57add01850..66a5c608ab3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/policies/CustomRegionCompartmentCreationEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/policies/CustomRegionCompartmentCreationEditPolicy.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.custom.policies;
+package org.eclipse.papyrus.uml.diagram.statemachine.custom.policies;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -33,12 +33,12 @@ import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalC
 import org.eclipse.gmf.runtime.emf.type.core.IElementType;
 import org.eclipse.gmf.runtime.emf.type.core.IHintedType;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.diagram.common.commands.SemanticAdapter;
-import org.eclipse.papyrus.diagram.statemachine.custom.commands.CustomRegionCreateElementCommand;
-import org.eclipse.papyrus.diagram.statemachine.custom.figures.RegionFigure;
-import org.eclipse.papyrus.diagram.statemachine.custom.helpers.Zone;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.RegionEditPart;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.common.commands.SemanticAdapter;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.commands.CustomRegionCreateElementCommand;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.figures.RegionFigure;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.helpers.Zone;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.RegionEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLElementTypes;
 
 public class CustomRegionCompartmentCreationEditPolicy extends CreationEditPolicy {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/policies/CustomRegionCompartmentXYLayoutEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/policies/CustomRegionCompartmentXYLayoutEditPolicy.java
index 6305285a36f..232bf1c2f4c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/policies/CustomRegionCompartmentXYLayoutEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/policies/CustomRegionCompartmentXYLayoutEditPolicy.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.custom.policies;
+package org.eclipse.papyrus.uml.diagram.statemachine.custom.policies;
 
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.draw2d.geometry.Rectangle;
@@ -17,9 +17,9 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateUnspecifiedTypeConnecti
 import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.diagram.common.commands.SemanticAdapter;
-import org.eclipse.papyrus.diagram.statemachine.custom.commands.CustomStateResizeCommand;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.StateEditPart;
+import org.eclipse.papyrus.uml.diagram.common.commands.SemanticAdapter;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.commands.CustomStateResizeCommand;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.StateEditPart;
 
 public class CustomRegionCompartmentXYLayoutEditPolicy extends XYLayoutEditPolicy {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/policies/CustomRegionComponentEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/policies/CustomRegionComponentEditPolicy.java
index bc6093ef4ec..27695cddb89 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/policies/CustomRegionComponentEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/policies/CustomRegionComponentEditPolicy.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.custom.policies;
+package org.eclipse.papyrus.uml.diagram.statemachine.custom.policies;
 
 import java.util.List;
 
@@ -14,8 +14,8 @@ import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ComponentEditPolicy;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.diagram.common.commands.SemanticAdapter;
-import org.eclipse.papyrus.diagram.statemachine.custom.commands.CustomRegionDeleteCommand;
+import org.eclipse.papyrus.uml.diagram.common.commands.SemanticAdapter;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.commands.CustomRegionDeleteCommand;
 
 public class CustomRegionComponentEditPolicy extends ComponentEditPolicy {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/policies/CustomRegionDragTracker.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/policies/CustomRegionDragTracker.java
index 47407ec0b89..8c5c9acf9f9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/policies/CustomRegionDragTracker.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/policies/CustomRegionDragTracker.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.custom.policies;
+package org.eclipse.papyrus.uml.diagram.statemachine.custom.policies;
 
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.runtime.IAdaptable;
@@ -10,12 +10,12 @@ import org.eclipse.gef.EditPolicy;
 import org.eclipse.gef.requests.ChangeBoundsRequest;
 import org.eclipse.gmf.runtime.diagram.ui.tools.DragEditPartsTrackerEx;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.diagram.common.commands.SemanticAdapter;
-import org.eclipse.papyrus.diagram.statemachine.custom.commands.CustomRegionResizeCommand;
-import org.eclipse.papyrus.diagram.statemachine.custom.figures.RegionFigure;
-import org.eclipse.papyrus.diagram.statemachine.custom.helpers.Zone;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.RegionCompartmentEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.RegionEditPart;
+import org.eclipse.papyrus.uml.diagram.common.commands.SemanticAdapter;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.commands.CustomRegionResizeCommand;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.figures.RegionFigure;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.helpers.Zone;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.RegionCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.RegionEditPart;
 
 /**
  * A specific drag tracker for regions. It locally stores the potential target
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/policies/CustomRegionItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/policies/CustomRegionItemSemanticEditPolicy.java
index 35a32a89798..0cea96acc2e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/policies/CustomRegionItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/policies/CustomRegionItemSemanticEditPolicy.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.custom.policies;
+package org.eclipse.papyrus.uml.diagram.statemachine.custom.policies;
 
 import java.util.Iterator;
 
@@ -12,12 +12,12 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyRequest;
 import org.eclipse.gmf.runtime.notation.Node;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.diagram.common.commands.SemanticAdapter;
-import org.eclipse.papyrus.diagram.statemachine.custom.commands.CustomRegionDeleteCommand;
-import org.eclipse.papyrus.diagram.statemachine.custom.commands.CustomRegionDestroyElementCommand;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.RegionCompartmentEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.policies.RegionItemSemanticEditPolicy;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.common.commands.SemanticAdapter;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.commands.CustomRegionDeleteCommand;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.commands.CustomRegionDestroyElementCommand;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.RegionCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.policies.RegionItemSemanticEditPolicy;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLVisualIDRegistry;
 
 public class CustomRegionItemSemanticEditPolicy extends RegionItemSemanticEditPolicy {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/policies/CustomRegionResizableEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/policies/CustomRegionResizableEditPolicy.java
index e8a0ea97864..119befbdf02 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/policies/CustomRegionResizableEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/policies/CustomRegionResizableEditPolicy.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.custom.policies;
+package org.eclipse.papyrus.uml.diagram.statemachine.custom.policies;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -15,9 +15,9 @@ import org.eclipse.gef.editpolicies.ResizableEditPolicy;
 import org.eclipse.gef.handles.ResizableHandleKit;
 import org.eclipse.gef.requests.ChangeBoundsRequest;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.diagram.statemachine.custom.figures.RegionFigure;
-import org.eclipse.papyrus.diagram.statemachine.custom.helpers.Zone;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.RegionEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.figures.RegionFigure;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.helpers.Zone;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.RegionEditPart;
 
 public class CustomRegionResizableEditPolicy extends ResizableEditPolicy {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/policies/CustomStateCompartmentCreationEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/policies/CustomStateCompartmentCreationEditPolicy.java
index 5d8b4e9d726..1e1c3156ce5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/policies/CustomStateCompartmentCreationEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/policies/CustomStateCompartmentCreationEditPolicy.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.custom.policies;
+package org.eclipse.papyrus.uml.diagram.statemachine.custom.policies;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -24,11 +24,11 @@ import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalC
 import org.eclipse.gmf.runtime.emf.type.core.IElementType;
 import org.eclipse.gmf.runtime.emf.type.core.IHintedType;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.diagram.common.commands.SemanticAdapter;
-import org.eclipse.papyrus.diagram.statemachine.custom.commands.CustomFirstRegionInCompositeStateCreateElementCommand;
-import org.eclipse.papyrus.diagram.statemachine.custom.helpers.Zone;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.RegionEditPart;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.common.commands.SemanticAdapter;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.commands.CustomFirstRegionInCompositeStateCreateElementCommand;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.helpers.Zone;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.RegionEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLElementTypes;
 
 public class CustomStateCompartmentCreationEditPolicy extends CreationEditPolicy {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/policies/CustomStateCompartmentXYLayoutEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/policies/CustomStateCompartmentXYLayoutEditPolicy.java
index bd3dafa5136..1862a19a59e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/policies/CustomStateCompartmentXYLayoutEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/policies/CustomStateCompartmentXYLayoutEditPolicy.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.custom.policies;
+package org.eclipse.papyrus.uml.diagram.statemachine.custom.policies;
 
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.draw2d.geometry.Rectangle;
@@ -14,10 +14,10 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.XYLayoutEditPolicy;
 import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramUIMessages;
 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.diagram.common.commands.SemanticAdapter;
-import org.eclipse.papyrus.diagram.statemachine.custom.commands.CustomRegionResizeCommand;
-import org.eclipse.papyrus.diagram.statemachine.custom.helpers.Zone;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.RegionEditPart;
+import org.eclipse.papyrus.uml.diagram.common.commands.SemanticAdapter;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.commands.CustomRegionResizeCommand;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.helpers.Zone;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.RegionEditPart;
 
 public class CustomStateCompartmentXYLayoutEditPolicy extends XYLayoutEditPolicy {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/policies/CustomStateCreationEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/policies/CustomStateCreationEditPolicy.java
index c3beef69772..15b54e0d0b3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/policies/CustomStateCreationEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/policies/CustomStateCreationEditPolicy.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.custom.policies;
+package org.eclipse.papyrus.uml.diagram.statemachine.custom.policies;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -24,12 +24,12 @@ import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalC
 import org.eclipse.gmf.runtime.emf.type.core.IElementType;
 import org.eclipse.gmf.runtime.emf.type.core.IHintedType;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.diagram.common.commands.SemanticAdapter;
-import org.eclipse.papyrus.diagram.statemachine.custom.commands.CustomFirstRegionInCompositeStateCreateElementCommand;
-import org.eclipse.papyrus.diagram.statemachine.custom.commands.CustomVertexCreateElementCommand;
-import org.eclipse.papyrus.diagram.statemachine.custom.helpers.Zone;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.RegionEditPart;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.common.commands.SemanticAdapter;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.commands.CustomFirstRegionInCompositeStateCreateElementCommand;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.commands.CustomVertexCreateElementCommand;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.helpers.Zone;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.RegionEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLElementTypes;
 import org.eclipse.uml2.uml.State;
 
 public class CustomStateCreationEditPolicy extends CreationEditPolicy {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/policies/CustomStateItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/policies/CustomStateItemSemanticEditPolicy.java
index f58c5e67c5d..fc9b7552ae1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/policies/CustomStateItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/policies/CustomStateItemSemanticEditPolicy.java
@@ -1,12 +1,12 @@
-package org.eclipse.papyrus.diagram.statemachine.custom.policies;
+package org.eclipse.papyrus.uml.diagram.statemachine.custom.policies;
 
 import org.eclipse.gef.commands.Command;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.papyrus.diagram.statemachine.custom.commands.CustomConnectionPointReferenceCreateCommand;
-import org.eclipse.papyrus.diagram.statemachine.custom.commands.CustomPseudostateEntryPointCreateCommand;
-import org.eclipse.papyrus.diagram.statemachine.custom.commands.CustomPseudostateExitPointCreateCommand;
-import org.eclipse.papyrus.diagram.statemachine.edit.policies.StateItemSemanticEditPolicy;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.commands.CustomConnectionPointReferenceCreateCommand;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.commands.CustomPseudostateEntryPointCreateCommand;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.commands.CustomPseudostateExitPointCreateCommand;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.policies.StateItemSemanticEditPolicy;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLElementTypes;
 
 
 public class CustomStateItemSemanticEditPolicy extends StateItemSemanticEditPolicy {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/policies/CustomStateLayoutEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/policies/CustomStateLayoutEditPolicy.java
index dc2d2bab014..f249693cbe3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/policies/CustomStateLayoutEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/policies/CustomStateLayoutEditPolicy.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.custom.policies;
+package org.eclipse.papyrus.uml.diagram.statemachine.custom.policies;
 
 import java.util.Iterator;
 
@@ -23,13 +23,13 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;
 import org.eclipse.gmf.runtime.emf.type.core.IHintedType;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.diagram.common.editpolicies.BorderItemResizableEditPolicy;
-import org.eclipse.papyrus.diagram.statemachine.custom.locators.CustomEntryExitPointPositionLocator;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.ConnectionPointReferenceEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateEntryPointEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateExitPointEditPart;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.locators.CustomEntryExitPointPositionLocator;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.ConnectionPointReferenceEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateEntryPointEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateExitPointEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLElementTypes;
 
 /**
  * This edit policy replaces the GMF generated edit policy for StateMachine(s).
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/policies/CustomStateMachineCompartmentXYLayoutEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/policies/CustomStateMachineCompartmentXYLayoutEditPolicy.java
index 5e9b79a6f6f..22a29449475 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/policies/CustomStateMachineCompartmentXYLayoutEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/policies/CustomStateMachineCompartmentXYLayoutEditPolicy.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.custom.policies;
+package org.eclipse.papyrus.uml.diagram.statemachine.custom.policies;
 
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.draw2d.geometry.Rectangle;
@@ -14,10 +14,10 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.XYLayoutEditPolicy;
 import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramUIMessages;
 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.diagram.common.commands.SemanticAdapter;
-import org.eclipse.papyrus.diagram.statemachine.custom.commands.CustomRegionResizeCommand;
-import org.eclipse.papyrus.diagram.statemachine.custom.helpers.Zone;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.RegionEditPart;
+import org.eclipse.papyrus.uml.diagram.common.commands.SemanticAdapter;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.commands.CustomRegionResizeCommand;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.helpers.Zone;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.RegionEditPart;
 
 public class CustomStateMachineCompartmentXYLayoutEditPolicy extends XYLayoutEditPolicy {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/policies/CustomStateMachineDiagramDragDropEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/policies/CustomStateMachineDiagramDragDropEditPolicy.java
index 80add3a5f41..a5e343fe8df 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/policies/CustomStateMachineDiagramDragDropEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/policies/CustomStateMachineDiagramDragDropEditPolicy.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.custom.policies;
+package org.eclipse.papyrus.uml.diagram.statemachine.custom.policies;
 
 import java.util.HashSet;
 import java.util.Iterator;
@@ -49,35 +49,35 @@ import org.eclipse.gmf.runtime.emf.type.core.IElementType;
 import org.eclipse.gmf.runtime.emf.type.core.IHintedType;
 import org.eclipse.gmf.runtime.notation.Node;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.diagram.common.commands.CommonDeferredCreateConnectionViewCommand;
-import org.eclipse.papyrus.diagram.common.commands.SemanticAdapter;
-import org.eclipse.papyrus.diagram.common.editpolicies.OldCommonDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.diagram.common.util.DiagramEditPartsUtil;
-import org.eclipse.papyrus.diagram.statemachine.custom.commands.CreateViewCommand;
-import org.eclipse.papyrus.diagram.statemachine.custom.commands.CustomCompositeStateSetBoundsCommand;
-import org.eclipse.papyrus.diagram.statemachine.custom.commands.CustomCompositeStateWithDefaultRegionCreateNodeCommand;
-import org.eclipse.papyrus.diagram.statemachine.custom.commands.CustomFirstRegionInCompositeStateCreateElementCommand;
-import org.eclipse.papyrus.diagram.statemachine.custom.commands.CustomRegionCreateElementCommand;
-import org.eclipse.papyrus.diagram.statemachine.custom.commands.CustomRegionMoveCommand;
-import org.eclipse.papyrus.diagram.statemachine.custom.commands.CustomStateMachineSetBoundsCommand;
-import org.eclipse.papyrus.diagram.statemachine.custom.commands.CustomStateMachineWithDefaultRegionCreateNodeCommand;
-import org.eclipse.papyrus.diagram.statemachine.custom.edit.part.CustomRegionEditPart;
-import org.eclipse.papyrus.diagram.statemachine.custom.figures.RegionFigure;
-import org.eclipse.papyrus.diagram.statemachine.custom.helpers.StateMachineLinkMappingHelper;
-import org.eclipse.papyrus.diagram.statemachine.custom.helpers.Zone;
-import org.eclipse.papyrus.diagram.statemachine.custom.locators.CustomEntryExitPointPositionLocator;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.ConnectionPointReferenceEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateEntryPointEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateExitPointEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.RegionCompartmentEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.RegionEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.StateCompartmentEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.StateEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.StateMachineCompartmentEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.StateMachineEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.TransitionEditPart;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.common.commands.CommonDeferredCreateConnectionViewCommand;
+import org.eclipse.papyrus.uml.diagram.common.commands.SemanticAdapter;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.OldCommonDiagramDragDropEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.commands.CreateViewCommand;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.commands.CustomCompositeStateSetBoundsCommand;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.commands.CustomCompositeStateWithDefaultRegionCreateNodeCommand;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.commands.CustomFirstRegionInCompositeStateCreateElementCommand;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.commands.CustomRegionCreateElementCommand;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.commands.CustomRegionMoveCommand;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.commands.CustomStateMachineSetBoundsCommand;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.commands.CustomStateMachineWithDefaultRegionCreateNodeCommand;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.edit.part.CustomRegionEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.figures.RegionFigure;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.helpers.StateMachineLinkMappingHelper;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.helpers.Zone;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.locators.CustomEntryExitPointPositionLocator;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.ConnectionPointReferenceEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateEntryPointEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateExitPointEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.RegionCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.RegionEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.StateCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.StateEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.StateMachineCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.StateMachineEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.TransitionEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLElementTypes;
 import org.eclipse.uml2.uml.ConnectionPointReference;
 import org.eclipse.uml2.uml.Element;
 import org.eclipse.uml2.uml.Pseudostate;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/policies/CustomStateMachineLayoutEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/policies/CustomStateMachineLayoutEditPolicy.java
index 0bfb5d3f2d0..c8c73036bed 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/policies/CustomStateMachineLayoutEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/policies/CustomStateMachineLayoutEditPolicy.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.custom.policies;
+package org.eclipse.papyrus.uml.diagram.statemachine.custom.policies;
 
 import java.util.Iterator;
 
@@ -22,11 +22,11 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewAndElementRequest;
 import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.diagram.common.editpolicies.BorderItemResizableEditPolicy;
-import org.eclipse.papyrus.diagram.statemachine.custom.locators.CustomEntryExitPointPositionLocator;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateEntryPointEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateExitPointEditPart;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.locators.CustomEntryExitPointPositionLocator;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateEntryPointEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateExitPointEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLVisualIDRegistry;
 
 /**
  * This edit policy replaces the GMF generated edit policy for StateMachine(s).
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/policies/RemoveOrphanViewPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/policies/RemoveOrphanViewPolicy.java
index f9eb81eff8a..55eff0f90e6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/policies/RemoveOrphanViewPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/policies/RemoveOrphanViewPolicy.java
@@ -11,16 +11,16 @@
  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - Initial API and implementation

  *  

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.statemachine.custom.policies;

+package org.eclipse.papyrus.uml.diagram.statemachine.custom.policies;

 

 import org.eclipse.emf.transaction.TransactionalEditingDomain;

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

 import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.editpolicies.OrphanViewPolicy;

-import org.eclipse.papyrus.diagram.statemachine.custom.commands.CustomRegionDeleteCommand;

-import org.eclipse.papyrus.diagram.statemachine.custom.helpers.Zone;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.OrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.statemachine.custom.commands.CustomRegionDeleteCommand;

+import org.eclipse.papyrus.uml.diagram.statemachine.custom.helpers.Zone;

 

 /**

  * this policy is used to supress orphan node view in GMF view the prolicy to

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/preferences/CustomStatePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/preferences/CustomStatePreferencePage.java
index c7f1329bae5..6778b0f9396 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/diagram/statemachine/custom/preferences/CustomStatePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/preferences/CustomStatePreferencePage.java
@@ -1,9 +1,9 @@
-package org.eclipse.papyrus.diagram.statemachine.custom.preferences;
+package org.eclipse.papyrus.uml.diagram.statemachine.custom.preferences;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PackageEditPart;
-import org.eclipse.papyrus.diagram.statemachine.preferences.StatePreferencePage;
 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PackageEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.preferences.StatePreferencePage;
 
 public class CustomStatePreferencePage extends StatePreferencePage {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/providers/CustomUMLEditPartProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/providers/CustomUMLEditPartProvider.java
new file mode 100644
index 00000000000..e6f9a58a7dd
--- /dev/null
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/providers/CustomUMLEditPartProvider.java
@@ -0,0 +1,13 @@
+package org.eclipse.papyrus.uml.diagram.statemachine.custom.providers;
+
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.factory.CustomUMLEditPartFactory;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLEditPartProvider;
+
+public class CustomUMLEditPartProvider extends UMLEditPartProvider {
+
+	public CustomUMLEditPartProvider() {
+		setFactory(new CustomUMLEditPartFactory());
+		setAllowCaching(true);
+	}
+
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/model/stateMachineDiagram.gmfgen b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/model/stateMachineDiagram.gmfgen
index 203ac29522e..d089659935e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/model/stateMachineDiagram.gmfgen
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/model/stateMachineDiagram.gmfgen
@@ -5,7 +5,7 @@
     xmlns:gmfgen="http://www.eclipse.org/gmf/2009/GenModel"

     xmlns:papyrusgmfgenextension="http://www.eclipse.org/papyrus/2009/papyrusgmfgenextension">

   <gmfgen:GenEditorGenerator

-      packageNamePrefix="org.eclipse.papyrus.diagram.statemachine"

+      packageNamePrefix="org.eclipse.papyrus.uml.diagram.statemachine"

       modelID="PapyrusUMLStateMachineDiagram"

       diagramFileExtension="PapyrusUMLStateMachine_diagram"

       domainFileExtension="PapyrusUMLStateMachine"

@@ -19,7 +19,7 @@
         iconProviderPriority="Low"

         creationWizardIconPath="icons/UMLDiagramFile.gif"

         creationWizardCategoryID="org.eclipse.ui.Examples"

-        editingDomainID="org.eclipse.papyrus.diagram.statemachine.EditingDomain"

+        editingDomainID="org.eclipse.papyrus.uml.diagram.statemachine.EditingDomain"

         validationEnabled="true"

         validationDecorators="true"

         liveValidationUIFeedback="true">

@@ -27,7 +27,7 @@
           href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Diagram"/>

       <elementType

           xsi:type="gmfgen:MetamodelType"

-          uniqueIdentifier="org.eclipse.papyrus.diagram.statemachine.Package_1000"

+          uniqueIdentifier="org.eclipse.papyrus.uml.diagram.statemachine.Package_1000"

           editHelperClassName="PackageEditHelper"/>

       <viewmap

           xsi:type="gmfgen:FigureViewmap"

@@ -35,19 +35,19 @@
       <behaviour

           xsi:type="gmfgen:CustomBehaviour"

           key="&quot;RemoveOrphanView&quot;"

-          editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.statemachine.custom.policies.RemoveOrphanViewPolicy"/>

+          editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.statemachine.custom.policies.RemoveOrphanViewPolicy"/>

       <behaviour

           xsi:type="gmfgen:CustomBehaviour"

           key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE"

-          editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.statemachine.custom.policies.CustomPackageCreationEditPolicy"/>

+          editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.statemachine.custom.policies.CustomPackageCreationEditPolicy"/>

       <behaviour

           xsi:type="gmfgen:CustomBehaviour"

           key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

-          editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.statemachine.custom.policies.CustomPackageXYLayoutEditPolicy"/>

+          editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.statemachine.custom.policies.CustomPackageXYLayoutEditPolicy"/>

       <behaviour

           xsi:type="gmfgen:CustomBehaviour"

           key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

-          editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.statemachine.custom.policies.CustomStateMachineDiagramDragDropEditPolicy"/>

+          editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.statemachine.custom.policies.CustomStateMachineDiagramDragDropEditPolicy"/>

       <domainDiagramElement

           href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package"/>

       <childNodes

@@ -66,19 +66,19 @@
             editHelperClassName="RegionEditHelper"/>

         <viewmap

             xsi:type="gmfgen:FigureViewmap"

-            figureQualifiedClassName="org.eclipse.papyrus.diagram.statemachine.custom.figures.RegionFigure"/>

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.statemachine.custom.figures.RegionFigure"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.SEMANTIC_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.statemachine.custom.policies.CustomRegionItemSemanticEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.statemachine.custom.policies.CustomRegionItemSemanticEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gef.EditPolicy.COMPONENT_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.statemachine.custom.policies.CustomRegionComponentEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.statemachine.custom.policies.CustomRegionComponentEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

         <modelFacet>

           <metaClass

               href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Region"/>

@@ -109,12 +109,12 @@
             href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

         <elementType

             xsi:type="gmfgen:MetamodelType"

-            uniqueIdentifier="org.eclipse.papyrus.diagram.statemachine.FinalState_5000"

+            uniqueIdentifier="org.eclipse.papyrus.uml.diagram.statemachine.FinalState_5000"

             displayName="FinalState"

             editHelperClassName="FinalStateEditHelper"/>

         <viewmap

             xsi:type="gmfgen:FigureViewmap"

-            figureQualifiedClassName="org.eclipse.papyrus.diagram.statemachine.custom.figures.FinalStateFigure">

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.statemachine.custom.figures.FinalStateFigure">

           <attributes

               xsi:type="gmfgen:DefaultSizeAttributes"

               width="16"

@@ -122,8 +122,8 @@
         </viewmap>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

         <modelFacet>

           <metaClass

               href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/FinalState"/>

@@ -170,7 +170,7 @@
               href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

           <viewmap

               xsi:type="gmfgen:FigureViewmap"

-              figureQualifiedClassName="org.eclipse.papyrus.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure">

+              figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure">

             <attributes

                 xsi:type="gmfgen:LabelOffsetAttributes"

                 x="25"

@@ -178,8 +178,8 @@
           </viewmap>

           <behaviour

               xsi:type="gmfgen:CustomBehaviour"

-              key="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-              editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy"/>

+              key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy"/>

           <modelFacet

               xsi:type="gmfgen:FeatureLabelModelFacet"

               parser="/0/@labelParsers/@implementations.1"

@@ -205,48 +205,48 @@
             href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

         <elementType

             xsi:type="gmfgen:MetamodelType"

-            uniqueIdentifier="org.eclipse.papyrus.diagram.statemachine.State_6000"

+            uniqueIdentifier="org.eclipse.papyrus.uml.diagram.statemachine.State_6000"

             displayName="State"

             editHelperClassName="StateEditHelper"/>

         <viewmap

             xsi:type="gmfgen:FigureViewmap"

-            figureQualifiedClassName="org.eclipse.papyrus.diagram.statemachine.custom.figures.StateFigure"/>

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.statemachine.custom.figures.StateFigure"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.statemachine.custom.policies.CustomStateLayoutEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.statemachine.custom.policies.CustomStateLayoutEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.statemachine.custom.policies.CustomStateMachineDiagramDragDropEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.statemachine.custom.policies.CustomStateMachineDiagramDragDropEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.statemachine.custom.policies.CustomStateCreationEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.statemachine.custom.policies.CustomStateCreationEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.SEMANTIC_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.statemachine.custom.policies.CustomStateItemSemanticEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.statemachine.custom.policies.CustomStateItemSemanticEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.NavigationEditPolicy.NAVIGATION_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.NavigationEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.NavigationEditPolicy.NAVIGATION_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.NavigationEditPolicy"/>

         <modelFacet>

           <metaClass

               href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/State"/>

@@ -278,8 +278,8 @@
           </viewmap>

           <behaviour

               xsi:type="gmfgen:CustomBehaviour"

-              key="org.eclipse.papyrus.diagram.common.editpolicies.NavigationEditPolicy.NAVIGATION_POLICY"

-              editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.NavigationEditPolicy"/>

+              key="org.eclipse.papyrus.uml.diagram.common.editpolicies.NavigationEditPolicy.NAVIGATION_POLICY"

+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.NavigationEditPolicy"/>

           <modelFacet

               xsi:type="gmfgen:FeatureLabelModelFacet"

               parser="/0/@labelParsers/@implementations.0">

@@ -300,12 +300,12 @@
             href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

         <elementType

             xsi:type="gmfgen:MetamodelType"

-            uniqueIdentifier="org.eclipse.papyrus.diagram.statemachine.Pseudostate_8000"

+            uniqueIdentifier="org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_8000"

             displayName="Pseudostate"

             editHelperClassName="PseudostateEditHelper"/>

         <viewmap

             xsi:type="gmfgen:FigureViewmap"

-            figureQualifiedClassName="org.eclipse.papyrus.diagram.statemachine.custom.figures.PseudostateInitialFigure">

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.statemachine.custom.figures.PseudostateInitialFigure">

           <attributes

               xsi:type="gmfgen:DefaultSizeAttributes"

               width="4"

@@ -313,12 +313,12 @@
         </viewmap>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

         <modelFacet

             modelElementSelector="/0/@expressionProviders/@providers.0/@expressions.11">

           <metaClass

@@ -372,7 +372,7 @@
               href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

           <viewmap

               xsi:type="gmfgen:FigureViewmap"

-              figureQualifiedClassName="org.eclipse.papyrus.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure">

+              figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure">

             <attributes

                 xsi:type="gmfgen:LabelOffsetAttributes"

                 x="25"

@@ -380,8 +380,8 @@
           </viewmap>

           <behaviour

               xsi:type="gmfgen:CustomBehaviour"

-              key="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-              editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy"/>

+              key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy"/>

           <modelFacet

               xsi:type="gmfgen:FeatureLabelModelFacet"

               parser="/0/@labelParsers/@implementations.1"

@@ -404,12 +404,12 @@
             href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

         <elementType

             xsi:type="gmfgen:MetamodelType"

-            uniqueIdentifier="org.eclipse.papyrus.diagram.statemachine.Pseudostate_9000"

+            uniqueIdentifier="org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_9000"

             displayName="Pseudostate"

             editHelperClassName="PseudostateEditHelper"/>

         <viewmap

             xsi:type="gmfgen:FigureViewmap"

-            figureQualifiedClassName="org.eclipse.papyrus.diagram.statemachine.custom.figures.PseudostateJoinForkFigure">

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.statemachine.custom.figures.PseudostateJoinForkFigure">

           <attributes

               xsi:type="gmfgen:DefaultSizeAttributes"

               width="4"

@@ -417,16 +417,16 @@
         </viewmap>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gef.EditPolicy.PRIMARY_DRAG_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.statemachine.custom.policies.CustomPseudostateForkJoinResizeEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.statemachine.custom.policies.CustomPseudostateForkJoinResizeEditPolicy"/>

         <modelFacet

             modelElementSelector="/0/@expressionProviders/@providers.0/@expressions.14">

           <metaClass

@@ -480,7 +480,7 @@
               href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

           <viewmap

               xsi:type="gmfgen:FigureViewmap"

-              figureQualifiedClassName="org.eclipse.papyrus.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure">

+              figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure">

             <attributes

                 xsi:type="gmfgen:LabelOffsetAttributes"

                 x="25"

@@ -488,8 +488,8 @@
           </viewmap>

           <behaviour

               xsi:type="gmfgen:CustomBehaviour"

-              key="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-              editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy"/>

+              key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy"/>

           <modelFacet

               xsi:type="gmfgen:FeatureLabelModelFacet"

               parser="/0/@labelParsers/@implementations.1"

@@ -512,12 +512,12 @@
             href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

         <elementType

             xsi:type="gmfgen:MetamodelType"

-            uniqueIdentifier="org.eclipse.papyrus.diagram.statemachine.Pseudostate_10000"

+            uniqueIdentifier="org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_10000"

             displayName="Pseudostate"

             editHelperClassName="PseudostateEditHelper"/>

         <viewmap

             xsi:type="gmfgen:FigureViewmap"

-            figureQualifiedClassName="org.eclipse.papyrus.diagram.statemachine.custom.figures.PseudostateJoinForkFigure">

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.statemachine.custom.figures.PseudostateJoinForkFigure">

           <attributes

               xsi:type="gmfgen:DefaultSizeAttributes"

               width="4"

@@ -525,16 +525,16 @@
         </viewmap>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gef.EditPolicy.PRIMARY_DRAG_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.statemachine.custom.policies.CustomPseudostateForkJoinResizeEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.statemachine.custom.policies.CustomPseudostateForkJoinResizeEditPolicy"/>

         <modelFacet

             modelElementSelector="/0/@expressionProviders/@providers.0/@expressions.15">

           <metaClass

@@ -588,7 +588,7 @@
               href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

           <viewmap

               xsi:type="gmfgen:FigureViewmap"

-              figureQualifiedClassName="org.eclipse.papyrus.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure">

+              figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure">

             <attributes

                 xsi:type="gmfgen:LabelOffsetAttributes"

                 x="25"

@@ -596,8 +596,8 @@
           </viewmap>

           <behaviour

               xsi:type="gmfgen:CustomBehaviour"

-              key="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-              editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy"/>

+              key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy"/>

           <modelFacet

               xsi:type="gmfgen:FeatureLabelModelFacet"

               parser="/0/@labelParsers/@implementations.1"

@@ -620,12 +620,12 @@
             href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

         <elementType

             xsi:type="gmfgen:MetamodelType"

-            uniqueIdentifier="org.eclipse.papyrus.diagram.statemachine.Pseudostate_11000"

+            uniqueIdentifier="org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_11000"

             displayName="Pseudostate"

             editHelperClassName="PseudostateEditHelper"/>

         <viewmap

             xsi:type="gmfgen:FigureViewmap"

-            figureQualifiedClassName="org.eclipse.papyrus.diagram.statemachine.custom.figures.PseudostateChoiceFigure">

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.statemachine.custom.figures.PseudostateChoiceFigure">

           <attributes

               xsi:type="gmfgen:DefaultSizeAttributes"

               width="4"

@@ -633,12 +633,12 @@
         </viewmap>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

         <modelFacet

             modelElementSelector="/0/@expressionProviders/@providers.0/@expressions.17">

           <metaClass

@@ -692,7 +692,7 @@
               href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

           <viewmap

               xsi:type="gmfgen:FigureViewmap"

-              figureQualifiedClassName="org.eclipse.papyrus.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure">

+              figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure">

             <attributes

                 xsi:type="gmfgen:LabelOffsetAttributes"

                 x="25"

@@ -700,8 +700,8 @@
           </viewmap>

           <behaviour

               xsi:type="gmfgen:CustomBehaviour"

-              key="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-              editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy"/>

+              key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy"/>

           <modelFacet

               xsi:type="gmfgen:FeatureLabelModelFacet"

               parser="/0/@labelParsers/@implementations.1"

@@ -724,12 +724,12 @@
             href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

         <elementType

             xsi:type="gmfgen:MetamodelType"

-            uniqueIdentifier="org.eclipse.papyrus.diagram.statemachine.Pseudostate_12000"

+            uniqueIdentifier="org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_12000"

             displayName="Pseudostate"

             editHelperClassName="PseudostateEditHelper"/>

         <viewmap

             xsi:type="gmfgen:FigureViewmap"

-            figureQualifiedClassName="org.eclipse.papyrus.diagram.statemachine.custom.figures.PseudostateJunctionFigure">

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.statemachine.custom.figures.PseudostateJunctionFigure">

           <attributes

               xsi:type="gmfgen:DefaultSizeAttributes"

               width="4"

@@ -737,12 +737,12 @@
         </viewmap>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

         <modelFacet

             modelElementSelector="/0/@expressionProviders/@providers.0/@expressions.16">

           <metaClass

@@ -796,7 +796,7 @@
               href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

           <viewmap

               xsi:type="gmfgen:FigureViewmap"

-              figureQualifiedClassName="org.eclipse.papyrus.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure">

+              figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure">

             <attributes

                 xsi:type="gmfgen:LabelOffsetAttributes"

                 x="25"

@@ -804,8 +804,8 @@
           </viewmap>

           <behaviour

               xsi:type="gmfgen:CustomBehaviour"

-              key="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-              editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy"/>

+              key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy"/>

           <modelFacet

               xsi:type="gmfgen:FeatureLabelModelFacet"

               parser="/0/@labelParsers/@implementations.1"

@@ -828,12 +828,12 @@
             href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

         <elementType

             xsi:type="gmfgen:MetamodelType"

-            uniqueIdentifier="org.eclipse.papyrus.diagram.statemachine.Pseudostate_13000"

+            uniqueIdentifier="org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_13000"

             displayName="Pseudostate"

             editHelperClassName="PseudostateEditHelper"/>

         <viewmap

             xsi:type="gmfgen:FigureViewmap"

-            figureQualifiedClassName="org.eclipse.papyrus.diagram.statemachine.custom.figures.PseudostateShallowHistoryFigure">

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.statemachine.custom.figures.PseudostateShallowHistoryFigure">

           <attributes

               xsi:type="gmfgen:DefaultSizeAttributes"

               width="4"

@@ -841,12 +841,12 @@
         </viewmap>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

         <modelFacet

             modelElementSelector="/0/@expressionProviders/@providers.0/@expressions.13">

           <metaClass

@@ -900,7 +900,7 @@
               href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

           <viewmap

               xsi:type="gmfgen:FigureViewmap"

-              figureQualifiedClassName="org.eclipse.papyrus.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure">

+              figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure">

             <attributes

                 xsi:type="gmfgen:LabelOffsetAttributes"

                 x="25"

@@ -908,8 +908,8 @@
           </viewmap>

           <behaviour

               xsi:type="gmfgen:CustomBehaviour"

-              key="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-              editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy"/>

+              key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy"/>

           <modelFacet

               xsi:type="gmfgen:FeatureLabelModelFacet"

               parser="/0/@labelParsers/@implementations.1"

@@ -932,12 +932,12 @@
             href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

         <elementType

             xsi:type="gmfgen:MetamodelType"

-            uniqueIdentifier="org.eclipse.papyrus.diagram.statemachine.Pseudostate_14000"

+            uniqueIdentifier="org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_14000"

             displayName="Pseudostate"

             editHelperClassName="PseudostateEditHelper"/>

         <viewmap

             xsi:type="gmfgen:FigureViewmap"

-            figureQualifiedClassName="org.eclipse.papyrus.diagram.statemachine.custom.figures.PseudostateDeepHistoryFigure">

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.statemachine.custom.figures.PseudostateDeepHistoryFigure">

           <attributes

               xsi:type="gmfgen:DefaultSizeAttributes"

               width="4"

@@ -945,12 +945,12 @@
         </viewmap>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

         <modelFacet

             modelElementSelector="/0/@expressionProviders/@providers.0/@expressions.12">

           <metaClass

@@ -1004,7 +1004,7 @@
               href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

           <viewmap

               xsi:type="gmfgen:FigureViewmap"

-              figureQualifiedClassName="org.eclipse.papyrus.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure">

+              figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure">

             <attributes

                 xsi:type="gmfgen:LabelOffsetAttributes"

                 x="25"

@@ -1012,8 +1012,8 @@
           </viewmap>

           <behaviour

               xsi:type="gmfgen:CustomBehaviour"

-              key="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-              editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy"/>

+              key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy"/>

           <modelFacet

               xsi:type="gmfgen:FeatureLabelModelFacet"

               parser="/0/@labelParsers/@implementations.1"

@@ -1036,12 +1036,12 @@
             href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

         <elementType

             xsi:type="gmfgen:MetamodelType"

-            uniqueIdentifier="org.eclipse.papyrus.diagram.statemachine.Pseudostate_15000"

+            uniqueIdentifier="org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_15000"

             displayName="Pseudostate"

             editHelperClassName="PseudostateEditHelper"/>

         <viewmap

             xsi:type="gmfgen:FigureViewmap"

-            figureQualifiedClassName="org.eclipse.papyrus.diagram.statemachine.custom.figures.PseudostateTerminateFigure">

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.statemachine.custom.figures.PseudostateTerminateFigure">

           <attributes

               xsi:type="gmfgen:DefaultSizeAttributes"

               width="4"

@@ -1049,12 +1049,12 @@
         </viewmap>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

         <modelFacet

             modelElementSelector="/0/@expressionProviders/@providers.0/@expressions.20">

           <metaClass

@@ -1109,7 +1109,7 @@
               href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

           <viewmap

               xsi:type="gmfgen:FigureViewmap"

-              figureQualifiedClassName="org.eclipse.papyrus.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure">

+              figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure">

             <attributes

                 xsi:type="gmfgen:LabelOffsetAttributes"

                 x="25"

@@ -1117,8 +1117,8 @@
           </viewmap>

           <behaviour

               xsi:type="gmfgen:CustomBehaviour"

-              key="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-              editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy"/>

+              key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy"/>

           <modelFacet

               xsi:type="gmfgen:FeatureLabelModelFacet"

               parser="/0/@labelParsers/@implementations.1"

@@ -1142,12 +1142,12 @@
             href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

         <elementType

             xsi:type="gmfgen:MetamodelType"

-            uniqueIdentifier="org.eclipse.papyrus.diagram.statemachine.Pseudostate_16000"

+            uniqueIdentifier="org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_16000"

             displayName="Pseudostate"

             editHelperClassName="PseudostateEditHelper"/>

         <viewmap

             xsi:type="gmfgen:FigureViewmap"

-            figureQualifiedClassName="org.eclipse.papyrus.diagram.statemachine.custom.figures.PseudostateEntryPointFigure">

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.statemachine.custom.figures.PseudostateEntryPointFigure">

           <attributes

               xsi:type="gmfgen:DefaultSizeAttributes"

               width="4"

@@ -1155,12 +1155,12 @@
         </viewmap>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

         <modelFacet

             modelElementSelector="/0/@expressionProviders/@providers.0/@expressions.18">

           <metaClass

@@ -1217,7 +1217,7 @@
               href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

           <viewmap

               xsi:type="gmfgen:FigureViewmap"

-              figureQualifiedClassName="org.eclipse.papyrus.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure">

+              figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure">

             <attributes

                 xsi:type="gmfgen:LabelOffsetAttributes"

                 x="25"

@@ -1225,8 +1225,8 @@
           </viewmap>

           <behaviour

               xsi:type="gmfgen:CustomBehaviour"

-              key="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-              editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy"/>

+              key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy"/>

           <modelFacet

               xsi:type="gmfgen:FeatureLabelModelFacet"

               parser="/0/@labelParsers/@implementations.1"

@@ -1250,12 +1250,12 @@
             href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

         <elementType

             xsi:type="gmfgen:MetamodelType"

-            uniqueIdentifier="org.eclipse.papyrus.diagram.statemachine.Pseudostate_17000"

+            uniqueIdentifier="org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_17000"

             displayName="Pseudostate"

             editHelperClassName="PseudostateEditHelper"/>

         <viewmap

             xsi:type="gmfgen:FigureViewmap"

-            figureQualifiedClassName="org.eclipse.papyrus.diagram.statemachine.custom.figures.PseudostateExitPointFigure">

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.statemachine.custom.figures.PseudostateExitPointFigure">

           <attributes

               xsi:type="gmfgen:DefaultSizeAttributes"

               width="4"

@@ -1263,12 +1263,12 @@
         </viewmap>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

         <modelFacet

             modelElementSelector="/0/@expressionProviders/@providers.0/@expressions.19">

           <metaClass

@@ -1325,7 +1325,7 @@
               href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

           <viewmap

               xsi:type="gmfgen:FigureViewmap"

-              figureQualifiedClassName="org.eclipse.papyrus.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure">

+              figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure">

             <attributes

                 xsi:type="gmfgen:LabelOffsetAttributes"

                 x="25"

@@ -1333,8 +1333,8 @@
           </viewmap>

           <behaviour

               xsi:type="gmfgen:CustomBehaviour"

-              key="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-              editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy"/>

+              key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy"/>

           <modelFacet

               xsi:type="gmfgen:FeatureLabelModelFacet"

               parser="/0/@labelParsers/@implementations.1"

@@ -1358,12 +1358,12 @@
             href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

         <elementType

             xsi:type="gmfgen:MetamodelType"

-            uniqueIdentifier="org.eclipse.papyrus.diagram.statemachine.ConnectionPointReference_18000"

+            uniqueIdentifier="org.eclipse.papyrus.uml.diagram.statemachine.ConnectionPointReference_18000"

             displayName="ConnectionPointReference"

             editHelperClassName="ConnectionPointReferenceEditHelper"/>

         <viewmap

             xsi:type="gmfgen:FigureViewmap"

-            figureQualifiedClassName="org.eclipse.papyrus.diagram.statemachine.custom.figures.ConnectionPointReferenceFigure">

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.statemachine.custom.figures.ConnectionPointReferenceFigure">

           <attributes

               xsi:type="gmfgen:DefaultSizeAttributes"

               width="4"

@@ -1371,12 +1371,12 @@
         </viewmap>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

         <modelFacet>

           <metaClass

               href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/ConnectionPointReference"/>

@@ -1426,7 +1426,7 @@
               href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

           <viewmap

               xsi:type="gmfgen:FigureViewmap"

-              figureQualifiedClassName="org.eclipse.papyrus.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure">

+              figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure">

             <attributes

                 xsi:type="gmfgen:LabelOffsetAttributes"

                 x="25"

@@ -1434,8 +1434,8 @@
           </viewmap>

           <behaviour

               xsi:type="gmfgen:CustomBehaviour"

-              key="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-              editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy"/>

+              key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy"/>

           <modelFacet

               xsi:type="gmfgen:FeatureLabelModelFacet"

               parser="/0/@labelParsers/@implementations.1"

@@ -1462,7 +1462,7 @@
             editHelperClassName="StateMachineEditHelper"/>

         <viewmap

             xsi:type="gmfgen:FigureViewmap"

-            figureQualifiedClassName="org.eclipse.papyrus.diagram.statemachine.custom.figures.StateMachineFigure">

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.statemachine.custom.figures.StateMachineFigure">

           <attributes

               xsi:type="gmfgen:DefaultSizeAttributes"

               width="200"

@@ -1470,28 +1470,28 @@
         </viewmap>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.statemachine.custom.policies.CustomStateMachineLayoutEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.statemachine.custom.policies.CustomStateMachineLayoutEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.statemachine.custom.policies.CustomStateMachineDiagramDragDropEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.statemachine.custom.policies.CustomStateMachineDiagramDragDropEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

         <modelFacet>

           <metaClass

               href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/StateMachine"/>

@@ -1554,24 +1554,24 @@
             href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>

         <elementType

             xsi:type="gmfgen:MetamodelType"

-            uniqueIdentifier="org.eclipse.papyrus.diagram.statemachine.Transition_7000"

+            uniqueIdentifier="org.eclipse.papyrus.uml.diagram.statemachine.Transition_7000"

             displayName="Transition"

             editHelperClassName="TransitionEditHelper"/>

         <viewmap

             xsi:type="gmfgen:FigureViewmap"

-            figureQualifiedClassName="org.eclipse.papyrus.diagram.statemachine.custom.figures.TransitionFigure"/>

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.statemachine.custom.figures.TransitionFigure"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.NavigationEditPolicy.NAVIGATION_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.NavigationEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.NavigationEditPolicy.NAVIGATION_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.NavigationEditPolicy"/>

         <modelFacet

             xsi:type="gmfgen:TypeLinkModelFacet">

           <metaClass

@@ -1661,16 +1661,16 @@
             href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>

         <elementType

             xsi:type="gmfgen:MetamodelType"

-            uniqueIdentifier="org.eclipse.papyrus.diagram.statemachine.Generalization_19000"

+            uniqueIdentifier="org.eclipse.papyrus.uml.diagram.statemachine.Generalization_19000"

             displayName="Generalization"

             editHelperClassName="GeneralizationEditHelper"/>

         <viewmap

             xsi:type="gmfgen:FigureViewmap"

-            figureQualifiedClassName="org.eclipse.papyrus.diagram.common.figure.edge.GeneralizationFigure"/>

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.edge.GeneralizationFigure"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy"/>

         <modelFacet

             xsi:type="gmfgen:TypeLinkModelFacet">

           <metaClass

@@ -1729,19 +1729,19 @@
         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="&quot;RemoveOrphanView&quot;"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.statemachine.custom.policies.RemoveOrphanViewPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.statemachine.custom.policies.RemoveOrphanViewPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.statemachine.custom.policies.CustomRegionCompartmentCreationEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.statemachine.custom.policies.CustomRegionCompartmentCreationEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.statemachine.custom.policies.CustomStateMachineDiagramDragDropEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.statemachine.custom.policies.CustomStateMachineDiagramDragDropEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.statemachine.custom.policies.CustomRegionCompartmentXYLayoutEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.statemachine.custom.policies.CustomRegionCompartmentXYLayoutEditPolicy"/>

       </compartments>

       <compartments

           visualID="2002"

@@ -1764,15 +1764,15 @@
         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="&quot;RemoveOrphanView&quot;"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.statemachine.custom.policies.RemoveOrphanViewPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.statemachine.custom.policies.RemoveOrphanViewPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.statemachine.custom.policies.CustomStateMachineCompartmentXYLayoutEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.statemachine.custom.policies.CustomStateMachineCompartmentXYLayoutEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.statemachine.custom.policies.CustomStateMachineDiagramDragDropEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.statemachine.custom.policies.CustomStateMachineDiagramDragDropEditPolicy"/>

       </compartments>

       <compartments

           visualID="6002"

@@ -1795,19 +1795,19 @@
         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="&quot;RemoveOrphanView&quot;"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.statemachine.custom.policies.RemoveOrphanViewPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.statemachine.custom.policies.RemoveOrphanViewPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.statemachine.custom.policies.CustomStateCompartmentXYLayoutEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.statemachine.custom.policies.CustomStateCompartmentXYLayoutEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.statemachine.custom.policies.CustomStateMachineDiagramDragDropEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.statemachine.custom.policies.CustomStateMachineDiagramDragDropEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.statemachine.custom.policies.CustomStateCompartmentCreationEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.statemachine.custom.policies.CustomStateCompartmentCreationEditPolicy"/>

       </compartments>

       <palette>

         <groups

@@ -1980,7 +1980,7 @@
       </preferencePages>

     </diagram>

     <plugin

-        iD="org.eclipse.papyrus.diagram.statemachine"

+        iD="org.eclipse.papyrus.uml.diagram.statemachine"

         name="PapyrusUMLStateMachineDiagram"/>

     <editor

         iconPath="icons/UMLDiagramFile.gif"/>

@@ -2040,7 +2040,7 @@
     <domainGenModel

         href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#/"/>

     <expressionProviders

-        expressionsPackageName="org.eclipse.papyrus.diagram.statemachine.custom.expressions">

+        expressionsPackageName="org.eclipse.papyrus.uml.diagram.statemachine.custom.expressions">

       <providers

           xsi:type="gmfgen:GenJavaExpressionProvider"

           injectExpressionBody="true">

@@ -2106,11 +2106,11 @@
       <implementations

           xsi:type="gmfgen:CustomParser"

           uses="/0/@diagram/@links.0/@labels.2/@modelFacet /0/@diagram/@childNodes.1/@labels.1/@modelFacet /0/@diagram/@childNodes.3/@labels.1/@modelFacet /0/@diagram/@childNodes.4/@labels.1/@modelFacet /0/@diagram/@childNodes.5/@labels.1/@modelFacet /0/@diagram/@childNodes.6/@labels.1/@modelFacet /0/@diagram/@childNodes.7/@labels.1/@modelFacet /0/@diagram/@childNodes.8/@labels.1/@modelFacet /0/@diagram/@childNodes.9/@labels.1/@modelFacet /0/@diagram/@childNodes.10/@labels.1/@modelFacet /0/@diagram/@childNodes.11/@labels.1/@modelFacet /0/@diagram/@childNodes.12/@labels.1/@modelFacet /0/@diagram/@childNodes.13/@labels.1/@modelFacet"

-          qualifiedName="org.eclipse.papyrus.diagram.common.parser.stereotype.AppliedStereotypeParser"/>

+          qualifiedName="org.eclipse.papyrus.uml.diagram.common.parser.stereotype.AppliedStereotypeParser"/>

       <implementations

           xsi:type="gmfgen:CustomParser"

           uses="/0/@diagram/@links.0/@labels.1/@modelFacet"

-          qualifiedName="org.eclipse.papyrus.diagram.statemachine.custom.parsers.TransitionPropertiesParser"/>

+          qualifiedName="org.eclipse.papyrus.uml.diagram.statemachine.custom.parsers.TransitionPropertiesParser"/>

     </labelParsers>

     <contextMenus

         context="/0/@diagram">

@@ -2125,45 +2125,45 @@
         comment="Add super class to a selected set of generated EditParts"

         genView="/0/@diagram/@topLevelNodes.0 /0/@diagram/@childNodes.2 /0/@diagram/@childNodes.0"

         name="NamedElementEditPart"

-        superOwnedEditPart="org.eclipse.papyrus.diagram.common.editparts.NamedElementEditPart"/>

+        superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart"/>

     <extensionNodes

         xsi:type="papyrusgmfgenextension:ExtendedGenView"

         comment="Label in charge to display applied stereotypes on links"

         genView="/0/@diagram/@links.0 /0/@diagram/@links.1"

         name="UMLConnectionNodeEditPart"

-        superOwnedEditPart="org.eclipse.papyrus.diagram.common.editparts.UMLConnectionNodeEditPart"/>

+        superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart"/>

     <extensionNodes

         xsi:type="papyrusgmfgenextension:SpecificLocatorExternalLabel"

         comment="ExternalLabel locator"

-        classpath="org.eclipse.papyrus.diagram.common.locator.ExternalLabelPositionLocator"

+        classpath="org.eclipse.papyrus.uml.diagram.common.locator.ExternalLabelPositionLocator"

         genExternalNodeLabel="/0/@diagram/@childNodes.1/@labels.1 /0/@diagram/@childNodes.3/@labels.1 /0/@diagram/@childNodes.4/@labels.1 /0/@diagram/@childNodes.5/@labels.1 /0/@diagram/@childNodes.6/@labels.1 /0/@diagram/@childNodes.7/@labels.1 /0/@diagram/@childNodes.8/@labels.1 /0/@diagram/@childNodes.9/@labels.1 /0/@diagram/@childNodes.10/@labels.1 /0/@diagram/@childNodes.11/@labels.1 /0/@diagram/@childNodes.1/@labels.0 /0/@diagram/@childNodes.3/@labels.0 /0/@diagram/@childNodes.4/@labels.0 /0/@diagram/@childNodes.5/@labels.0 /0/@diagram/@childNodes.6/@labels.0 /0/@diagram/@childNodes.7/@labels.0 /0/@diagram/@childNodes.8/@labels.0 /0/@diagram/@childNodes.9/@labels.0 /0/@diagram/@childNodes.10/@labels.0 /0/@diagram/@childNodes.11/@labels.0 /0/@diagram/@childNodes.12/@labels.0 /0/@diagram/@childNodes.13/@labels.0"/>

     <extensionNodes

         xsi:type="papyrusgmfgenextension:ExtendedGenView"

         comment="Manages stereotype shown with External Label"

         genView="/0/@diagram/@childNodes.1/@labels.1 /0/@diagram/@childNodes.3/@labels.1 /0/@diagram/@childNodes.4/@labels.1 /0/@diagram/@childNodes.5/@labels.1 /0/@diagram/@childNodes.6/@labels.1 /0/@diagram/@childNodes.7/@labels.1 /0/@diagram/@childNodes.8/@labels.1 /0/@diagram/@childNodes.9/@labels.1 /0/@diagram/@childNodes.10/@labels.1 /0/@diagram/@childNodes.11/@labels.1 /0/@diagram/@childNodes.12/@labels.1 /0/@diagram/@childNodes.13/@labels.1"

         name="StereotypeLabel"

-        superOwnedEditPart="org.eclipse.papyrus.diagram.common.editparts.AbstractLabelEditPart"/>

+        superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.AbstractLabelEditPart"/>

     <extensionNodes

         xsi:type="papyrusgmfgenextension:SpecificLocator"

         comment="Affixed EntryExitPoints ConnectionPointReferences Locator"

-        classpath="org.eclipse.papyrus.diagram.statemachine.custom.locators.CustomEntryExitPointPositionLocator"

+        classpath="org.eclipse.papyrus.uml.diagram.statemachine.custom.locators.CustomEntryExitPointPositionLocator"

         genChildSideAffixedNode="/0/@diagram/@childNodes.11 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13"/>

     <extensionNodes

         xsi:type="papyrusgmfgenextension:SpecificDiagramUpdater"

         comment="Region compartment custom DiagramUpdater"

-        classpath="org.eclipse.papyrus.diagram.statemachine.custom.parts.RegionCompartmentDiagramUpdater"

+        classpath="org.eclipse.papyrus.uml.diagram.statemachine.custom.parts.RegionCompartmentDiagramUpdater"

         genNode="/0/@diagram/@compartments.0"/>

     <extensionNodes

         xsi:type="papyrusgmfgenextension:ExtendedGenView"

         comment="Manage named element figure relying on Affixed Node"

         genView="/0/@diagram/@childNodes.11 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13"

         name="AffixedNode"

-        superOwnedEditPart="org.eclipse.papyrus.diagram.common.editparts.AbstractBorderEditPart"/>

+        superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.AbstractBorderEditPart"/>

     <extensionNodes

         xsi:type="papyrusgmfgenextension:ExtendedGenView"

         comment="elements that intherit form UMLNodeEditpart"

         genView="/0/@diagram/@childNodes.1 /0/@diagram/@childNodes.3 /0/@diagram/@childNodes.4 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10"

         name="UMLNodeEditPart"

-        superOwnedEditPart="org.eclipse.papyrus.diagram.common.editparts.UMLNodeEditPart"/>

+        superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.UMLNodeEditPart"/>

   </papyrusgmfgenextension:PapyrusExtensionRootNode>

 </xmi:XMI>

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/plugin.xml
index 38859291904..7679937ea6b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/plugin.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/plugin.xml
@@ -5,7 +5,7 @@
       

    <extension point="org.eclipse.gmf.runtime.common.ui.services.markerNavigationProviders" id="markers-navigation">

       <?gmfgen generated="true"?>

-      <MarkerNavigationProvider class="org.eclipse.papyrus.diagram.statemachine.providers.UMLMarkerNavigationProvider">

+      <MarkerNavigationProvider class="org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLMarkerNavigationProvider">

          <MarkerType name="org.eclipse.papyrus.diagram.statemachine.diagnostic"/>

          <Priority name="Lowest"/>

       </MarkerNavigationProvider>

@@ -20,7 +20,7 @@
 
    <extension point="org.eclipse.core.runtime.preferences">

 		<?gmfgen generated="true"?>

-		<initializer class="org.eclipse.papyrus.diagram.statemachine.preferences.DiagramPreferenceInitializer"/>

+		<initializer class="org.eclipse.papyrus.uml.diagram.statemachine.preferences.DiagramPreferenceInitializer"/>

 	</extension>

 
    <extension point="org.eclipse.ui.preferencePages" id="prefpages">

@@ -29,7 +29,7 @@
             id="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLStateMachineDiagram"

             name="PapyrusUMLStateMachineDiagram Diagram"

             category="org.eclipse.papyrus.preferences.diagrams"

-            class="org.eclipse.papyrus.diagram.statemachine.preferences.DiagramGeneralPreferencePage">

+            class="org.eclipse.papyrus.uml.diagram.statemachine.preferences.DiagramGeneralPreferencePage">

       </page>

       
 
@@ -38,14 +38,14 @@
             id="org.eclipse.papyrus.diagram.statemachine.preferences.DiagramPrintingPreferencePage"

             name="%prefpage.org.eclipse.uml2.uml.diagram.printing"

             category="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLStateMachineDiagram"

-            class="org.eclipse.papyrus.diagram.statemachine.preferences.DiagramPrintingPreferencePage">

+            class="org.eclipse.papyrus.uml.diagram.statemachine.preferences.DiagramPrintingPreferencePage">

       </page>

 
       <page

             id="org.eclipse.papyrus.diagram.statemachine.preferences.DiagramRulersAndGridPreferencePage"

             name="%prefpage.org.eclipse.uml2.uml.diagram.rulersAndGrid"

             category="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLStateMachineDiagram"

-            class="org.eclipse.papyrus.diagram.statemachine.preferences.DiagramRulersAndGridPreferencePage">

+            class="org.eclipse.papyrus.uml.diagram.statemachine.preferences.DiagramRulersAndGridPreferencePage">

       </page>

 
 
@@ -55,7 +55,7 @@
       <?gmfgen generated="true"?>
       <propertyContributor
             contributorId="org.eclipse.papyrus.diagram.statemachine"
-            labelProvider="org.eclipse.papyrus.diagram.statemachine.sheet.UMLSheetLabelProvider">
+            labelProvider="org.eclipse.papyrus.uml.diagram.statemachine.sheet.UMLSheetLabelProvider">
          <propertyCategory category="domain"/>
          <propertyCategory category="visual"/>
          <propertyCategory category="extra"/>
@@ -114,26 +114,26 @@
          <propertySection
             id="property.section.domain" 
             tab="property.tab.domain"
-            class="org.eclipse.papyrus.diagram.statemachine.sheet.UMLPropertySection">
+            class="org.eclipse.papyrus.uml.diagram.statemachine.sheet.UMLPropertySection">
             <input type="org.eclipse.gmf.runtime.notation.View"/>
             <input type="org.eclipse.gef.EditPart"/>
-            <input type="org.eclipse.papyrus.diagram.statemachine.navigator.UMLAbstractNavigatorItem"/>
+            <input type="org.eclipse.papyrus.uml.diagram.statemachine.navigator.UMLAbstractNavigatorItem"/>
          </propertySection>
          <propertySection
             id="property.section.domain" 
             tab="property.tab.domain"
-            class="org.eclipse.papyrus.diagram.statemachine.sheet.UMLPropertySection">
+            class="org.eclipse.papyrus.uml.diagram.statemachine.sheet.UMLPropertySection">
             <input type="org.eclipse.gmf.runtime.notation.View"/>
             <input type="org.eclipse.gef.EditPart"/>
-            <input type="org.eclipse.papyrus.diagram.statemachine.navigator.UMLAbstractNavigatorItem"/>
+            <input type="org.eclipse.papyrus.uml.diagram.statemachine.navigator.UMLAbstractNavigatorItem"/>
          </propertySection>
          <propertySection
             id="property.section.domain" 
             tab="property.tab.domain"
-            class="org.eclipse.papyrus.diagram.statemachine.sheet.UMLPropertySection">
+            class="org.eclipse.papyrus.uml.diagram.statemachine.sheet.UMLPropertySection">
             <input type="org.eclipse.gmf.runtime.notation.View"/>
             <input type="org.eclipse.gef.EditPart"/>
-            <input type="org.eclipse.papyrus.diagram.statemachine.navigator.UMLAbstractNavigatorItem"/>
+            <input type="org.eclipse.papyrus.uml.diagram.statemachine.navigator.UMLAbstractNavigatorItem"/>
          </propertySection>
       </propertySections>
    </extension>
@@ -177,7 +177,7 @@
 
    <extension point="org.eclipse.gmf.runtime.emf.ui.modelingAssistantProviders" id="modelassist-provider">
       <?gmfgen generated="true"?>
-      <modelingAssistantProvider class="org.eclipse.papyrus.diagram.statemachine.providers.UMLModelingAssistantProvider">
+      <modelingAssistantProvider class="org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLModelingAssistantProvider">
          <Priority name="Lowest"/>
          <object class="org.eclipse.papyrus.diagram.statemachine.edit.parts.PackageEditPart" id="Package_1000"/>
          <object class="org.eclipse.papyrus.diagram.statemachine.edit.parts.StateMachineEditPart" id="StateMachine_2000"/>
@@ -187,14 +187,14 @@
 
    <extension point="org.eclipse.gmf.runtime.common.ui.services.iconProviders" id="icon-provider">
       <?gmfgen generated="true"?>
-      <IconProvider class="org.eclipse.papyrus.diagram.statemachine.providers.UMLIconProvider">
+      <IconProvider class="org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLIconProvider">
          <Priority name="Low"/>
       </IconProvider>
    </extension>
 
    <extension point="org.eclipse.gmf.runtime.common.ui.services.parserProviders" id="parser-provider">
       <?gmfgen generated="true"?>
-      <ParserProvider class="org.eclipse.papyrus.diagram.statemachine.providers.UMLParserProvider">
+      <ParserProvider class="org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLParserProvider">
          <Priority name="Lowest"/>
       </ParserProvider>
    </extension>
@@ -207,7 +207,7 @@
                name="%metatype.name.Package_1000"
                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
                eclass="Package"
-               edithelper="org.eclipse.papyrus.diagram.statemachine.edit.helpers.PackageEditHelper">
+               edithelper="org.eclipse.papyrus.uml.diagram.statemachine.edit.helpers.PackageEditHelper">
             <param name="semanticHint" value="1000"/>
          </metamodelType>
       </metamodel>
@@ -217,7 +217,7 @@
                name="%metatype.name.StateMachine_2000"
                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
                eclass="StateMachine"
-               edithelper="org.eclipse.papyrus.diagram.statemachine.edit.helpers.StateMachineEditHelper">
+               edithelper="org.eclipse.papyrus.uml.diagram.statemachine.edit.helpers.StateMachineEditHelper">
             <param name="semanticHint" value="2000"/>
          </metamodelType>
       </metamodel>
@@ -227,7 +227,7 @@
                name="%metatype.name.Region_3000"
                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
                eclass="Region"
-               edithelper="org.eclipse.papyrus.diagram.statemachine.edit.helpers.RegionEditHelper">
+               edithelper="org.eclipse.papyrus.uml.diagram.statemachine.edit.helpers.RegionEditHelper">
             <param name="semanticHint" value="3000"/>
          </metamodelType>
       </metamodel>
@@ -237,7 +237,7 @@
                name="%metatype.name.FinalState_5000"
                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
                eclass="FinalState"
-               edithelper="org.eclipse.papyrus.diagram.statemachine.edit.helpers.FinalStateEditHelper">
+               edithelper="org.eclipse.papyrus.uml.diagram.statemachine.edit.helpers.FinalStateEditHelper">
             <param name="semanticHint" value="5000"/>
          </metamodelType>
       </metamodel>
@@ -247,7 +247,7 @@
                name="%metatype.name.State_6000"
                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
                eclass="State"
-               edithelper="org.eclipse.papyrus.diagram.statemachine.edit.helpers.StateEditHelper">
+               edithelper="org.eclipse.papyrus.uml.diagram.statemachine.edit.helpers.StateEditHelper">
             <param name="semanticHint" value="6000"/>
          </metamodelType>
       </metamodel>
@@ -257,7 +257,7 @@
                name="%metatype.name.Pseudostate_8000"
                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
                eclass="Pseudostate"
-               edithelper="org.eclipse.papyrus.diagram.statemachine.edit.helpers.PseudostateEditHelper">
+               edithelper="org.eclipse.papyrus.uml.diagram.statemachine.edit.helpers.PseudostateEditHelper">
             <param name="semanticHint" value="8000"/>
          </metamodelType>
       </metamodel>
@@ -267,7 +267,7 @@
                name="%metatype.name.Pseudostate_9000"
                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
                eclass="Pseudostate"
-               edithelper="org.eclipse.papyrus.diagram.statemachine.edit.helpers.PseudostateEditHelper">
+               edithelper="org.eclipse.papyrus.uml.diagram.statemachine.edit.helpers.PseudostateEditHelper">
             <param name="semanticHint" value="9000"/>
          </metamodelType>
       </metamodel>
@@ -277,7 +277,7 @@
                name="%metatype.name.Pseudostate_10000"
                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
                eclass="Pseudostate"
-               edithelper="org.eclipse.papyrus.diagram.statemachine.edit.helpers.PseudostateEditHelper">
+               edithelper="org.eclipse.papyrus.uml.diagram.statemachine.edit.helpers.PseudostateEditHelper">
             <param name="semanticHint" value="10000"/>
          </metamodelType>
       </metamodel>
@@ -287,7 +287,7 @@
                name="%metatype.name.Pseudostate_11000"
                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
                eclass="Pseudostate"
-               edithelper="org.eclipse.papyrus.diagram.statemachine.edit.helpers.PseudostateEditHelper">
+               edithelper="org.eclipse.papyrus.uml.diagram.statemachine.edit.helpers.PseudostateEditHelper">
             <param name="semanticHint" value="11000"/>
          </metamodelType>
       </metamodel>
@@ -297,7 +297,7 @@
                name="%metatype.name.Pseudostate_12000"
                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
                eclass="Pseudostate"
-               edithelper="org.eclipse.papyrus.diagram.statemachine.edit.helpers.PseudostateEditHelper">
+               edithelper="org.eclipse.papyrus.uml.diagram.statemachine.edit.helpers.PseudostateEditHelper">
             <param name="semanticHint" value="12000"/>
          </metamodelType>
       </metamodel>
@@ -307,7 +307,7 @@
                name="%metatype.name.Pseudostate_13000"
                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
                eclass="Pseudostate"
-               edithelper="org.eclipse.papyrus.diagram.statemachine.edit.helpers.PseudostateEditHelper">
+               edithelper="org.eclipse.papyrus.uml.diagram.statemachine.edit.helpers.PseudostateEditHelper">
             <param name="semanticHint" value="13000"/>
          </metamodelType>
       </metamodel>
@@ -317,7 +317,7 @@
                name="%metatype.name.Pseudostate_14000"
                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
                eclass="Pseudostate"
-               edithelper="org.eclipse.papyrus.diagram.statemachine.edit.helpers.PseudostateEditHelper">
+               edithelper="org.eclipse.papyrus.uml.diagram.statemachine.edit.helpers.PseudostateEditHelper">
             <param name="semanticHint" value="14000"/>
          </metamodelType>
       </metamodel>
@@ -327,7 +327,7 @@
                name="%metatype.name.Pseudostate_15000"
                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
                eclass="Pseudostate"
-               edithelper="org.eclipse.papyrus.diagram.statemachine.edit.helpers.PseudostateEditHelper">
+               edithelper="org.eclipse.papyrus.uml.diagram.statemachine.edit.helpers.PseudostateEditHelper">
             <param name="semanticHint" value="15000"/>
          </metamodelType>
       </metamodel>
@@ -337,7 +337,7 @@
                name="%metatype.name.Pseudostate_16000"
                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
                eclass="Pseudostate"
-               edithelper="org.eclipse.papyrus.diagram.statemachine.edit.helpers.PseudostateEditHelper">
+               edithelper="org.eclipse.papyrus.uml.diagram.statemachine.edit.helpers.PseudostateEditHelper">
             <param name="semanticHint" value="16000"/>
          </metamodelType>
       </metamodel>
@@ -347,7 +347,7 @@
                name="%metatype.name.Pseudostate_17000"
                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
                eclass="Pseudostate"
-               edithelper="org.eclipse.papyrus.diagram.statemachine.edit.helpers.PseudostateEditHelper">
+               edithelper="org.eclipse.papyrus.uml.diagram.statemachine.edit.helpers.PseudostateEditHelper">
             <param name="semanticHint" value="17000"/>
          </metamodelType>
       </metamodel>
@@ -357,7 +357,7 @@
                name="%metatype.name.ConnectionPointReference_18000"
                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
                eclass="ConnectionPointReference"
-               edithelper="org.eclipse.papyrus.diagram.statemachine.edit.helpers.ConnectionPointReferenceEditHelper">
+               edithelper="org.eclipse.papyrus.uml.diagram.statemachine.edit.helpers.ConnectionPointReferenceEditHelper">
             <param name="semanticHint" value="18000"/>
          </metamodelType>
       </metamodel>
@@ -367,7 +367,7 @@
                name="%metatype.name.Transition_7000"
                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
                eclass="Transition"
-               edithelper="org.eclipse.papyrus.diagram.statemachine.edit.helpers.TransitionEditHelper">
+               edithelper="org.eclipse.papyrus.uml.diagram.statemachine.edit.helpers.TransitionEditHelper">
             <param name="semanticHint" value="7000"/>
          </metamodelType>
       </metamodel>
@@ -377,7 +377,7 @@
                name="%metatype.name.Generalization_19000"
                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
                eclass="Generalization"
-               edithelper="org.eclipse.papyrus.diagram.statemachine.edit.helpers.GeneralizationEditHelper">
+               edithelper="org.eclipse.papyrus.uml.diagram.statemachine.edit.helpers.GeneralizationEditHelper">
             <param name="semanticHint" value="19000"/>
          </metamodelType>
       </metamodel>
@@ -421,7 +421,7 @@
            type="org.eclipse.emf.common.ui.URIEditorInput"
            namespace="org.eclipse.papyrus.diagram.statemachine"
            properties="isURIEditorInput"
-           class="org.eclipse.papyrus.diagram.statemachine.part.UMLUriEditorInputTester">
+           class="org.eclipse.papyrus.uml.diagram.statemachine.part.UMLUriEditorInputTester">
        </propertyTester>
    </extension>
 
@@ -447,8 +447,8 @@
             id="org.eclipse.papyrus.diagram.statemachine.resourceContent" 
             name="%navigatorContentName" 
             priority="normal" 
-            contentProvider="org.eclipse.papyrus.diagram.statemachine.navigator.UMLNavigatorContentProvider" 
-            labelProvider="org.eclipse.papyrus.diagram.statemachine.navigator.UMLNavigatorLabelProvider"
+            contentProvider="org.eclipse.papyrus.uml.diagram.statemachine.navigator.UMLNavigatorContentProvider" 
+            labelProvider="org.eclipse.papyrus.uml.diagram.statemachine.navigator.UMLNavigatorLabelProvider"
             icon="icons/UMLDiagramFile.gif"
             activeByDefault="true">
          <triggerPoints>
@@ -457,24 +457,24 @@
     	          <instanceof value="org.eclipse.core.resources.IFile"/>
         	      <test property="org.eclipse.core.resources.extension" value="PapyrusUMLStateMachine_diagram"/>
                </and>
-               <instanceof value="org.eclipse.papyrus.diagram.statemachine.navigator.UMLAbstractNavigatorItem"/>
+               <instanceof value="org.eclipse.papyrus.uml.diagram.statemachine.navigator.UMLAbstractNavigatorItem"/>
             </or>
          </triggerPoints>
          <possibleChildren>
             <or>
-         	   <instanceof value="org.eclipse.papyrus.diagram.statemachine.navigator.UMLAbstractNavigatorItem"/>
+         	   <instanceof value="org.eclipse.papyrus.uml.diagram.statemachine.navigator.UMLAbstractNavigatorItem"/>
             </or>
          </possibleChildren>
          <commonSorter 
                id="org.eclipse.papyrus.diagram.statemachine.navigatorSorter" 
-               class="org.eclipse.papyrus.diagram.statemachine.navigator.UMLNavigatorSorter">
+               class="org.eclipse.papyrus.uml.diagram.statemachine.navigator.UMLNavigatorSorter">
             <parentExpression>
                <or>
 	              <and>
     	             <instanceof value="org.eclipse.core.resources.IFile"/>
         	         <test property="org.eclipse.core.resources.extension" value="PapyrusUMLStateMachine_diagram"/>
                   </and>
-                  <instanceof value="org.eclipse.papyrus.diagram.statemachine.navigator.UMLAbstractNavigatorItem"/>
+                  <instanceof value="org.eclipse.papyrus.uml.diagram.statemachine.navigator.UMLAbstractNavigatorItem"/>
                </or>
             </parentExpression>
          </commonSorter>
@@ -483,8 +483,8 @@
             id="org.eclipse.papyrus.diagram.statemachine.domainResourceContent" 
             name="%domainNavigatorContentName" 
             priority="normal" 
-            contentProvider="org.eclipse.papyrus.diagram.statemachine.navigator.UMLDomainNavigatorContentProvider" 
-            labelProvider="org.eclipse.papyrus.diagram.statemachine.navigator.UMLDomainNavigatorLabelProvider"
+            contentProvider="org.eclipse.papyrus.uml.diagram.statemachine.navigator.UMLDomainNavigatorContentProvider" 
+            labelProvider="org.eclipse.papyrus.uml.diagram.statemachine.navigator.UMLDomainNavigatorLabelProvider"
             icon="icons/UMLDiagramFile.gif"
             activeByDefault="true">
          <triggerPoints>
@@ -493,19 +493,19 @@
     	          <instanceof value="org.eclipse.core.resources.IFile"/>
         	      <test property="org.eclipse.core.resources.extension" value="PapyrusUMLStateMachine"/>
                </and>
-               <instanceof value="org.eclipse.papyrus.diagram.statemachine.navigator.UMLDomainNavigatorItem"/>
+               <instanceof value="org.eclipse.papyrus.uml.diagram.statemachine.navigator.UMLDomainNavigatorItem"/>
             </or>
          </triggerPoints>
          <possibleChildren>
-            <instanceof value="org.eclipse.papyrus.diagram.statemachine.navigator.UMLDomainNavigatorItem"/>
+            <instanceof value="org.eclipse.papyrus.uml.diagram.statemachine.navigator.UMLDomainNavigatorItem"/>
          </possibleChildren>
       </navigatorContent>
       <actionProvider
             id="org.eclipse.papyrus.diagram.statemachine.navigatorActionProvider"
-            class="org.eclipse.papyrus.diagram.statemachine.navigator.UMLNavigatorActionProvider">
+            class="org.eclipse.papyrus.uml.diagram.statemachine.navigator.UMLNavigatorActionProvider">
          <enablement>
             <or>
-               <instanceof value="org.eclipse.papyrus.diagram.statemachine.navigator.UMLAbstractNavigatorItem"/>
+               <instanceof value="org.eclipse.papyrus.uml.diagram.statemachine.navigator.UMLAbstractNavigatorItem"/>
             </or>
          </enablement>
       </actionProvider>
@@ -515,7 +515,7 @@
       <?gmfgen generated="true"?>
       <linkHelper
             id="org.eclipse.papyrus.diagram.statemachine.navigatorLinkHelper"
-            class="org.eclipse.papyrus.diagram.statemachine.navigator.UMLNavigatorLinkHelper">
+            class="org.eclipse.papyrus.uml.diagram.statemachine.navigator.UMLNavigatorLinkHelper">
          <editorInputEnablement>
             <and>
                <instanceof value="org.eclipse.emf.common.ui.URIEditorInput"/>
@@ -523,7 +523,7 @@
             </and>
          </editorInputEnablement>
          <selectionEnablement>
-            <instanceof value="org.eclipse.papyrus.diagram.statemachine.navigator.UMLAbstractNavigatorItem"/>
+            <instanceof value="org.eclipse.papyrus.uml.diagram.statemachine.navigator.UMLAbstractNavigatorItem"/>
          </selectionEnablement>
       </linkHelper>
    </extension>
@@ -531,7 +531,7 @@
       <?gmfgen generated="true"?>
       <command
          categoryId="org.eclipse.ui.category.edit"
-         defaultHandler="org.eclipse.papyrus.diagram.statemachine.part.UMLDiagramUpdateCommand"
+         defaultHandler="org.eclipse.papyrus.uml.diagram.statemachine.part.UMLDiagramUpdateCommand"
          description="%update.diagram.description"
          id="org.eclipse.papyrus.diagram.statemachine.updateDiagram"
          name="%update.diagram.name"/>
@@ -558,7 +558,7 @@
                <and>
                   <with variable="activePartId"><equals value="org.eclipse.papyrus.diagram.statemachine.part.UMLDiagramEditorID"/></with>
                   <with variable="selection"><iterate ifEmpty="false"> 
-                     <instanceof value="org.eclipse.papyrus.diagram.statemachine.edit.parts.PackageEditPart"/>
+                     <instanceof value="org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PackageEditPart"/>
                   </iterate></with>
                </and>
             </visibleWhen>
@@ -572,7 +572,7 @@
       <command id="org.eclipse.papyrus.diagram.statemachine.LoadResourceAction"
          name="Load Resource"
          categoryId="org.eclipse.papyrus.diagram.statemachine.part.UMLDiagramEditorID"
-         defaultHandler="org.eclipse.papyrus.diagram.statemachine.part.LoadResourceAction"/>
+         defaultHandler="org.eclipse.papyrus.uml.diagram.statemachine.part.LoadResourceAction"/>
    </extension>
 
 <!-- Diagram creation command and handler -->

@@ -585,7 +585,7 @@
 
    <extension point="org.eclipse.ui.handlers">
 	<handler

-		class="org.eclipse.papyrus.diagram.statemachine.CreateStateMachineDiagramWithNavigationHandler"

+		class="org.eclipse.papyrus.uml.diagram.statemachine.CreateStateMachineDiagramWithNavigationHandler"

 		commandId="org.eclipse.papyrus.diagram.statemachine.CreationCommand">

 		<activeWhen>

 			<with variable="activeEditorId">

@@ -604,7 +604,7 @@
 			icon="icons/obj16/Diagram_StateMachine.gif" label="Create a new StateMachine Diagram"

 			style="push" tooltip="Create a new StateMachine Diagram">

 			<visibleWhen>

-				<reference definitionId="org.eclipse.papyrus.diagram.common.IsPapyrusActiveWithUMLModel"/>

+				<reference definitionId="org.eclipse.papyrus.uml.diagram.common.IsPapyrusActiveWithUMLModel"/>

 			</visibleWhen> 

 		</command>

 	</menu>

@@ -616,20 +616,20 @@
 			icon="icons/obj16/Diagram_StateMachine.gif" label="Create a new StateMachine Diagram"

 			style="push" tooltip="Create a new StateMachine Diagram">

 			<visibleWhen>

-				<reference definitionId="org.eclipse.papyrus.diagram.common.IsPapyrusActiveWithUMLModel"/>

+				<reference definitionId="org.eclipse.papyrus.uml.diagram.common.IsPapyrusActiveWithUMLModel"/>

 			</visibleWhen> 

 		</command>

 	</toolbar>

 	</menuContribution>

 

-	<menuContribution locationURI="popup:org.eclipse.papyrus.modelexplorer.popupmenu.creatediagram">

+	<menuContribution locationURI="popup:org.eclipse.papyrus.views.modelexplorer.popupmenu.creatediagram">

 		<command commandId="org.eclipse.papyrus.diagram.statemachine.CreationCommand"

 			icon="icons/obj16/Diagram_StateMachine.gif"

 			label="Create a new StateMachine Diagram"

 			style="push"

 			tooltip="Create a new StateMachine Diagram">

 			<visibleWhen>

-				<reference definitionId="org.eclipse.papyrus.diagram.common.IsPapyrusActiveWithUMLModel"/>

+				<reference definitionId="org.eclipse.papyrus.uml.diagram.common.IsPapyrusActiveWithUMLModel"/>

 			</visibleWhen>

 		</command>

 	</menuContribution>	

@@ -639,13 +639,13 @@
    <extension

          point="org.eclipse.papyrus.core.papyrusDiagram">

       <editorDiagram

-            actionBarContributorId="org.eclipse.papyrus.diagram.common.part.UMLDiagramActionBarContributor"

-            factoryClass="org.eclipse.papyrus.diagram.statemachine.StateMachineDiagramEditorFactory"

+            actionBarContributorId="org.eclipse.papyrus.uml.diagram.common.part.UMLDiagramActionBarContributor"

+            factoryClass="org.eclipse.papyrus.uml.diagram.statemachine.StateMachineDiagramEditorFactory"

             icon="icons/obj16/Diagram_StateMachine.gif">

       </editorDiagram>

       <creationCommand

-            creationCommandClass="org.eclipse.papyrus.diagram.statemachine.CreateStateMachineDiagramCommand"

-            creationCondition="org.eclipse.papyrus.diagram.statemachine.StateMachineDiagramCreationCondition"

+            creationCommandClass="org.eclipse.papyrus.uml.diagram.statemachine.CreateStateMachineDiagramCommand"

+            creationCondition="org.eclipse.papyrus.uml.diagram.statemachine.StateMachineDiagramCreationCondition"

             icon="icons/obj16/Diagram_StateMachine.gif"

             id="org.eclipse.papyrus.diagram.statemachine.CreationCommand"

             language="uml"

@@ -712,42 +712,42 @@
 		

 	<?gmfgen generated="true"?>

 	<page  	category="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLStateMachineDiagram"

-			class="org.eclipse.papyrus.diagram.statemachine.preferences.PseudostatePreferencePage"

+			class="org.eclipse.papyrus.uml.diagram.statemachine.preferences.PseudostatePreferencePage"

             id="org.eclipse.papyrus.diagram.statemachine.preferences.PseudostatePreferencePage"

             name="Pseudostate Node" />

 	
 		

 	<?gmfgen generated="true"?>

 	<page  	category="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLStateMachineDiagram"

-			class="org.eclipse.papyrus.diagram.statemachine.preferences.ConnectionPointReferencePreferencePage"

+			class="org.eclipse.papyrus.uml.diagram.statemachine.preferences.ConnectionPointReferencePreferencePage"

             id="org.eclipse.papyrus.diagram.statemachine.preferences.ConnectionPointReferencePreferencePage"

             name="ConnectionPointReference Node" />

 	
 		

 	<?gmfgen generated="true"?>

 	<page  	category="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLStateMachineDiagram"

-			class="org.eclipse.papyrus.diagram.statemachine.preferences.RegionPreferencePage"

+			class="org.eclipse.papyrus.uml.diagram.statemachine.preferences.RegionPreferencePage"

             id="org.eclipse.papyrus.diagram.statemachine.preferences.RegionPreferencePage"

             name="Region Node" />

 	
 		

 	<?gmfgen generated="true"?>

 	<page  	category="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLStateMachineDiagram"

-			class="org.eclipse.papyrus.diagram.statemachine.preferences.StatePreferencePage"

+			class="org.eclipse.papyrus.uml.diagram.statemachine.preferences.StatePreferencePage"

             id="org.eclipse.papyrus.diagram.statemachine.preferences.StatePreferencePage"

             name="State Node" />

 	
 		

 	<?gmfgen generated="true"?>

 	<page  	category="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLStateMachineDiagram"

-			class="org.eclipse.papyrus.diagram.statemachine.preferences.FinalStatePreferencePage"

+			class="org.eclipse.papyrus.uml.diagram.statemachine.preferences.FinalStatePreferencePage"

             id="org.eclipse.papyrus.diagram.statemachine.preferences.FinalStatePreferencePage"

             name="FinalState Node" />

 	
 		

 	<?gmfgen generated="true"?>

 	<page  	category="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLStateMachineDiagram"

-			class="org.eclipse.papyrus.diagram.statemachine.preferences.StateMachinePreferencePage"

+			class="org.eclipse.papyrus.uml.diagram.statemachine.preferences.StateMachinePreferencePage"

             id="org.eclipse.papyrus.diagram.statemachine.preferences.StateMachinePreferencePage"

             name="StateMachine Node" />

 	
@@ -757,7 +757,7 @@
 

 	<?gmfgen generated="true"?>

 	<page  	category="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLStateMachineDiagram"

-			class="org.eclipse.papyrus.diagram.statemachine.preferences.GeneralizationPreferencePage"

+			class="org.eclipse.papyrus.uml.diagram.statemachine.preferences.GeneralizationPreferencePage"

             id="org.eclipse.papyrus.diagram.statemachine.preferences.GeneralizationPreferencePage"

             name="Generalization Link" />

 		

@@ -765,7 +765,7 @@
 

 	<?gmfgen generated="true"?>

 	<page  	category="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLStateMachineDiagram"

-			class="org.eclipse.papyrus.diagram.statemachine.preferences.TransitionPreferencePage"

+			class="org.eclipse.papyrus.uml.diagram.statemachine.preferences.TransitionPreferencePage"

             id="org.eclipse.papyrus.diagram.statemachine.preferences.TransitionPreferencePage"

             name="Transition Link" />

 		

@@ -780,7 +780,7 @@
 		<paletteProvider class="org.eclipse.gmf.runtime.diagram.ui.providers.DefaultPaletteProvider">

 			<Priority name="Lowest"/>

       		<contribution

-            	factoryClass="org.eclipse.papyrus.diagram.statemachine.part.UMLPaletteFactory">

+            	factoryClass="org.eclipse.papyrus.uml.diagram.statemachine.part.UMLPaletteFactory">

      			<predefinedEntry id="standardGroup/noteStack/noteTool" remove="true"/> 

 				<predefinedEntry id="standardGroup/noteStack/textTool" remove="true"/> 

 				<predefinedEntry id="standardGroup/noteStack/noteattachmentTool" remove="true"/>

@@ -962,7 +962,7 @@
 		<paletteProvider class="org.eclipse.gmf.runtime.diagram.ui.providers.DefaultPaletteProvider">

 			<Priority name="Low"/>

       		<contribution

-            	factoryClass="org.eclipse.papyrus.diagram.statemachine.part.UMLPaletteFactory">

+            	factoryClass="org.eclipse.papyrus.uml.diagram.statemachine.part.UMLPaletteFactory">

      			<predefinedEntry id="standardGroup/noteStack/noteTool" remove="true"/> 

 				<predefinedEntry id="standardGroup/noteStack/textTool" remove="true"/> 

 				<predefinedEntry id="standardGroup/noteStack/noteattachmentTool" remove="true"/>

@@ -1062,7 +1062,7 @@
 	</extension>

 <extension id="validationDecoratorProvider" name="ValidationDecorations" point="org.eclipse.gmf.runtime.diagram.ui.decoratorProviders">

       <?gmfgen generated="true"?>

-      <decoratorProvider class="org.eclipse.papyrus.diagram.statemachine.providers.UMLValidationDecoratorProvider">

+      <decoratorProvider class="org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLValidationDecoratorProvider">

          <Priority name="Lowest"/>

          <object class="org.eclipse.gmf.runtime.diagram.ui.editparts.IPrimaryEditPart(org.eclipse.gmf.runtime.diagram.ui)" id="PRIMARY_VIEW"/>

          <context decoratorTargets="PRIMARY_VIEW"/>

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/commands/ConnectionPointReferenceCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/commands/ConnectionPointReferenceCreateCommand.java
index 7b2e9f8081e..9793ab05921 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/commands/ConnectionPointReferenceCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/commands/ConnectionPointReferenceCreateCommand.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.commands;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.commands;
 
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.runtime.IAdaptable;
@@ -12,7 +12,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.diagram.statemachine.providers.ElementInitializers;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.ElementInitializers;
 import org.eclipse.uml2.uml.ConnectionPointReference;
 import org.eclipse.uml2.uml.State;
 import org.eclipse.uml2.uml.UMLFactory;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/commands/FinalStateCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/commands/FinalStateCreateCommand.java
index 2cc1226f2a2..a66f0df0a0e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/commands/FinalStateCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/commands/FinalStateCreateCommand.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.commands;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.commands;
 
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.runtime.IAdaptable;
@@ -12,7 +12,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.diagram.statemachine.providers.ElementInitializers;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.ElementInitializers;
 import org.eclipse.uml2.uml.FinalState;
 import org.eclipse.uml2.uml.Region;
 import org.eclipse.uml2.uml.UMLFactory;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/commands/GeneralizationCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/commands/GeneralizationCreateCommand.java
index d3b4775c9a7..de4dfb30fce 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/commands/GeneralizationCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/commands/GeneralizationCreateCommand.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.commands;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.commands;
 
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.runtime.IAdaptable;
@@ -11,7 +11,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.papyrus.diagram.statemachine.edit.policies.UMLBaseItemSemanticEditPolicy;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.policies.UMLBaseItemSemanticEditPolicy;
 import org.eclipse.uml2.uml.Classifier;
 import org.eclipse.uml2.uml.Generalization;
 import org.eclipse.uml2.uml.UMLFactory;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/commands/GeneralizationReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/commands/GeneralizationReorientCommand.java
index 43b3e8fa5f3..dfcdf9ce73f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/commands/GeneralizationReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/commands/GeneralizationReorientCommand.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.commands;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.commands;
 
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.runtime.IAdaptable;
@@ -7,7 +7,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gmf.runtime.common.core.command.CommandResult;
 import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.diagram.statemachine.edit.policies.UMLBaseItemSemanticEditPolicy;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.policies.UMLBaseItemSemanticEditPolicy;
 import org.eclipse.uml2.uml.Classifier;
 import org.eclipse.uml2.uml.Generalization;
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/commands/PseudostateChoiceCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/commands/PseudostateChoiceCreateCommand.java
index 6d161b8d8ab..7acf9bbae62 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/commands/PseudostateChoiceCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/commands/PseudostateChoiceCreateCommand.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.commands;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.commands;
 
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.runtime.IAdaptable;
@@ -12,7 +12,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.diagram.statemachine.providers.ElementInitializers;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.ElementInitializers;
 import org.eclipse.uml2.uml.Pseudostate;
 import org.eclipse.uml2.uml.Region;
 import org.eclipse.uml2.uml.UMLFactory;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/commands/PseudostateDeepHistoryCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/commands/PseudostateDeepHistoryCreateCommand.java
index a65b970e7c1..8f519083322 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/commands/PseudostateDeepHistoryCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/commands/PseudostateDeepHistoryCreateCommand.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.commands;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.commands;
 
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.runtime.IAdaptable;
@@ -12,7 +12,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.diagram.statemachine.providers.ElementInitializers;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.ElementInitializers;
 import org.eclipse.uml2.uml.Pseudostate;
 import org.eclipse.uml2.uml.Region;
 import org.eclipse.uml2.uml.UMLFactory;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/commands/PseudostateEntryPointCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/commands/PseudostateEntryPointCreateCommand.java
index f7fd57a1ce3..ce0521494b6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/commands/PseudostateEntryPointCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/commands/PseudostateEntryPointCreateCommand.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.commands;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.commands;
 
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.runtime.IAdaptable;
@@ -12,7 +12,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.diagram.statemachine.providers.ElementInitializers;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.ElementInitializers;
 import org.eclipse.uml2.uml.Pseudostate;
 import org.eclipse.uml2.uml.StateMachine;
 import org.eclipse.uml2.uml.UMLFactory;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/commands/PseudostateExitPointCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/commands/PseudostateExitPointCreateCommand.java
index e1e48c9e2a9..d519da6fb4a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/commands/PseudostateExitPointCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/commands/PseudostateExitPointCreateCommand.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.commands;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.commands;
 
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.runtime.IAdaptable;
@@ -12,7 +12,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.diagram.statemachine.providers.ElementInitializers;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.ElementInitializers;
 import org.eclipse.uml2.uml.Pseudostate;
 import org.eclipse.uml2.uml.StateMachine;
 import org.eclipse.uml2.uml.UMLFactory;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/commands/PseudostateForkCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/commands/PseudostateForkCreateCommand.java
index 986c2bab48e..2cb6548404f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/commands/PseudostateForkCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/commands/PseudostateForkCreateCommand.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.commands;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.commands;
 
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.runtime.IAdaptable;
@@ -12,7 +12,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.diagram.statemachine.providers.ElementInitializers;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.ElementInitializers;
 import org.eclipse.uml2.uml.Pseudostate;
 import org.eclipse.uml2.uml.Region;
 import org.eclipse.uml2.uml.UMLFactory;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/commands/PseudostateInitialCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/commands/PseudostateInitialCreateCommand.java
index ecfd6c7fb89..ad98dc66662 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/commands/PseudostateInitialCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/commands/PseudostateInitialCreateCommand.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.commands;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.commands;
 
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.runtime.IAdaptable;
@@ -12,7 +12,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.diagram.statemachine.providers.ElementInitializers;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.ElementInitializers;
 import org.eclipse.uml2.uml.Pseudostate;
 import org.eclipse.uml2.uml.Region;
 import org.eclipse.uml2.uml.UMLFactory;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/commands/PseudostateJoinCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/commands/PseudostateJoinCreateCommand.java
index f50b54e4dbe..41af5e8afd5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/commands/PseudostateJoinCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/commands/PseudostateJoinCreateCommand.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.commands;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.commands;
 
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.runtime.IAdaptable;
@@ -12,7 +12,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.diagram.statemachine.providers.ElementInitializers;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.ElementInitializers;
 import org.eclipse.uml2.uml.Pseudostate;
 import org.eclipse.uml2.uml.Region;
 import org.eclipse.uml2.uml.UMLFactory;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/commands/PseudostateJunctionCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/commands/PseudostateJunctionCreateCommand.java
index 9663a5f98b8..c7ccd4a683c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/commands/PseudostateJunctionCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/commands/PseudostateJunctionCreateCommand.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.commands;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.commands;
 
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.runtime.IAdaptable;
@@ -12,7 +12,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.diagram.statemachine.providers.ElementInitializers;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.ElementInitializers;
 import org.eclipse.uml2.uml.Pseudostate;
 import org.eclipse.uml2.uml.Region;
 import org.eclipse.uml2.uml.UMLFactory;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/commands/PseudostateShallowHistoryCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/commands/PseudostateShallowHistoryCreateCommand.java
index f6f05e2f391..a1be380781b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/commands/PseudostateShallowHistoryCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/commands/PseudostateShallowHistoryCreateCommand.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.commands;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.commands;
 
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.runtime.IAdaptable;
@@ -12,7 +12,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.diagram.statemachine.providers.ElementInitializers;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.ElementInitializers;
 import org.eclipse.uml2.uml.Pseudostate;
 import org.eclipse.uml2.uml.Region;
 import org.eclipse.uml2.uml.UMLFactory;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/commands/PseudostateTerminateCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/commands/PseudostateTerminateCreateCommand.java
index 8acbfd56fff..f5d83d6c39a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/commands/PseudostateTerminateCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/commands/PseudostateTerminateCreateCommand.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.commands;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.commands;
 
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.runtime.IAdaptable;
@@ -12,7 +12,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.diagram.statemachine.providers.ElementInitializers;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.ElementInitializers;
 import org.eclipse.uml2.uml.Pseudostate;
 import org.eclipse.uml2.uml.Region;
 import org.eclipse.uml2.uml.UMLFactory;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/commands/RegionCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/commands/RegionCreateCommand.java
index 9bfb46579c6..9ec009b3232 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/commands/RegionCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/commands/RegionCreateCommand.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.commands;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.commands;
 
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.runtime.IAdaptable;
@@ -12,7 +12,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.diagram.statemachine.providers.ElementInitializers;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.ElementInitializers;
 import org.eclipse.uml2.uml.Region;
 import org.eclipse.uml2.uml.StateMachine;
 import org.eclipse.uml2.uml.UMLFactory;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/commands/StateCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/commands/StateCreateCommand.java
index febbf01a83c..be9c3055131 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/commands/StateCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/commands/StateCreateCommand.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.commands;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.commands;
 
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.runtime.IAdaptable;
@@ -12,7 +12,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.diagram.statemachine.providers.ElementInitializers;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.ElementInitializers;
 import org.eclipse.uml2.uml.Region;
 import org.eclipse.uml2.uml.State;
 import org.eclipse.uml2.uml.UMLFactory;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/commands/StateMachineCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/commands/StateMachineCreateCommand.java
index 38341117720..adeb9e67e56 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/commands/StateMachineCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/commands/StateMachineCreateCommand.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.commands;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.commands;
 
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.runtime.IAdaptable;
@@ -12,7 +12,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.diagram.statemachine.providers.ElementInitializers;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.ElementInitializers;
 import org.eclipse.uml2.uml.Package;
 import org.eclipse.uml2.uml.StateMachine;
 import org.eclipse.uml2.uml.UMLFactory;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/commands/TransitionCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/commands/TransitionCreateCommand.java
index fdad3010251..b91139dbc0a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/commands/TransitionCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/commands/TransitionCreateCommand.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.commands;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.commands;
 
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.runtime.IAdaptable;
@@ -11,8 +11,8 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.papyrus.diagram.statemachine.edit.policies.UMLBaseItemSemanticEditPolicy;
-import org.eclipse.papyrus.diagram.statemachine.providers.ElementInitializers;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.policies.UMLBaseItemSemanticEditPolicy;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.ElementInitializers;
 import org.eclipse.uml2.uml.Region;
 import org.eclipse.uml2.uml.Transition;
 import org.eclipse.uml2.uml.UMLFactory;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/commands/TransitionReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/commands/TransitionReorientCommand.java
index c258b72138e..8de18fd6a9b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/commands/TransitionReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/commands/TransitionReorientCommand.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.commands;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.commands;
 
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.runtime.IAdaptable;
@@ -7,7 +7,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gmf.runtime.common.core.command.CommandResult;
 import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.diagram.statemachine.edit.policies.UMLBaseItemSemanticEditPolicy;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.policies.UMLBaseItemSemanticEditPolicy;
 import org.eclipse.uml2.uml.Region;
 import org.eclipse.uml2.uml.Transition;
 import org.eclipse.uml2.uml.Vertex;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/commands/UMLReorientConnectionViewCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/commands/UMLReorientConnectionViewCommand.java
index 79c6d6e29a5..af2a4f3a43b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/commands/UMLReorientConnectionViewCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/commands/UMLReorientConnectionViewCommand.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.commands;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.commands;
 
 import java.util.List;
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/helpers/ConnectionPointReferenceEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/helpers/ConnectionPointReferenceEditHelper.java
index 55b185a9170..e469b7f6c1e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/helpers/ConnectionPointReferenceEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/helpers/ConnectionPointReferenceEditHelper.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.helpers;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.helpers;
 
 /**
  * @generated
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/helpers/FinalStateEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/helpers/FinalStateEditHelper.java
index 7ed702aa4c9..49e12581dc5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/helpers/FinalStateEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/helpers/FinalStateEditHelper.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.helpers;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.helpers;
 
 /**
  * @generated
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/helpers/GeneralizationEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/helpers/GeneralizationEditHelper.java
index ff2ca7e56e4..dd378b2a806 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/helpers/GeneralizationEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/helpers/GeneralizationEditHelper.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.helpers;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.helpers;
 
 /**
  * @generated
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/helpers/PackageEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/helpers/PackageEditHelper.java
index 4b9f1bf9f35..ec0a07cc06f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/helpers/PackageEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/helpers/PackageEditHelper.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.helpers;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.helpers;
 
 /**
  * @generated
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/helpers/PseudostateEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/helpers/PseudostateEditHelper.java
index 14949cf0be7..a094790cc33 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/helpers/PseudostateEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/helpers/PseudostateEditHelper.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.helpers;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.helpers;
 
 /**
  * @generated
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/helpers/RegionEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/helpers/RegionEditHelper.java
index 2f152168879..ec6856a89d3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/helpers/RegionEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/helpers/RegionEditHelper.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.helpers;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.helpers;
 
 /**
  * @generated
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/helpers/StateEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/helpers/StateEditHelper.java
index 9194c89fdc2..dd116e54540 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/helpers/StateEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/helpers/StateEditHelper.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.helpers;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.helpers;
 
 /**
  * @generated
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/helpers/StateMachineEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/helpers/StateMachineEditHelper.java
index 16157895e66..0a446a5c96a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/helpers/StateMachineEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/helpers/StateMachineEditHelper.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.helpers;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.helpers;
 
 /**
  * @generated
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/helpers/TransitionEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/helpers/TransitionEditHelper.java
index 6a406c5d168..7c09b006309 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/helpers/TransitionEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/helpers/TransitionEditHelper.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.helpers;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.helpers;
 
 /**
  * @generated
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/helpers/UMLBaseEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/helpers/UMLBaseEditHelper.java
index 36656d641c4..03531d1cda8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/helpers/UMLBaseEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/helpers/UMLBaseEditHelper.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.helpers;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.helpers;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
@@ -12,7 +12,7 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
-import org.eclipse.papyrus.diagram.common.commands.UnapplyAllStereotypesCommand;
+import org.eclipse.papyrus.uml.diagram.common.commands.UnapplyAllStereotypesCommand;
 import org.eclipse.uml2.uml.Element;
 
 /**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/ConnectionPointReferenceEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/ConnectionPointReferenceEditPart.java
index 65052525a8b..fb323f24ff8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/ConnectionPointReferenceEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/ConnectionPointReferenceEditPart.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.parts;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.parts;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -35,19 +35,19 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.papyrus.diagram.common.editparts.AbstractBorderEditPart;
-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.diagram.common.helper.PreferenceInitializerForElementHelper;
-import org.eclipse.papyrus.diagram.common.locator.ExternalLabelPositionLocator;
-import org.eclipse.papyrus.diagram.statemachine.custom.figures.ConnectionPointReferenceFigure;
-import org.eclipse.papyrus.diagram.statemachine.edit.policies.ConnectionPointReferenceItemSemanticEditPolicy;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLDiagramEditorPlugin;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLElementTypes;
 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;
 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractBorderEditPart;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;
+import org.eclipse.papyrus.uml.diagram.common.locator.ExternalLabelPositionLocator;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.figures.ConnectionPointReferenceFigure;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.policies.ConnectionPointReferenceItemSemanticEditPolicy;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLDiagramEditorPlugin;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLElementTypes;
 import org.eclipse.swt.graphics.Color;
 
 /**
@@ -246,7 +246,7 @@ AbstractBorderEditPart {
 		if(targetEditPart instanceof PseudostateExitPointEditPart) {
 			types.add(UMLElementTypes.Transition_7000);
 		}
-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.statemachine.edit.parts.ConnectionPointReferenceEditPart) {
+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.ConnectionPointReferenceEditPart) {
 			types.add(UMLElementTypes.Transition_7000);
 		}
 		return types;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/ConnectionPointReferenceNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/ConnectionPointReferenceNameEditPart.java
index 2ade04e8cba..ee4a2668c5c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/ConnectionPointReferenceNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/ConnectionPointReferenceNameEditPart.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.parts;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.parts;
 
 import java.util.Collections;
 import java.util.List;
@@ -40,14 +40,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
 import org.eclipse.jface.viewers.ICellEditorValidator;
 import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.diagram.statemachine.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLElementTypes;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLParserProvider;
 import org.eclipse.papyrus.extensionpoints.editors.Activator;
 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
@@ -57,6 +49,14 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.policies.UMLTextSelectionEditPolicy;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLParserProvider;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.accessibility.AccessibleEvent;
 import org.eclipse.swt.graphics.Color;
@@ -116,7 +116,7 @@ implements ITextAwareEditPart, IBorderItemEditPart {
 	 * @generated
 	 */
 	static {
-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.statemachine.edit.parts.ConnectionPointReferenceNameEditPart.VISUAL_ID), new Point(0, 0));
+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.ConnectionPointReferenceNameEditPart.VISUAL_ID), new Point(0, 0));
 	}
 
 	/**
@@ -236,7 +236,7 @@ implements ITextAwareEditPart, IBorderItemEditPart {
 	/**
 	 * Returns the kind of associated editor for direct edition.
 	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition
+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
 	 * @generated
 	 */
 	public int getDirectEditionType() {
@@ -368,7 +368,7 @@ implements ITextAwareEditPart, IBorderItemEditPart {
 	 */
 	public IParser getParser() {
 		if(parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.ConnectionPointReference_18000, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.statemachine.edit.parts.ConnectionPointReferenceNameEditPart.VISUAL_ID));
+			parser = UMLParserProvider.getParser(UMLElementTypes.ConnectionPointReference_18000, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.ConnectionPointReferenceNameEditPart.VISUAL_ID));
 		}
 		return parser;
 	}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/ConnectionPointReferenceStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/ConnectionPointReferenceStereotypeEditPart.java
index fae0281b7ef..44e6d07861f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/ConnectionPointReferenceStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/ConnectionPointReferenceStereotypeEditPart.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.parts;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.parts;
 
 import java.util.Collections;
 import java.util.List;
@@ -39,18 +39,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
 import org.eclipse.jface.viewers.ICellEditorValidator;
 import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.diagram.common.editparts.AbstractLabelEditPart;
-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy;
-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure;
-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.diagram.statemachine.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLElementTypes;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLParserProvider;
 import org.eclipse.papyrus.extensionpoints.editors.Activator;
 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
@@ -60,6 +48,18 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
+import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractLabelEditPart;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.policies.UMLTextSelectionEditPolicy;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLParserProvider;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.accessibility.AccessibleEvent;
 import org.eclipse.swt.graphics.Color;
@@ -119,7 +119,7 @@ implements ITextAwareEditPart, IBorderItemEditPart {
 	 * @generated
 	 */
 	static {
-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.statemachine.edit.parts.ConnectionPointReferenceStereotypeEditPart.VISUAL_ID), new Point(0, 0));
+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.ConnectionPointReferenceStereotypeEditPart.VISUAL_ID), new Point(0, 0));
 	}
 
 	/**
@@ -240,7 +240,7 @@ implements ITextAwareEditPart, IBorderItemEditPart {
 	/**
 	 * Returns the kind of associated editor for direct edition.
 	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition
+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
 	 * @generated
 	 */
 	public int getDirectEditionType() {
@@ -372,7 +372,7 @@ implements ITextAwareEditPart, IBorderItemEditPart {
 	 */
 	public IParser getParser() {
 		if(parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.ConnectionPointReference_18000, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.statemachine.edit.parts.ConnectionPointReferenceStereotypeEditPart.VISUAL_ID));
+			parser = UMLParserProvider.getParser(UMLElementTypes.ConnectionPointReference_18000, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.ConnectionPointReferenceStereotypeEditPart.VISUAL_ID));
 		}
 		return parser;
 	}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/FinalStateEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/FinalStateEditPart.java
index d2e7f02736d..dfa126b6162 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/FinalStateEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/FinalStateEditPart.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.parts;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.parts;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -32,17 +32,17 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.papyrus.diagram.common.editparts.UMLNodeEditPart;
-import org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.diagram.common.helper.PreferenceInitializerForElementHelper;
-import org.eclipse.papyrus.diagram.common.locator.ExternalLabelPositionLocator;
-import org.eclipse.papyrus.diagram.statemachine.custom.figures.FinalStateFigure;
-import org.eclipse.papyrus.diagram.statemachine.edit.policies.FinalStateItemSemanticEditPolicy;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLDiagramEditorPlugin;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLElementTypes;
 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;
 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.uml.diagram.common.editparts.UMLNodeEditPart;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;
+import org.eclipse.papyrus.uml.diagram.common.locator.ExternalLabelPositionLocator;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.figures.FinalStateFigure;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.policies.FinalStateItemSemanticEditPolicy;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLDiagramEditorPlugin;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLElementTypes;
 import org.eclipse.swt.graphics.Color;
 
 /**
@@ -200,7 +200,7 @@ UMLNodeEditPart {
 	 */
 	public List<IElementType> getMARelTypesOnSourceAndTarget(IGraphicalEditPart targetEditPart) {
 		LinkedList<IElementType> types = new LinkedList<IElementType>();
-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.statemachine.edit.parts.FinalStateEditPart) {
+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.FinalStateEditPart) {
 			types.add(UMLElementTypes.Transition_7000);
 		}
 		if(targetEditPart instanceof StateEditPart) {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/FinalStateNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/FinalStateNameEditPart.java
index 27affe88c17..a972ff97360 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/FinalStateNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/FinalStateNameEditPart.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.parts;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.parts;
 
 import java.util.Collections;
 import java.util.List;
@@ -40,14 +40,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
 import org.eclipse.jface.viewers.ICellEditorValidator;
 import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.diagram.statemachine.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLElementTypes;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLParserProvider;
 import org.eclipse.papyrus.extensionpoints.editors.Activator;
 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
@@ -57,6 +49,14 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.policies.UMLTextSelectionEditPolicy;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLParserProvider;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.accessibility.AccessibleEvent;
 import org.eclipse.swt.graphics.Color;
@@ -116,7 +116,7 @@ implements ITextAwareEditPart, IBorderItemEditPart {
 	 * @generated
 	 */
 	static {
-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.statemachine.edit.parts.FinalStateNameEditPart.VISUAL_ID), new Point(0, 0));
+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.FinalStateNameEditPart.VISUAL_ID), new Point(0, 0));
 	}
 
 	/**
@@ -237,7 +237,7 @@ implements ITextAwareEditPart, IBorderItemEditPart {
 	 * Returns the kind of associated editor for direct edition.
 	 * 
 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see
-	 *         org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition
+	 *         org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
 	 * @generated
 	 */
 	public int getDirectEditionType() {
@@ -369,7 +369,7 @@ implements ITextAwareEditPart, IBorderItemEditPart {
 	 */
 	public IParser getParser() {
 		if(parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.FinalState_5000, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.statemachine.edit.parts.FinalStateNameEditPart.VISUAL_ID));
+			parser = UMLParserProvider.getParser(UMLElementTypes.FinalState_5000, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.FinalStateNameEditPart.VISUAL_ID));
 		}
 		return parser;
 	}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/FinalStateStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/FinalStateStereotypeEditPart.java
index d38d466bce0..0ebbcf4f993 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/FinalStateStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/FinalStateStereotypeEditPart.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.parts;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.parts;
 
 import java.util.Collections;
 import java.util.List;
@@ -39,18 +39,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
 import org.eclipse.jface.viewers.ICellEditorValidator;
 import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.diagram.common.editparts.AbstractLabelEditPart;
-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy;
-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure;
-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.diagram.statemachine.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLElementTypes;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLParserProvider;
 import org.eclipse.papyrus.extensionpoints.editors.Activator;
 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
@@ -60,6 +48,18 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
+import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractLabelEditPart;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.policies.UMLTextSelectionEditPolicy;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLParserProvider;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.accessibility.AccessibleEvent;
 import org.eclipse.swt.graphics.Color;
@@ -119,7 +119,7 @@ implements ITextAwareEditPart, IBorderItemEditPart {
 	 * @generated
 	 */
 	static {
-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.statemachine.edit.parts.FinalStateStereotypeEditPart.VISUAL_ID), new Point(0, 0));
+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.FinalStateStereotypeEditPart.VISUAL_ID), new Point(0, 0));
 	}
 
 	/**
@@ -241,7 +241,7 @@ implements ITextAwareEditPart, IBorderItemEditPart {
 	 * Returns the kind of associated editor for direct edition.
 	 * 
 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see
-	 *         org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition
+	 *         org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
 	 * @generated
 	 */
 	public int getDirectEditionType() {
@@ -373,7 +373,7 @@ implements ITextAwareEditPart, IBorderItemEditPart {
 	 */
 	public IParser getParser() {
 		if(parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.FinalState_5000, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.statemachine.edit.parts.FinalStateStereotypeEditPart.VISUAL_ID));
+			parser = UMLParserProvider.getParser(UMLElementTypes.FinalState_5000, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.FinalStateStereotypeEditPart.VISUAL_ID));
 		}
 		return parser;
 	}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/GeneralizationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/GeneralizationEditPart.java
index 1e13398f36e..8ad31ec76e8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/GeneralizationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/GeneralizationEditPart.java
@@ -1,14 +1,14 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.parts;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.parts;
 
 import org.eclipse.draw2d.Connection;
 import org.eclipse.gef.EditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.diagram.common.editparts.UMLConnectionNodeEditPart;
-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;
-import org.eclipse.papyrus.diagram.common.figure.edge.GeneralizationFigure;
-import org.eclipse.papyrus.diagram.statemachine.edit.policies.GeneralizationItemSemanticEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.figure.edge.GeneralizationFigure;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.policies.GeneralizationItemSemanticEditPolicy;
 
 /**
  * @generated
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/GeneralizationStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/GeneralizationStereotypeEditPart.java
index 72221a5347c..c06da16241a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/GeneralizationStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/GeneralizationStereotypeEditPart.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.parts;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.parts;
 
 import java.util.Collections;
 import java.util.List;
@@ -38,14 +38,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
 import org.eclipse.jface.viewers.ICellEditorValidator;
 import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.diagram.statemachine.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLElementTypes;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLParserProvider;
 import org.eclipse.papyrus.extensionpoints.editors.Activator;
 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
@@ -55,6 +47,14 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.policies.UMLTextSelectionEditPolicy;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLParserProvider;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.accessibility.AccessibleEvent;
 import org.eclipse.swt.graphics.Color;
@@ -110,7 +110,7 @@ public class GeneralizationStereotypeEditPart extends LabelEditPart implements I
 	 * @generated
 	 */
 	static {
-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.statemachine.edit.parts.GeneralizationStereotypeEditPart.VISUAL_ID), new Point(0, 40));
+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.GeneralizationStereotypeEditPart.VISUAL_ID), new Point(0, 40));
 	}
 
 	/**
@@ -211,7 +211,7 @@ public class GeneralizationStereotypeEditPart extends LabelEditPart implements I
 	/**
 	 * Returns the kind of associated editor for direct edition.
 	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition
+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
 	 * @generated
 	 */
 	public int getDirectEditionType() {
@@ -342,7 +342,7 @@ public class GeneralizationStereotypeEditPart extends LabelEditPart implements I
 	 */
 	public IParser getParser() {
 		if(parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.Generalization_19000, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.statemachine.edit.parts.GeneralizationStereotypeEditPart.VISUAL_ID));
+			parser = UMLParserProvider.getParser(UMLElementTypes.Generalization_19000, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.GeneralizationStereotypeEditPart.VISUAL_ID));
 		}
 		return parser;
 	}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/PackageEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PackageEditPart.java
index 73f750f301b..c92b6859c87 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/PackageEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PackageEditPart.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.parts;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.parts;
 
 import java.util.Collections;
 import java.util.List;
@@ -19,15 +19,15 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.NonResizableLabelEditPolicy;
 import org.eclipse.gmf.runtime.diagram.ui.figures.BorderedNodeFigure;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.diagram.common.editpolicies.DuplicatePasteEditPolicy;
-import org.eclipse.papyrus.diagram.common.providers.ViewInfo;
-import org.eclipse.papyrus.diagram.common.util.MDTUtil;
-import org.eclipse.papyrus.diagram.statemachine.custom.policies.CustomPackageCreationEditPolicy;
-import org.eclipse.papyrus.diagram.statemachine.custom.policies.CustomPackageXYLayoutEditPolicy;
-import org.eclipse.papyrus.diagram.statemachine.custom.policies.CustomStateMachineDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.diagram.statemachine.custom.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.diagram.statemachine.edit.policies.PackageItemSemanticEditPolicy;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.providers.ViewInfo;
+import org.eclipse.papyrus.uml.diagram.common.util.MDTUtil;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.policies.CustomPackageCreationEditPolicy;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.policies.CustomPackageXYLayoutEditPolicy;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.policies.CustomStateMachineDiagramDragDropEditPolicy;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.policies.RemoveOrphanViewPolicy;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.policies.PackageItemSemanticEditPolicy;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLVisualIDRegistry;
 
 /**
  * @generated
@@ -152,7 +152,7 @@ public class PackageEditPart extends DiagramEditPart {
 		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new PackageItemSemanticEditPolicy());
 
 		//in Papyrus diagrams are not strongly synchronised
-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.diagram.statemachine.edit.policies.PackageCanonicalEditPolicy());
+		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.statemachine.edit.policies.PackageCanonicalEditPolicy());
 
 		installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
 		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new CustomPackageCreationEditPolicy());
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/PseudostateChoiceEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateChoiceEditPart.java
index 2069258c930..d246a7ae546 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/PseudostateChoiceEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateChoiceEditPart.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.parts;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.parts;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -32,19 +32,19 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.papyrus.diagram.common.editparts.UMLNodeEditPart;
-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.diagram.common.helper.PreferenceInitializerForElementHelper;
-import org.eclipse.papyrus.diagram.common.locator.ExternalLabelPositionLocator;
-import org.eclipse.papyrus.diagram.statemachine.custom.figures.PseudostateChoiceFigure;
-import org.eclipse.papyrus.diagram.statemachine.edit.policies.PseudostateChoiceItemSemanticEditPolicy;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLDiagramEditorPlugin;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLElementTypes;
 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;
 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.uml.diagram.common.editparts.UMLNodeEditPart;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;
+import org.eclipse.papyrus.uml.diagram.common.locator.ExternalLabelPositionLocator;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.figures.PseudostateChoiceFigure;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.policies.PseudostateChoiceItemSemanticEditPolicy;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLDiagramEditorPlugin;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLElementTypes;
 import org.eclipse.swt.graphics.Color;
 
 /**
@@ -218,7 +218,7 @@ UMLNodeEditPart {
 		if(targetEditPart instanceof PseudostateForkEditPart) {
 			types.add(UMLElementTypes.Transition_7000);
 		}
-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateChoiceEditPart) {
+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateChoiceEditPart) {
 			types.add(UMLElementTypes.Transition_7000);
 		}
 		if(targetEditPart instanceof PseudostateJunctionEditPart) {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/PseudostateChoiceNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateChoiceNameEditPart.java
index f56ccbeafe9..b04446e6b42 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/PseudostateChoiceNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateChoiceNameEditPart.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.parts;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.parts;
 
 import java.util.Collections;
 import java.util.List;
@@ -40,14 +40,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
 import org.eclipse.jface.viewers.ICellEditorValidator;
 import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.diagram.statemachine.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLElementTypes;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLParserProvider;
 import org.eclipse.papyrus.extensionpoints.editors.Activator;
 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
@@ -57,6 +49,14 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.policies.UMLTextSelectionEditPolicy;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLParserProvider;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.accessibility.AccessibleEvent;
 import org.eclipse.swt.graphics.Color;
@@ -116,7 +116,7 @@ implements ITextAwareEditPart, IBorderItemEditPart {
 	 * @generated
 	 */
 	static {
-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateChoiceNameEditPart.VISUAL_ID), new Point(0, 0));
+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateChoiceNameEditPart.VISUAL_ID), new Point(0, 0));
 	}
 
 	/**
@@ -236,7 +236,7 @@ implements ITextAwareEditPart, IBorderItemEditPart {
 	/**
 	 * Returns the kind of associated editor for direct edition.
 	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition
+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
 	 * @generated
 	 */
 	public int getDirectEditionType() {
@@ -368,7 +368,7 @@ implements ITextAwareEditPart, IBorderItemEditPart {
 	 */
 	public IParser getParser() {
 		if(parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.Pseudostate_11000, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateChoiceNameEditPart.VISUAL_ID));
+			parser = UMLParserProvider.getParser(UMLElementTypes.Pseudostate_11000, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateChoiceNameEditPart.VISUAL_ID));
 		}
 		return parser;
 	}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/PseudostateChoiceStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateChoiceStereotypeEditPart.java
index fa468818ade..2bd2c962b3a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/PseudostateChoiceStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateChoiceStereotypeEditPart.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.parts;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.parts;
 
 import java.util.Collections;
 import java.util.List;
@@ -39,18 +39,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
 import org.eclipse.jface.viewers.ICellEditorValidator;
 import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.diagram.common.editparts.AbstractLabelEditPart;
-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy;
-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure;
-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.diagram.statemachine.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLElementTypes;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLParserProvider;
 import org.eclipse.papyrus.extensionpoints.editors.Activator;
 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
@@ -60,6 +48,18 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
+import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractLabelEditPart;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.policies.UMLTextSelectionEditPolicy;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLParserProvider;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.accessibility.AccessibleEvent;
 import org.eclipse.swt.graphics.Color;
@@ -119,7 +119,7 @@ implements ITextAwareEditPart, IBorderItemEditPart {
 	 * @generated
 	 */
 	static {
-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateChoiceStereotypeEditPart.VISUAL_ID), new Point(0, 0));
+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateChoiceStereotypeEditPart.VISUAL_ID), new Point(0, 0));
 	}
 
 	/**
@@ -240,7 +240,7 @@ implements ITextAwareEditPart, IBorderItemEditPart {
 	/**
 	 * Returns the kind of associated editor for direct edition.
 	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition
+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
 	 * @generated
 	 */
 	public int getDirectEditionType() {
@@ -372,7 +372,7 @@ implements ITextAwareEditPart, IBorderItemEditPart {
 	 */
 	public IParser getParser() {
 		if(parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.Pseudostate_11000, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateChoiceStereotypeEditPart.VISUAL_ID));
+			parser = UMLParserProvider.getParser(UMLElementTypes.Pseudostate_11000, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateChoiceStereotypeEditPart.VISUAL_ID));
 		}
 		return parser;
 	}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/PseudostateDeepHistoryEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateDeepHistoryEditPart.java
index 1b253ebca33..bc081749ca4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/PseudostateDeepHistoryEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateDeepHistoryEditPart.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.parts;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.parts;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -32,19 +32,19 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.papyrus.diagram.common.editparts.UMLNodeEditPart;
-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.diagram.common.helper.PreferenceInitializerForElementHelper;
-import org.eclipse.papyrus.diagram.common.locator.ExternalLabelPositionLocator;
-import org.eclipse.papyrus.diagram.statemachine.custom.figures.PseudostateDeepHistoryFigure;
-import org.eclipse.papyrus.diagram.statemachine.edit.policies.PseudostateDeepHistoryItemSemanticEditPolicy;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLDiagramEditorPlugin;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLElementTypes;
 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;
 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.uml.diagram.common.editparts.UMLNodeEditPart;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;
+import org.eclipse.papyrus.uml.diagram.common.locator.ExternalLabelPositionLocator;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.figures.PseudostateDeepHistoryFigure;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.policies.PseudostateDeepHistoryItemSemanticEditPolicy;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLDiagramEditorPlugin;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLElementTypes;
 import org.eclipse.swt.graphics.Color;
 
 /**
@@ -227,7 +227,7 @@ UMLNodeEditPart {
 		if(targetEditPart instanceof PseudostateShallowHistoryEditPart) {
 			types.add(UMLElementTypes.Transition_7000);
 		}
-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateDeepHistoryEditPart) {
+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateDeepHistoryEditPart) {
 			types.add(UMLElementTypes.Transition_7000);
 		}
 		if(targetEditPart instanceof PseudostateTerminateEditPart) {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/PseudostateDeepHistoryNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateDeepHistoryNameEditPart.java
index a72209ca12e..b45bc315904 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/PseudostateDeepHistoryNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateDeepHistoryNameEditPart.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.parts;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.parts;
 
 import java.util.Collections;
 import java.util.List;
@@ -40,14 +40,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
 import org.eclipse.jface.viewers.ICellEditorValidator;
 import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.diagram.statemachine.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLElementTypes;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLParserProvider;
 import org.eclipse.papyrus.extensionpoints.editors.Activator;
 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
@@ -57,6 +49,14 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.policies.UMLTextSelectionEditPolicy;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLParserProvider;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.accessibility.AccessibleEvent;
 import org.eclipse.swt.graphics.Color;
@@ -116,7 +116,7 @@ implements ITextAwareEditPart, IBorderItemEditPart {
 	 * @generated
 	 */
 	static {
-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateDeepHistoryNameEditPart.VISUAL_ID), new Point(0, 0));
+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateDeepHistoryNameEditPart.VISUAL_ID), new Point(0, 0));
 	}
 
 	/**
@@ -236,7 +236,7 @@ implements ITextAwareEditPart, IBorderItemEditPart {
 	/**
 	 * Returns the kind of associated editor for direct edition.
 	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition
+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
 	 * @generated
 	 */
 	public int getDirectEditionType() {
@@ -368,7 +368,7 @@ implements ITextAwareEditPart, IBorderItemEditPart {
 	 */
 	public IParser getParser() {
 		if(parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.Pseudostate_14000, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateDeepHistoryNameEditPart.VISUAL_ID));
+			parser = UMLParserProvider.getParser(UMLElementTypes.Pseudostate_14000, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateDeepHistoryNameEditPart.VISUAL_ID));
 		}
 		return parser;
 	}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/PseudostateDeepHistoryStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateDeepHistoryStereotypeEditPart.java
index b97520020f4..d0dd1a32bee 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/PseudostateDeepHistoryStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateDeepHistoryStereotypeEditPart.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.parts;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.parts;
 
 import java.util.Collections;
 import java.util.List;
@@ -39,18 +39,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
 import org.eclipse.jface.viewers.ICellEditorValidator;
 import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.diagram.common.editparts.AbstractLabelEditPart;
-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy;
-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure;
-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.diagram.statemachine.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLElementTypes;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLParserProvider;
 import org.eclipse.papyrus.extensionpoints.editors.Activator;
 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
@@ -60,6 +48,18 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
+import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractLabelEditPart;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.policies.UMLTextSelectionEditPolicy;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLParserProvider;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.accessibility.AccessibleEvent;
 import org.eclipse.swt.graphics.Color;
@@ -119,7 +119,7 @@ implements ITextAwareEditPart, IBorderItemEditPart {
 	 * @generated
 	 */
 	static {
-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateDeepHistoryStereotypeEditPart.VISUAL_ID), new Point(0, 0));
+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateDeepHistoryStereotypeEditPart.VISUAL_ID), new Point(0, 0));
 	}
 
 	/**
@@ -240,7 +240,7 @@ implements ITextAwareEditPart, IBorderItemEditPart {
 	/**
 	 * Returns the kind of associated editor for direct edition.
 	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition
+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
 	 * @generated
 	 */
 	public int getDirectEditionType() {
@@ -372,7 +372,7 @@ implements ITextAwareEditPart, IBorderItemEditPart {
 	 */
 	public IParser getParser() {
 		if(parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.Pseudostate_14000, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateDeepHistoryStereotypeEditPart.VISUAL_ID));
+			parser = UMLParserProvider.getParser(UMLElementTypes.Pseudostate_14000, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateDeepHistoryStereotypeEditPart.VISUAL_ID));
 		}
 		return parser;
 	}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/PseudostateEntryPointEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateEntryPointEditPart.java
index f4f2a0ac8d7..4957ec6e5ac 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/PseudostateEntryPointEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateEntryPointEditPart.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.parts;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.parts;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -32,19 +32,19 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.papyrus.diagram.common.editparts.AbstractBorderEditPart;
-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.diagram.common.helper.PreferenceInitializerForElementHelper;
-import org.eclipse.papyrus.diagram.common.locator.ExternalLabelPositionLocator;
-import org.eclipse.papyrus.diagram.statemachine.custom.figures.PseudostateEntryPointFigure;
-import org.eclipse.papyrus.diagram.statemachine.edit.policies.PseudostateEntryPointItemSemanticEditPolicy;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLDiagramEditorPlugin;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLElementTypes;
 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;
 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractBorderEditPart;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;
+import org.eclipse.papyrus.uml.diagram.common.locator.ExternalLabelPositionLocator;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.figures.PseudostateEntryPointFigure;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.policies.PseudostateEntryPointItemSemanticEditPolicy;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLDiagramEditorPlugin;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLElementTypes;
 import org.eclipse.swt.graphics.Color;
 
 /**
@@ -236,7 +236,7 @@ AbstractBorderEditPart {
 		if(targetEditPart instanceof PseudostateTerminateEditPart) {
 			types.add(UMLElementTypes.Transition_7000);
 		}
-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateEntryPointEditPart) {
+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateEntryPointEditPart) {
 			types.add(UMLElementTypes.Transition_7000);
 		}
 		if(targetEditPart instanceof PseudostateExitPointEditPart) {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/PseudostateEntryPointNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateEntryPointNameEditPart.java
index 7632044035f..456fc1da373 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/PseudostateEntryPointNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateEntryPointNameEditPart.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.parts;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.parts;
 
 import java.util.Collections;
 import java.util.List;
@@ -40,14 +40,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
 import org.eclipse.jface.viewers.ICellEditorValidator;
 import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.diagram.statemachine.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLElementTypes;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLParserProvider;
 import org.eclipse.papyrus.extensionpoints.editors.Activator;
 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
@@ -57,6 +49,14 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.policies.UMLTextSelectionEditPolicy;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLParserProvider;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.accessibility.AccessibleEvent;
 import org.eclipse.swt.graphics.Color;
@@ -116,7 +116,7 @@ implements ITextAwareEditPart, IBorderItemEditPart {
 	 * @generated
 	 */
 	static {
-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateEntryPointNameEditPart.VISUAL_ID), new Point(0, 0));
+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateEntryPointNameEditPart.VISUAL_ID), new Point(0, 0));
 	}
 
 	/**
@@ -236,7 +236,7 @@ implements ITextAwareEditPart, IBorderItemEditPart {
 	/**
 	 * Returns the kind of associated editor for direct edition.
 	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition
+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
 	 * @generated
 	 */
 	public int getDirectEditionType() {
@@ -368,7 +368,7 @@ implements ITextAwareEditPart, IBorderItemEditPart {
 	 */
 	public IParser getParser() {
 		if(parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.Pseudostate_16000, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateEntryPointNameEditPart.VISUAL_ID));
+			parser = UMLParserProvider.getParser(UMLElementTypes.Pseudostate_16000, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateEntryPointNameEditPart.VISUAL_ID));
 		}
 		return parser;
 	}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/PseudostateEntryPointStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateEntryPointStereotypeEditPart.java
index 870407cd2e6..bc34b74dbc4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/PseudostateEntryPointStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateEntryPointStereotypeEditPart.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.parts;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.parts;
 
 import java.util.Collections;
 import java.util.List;
@@ -39,18 +39,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
 import org.eclipse.jface.viewers.ICellEditorValidator;
 import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.diagram.common.editparts.AbstractLabelEditPart;
-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy;
-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure;
-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.diagram.statemachine.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLElementTypes;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLParserProvider;
 import org.eclipse.papyrus.extensionpoints.editors.Activator;
 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
@@ -60,6 +48,18 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
+import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractLabelEditPart;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.policies.UMLTextSelectionEditPolicy;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLParserProvider;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.accessibility.AccessibleEvent;
 import org.eclipse.swt.graphics.Color;
@@ -119,7 +119,7 @@ implements ITextAwareEditPart, IBorderItemEditPart {
 	 * @generated
 	 */
 	static {
-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateEntryPointStereotypeEditPart.VISUAL_ID), new Point(0, 0));
+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateEntryPointStereotypeEditPart.VISUAL_ID), new Point(0, 0));
 	}
 
 	/**
@@ -240,7 +240,7 @@ implements ITextAwareEditPart, IBorderItemEditPart {
 	/**
 	 * Returns the kind of associated editor for direct edition.
 	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition
+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
 	 * @generated
 	 */
 	public int getDirectEditionType() {
@@ -372,7 +372,7 @@ implements ITextAwareEditPart, IBorderItemEditPart {
 	 */
 	public IParser getParser() {
 		if(parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.Pseudostate_16000, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateEntryPointStereotypeEditPart.VISUAL_ID));
+			parser = UMLParserProvider.getParser(UMLElementTypes.Pseudostate_16000, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateEntryPointStereotypeEditPart.VISUAL_ID));
 		}
 		return parser;
 	}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/PseudostateExitPointEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateExitPointEditPart.java
index 8c7919412e9..e299c9e6db8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/PseudostateExitPointEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateExitPointEditPart.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.parts;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.parts;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -35,19 +35,19 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.papyrus.diagram.common.editparts.AbstractBorderEditPart;
-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.diagram.common.helper.PreferenceInitializerForElementHelper;
-import org.eclipse.papyrus.diagram.common.locator.ExternalLabelPositionLocator;
-import org.eclipse.papyrus.diagram.statemachine.custom.figures.PseudostateExitPointFigure;
-import org.eclipse.papyrus.diagram.statemachine.edit.policies.PseudostateExitPointItemSemanticEditPolicy;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLDiagramEditorPlugin;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLElementTypes;
 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;
 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractBorderEditPart;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;
+import org.eclipse.papyrus.uml.diagram.common.locator.ExternalLabelPositionLocator;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.figures.PseudostateExitPointFigure;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.policies.PseudostateExitPointItemSemanticEditPolicy;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLDiagramEditorPlugin;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLElementTypes;
 import org.eclipse.swt.graphics.Color;
 
 /**
@@ -243,7 +243,7 @@ AbstractBorderEditPart {
 		if(targetEditPart instanceof PseudostateEntryPointEditPart) {
 			types.add(UMLElementTypes.Transition_7000);
 		}
-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateExitPointEditPart) {
+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateExitPointEditPart) {
 			types.add(UMLElementTypes.Transition_7000);
 		}
 		if(targetEditPart instanceof ConnectionPointReferenceEditPart) {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/PseudostateExitPointNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateExitPointNameEditPart.java
index 5a20d24aef6..23f4e14e175 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/PseudostateExitPointNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateExitPointNameEditPart.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.parts;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.parts;
 
 import java.util.Collections;
 import java.util.List;
@@ -40,14 +40,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
 import org.eclipse.jface.viewers.ICellEditorValidator;
 import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.diagram.statemachine.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLElementTypes;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLParserProvider;
 import org.eclipse.papyrus.extensionpoints.editors.Activator;
 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
@@ -57,6 +49,14 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.policies.UMLTextSelectionEditPolicy;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLParserProvider;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.accessibility.AccessibleEvent;
 import org.eclipse.swt.graphics.Color;
@@ -116,7 +116,7 @@ implements ITextAwareEditPart, IBorderItemEditPart {
 	 * @generated
 	 */
 	static {
-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateExitPointNameEditPart.VISUAL_ID), new Point(0, 0));
+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateExitPointNameEditPart.VISUAL_ID), new Point(0, 0));
 	}
 
 	/**
@@ -236,7 +236,7 @@ implements ITextAwareEditPart, IBorderItemEditPart {
 	/**
 	 * Returns the kind of associated editor for direct edition.
 	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition
+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
 	 * @generated
 	 */
 	public int getDirectEditionType() {
@@ -368,7 +368,7 @@ implements ITextAwareEditPart, IBorderItemEditPart {
 	 */
 	public IParser getParser() {
 		if(parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.Pseudostate_17000, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateExitPointNameEditPart.VISUAL_ID));
+			parser = UMLParserProvider.getParser(UMLElementTypes.Pseudostate_17000, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateExitPointNameEditPart.VISUAL_ID));
 		}
 		return parser;
 	}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/PseudostateExitPointStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateExitPointStereotypeEditPart.java
index d02fe61e2c6..d1c5338f0d4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/PseudostateExitPointStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateExitPointStereotypeEditPart.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.parts;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.parts;
 
 import java.util.Collections;
 import java.util.List;
@@ -39,18 +39,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
 import org.eclipse.jface.viewers.ICellEditorValidator;
 import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.diagram.common.editparts.AbstractLabelEditPart;
-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy;
-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure;
-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.diagram.statemachine.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLElementTypes;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLParserProvider;
 import org.eclipse.papyrus.extensionpoints.editors.Activator;
 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
@@ -60,6 +48,18 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
+import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractLabelEditPart;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.policies.UMLTextSelectionEditPolicy;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLParserProvider;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.accessibility.AccessibleEvent;
 import org.eclipse.swt.graphics.Color;
@@ -119,7 +119,7 @@ implements ITextAwareEditPart, IBorderItemEditPart {
 	 * @generated
 	 */
 	static {
-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateExitPointStereotypeEditPart.VISUAL_ID), new Point(0, 0));
+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateExitPointStereotypeEditPart.VISUAL_ID), new Point(0, 0));
 	}
 
 	/**
@@ -240,7 +240,7 @@ implements ITextAwareEditPart, IBorderItemEditPart {
 	/**
 	 * Returns the kind of associated editor for direct edition.
 	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition
+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
 	 * @generated
 	 */
 	public int getDirectEditionType() {
@@ -372,7 +372,7 @@ implements ITextAwareEditPart, IBorderItemEditPart {
 	 */
 	public IParser getParser() {
 		if(parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.Pseudostate_17000, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateExitPointStereotypeEditPart.VISUAL_ID));
+			parser = UMLParserProvider.getParser(UMLElementTypes.Pseudostate_17000, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateExitPointStereotypeEditPart.VISUAL_ID));
 		}
 		return parser;
 	}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/PseudostateForkEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateForkEditPart.java
index ff14f917c4e..575779c415e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/PseudostateForkEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateForkEditPart.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.parts;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.parts;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -32,20 +32,20 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.papyrus.diagram.common.editparts.UMLNodeEditPart;
-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.diagram.common.helper.PreferenceInitializerForElementHelper;
-import org.eclipse.papyrus.diagram.common.locator.ExternalLabelPositionLocator;
-import org.eclipse.papyrus.diagram.statemachine.custom.figures.PseudostateJoinForkFigure;
-import org.eclipse.papyrus.diagram.statemachine.custom.policies.CustomPseudostateForkJoinResizeEditPolicy;
-import org.eclipse.papyrus.diagram.statemachine.edit.policies.PseudostateForkItemSemanticEditPolicy;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLDiagramEditorPlugin;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLElementTypes;
 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;
 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.uml.diagram.common.editparts.UMLNodeEditPart;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;
+import org.eclipse.papyrus.uml.diagram.common.locator.ExternalLabelPositionLocator;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.figures.PseudostateJoinForkFigure;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.policies.CustomPseudostateForkJoinResizeEditPolicy;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.policies.PseudostateForkItemSemanticEditPolicy;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLDiagramEditorPlugin;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLElementTypes;
 import org.eclipse.swt.graphics.Color;
 
 /**
@@ -217,7 +217,7 @@ UMLNodeEditPart {
 		if(targetEditPart instanceof PseudostateJoinEditPart) {
 			types.add(UMLElementTypes.Transition_7000);
 		}
-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateForkEditPart) {
+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateForkEditPart) {
 			types.add(UMLElementTypes.Transition_7000);
 		}
 		if(targetEditPart instanceof PseudostateChoiceEditPart) {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/PseudostateForkNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateForkNameEditPart.java
index 069ac8b12f4..f3397aaef4b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/PseudostateForkNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateForkNameEditPart.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.parts;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.parts;
 
 import java.util.Collections;
 import java.util.List;
@@ -40,14 +40,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
 import org.eclipse.jface.viewers.ICellEditorValidator;
 import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.diagram.statemachine.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLElementTypes;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLParserProvider;
 import org.eclipse.papyrus.extensionpoints.editors.Activator;
 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
@@ -57,6 +49,14 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.policies.UMLTextSelectionEditPolicy;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLParserProvider;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.accessibility.AccessibleEvent;
 import org.eclipse.swt.graphics.Color;
@@ -116,7 +116,7 @@ implements ITextAwareEditPart, IBorderItemEditPart {
 	 * @generated
 	 */
 	static {
-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateForkNameEditPart.VISUAL_ID), new Point(0, 0));
+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateForkNameEditPart.VISUAL_ID), new Point(0, 0));
 	}
 
 	/**
@@ -236,7 +236,7 @@ implements ITextAwareEditPart, IBorderItemEditPart {
 	/**
 	 * Returns the kind of associated editor for direct edition.
 	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition
+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
 	 * @generated
 	 */
 	public int getDirectEditionType() {
@@ -368,7 +368,7 @@ implements ITextAwareEditPart, IBorderItemEditPart {
 	 */
 	public IParser getParser() {
 		if(parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.Pseudostate_10000, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateForkNameEditPart.VISUAL_ID));
+			parser = UMLParserProvider.getParser(UMLElementTypes.Pseudostate_10000, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateForkNameEditPart.VISUAL_ID));
 		}
 		return parser;
 	}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/PseudostateForkStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateForkStereotypeEditPart.java
index b8091ec6406..1fec54e7f49 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/PseudostateForkStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateForkStereotypeEditPart.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.parts;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.parts;
 
 import java.util.Collections;
 import java.util.List;
@@ -39,18 +39,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
 import org.eclipse.jface.viewers.ICellEditorValidator;
 import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.diagram.common.editparts.AbstractLabelEditPart;
-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy;
-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure;
-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.diagram.statemachine.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLElementTypes;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLParserProvider;
 import org.eclipse.papyrus.extensionpoints.editors.Activator;
 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
@@ -60,6 +48,18 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
+import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractLabelEditPart;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.policies.UMLTextSelectionEditPolicy;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLParserProvider;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.accessibility.AccessibleEvent;
 import org.eclipse.swt.graphics.Color;
@@ -119,7 +119,7 @@ implements ITextAwareEditPart, IBorderItemEditPart {
 	 * @generated
 	 */
 	static {
-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateForkStereotypeEditPart.VISUAL_ID), new Point(0, 0));
+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateForkStereotypeEditPart.VISUAL_ID), new Point(0, 0));
 	}
 
 	/**
@@ -240,7 +240,7 @@ implements ITextAwareEditPart, IBorderItemEditPart {
 	/**
 	 * Returns the kind of associated editor for direct edition.
 	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition
+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
 	 * @generated
 	 */
 	public int getDirectEditionType() {
@@ -372,7 +372,7 @@ implements ITextAwareEditPart, IBorderItemEditPart {
 	 */
 	public IParser getParser() {
 		if(parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.Pseudostate_10000, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateForkStereotypeEditPart.VISUAL_ID));
+			parser = UMLParserProvider.getParser(UMLElementTypes.Pseudostate_10000, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateForkStereotypeEditPart.VISUAL_ID));
 		}
 		return parser;
 	}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/PseudostateInitialEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateInitialEditPart.java
index f6a3c826f8c..2e554340a02 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/PseudostateInitialEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateInitialEditPart.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.parts;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.parts;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -32,19 +32,19 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.papyrus.diagram.common.editparts.UMLNodeEditPart;
-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.diagram.common.helper.PreferenceInitializerForElementHelper;
-import org.eclipse.papyrus.diagram.common.locator.ExternalLabelPositionLocator;
-import org.eclipse.papyrus.diagram.statemachine.custom.figures.PseudostateInitialFigure;
-import org.eclipse.papyrus.diagram.statemachine.edit.policies.PseudostateInitialItemSemanticEditPolicy;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLDiagramEditorPlugin;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLElementTypes;
 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;
 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.uml.diagram.common.editparts.UMLNodeEditPart;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;
+import org.eclipse.papyrus.uml.diagram.common.locator.ExternalLabelPositionLocator;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.figures.PseudostateInitialFigure;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.policies.PseudostateInitialItemSemanticEditPolicy;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLDiagramEditorPlugin;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLElementTypes;
 import org.eclipse.swt.graphics.Color;
 
 /**
@@ -209,7 +209,7 @@ UMLNodeEditPart {
 		if(targetEditPart instanceof StateEditPart) {
 			types.add(UMLElementTypes.Transition_7000);
 		}
-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateInitialEditPart) {
+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateInitialEditPart) {
 			types.add(UMLElementTypes.Transition_7000);
 		}
 		if(targetEditPart instanceof PseudostateJoinEditPart) {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/PseudostateInitialNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateInitialNameEditPart.java
index cd7e001687e..947adc31843 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/PseudostateInitialNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateInitialNameEditPart.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.parts;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.parts;
 
 import java.util.Collections;
 import java.util.List;
@@ -40,14 +40,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
 import org.eclipse.jface.viewers.ICellEditorValidator;
 import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.diagram.statemachine.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLElementTypes;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLParserProvider;
 import org.eclipse.papyrus.extensionpoints.editors.Activator;
 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
@@ -57,6 +49,14 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.policies.UMLTextSelectionEditPolicy;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLParserProvider;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.accessibility.AccessibleEvent;
 import org.eclipse.swt.graphics.Color;
@@ -116,7 +116,7 @@ implements ITextAwareEditPart, IBorderItemEditPart {
 	 * @generated
 	 */
 	static {
-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateInitialNameEditPart.VISUAL_ID), new Point(0, 0));
+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateInitialNameEditPart.VISUAL_ID), new Point(0, 0));
 	}
 
 	/**
@@ -236,7 +236,7 @@ implements ITextAwareEditPart, IBorderItemEditPart {
 	/**
 	 * Returns the kind of associated editor for direct edition.
 	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition
+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
 	 * @generated
 	 */
 	public int getDirectEditionType() {
@@ -368,7 +368,7 @@ implements ITextAwareEditPart, IBorderItemEditPart {
 	 */
 	public IParser getParser() {
 		if(parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.Pseudostate_8000, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateInitialNameEditPart.VISUAL_ID));
+			parser = UMLParserProvider.getParser(UMLElementTypes.Pseudostate_8000, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateInitialNameEditPart.VISUAL_ID));
 		}
 		return parser;
 	}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/PseudostateInitialStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateInitialStereotypeEditPart.java
index ca7dd710089..4e8b40b306b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/PseudostateInitialStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateInitialStereotypeEditPart.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.parts;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.parts;
 
 import java.util.Collections;
 import java.util.List;
@@ -39,18 +39,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
 import org.eclipse.jface.viewers.ICellEditorValidator;
 import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.diagram.common.editparts.AbstractLabelEditPart;
-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy;
-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure;
-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.diagram.statemachine.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLElementTypes;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLParserProvider;
 import org.eclipse.papyrus.extensionpoints.editors.Activator;
 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
@@ -60,6 +48,18 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
+import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractLabelEditPart;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.policies.UMLTextSelectionEditPolicy;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLParserProvider;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.accessibility.AccessibleEvent;
 import org.eclipse.swt.graphics.Color;
@@ -119,7 +119,7 @@ implements ITextAwareEditPart, IBorderItemEditPart {
 	 * @generated
 	 */
 	static {
-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateInitialStereotypeEditPart.VISUAL_ID), new Point(0, 0));
+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateInitialStereotypeEditPart.VISUAL_ID), new Point(0, 0));
 	}
 
 	/**
@@ -240,7 +240,7 @@ implements ITextAwareEditPart, IBorderItemEditPart {
 	/**
 	 * Returns the kind of associated editor for direct edition.
 	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition
+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
 	 * @generated
 	 */
 	public int getDirectEditionType() {
@@ -372,7 +372,7 @@ implements ITextAwareEditPart, IBorderItemEditPart {
 	 */
 	public IParser getParser() {
 		if(parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.Pseudostate_8000, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateInitialStereotypeEditPart.VISUAL_ID));
+			parser = UMLParserProvider.getParser(UMLElementTypes.Pseudostate_8000, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateInitialStereotypeEditPart.VISUAL_ID));
 		}
 		return parser;
 	}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/PseudostateJoinEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateJoinEditPart.java
index 39f08812feb..bed6c27a7f9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/PseudostateJoinEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateJoinEditPart.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.parts;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.parts;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -32,20 +32,20 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.papyrus.diagram.common.editparts.UMLNodeEditPart;
-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.diagram.common.helper.PreferenceInitializerForElementHelper;
-import org.eclipse.papyrus.diagram.common.locator.ExternalLabelPositionLocator;
-import org.eclipse.papyrus.diagram.statemachine.custom.figures.PseudostateJoinForkFigure;
-import org.eclipse.papyrus.diagram.statemachine.custom.policies.CustomPseudostateForkJoinResizeEditPolicy;
-import org.eclipse.papyrus.diagram.statemachine.edit.policies.PseudostateJoinItemSemanticEditPolicy;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLDiagramEditorPlugin;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLElementTypes;
 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;
 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.uml.diagram.common.editparts.UMLNodeEditPart;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;
+import org.eclipse.papyrus.uml.diagram.common.locator.ExternalLabelPositionLocator;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.figures.PseudostateJoinForkFigure;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.policies.CustomPseudostateForkJoinResizeEditPolicy;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.policies.PseudostateJoinItemSemanticEditPolicy;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLDiagramEditorPlugin;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLElementTypes;
 import org.eclipse.swt.graphics.Color;
 
 /**
@@ -214,7 +214,7 @@ UMLNodeEditPart {
 		if(targetEditPart instanceof PseudostateInitialEditPart) {
 			types.add(UMLElementTypes.Transition_7000);
 		}
-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateJoinEditPart) {
+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateJoinEditPart) {
 			types.add(UMLElementTypes.Transition_7000);
 		}
 		if(targetEditPart instanceof PseudostateForkEditPart) {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/PseudostateJoinNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateJoinNameEditPart.java
index 768efd54ecb..552f3381f94 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/PseudostateJoinNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateJoinNameEditPart.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.parts;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.parts;
 
 import java.util.Collections;
 import java.util.List;
@@ -40,14 +40,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
 import org.eclipse.jface.viewers.ICellEditorValidator;
 import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.diagram.statemachine.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLElementTypes;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLParserProvider;
 import org.eclipse.papyrus.extensionpoints.editors.Activator;
 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
@@ -57,6 +49,14 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.policies.UMLTextSelectionEditPolicy;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLParserProvider;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.accessibility.AccessibleEvent;
 import org.eclipse.swt.graphics.Color;
@@ -116,7 +116,7 @@ implements ITextAwareEditPart, IBorderItemEditPart {
 	 * @generated
 	 */
 	static {
-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateJoinNameEditPart.VISUAL_ID), new Point(0, 0));
+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateJoinNameEditPart.VISUAL_ID), new Point(0, 0));
 	}
 
 	/**
@@ -236,7 +236,7 @@ implements ITextAwareEditPart, IBorderItemEditPart {
 	/**
 	 * Returns the kind of associated editor for direct edition.
 	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition
+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
 	 * @generated
 	 */
 	public int getDirectEditionType() {
@@ -368,7 +368,7 @@ implements ITextAwareEditPart, IBorderItemEditPart {
 	 */
 	public IParser getParser() {
 		if(parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.Pseudostate_9000, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateJoinNameEditPart.VISUAL_ID));
+			parser = UMLParserProvider.getParser(UMLElementTypes.Pseudostate_9000, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateJoinNameEditPart.VISUAL_ID));
 		}
 		return parser;
 	}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/PseudostateJoinStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateJoinStereotypeEditPart.java
index c3e739a22d5..7c12561a56a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/PseudostateJoinStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateJoinStereotypeEditPart.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.parts;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.parts;
 
 import java.util.Collections;
 import java.util.List;
@@ -39,18 +39,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
 import org.eclipse.jface.viewers.ICellEditorValidator;
 import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.diagram.common.editparts.AbstractLabelEditPart;
-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy;
-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure;
-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.diagram.statemachine.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLElementTypes;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLParserProvider;
 import org.eclipse.papyrus.extensionpoints.editors.Activator;
 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
@@ -60,6 +48,18 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
+import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractLabelEditPart;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.policies.UMLTextSelectionEditPolicy;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLParserProvider;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.accessibility.AccessibleEvent;
 import org.eclipse.swt.graphics.Color;
@@ -119,7 +119,7 @@ implements ITextAwareEditPart, IBorderItemEditPart {
 	 * @generated
 	 */
 	static {
-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateJoinStereotypeEditPart.VISUAL_ID), new Point(0, 0));
+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateJoinStereotypeEditPart.VISUAL_ID), new Point(0, 0));
 	}
 
 	/**
@@ -240,7 +240,7 @@ implements ITextAwareEditPart, IBorderItemEditPart {
 	/**
 	 * Returns the kind of associated editor for direct edition.
 	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition
+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
 	 * @generated
 	 */
 	public int getDirectEditionType() {
@@ -372,7 +372,7 @@ implements ITextAwareEditPart, IBorderItemEditPart {
 	 */
 	public IParser getParser() {
 		if(parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.Pseudostate_9000, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateJoinStereotypeEditPart.VISUAL_ID));
+			parser = UMLParserProvider.getParser(UMLElementTypes.Pseudostate_9000, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateJoinStereotypeEditPart.VISUAL_ID));
 		}
 		return parser;
 	}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/PseudostateJunctionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateJunctionEditPart.java
index 87233edc33b..62be502229e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/PseudostateJunctionEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateJunctionEditPart.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.parts;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.parts;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -32,19 +32,19 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.papyrus.diagram.common.editparts.UMLNodeEditPart;
-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.diagram.common.helper.PreferenceInitializerForElementHelper;
-import org.eclipse.papyrus.diagram.common.locator.ExternalLabelPositionLocator;
-import org.eclipse.papyrus.diagram.statemachine.custom.figures.PseudostateJunctionFigure;
-import org.eclipse.papyrus.diagram.statemachine.edit.policies.PseudostateJunctionItemSemanticEditPolicy;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLDiagramEditorPlugin;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLElementTypes;
 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;
 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.uml.diagram.common.editparts.UMLNodeEditPart;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;
+import org.eclipse.papyrus.uml.diagram.common.locator.ExternalLabelPositionLocator;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.figures.PseudostateJunctionFigure;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.policies.PseudostateJunctionItemSemanticEditPolicy;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLDiagramEditorPlugin;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLElementTypes;
 import org.eclipse.swt.graphics.Color;
 
 /**
@@ -221,7 +221,7 @@ UMLNodeEditPart {
 		if(targetEditPart instanceof PseudostateChoiceEditPart) {
 			types.add(UMLElementTypes.Transition_7000);
 		}
-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateJunctionEditPart) {
+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateJunctionEditPart) {
 			types.add(UMLElementTypes.Transition_7000);
 		}
 		if(targetEditPart instanceof PseudostateShallowHistoryEditPart) {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/PseudostateJunctionNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateJunctionNameEditPart.java
index b0916d25317..2ae2f90cf47 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/PseudostateJunctionNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateJunctionNameEditPart.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.parts;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.parts;
 
 import java.util.Collections;
 import java.util.List;
@@ -40,14 +40,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
 import org.eclipse.jface.viewers.ICellEditorValidator;
 import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.diagram.statemachine.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLElementTypes;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLParserProvider;
 import org.eclipse.papyrus.extensionpoints.editors.Activator;
 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
@@ -57,6 +49,14 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.policies.UMLTextSelectionEditPolicy;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLParserProvider;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.accessibility.AccessibleEvent;
 import org.eclipse.swt.graphics.Color;
@@ -116,7 +116,7 @@ implements ITextAwareEditPart, IBorderItemEditPart {
 	 * @generated
 	 */
 	static {
-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateJunctionNameEditPart.VISUAL_ID), new Point(0, 0));
+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateJunctionNameEditPart.VISUAL_ID), new Point(0, 0));
 	}
 
 	/**
@@ -236,7 +236,7 @@ implements ITextAwareEditPart, IBorderItemEditPart {
 	/**
 	 * Returns the kind of associated editor for direct edition.
 	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition
+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
 	 * @generated
 	 */
 	public int getDirectEditionType() {
@@ -368,7 +368,7 @@ implements ITextAwareEditPart, IBorderItemEditPart {
 	 */
 	public IParser getParser() {
 		if(parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.Pseudostate_12000, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateJunctionNameEditPart.VISUAL_ID));
+			parser = UMLParserProvider.getParser(UMLElementTypes.Pseudostate_12000, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateJunctionNameEditPart.VISUAL_ID));
 		}
 		return parser;
 	}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/PseudostateJunctionStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateJunctionStereotypeEditPart.java
index 44bd6f6ed0e..ae167796be4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/PseudostateJunctionStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateJunctionStereotypeEditPart.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.parts;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.parts;
 
 import java.util.Collections;
 import java.util.List;
@@ -39,18 +39,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
 import org.eclipse.jface.viewers.ICellEditorValidator;
 import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.diagram.common.editparts.AbstractLabelEditPart;
-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy;
-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure;
-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.diagram.statemachine.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLElementTypes;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLParserProvider;
 import org.eclipse.papyrus.extensionpoints.editors.Activator;
 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
@@ -60,6 +48,18 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
+import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractLabelEditPart;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.policies.UMLTextSelectionEditPolicy;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLParserProvider;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.accessibility.AccessibleEvent;
 import org.eclipse.swt.graphics.Color;
@@ -119,7 +119,7 @@ implements ITextAwareEditPart, IBorderItemEditPart {
 	 * @generated
 	 */
 	static {
-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateJunctionStereotypeEditPart.VISUAL_ID), new Point(0, 0));
+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateJunctionStereotypeEditPart.VISUAL_ID), new Point(0, 0));
 	}
 
 	/**
@@ -240,7 +240,7 @@ implements ITextAwareEditPart, IBorderItemEditPart {
 	/**
 	 * Returns the kind of associated editor for direct edition.
 	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition
+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
 	 * @generated
 	 */
 	public int getDirectEditionType() {
@@ -372,7 +372,7 @@ implements ITextAwareEditPart, IBorderItemEditPart {
 	 */
 	public IParser getParser() {
 		if(parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.Pseudostate_12000, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateJunctionStereotypeEditPart.VISUAL_ID));
+			parser = UMLParserProvider.getParser(UMLElementTypes.Pseudostate_12000, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateJunctionStereotypeEditPart.VISUAL_ID));
 		}
 		return parser;
 	}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/PseudostateShallowHistoryEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateShallowHistoryEditPart.java
index 6ad05f37a18..16f40084cc1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/PseudostateShallowHistoryEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateShallowHistoryEditPart.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.parts;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.parts;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -32,19 +32,19 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.papyrus.diagram.common.editparts.UMLNodeEditPart;
-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.diagram.common.helper.PreferenceInitializerForElementHelper;
-import org.eclipse.papyrus.diagram.common.locator.ExternalLabelPositionLocator;
-import org.eclipse.papyrus.diagram.statemachine.custom.figures.PseudostateShallowHistoryFigure;
-import org.eclipse.papyrus.diagram.statemachine.edit.policies.PseudostateShallowHistoryItemSemanticEditPolicy;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLDiagramEditorPlugin;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLElementTypes;
 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;
 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.uml.diagram.common.editparts.UMLNodeEditPart;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;
+import org.eclipse.papyrus.uml.diagram.common.locator.ExternalLabelPositionLocator;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.figures.PseudostateShallowHistoryFigure;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.policies.PseudostateShallowHistoryItemSemanticEditPolicy;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLDiagramEditorPlugin;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLElementTypes;
 import org.eclipse.swt.graphics.Color;
 
 /**
@@ -224,7 +224,7 @@ UMLNodeEditPart {
 		if(targetEditPart instanceof PseudostateJunctionEditPart) {
 			types.add(UMLElementTypes.Transition_7000);
 		}
-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateShallowHistoryEditPart) {
+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateShallowHistoryEditPart) {
 			types.add(UMLElementTypes.Transition_7000);
 		}
 		if(targetEditPart instanceof PseudostateDeepHistoryEditPart) {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/PseudostateShallowHistoryNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateShallowHistoryNameEditPart.java
index 6be98083c18..f2829fd62e8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/PseudostateShallowHistoryNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateShallowHistoryNameEditPart.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.parts;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.parts;
 
 import java.util.Collections;
 import java.util.List;
@@ -40,14 +40,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
 import org.eclipse.jface.viewers.ICellEditorValidator;
 import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.diagram.statemachine.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLElementTypes;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLParserProvider;
 import org.eclipse.papyrus.extensionpoints.editors.Activator;
 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
@@ -57,6 +49,14 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.policies.UMLTextSelectionEditPolicy;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLParserProvider;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.accessibility.AccessibleEvent;
 import org.eclipse.swt.graphics.Color;
@@ -116,7 +116,7 @@ implements ITextAwareEditPart, IBorderItemEditPart {
 	 * @generated
 	 */
 	static {
-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateShallowHistoryNameEditPart.VISUAL_ID), new Point(0, 0));
+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateShallowHistoryNameEditPart.VISUAL_ID), new Point(0, 0));
 	}
 
 	/**
@@ -236,7 +236,7 @@ implements ITextAwareEditPart, IBorderItemEditPart {
 	/**
 	 * Returns the kind of associated editor for direct edition.
 	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition
+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
 	 * @generated
 	 */
 	public int getDirectEditionType() {
@@ -368,7 +368,7 @@ implements ITextAwareEditPart, IBorderItemEditPart {
 	 */
 	public IParser getParser() {
 		if(parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.Pseudostate_13000, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateShallowHistoryNameEditPart.VISUAL_ID));
+			parser = UMLParserProvider.getParser(UMLElementTypes.Pseudostate_13000, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateShallowHistoryNameEditPart.VISUAL_ID));
 		}
 		return parser;
 	}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/PseudostateShallowHistoryStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateShallowHistoryStereotypeEditPart.java
index 36fd55dd4f6..ae7d07b6700 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/PseudostateShallowHistoryStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateShallowHistoryStereotypeEditPart.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.parts;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.parts;
 
 import java.util.Collections;
 import java.util.List;
@@ -39,18 +39,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
 import org.eclipse.jface.viewers.ICellEditorValidator;
 import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.diagram.common.editparts.AbstractLabelEditPart;
-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy;
-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure;
-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.diagram.statemachine.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLElementTypes;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLParserProvider;
 import org.eclipse.papyrus.extensionpoints.editors.Activator;
 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
@@ -60,6 +48,18 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
+import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractLabelEditPart;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.policies.UMLTextSelectionEditPolicy;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLParserProvider;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.accessibility.AccessibleEvent;
 import org.eclipse.swt.graphics.Color;
@@ -119,7 +119,7 @@ implements ITextAwareEditPart, IBorderItemEditPart {
 	 * @generated
 	 */
 	static {
-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateShallowHistoryStereotypeEditPart.VISUAL_ID), new Point(0, 0));
+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateShallowHistoryStereotypeEditPart.VISUAL_ID), new Point(0, 0));
 	}
 
 	/**
@@ -240,7 +240,7 @@ implements ITextAwareEditPart, IBorderItemEditPart {
 	/**
 	 * Returns the kind of associated editor for direct edition.
 	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition
+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
 	 * @generated
 	 */
 	public int getDirectEditionType() {
@@ -372,7 +372,7 @@ implements ITextAwareEditPart, IBorderItemEditPart {
 	 */
 	public IParser getParser() {
 		if(parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.Pseudostate_13000, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateShallowHistoryStereotypeEditPart.VISUAL_ID));
+			parser = UMLParserProvider.getParser(UMLElementTypes.Pseudostate_13000, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateShallowHistoryStereotypeEditPart.VISUAL_ID));
 		}
 		return parser;
 	}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/PseudostateTerminateEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateTerminateEditPart.java
index 49affeaff7c..c8f1711c39c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/PseudostateTerminateEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateTerminateEditPart.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.parts;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.parts;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -32,19 +32,19 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.papyrus.diagram.common.editparts.UMLNodeEditPart;
-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.diagram.common.helper.PreferenceInitializerForElementHelper;
-import org.eclipse.papyrus.diagram.common.locator.ExternalLabelPositionLocator;
-import org.eclipse.papyrus.diagram.statemachine.custom.figures.PseudostateTerminateFigure;
-import org.eclipse.papyrus.diagram.statemachine.edit.policies.PseudostateTerminateItemSemanticEditPolicy;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLDiagramEditorPlugin;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLElementTypes;
 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;
 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.uml.diagram.common.editparts.UMLNodeEditPart;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;
+import org.eclipse.papyrus.uml.diagram.common.locator.ExternalLabelPositionLocator;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.figures.PseudostateTerminateFigure;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.policies.PseudostateTerminateItemSemanticEditPolicy;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLDiagramEditorPlugin;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLElementTypes;
 import org.eclipse.swt.graphics.Color;
 
 /**
@@ -230,7 +230,7 @@ UMLNodeEditPart {
 		if(targetEditPart instanceof PseudostateDeepHistoryEditPart) {
 			types.add(UMLElementTypes.Transition_7000);
 		}
-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateTerminateEditPart) {
+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateTerminateEditPart) {
 			types.add(UMLElementTypes.Transition_7000);
 		}
 		if(targetEditPart instanceof PseudostateEntryPointEditPart) {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/PseudostateTerminateNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateTerminateNameEditPart.java
index f015b955021..c27073cbf93 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/PseudostateTerminateNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateTerminateNameEditPart.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.parts;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.parts;
 
 import java.util.Collections;
 import java.util.List;
@@ -40,14 +40,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
 import org.eclipse.jface.viewers.ICellEditorValidator;
 import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.diagram.statemachine.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLElementTypes;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLParserProvider;
 import org.eclipse.papyrus.extensionpoints.editors.Activator;
 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
@@ -57,6 +49,14 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.policies.UMLTextSelectionEditPolicy;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLParserProvider;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.accessibility.AccessibleEvent;
 import org.eclipse.swt.graphics.Color;
@@ -116,7 +116,7 @@ implements ITextAwareEditPart, IBorderItemEditPart {
 	 * @generated
 	 */
 	static {
-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateTerminateNameEditPart.VISUAL_ID), new Point(0, 0));
+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateTerminateNameEditPart.VISUAL_ID), new Point(0, 0));
 	}
 
 	/**
@@ -236,7 +236,7 @@ implements ITextAwareEditPart, IBorderItemEditPart {
 	/**
 	 * Returns the kind of associated editor for direct edition.
 	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition
+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
 	 * @generated
 	 */
 	public int getDirectEditionType() {
@@ -368,7 +368,7 @@ implements ITextAwareEditPart, IBorderItemEditPart {
 	 */
 	public IParser getParser() {
 		if(parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.Pseudostate_15000, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateTerminateNameEditPart.VISUAL_ID));
+			parser = UMLParserProvider.getParser(UMLElementTypes.Pseudostate_15000, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateTerminateNameEditPart.VISUAL_ID));
 		}
 		return parser;
 	}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/PseudostateTerminateStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateTerminateStereotypeEditPart.java
index ad955517e2b..2c0c4761d7d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/PseudostateTerminateStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateTerminateStereotypeEditPart.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.parts;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.parts;
 
 import java.util.Collections;
 import java.util.List;
@@ -39,18 +39,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
 import org.eclipse.jface.viewers.ICellEditorValidator;
 import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.diagram.common.editparts.AbstractLabelEditPart;
-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy;
-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure;
-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.diagram.statemachine.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLElementTypes;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLParserProvider;
 import org.eclipse.papyrus.extensionpoints.editors.Activator;
 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
@@ -60,6 +48,18 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
+import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractLabelEditPart;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.policies.UMLTextSelectionEditPolicy;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLParserProvider;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.accessibility.AccessibleEvent;
 import org.eclipse.swt.graphics.Color;
@@ -119,7 +119,7 @@ implements ITextAwareEditPart, IBorderItemEditPart {
 	 * @generated
 	 */
 	static {
-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateTerminateStereotypeEditPart.VISUAL_ID), new Point(0, 0));
+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateTerminateStereotypeEditPart.VISUAL_ID), new Point(0, 0));
 	}
 
 	/**
@@ -240,7 +240,7 @@ implements ITextAwareEditPart, IBorderItemEditPart {
 	/**
 	 * Returns the kind of associated editor for direct edition.
 	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition
+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
 	 * @generated
 	 */
 	public int getDirectEditionType() {
@@ -372,7 +372,7 @@ implements ITextAwareEditPart, IBorderItemEditPart {
 	 */
 	public IParser getParser() {
 		if(parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.Pseudostate_15000, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateTerminateStereotypeEditPart.VISUAL_ID));
+			parser = UMLParserProvider.getParser(UMLElementTypes.Pseudostate_15000, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateTerminateStereotypeEditPart.VISUAL_ID));
 		}
 		return parser;
 	}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/RegionCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/RegionCompartmentEditPart.java
index c1ca0b7b5d9..17075b9a085 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/RegionCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/RegionCompartmentEditPart.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.parts;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.parts;
 
 import org.eclipse.draw2d.IFigure;
 import org.eclipse.draw2d.geometry.Dimension;
@@ -15,13 +15,13 @@ import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
 import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.diagram.common.editpolicies.DuplicatePasteEditPolicy;
-import org.eclipse.papyrus.diagram.statemachine.custom.policies.CustomRegionCompartmentCreationEditPolicy;
-import org.eclipse.papyrus.diagram.statemachine.custom.policies.CustomRegionCompartmentXYLayoutEditPolicy;
-import org.eclipse.papyrus.diagram.statemachine.custom.policies.CustomStateMachineDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.diagram.statemachine.custom.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.diagram.statemachine.edit.policies.RegionCompartmentItemSemanticEditPolicy;
-import org.eclipse.papyrus.diagram.statemachine.part.Messages;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.policies.CustomRegionCompartmentCreationEditPolicy;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.policies.CustomRegionCompartmentXYLayoutEditPolicy;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.policies.CustomStateMachineDiagramDragDropEditPolicy;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.policies.RemoveOrphanViewPolicy;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.policies.RegionCompartmentItemSemanticEditPolicy;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.Messages;
 
 /**
  * @generated
@@ -55,7 +55,7 @@ extends ShapeCompartmentEditPart
 		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());
 
 		//in Papyrus diagrams are not strongly synchronised
-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.diagram.statemachine.edit.policies.RegionCompartmentCanonicalEditPolicy());
+		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.statemachine.edit.policies.RegionCompartmentCanonicalEditPolicy());
 
 		installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
 		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new CustomRegionCompartmentCreationEditPolicy());
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/RegionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/RegionEditPart.java
index 065aac397de..948eb9f82be 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/RegionEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/RegionEditPart.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.parts;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.parts;
 
 import org.eclipse.draw2d.IFigure;
 import org.eclipse.draw2d.Shape;
@@ -22,16 +22,16 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.papyrus.diagram.common.editparts.NamedElementEditPart;
-import org.eclipse.papyrus.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;
-import org.eclipse.papyrus.diagram.common.helper.PreferenceInitializerForElementHelper;
-import org.eclipse.papyrus.diagram.statemachine.custom.figures.RegionFigure;
-import org.eclipse.papyrus.diagram.statemachine.custom.policies.CustomRegionComponentEditPolicy;
-import org.eclipse.papyrus.diagram.statemachine.custom.policies.CustomRegionItemSemanticEditPolicy;
-import org.eclipse.papyrus.diagram.statemachine.edit.policies.RegionItemSemanticEditPolicy;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLDiagramEditorPlugin;
 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;
 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.figures.RegionFigure;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.policies.CustomRegionComponentEditPolicy;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.policies.CustomRegionItemSemanticEditPolicy;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.policies.RegionItemSemanticEditPolicy;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLDiagramEditorPlugin;
 import org.eclipse.swt.graphics.Color;
 
 /**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/StateCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/StateCompartmentEditPart.java
index 153e6a3dca6..0c42370212e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/StateCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/StateCompartmentEditPart.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.parts;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.parts;
 
 import org.eclipse.draw2d.IFigure;
 import org.eclipse.draw2d.geometry.Dimension;
@@ -15,13 +15,13 @@ import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
 import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.diagram.common.editpolicies.DuplicatePasteEditPolicy;
-import org.eclipse.papyrus.diagram.statemachine.custom.policies.CustomStateCompartmentCreationEditPolicy;
-import org.eclipse.papyrus.diagram.statemachine.custom.policies.CustomStateCompartmentXYLayoutEditPolicy;
-import org.eclipse.papyrus.diagram.statemachine.custom.policies.CustomStateMachineDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.diagram.statemachine.custom.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.diagram.statemachine.edit.policies.StateCompartmentItemSemanticEditPolicy;
-import org.eclipse.papyrus.diagram.statemachine.part.Messages;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.policies.CustomStateCompartmentCreationEditPolicy;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.policies.CustomStateCompartmentXYLayoutEditPolicy;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.policies.CustomStateMachineDiagramDragDropEditPolicy;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.policies.RemoveOrphanViewPolicy;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.policies.StateCompartmentItemSemanticEditPolicy;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.Messages;
 
 /**
  * @generated
@@ -55,7 +55,7 @@ extends ShapeCompartmentEditPart
 		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());
 
 		//in Papyrus diagrams are not strongly synchronised
-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.diagram.statemachine.edit.policies.StateCompartmentCanonicalEditPolicy());
+		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.statemachine.edit.policies.StateCompartmentCanonicalEditPolicy());
 
 		installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
 		installEditPolicy(EditPolicy.LAYOUT_ROLE, new CustomStateCompartmentXYLayoutEditPolicy());
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/StateEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/StateEditPart.java
index 500e625f9ed..1719aa4ff30 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/StateEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/StateEditPart.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.parts;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.parts;
 
 import java.util.ArrayList;
 import java.util.LinkedList;
@@ -32,27 +32,27 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.papyrus.diagram.common.editparts.NamedElementEditPart;
-import org.eclipse.papyrus.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy;
-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.diagram.common.editpolicies.BorderItemResizableEditPolicy;
-import org.eclipse.papyrus.diagram.common.editpolicies.NavigationEditPolicy;
-import org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;
-import org.eclipse.papyrus.diagram.common.helper.PreferenceInitializerForElementHelper;
-import org.eclipse.papyrus.diagram.statemachine.custom.figures.StateFigure;
-import org.eclipse.papyrus.diagram.statemachine.custom.locators.CustomEntryExitPointPositionLocator;
-import org.eclipse.papyrus.diagram.statemachine.custom.policies.CustomStateCreationEditPolicy;
-import org.eclipse.papyrus.diagram.statemachine.custom.policies.CustomStateItemSemanticEditPolicy;
-import org.eclipse.papyrus.diagram.statemachine.custom.policies.CustomStateLayoutEditPolicy;
-import org.eclipse.papyrus.diagram.statemachine.custom.policies.CustomStateMachineDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.diagram.statemachine.edit.policies.StateItemSemanticEditPolicy;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLDiagramEditorPlugin;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLElementTypes;
 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;
 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.NavigationEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.figures.StateFigure;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.locators.CustomEntryExitPointPositionLocator;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.policies.CustomStateCreationEditPolicy;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.policies.CustomStateItemSemanticEditPolicy;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.policies.CustomStateLayoutEditPolicy;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.policies.CustomStateMachineDiagramDragDropEditPolicy;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.policies.StateItemSemanticEditPolicy;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLDiagramEditorPlugin;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLElementTypes;
 import org.eclipse.swt.graphics.Color;
 
 /**
@@ -144,7 +144,7 @@ NamedElementEditPart {
 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
 
 		//in Papyrus diagrams are not strongly synchronised
-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.diagram.statemachine.edit.policies.StateCanonicalEditPolicy());
+		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.statemachine.edit.policies.StateCanonicalEditPolicy());
 
 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());
@@ -271,7 +271,7 @@ NamedElementEditPart {
 		if(targetEditPart instanceof FinalStateEditPart) {
 			types.add(UMLElementTypes.Transition_7000);
 		}
-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.statemachine.edit.parts.StateEditPart) {
+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.StateEditPart) {
 			types.add(UMLElementTypes.Transition_7000);
 		}
 		if(targetEditPart instanceof PseudostateInitialEditPart) {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/StateMachineCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/StateMachineCompartmentEditPart.java
index 101569eb42c..cbaedc2acdd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/StateMachineCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/StateMachineCompartmentEditPart.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.parts;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.parts;
 
 import org.eclipse.draw2d.IFigure;
 import org.eclipse.draw2d.geometry.Dimension;
@@ -15,12 +15,12 @@ import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
 import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.diagram.common.editpolicies.DuplicatePasteEditPolicy;
-import org.eclipse.papyrus.diagram.statemachine.custom.policies.CustomStateMachineCompartmentXYLayoutEditPolicy;
-import org.eclipse.papyrus.diagram.statemachine.custom.policies.CustomStateMachineDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.diagram.statemachine.custom.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.diagram.statemachine.edit.policies.StateMachineCompartmentItemSemanticEditPolicy;
-import org.eclipse.papyrus.diagram.statemachine.part.Messages;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.policies.CustomStateMachineCompartmentXYLayoutEditPolicy;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.policies.CustomStateMachineDiagramDragDropEditPolicy;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.policies.RemoveOrphanViewPolicy;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.policies.StateMachineCompartmentItemSemanticEditPolicy;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.Messages;
 
 /**
  * @generated
@@ -54,7 +54,7 @@ extends ShapeCompartmentEditPart
 		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());
 
 		//in Papyrus diagrams are not strongly synchronised
-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.diagram.statemachine.edit.policies.StateMachineCompartmentCanonicalEditPolicy());
+		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.statemachine.edit.policies.StateMachineCompartmentCanonicalEditPolicy());
 
 		installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
 		installEditPolicy(EditPolicy.LAYOUT_ROLE, new CustomStateMachineCompartmentXYLayoutEditPolicy());
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/StateMachineEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/StateMachineEditPart.java
index 3094330e101..6ce2f45d5f8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/StateMachineEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/StateMachineEditPart.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.parts;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.parts;
 
 import java.util.ArrayList;
 import java.util.LinkedList;
@@ -32,24 +32,24 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.papyrus.diagram.common.editparts.NamedElementEditPart;
-import org.eclipse.papyrus.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy;
-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.diagram.common.editpolicies.BorderItemResizableEditPolicy;
-import org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;
-import org.eclipse.papyrus.diagram.common.helper.PreferenceInitializerForElementHelper;
-import org.eclipse.papyrus.diagram.statemachine.custom.figures.StateMachineFigure;
-import org.eclipse.papyrus.diagram.statemachine.custom.locators.CustomEntryExitPointPositionLocator;
-import org.eclipse.papyrus.diagram.statemachine.custom.policies.CustomStateMachineDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.diagram.statemachine.custom.policies.CustomStateMachineLayoutEditPolicy;
-import org.eclipse.papyrus.diagram.statemachine.edit.policies.StateMachineItemSemanticEditPolicy;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLDiagramEditorPlugin;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLElementTypes;
 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;
 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.figures.StateMachineFigure;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.locators.CustomEntryExitPointPositionLocator;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.policies.CustomStateMachineDiagramDragDropEditPolicy;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.policies.CustomStateMachineLayoutEditPolicy;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.policies.StateMachineItemSemanticEditPolicy;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLDiagramEditorPlugin;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLElementTypes;
 import org.eclipse.swt.graphics.Color;
 
 /**
@@ -134,7 +134,7 @@ NamedElementEditPart {
 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
 
 		//in Papyrus diagrams are not strongly synchronised
-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.diagram.statemachine.edit.policies.StateMachineCanonicalEditPolicy());
+		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.statemachine.edit.policies.StateMachineCanonicalEditPolicy());
 
 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());
@@ -254,7 +254,7 @@ NamedElementEditPart {
 	 */
 	public List<IElementType> getMARelTypesOnSourceAndTarget(IGraphicalEditPart targetEditPart) {
 		LinkedList<IElementType> types = new LinkedList<IElementType>();
-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.statemachine.edit.parts.StateMachineEditPart) {
+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.StateMachineEditPart) {
 			types.add(UMLElementTypes.Generalization_19000);
 		}
 		return types;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/StateMachineNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/StateMachineNameEditPart.java
index e74507aba13..e9c339e9dd5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/StateMachineNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/StateMachineNameEditPart.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.parts;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.parts;
 
 import java.util.Collections;
 import java.util.List;
@@ -37,14 +37,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
 import org.eclipse.jface.viewers.ICellEditorValidator;
 import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.diagram.statemachine.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLElementTypes;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLParserProvider;
 import org.eclipse.papyrus.extensionpoints.editors.Activator;
 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
@@ -54,6 +46,14 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.policies.UMLTextSelectionEditPolicy;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLParserProvider;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.accessibility.AccessibleEvent;
 import org.eclipse.swt.graphics.Color;
@@ -231,7 +231,7 @@ public class StateMachineNameEditPart extends CompartmentEditPart implements ITe
 	 * Returns the kind of associated editor for direct edition.
 	 * 
 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see
-	 *         org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition
+	 *         org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
 	 * @generated
 	 */
 	public int getDirectEditionType() {
@@ -363,7 +363,7 @@ public class StateMachineNameEditPart extends CompartmentEditPart implements ITe
 	 */
 	public IParser getParser() {
 		if(parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.StateMachine_2000, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.statemachine.edit.parts.StateMachineNameEditPart.VISUAL_ID));
+			parser = UMLParserProvider.getParser(UMLElementTypes.StateMachine_2000, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.StateMachineNameEditPart.VISUAL_ID));
 		}
 		return parser;
 	}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/StateNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/StateNameEditPart.java
index c9e154807e0..8747387ffed 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/StateNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/StateNameEditPart.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.parts;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.parts;
 
 import java.util.Collections;
 import java.util.List;
@@ -37,15 +37,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
 import org.eclipse.jface.viewers.ICellEditorValidator;
 import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.diagram.common.editpolicies.NavigationEditPolicy;
-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.diagram.statemachine.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLElementTypes;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLParserProvider;
 import org.eclipse.papyrus.extensionpoints.editors.Activator;
 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
@@ -55,6 +46,15 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.NavigationEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.policies.UMLTextSelectionEditPolicy;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLParserProvider;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.accessibility.AccessibleEvent;
 import org.eclipse.swt.graphics.Color;
@@ -244,7 +244,7 @@ public class StateNameEditPart extends CompartmentEditPart implements ITextAware
 	 * Returns the kind of associated editor for direct edition.
 	 * 
 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see
-	 *         org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition
+	 *         org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
 	 * @generated
 	 */
 	public int getDirectEditionType() {
@@ -376,7 +376,7 @@ public class StateNameEditPart extends CompartmentEditPart implements ITextAware
 	 */
 	public IParser getParser() {
 		if(parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.State_6000, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.statemachine.edit.parts.StateNameEditPart.VISUAL_ID));
+			parser = UMLParserProvider.getParser(UMLElementTypes.State_6000, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.StateNameEditPart.VISUAL_ID));
 		}
 		return parser;
 	}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/TransitionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/TransitionEditPart.java
index d0e9825dcc8..b28b58ec704 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/TransitionEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/TransitionEditPart.java
@@ -1,16 +1,16 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.parts;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.parts;
 
 import org.eclipse.draw2d.Connection;
 import org.eclipse.gef.EditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.diagram.common.editparts.UMLConnectionNodeEditPart;
-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;
-import org.eclipse.papyrus.diagram.common.editpolicies.NavigationEditPolicy;
-import org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.diagram.statemachine.custom.figures.TransitionFigure;
-import org.eclipse.papyrus.diagram.statemachine.edit.policies.TransitionItemSemanticEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.NavigationEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.figures.TransitionFigure;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.policies.TransitionItemSemanticEditPolicy;
 
 /**
  * @generated
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/TransitionGuardEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/TransitionGuardEditPart.java
index 270deb606f0..6cd07a2082f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/TransitionGuardEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/TransitionGuardEditPart.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.parts;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.parts;
 
 import java.util.Collections;
 import java.util.List;
@@ -38,14 +38,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
 import org.eclipse.jface.viewers.ICellEditorValidator;
 import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.diagram.statemachine.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLElementTypes;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLParserProvider;
 import org.eclipse.papyrus.extensionpoints.editors.Activator;
 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
@@ -55,6 +47,14 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.policies.UMLTextSelectionEditPolicy;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLParserProvider;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.accessibility.AccessibleEvent;
 import org.eclipse.swt.graphics.Color;
@@ -110,7 +110,7 @@ public class TransitionGuardEditPart extends LabelEditPart implements ITextAware
 	 * @generated
 	 */
 	static {
-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.statemachine.edit.parts.TransitionGuardEditPart.VISUAL_ID), new Point(0, 0));
+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.TransitionGuardEditPart.VISUAL_ID), new Point(0, 0));
 	}
 
 	/**
@@ -220,7 +220,7 @@ public class TransitionGuardEditPart extends LabelEditPart implements ITextAware
 	 * Returns the kind of associated editor for direct edition.
 	 * 
 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see
-	 *         org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition
+	 *         org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
 	 * @generated
 	 */
 	public int getDirectEditionType() {
@@ -359,7 +359,7 @@ public class TransitionGuardEditPart extends LabelEditPart implements ITextAware
 	 */
 	public IParser getParser() {
 		if(parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.Transition_7000, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.statemachine.edit.parts.TransitionGuardEditPart.VISUAL_ID));
+			parser = UMLParserProvider.getParser(UMLElementTypes.Transition_7000, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.TransitionGuardEditPart.VISUAL_ID));
 		}
 		return parser;
 	}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/TransitionNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/TransitionNameEditPart.java
index 59168227b72..a5a1fc4b8ba 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/TransitionNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/TransitionNameEditPart.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.parts;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.parts;
 
 import java.util.Collections;
 import java.util.List;
@@ -38,14 +38,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
 import org.eclipse.jface.viewers.ICellEditorValidator;
 import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.diagram.statemachine.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLElementTypes;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLParserProvider;
 import org.eclipse.papyrus.extensionpoints.editors.Activator;
 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
@@ -55,6 +47,14 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.policies.UMLTextSelectionEditPolicy;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLParserProvider;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.accessibility.AccessibleEvent;
 import org.eclipse.swt.graphics.Color;
@@ -110,7 +110,7 @@ public class TransitionNameEditPart extends LabelEditPart implements ITextAwareE
 	 * @generated
 	 */
 	static {
-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.statemachine.edit.parts.TransitionNameEditPart.VISUAL_ID), new Point(0, 0));
+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.TransitionNameEditPart.VISUAL_ID), new Point(0, 0));
 	}
 
 	/**
@@ -220,7 +220,7 @@ public class TransitionNameEditPart extends LabelEditPart implements ITextAwareE
 	 * Returns the kind of associated editor for direct edition.
 	 * 
 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see
-	 *         org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition
+	 *         org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
 	 * @generated
 	 */
 	public int getDirectEditionType() {
@@ -359,7 +359,7 @@ public class TransitionNameEditPart extends LabelEditPart implements ITextAwareE
 	 */
 	public IParser getParser() {
 		if(parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.Transition_7000, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.statemachine.edit.parts.TransitionNameEditPart.VISUAL_ID));
+			parser = UMLParserProvider.getParser(UMLElementTypes.Transition_7000, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.TransitionNameEditPart.VISUAL_ID));
 		}
 		return parser;
 	}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/TransitionStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/TransitionStereotypeEditPart.java
index 568363c6a25..2d8a13fd6a6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/TransitionStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/TransitionStereotypeEditPart.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.parts;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.parts;
 
 import java.util.Collections;
 import java.util.List;
@@ -38,14 +38,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
 import org.eclipse.jface.viewers.ICellEditorValidator;
 import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.diagram.statemachine.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLElementTypes;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLParserProvider;
 import org.eclipse.papyrus.extensionpoints.editors.Activator;
 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
@@ -55,6 +47,14 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.policies.UMLTextSelectionEditPolicy;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLParserProvider;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.accessibility.AccessibleEvent;
 import org.eclipse.swt.graphics.Color;
@@ -110,7 +110,7 @@ public class TransitionStereotypeEditPart extends LabelEditPart implements IText
 	 * @generated
 	 */
 	static {
-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.statemachine.edit.parts.TransitionStereotypeEditPart.VISUAL_ID), new Point(0, 60));
+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.TransitionStereotypeEditPart.VISUAL_ID), new Point(0, 60));
 	}
 
 	/**
@@ -211,7 +211,7 @@ public class TransitionStereotypeEditPart extends LabelEditPart implements IText
 	/**
 	 * Returns the kind of associated editor for direct edition.
 	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition
+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
 	 * @generated
 	 */
 	public int getDirectEditionType() {
@@ -342,7 +342,7 @@ public class TransitionStereotypeEditPart extends LabelEditPart implements IText
 	 */
 	public IParser getParser() {
 		if(parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.Transition_7000, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.statemachine.edit.parts.TransitionStereotypeEditPart.VISUAL_ID));
+			parser = UMLParserProvider.getParser(UMLElementTypes.Transition_7000, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.TransitionStereotypeEditPart.VISUAL_ID));
 		}
 		return parser;
 	}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/UMLEditPartFactory.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/UMLEditPartFactory.java
index fa1965ab65d..a384c031428 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/parts/UMLEditPartFactory.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/UMLEditPartFactory.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.parts;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.parts;
 
 import org.eclipse.draw2d.FigureUtilities;
 import org.eclipse.draw2d.Label;
@@ -11,8 +11,8 @@ import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.papyrus.diagram.common.figure.node.IMultilineEditableFigure;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.IMultilineEditableFigure;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLVisualIDRegistry;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Text;
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/policies/ConnectionPointReferenceItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/policies/ConnectionPointReferenceItemSemanticEditPolicy.java
index 19a2d30b4bb..4100453aa99 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/policies/ConnectionPointReferenceItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/policies/ConnectionPointReferenceItemSemanticEditPolicy.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.policies;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.policies;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -13,10 +13,10 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;
-import org.eclipse.papyrus.diagram.statemachine.edit.commands.TransitionCreateCommand;
-import org.eclipse.papyrus.diagram.statemachine.edit.commands.TransitionReorientCommand;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.TransitionEditPart;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.commands.TransitionCreateCommand;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.commands.TransitionReorientCommand;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.TransitionEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLElementTypes;
 
 /**
  * @generated
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/policies/FinalStateItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/policies/FinalStateItemSemanticEditPolicy.java
index bb5f1f28460..10cdd3a929a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/policies/FinalStateItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/policies/FinalStateItemSemanticEditPolicy.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.policies;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.policies;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -13,10 +13,10 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;
-import org.eclipse.papyrus.diagram.statemachine.edit.commands.TransitionCreateCommand;
-import org.eclipse.papyrus.diagram.statemachine.edit.commands.TransitionReorientCommand;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.TransitionEditPart;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.commands.TransitionCreateCommand;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.commands.TransitionReorientCommand;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.TransitionEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLElementTypes;
 
 /**
  * @generated
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/policies/GeneralizationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/policies/GeneralizationItemSemanticEditPolicy.java
index 623ce7f290e..e6c4d2e0563 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/policies/GeneralizationItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/policies/GeneralizationItemSemanticEditPolicy.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.policies;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.policies;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -9,7 +9,7 @@ import org.eclipse.gef.commands.Command;
 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
 import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLElementTypes;
 
 /**
  * @generated
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/policies/PackageCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/policies/PackageCanonicalEditPolicy.java
index 38bc311e605..9ed2f93e58d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/policies/PackageCanonicalEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/policies/PackageCanonicalEditPolicy.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.policies;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.policies;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -28,28 +28,28 @@ import org.eclipse.gmf.runtime.notation.Diagram;
 import org.eclipse.gmf.runtime.notation.Edge;
 import org.eclipse.gmf.runtime.notation.Node;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.ConnectionPointReferenceEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.FinalStateEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.GeneralizationEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PackageEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateChoiceEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateDeepHistoryEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateEntryPointEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateExitPointEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateForkEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateInitialEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateJoinEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateJunctionEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateShallowHistoryEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateTerminateEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.RegionEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.StateEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.StateMachineEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.TransitionEditPart;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLDiagramUpdater;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLLinkDescriptor;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLNodeDescriptor;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.ConnectionPointReferenceEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.FinalStateEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.GeneralizationEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PackageEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateChoiceEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateDeepHistoryEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateEntryPointEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateExitPointEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateForkEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateInitialEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateJoinEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateJunctionEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateShallowHistoryEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateTerminateEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.RegionEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.StateEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.StateMachineEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.TransitionEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLDiagramUpdater;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLLinkDescriptor;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLNodeDescriptor;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLVisualIDRegistry;
 import org.eclipse.uml2.uml.UMLPackage;
 
 /**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/policies/PackageItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/policies/PackageItemSemanticEditPolicy.java
index 073e2b6aa47..9322964b244 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/policies/PackageItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/policies/PackageItemSemanticEditPolicy.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.policies;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.policies;
 
 import org.eclipse.emf.transaction.TransactionalEditingDomain;
 import org.eclipse.gef.commands.Command;
@@ -6,9 +6,9 @@ import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DuplicateElementsRequest;
 import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.papyrus.diagram.common.commands.DuplicateNamedElementCommand;
-import org.eclipse.papyrus.diagram.statemachine.edit.commands.StateMachineCreateCommand;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.common.commands.DuplicateNamedElementCommand;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.commands.StateMachineCreateCommand;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLElementTypes;
 
 /**
  * @generated
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/policies/PseudostateChoiceItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/policies/PseudostateChoiceItemSemanticEditPolicy.java
index 964bcb8d86c..ae2931e5b02 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/policies/PseudostateChoiceItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/policies/PseudostateChoiceItemSemanticEditPolicy.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.policies;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.policies;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -13,10 +13,10 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;
-import org.eclipse.papyrus.diagram.statemachine.edit.commands.TransitionCreateCommand;
-import org.eclipse.papyrus.diagram.statemachine.edit.commands.TransitionReorientCommand;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.TransitionEditPart;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.commands.TransitionCreateCommand;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.commands.TransitionReorientCommand;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.TransitionEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLElementTypes;
 
 /**
  * @generated
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/policies/PseudostateDeepHistoryItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/policies/PseudostateDeepHistoryItemSemanticEditPolicy.java
index 1f67ca6c19f..2a1e50d2ebb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/policies/PseudostateDeepHistoryItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/policies/PseudostateDeepHistoryItemSemanticEditPolicy.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.policies;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.policies;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -13,10 +13,10 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;
-import org.eclipse.papyrus.diagram.statemachine.edit.commands.TransitionCreateCommand;
-import org.eclipse.papyrus.diagram.statemachine.edit.commands.TransitionReorientCommand;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.TransitionEditPart;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.commands.TransitionCreateCommand;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.commands.TransitionReorientCommand;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.TransitionEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLElementTypes;
 
 /**
  * @generated
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/policies/PseudostateEntryPointItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/policies/PseudostateEntryPointItemSemanticEditPolicy.java
index d8cf0d40b66..e171aa9d8a4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/policies/PseudostateEntryPointItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/policies/PseudostateEntryPointItemSemanticEditPolicy.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.policies;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.policies;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -13,10 +13,10 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;
-import org.eclipse.papyrus.diagram.statemachine.edit.commands.TransitionCreateCommand;
-import org.eclipse.papyrus.diagram.statemachine.edit.commands.TransitionReorientCommand;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.TransitionEditPart;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.commands.TransitionCreateCommand;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.commands.TransitionReorientCommand;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.TransitionEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLElementTypes;
 
 /**
  * @generated
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/policies/PseudostateExitPointItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/policies/PseudostateExitPointItemSemanticEditPolicy.java
index 67df7fa0180..f049c9a0036 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/policies/PseudostateExitPointItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/policies/PseudostateExitPointItemSemanticEditPolicy.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.policies;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.policies;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -13,10 +13,10 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;
-import org.eclipse.papyrus.diagram.statemachine.edit.commands.TransitionCreateCommand;
-import org.eclipse.papyrus.diagram.statemachine.edit.commands.TransitionReorientCommand;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.TransitionEditPart;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.commands.TransitionCreateCommand;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.commands.TransitionReorientCommand;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.TransitionEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLElementTypes;
 
 /**
  * @generated
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/policies/PseudostateForkItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/policies/PseudostateForkItemSemanticEditPolicy.java
index a2836d2a9ed..dcaa9adc21e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/policies/PseudostateForkItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/policies/PseudostateForkItemSemanticEditPolicy.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.policies;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.policies;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -13,10 +13,10 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;
-import org.eclipse.papyrus.diagram.statemachine.edit.commands.TransitionCreateCommand;
-import org.eclipse.papyrus.diagram.statemachine.edit.commands.TransitionReorientCommand;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.TransitionEditPart;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.commands.TransitionCreateCommand;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.commands.TransitionReorientCommand;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.TransitionEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLElementTypes;
 
 /**
  * @generated
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/policies/PseudostateInitialItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/policies/PseudostateInitialItemSemanticEditPolicy.java
index cbec43d68a4..c2444dde277 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/policies/PseudostateInitialItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/policies/PseudostateInitialItemSemanticEditPolicy.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.policies;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.policies;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -13,10 +13,10 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;
-import org.eclipse.papyrus.diagram.statemachine.edit.commands.TransitionCreateCommand;
-import org.eclipse.papyrus.diagram.statemachine.edit.commands.TransitionReorientCommand;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.TransitionEditPart;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.commands.TransitionCreateCommand;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.commands.TransitionReorientCommand;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.TransitionEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLElementTypes;
 
 /**
  * @generated
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/policies/PseudostateJoinItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/policies/PseudostateJoinItemSemanticEditPolicy.java
index d0b80040d81..7b04a9890a9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/policies/PseudostateJoinItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/policies/PseudostateJoinItemSemanticEditPolicy.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.policies;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.policies;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -13,10 +13,10 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;
-import org.eclipse.papyrus.diagram.statemachine.edit.commands.TransitionCreateCommand;
-import org.eclipse.papyrus.diagram.statemachine.edit.commands.TransitionReorientCommand;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.TransitionEditPart;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.commands.TransitionCreateCommand;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.commands.TransitionReorientCommand;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.TransitionEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLElementTypes;
 
 /**
  * @generated
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/policies/PseudostateJunctionItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/policies/PseudostateJunctionItemSemanticEditPolicy.java
index 4552e5420c5..87666214078 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/policies/PseudostateJunctionItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/policies/PseudostateJunctionItemSemanticEditPolicy.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.policies;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.policies;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -13,10 +13,10 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;
-import org.eclipse.papyrus.diagram.statemachine.edit.commands.TransitionCreateCommand;
-import org.eclipse.papyrus.diagram.statemachine.edit.commands.TransitionReorientCommand;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.TransitionEditPart;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.commands.TransitionCreateCommand;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.commands.TransitionReorientCommand;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.TransitionEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLElementTypes;
 
 /**
  * @generated
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/policies/PseudostateShallowHistoryItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/policies/PseudostateShallowHistoryItemSemanticEditPolicy.java
index ce4363be92e..8fbaf6a3b5a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/policies/PseudostateShallowHistoryItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/policies/PseudostateShallowHistoryItemSemanticEditPolicy.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.policies;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.policies;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -13,10 +13,10 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;
-import org.eclipse.papyrus.diagram.statemachine.edit.commands.TransitionCreateCommand;
-import org.eclipse.papyrus.diagram.statemachine.edit.commands.TransitionReorientCommand;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.TransitionEditPart;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.commands.TransitionCreateCommand;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.commands.TransitionReorientCommand;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.TransitionEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLElementTypes;
 
 /**
  * @generated
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/policies/PseudostateTerminateItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/policies/PseudostateTerminateItemSemanticEditPolicy.java
index e8301a8cbed..3e9f609f222 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/policies/PseudostateTerminateItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/policies/PseudostateTerminateItemSemanticEditPolicy.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.policies;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.policies;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -13,10 +13,10 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;
-import org.eclipse.papyrus.diagram.statemachine.edit.commands.TransitionCreateCommand;
-import org.eclipse.papyrus.diagram.statemachine.edit.commands.TransitionReorientCommand;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.TransitionEditPart;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.commands.TransitionCreateCommand;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.commands.TransitionReorientCommand;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.TransitionEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLElementTypes;
 
 /**
  * @generated
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/policies/RegionCompartmentCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/policies/RegionCompartmentCanonicalEditPolicy.java
index c841c65a2ec..65d3a622a6e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/policies/RegionCompartmentCanonicalEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/policies/RegionCompartmentCanonicalEditPolicy.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.policies;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.policies;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -32,21 +32,21 @@ import org.eclipse.gmf.runtime.notation.Location;
 import org.eclipse.gmf.runtime.notation.Node;
 import org.eclipse.gmf.runtime.notation.Size;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.FinalStateEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateChoiceEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateDeepHistoryEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateEntryPointEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateExitPointEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateForkEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateInitialEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateJoinEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateJunctionEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateShallowHistoryEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateTerminateEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.StateEditPart;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLDiagramUpdater;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLNodeDescriptor;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.FinalStateEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateChoiceEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateDeepHistoryEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateEntryPointEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateExitPointEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateForkEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateInitialEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateJoinEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateJunctionEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateShallowHistoryEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateTerminateEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.StateEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLDiagramUpdater;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLNodeDescriptor;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLVisualIDRegistry;
 import org.eclipse.uml2.uml.UMLPackage;
 
 /**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/policies/RegionCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/policies/RegionCompartmentItemSemanticEditPolicy.java
index 9400b52e500..c9c3d33881a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/policies/RegionCompartmentItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/policies/RegionCompartmentItemSemanticEditPolicy.java
@@ -1,20 +1,20 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.policies;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.policies;
 
 import org.eclipse.gef.commands.Command;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.papyrus.diagram.statemachine.edit.commands.FinalStateCreateCommand;
-import org.eclipse.papyrus.diagram.statemachine.edit.commands.PseudostateChoiceCreateCommand;
-import org.eclipse.papyrus.diagram.statemachine.edit.commands.PseudostateDeepHistoryCreateCommand;
-import org.eclipse.papyrus.diagram.statemachine.edit.commands.PseudostateEntryPointCreateCommand;
-import org.eclipse.papyrus.diagram.statemachine.edit.commands.PseudostateExitPointCreateCommand;
-import org.eclipse.papyrus.diagram.statemachine.edit.commands.PseudostateForkCreateCommand;
-import org.eclipse.papyrus.diagram.statemachine.edit.commands.PseudostateInitialCreateCommand;
-import org.eclipse.papyrus.diagram.statemachine.edit.commands.PseudostateJoinCreateCommand;
-import org.eclipse.papyrus.diagram.statemachine.edit.commands.PseudostateJunctionCreateCommand;
-import org.eclipse.papyrus.diagram.statemachine.edit.commands.PseudostateShallowHistoryCreateCommand;
-import org.eclipse.papyrus.diagram.statemachine.edit.commands.PseudostateTerminateCreateCommand;
-import org.eclipse.papyrus.diagram.statemachine.edit.commands.StateCreateCommand;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.commands.FinalStateCreateCommand;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.commands.PseudostateChoiceCreateCommand;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.commands.PseudostateDeepHistoryCreateCommand;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.commands.PseudostateEntryPointCreateCommand;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.commands.PseudostateExitPointCreateCommand;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.commands.PseudostateForkCreateCommand;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.commands.PseudostateInitialCreateCommand;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.commands.PseudostateJoinCreateCommand;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.commands.PseudostateJunctionCreateCommand;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.commands.PseudostateShallowHistoryCreateCommand;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.commands.PseudostateTerminateCreateCommand;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.commands.StateCreateCommand;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLElementTypes;
 
 /**
  * @generated
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/policies/RegionItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/policies/RegionItemSemanticEditPolicy.java
index b454c077da5..02b3e5b4a71 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/policies/RegionItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/policies/RegionItemSemanticEditPolicy.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.policies;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.policies;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -16,22 +16,22 @@ import org.eclipse.gmf.runtime.notation.Edge;
 import org.eclipse.gmf.runtime.notation.Node;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.FinalStateEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateChoiceEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateDeepHistoryEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateEntryPointEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateExitPointEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateForkEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateInitialEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateJoinEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateJunctionEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateShallowHistoryEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateTerminateEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.RegionCompartmentEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.StateEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.TransitionEditPart;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.FinalStateEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateChoiceEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateDeepHistoryEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateEntryPointEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateExitPointEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateForkEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateInitialEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateJoinEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateJunctionEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateShallowHistoryEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateTerminateEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.RegionCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.StateEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.TransitionEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLElementTypes;
 
 /**
  * @generated
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/policies/StateCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/policies/StateCanonicalEditPolicy.java
index 52930ce3ab1..86f80711ed6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/policies/StateCanonicalEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/policies/StateCanonicalEditPolicy.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.policies;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.policies;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -32,13 +32,13 @@ import org.eclipse.gmf.runtime.notation.Location;
 import org.eclipse.gmf.runtime.notation.Node;
 import org.eclipse.gmf.runtime.notation.Size;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.ConnectionPointReferenceEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateEntryPointEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateExitPointEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.RegionEditPart;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLDiagramUpdater;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLNodeDescriptor;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.ConnectionPointReferenceEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateEntryPointEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateExitPointEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.RegionEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLDiagramUpdater;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLNodeDescriptor;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLVisualIDRegistry;
 import org.eclipse.uml2.uml.UMLPackage;
 
 /**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/policies/StateCompartmentCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/policies/StateCompartmentCanonicalEditPolicy.java
index 625757e3492..959ef693870 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/policies/StateCompartmentCanonicalEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/policies/StateCompartmentCanonicalEditPolicy.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.policies;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.policies;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -22,11 +22,11 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
 import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
 import org.eclipse.gmf.runtime.notation.Node;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.ConnectionPointReferenceEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.RegionEditPart;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLDiagramUpdater;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLNodeDescriptor;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.ConnectionPointReferenceEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.RegionEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLDiagramUpdater;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLNodeDescriptor;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLVisualIDRegistry;
 import org.eclipse.uml2.uml.UMLPackage;
 
 /**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/policies/StateCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/policies/StateCompartmentItemSemanticEditPolicy.java
index f1866b1c774..b95d81dc568 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/policies/StateCompartmentItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/policies/StateCompartmentItemSemanticEditPolicy.java
@@ -1,10 +1,10 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.policies;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.policies;
 
 import org.eclipse.gef.commands.Command;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.papyrus.diagram.statemachine.edit.commands.ConnectionPointReferenceCreateCommand;
-import org.eclipse.papyrus.diagram.statemachine.edit.commands.RegionCreateCommand;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.commands.ConnectionPointReferenceCreateCommand;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.commands.RegionCreateCommand;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLElementTypes;
 
 /**
  * @generated
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/policies/StateItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/policies/StateItemSemanticEditPolicy.java
index 414b1f11aa1..b6f11470b44 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/policies/StateItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/policies/StateItemSemanticEditPolicy.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.policies;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.policies;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -19,20 +19,20 @@ import org.eclipse.gmf.runtime.notation.Edge;
 import org.eclipse.gmf.runtime.notation.Node;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;
-import org.eclipse.papyrus.diagram.statemachine.edit.commands.ConnectionPointReferenceCreateCommand;
-import org.eclipse.papyrus.diagram.statemachine.edit.commands.PseudostateEntryPointCreateCommand;
-import org.eclipse.papyrus.diagram.statemachine.edit.commands.PseudostateExitPointCreateCommand;
-import org.eclipse.papyrus.diagram.statemachine.edit.commands.RegionCreateCommand;
-import org.eclipse.papyrus.diagram.statemachine.edit.commands.TransitionCreateCommand;
-import org.eclipse.papyrus.diagram.statemachine.edit.commands.TransitionReorientCommand;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.ConnectionPointReferenceEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateEntryPointEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateExitPointEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.RegionEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.StateCompartmentEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.TransitionEditPart;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.commands.ConnectionPointReferenceCreateCommand;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.commands.PseudostateEntryPointCreateCommand;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.commands.PseudostateExitPointCreateCommand;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.commands.RegionCreateCommand;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.commands.TransitionCreateCommand;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.commands.TransitionReorientCommand;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.ConnectionPointReferenceEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateEntryPointEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateExitPointEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.RegionEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.StateCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.TransitionEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLElementTypes;
 
 /**
  * @generated
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/policies/StateMachineCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/policies/StateMachineCanonicalEditPolicy.java
index f783b4ad589..8182c2bc302 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/policies/StateMachineCanonicalEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/policies/StateMachineCanonicalEditPolicy.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.policies;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.policies;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -30,11 +30,11 @@ import org.eclipse.gmf.runtime.notation.Location;
 import org.eclipse.gmf.runtime.notation.Node;
 import org.eclipse.gmf.runtime.notation.Size;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateEntryPointEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateExitPointEditPart;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLDiagramUpdater;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLNodeDescriptor;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateEntryPointEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateExitPointEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLDiagramUpdater;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLNodeDescriptor;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLVisualIDRegistry;
 import org.eclipse.uml2.uml.UMLPackage;
 
 /**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/policies/StateMachineCompartmentCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/policies/StateMachineCompartmentCanonicalEditPolicy.java
index a002314e9e6..0bd3e4b6558 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/policies/StateMachineCompartmentCanonicalEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/policies/StateMachineCompartmentCanonicalEditPolicy.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.policies;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.policies;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -32,12 +32,12 @@ import org.eclipse.gmf.runtime.notation.Location;
 import org.eclipse.gmf.runtime.notation.Node;
 import org.eclipse.gmf.runtime.notation.Size;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateEntryPointEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateExitPointEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.RegionEditPart;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLDiagramUpdater;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLNodeDescriptor;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateEntryPointEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateExitPointEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.RegionEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLDiagramUpdater;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLNodeDescriptor;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLVisualIDRegistry;
 import org.eclipse.uml2.uml.UMLPackage;
 
 /**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/policies/StateMachineCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/policies/StateMachineCompartmentItemSemanticEditPolicy.java
index bce8db45e52..ce31dbcb17f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/policies/StateMachineCompartmentItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/policies/StateMachineCompartmentItemSemanticEditPolicy.java
@@ -1,11 +1,11 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.policies;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.policies;
 
 import org.eclipse.gef.commands.Command;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.papyrus.diagram.statemachine.edit.commands.PseudostateEntryPointCreateCommand;
-import org.eclipse.papyrus.diagram.statemachine.edit.commands.PseudostateExitPointCreateCommand;
-import org.eclipse.papyrus.diagram.statemachine.edit.commands.RegionCreateCommand;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.commands.PseudostateEntryPointCreateCommand;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.commands.PseudostateExitPointCreateCommand;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.commands.RegionCreateCommand;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLElementTypes;
 
 /**
  * @generated
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/policies/StateMachineItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/policies/StateMachineItemSemanticEditPolicy.java
index 22760d4eaba..a923b125274 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/policies/StateMachineItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/policies/StateMachineItemSemanticEditPolicy.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.policies;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.policies;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -19,18 +19,18 @@ import org.eclipse.gmf.runtime.notation.Edge;
 import org.eclipse.gmf.runtime.notation.Node;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;
-import org.eclipse.papyrus.diagram.statemachine.edit.commands.GeneralizationCreateCommand;
-import org.eclipse.papyrus.diagram.statemachine.edit.commands.GeneralizationReorientCommand;
-import org.eclipse.papyrus.diagram.statemachine.edit.commands.PseudostateEntryPointCreateCommand;
-import org.eclipse.papyrus.diagram.statemachine.edit.commands.PseudostateExitPointCreateCommand;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.GeneralizationEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateEntryPointEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateExitPointEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.RegionEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.StateMachineCompartmentEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.TransitionEditPart;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.commands.GeneralizationCreateCommand;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.commands.GeneralizationReorientCommand;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.commands.PseudostateEntryPointCreateCommand;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.commands.PseudostateExitPointCreateCommand;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.GeneralizationEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateEntryPointEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateExitPointEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.RegionEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.StateMachineCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.TransitionEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLElementTypes;
 
 /**
  * @generated
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/policies/TransitionItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/policies/TransitionItemSemanticEditPolicy.java
index 376e858cc73..c0c4aff53f2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/policies/TransitionItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/policies/TransitionItemSemanticEditPolicy.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.policies;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.policies;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -9,7 +9,7 @@ import org.eclipse.gef.commands.Command;
 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
 import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLElementTypes;
 
 /**
  * @generated
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/policies/UMLBaseItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/policies/UMLBaseItemSemanticEditPolicy.java
index 1621610daaf..ad8c33383ed 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/policies/UMLBaseItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/policies/UMLBaseItemSemanticEditPolicy.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.policies;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.policies;
 
 import java.util.Iterator;
 
@@ -31,10 +31,10 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelations
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.diagram.statemachine.edit.helpers.UMLBaseEditHelper;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLDiagramEditorPlugin;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.helpers.UMLBaseEditHelper;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLDiagramEditorPlugin;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLElementTypes;
 import org.eclipse.uml2.uml.Classifier;
 import org.eclipse.uml2.uml.Generalization;
 import org.eclipse.uml2.uml.Region;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/policies/UMLTextNonResizableEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/policies/UMLTextNonResizableEditPolicy.java
index 33299b69ca7..811153023fc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/policies/UMLTextNonResizableEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/policies/UMLTextNonResizableEditPolicy.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.policies;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.policies;
 
 import java.util.Collections;
 import java.util.List;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/policies/UMLTextSelectionEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/policies/UMLTextSelectionEditPolicy.java
index 7f9e9551eb1..c2f136d0fb7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/edit/policies/UMLTextSelectionEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/policies/UMLTextSelectionEditPolicy.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.edit.policies;
+package org.eclipse.papyrus.uml.diagram.statemachine.edit.policies;
 
 import org.eclipse.draw2d.ColorConstants;
 import org.eclipse.draw2d.Figure;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/navigator/UMLAbstractNavigatorItem.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/navigator/UMLAbstractNavigatorItem.java
index b175a8451d0..ce4eaf26fa9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/navigator/UMLAbstractNavigatorItem.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/navigator/UMLAbstractNavigatorItem.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.navigator;
+package org.eclipse.papyrus.uml.diagram.statemachine.navigator;
 
 import org.eclipse.core.runtime.IAdapterFactory;
 import org.eclipse.core.runtime.Platform;
@@ -18,13 +18,13 @@ public abstract class UMLAbstractNavigatorItem extends PlatformObject {
 		final ITabbedPropertySheetPageContributor propertySheetPageContributor = new ITabbedPropertySheetPageContributor() {
 
 			public String getContributorId() {
-				return "org.eclipse.papyrus.diagram.statemachine"; //$NON-NLS-1$
+				return "org.eclipse.papyrus.uml.diagram.statemachine"; //$NON-NLS-1$
 			}
 		};
 		Platform.getAdapterManager().registerAdapters(new IAdapterFactory() {
 
 			public Object getAdapter(Object adaptableObject, Class adapterType) {
-				if(adaptableObject instanceof org.eclipse.papyrus.diagram.statemachine.navigator.UMLAbstractNavigatorItem && adapterType == ITabbedPropertySheetPageContributor.class) {
+				if(adaptableObject instanceof org.eclipse.papyrus.uml.diagram.statemachine.navigator.UMLAbstractNavigatorItem && adapterType == ITabbedPropertySheetPageContributor.class) {
 					return propertySheetPageContributor;
 				}
 				return null;
@@ -33,7 +33,7 @@ public abstract class UMLAbstractNavigatorItem extends PlatformObject {
 			public Class[] getAdapterList() {
 				return supportedTypes;
 			}
-		}, org.eclipse.papyrus.diagram.statemachine.navigator.UMLAbstractNavigatorItem.class);
+		}, org.eclipse.papyrus.uml.diagram.statemachine.navigator.UMLAbstractNavigatorItem.class);
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/navigator/UMLDomainNavigatorContentProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/navigator/UMLDomainNavigatorContentProvider.java
index 6c54d6f3c7c..866076a82e0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/navigator/UMLDomainNavigatorContentProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/navigator/UMLDomainNavigatorContentProvider.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.navigator;
+package org.eclipse.papyrus.uml.diagram.statemachine.navigator;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -15,7 +15,7 @@ import org.eclipse.emf.transaction.TransactionalEditingDomain;
 import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;
 import org.eclipse.gmf.runtime.emf.core.GMFEditingDomainFactory;
 import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLDiagramEditorPlugin;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLDiagramEditorPlugin;
 import org.eclipse.ui.IMemento;
 import org.eclipse.ui.navigator.ICommonContentExtensionSite;
 import org.eclipse.ui.navigator.ICommonContentProvider;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/navigator/UMLDomainNavigatorItem.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/navigator/UMLDomainNavigatorItem.java
index 24fbe46a97a..638a515e016 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/navigator/UMLDomainNavigatorItem.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/navigator/UMLDomainNavigatorItem.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.navigator;
+package org.eclipse.papyrus.uml.diagram.statemachine.navigator;
 
 import org.eclipse.core.runtime.IAdapterFactory;
 import org.eclipse.core.runtime.Platform;
@@ -21,8 +21,8 @@ public class UMLDomainNavigatorItem extends PlatformObject {
 		Platform.getAdapterManager().registerAdapters(new IAdapterFactory() {
 
 			public Object getAdapter(Object adaptableObject, Class adapterType) {
-				if(adaptableObject instanceof org.eclipse.papyrus.diagram.statemachine.navigator.UMLDomainNavigatorItem) {
-					org.eclipse.papyrus.diagram.statemachine.navigator.UMLDomainNavigatorItem domainNavigatorItem = (org.eclipse.papyrus.diagram.statemachine.navigator.UMLDomainNavigatorItem)adaptableObject;
+				if(adaptableObject instanceof org.eclipse.papyrus.uml.diagram.statemachine.navigator.UMLDomainNavigatorItem) {
+					org.eclipse.papyrus.uml.diagram.statemachine.navigator.UMLDomainNavigatorItem domainNavigatorItem = (org.eclipse.papyrus.uml.diagram.statemachine.navigator.UMLDomainNavigatorItem)adaptableObject;
 					EObject eObject = domainNavigatorItem.getEObject();
 					if(adapterType == EObject.class) {
 						return eObject;
@@ -38,7 +38,7 @@ public class UMLDomainNavigatorItem extends PlatformObject {
 			public Class[] getAdapterList() {
 				return supportedTypes;
 			}
-		}, org.eclipse.papyrus.diagram.statemachine.navigator.UMLDomainNavigatorItem.class);
+		}, org.eclipse.papyrus.uml.diagram.statemachine.navigator.UMLDomainNavigatorItem.class);
 	}
 
 	/**
@@ -69,8 +69,8 @@ public class UMLDomainNavigatorItem extends PlatformObject {
 	 * @generated
 	 */
 	public boolean equals(Object obj) {
-		if(obj instanceof org.eclipse.papyrus.diagram.statemachine.navigator.UMLDomainNavigatorItem) {
-			return EcoreUtil.getURI(getEObject()).equals(EcoreUtil.getURI(((org.eclipse.papyrus.diagram.statemachine.navigator.UMLDomainNavigatorItem)obj).getEObject()));
+		if(obj instanceof org.eclipse.papyrus.uml.diagram.statemachine.navigator.UMLDomainNavigatorItem) {
+			return EcoreUtil.getURI(getEObject()).equals(EcoreUtil.getURI(((org.eclipse.papyrus.uml.diagram.statemachine.navigator.UMLDomainNavigatorItem)obj).getEObject()));
 		}
 		return super.equals(obj);
 	}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/navigator/UMLDomainNavigatorLabelProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/navigator/UMLDomainNavigatorLabelProvider.java
index 768bf87b809..de47c3fcbee 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/navigator/UMLDomainNavigatorLabelProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/navigator/UMLDomainNavigatorLabelProvider.java
@@ -1,8 +1,8 @@
-package org.eclipse.papyrus.diagram.statemachine.navigator;
+package org.eclipse.papyrus.uml.diagram.statemachine.navigator;
 
 import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
 import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLDiagramEditorPlugin;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLDiagramEditorPlugin;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.ui.IMemento;
 import org.eclipse.ui.navigator.ICommonContentExtensionSite;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/navigator/UMLNavigatorActionProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/navigator/UMLNavigatorActionProvider.java
index cf14162a3e8..b60b71b5be0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/navigator/UMLNavigatorActionProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/navigator/UMLNavigatorActionProvider.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.navigator;
+package org.eclipse.papyrus.uml.diagram.statemachine.navigator;
 
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.emf.common.ui.URIEditorInput;
@@ -12,11 +12,11 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.action.IMenuManager;
 import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PackageEditPart;
-import org.eclipse.papyrus.diagram.statemachine.part.Messages;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLDiagramEditor;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLDiagramEditorPlugin;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PackageEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.Messages;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLDiagramEditor;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLDiagramEditorPlugin;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLVisualIDRegistry;
 import org.eclipse.ui.IActionBars;
 import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IWorkbenchPage;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/navigator/UMLNavigatorContentProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/navigator/UMLNavigatorContentProvider.java
index 6cf8b0560de..d19a89a88ee 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/navigator/UMLNavigatorContentProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/navigator/UMLNavigatorContentProvider.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.navigator;
+package org.eclipse.papyrus.uml.diagram.statemachine.navigator;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -17,11 +17,11 @@ import org.eclipse.gmf.runtime.notation.Diagram;
 import org.eclipse.gmf.runtime.notation.Edge;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PackageEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.RegionEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.StateMachineCompartmentEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.StateMachineEditPart;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PackageEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.RegionEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.StateMachineCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.StateMachineEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLVisualIDRegistry;
 import org.eclipse.ui.IMemento;
 import org.eclipse.ui.navigator.ICommonContentExtensionSite;
 import org.eclipse.ui.navigator.ICommonContentProvider;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/navigator/UMLNavigatorGroup.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/navigator/UMLNavigatorGroup.java
index 178ca7b4249..b50b8bacaba 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/navigator/UMLNavigatorGroup.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/navigator/UMLNavigatorGroup.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.navigator;
+package org.eclipse.papyrus.uml.diagram.statemachine.navigator;
 
 import java.util.Collection;
 import java.util.LinkedList;
@@ -50,8 +50,8 @@ public class UMLNavigatorGroup extends UMLAbstractNavigatorItem {
 	 * @generated
 	 */
 	public boolean equals(Object obj) {
-		if(obj instanceof org.eclipse.papyrus.diagram.statemachine.navigator.UMLNavigatorGroup) {
-			org.eclipse.papyrus.diagram.statemachine.navigator.UMLNavigatorGroup anotherGroup = (org.eclipse.papyrus.diagram.statemachine.navigator.UMLNavigatorGroup)obj;
+		if(obj instanceof org.eclipse.papyrus.uml.diagram.statemachine.navigator.UMLNavigatorGroup) {
+			org.eclipse.papyrus.uml.diagram.statemachine.navigator.UMLNavigatorGroup anotherGroup = (org.eclipse.papyrus.uml.diagram.statemachine.navigator.UMLNavigatorGroup)obj;
 			if(getGroupName().equals(anotherGroup.getGroupName())) {
 				return getParent().equals(anotherGroup.getParent());
 			}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/navigator/UMLNavigatorItem.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/navigator/UMLNavigatorItem.java
index 44aa50088d7..b42bf8f2511 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/navigator/UMLNavigatorItem.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/navigator/UMLNavigatorItem.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.navigator;
+package org.eclipse.papyrus.uml.diagram.statemachine.navigator;
 
 import org.eclipse.core.runtime.IAdapterFactory;
 import org.eclipse.core.runtime.Platform;
@@ -19,8 +19,8 @@ public class UMLNavigatorItem extends UMLAbstractNavigatorItem {
 		Platform.getAdapterManager().registerAdapters(new IAdapterFactory() {
 
 			public Object getAdapter(Object adaptableObject, Class adapterType) {
-				if(adaptableObject instanceof org.eclipse.papyrus.diagram.statemachine.navigator.UMLNavigatorItem && (adapterType == View.class || adapterType == EObject.class)) {
-					return ((org.eclipse.papyrus.diagram.statemachine.navigator.UMLNavigatorItem)adaptableObject).getView();
+				if(adaptableObject instanceof org.eclipse.papyrus.uml.diagram.statemachine.navigator.UMLNavigatorItem && (adapterType == View.class || adapterType == EObject.class)) {
+					return ((org.eclipse.papyrus.uml.diagram.statemachine.navigator.UMLNavigatorItem)adaptableObject).getView();
 				}
 				return null;
 			}
@@ -28,7 +28,7 @@ public class UMLNavigatorItem extends UMLAbstractNavigatorItem {
 			public Class[] getAdapterList() {
 				return supportedTypes;
 			}
-		}, org.eclipse.papyrus.diagram.statemachine.navigator.UMLNavigatorItem.class);
+		}, org.eclipse.papyrus.uml.diagram.statemachine.navigator.UMLNavigatorItem.class);
 	}
 
 	/**
@@ -54,8 +54,8 @@ public class UMLNavigatorItem extends UMLAbstractNavigatorItem {
 	 * @generated
 	 */
 	public boolean equals(Object obj) {
-		if(obj instanceof org.eclipse.papyrus.diagram.statemachine.navigator.UMLNavigatorItem) {
-			return EcoreUtil.getURI(getView()).equals(EcoreUtil.getURI(((org.eclipse.papyrus.diagram.statemachine.navigator.UMLNavigatorItem)obj).getView()));
+		if(obj instanceof org.eclipse.papyrus.uml.diagram.statemachine.navigator.UMLNavigatorItem) {
+			return EcoreUtil.getURI(getView()).equals(EcoreUtil.getURI(((org.eclipse.papyrus.uml.diagram.statemachine.navigator.UMLNavigatorItem)obj).getView()));
 		}
 		return super.equals(obj);
 	}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/navigator/UMLNavigatorLabelProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/navigator/UMLNavigatorLabelProvider.java
index 4c1c953c2b1..5a383bd5154 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/navigator/UMLNavigatorLabelProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/navigator/UMLNavigatorLabelProvider.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.navigator;
+package org.eclipse.papyrus.uml.diagram.statemachine.navigator;
 
 import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
 import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
@@ -11,14 +11,14 @@ import org.eclipse.jface.viewers.ITreePathLabelProvider;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.TreePath;
 import org.eclipse.jface.viewers.ViewerLabel;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PackageEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.RegionEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.StateMachineEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.StateMachineNameEditPart;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLDiagramEditorPlugin;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLElementTypes;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLParserProvider;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PackageEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.RegionEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.StateMachineEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.StateMachineNameEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLDiagramEditorPlugin;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLParserProvider;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.ui.IMemento;
 import org.eclipse.ui.navigator.ICommonContentExtensionSite;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/navigator/UMLNavigatorLinkHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/navigator/UMLNavigatorLinkHelper.java
index 1f91ac4a63a..b9ac83eb987 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/navigator/UMLNavigatorLinkHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/navigator/UMLNavigatorLinkHelper.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.navigator;
+package org.eclipse.papyrus.uml.diagram.statemachine.navigator;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.emf.common.ui.URIEditorInput;
@@ -16,7 +16,7 @@ import org.eclipse.gmf.runtime.notation.Diagram;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLDiagramEditorPlugin;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLDiagramEditorPlugin;
 import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.IWorkbenchPage;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/navigator/UMLNavigatorSorter.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/navigator/UMLNavigatorSorter.java
index 529ef9fefd5..919266b0dc1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/navigator/UMLNavigatorSorter.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/navigator/UMLNavigatorSorter.java
@@ -1,7 +1,7 @@
-package org.eclipse.papyrus.diagram.statemachine.navigator;
+package org.eclipse.papyrus.uml.diagram.statemachine.navigator;
 
 import org.eclipse.jface.viewers.ViewerSorter;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLVisualIDRegistry;
 
 /**
  * @generated
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/parsers/AbstractParser.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/parsers/AbstractParser.java
index fb71d20142e..d157cc1b88e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/parsers/AbstractParser.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/parsers/AbstractParser.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.parsers;
+package org.eclipse.papyrus.uml.diagram.statemachine.parsers;
 
 import java.util.Arrays;
 
@@ -22,8 +22,8 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.SetValueCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
 import org.eclipse.osgi.util.NLS;
-import org.eclipse.papyrus.diagram.statemachine.part.Messages;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLDiagramEditorPlugin;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.Messages;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLDiagramEditorPlugin;
 
 /**
  * @generated
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/parsers/MessageFormatParser.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/parsers/MessageFormatParser.java
index f2e0b4b9502..07264583347 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/parsers/MessageFormatParser.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/parsers/MessageFormatParser.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.parsers;
+package org.eclipse.papyrus.uml.diagram.statemachine.parsers;
 
 import java.text.FieldPosition;
 import java.text.MessageFormat;
@@ -11,8 +11,8 @@ import org.eclipse.gmf.runtime.common.core.command.ICommand;
 import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
 import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
 import org.eclipse.osgi.util.NLS;
-import org.eclipse.papyrus.diagram.statemachine.part.Messages;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLDiagramEditorPlugin;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.Messages;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLDiagramEditorPlugin;
 
 /**
  * @generated
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/part/DeleteElementAction.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/part/DeleteElementAction.java
index f36e10a3fab..08170778a03 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/part/DeleteElementAction.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/part/DeleteElementAction.java
@@ -1,3 +1,4 @@
+package org.eclipse.papyrus.uml.diagram.statemachine.part;
 //This file is not used. 
 // The DeleteElementAction is removed from the plugin and replaced by
 // DeleteFromModelAction in the plugin org.eclipse.diagram.common.
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/part/DiagramEditorContextMenuProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/part/DiagramEditorContextMenuProvider.java
index 807638910d0..42805cfe7ed 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/part/DiagramEditorContextMenuProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/part/DiagramEditorContextMenuProvider.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.part;
+package org.eclipse.papyrus.uml.diagram.statemachine.part;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.transaction.util.TransactionUtil;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/part/LoadResourceAction.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/part/LoadResourceAction.java
index efcb2263aa2..d01693bb68b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/part/LoadResourceAction.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/part/LoadResourceAction.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.part;
+package org.eclipse.papyrus.uml.diagram.statemachine.part;
 
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/part/Messages.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/part/Messages.java
index 3835667d769..64d2dc9d8eb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/part/Messages.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/part/Messages.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.part;
+package org.eclipse.papyrus.uml.diagram.statemachine.part;
 
 import org.eclipse.osgi.util.NLS;
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/part/ModelElementSelectionPage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/part/ModelElementSelectionPage.java
index dd80772c0fb..f092b9d6d25 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/part/ModelElementSelectionPage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/part/ModelElementSelectionPage.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.part;
+package org.eclipse.papyrus.uml.diagram.statemachine.part;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.util.FeatureMap;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/part/UMLCreationWizard.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/part/UMLCreationWizard.java
index 40ec75fc1de..d6a3de31528 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/part/UMLCreationWizard.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/part/UMLCreationWizard.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.part;
+package org.eclipse.papyrus.uml.diagram.statemachine.part;
 
 import java.lang.reflect.InvocationTargetException;
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/part/UMLCreationWizardPage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/part/UMLCreationWizardPage.java
index 44de45e5463..0be27804d64 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/part/UMLCreationWizardPage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/part/UMLCreationWizardPage.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.part;
+package org.eclipse.papyrus.uml.diagram.statemachine.part;
 
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Path;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/part/UMLDiagramActionBarContributor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/part/UMLDiagramActionBarContributor.java
index bc2b509caa9..effcf4e9a52 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/part/UMLDiagramActionBarContributor.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/part/UMLDiagramActionBarContributor.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.part;
+package org.eclipse.papyrus.uml.diagram.statemachine.part;
 
 import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramActionBarContributor;
 import org.eclipse.jface.action.GroupMarker;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/part/UMLDiagramEditor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/part/UMLDiagramEditor.java
index e443ba5c0c3..77142b57037 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/part/UMLDiagramEditor.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/part/UMLDiagramEditor.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.part;
+package org.eclipse.papyrus.uml.diagram.statemachine.part;
 
 import java.util.EventObject;
 
@@ -32,12 +32,12 @@ import org.eclipse.papyrus.core.adaptor.gmf.GmfMultiDiagramDocumentProvider;
 import org.eclipse.papyrus.core.editor.IMultiDiagramEditor;
 import org.eclipse.papyrus.core.services.ServiceException;
 import org.eclipse.papyrus.core.services.ServicesRegistry;
-import org.eclipse.papyrus.diagram.common.listeners.DropTargetListener;
-import org.eclipse.papyrus.diagram.common.part.PapyrusPaletteContextMenuProvider;
-import org.eclipse.papyrus.diagram.common.part.PapyrusPaletteViewer;
-import org.eclipse.papyrus.diagram.common.part.UmlGmfDiagramEditor;
-import org.eclipse.papyrus.diagram.common.service.PapyrusPaletteService;
-import org.eclipse.papyrus.diagram.statemachine.navigator.UMLNavigatorItem;
+import org.eclipse.papyrus.uml.diagram.common.listeners.DropTargetListener;
+import org.eclipse.papyrus.uml.diagram.common.part.PapyrusPaletteContextMenuProvider;
+import org.eclipse.papyrus.uml.diagram.common.part.PapyrusPaletteViewer;
+import org.eclipse.papyrus.uml.diagram.common.part.UmlGmfDiagramEditor;
+import org.eclipse.papyrus.uml.diagram.common.service.PapyrusPaletteService;
+import org.eclipse.papyrus.uml.diagram.statemachine.navigator.UMLNavigatorItem;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.dnd.TransferData;
 import org.eclipse.swt.events.KeyEvent;
@@ -60,12 +60,12 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh
 	/**
 	 * @generated
 	 */
-	public static final String ID = "org.eclipse.papyrus.diagram.statemachine.part.UMLDiagramEditorID"; //$NON-NLS-1$
+	public static final String ID = "org.eclipse.papyrus.uml.diagram.statemachine.part.UMLDiagramEditorID"; //$NON-NLS-1$
 
 	/**
 	 * @generated
 	 */
-	public static final String CONTEXT_ID = "org.eclipse.papyrus.diagram.statemachine.ui.diagramContext"; //$NON-NLS-1$
+	public static final String CONTEXT_ID = "org.eclipse.papyrus.uml.diagram.statemachine.ui.diagramContext"; //$NON-NLS-1$
 
 	/**
 	 * @generated
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/part/UMLDiagramEditorPlugin.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/part/UMLDiagramEditorPlugin.java
index 1a3b32bbd18..dadf94ab6a9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/part/UMLDiagramEditorPlugin.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/part/UMLDiagramEditorPlugin.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.part;
+package org.eclipse.papyrus.uml.diagram.statemachine.part;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -18,10 +18,10 @@ import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;
 import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.papyrus.diagram.statemachine.edit.policies.UMLBaseItemSemanticEditPolicy;
-import org.eclipse.papyrus.diagram.statemachine.preferences.DiagramPreferenceInitializer;
-import org.eclipse.papyrus.diagram.statemachine.providers.ElementInitializers;
 import org.eclipse.papyrus.preferences.Activator;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.policies.UMLBaseItemSemanticEditPolicy;
+import org.eclipse.papyrus.uml.diagram.statemachine.preferences.DiagramPreferenceInitializer;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.ElementInitializers;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.eclipse.uml2.uml.edit.providers.UMLItemProviderAdapterFactory;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/part/UMLDiagramEditorUtil.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/part/UMLDiagramEditorUtil.java
index c505725108a..61643e92a33 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/part/UMLDiagramEditorUtil.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/part/UMLDiagramEditorUtil.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.part;
+package org.eclipse.papyrus.uml.diagram.statemachine.part;
 
 import java.io.IOException;
 import java.util.Collections;
@@ -43,7 +43,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.dialogs.IDialogSettings;
 import org.eclipse.jface.wizard.Wizard;
 import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PackageEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PackageEditPart;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.PartInitException;
@@ -171,8 +171,8 @@ public class UMLDiagramEditorUtil {
 				}
 
 				try {
-					modelResource.save(org.eclipse.papyrus.diagram.statemachine.part.UMLDiagramEditorUtil.getSaveOptions());
-					diagramResource.save(org.eclipse.papyrus.diagram.statemachine.part.UMLDiagramEditorUtil.getSaveOptions());
+					modelResource.save(org.eclipse.papyrus.uml.diagram.statemachine.part.UMLDiagramEditorUtil.getSaveOptions());
+					diagramResource.save(org.eclipse.papyrus.uml.diagram.statemachine.part.UMLDiagramEditorUtil.getSaveOptions());
 				} catch (IOException e) {
 
 					UMLDiagramEditorPlugin.getInstance().logError("Unable to store model and diagram resources", e); //$NON-NLS-1$
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/part/UMLDiagramUpdateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/part/UMLDiagramUpdateCommand.java
index 41f1162e84d..b2865abe58a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/part/UMLDiagramUpdateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/part/UMLDiagramUpdateCommand.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.part;
+package org.eclipse.papyrus.uml.diagram.statemachine.part;
 
 import java.util.Iterator;
 import java.util.List;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/part/UMLDiagramUpdater.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/part/UMLDiagramUpdater.java
index e6d71997f77..42bbc7a7707 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/part/UMLDiagramUpdater.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/part/UMLDiagramUpdater.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.part;
+package org.eclipse.papyrus.uml.diagram.statemachine.part;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -11,30 +11,30 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.diagram.common.part.ICustomDiagramUpdater;
-import org.eclipse.papyrus.diagram.statemachine.custom.parts.RegionCompartmentDiagramUpdater;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.ConnectionPointReferenceEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.FinalStateEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.GeneralizationEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PackageEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateChoiceEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateDeepHistoryEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateEntryPointEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateExitPointEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateForkEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateInitialEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateJoinEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateJunctionEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateShallowHistoryEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateTerminateEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.RegionCompartmentEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.RegionEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.StateCompartmentEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.StateEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.StateMachineCompartmentEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.StateMachineEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.TransitionEditPart;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.common.part.ICustomDiagramUpdater;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.parts.RegionCompartmentDiagramUpdater;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.ConnectionPointReferenceEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.FinalStateEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.GeneralizationEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PackageEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateChoiceEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateDeepHistoryEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateEntryPointEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateExitPointEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateForkEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateInitialEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateJoinEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateJunctionEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateShallowHistoryEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateTerminateEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.RegionCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.RegionEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.StateCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.StateEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.StateMachineCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.StateMachineEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.TransitionEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLElementTypes;
 import org.eclipse.uml2.uml.Classifier;
 import org.eclipse.uml2.uml.ConnectionPointReference;
 import org.eclipse.uml2.uml.FinalState;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/part/UMLDocumentProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/part/UMLDocumentProvider.java
index f42f5379103..3bf328ff4d8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/part/UMLDocumentProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/part/UMLDocumentProvider.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.part;
+package org.eclipse.papyrus.uml.diagram.statemachine.part;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -455,7 +455,7 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi
 	 */
 	private TransactionalEditingDomain createEditingDomain() {
 		TransactionalEditingDomain editingDomain = DiagramEditingDomainFactory.getInstance().createEditingDomain();
-		editingDomain.setID("org.eclipse.papyrus.diagram.statemachine.EditingDomain"); //$NON-NLS-1$
+		editingDomain.setID("org.eclipse.papyrus.uml.diagram.statemachine.EditingDomain"); //$NON-NLS-1$
 		final NotificationFilter diagramResourceModifiedFilter = NotificationFilter.createNotifierFilter(editingDomain.getResourceSet()).and(NotificationFilter.createEventTypeFilter(Notification.ADD)).and(NotificationFilter.createFeatureFilter(ResourceSet.class, ResourceSet.RESOURCE_SET__RESOURCES));
 		editingDomain.getResourceSet().eAdapters().add(new Adapter() {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/part/UMLInitDiagramFileAction.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/part/UMLInitDiagramFileAction.java
index 07004da5af6..2bd30d09bef 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/part/UMLInitDiagramFileAction.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/part/UMLInitDiagramFileAction.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.part;
+package org.eclipse.papyrus.uml.diagram.statemachine.part;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.emf.common.util.URI;
@@ -14,7 +14,7 @@ import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.wizard.Wizard;
 import org.eclipse.osgi.util.NLS;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PackageEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PackageEditPart;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.IObjectActionDelegate;
 import org.eclipse.ui.IWorkbenchPart;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/part/UMLLinkDescriptor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/part/UMLLinkDescriptor.java
index da209e29cd9..6997eb1b159 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/part/UMLLinkDescriptor.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/part/UMLLinkDescriptor.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.part;
+package org.eclipse.papyrus.uml.diagram.statemachine.part;
 
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.emf.ecore.EObject;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/part/UMLMatchingStrategy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/part/UMLMatchingStrategy.java
index bc305e9548e..81d142d4934 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/part/UMLMatchingStrategy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/part/UMLMatchingStrategy.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.part;
+package org.eclipse.papyrus.uml.diagram.statemachine.part;
 
 import org.eclipse.emf.common.ui.URIEditorInput;
 import org.eclipse.ui.IEditorInput;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/part/UMLNewDiagramFileWizard.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/part/UMLNewDiagramFileWizard.java
index 9b4f7dff8de..a35478617e8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/part/UMLNewDiagramFileWizard.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/part/UMLNewDiagramFileWizard.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.part;
+package org.eclipse.papyrus.uml.diagram.statemachine.part;
 
 import java.io.IOException;
 import java.util.LinkedList;
@@ -25,7 +25,7 @@ import org.eclipse.gmf.runtime.notation.Diagram;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.wizard.Wizard;
 import org.eclipse.osgi.util.NLS;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PackageEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PackageEditPart;
 import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/part/UMLNodeDescriptor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/part/UMLNodeDescriptor.java
index 521df51262c..0bb1e55d0cc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/part/UMLNodeDescriptor.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/part/UMLNodeDescriptor.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.part;
+package org.eclipse.papyrus.uml.diagram.statemachine.part;
 
 import org.eclipse.emf.ecore.EObject;
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/part/UMLPaletteFactory.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/part/UMLPaletteFactory.java
index 37264ab87db..aa575717488 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/part/UMLPaletteFactory.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/part/UMLPaletteFactory.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.part;
+package org.eclipse.papyrus.uml.diagram.statemachine.part;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -6,9 +6,9 @@ import java.util.List;
 import org.eclipse.gef.Tool;
 import org.eclipse.gmf.runtime.diagram.ui.services.palette.PaletteFactory;
 import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.diagram.common.service.AspectUnspecifiedTypeConnectionTool;
-import org.eclipse.papyrus.diagram.common.service.AspectUnspecifiedTypeCreationTool;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.common.service.AspectUnspecifiedTypeConnectionTool;
+import org.eclipse.papyrus.uml.diagram.common.service.AspectUnspecifiedTypeCreationTool;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLElementTypes;
 
 /**
  * @generated
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/part/UMLUriEditorInputTester.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/part/UMLUriEditorInputTester.java
index 35214cd76f3..4afe93b8765 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/part/UMLUriEditorInputTester.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/part/UMLUriEditorInputTester.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.part;
+package org.eclipse.papyrus.uml.diagram.statemachine.part;
 
 import org.eclipse.core.expressions.PropertyTester;
 import org.eclipse.emf.common.ui.URIEditorInput;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/part/UMLVisualIDRegistry.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/part/UMLVisualIDRegistry.java
index c6500cbf233..56f4a62fad2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/part/UMLVisualIDRegistry.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/part/UMLVisualIDRegistry.java
@@ -1,63 +1,63 @@
-package org.eclipse.papyrus.diagram.statemachine.part;
+package org.eclipse.papyrus.uml.diagram.statemachine.part;
 
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.emf.ecore.EAnnotation;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gmf.runtime.notation.Diagram;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.diagram.common.providers.BaseViewInfo;
-import org.eclipse.papyrus.diagram.common.providers.ViewInfo;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.ConnectionPointReferenceEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.ConnectionPointReferenceNameEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.ConnectionPointReferenceStereotypeEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.FinalStateEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.FinalStateNameEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.FinalStateStereotypeEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.GeneralizationEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.GeneralizationStereotypeEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PackageEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateChoiceEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateChoiceNameEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateChoiceStereotypeEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateDeepHistoryEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateDeepHistoryNameEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateDeepHistoryStereotypeEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateEntryPointEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateEntryPointNameEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateEntryPointStereotypeEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateExitPointEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateExitPointNameEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateExitPointStereotypeEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateForkEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateForkNameEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateForkStereotypeEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateInitialEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateInitialNameEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateInitialStereotypeEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateJoinEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateJoinNameEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateJoinStereotypeEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateJunctionEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateJunctionNameEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateJunctionStereotypeEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateShallowHistoryEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateShallowHistoryNameEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateShallowHistoryStereotypeEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateTerminateEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateTerminateNameEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateTerminateStereotypeEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.RegionCompartmentEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.RegionEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.StateCompartmentEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.StateEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.StateMachineCompartmentEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.StateMachineEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.StateMachineNameEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.StateNameEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.TransitionEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.TransitionGuardEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.TransitionNameEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.TransitionStereotypeEditPart;
+import org.eclipse.papyrus.uml.diagram.common.providers.BaseViewInfo;
+import org.eclipse.papyrus.uml.diagram.common.providers.ViewInfo;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.ConnectionPointReferenceEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.ConnectionPointReferenceNameEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.ConnectionPointReferenceStereotypeEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.FinalStateEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.FinalStateNameEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.FinalStateStereotypeEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.GeneralizationEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.GeneralizationStereotypeEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PackageEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateChoiceEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateChoiceNameEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateChoiceStereotypeEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateDeepHistoryEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateDeepHistoryNameEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateDeepHistoryStereotypeEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateEntryPointEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateEntryPointNameEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateEntryPointStereotypeEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateExitPointEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateExitPointNameEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateExitPointStereotypeEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateForkEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateForkNameEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateForkStereotypeEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateInitialEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateInitialNameEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateInitialStereotypeEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateJoinEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateJoinNameEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateJoinStereotypeEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateJunctionEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateJunctionNameEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateJunctionStereotypeEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateShallowHistoryEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateShallowHistoryNameEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateShallowHistoryStereotypeEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateTerminateEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateTerminateNameEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateTerminateStereotypeEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.RegionCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.RegionEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.StateCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.StateEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.StateMachineCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.StateMachineEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.StateMachineNameEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.StateNameEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.TransitionEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.TransitionGuardEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.TransitionNameEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.TransitionStereotypeEditPart;
 import org.eclipse.uml2.uml.Package;
 import org.eclipse.uml2.uml.Pseudostate;
 import org.eclipse.uml2.uml.PseudostateKind;
@@ -75,7 +75,7 @@ public class UMLVisualIDRegistry {
 	/**
 	 * @generated
 	 */
-	private static final String DEBUG_KEY = "org.eclipse.papyrus.diagram.statemachine/debug/visualID"; //$NON-NLS-1$
+	private static final String DEBUG_KEY = "org.eclipse.papyrus.uml.diagram.statemachine/debug/visualID"; //$NON-NLS-1$
 
 	/**
 	 * @generated
@@ -86,13 +86,13 @@ public class UMLVisualIDRegistry {
 	 * @generated
 	 */
 	public static boolean canCreateNode(View containerView, int nodeVisualID) {
-		String containerModelID = org.eclipse.papyrus.diagram.statemachine.part.UMLVisualIDRegistry.getModelID(containerView);
+		String containerModelID = org.eclipse.papyrus.uml.diagram.statemachine.part.UMLVisualIDRegistry.getModelID(containerView);
 		if(!PackageEditPart.MODEL_ID.equals(containerModelID)) {
 			return false;
 		}
 		int containerVisualID;
 		if(PackageEditPart.MODEL_ID.equals(containerModelID)) {
-			containerVisualID = org.eclipse.papyrus.diagram.statemachine.part.UMLVisualIDRegistry.getVisualID(containerView);
+			containerVisualID = org.eclipse.papyrus.uml.diagram.statemachine.part.UMLVisualIDRegistry.getVisualID(containerView);
 		} else {
 			if(containerView instanceof Diagram) {
 				containerVisualID = PackageEditPart.VISUAL_ID;
@@ -384,13 +384,13 @@ public class UMLVisualIDRegistry {
 		if(domainElement == null) {
 			return -1;
 		}
-		String containerModelID = org.eclipse.papyrus.diagram.statemachine.part.UMLVisualIDRegistry.getModelID(containerView);
+		String containerModelID = org.eclipse.papyrus.uml.diagram.statemachine.part.UMLVisualIDRegistry.getModelID(containerView);
 		if(!PackageEditPart.MODEL_ID.equals(containerModelID)) {
 			return -1;
 		}
 		int containerVisualID;
 		if(PackageEditPart.MODEL_ID.equals(containerModelID)) {
-			containerVisualID = org.eclipse.papyrus.diagram.statemachine.part.UMLVisualIDRegistry.getVisualID(containerView);
+			containerVisualID = org.eclipse.papyrus.uml.diagram.statemachine.part.UMLVisualIDRegistry.getVisualID(containerView);
 		} else {
 			if(containerView instanceof Diagram) {
 				containerVisualID = PackageEditPart.VISUAL_ID;
@@ -641,7 +641,7 @@ public class UMLVisualIDRegistry {
 				return -1;
 			}
 		}
-		return org.eclipse.papyrus.diagram.statemachine.part.UMLVisualIDRegistry.getVisualID(view.getType());
+		return org.eclipse.papyrus.uml.diagram.statemachine.part.UMLVisualIDRegistry.getVisualID(view.getType());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/part/ValidateAction.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/part/ValidateAction.java
index 061e27cc19a..3748a899e37 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/part/ValidateAction.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/part/ValidateAction.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.part;
+package org.eclipse.papyrus.uml.diagram.statemachine.part;
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
@@ -29,8 +29,8 @@ import org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLMarkerNavigationProvider;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLValidationProvider;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLMarkerNavigationProvider;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLValidationProvider;
 import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.IWorkbenchPart;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/preferences/ConnectionPointReferencePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/preferences/ConnectionPointReferencePreferencePage.java
index 8dd4211a2bd..d2a7efb9bd1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/preferences/ConnectionPointReferencePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/preferences/ConnectionPointReferencePreferencePage.java
@@ -1,10 +1,10 @@
-package org.eclipse.papyrus.diagram.statemachine.preferences;
+package org.eclipse.papyrus.uml.diagram.statemachine.preferences;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PackageEditPart;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLDiagramEditorPlugin;
 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;
 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PackageEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLDiagramEditorPlugin;
 
 /**
  * @generated
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/preferences/DiagramAppearancePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/preferences/DiagramAppearancePreferencePage.java
index 6b4d34047ba..5d3af5ac287 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/preferences/DiagramAppearancePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/preferences/DiagramAppearancePreferencePage.java
@@ -1,7 +1,7 @@
-package org.eclipse.papyrus.diagram.statemachine.preferences;
+package org.eclipse.papyrus.uml.diagram.statemachine.preferences;
 
 import org.eclipse.gmf.runtime.diagram.ui.preferences.AppearancePreferencePage;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLDiagramEditorPlugin;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLDiagramEditorPlugin;
 
 /**
  * @generated
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/preferences/DiagramConnectionsPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/preferences/DiagramConnectionsPreferencePage.java
index ee6f97fc080..a7067eebb24 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/preferences/DiagramConnectionsPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/preferences/DiagramConnectionsPreferencePage.java
@@ -1,7 +1,7 @@
-package org.eclipse.papyrus.diagram.statemachine.preferences;
+package org.eclipse.papyrus.uml.diagram.statemachine.preferences;
 
 import org.eclipse.gmf.runtime.diagram.ui.preferences.ConnectionsPreferencePage;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLDiagramEditorPlugin;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLDiagramEditorPlugin;
 
 /**
  * @generated
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/preferences/DiagramGeneralPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/preferences/DiagramGeneralPreferencePage.java
index b14e4967ba4..b6154ba785b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/preferences/DiagramGeneralPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/preferences/DiagramGeneralPreferencePage.java
@@ -1,8 +1,8 @@
-package org.eclipse.papyrus.diagram.statemachine.preferences;
+package org.eclipse.papyrus.uml.diagram.statemachine.preferences;
 
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PackageEditPart;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLDiagramEditorPlugin;
 import org.eclipse.papyrus.preferences.pages.DiagramPreferencePage;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PackageEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLDiagramEditorPlugin;
 
 /**
  * @generated
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/preferences/DiagramPreferenceInitializer.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/preferences/DiagramPreferenceInitializer.java
index 622f983e87c..a77eafd9d7e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/preferences/DiagramPreferenceInitializer.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/preferences/DiagramPreferenceInitializer.java
@@ -1,8 +1,8 @@
-package org.eclipse.papyrus.diagram.statemachine.preferences;
+package org.eclipse.papyrus.uml.diagram.statemachine.preferences;
 
 import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLDiagramEditorPlugin;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLDiagramEditorPlugin;
 
 /**
  * @generated
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/preferences/DiagramPrintingPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/preferences/DiagramPrintingPreferencePage.java
index ed47a45c616..4bb34dce18f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/preferences/DiagramPrintingPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/preferences/DiagramPrintingPreferencePage.java
@@ -1,7 +1,7 @@
-package org.eclipse.papyrus.diagram.statemachine.preferences;
+package org.eclipse.papyrus.uml.diagram.statemachine.preferences;
 
 import org.eclipse.gmf.runtime.diagram.ui.preferences.PrintingPreferencePage;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLDiagramEditorPlugin;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLDiagramEditorPlugin;
 
 /**
  * @generated
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/preferences/DiagramRulersAndGridPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/preferences/DiagramRulersAndGridPreferencePage.java
index 3b897132d84..0acb3f574bd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/preferences/DiagramRulersAndGridPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/preferences/DiagramRulersAndGridPreferencePage.java
@@ -1,7 +1,7 @@
-package org.eclipse.papyrus.diagram.statemachine.preferences;
+package org.eclipse.papyrus.uml.diagram.statemachine.preferences;
 
 import org.eclipse.gmf.runtime.diagram.ui.preferences.RulerGridPreferencePage;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLDiagramEditorPlugin;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLDiagramEditorPlugin;
 
 /**
  * @generated
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/preferences/FinalStatePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/preferences/FinalStatePreferencePage.java
index 71bf70b0f68..bb4d8eeddb9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/preferences/FinalStatePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/preferences/FinalStatePreferencePage.java
@@ -1,10 +1,10 @@
-package org.eclipse.papyrus.diagram.statemachine.preferences;
+package org.eclipse.papyrus.uml.diagram.statemachine.preferences;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PackageEditPart;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLDiagramEditorPlugin;
 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;
 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PackageEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLDiagramEditorPlugin;
 
 /**
  * @generated
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/preferences/GeneralizationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/preferences/GeneralizationPreferencePage.java
index 0d423872aef..fc0c9d585fc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/preferences/GeneralizationPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/preferences/GeneralizationPreferencePage.java
@@ -1,9 +1,9 @@
-package org.eclipse.papyrus.diagram.statemachine.preferences;
+package org.eclipse.papyrus.uml.diagram.statemachine.preferences;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PackageEditPart;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLDiagramEditorPlugin;
 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusLinkPreferencePage;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PackageEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLDiagramEditorPlugin;
 
 /**
  * @generated
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/preferences/PseudostatePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/preferences/PseudostatePreferencePage.java
index e695a77de29..0369ef1c06d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/preferences/PseudostatePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/preferences/PseudostatePreferencePage.java
@@ -1,10 +1,10 @@
-package org.eclipse.papyrus.diagram.statemachine.preferences;
+package org.eclipse.papyrus.uml.diagram.statemachine.preferences;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PackageEditPart;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLDiagramEditorPlugin;
 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;
 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PackageEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLDiagramEditorPlugin;
 
 /**
  * @generated
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/preferences/RegionPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/preferences/RegionPreferencePage.java
index fb9b562c31d..4710e2e4c19 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/preferences/RegionPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/preferences/RegionPreferencePage.java
@@ -1,10 +1,10 @@
-package org.eclipse.papyrus.diagram.statemachine.preferences;
+package org.eclipse.papyrus.uml.diagram.statemachine.preferences;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PackageEditPart;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLDiagramEditorPlugin;
 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;
 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PackageEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLDiagramEditorPlugin;
 
 /**
  * @generated
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/preferences/StateMachinePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/preferences/StateMachinePreferencePage.java
index 222f7c6014e..7acf73bc4de 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/preferences/StateMachinePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/preferences/StateMachinePreferencePage.java
@@ -1,10 +1,10 @@
-package org.eclipse.papyrus.diagram.statemachine.preferences;
+package org.eclipse.papyrus.uml.diagram.statemachine.preferences;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PackageEditPart;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLDiagramEditorPlugin;
 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;
 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PackageEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLDiagramEditorPlugin;
 
 /**
  * @generated
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/preferences/StatePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/preferences/StatePreferencePage.java
index c13b17c8707..e5ff9162be1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/preferences/StatePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/preferences/StatePreferencePage.java
@@ -1,10 +1,10 @@
-package org.eclipse.papyrus.diagram.statemachine.preferences;
+package org.eclipse.papyrus.uml.diagram.statemachine.preferences;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PackageEditPart;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLDiagramEditorPlugin;
 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;
 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PackageEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLDiagramEditorPlugin;
 
 /**
  * @generated
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/preferences/TransitionPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/preferences/TransitionPreferencePage.java
index 7856f52de34..540a92fdc8c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/preferences/TransitionPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/preferences/TransitionPreferencePage.java
@@ -1,9 +1,9 @@
-package org.eclipse.papyrus.diagram.statemachine.preferences;
+package org.eclipse.papyrus.uml.diagram.statemachine.preferences;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PackageEditPart;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLDiagramEditorPlugin;
 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusLinkPreferencePage;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PackageEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLDiagramEditorPlugin;
 
 /**
  * @generated
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/providers/ElementInitializers.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/providers/ElementInitializers.java
index b009361085d..07524243a3c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/providers/ElementInitializers.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/providers/ElementInitializers.java
@@ -1,10 +1,10 @@
-package org.eclipse.papyrus.diagram.statemachine.providers;
+package org.eclipse.papyrus.uml.diagram.statemachine.providers;
 
 import java.util.Iterator;
 
-import org.eclipse.papyrus.diagram.common.helper.NamedElementHelper;
-import org.eclipse.papyrus.diagram.statemachine.custom.expressions.UMLAbstractExpression;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLDiagramEditorPlugin;
+import org.eclipse.papyrus.uml.diagram.common.helper.NamedElementHelper;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.expressions.UMLAbstractExpression;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLDiagramEditorPlugin;
 import org.eclipse.uml2.uml.ConnectionPointReference;
 import org.eclipse.uml2.uml.Element;
 import org.eclipse.uml2.uml.FinalState;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/providers/UMLEditPartProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/providers/UMLEditPartProvider.java
index 24f22efb3dc..358013dd4ea 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/providers/UMLEditPartProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/providers/UMLEditPartProvider.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.providers;
+package org.eclipse.papyrus.uml.diagram.statemachine.providers;
 
 import java.lang.ref.WeakReference;
 
@@ -10,9 +10,9 @@ import org.eclipse.gmf.runtime.diagram.ui.services.editpart.AbstractEditPartProv
 import org.eclipse.gmf.runtime.diagram.ui.services.editpart.CreateGraphicEditPartOperation;
 import org.eclipse.gmf.runtime.diagram.ui.services.editpart.IEditPartOperation;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PackageEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.UMLEditPartFactory;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PackageEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.UMLEditPartFactory;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLVisualIDRegistry;
 
 /**
  * @generated
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/providers/UMLElementTypes.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/providers/UMLElementTypes.java
index 044fe66a996..d5351436987 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/providers/UMLElementTypes.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/providers/UMLElementTypes.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.providers;
+package org.eclipse.papyrus.uml.diagram.statemachine.providers;
 
 import java.util.HashSet;
 import java.util.IdentityHashMap;
@@ -14,25 +14,25 @@ import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
 import org.eclipse.gmf.runtime.emf.type.core.IElementType;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.ConnectionPointReferenceEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.FinalStateEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.GeneralizationEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PackageEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateChoiceEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateDeepHistoryEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateEntryPointEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateExitPointEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateForkEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateInitialEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateJoinEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateJunctionEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateShallowHistoryEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateTerminateEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.RegionEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.StateEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.StateMachineEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.TransitionEditPart;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLDiagramEditorPlugin;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.ConnectionPointReferenceEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.FinalStateEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.GeneralizationEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PackageEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateChoiceEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateDeepHistoryEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateEntryPointEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateExitPointEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateForkEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateInitialEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateJoinEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateJunctionEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateShallowHistoryEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateTerminateEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.RegionEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.StateEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.StateMachineEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.TransitionEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLDiagramEditorPlugin;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.uml2.uml.UMLPackage;
 
@@ -59,92 +59,92 @@ public class UMLElementTypes {
 	/**
 	 * @generated
 	 */
-	public static final IElementType Package_1000 = getElementType("org.eclipse.papyrus.diagram.statemachine.Package_1000"); //$NON-NLS-1$
+	public static final IElementType Package_1000 = getElementType("org.eclipse.papyrus.uml.diagram.statemachine.Package_1000"); //$NON-NLS-1$
 
 	/**
 	 * @generated
 	 */
-	public static final IElementType StateMachine_2000 = getElementType("org.eclipse.papyrus.diagram.statemachine.StateMachine_2000"); //$NON-NLS-1$
+	public static final IElementType StateMachine_2000 = getElementType("org.eclipse.papyrus.uml.diagram.statemachine.StateMachine_2000"); //$NON-NLS-1$
 
 	/**
 	 * @generated
 	 */
-	public static final IElementType Region_3000 = getElementType("org.eclipse.papyrus.diagram.statemachine.Region_3000"); //$NON-NLS-1$
+	public static final IElementType Region_3000 = getElementType("org.eclipse.papyrus.uml.diagram.statemachine.Region_3000"); //$NON-NLS-1$
 
 	/**
 	 * @generated
 	 */
-	public static final IElementType FinalState_5000 = getElementType("org.eclipse.papyrus.diagram.statemachine.FinalState_5000"); //$NON-NLS-1$
+	public static final IElementType FinalState_5000 = getElementType("org.eclipse.papyrus.uml.diagram.statemachine.FinalState_5000"); //$NON-NLS-1$
 
 	/**
 	 * @generated
 	 */
-	public static final IElementType State_6000 = getElementType("org.eclipse.papyrus.diagram.statemachine.State_6000"); //$NON-NLS-1$
+	public static final IElementType State_6000 = getElementType("org.eclipse.papyrus.uml.diagram.statemachine.State_6000"); //$NON-NLS-1$
 
 	/**
 	 * @generated
 	 */
-	public static final IElementType Pseudostate_8000 = getElementType("org.eclipse.papyrus.diagram.statemachine.Pseudostate_8000"); //$NON-NLS-1$
+	public static final IElementType Pseudostate_8000 = getElementType("org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_8000"); //$NON-NLS-1$
 
 	/**
 	 * @generated
 	 */
-	public static final IElementType Pseudostate_9000 = getElementType("org.eclipse.papyrus.diagram.statemachine.Pseudostate_9000"); //$NON-NLS-1$
+	public static final IElementType Pseudostate_9000 = getElementType("org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_9000"); //$NON-NLS-1$
 
 	/**
 	 * @generated
 	 */
-	public static final IElementType Pseudostate_10000 = getElementType("org.eclipse.papyrus.diagram.statemachine.Pseudostate_10000"); //$NON-NLS-1$
+	public static final IElementType Pseudostate_10000 = getElementType("org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_10000"); //$NON-NLS-1$
 
 	/**
 	 * @generated
 	 */
-	public static final IElementType Pseudostate_11000 = getElementType("org.eclipse.papyrus.diagram.statemachine.Pseudostate_11000"); //$NON-NLS-1$
+	public static final IElementType Pseudostate_11000 = getElementType("org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_11000"); //$NON-NLS-1$
 
 	/**
 	 * @generated
 	 */
-	public static final IElementType Pseudostate_12000 = getElementType("org.eclipse.papyrus.diagram.statemachine.Pseudostate_12000"); //$NON-NLS-1$
+	public static final IElementType Pseudostate_12000 = getElementType("org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_12000"); //$NON-NLS-1$
 
 	/**
 	 * @generated
 	 */
-	public static final IElementType Pseudostate_13000 = getElementType("org.eclipse.papyrus.diagram.statemachine.Pseudostate_13000"); //$NON-NLS-1$
+	public static final IElementType Pseudostate_13000 = getElementType("org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_13000"); //$NON-NLS-1$
 
 	/**
 	 * @generated
 	 */
-	public static final IElementType Pseudostate_14000 = getElementType("org.eclipse.papyrus.diagram.statemachine.Pseudostate_14000"); //$NON-NLS-1$
+	public static final IElementType Pseudostate_14000 = getElementType("org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_14000"); //$NON-NLS-1$
 
 	/**
 	 * @generated
 	 */
-	public static final IElementType Pseudostate_15000 = getElementType("org.eclipse.papyrus.diagram.statemachine.Pseudostate_15000"); //$NON-NLS-1$
+	public static final IElementType Pseudostate_15000 = getElementType("org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_15000"); //$NON-NLS-1$
 
 	/**
 	 * @generated
 	 */
-	public static final IElementType Pseudostate_16000 = getElementType("org.eclipse.papyrus.diagram.statemachine.Pseudostate_16000"); //$NON-NLS-1$
+	public static final IElementType Pseudostate_16000 = getElementType("org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_16000"); //$NON-NLS-1$
 
 	/**
 	 * @generated
 	 */
-	public static final IElementType Pseudostate_17000 = getElementType("org.eclipse.papyrus.diagram.statemachine.Pseudostate_17000"); //$NON-NLS-1$
+	public static final IElementType Pseudostate_17000 = getElementType("org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_17000"); //$NON-NLS-1$
 
 	/**
 	 * @generated
 	 */
-	public static final IElementType ConnectionPointReference_18000 = getElementType("org.eclipse.papyrus.diagram.statemachine.ConnectionPointReference_18000"); //$NON-NLS-1$
+	public static final IElementType ConnectionPointReference_18000 = getElementType("org.eclipse.papyrus.uml.diagram.statemachine.ConnectionPointReference_18000"); //$NON-NLS-1$
 
 	/**
 	 * @generated
 	 */
-	public static final IElementType Transition_7000 = getElementType("org.eclipse.papyrus.diagram.statemachine.Transition_7000"); //$NON-NLS-1$
+	public static final IElementType Transition_7000 = getElementType("org.eclipse.papyrus.uml.diagram.statemachine.Transition_7000"); //$NON-NLS-1$
 
 	/**
 	 * @generated
 	 */
-	public static final IElementType Generalization_19000 = getElementType("org.eclipse.papyrus.diagram.statemachine.Generalization_19000"); //$NON-NLS-1$
+	public static final IElementType Generalization_19000 = getElementType("org.eclipse.papyrus.uml.diagram.statemachine.Generalization_19000"); //$NON-NLS-1$
 
 	/**
 	 * Returns 'type' of the ecore object associated with the hint.
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/providers/UMLIconProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/providers/UMLIconProvider.java
index 753f09305f5..88be0ef99d4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/providers/UMLIconProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/providers/UMLIconProvider.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.providers;
+package org.eclipse.papyrus.uml.diagram.statemachine.providers;
 
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.gmf.runtime.common.core.service.AbstractProvider;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/providers/UMLMarkerNavigationProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/providers/UMLMarkerNavigationProvider.java
index f60c132604c..0374a835107 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/providers/UMLMarkerNavigationProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/providers/UMLMarkerNavigationProvider.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.providers;
+package org.eclipse.papyrus.uml.diagram.statemachine.providers;
 
 import java.util.Arrays;
 import java.util.Map;
@@ -12,8 +12,8 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gef.EditPart;
 import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditor;
 import org.eclipse.gmf.runtime.emf.ui.providers.marker.AbstractModelMarkerNavigationProvider;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLDiagramEditorPlugin;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLDiagramEditorUtil;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLDiagramEditorPlugin;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLDiagramEditorUtil;
 
 /**
  * @generated
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/providers/UMLModelingAssistantProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/providers/UMLModelingAssistantProvider.java
index f8e4a0aa8c2..8fc0f70b908 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/providers/UMLModelingAssistantProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/providers/UMLModelingAssistantProvider.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.providers;
+package org.eclipse.papyrus.uml.diagram.statemachine.providers;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -17,26 +17,26 @@ import org.eclipse.gmf.runtime.emf.ui.services.modelingassistant.ModelingAssista
 import org.eclipse.gmf.runtime.notation.Diagram;
 import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.ConnectionPointReferenceEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.FinalStateEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PackageEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateChoiceEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateDeepHistoryEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateEntryPointEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateExitPointEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateForkEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateInitialEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateJoinEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateJunctionEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateShallowHistoryEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateTerminateEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.RegionCompartmentEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.StateCompartmentEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.StateEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.StateMachineCompartmentEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.StateMachineEditPart;
-import org.eclipse.papyrus.diagram.statemachine.part.Messages;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLDiagramEditorPlugin;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.ConnectionPointReferenceEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.FinalStateEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PackageEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateChoiceEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateDeepHistoryEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateEntryPointEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateExitPointEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateForkEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateInitialEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateJoinEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateJunctionEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateShallowHistoryEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateTerminateEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.RegionCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.StateCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.StateEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.StateMachineCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.StateMachineEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.Messages;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLDiagramEditorPlugin;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.dialogs.ElementListSelectionDialog;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/providers/UMLParserProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/providers/UMLParserProvider.java
index bc378dc946d..029d6216509 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/providers/UMLParserProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/providers/UMLParserProvider.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.providers;
+package org.eclipse.papyrus.uml.diagram.statemachine.providers;
 
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.emf.ecore.EAttribute;
@@ -12,40 +12,40 @@ import org.eclipse.gmf.runtime.common.ui.services.parser.ParserService;
 import org.eclipse.gmf.runtime.emf.type.core.IElementType;
 import org.eclipse.gmf.runtime.emf.ui.services.parser.ParserHintAdapter;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.diagram.common.parser.stereotype.AppliedStereotypeParser;
-import org.eclipse.papyrus.diagram.statemachine.custom.parsers.TransitionPropertiesParser;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.ConnectionPointReferenceNameEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.ConnectionPointReferenceStereotypeEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.FinalStateNameEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.FinalStateStereotypeEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.GeneralizationStereotypeEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateChoiceNameEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateChoiceStereotypeEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateDeepHistoryNameEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateDeepHistoryStereotypeEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateEntryPointNameEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateEntryPointStereotypeEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateExitPointNameEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateExitPointStereotypeEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateForkNameEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateForkStereotypeEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateInitialNameEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateInitialStereotypeEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateJoinNameEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateJoinStereotypeEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateJunctionNameEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateJunctionStereotypeEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateShallowHistoryNameEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateShallowHistoryStereotypeEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateTerminateNameEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateTerminateStereotypeEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.StateMachineNameEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.StateNameEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.TransitionGuardEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.TransitionNameEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.TransitionStereotypeEditPart;
-import org.eclipse.papyrus.diagram.statemachine.parsers.MessageFormatParser;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.common.parser.stereotype.AppliedStereotypeParser;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.parsers.TransitionPropertiesParser;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.ConnectionPointReferenceNameEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.ConnectionPointReferenceStereotypeEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.FinalStateNameEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.FinalStateStereotypeEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.GeneralizationStereotypeEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateChoiceNameEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateChoiceStereotypeEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateDeepHistoryNameEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateDeepHistoryStereotypeEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateEntryPointNameEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateEntryPointStereotypeEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateExitPointNameEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateExitPointStereotypeEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateForkNameEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateForkStereotypeEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateInitialNameEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateInitialStereotypeEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateJoinNameEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateJoinStereotypeEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateJunctionNameEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateJunctionStereotypeEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateShallowHistoryNameEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateShallowHistoryStereotypeEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateTerminateNameEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateTerminateStereotypeEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.StateMachineNameEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.StateNameEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.TransitionGuardEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.TransitionNameEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.TransitionStereotypeEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.parsers.MessageFormatParser;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLVisualIDRegistry;
 import org.eclipse.uml2.uml.UMLPackage;
 
 /**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/providers/UMLValidationDecoratorProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/providers/UMLValidationDecoratorProvider.java
index aeff7172b54..25f9ac6a29e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/providers/UMLValidationDecoratorProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/providers/UMLValidationDecoratorProvider.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.providers;
+package org.eclipse.papyrus.uml.diagram.statemachine.providers;
 
 import org.eclipse.gef.EditDomain;
 import org.eclipse.gef.EditPart;
@@ -11,10 +11,10 @@ import org.eclipse.gmf.runtime.diagram.ui.services.decorator.IDecoratorProvider;
 import org.eclipse.gmf.runtime.diagram.ui.services.decorator.IDecoratorTarget;
 import org.eclipse.gmf.runtime.notation.Edge;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.diagram.common.providers.ValidationDecoratorProvider;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PackageEditPart;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLDiagramEditor;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.common.providers.ValidationDecoratorProvider;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PackageEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLDiagramEditor;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLVisualIDRegistry;
 
 /**
  * @generated
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/providers/UMLValidationProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/providers/UMLValidationProvider.java
index d3b7d72d1ae..01eabfe738b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/providers/UMLValidationProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/providers/UMLValidationProvider.java
@@ -1,10 +1,10 @@
-package org.eclipse.papyrus.diagram.statemachine.providers;
+package org.eclipse.papyrus.uml.diagram.statemachine.providers;
 
 import org.eclipse.emf.transaction.TransactionalEditingDomain;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PackageEditPart;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLDiagramEditorPlugin;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PackageEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLDiagramEditorPlugin;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLVisualIDRegistry;
 
 /**
  * @generated
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/providers/UMLViewProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/providers/UMLViewProvider.java
index 95f2f80fb4c..66e96497bc9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/providers/UMLViewProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/providers/UMLViewProvider.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.providers;
+package org.eclipse.papyrus.uml.diagram.statemachine.providers;
 
 import java.util.ArrayList;
 
@@ -39,61 +39,61 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.gmf.runtime.notation.datatype.RelativeBendpoint;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.papyrus.diagram.common.helper.PreferenceInitializerForElementHelper;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.ConnectionPointReferenceEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.ConnectionPointReferenceNameEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.ConnectionPointReferenceStereotypeEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.FinalStateEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.FinalStateNameEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.FinalStateStereotypeEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.GeneralizationEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.GeneralizationStereotypeEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PackageEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateChoiceEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateChoiceNameEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateChoiceStereotypeEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateDeepHistoryEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateDeepHistoryNameEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateDeepHistoryStereotypeEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateEntryPointEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateEntryPointNameEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateEntryPointStereotypeEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateExitPointEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateExitPointNameEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateExitPointStereotypeEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateForkEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateForkNameEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateForkStereotypeEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateInitialEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateInitialNameEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateInitialStereotypeEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateJoinEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateJoinNameEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateJoinStereotypeEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateJunctionEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateJunctionNameEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateJunctionStereotypeEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateShallowHistoryEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateShallowHistoryNameEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateShallowHistoryStereotypeEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateTerminateEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateTerminateNameEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.PseudostateTerminateStereotypeEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.RegionCompartmentEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.RegionEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.StateCompartmentEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.StateEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.StateMachineCompartmentEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.StateMachineEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.StateMachineNameEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.StateNameEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.TransitionEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.TransitionGuardEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.TransitionNameEditPart;
-import org.eclipse.papyrus.diagram.statemachine.edit.parts.TransitionStereotypeEditPart;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLVisualIDRegistry;
 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;
 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.ConnectionPointReferenceEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.ConnectionPointReferenceNameEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.ConnectionPointReferenceStereotypeEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.FinalStateEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.FinalStateNameEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.FinalStateStereotypeEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.GeneralizationEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.GeneralizationStereotypeEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PackageEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateChoiceEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateChoiceNameEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateChoiceStereotypeEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateDeepHistoryEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateDeepHistoryNameEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateDeepHistoryStereotypeEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateEntryPointEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateEntryPointNameEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateEntryPointStereotypeEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateExitPointEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateExitPointNameEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateExitPointStereotypeEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateForkEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateForkNameEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateForkStereotypeEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateInitialEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateInitialNameEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateInitialStereotypeEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateJoinEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateJoinNameEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateJoinStereotypeEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateJunctionEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateJunctionNameEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateJunctionStereotypeEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateShallowHistoryEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateShallowHistoryNameEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateShallowHistoryStereotypeEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateTerminateEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateTerminateNameEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PseudostateTerminateStereotypeEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.RegionCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.RegionEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.StateCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.StateEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.StateMachineCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.StateMachineEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.StateMachineNameEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.StateNameEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.TransitionEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.TransitionGuardEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.TransitionNameEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.TransitionStereotypeEditPart;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLVisualIDRegistry;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.FontData;
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/sheet/UMLPropertySection.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/sheet/UMLPropertySection.java
index b2c36b540ff..24c835d3b7e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/sheet/UMLPropertySection.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/sheet/UMLPropertySection.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.sheet;
+package org.eclipse.papyrus.uml.diagram.statemachine.sheet;
 
 import java.util.ArrayList;
 import java.util.Iterator;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/sheet/UMLSheetLabelProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/sheet/UMLSheetLabelProvider.java
index 50b638abaca..2143862238d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/diagram/statemachine/sheet/UMLSheetLabelProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/sheet/UMLSheetLabelProvider.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.statemachine.sheet;
+package org.eclipse.papyrus.uml.diagram.statemachine.sheet;
 
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.gmf.runtime.emf.type.core.IElementType;
@@ -6,9 +6,9 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.viewers.BaseLabelProvider;
 import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.papyrus.diagram.statemachine.navigator.UMLNavigatorGroup;
-import org.eclipse.papyrus.diagram.statemachine.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.diagram.statemachine.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.statemachine.navigator.UMLNavigatorGroup;
+import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLElementTypes;
 import org.eclipse.swt.graphics.Image;
 
 /**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/.options b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/.options
index b0abf62dc94..164ab40eab5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/.options
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/.options
@@ -1,7 +1,7 @@
-# Tracing options for the org.eclipse.papyrus.diagram.usecase plug-in

+# Tracing options for the org.eclipse.papyrus.uml.diagram.usecase plug-in

 

 # Common issues

-org.eclipse.papyrus.diagram.usecase/debug=false

+org.eclipse.papyrus.uml.diagram.usecase/debug=false

 

 # Visual IDs

-org.eclipse.papyrus.diagram.usecase/debug/visualID=false

+org.eclipse.papyrus.uml.diagram.usecase/debug/visualID=false

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/META-INF/MANIFEST.MF
index 6a13ff72876..18e6ff11a0d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/META-INF/MANIFEST.MF
@@ -1,20 +1,20 @@
 Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.diagram.usecase,

- org.eclipse.papyrus.diagram.usecase.command,

- org.eclipse.papyrus.diagram.usecase.draw2d,

- org.eclipse.papyrus.diagram.usecase.edit.commands,

- org.eclipse.papyrus.diagram.usecase.edit.helpers,

- org.eclipse.papyrus.diagram.usecase.edit.parts,

- org.eclipse.papyrus.diagram.usecase.edit.policies,

- org.eclipse.papyrus.diagram.usecase.expressions,

- org.eclipse.papyrus.diagram.usecase.figure,

- org.eclipse.papyrus.diagram.usecase.helper,

- org.eclipse.papyrus.diagram.usecase.navigator,

- org.eclipse.papyrus.diagram.usecase.parsers,

- org.eclipse.papyrus.diagram.usecase.part,

- org.eclipse.papyrus.diagram.usecase.preferences,

- org.eclipse.papyrus.diagram.usecase.providers,

- org.eclipse.papyrus.diagram.usecase.sheet

+Export-Package: org.eclipse.papyrus.uml.diagram.usecase,

+ org.eclipse.papyrus.uml.diagram.usecase.command,

+ org.eclipse.papyrus.uml.diagram.usecase.draw2d,

+ org.eclipse.papyrus.uml.diagram.usecase.edit.commands,

+ org.eclipse.papyrus.uml.diagram.usecase.edit.helpers,

+ org.eclipse.papyrus.uml.diagram.usecase.edit.parts,

+ org.eclipse.papyrus.uml.diagram.usecase.edit.policies,

+ org.eclipse.papyrus.uml.diagram.usecase.expressions,

+ org.eclipse.papyrus.uml.diagram.usecase.figure,

+ org.eclipse.papyrus.uml.diagram.usecase.helper,

+ org.eclipse.papyrus.uml.diagram.usecase.navigator,

+ org.eclipse.papyrus.uml.diagram.usecase.parsers,

+ org.eclipse.papyrus.uml.diagram.usecase.part,

+ org.eclipse.papyrus.uml.diagram.usecase.preferences,

+ org.eclipse.papyrus.uml.diagram.usecase.providers,

+ org.eclipse.papyrus.uml.diagram.usecase.sheet

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

 Bundle-Name: %pluginName

@@ -60,7 +60,6 @@ Bundle-Vendor: %providerName
 Eclipse-LazyStart: true

 Bundle-Version: 0.9.0.qualifier

 Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.diagram.usecase.part.UMLDiagramE

- ditorPlugin

+Bundle-Activator: org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin

 Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.usecase;singleton:=true

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/diagram/usecase/CreateUseCaseDiagramCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/CreateUseCaseDiagramCommand.java
index cbeca101c26..18770592d94 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/diagram/usecase/CreateUseCaseDiagramCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/CreateUseCaseDiagramCommand.java
@@ -8,12 +8,12 @@
  * Contributors:
  *     Obeo - initial API and implementation
  *******************************************************************************/
-package org.eclipse.papyrus.diagram.usecase;
+package org.eclipse.papyrus.uml.diagram.usecase;
 
 import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
 import org.eclipse.papyrus.core.adaptor.gmf.AbstractPapyrusGmfCreateDiagramCommandHandler;
-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseDiagramEditPart;
-import org.eclipse.papyrus.diagram.usecase.part.UMLDiagramEditorPlugin;
+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseDiagramEditPart;
+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin;
 
 /**
  * Define a command to create a new UseCase Diagram. This command is used by all UI (toolbar,
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/diagram/usecase/CreateUseCaseDiagramWithNavigationHandler.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/CreateUseCaseDiagramWithNavigationHandler.java
index 39c8b1e7bd2..09439ab4efa 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/diagram/usecase/CreateUseCaseDiagramWithNavigationHandler.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/CreateUseCaseDiagramWithNavigationHandler.java
@@ -11,7 +11,7 @@
  *  Mathieu Velten (Atos Origin) mathieu.velten@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase;

+package org.eclipse.papyrus.uml.diagram.usecase;

 

 import org.eclipse.papyrus.navigation.CreateDiagramWithNavigationHandler;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/diagram/usecase/UmlUseCaseDiagramForMultiEditor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/UmlUseCaseDiagramForMultiEditor.java
index c752359f454..dee3a6e6658 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/diagram/usecase/UmlUseCaseDiagramForMultiEditor.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/UmlUseCaseDiagramForMultiEditor.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase;

+package org.eclipse.papyrus.uml.diagram.usecase;

 

 import org.eclipse.core.runtime.CoreException;

 import org.eclipse.emf.common.ui.URIEditorInput;

@@ -22,8 +22,8 @@ import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.papyrus.core.editor.BackboneException;

 import org.eclipse.papyrus.core.services.ServiceException;

 import org.eclipse.papyrus.core.services.ServicesRegistry;

-import org.eclipse.papyrus.diagram.usecase.part.UMLDiagramEditor;

-import org.eclipse.papyrus.diagram.usecase.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditor;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin;

 import org.eclipse.swt.widgets.Composite;

 import org.eclipse.swt.widgets.Shell;

 import org.eclipse.ui.IEditorInput;

@@ -114,6 +114,6 @@ public class UmlUseCaseDiagramForMultiEditor extends UMLDiagramEditor {
 	 */

 	@Override

 	public String getEditingDomainID() {

-		return "org.eclipse.papyrus.diagram.usecase.EditingDomain";

+		return "org.eclipse.papyrus.uml.diagram.usecase.EditingDomain";

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/diagram/usecase/UseCaseDiagramCreationCondition.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/UseCaseDiagramCreationCondition.java
index 658d9c68a88..0766c67339d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/diagram/usecase/UseCaseDiagramCreationCondition.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/UseCaseDiagramCreationCondition.java
@@ -8,7 +8,7 @@
  * Contributors:

  *  Atos Origin - Initial API and implementation

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase;

+package org.eclipse.papyrus.uml.diagram.usecase;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.papyrus.core.extension.commands.PerspectiveContextDependence;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/diagram/usecase/UseCaseDiagramEditorFactory.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/UseCaseDiagramEditorFactory.java
index a93e6524b11..d1510cd6e37 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/diagram/usecase/UseCaseDiagramEditorFactory.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/UseCaseDiagramEditorFactory.java
@@ -11,10 +11,10 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase;

+package org.eclipse.papyrus.uml.diagram.usecase;

 

 import org.eclipse.papyrus.core.adaptor.gmf.GmfEditorFactory;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

 

 /**

  * The editor factory to launch the usecase diagram.

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/diagram/usecase/command/CreateAssociationSupplement.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/command/CreateAssociationSupplement.java
index 5132e1da9b7..70212a9d29b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/diagram/usecase/command/CreateAssociationSupplement.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/command/CreateAssociationSupplement.java
@@ -12,15 +12,15 @@
  *  Emilien Perico (Atos Origin) - adapt class for use case association

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.command;

+package org.eclipse.papyrus.uml.diagram.usecase.command;

 

 import java.util.List;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.transaction.TransactionalEditingDomain;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.papyrus.diagram.common.commands.SupplementCommand;

-import org.eclipse.papyrus.diagram.usecase.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.common.commands.SupplementCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.ElementInitializers;

 import org.eclipse.uml2.uml.Association;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.Property;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/diagram/usecase/command/CreateExtensionPointCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/command/CreateExtensionPointCommand.java
index 48a76e4a632..ed2713b1a36 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/diagram/usecase/command/CreateExtensionPointCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/command/CreateExtensionPointCommand.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.command;

+package org.eclipse.papyrus.uml.diagram.usecase.command;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -31,12 +31,12 @@ import org.eclipse.gmf.runtime.emf.type.core.IHintedType;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.papyrus.core.utils.EditorUtils;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.ExtensionPointCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ExtensionPointEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCasePointsEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCasePointsInComponentEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCasePointsInPackageEditPart;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ExtensionPointCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ExtensionPointEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCasePointsEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCasePointsInComponentEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCasePointsInPackageEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

 import org.eclipse.uml2.uml.Extend;

 import org.eclipse.uml2.uml.ExtensionPoint;

 import org.eclipse.uml2.uml.UseCase;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/diagram/usecase/draw2d/AbstractProportionalShape.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/draw2d/AbstractProportionalShape.java
index ec908ed107d..5dbe9df83ea 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/diagram/usecase/draw2d/AbstractProportionalShape.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/draw2d/AbstractProportionalShape.java
@@ -8,7 +8,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.draw2d;

+package org.eclipse.papyrus.uml.diagram.usecase.draw2d;

 

 import org.eclipse.draw2d.Shape;

 import org.eclipse.draw2d.geometry.Dimension;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/diagram/usecase/draw2d/ShadowShape.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/draw2d/ShadowShape.java
index a62ba85a5a6..6bedbad878e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/diagram/usecase/draw2d/ShadowShape.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/draw2d/ShadowShape.java
@@ -8,7 +8,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.draw2d;

+package org.eclipse.papyrus.uml.diagram.usecase.draw2d;

 

 import org.eclipse.draw2d.AbstractBorder;

 import org.eclipse.draw2d.Border;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/diagram/usecase/draw2d/StickMan.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/draw2d/StickMan.java
index be576ab3d65..fb2ea367d09 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/diagram/usecase/draw2d/StickMan.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/draw2d/StickMan.java
@@ -8,7 +8,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.draw2d;

+package org.eclipse.papyrus.uml.diagram.usecase.draw2d;

 

 import org.eclipse.draw2d.ColorConstants;

 import org.eclipse.draw2d.Graphics;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/diagram/usecase/edit/policies/AppliedStereotypeExtensionPointLabelDisplayEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/AppliedStereotypeExtensionPointLabelDisplayEditPolicy.java
index 0338168a12c..880e524190c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/diagram/usecase/edit/policies/AppliedStereotypeExtensionPointLabelDisplayEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/AppliedStereotypeExtensionPointLabelDisplayEditPolicy.java
@@ -11,11 +11,11 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.policies;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.policies;

 

 import org.eclipse.gef.GraphicalEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.helper.ExtensionPointLabelHelper;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.helper.ExtensionPointLabelHelper;

 import org.eclipse.uml2.uml.ExtensionPoint;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/diagram/usecase/edit/policies/CreateExtensionPointEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/CreateExtensionPointEditPolicy.java
index b7f48304c75..f43bb2e8024 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/diagram/usecase/edit/policies/CreateExtensionPointEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/CreateExtensionPointEditPolicy.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.policies;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.policies;

 

 import org.eclipse.core.runtime.IAdaptable;

 import org.eclipse.emf.ecore.EObject;

@@ -26,8 +26,8 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewRequest;
 import org.eclipse.gmf.runtime.emf.type.core.IHintedType;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.usecase.command.CreateExtensionPointCommand;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.usecase.command.CreateExtensionPointCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

 import org.eclipse.uml2.uml.Extend;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/diagram/usecase/edit/policies/CustomDiagramDragDropEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/CustomDiagramDragDropEditPolicy.java
index 4bd905661ee..d237604cb8d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/diagram/usecase/edit/policies/CustomDiagramDragDropEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/CustomDiagramDragDropEditPolicy.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.policies;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.policies;

 

 import java.util.Collection;

 import java.util.HashSet;

@@ -25,11 +25,11 @@ import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
 import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;

 import org.eclipse.gmf.runtime.emf.type.core.IElementType;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.editpolicies.OldCommonDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.diagram.usecase.helper.UseCaseLinkMappingHelper;

-import org.eclipse.papyrus.diagram.usecase.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.OldCommonDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AssociationEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.helper.UseCaseLinkMappingHelper;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

 import org.eclipse.uml2.uml.Element;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/diagram/usecase/figure/AbstractSubjectFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/figure/AbstractSubjectFigure.java
index d5b500ccf55..6e2367dd6f7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/diagram/usecase/figure/AbstractSubjectFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/figure/AbstractSubjectFigure.java
@@ -11,13 +11,13 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.figure;

+package org.eclipse.papyrus.uml.diagram.usecase.figure;

 

 import org.eclipse.draw2d.Label;

 import org.eclipse.draw2d.RectangleFigure;

-import org.eclipse.papyrus.diagram.common.draw2d.PileLayout;

-import org.eclipse.papyrus.diagram.common.figure.node.IPapyrusNodeUMLElementFigure;

-import org.eclipse.papyrus.diagram.common.helper.StereotypeFigureHelper;

+import org.eclipse.papyrus.uml.diagram.common.draw2d.PileLayout;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.IPapyrusNodeUMLElementFigure;

+import org.eclipse.papyrus.uml.diagram.common.helper.StereotypeFigureHelper;

 import org.eclipse.swt.graphics.Color;

 import org.eclipse.swt.graphics.Image;

 

@@ -62,7 +62,7 @@ public abstract class AbstractSubjectFigure extends RectangleFigure implements I
 	 *        the string representing the stereotypes to be displayed

 	 * @param image

 	 *        the image representing the stereotypes to be displayed

-	 * @see org.eclipse.papyrus.diagram.common.figure.node.IPapyrusUMLElementFigure#setStereotypeDisplay(java.lang.String,

+	 * @see org.eclipse.papyrus.uml.diagram.common.figure.node.IPapyrusUMLElementFigure#setStereotypeDisplay(java.lang.String,

 	 *      org.eclipse.swt.graphics.Image)

 	 */

 	public void setStereotypeDisplay(String stereotypes, Image image) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/diagram/usecase/figure/AssociationFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/figure/AssociationFigure.java
index 382770054f1..7b32c993337 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/diagram/usecase/figure/AssociationFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/figure/AssociationFigure.java
@@ -12,13 +12,13 @@
  *  Emilien Perico (Atos Origin) - adapt class for use case association

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.figure;

+package org.eclipse.papyrus.uml.diagram.usecase.figure;

 

 import org.eclipse.draw2d.Graphics;

 import org.eclipse.draw2d.PolylineDecoration;

 import org.eclipse.draw2d.RotatableDecoration;

 import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

-import org.eclipse.papyrus.diagram.common.figure.edge.UMLEdgeFigure;

+import org.eclipse.papyrus.uml.diagram.common.figure.edge.UMLEdgeFigure;

 import org.eclipse.swt.SWT;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/diagram/usecase/figure/UseCaseFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/figure/UseCaseFigure.java
index be170a0f912..7a79ddd6d42 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/diagram/usecase/figure/UseCaseFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/figure/UseCaseFigure.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.figure;

+package org.eclipse.papyrus.uml.diagram.usecase.figure;

 

 import org.eclipse.draw2d.Border;

 import org.eclipse.draw2d.Ellipse;

@@ -22,10 +22,10 @@ import org.eclipse.gmf.runtime.draw2d.ui.figures.GravityConstrainedFlowLayout;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

 import org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode;

 import org.eclipse.gmf.runtime.draw2d.ui.mapmode.MapModeUtil;

-import org.eclipse.papyrus.diagram.common.draw2d.SplitEllipseLayout;

-import org.eclipse.papyrus.diagram.common.figure.node.CenteredWrappedLabel;

-import org.eclipse.papyrus.diagram.common.figure.node.IPapyrusNodeUMLElementFigure;

-import org.eclipse.papyrus.diagram.common.helper.StereotypeFigureHelper;

+import org.eclipse.papyrus.uml.diagram.common.draw2d.SplitEllipseLayout;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.CenteredWrappedLabel;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.IPapyrusNodeUMLElementFigure;

+import org.eclipse.papyrus.uml.diagram.common.helper.StereotypeFigureHelper;

 import org.eclipse.swt.graphics.Image;

 

 /**

@@ -153,7 +153,7 @@ public class UseCaseFigure extends Ellipse implements IPapyrusNodeUMLElementFigu
 	 *        the string representing the stereotypes to be displayed

 	 * @param image

 	 *        the image representing the stereotypes to be displayed

-	 * @see org.eclipse.papyrus.diagram.common.figure.node.IPapyrusUMLElementFigure#setStereotypeDisplay(java.lang.String,

+	 * @see org.eclipse.papyrus.uml.diagram.common.figure.node.IPapyrusUMLElementFigure#setStereotypeDisplay(java.lang.String,

 	 *      org.eclipse.swt.graphics.Image)

 	 */

 	public void setStereotypeDisplay(String stereotypes, Image image) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/diagram/usecase/figure/UseCaseNodeFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/figure/UseCaseNodeFigure.java
index b6e158748b2..a9cc942e9cf 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/diagram/usecase/figure/UseCaseNodeFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/figure/UseCaseNodeFigure.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.figure;

+package org.eclipse.papyrus.uml.diagram.usecase.figure;

 

 import org.eclipse.draw2d.ConnectionAnchor;

 import org.eclipse.draw2d.geometry.Dimension;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/diagram/usecase/helper/ExtensionPointLabelHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/helper/ExtensionPointLabelHelper.java
index f26692826fa..315a2269618 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/diagram/usecase/helper/ExtensionPointLabelHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/helper/ExtensionPointLabelHelper.java
@@ -11,14 +11,14 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.helper;

+package org.eclipse.papyrus.uml.diagram.usecase.helper;

 

 import java.util.Collection;

 

 import org.eclipse.draw2d.IFigure;

 import org.eclipse.gef.GraphicalEditPart;

 import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

-import org.eclipse.papyrus.diagram.common.helper.StereotypedElementLabelHelper;

+import org.eclipse.papyrus.uml.diagram.common.helper.StereotypedElementLabelHelper;

 import org.eclipse.swt.graphics.Image;

 import org.eclipse.uml2.uml.NamedElement;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/diagram/usecase/helper/UseCaseLinkMappingHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/helper/UseCaseLinkMappingHelper.java
index 3962bb80344..4f11d1924ff 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/diagram/usecase/helper/UseCaseLinkMappingHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/helper/UseCaseLinkMappingHelper.java
@@ -11,14 +11,14 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.helper;

+package org.eclipse.papyrus.uml.diagram.usecase.helper;

 

 import java.util.Collection;

 

-import org.eclipse.papyrus.diagram.common.helper.ILinkMappingHelper;

-import org.eclipse.papyrus.diagram.common.helper.LinkMappingHelper;

-import org.eclipse.papyrus.diagram.common.helper.LinkMappingHelper.CommonSourceUMLSwitch;

-import org.eclipse.papyrus.diagram.common.helper.LinkMappingHelper.CommonTargetUMLSwitch;

+import org.eclipse.papyrus.uml.diagram.common.helper.ILinkMappingHelper;

+import org.eclipse.papyrus.uml.diagram.common.helper.LinkMappingHelper;

+import org.eclipse.papyrus.uml.diagram.common.helper.LinkMappingHelper.CommonSourceUMLSwitch;

+import org.eclipse.papyrus.uml.diagram.common.helper.LinkMappingHelper.CommonTargetUMLSwitch;

 import org.eclipse.uml2.uml.Element;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/diagram/usecase/providers/CustomEditPolicyProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/providers/CustomEditPolicyProvider.java
index dc0dda0e556..a7673d79a2a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/diagram/usecase/providers/CustomEditPolicyProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/providers/CustomEditPolicyProvider.java
@@ -11,7 +11,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.providers;

+package org.eclipse.papyrus.uml.diagram.usecase.providers;

 

 import org.eclipse.gef.EditPart;

 import org.eclipse.gmf.runtime.common.core.service.IOperation;

@@ -21,11 +21,11 @@ import org.eclipse.gmf.runtime.diagram.ui.editparts.IPrimaryEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.diagram.ui.services.editpolicy.CreateEditPoliciesOperation;

 import org.eclipse.gmf.runtime.diagram.ui.services.editpolicy.IEditPolicyProvider;

-import org.eclipse.papyrus.diagram.common.editpolicies.ApplyStereotypeEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.NavigationEditPolicy;

-import org.eclipse.papyrus.diagram.common.service.ApplyStereotypeRequest;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ApplyStereotypeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.NavigationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.service.ApplyStereotypeRequest;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

 

 /**

  * this is an editpolicy provider in charge to install a policy to navigate between diagrams and elements

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/models/usecaseDiagram.gmfgen b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/models/usecaseDiagram.gmfgen
index 406fa3d2f2a..72b9805527e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/models/usecaseDiagram.gmfgen
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/models/usecaseDiagram.gmfgen
@@ -5,7 +5,7 @@
     xmlns:gmfgen="http://www.eclipse.org/gmf/2009/GenModel"

     xmlns:papyrusgmfgenextension="http://www.eclipse.org/papyrus/2009/papyrusgmfgenextension">

   <gmfgen:GenEditorGenerator

-      packageNamePrefix="org.eclipse.papyrus.diagram.usecase"

+      packageNamePrefix="org.eclipse.papyrus.uml.diagram.usecase"

       modelID="UseCase"

       domainFileExtension="PapyrusUMLUsecase"

       dynamicTemplates="true"

@@ -32,7 +32,7 @@
       <behaviour

           xsi:type="gmfgen:CustomBehaviour"

           key="EditPolicyRoles.DRAG_DROP_ROLE"

-          editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.usecase.edit.policies.CustomDiagramDragDropEditPolicy"/>

+          editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.usecase.edit.policies.CustomDiagramDragDropEditPolicy"/>

       <domainDiagramElement

           href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package"/>

       <childNodes

@@ -55,8 +55,8 @@
             figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.usecase.edit.policies.AppliedStereotypeExtensionPointLabelDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.usecase.edit.policies.AppliedStereotypeExtensionPointLabelDisplayEditPolicy"/>

         <modelFacet>

           <metaClass

               href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/ExtensionPoint"/>

@@ -102,8 +102,8 @@
             figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.usecase.edit.policies.AppliedStereotypeExtensionPointLabelDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.usecase.edit.policies.AppliedStereotypeExtensionPointLabelDisplayEditPolicy"/>

         <modelFacet>

           <metaClass

               href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/ExtensionPoint"/>

@@ -146,7 +146,7 @@
             metamodelType="/0/@diagram/@topLevelNodes.2/@elementType"/>

         <viewmap

             xsi:type="gmfgen:FigureViewmap"

-            figureQualifiedClassName="org.eclipse.papyrus.diagram.usecase.figure.UseCaseFigure">

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.usecase.figure.UseCaseFigure">

           <attributes

               xsi:type="gmfgen:DefaultSizeAttributes"

               width="140"

@@ -155,19 +155,19 @@
         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.POPUPBAR_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.usecase.edit.policies.CreateExtensionPointEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.usecase.edit.policies.CreateExtensionPointEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

         <modelFacet>

           <metaClass

               href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/UseCase"/>

@@ -224,7 +224,7 @@
         <viewmap

             xsi:type="gmfgen:InnerClassViewmap"

             className="UseCaseSubjectFigure"

-            classBody="&#xA;/**&#xA; * @generated&#xA; */&#xA;public class UseCaseSubjectFigure extends org.eclipse.draw2d.RectangleFigure {&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private org.eclipse.draw2d.RectangleFigure fUseCaseSubjectFigure_contents; &#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel fUseCaseSubjectFigure_name; &#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public UseCaseSubjectFigure() {&#xA;&#x9;&#x9;&#xA;&#x9;org.eclipse.papyrus.diagram.common.draw2d.PileLayout layoutThis = new org.eclipse.papyrus.diagram.common.draw2d.PileLayout();&#xA;&#xA;&#xA;&#xA;&#xA;layoutThis.setStretchBottom(&#xA;true);&#xA;&#xA;&#xA;&#x9;this.setLayoutManager(layoutThis);&#xA;&#xA;&#x9;&#x9;this.setLineWidth(1);&#xA;&#x9;this.setBackgroundColor(THIS_BACK&#xA;);&#xA;&#x9;&#x9;createContents();&#xA;&#x9;}&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private void createContents(){&#xA;&#xA;&#xA;org.eclipse.draw2d.RectangleFigure useCaseSubjectFigure_header0 = new org.eclipse.draw2d.RectangleFigure();&#xA;useCaseSubjectFigure_header0.setLineWidth(1);&#xA;&#xA;this.add(useCaseSubjectFigure_header0);&#xA;&#xA;&#x9;org.eclipse.papyrus.diagram.common.draw2d.CenterLayout layoutUseCaseSubjectFigure_header0 = new org.eclipse.papyrus.diagram.common.draw2d.CenterLayout();&#xA;&#xA;&#xA;&#x9;useCaseSubjectFigure_header0.setLayoutManager(layoutUseCaseSubjectFigure_header0);&#xA;&#xA;&#xA;&#xA;fUseCaseSubjectFigure_name = new org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel();&#xA;fUseCaseSubjectFigure_name.setText(&quot;&quot;);&#xA;&#xA;fUseCaseSubjectFigure_name.setFont(FUSECASESUBJECTFIGURE_NAME_FONT);&#xA;&#xA;&#xA;&#xA;fUseCaseSubjectFigure_name.setBorder(new org.eclipse.draw2d.MarginBorder(getMapMode().DPtoLP(0)&#xA;, getMapMode().DPtoLP(5)&#xA;, getMapMode().DPtoLP(5)&#xA;, getMapMode().DPtoLP(5)&#xA;));&#xA;&#xA;useCaseSubjectFigure_header0.add(fUseCaseSubjectFigure_name);&#xA;&#xA;&#xA;&#xA;&#xA;fUseCaseSubjectFigure_contents = new org.eclipse.draw2d.RectangleFigure();&#xA;fUseCaseSubjectFigure_contents.setLineWidth(1);&#xA;&#xA;this.add(fUseCaseSubjectFigure_contents);&#xA;fUseCaseSubjectFigure_contents.setLayoutManager(new org.eclipse.draw2d.StackLayout());&#xA;&#xA;&#xA;&#x9;}&#xA;&#xA;&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private boolean myUseLocalCoordinates = false;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;protected boolean useLocalCoordinates() {&#xA;&#x9;&#x9;return myUseLocalCoordinates;&#xA;&#x9;}&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;protected void setUseLocalCoordinates(boolean useLocalCoordinates) {&#xA;&#x9;&#x9;myUseLocalCoordinates = useLocalCoordinates;&#xA;&#x9;}&#xA;&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public org.eclipse.draw2d.RectangleFigure getUseCaseSubjectFigure_contents() {&#xA;&#x9;&#x9;return fUseCaseSubjectFigure_contents;&#xA;&#x9;}&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel getUseCaseSubjectFigure_name() {&#xA;&#x9;&#x9;return fUseCaseSubjectFigure_name;&#xA;&#x9;}&#xA;&#xA;&#xA;}&#xA;&#xA;/**&#xA; * @generated&#xA; */&#xA;static final org.eclipse.swt.graphics.Color THIS_BACK = new org.eclipse.swt.graphics.Color(null, 245, 245, 245);&#xA;&#xA;/**&#xA; * @generated&#xA; */&#xA;static final org.eclipse.swt.graphics.Font FUSECASESUBJECTFIGURE_NAME_FONT = new org.eclipse.swt.graphics.Font(org.eclipse.swt.widgets.Display.getCurrent(), org.eclipse.swt.widgets.Display.getDefault().getSystemFont().getFontData()[0].getName(), 9, org.eclipse.swt.SWT.NORMAL);&#xA;&#xA;">

+            classBody="&#xA;/**&#xA; * @generated&#xA; */&#xA;public class UseCaseSubjectFigure extends org.eclipse.draw2d.RectangleFigure {&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private org.eclipse.draw2d.RectangleFigure fUseCaseSubjectFigure_contents; &#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel fUseCaseSubjectFigure_name; &#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public UseCaseSubjectFigure() {&#xA;&#x9;&#x9;&#xA;&#x9;org.eclipse.papyrus.uml.diagram.common.draw2d.PileLayout layoutThis = new org.eclipse.papyrus.uml.diagram.common.draw2d.PileLayout();&#xA;&#xA;&#xA;&#xA;&#xA;layoutThis.setStretchBottom(&#xA;true);&#xA;&#xA;&#xA;&#x9;this.setLayoutManager(layoutThis);&#xA;&#xA;&#x9;&#x9;this.setLineWidth(1);&#xA;&#x9;this.setBackgroundColor(THIS_BACK&#xA;);&#xA;&#x9;&#x9;createContents();&#xA;&#x9;}&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private void createContents(){&#xA;&#xA;&#xA;org.eclipse.draw2d.RectangleFigure useCaseSubjectFigure_header0 = new org.eclipse.draw2d.RectangleFigure();&#xA;useCaseSubjectFigure_header0.setLineWidth(1);&#xA;&#xA;this.add(useCaseSubjectFigure_header0);&#xA;&#xA;&#x9;org.eclipse.papyrus.uml.diagram.common.draw2d.CenterLayout layoutUseCaseSubjectFigure_header0 = new org.eclipse.papyrus.uml.diagram.common.draw2d.CenterLayout();&#xA;&#xA;&#xA;&#x9;useCaseSubjectFigure_header0.setLayoutManager(layoutUseCaseSubjectFigure_header0);&#xA;&#xA;&#xA;&#xA;fUseCaseSubjectFigure_name = new org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel();&#xA;fUseCaseSubjectFigure_name.setText(&quot;&quot;);&#xA;&#xA;fUseCaseSubjectFigure_name.setFont(FUSECASESUBJECTFIGURE_NAME_FONT);&#xA;&#xA;&#xA;&#xA;fUseCaseSubjectFigure_name.setBorder(new org.eclipse.draw2d.MarginBorder(getMapMode().DPtoLP(0)&#xA;, getMapMode().DPtoLP(5)&#xA;, getMapMode().DPtoLP(5)&#xA;, getMapMode().DPtoLP(5)&#xA;));&#xA;&#xA;useCaseSubjectFigure_header0.add(fUseCaseSubjectFigure_name);&#xA;&#xA;&#xA;&#xA;&#xA;fUseCaseSubjectFigure_contents = new org.eclipse.draw2d.RectangleFigure();&#xA;fUseCaseSubjectFigure_contents.setLineWidth(1);&#xA;&#xA;this.add(fUseCaseSubjectFigure_contents);&#xA;fUseCaseSubjectFigure_contents.setLayoutManager(new org.eclipse.draw2d.StackLayout());&#xA;&#xA;&#xA;&#x9;}&#xA;&#xA;&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private boolean myUseLocalCoordinates = false;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;protected boolean useLocalCoordinates() {&#xA;&#x9;&#x9;return myUseLocalCoordinates;&#xA;&#x9;}&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;protected void setUseLocalCoordinates(boolean useLocalCoordinates) {&#xA;&#x9;&#x9;myUseLocalCoordinates = useLocalCoordinates;&#xA;&#x9;}&#xA;&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public org.eclipse.draw2d.RectangleFigure getUseCaseSubjectFigure_contents() {&#xA;&#x9;&#x9;return fUseCaseSubjectFigure_contents;&#xA;&#x9;}&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel getUseCaseSubjectFigure_name() {&#xA;&#x9;&#x9;return fUseCaseSubjectFigure_name;&#xA;&#x9;}&#xA;&#xA;&#xA;}&#xA;&#xA;/**&#xA; * @generated&#xA; */&#xA;static final org.eclipse.swt.graphics.Color THIS_BACK = new org.eclipse.swt.graphics.Color(null, 245, 245, 245);&#xA;&#xA;/**&#xA; * @generated&#xA; */&#xA;static final org.eclipse.swt.graphics.Font FUSECASESUBJECTFIGURE_NAME_FONT = new org.eclipse.swt.graphics.Font(org.eclipse.swt.widgets.Display.getCurrent(), org.eclipse.swt.widgets.Display.getDefault().getSystemFont().getFontData()[0].getName(), 9, org.eclipse.swt.SWT.NORMAL);&#xA;&#xA;">

           <attributes

               xsi:type="gmfgen:StyleAttributes"

               fixedBackground="true"/>

@@ -236,15 +236,15 @@
         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.POPUPBAR_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

         <modelFacet>

           <metaClass

               href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Component"/>

@@ -302,17 +302,17 @@
             editHelperClassName="CommentEditHelper"/>

         <viewmap

             xsi:type="gmfgen:FigureViewmap"

-            figureQualifiedClassName="org.eclipse.papyrus.diagram.common.figure.node.HTMLCornerBentFigure"/>

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.HTMLCornerBentFigure"/>

         <behaviour

             xsi:type="gmfgen:OpenDiagramBehaviour"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.POPUPBAR_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

         <modelFacet>

           <metaClass

               href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Comment"/>

@@ -339,7 +339,7 @@
           <viewmap

               xsi:type="gmfgen:ParentAssignedViewmap"

               getterName="getCornerBentFigure"

-              figureQualifiedClassName="org.eclipse.papyrus.diagram.common.figure.node.HTMLCornerBentFigure">

+              figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.HTMLCornerBentFigure">

             <attributes

                 xsi:type="gmfgen:StyleAttributes"

                 fixedFont="true"/>

@@ -369,7 +369,7 @@
         <viewmap

             xsi:type="gmfgen:InnerClassViewmap"

             className="CornerBentDescriptor"

-            classBody="&#xA;/**&#xA; * @generated&#xA; */&#xA;public class CornerBentDescriptor extends org.eclipse.papyrus.diagram.common.figure.node.CornerBentFigure {&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel fCornerBentContentLabel; &#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public CornerBentDescriptor() {&#xA;&#x9;&#x9;&#x9;&#x9;&#xA;&#xA;&#x9;this.setForegroundColor(org.eclipse.draw2d.ColorConstants.black);&#xA;&#x9;this.setBackgroundColor(THIS_BACK&#xA;);&#xA;&#x9;&#x9;createContents();&#xA;&#x9;}&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private void createContents(){&#xA;&#xA;&#xA;fCornerBentContentLabel = new org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel();&#xA;fCornerBentContentLabel.setText(&quot;&quot;);&#xA;&#xA;fCornerBentContentLabel.setFont(FCORNERBENTCONTENTLABEL_FONT);&#xA;&#xA;&#xA;&#xA;this.add(fCornerBentContentLabel);&#xA;&#xA;&#xA;&#x9;}&#xA;&#xA;&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private boolean myUseLocalCoordinates = false;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;protected boolean useLocalCoordinates() {&#xA;&#x9;&#x9;return myUseLocalCoordinates;&#xA;&#x9;}&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;protected void setUseLocalCoordinates(boolean useLocalCoordinates) {&#xA;&#x9;&#x9;myUseLocalCoordinates = useLocalCoordinates;&#xA;&#x9;}&#xA;&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel getCornerBentContentLabel() {&#xA;&#x9;&#x9;return fCornerBentContentLabel;&#xA;&#x9;}&#xA;&#xA;&#xA;}&#xA;&#xA;/**&#xA; * @generated&#xA; */&#xA;static final org.eclipse.swt.graphics.Color THIS_BACK = new org.eclipse.swt.graphics.Color(null, 248, 249, 214);&#xA;&#xA;/**&#xA; * @generated&#xA; */&#xA;static final org.eclipse.swt.graphics.Font FCORNERBENTCONTENTLABEL_FONT = new org.eclipse.swt.graphics.Font(org.eclipse.swt.widgets.Display.getCurrent(), &quot;Arial&quot;, 8, org.eclipse.swt.SWT.NORMAL);&#xA;&#xA;">

+            classBody="&#xA;/**&#xA; * @generated&#xA; */&#xA;public class CornerBentDescriptor extends org.eclipse.papyrus.uml.diagram.common.figure.node.CornerBentFigure {&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel fCornerBentContentLabel; &#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public CornerBentDescriptor() {&#xA;&#x9;&#x9;&#x9;&#x9;&#xA;&#xA;&#x9;this.setForegroundColor(org.eclipse.draw2d.ColorConstants.black);&#xA;&#x9;this.setBackgroundColor(THIS_BACK&#xA;);&#xA;&#x9;&#x9;createContents();&#xA;&#x9;}&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private void createContents(){&#xA;&#xA;&#xA;fCornerBentContentLabel = new org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel();&#xA;fCornerBentContentLabel.setText(&quot;&quot;);&#xA;&#xA;fCornerBentContentLabel.setFont(FCORNERBENTCONTENTLABEL_FONT);&#xA;&#xA;&#xA;&#xA;this.add(fCornerBentContentLabel);&#xA;&#xA;&#xA;&#x9;}&#xA;&#xA;&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private boolean myUseLocalCoordinates = false;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;protected boolean useLocalCoordinates() {&#xA;&#x9;&#x9;return myUseLocalCoordinates;&#xA;&#x9;}&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;protected void setUseLocalCoordinates(boolean useLocalCoordinates) {&#xA;&#x9;&#x9;myUseLocalCoordinates = useLocalCoordinates;&#xA;&#x9;}&#xA;&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel getCornerBentContentLabel() {&#xA;&#x9;&#x9;return fCornerBentContentLabel;&#xA;&#x9;}&#xA;&#xA;&#xA;}&#xA;&#xA;/**&#xA; * @generated&#xA; */&#xA;static final org.eclipse.swt.graphics.Color THIS_BACK = new org.eclipse.swt.graphics.Color(null, 248, 249, 214);&#xA;&#xA;/**&#xA; * @generated&#xA; */&#xA;static final org.eclipse.swt.graphics.Font FCORNERBENTCONTENTLABEL_FONT = new org.eclipse.swt.graphics.Font(org.eclipse.swt.widgets.Display.getCurrent(), &quot;Arial&quot;, 8, org.eclipse.swt.SWT.NORMAL);&#xA;&#xA;">

           <attributes

               xsi:type="gmfgen:StyleAttributes"

               fixedForeground="true"

@@ -378,7 +378,7 @@
         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.POPUPBAR_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy"/>

         <modelFacet>

           <metaClass

               href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint"/>

@@ -445,7 +445,7 @@
             metamodelType="/0/@diagram/@topLevelNodes.0/@elementType"/>

         <viewmap

             xsi:type="gmfgen:FigureViewmap"

-            figureQualifiedClassName="org.eclipse.papyrus.diagram.usecase.draw2d.StickMan">

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.usecase.draw2d.StickMan">

           <attributes

               xsi:type="gmfgen:DefaultSizeAttributes"

               width="30"

@@ -454,7 +454,7 @@
         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.POPUPBAR_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy"/>

         <modelFacet>

           <metaClass

               href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Actor"/>

@@ -502,11 +502,11 @@
               href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

           <viewmap

               xsi:type="gmfgen:FigureViewmap"

-              figureQualifiedClassName="org.eclipse.papyrus.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure"/>

+              figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure"/>

           <behaviour

               xsi:type="gmfgen:CustomBehaviour"

-              key="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-              editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy"/>

+              key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy"/>

           <modelFacet

               parser="/0/@labelParsers/@implementations.2"/>

         </labels>

@@ -528,7 +528,7 @@
         <viewmap

             xsi:type="gmfgen:InnerClassViewmap"

             className="CornerBentDescriptor"

-            classBody="&#xA;/**&#xA; * @generated&#xA; */&#xA;public class CornerBentDescriptor extends org.eclipse.papyrus.diagram.common.figure.node.CornerBentFigure {&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel fCornerBentContentLabel; &#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public CornerBentDescriptor() {&#xA;&#x9;&#x9;&#x9;&#x9;&#xA;&#xA;&#x9;this.setForegroundColor(org.eclipse.draw2d.ColorConstants.black);&#xA;&#x9;this.setBackgroundColor(THIS_BACK&#xA;);&#xA;&#x9;&#x9;createContents();&#xA;&#x9;}&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private void createContents(){&#xA;&#xA;&#xA;fCornerBentContentLabel = new org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel();&#xA;fCornerBentContentLabel.setText(&quot;&quot;);&#xA;&#xA;fCornerBentContentLabel.setFont(FCORNERBENTCONTENTLABEL_FONT);&#xA;&#xA;&#xA;&#xA;this.add(fCornerBentContentLabel);&#xA;&#xA;&#xA;&#x9;}&#xA;&#xA;&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private boolean myUseLocalCoordinates = false;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;protected boolean useLocalCoordinates() {&#xA;&#x9;&#x9;return myUseLocalCoordinates;&#xA;&#x9;}&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;protected void setUseLocalCoordinates(boolean useLocalCoordinates) {&#xA;&#x9;&#x9;myUseLocalCoordinates = useLocalCoordinates;&#xA;&#x9;}&#xA;&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel getCornerBentContentLabel() {&#xA;&#x9;&#x9;return fCornerBentContentLabel;&#xA;&#x9;}&#xA;&#xA;&#xA;}&#xA;&#xA;/**&#xA; * @generated&#xA; */&#xA;static final org.eclipse.swt.graphics.Color THIS_BACK = new org.eclipse.swt.graphics.Color(null, 248, 249, 214);&#xA;&#xA;/**&#xA; * @generated&#xA; */&#xA;static final org.eclipse.swt.graphics.Font FCORNERBENTCONTENTLABEL_FONT = new org.eclipse.swt.graphics.Font(org.eclipse.swt.widgets.Display.getCurrent(), &quot;Arial&quot;, 8, org.eclipse.swt.SWT.NORMAL);&#xA;&#xA;">

+            classBody="&#xA;/**&#xA; * @generated&#xA; */&#xA;public class CornerBentDescriptor extends org.eclipse.papyrus.uml.diagram.common.figure.node.CornerBentFigure {&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel fCornerBentContentLabel; &#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public CornerBentDescriptor() {&#xA;&#x9;&#x9;&#x9;&#x9;&#xA;&#xA;&#x9;this.setForegroundColor(org.eclipse.draw2d.ColorConstants.black);&#xA;&#x9;this.setBackgroundColor(THIS_BACK&#xA;);&#xA;&#x9;&#x9;createContents();&#xA;&#x9;}&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private void createContents(){&#xA;&#xA;&#xA;fCornerBentContentLabel = new org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel();&#xA;fCornerBentContentLabel.setText(&quot;&quot;);&#xA;&#xA;fCornerBentContentLabel.setFont(FCORNERBENTCONTENTLABEL_FONT);&#xA;&#xA;&#xA;&#xA;this.add(fCornerBentContentLabel);&#xA;&#xA;&#xA;&#x9;}&#xA;&#xA;&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private boolean myUseLocalCoordinates = false;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;protected boolean useLocalCoordinates() {&#xA;&#x9;&#x9;return myUseLocalCoordinates;&#xA;&#x9;}&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;protected void setUseLocalCoordinates(boolean useLocalCoordinates) {&#xA;&#x9;&#x9;myUseLocalCoordinates = useLocalCoordinates;&#xA;&#x9;}&#xA;&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel getCornerBentContentLabel() {&#xA;&#x9;&#x9;return fCornerBentContentLabel;&#xA;&#x9;}&#xA;&#xA;&#xA;}&#xA;&#xA;/**&#xA; * @generated&#xA; */&#xA;static final org.eclipse.swt.graphics.Color THIS_BACK = new org.eclipse.swt.graphics.Color(null, 248, 249, 214);&#xA;&#xA;/**&#xA; * @generated&#xA; */&#xA;static final org.eclipse.swt.graphics.Font FCORNERBENTCONTENTLABEL_FONT = new org.eclipse.swt.graphics.Font(org.eclipse.swt.widgets.Display.getCurrent(), &quot;Arial&quot;, 8, org.eclipse.swt.SWT.NORMAL);&#xA;&#xA;">

           <attributes

               xsi:type="gmfgen:StyleAttributes"

               fixedForeground="true"

@@ -537,7 +537,7 @@
         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.POPUPBAR_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy"/>

         <modelFacet>

           <metaClass

               href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint"/>

@@ -604,7 +604,7 @@
             metamodelType="/0/@diagram/@topLevelNodes.0/@elementType"/>

         <viewmap

             xsi:type="gmfgen:FigureViewmap"

-            figureQualifiedClassName="org.eclipse.papyrus.diagram.usecase.draw2d.StickMan">

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.usecase.draw2d.StickMan">

           <attributes

               xsi:type="gmfgen:DefaultSizeAttributes"

               width="30"

@@ -613,7 +613,7 @@
         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.POPUPBAR_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy"/>

         <modelFacet>

           <metaClass

               href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Actor"/>

@@ -661,11 +661,11 @@
               href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

           <viewmap

               xsi:type="gmfgen:FigureViewmap"

-              figureQualifiedClassName="org.eclipse.papyrus.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure"/>

+              figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure"/>

           <behaviour

               xsi:type="gmfgen:CustomBehaviour"

-              key="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-              editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy"/>

+              key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy"/>

           <modelFacet

               parser="/0/@labelParsers/@implementations.2"/>

         </labels>

@@ -687,7 +687,7 @@
             metamodelType="/0/@diagram/@topLevelNodes.2/@elementType"/>

         <viewmap

             xsi:type="gmfgen:FigureViewmap"

-            figureQualifiedClassName="org.eclipse.papyrus.diagram.usecase.figure.UseCaseFigure">

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.usecase.figure.UseCaseFigure">

           <attributes

               xsi:type="gmfgen:DefaultSizeAttributes"

               width="140"

@@ -696,19 +696,19 @@
         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.POPUPBAR_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.usecase.edit.policies.CreateExtensionPointEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.usecase.edit.policies.CreateExtensionPointEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

         <modelFacet>

           <metaClass

               href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/UseCase"/>

@@ -765,7 +765,7 @@
         <viewmap

             xsi:type="gmfgen:InnerClassViewmap"

             className="UseCaseSubjectFigure"

-            classBody="&#xA;/**&#xA; * @generated&#xA; */&#xA;public class UseCaseSubjectFigure extends org.eclipse.draw2d.RectangleFigure {&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private org.eclipse.draw2d.RectangleFigure fUseCaseSubjectFigure_contents; &#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel fUseCaseSubjectFigure_name; &#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public UseCaseSubjectFigure() {&#xA;&#x9;&#x9;&#xA;&#x9;org.eclipse.papyrus.diagram.common.draw2d.PileLayout layoutThis = new org.eclipse.papyrus.diagram.common.draw2d.PileLayout();&#xA;&#xA;&#xA;&#xA;&#xA;layoutThis.setStretchBottom(&#xA;true);&#xA;&#xA;&#xA;&#x9;this.setLayoutManager(layoutThis);&#xA;&#xA;&#x9;&#x9;this.setLineWidth(1);&#xA;&#x9;this.setBackgroundColor(THIS_BACK&#xA;);&#xA;&#x9;&#x9;createContents();&#xA;&#x9;}&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private void createContents(){&#xA;&#xA;&#xA;org.eclipse.draw2d.RectangleFigure useCaseSubjectFigure_header0 = new org.eclipse.draw2d.RectangleFigure();&#xA;useCaseSubjectFigure_header0.setLineWidth(1);&#xA;&#xA;this.add(useCaseSubjectFigure_header0);&#xA;&#xA;&#x9;org.eclipse.papyrus.diagram.common.draw2d.CenterLayout layoutUseCaseSubjectFigure_header0 = new org.eclipse.papyrus.diagram.common.draw2d.CenterLayout();&#xA;&#xA;&#xA;&#x9;useCaseSubjectFigure_header0.setLayoutManager(layoutUseCaseSubjectFigure_header0);&#xA;&#xA;&#xA;&#xA;fUseCaseSubjectFigure_name = new org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel();&#xA;fUseCaseSubjectFigure_name.setText(&quot;&quot;);&#xA;&#xA;fUseCaseSubjectFigure_name.setFont(FUSECASESUBJECTFIGURE_NAME_FONT);&#xA;&#xA;&#xA;&#xA;fUseCaseSubjectFigure_name.setBorder(new org.eclipse.draw2d.MarginBorder(getMapMode().DPtoLP(0)&#xA;, getMapMode().DPtoLP(5)&#xA;, getMapMode().DPtoLP(5)&#xA;, getMapMode().DPtoLP(5)&#xA;));&#xA;&#xA;useCaseSubjectFigure_header0.add(fUseCaseSubjectFigure_name);&#xA;&#xA;&#xA;&#xA;&#xA;fUseCaseSubjectFigure_contents = new org.eclipse.draw2d.RectangleFigure();&#xA;fUseCaseSubjectFigure_contents.setLineWidth(1);&#xA;&#xA;this.add(fUseCaseSubjectFigure_contents);&#xA;fUseCaseSubjectFigure_contents.setLayoutManager(new org.eclipse.draw2d.StackLayout());&#xA;&#xA;&#xA;&#x9;}&#xA;&#xA;&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private boolean myUseLocalCoordinates = false;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;protected boolean useLocalCoordinates() {&#xA;&#x9;&#x9;return myUseLocalCoordinates;&#xA;&#x9;}&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;protected void setUseLocalCoordinates(boolean useLocalCoordinates) {&#xA;&#x9;&#x9;myUseLocalCoordinates = useLocalCoordinates;&#xA;&#x9;}&#xA;&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public org.eclipse.draw2d.RectangleFigure getUseCaseSubjectFigure_contents() {&#xA;&#x9;&#x9;return fUseCaseSubjectFigure_contents;&#xA;&#x9;}&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel getUseCaseSubjectFigure_name() {&#xA;&#x9;&#x9;return fUseCaseSubjectFigure_name;&#xA;&#x9;}&#xA;&#xA;&#xA;}&#xA;&#xA;/**&#xA; * @generated&#xA; */&#xA;static final org.eclipse.swt.graphics.Color THIS_BACK = new org.eclipse.swt.graphics.Color(null, 245, 245, 245);&#xA;&#xA;/**&#xA; * @generated&#xA; */&#xA;static final org.eclipse.swt.graphics.Font FUSECASESUBJECTFIGURE_NAME_FONT = new org.eclipse.swt.graphics.Font(org.eclipse.swt.widgets.Display.getCurrent(), org.eclipse.swt.widgets.Display.getDefault().getSystemFont().getFontData()[0].getName(), 9, org.eclipse.swt.SWT.NORMAL);&#xA;&#xA;">

+            classBody="&#xA;/**&#xA; * @generated&#xA; */&#xA;public class UseCaseSubjectFigure extends org.eclipse.draw2d.RectangleFigure {&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private org.eclipse.draw2d.RectangleFigure fUseCaseSubjectFigure_contents; &#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel fUseCaseSubjectFigure_name; &#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public UseCaseSubjectFigure() {&#xA;&#x9;&#x9;&#xA;&#x9;org.eclipse.papyrus.uml.diagram.common.draw2d.PileLayout layoutThis = new org.eclipse.papyrus.uml.diagram.common.draw2d.PileLayout();&#xA;&#xA;&#xA;&#xA;&#xA;layoutThis.setStretchBottom(&#xA;true);&#xA;&#xA;&#xA;&#x9;this.setLayoutManager(layoutThis);&#xA;&#xA;&#x9;&#x9;this.setLineWidth(1);&#xA;&#x9;this.setBackgroundColor(THIS_BACK&#xA;);&#xA;&#x9;&#x9;createContents();&#xA;&#x9;}&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private void createContents(){&#xA;&#xA;&#xA;org.eclipse.draw2d.RectangleFigure useCaseSubjectFigure_header0 = new org.eclipse.draw2d.RectangleFigure();&#xA;useCaseSubjectFigure_header0.setLineWidth(1);&#xA;&#xA;this.add(useCaseSubjectFigure_header0);&#xA;&#xA;&#x9;org.eclipse.papyrus.uml.diagram.common.draw2d.CenterLayout layoutUseCaseSubjectFigure_header0 = new org.eclipse.papyrus.uml.diagram.common.draw2d.CenterLayout();&#xA;&#xA;&#xA;&#x9;useCaseSubjectFigure_header0.setLayoutManager(layoutUseCaseSubjectFigure_header0);&#xA;&#xA;&#xA;&#xA;fUseCaseSubjectFigure_name = new org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel();&#xA;fUseCaseSubjectFigure_name.setText(&quot;&quot;);&#xA;&#xA;fUseCaseSubjectFigure_name.setFont(FUSECASESUBJECTFIGURE_NAME_FONT);&#xA;&#xA;&#xA;&#xA;fUseCaseSubjectFigure_name.setBorder(new org.eclipse.draw2d.MarginBorder(getMapMode().DPtoLP(0)&#xA;, getMapMode().DPtoLP(5)&#xA;, getMapMode().DPtoLP(5)&#xA;, getMapMode().DPtoLP(5)&#xA;));&#xA;&#xA;useCaseSubjectFigure_header0.add(fUseCaseSubjectFigure_name);&#xA;&#xA;&#xA;&#xA;&#xA;fUseCaseSubjectFigure_contents = new org.eclipse.draw2d.RectangleFigure();&#xA;fUseCaseSubjectFigure_contents.setLineWidth(1);&#xA;&#xA;this.add(fUseCaseSubjectFigure_contents);&#xA;fUseCaseSubjectFigure_contents.setLayoutManager(new org.eclipse.draw2d.StackLayout());&#xA;&#xA;&#xA;&#x9;}&#xA;&#xA;&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private boolean myUseLocalCoordinates = false;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;protected boolean useLocalCoordinates() {&#xA;&#x9;&#x9;return myUseLocalCoordinates;&#xA;&#x9;}&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;protected void setUseLocalCoordinates(boolean useLocalCoordinates) {&#xA;&#x9;&#x9;myUseLocalCoordinates = useLocalCoordinates;&#xA;&#x9;}&#xA;&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public org.eclipse.draw2d.RectangleFigure getUseCaseSubjectFigure_contents() {&#xA;&#x9;&#x9;return fUseCaseSubjectFigure_contents;&#xA;&#x9;}&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel getUseCaseSubjectFigure_name() {&#xA;&#x9;&#x9;return fUseCaseSubjectFigure_name;&#xA;&#x9;}&#xA;&#xA;&#xA;}&#xA;&#xA;/**&#xA; * @generated&#xA; */&#xA;static final org.eclipse.swt.graphics.Color THIS_BACK = new org.eclipse.swt.graphics.Color(null, 245, 245, 245);&#xA;&#xA;/**&#xA; * @generated&#xA; */&#xA;static final org.eclipse.swt.graphics.Font FUSECASESUBJECTFIGURE_NAME_FONT = new org.eclipse.swt.graphics.Font(org.eclipse.swt.widgets.Display.getCurrent(), org.eclipse.swt.widgets.Display.getDefault().getSystemFont().getFontData()[0].getName(), 9, org.eclipse.swt.SWT.NORMAL);&#xA;&#xA;">

           <attributes

               xsi:type="gmfgen:StyleAttributes"

               fixedBackground="true"/>

@@ -777,15 +777,15 @@
         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.POPUPBAR_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

         <modelFacet>

           <metaClass

               href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Component"/>

@@ -844,7 +844,7 @@
             metamodelType="/0/@diagram/@elementType"/>

         <viewmap

             xsi:type="gmfgen:FigureViewmap"

-            figureQualifiedClassName="org.eclipse.papyrus.diagram.common.figure.node.PackageFigure">

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.PackageFigure">

           <attributes

               xsi:type="gmfgen:DefaultSizeAttributes"

               width="150"

@@ -855,15 +855,15 @@
         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.POPUPBAR_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

         <modelFacet>

           <metaClass

               href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package"/>

@@ -921,7 +921,7 @@
             editHelperClassName="ActorEditHelper"/>

         <viewmap

             xsi:type="gmfgen:FigureViewmap"

-            figureQualifiedClassName="org.eclipse.papyrus.diagram.usecase.draw2d.StickMan">

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.usecase.draw2d.StickMan">

           <attributes

               xsi:type="gmfgen:DefaultSizeAttributes"

               width="30"

@@ -930,7 +930,7 @@
         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.POPUPBAR_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy"/>

         <modelFacet>

           <metaClass

               href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Actor"/>

@@ -978,11 +978,11 @@
               href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

           <viewmap

               xsi:type="gmfgen:FigureViewmap"

-              figureQualifiedClassName="org.eclipse.papyrus.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure"/>

+              figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure"/>

           <behaviour

               xsi:type="gmfgen:CustomBehaviour"

-              key="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-              editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy"/>

+              key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy"/>

           <modelFacet

               parser="/0/@labelParsers/@implementations.2"/>

         </labels>

@@ -1004,7 +1004,7 @@
             xsi:type="gmfgen:InnerClassViewmap"

             layoutType="TOOLBAR_LAYOUT"

             className="ActorAsRectangleFigure"

-            classBody="&#xA;/**&#xA; * @generated&#xA; */&#xA;public class ActorAsRectangleFigure extends org.eclipse.draw2d.RectangleFigure {&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel fActorAsRectangleFigure_name; &#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public ActorAsRectangleFigure() {&#xA;&#x9;&#x9;&#xA;&#x9;org.eclipse.draw2d.ToolbarLayout layoutThis = new org.eclipse.draw2d.ToolbarLayout();&#xA;&#x9;layoutThis.setStretchMinorAxis(true);&#xA;&#x9;layoutThis.setMinorAlignment(org.eclipse.draw2d.ToolbarLayout.ALIGN_CENTER&#xA;);&#xA;&#xA;&#x9;layoutThis.setSpacing(0);&#xA;&#x9;layoutThis.setVertical(true);&#xA;&#xA;&#x9;this.setLayoutManager(layoutThis);&#xA;&#xA;&#x9;&#x9;this.setLineWidth(1);&#xA;&#x9;&#x9;createContents();&#xA;&#x9;}&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private void createContents(){&#xA;&#xA;&#xA;org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel actorAsRectangleFigure_fixed_actor0 = new org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel();&#xA;actorAsRectangleFigure_fixed_actor0.setText(&quot;\u00ABactor\u00BB&quot;);&#xA;&#xA;this.add(actorAsRectangleFigure_fixed_actor0);&#xA;&#xA;&#xA;&#xA;org.eclipse.draw2d.RectangleFigure actorAsRectangleFigure_NameContainer0 = new org.eclipse.draw2d.RectangleFigure();&#xA;actorAsRectangleFigure_NameContainer0.setFill(false);&#xA;actorAsRectangleFigure_NameContainer0.setOutline(false);&#xA;actorAsRectangleFigure_NameContainer0.setLineWidth(1);&#xA;&#xA;this.add(actorAsRectangleFigure_NameContainer0);&#xA;&#xA;&#x9;org.eclipse.papyrus.diagram.common.draw2d.CenterLayout layoutActorAsRectangleFigure_NameContainer0 = new org.eclipse.papyrus.diagram.common.draw2d.CenterLayout();&#xA;&#xA;&#xA;&#x9;actorAsRectangleFigure_NameContainer0.setLayoutManager(layoutActorAsRectangleFigure_NameContainer0);&#xA;&#xA;&#xA;&#xA;fActorAsRectangleFigure_name = new org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel();&#xA;fActorAsRectangleFigure_name.setText(&quot;&quot;);&#xA;&#xA;actorAsRectangleFigure_NameContainer0.add(fActorAsRectangleFigure_name);&#xA;&#xA;&#xA;&#xA;&#x9;}&#xA;&#xA;&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private boolean myUseLocalCoordinates = false;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;protected boolean useLocalCoordinates() {&#xA;&#x9;&#x9;return myUseLocalCoordinates;&#xA;&#x9;}&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;protected void setUseLocalCoordinates(boolean useLocalCoordinates) {&#xA;&#x9;&#x9;myUseLocalCoordinates = useLocalCoordinates;&#xA;&#x9;}&#xA;&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel getActorAsRectangleFigure_name() {&#xA;&#x9;&#x9;return fActorAsRectangleFigure_name;&#xA;&#x9;}&#xA;&#xA;&#xA;}&#xA;&#xA;">

+            classBody="&#xA;/**&#xA; * @generated&#xA; */&#xA;public class ActorAsRectangleFigure extends org.eclipse.draw2d.RectangleFigure {&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel fActorAsRectangleFigure_name; &#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public ActorAsRectangleFigure() {&#xA;&#x9;&#x9;&#xA;&#x9;org.eclipse.draw2d.ToolbarLayout layoutThis = new org.eclipse.draw2d.ToolbarLayout();&#xA;&#x9;layoutThis.setStretchMinorAxis(true);&#xA;&#x9;layoutThis.setMinorAlignment(org.eclipse.draw2d.ToolbarLayout.ALIGN_CENTER&#xA;);&#xA;&#xA;&#x9;layoutThis.setSpacing(0);&#xA;&#x9;layoutThis.setVertical(true);&#xA;&#xA;&#x9;this.setLayoutManager(layoutThis);&#xA;&#xA;&#x9;&#x9;this.setLineWidth(1);&#xA;&#x9;&#x9;createContents();&#xA;&#x9;}&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private void createContents(){&#xA;&#xA;&#xA;org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel actorAsRectangleFigure_fixed_actor0 = new org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel();&#xA;actorAsRectangleFigure_fixed_actor0.setText(&quot;\u00ABactor\u00BB&quot;);&#xA;&#xA;this.add(actorAsRectangleFigure_fixed_actor0);&#xA;&#xA;&#xA;&#xA;org.eclipse.draw2d.RectangleFigure actorAsRectangleFigure_NameContainer0 = new org.eclipse.draw2d.RectangleFigure();&#xA;actorAsRectangleFigure_NameContainer0.setFill(false);&#xA;actorAsRectangleFigure_NameContainer0.setOutline(false);&#xA;actorAsRectangleFigure_NameContainer0.setLineWidth(1);&#xA;&#xA;this.add(actorAsRectangleFigure_NameContainer0);&#xA;&#xA;&#x9;org.eclipse.papyrus.uml.diagram.common.draw2d.CenterLayout layoutActorAsRectangleFigure_NameContainer0 = new org.eclipse.papyrus.uml.diagram.common.draw2d.CenterLayout();&#xA;&#xA;&#xA;&#x9;actorAsRectangleFigure_NameContainer0.setLayoutManager(layoutActorAsRectangleFigure_NameContainer0);&#xA;&#xA;&#xA;&#xA;fActorAsRectangleFigure_name = new org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel();&#xA;fActorAsRectangleFigure_name.setText(&quot;&quot;);&#xA;&#xA;actorAsRectangleFigure_NameContainer0.add(fActorAsRectangleFigure_name);&#xA;&#xA;&#xA;&#xA;&#x9;}&#xA;&#xA;&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private boolean myUseLocalCoordinates = false;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;protected boolean useLocalCoordinates() {&#xA;&#x9;&#x9;return myUseLocalCoordinates;&#xA;&#x9;}&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;protected void setUseLocalCoordinates(boolean useLocalCoordinates) {&#xA;&#x9;&#x9;myUseLocalCoordinates = useLocalCoordinates;&#xA;&#x9;}&#xA;&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel getActorAsRectangleFigure_name() {&#xA;&#x9;&#x9;return fActorAsRectangleFigure_name;&#xA;&#x9;}&#xA;&#xA;&#xA;}&#xA;&#xA;">

           <attributes

               xsi:type="gmfgen:DefaultSizeAttributes"

               width="80"

@@ -1013,7 +1013,7 @@
         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.POPUPBAR_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy"/>

         <modelFacet>

           <metaClass

               href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Actor"/>

@@ -1068,7 +1068,7 @@
             editHelperClassName="UseCaseEditHelper"/>

         <viewmap

             xsi:type="gmfgen:FigureViewmap"

-            figureQualifiedClassName="org.eclipse.papyrus.diagram.usecase.figure.UseCaseFigure">

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.usecase.figure.UseCaseFigure">

           <attributes

               xsi:type="gmfgen:DefaultSizeAttributes"

               width="140"

@@ -1077,19 +1077,19 @@
         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.POPUPBAR_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.usecase.edit.policies.CreateExtensionPointEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.usecase.edit.policies.CreateExtensionPointEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

         <modelFacet>

           <metaClass

               href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/UseCase"/>

@@ -1146,7 +1146,7 @@
             xsi:type="gmfgen:InnerClassViewmap"

             layoutType="TOOLBAR_LAYOUT"

             className="UseCaseAsClassFigure"

-            classBody="&#xA;/**&#xA; * @generated&#xA; */&#xA;public class UseCaseAsClassFigure extends org.eclipse.draw2d.RectangleFigure {&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel fUseCaseAsClassFigure_name; &#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private org.eclipse.draw2d.RectangleFigure fUseCaseAsClass_points; &#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public UseCaseAsClassFigure() {&#xA;&#x9;&#x9;&#xA;&#x9;org.eclipse.draw2d.ToolbarLayout layoutThis = new org.eclipse.draw2d.ToolbarLayout();&#xA;&#x9;layoutThis.setStretchMinorAxis(true);&#xA;&#x9;layoutThis.setMinorAlignment(org.eclipse.draw2d.ToolbarLayout.ALIGN_CENTER&#xA;);&#xA;&#xA;&#x9;layoutThis.setSpacing(0);&#xA;&#x9;layoutThis.setVertical(true);&#xA;&#xA;&#x9;this.setLayoutManager(layoutThis);&#xA;&#xA;&#x9;&#x9;this.setLineWidth(1);&#xA;&#x9;&#x9;createContents();&#xA;&#x9;}&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private void createContents(){&#xA;&#xA;&#xA;org.eclipse.draw2d.RectangleFigure useCaseAsClassFigure_Header0 = new org.eclipse.draw2d.RectangleFigure();&#xA;useCaseAsClassFigure_Header0.setLineWidth(1);&#xA;useCaseAsClassFigure_Header0.setBorder(new org.eclipse.draw2d.LineBorder(null, getMapMode().DPtoLP(1)&#xA;));&#xA;&#xA;this.add(useCaseAsClassFigure_Header0);&#xA;&#xA;&#x9;org.eclipse.draw2d.ToolbarLayout layoutUseCaseAsClassFigure_Header0 = new org.eclipse.draw2d.ToolbarLayout();&#xA;&#x9;layoutUseCaseAsClassFigure_Header0.setStretchMinorAxis(true);&#xA;&#x9;layoutUseCaseAsClassFigure_Header0.setMinorAlignment(org.eclipse.draw2d.ToolbarLayout.ALIGN_TOPLEFT&#xA;);&#xA;&#xA;&#x9;layoutUseCaseAsClassFigure_Header0.setSpacing(0);&#xA;&#x9;layoutUseCaseAsClassFigure_Header0.setVertical(true);&#xA;&#xA;&#x9;useCaseAsClassFigure_Header0.setLayoutManager(layoutUseCaseAsClassFigure_Header0);&#xA;&#xA;&#xA;&#xA;org.eclipse.draw2d.RectangleFigure useCaseAsClassFigure_NameContainer1 = new org.eclipse.draw2d.RectangleFigure();&#xA;useCaseAsClassFigure_NameContainer1.setOutline(false);&#xA;useCaseAsClassFigure_NameContainer1.setLineWidth(1);&#xA;&#xA;useCaseAsClassFigure_Header0.add(useCaseAsClassFigure_NameContainer1);&#xA;&#xA;&#x9;org.eclipse.papyrus.diagram.common.draw2d.CenterLayout layoutUseCaseAsClassFigure_NameContainer1 = new org.eclipse.papyrus.diagram.common.draw2d.CenterLayout();&#xA;&#xA;&#xA;&#x9;useCaseAsClassFigure_NameContainer1.setLayoutManager(layoutUseCaseAsClassFigure_NameContainer1);&#xA;&#xA;&#xA;&#xA;fUseCaseAsClassFigure_name = new org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel();&#xA;fUseCaseAsClassFigure_name.setText(&quot;&quot;);&#xA;&#xA;fUseCaseAsClassFigure_name.setFont(FUSECASEASCLASSFIGURE_NAME_FONT);&#xA;&#xA;&#xA;&#xA;fUseCaseAsClassFigure_name.setBorder(new org.eclipse.draw2d.MarginBorder(getMapMode().DPtoLP(0)&#xA;, getMapMode().DPtoLP(5)&#xA;, getMapMode().DPtoLP(5)&#xA;, getMapMode().DPtoLP(5)&#xA;));&#xA;&#xA;useCaseAsClassFigure_NameContainer1.add(fUseCaseAsClassFigure_name);&#xA;&#xA;&#xA;&#xA;&#xA;&#xA;fUseCaseAsClass_points = new org.eclipse.draw2d.RectangleFigure();&#xA;fUseCaseAsClass_points.setLineWidth(1);&#xA;&#xA;this.add(fUseCaseAsClass_points);&#xA;fUseCaseAsClass_points.setLayoutManager(new org.eclipse.draw2d.StackLayout());&#xA;&#xA;&#xA;&#x9;}&#xA;&#xA;&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private boolean myUseLocalCoordinates = false;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;protected boolean useLocalCoordinates() {&#xA;&#x9;&#x9;return myUseLocalCoordinates;&#xA;&#x9;}&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;protected void setUseLocalCoordinates(boolean useLocalCoordinates) {&#xA;&#x9;&#x9;myUseLocalCoordinates = useLocalCoordinates;&#xA;&#x9;}&#xA;&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel getUseCaseAsClassFigure_name() {&#xA;&#x9;&#x9;return fUseCaseAsClassFigure_name;&#xA;&#x9;}&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public org.eclipse.draw2d.RectangleFigure getUseCaseAsClass_points() {&#xA;&#x9;&#x9;return fUseCaseAsClass_points;&#xA;&#x9;}&#xA;&#xA;&#xA;}&#xA;&#xA;/**&#xA; * @generated&#xA; */&#xA;static final org.eclipse.swt.graphics.Font FUSECASEASCLASSFIGURE_NAME_FONT = new org.eclipse.swt.graphics.Font(org.eclipse.swt.widgets.Display.getCurrent(), org.eclipse.swt.widgets.Display.getDefault().getSystemFont().getFontData()[0].getName(), 9, org.eclipse.swt.SWT.NORMAL);&#xA;&#xA;">

+            classBody="&#xA;/**&#xA; * @generated&#xA; */&#xA;public class UseCaseAsClassFigure extends org.eclipse.draw2d.RectangleFigure {&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel fUseCaseAsClassFigure_name; &#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private org.eclipse.draw2d.RectangleFigure fUseCaseAsClass_points; &#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public UseCaseAsClassFigure() {&#xA;&#x9;&#x9;&#xA;&#x9;org.eclipse.draw2d.ToolbarLayout layoutThis = new org.eclipse.draw2d.ToolbarLayout();&#xA;&#x9;layoutThis.setStretchMinorAxis(true);&#xA;&#x9;layoutThis.setMinorAlignment(org.eclipse.draw2d.ToolbarLayout.ALIGN_CENTER&#xA;);&#xA;&#xA;&#x9;layoutThis.setSpacing(0);&#xA;&#x9;layoutThis.setVertical(true);&#xA;&#xA;&#x9;this.setLayoutManager(layoutThis);&#xA;&#xA;&#x9;&#x9;this.setLineWidth(1);&#xA;&#x9;&#x9;createContents();&#xA;&#x9;}&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private void createContents(){&#xA;&#xA;&#xA;org.eclipse.draw2d.RectangleFigure useCaseAsClassFigure_Header0 = new org.eclipse.draw2d.RectangleFigure();&#xA;useCaseAsClassFigure_Header0.setLineWidth(1);&#xA;useCaseAsClassFigure_Header0.setBorder(new org.eclipse.draw2d.LineBorder(null, getMapMode().DPtoLP(1)&#xA;));&#xA;&#xA;this.add(useCaseAsClassFigure_Header0);&#xA;&#xA;&#x9;org.eclipse.draw2d.ToolbarLayout layoutUseCaseAsClassFigure_Header0 = new org.eclipse.draw2d.ToolbarLayout();&#xA;&#x9;layoutUseCaseAsClassFigure_Header0.setStretchMinorAxis(true);&#xA;&#x9;layoutUseCaseAsClassFigure_Header0.setMinorAlignment(org.eclipse.draw2d.ToolbarLayout.ALIGN_TOPLEFT&#xA;);&#xA;&#xA;&#x9;layoutUseCaseAsClassFigure_Header0.setSpacing(0);&#xA;&#x9;layoutUseCaseAsClassFigure_Header0.setVertical(true);&#xA;&#xA;&#x9;useCaseAsClassFigure_Header0.setLayoutManager(layoutUseCaseAsClassFigure_Header0);&#xA;&#xA;&#xA;&#xA;org.eclipse.draw2d.RectangleFigure useCaseAsClassFigure_NameContainer1 = new org.eclipse.draw2d.RectangleFigure();&#xA;useCaseAsClassFigure_NameContainer1.setOutline(false);&#xA;useCaseAsClassFigure_NameContainer1.setLineWidth(1);&#xA;&#xA;useCaseAsClassFigure_Header0.add(useCaseAsClassFigure_NameContainer1);&#xA;&#xA;&#x9;org.eclipse.papyrus.uml.diagram.common.draw2d.CenterLayout layoutUseCaseAsClassFigure_NameContainer1 = new org.eclipse.papyrus.uml.diagram.common.draw2d.CenterLayout();&#xA;&#xA;&#xA;&#x9;useCaseAsClassFigure_NameContainer1.setLayoutManager(layoutUseCaseAsClassFigure_NameContainer1);&#xA;&#xA;&#xA;&#xA;fUseCaseAsClassFigure_name = new org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel();&#xA;fUseCaseAsClassFigure_name.setText(&quot;&quot;);&#xA;&#xA;fUseCaseAsClassFigure_name.setFont(FUSECASEASCLASSFIGURE_NAME_FONT);&#xA;&#xA;&#xA;&#xA;fUseCaseAsClassFigure_name.setBorder(new org.eclipse.draw2d.MarginBorder(getMapMode().DPtoLP(0)&#xA;, getMapMode().DPtoLP(5)&#xA;, getMapMode().DPtoLP(5)&#xA;, getMapMode().DPtoLP(5)&#xA;));&#xA;&#xA;useCaseAsClassFigure_NameContainer1.add(fUseCaseAsClassFigure_name);&#xA;&#xA;&#xA;&#xA;&#xA;&#xA;fUseCaseAsClass_points = new org.eclipse.draw2d.RectangleFigure();&#xA;fUseCaseAsClass_points.setLineWidth(1);&#xA;&#xA;this.add(fUseCaseAsClass_points);&#xA;fUseCaseAsClass_points.setLayoutManager(new org.eclipse.draw2d.StackLayout());&#xA;&#xA;&#xA;&#x9;}&#xA;&#xA;&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private boolean myUseLocalCoordinates = false;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;protected boolean useLocalCoordinates() {&#xA;&#x9;&#x9;return myUseLocalCoordinates;&#xA;&#x9;}&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;protected void setUseLocalCoordinates(boolean useLocalCoordinates) {&#xA;&#x9;&#x9;myUseLocalCoordinates = useLocalCoordinates;&#xA;&#x9;}&#xA;&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel getUseCaseAsClassFigure_name() {&#xA;&#x9;&#x9;return fUseCaseAsClassFigure_name;&#xA;&#x9;}&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public org.eclipse.draw2d.RectangleFigure getUseCaseAsClass_points() {&#xA;&#x9;&#x9;return fUseCaseAsClass_points;&#xA;&#x9;}&#xA;&#xA;&#xA;}&#xA;&#xA;/**&#xA; * @generated&#xA; */&#xA;static final org.eclipse.swt.graphics.Font FUSECASEASCLASSFIGURE_NAME_FONT = new org.eclipse.swt.graphics.Font(org.eclipse.swt.widgets.Display.getCurrent(), org.eclipse.swt.widgets.Display.getDefault().getSystemFont().getFontData()[0].getName(), 9, org.eclipse.swt.SWT.NORMAL);&#xA;&#xA;">

           <attributes

               xsi:type="gmfgen:DefaultSizeAttributes"

               width="100"

@@ -1155,11 +1155,11 @@
         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.POPUPBAR_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

         <modelFacet>

           <metaClass

               href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/UseCase"/>

@@ -1219,7 +1219,7 @@
         <viewmap

             xsi:type="gmfgen:InnerClassViewmap"

             className="UseCaseSubjectFigure"

-            classBody="&#xA;/**&#xA; * @generated&#xA; */&#xA;public class UseCaseSubjectFigure extends org.eclipse.draw2d.RectangleFigure {&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private org.eclipse.draw2d.RectangleFigure fUseCaseSubjectFigure_contents; &#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel fUseCaseSubjectFigure_name; &#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public UseCaseSubjectFigure() {&#xA;&#x9;&#x9;&#xA;&#x9;org.eclipse.papyrus.diagram.common.draw2d.PileLayout layoutThis = new org.eclipse.papyrus.diagram.common.draw2d.PileLayout();&#xA;&#xA;&#xA;&#xA;&#xA;layoutThis.setStretchBottom(&#xA;true);&#xA;&#xA;&#xA;&#x9;this.setLayoutManager(layoutThis);&#xA;&#xA;&#x9;&#x9;this.setLineWidth(1);&#xA;&#x9;this.setBackgroundColor(THIS_BACK&#xA;);&#xA;&#x9;&#x9;createContents();&#xA;&#x9;}&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private void createContents(){&#xA;&#xA;&#xA;org.eclipse.draw2d.RectangleFigure useCaseSubjectFigure_header0 = new org.eclipse.draw2d.RectangleFigure();&#xA;useCaseSubjectFigure_header0.setLineWidth(1);&#xA;&#xA;this.add(useCaseSubjectFigure_header0);&#xA;&#xA;&#x9;org.eclipse.papyrus.diagram.common.draw2d.CenterLayout layoutUseCaseSubjectFigure_header0 = new org.eclipse.papyrus.diagram.common.draw2d.CenterLayout();&#xA;&#xA;&#xA;&#x9;useCaseSubjectFigure_header0.setLayoutManager(layoutUseCaseSubjectFigure_header0);&#xA;&#xA;&#xA;&#xA;fUseCaseSubjectFigure_name = new org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel();&#xA;fUseCaseSubjectFigure_name.setText(&quot;&quot;);&#xA;&#xA;fUseCaseSubjectFigure_name.setFont(FUSECASESUBJECTFIGURE_NAME_FONT);&#xA;&#xA;&#xA;&#xA;fUseCaseSubjectFigure_name.setBorder(new org.eclipse.draw2d.MarginBorder(getMapMode().DPtoLP(0)&#xA;, getMapMode().DPtoLP(5)&#xA;, getMapMode().DPtoLP(5)&#xA;, getMapMode().DPtoLP(5)&#xA;));&#xA;&#xA;useCaseSubjectFigure_header0.add(fUseCaseSubjectFigure_name);&#xA;&#xA;&#xA;&#xA;&#xA;fUseCaseSubjectFigure_contents = new org.eclipse.draw2d.RectangleFigure();&#xA;fUseCaseSubjectFigure_contents.setLineWidth(1);&#xA;&#xA;this.add(fUseCaseSubjectFigure_contents);&#xA;fUseCaseSubjectFigure_contents.setLayoutManager(new org.eclipse.draw2d.StackLayout());&#xA;&#xA;&#xA;&#x9;}&#xA;&#xA;&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private boolean myUseLocalCoordinates = false;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;protected boolean useLocalCoordinates() {&#xA;&#x9;&#x9;return myUseLocalCoordinates;&#xA;&#x9;}&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;protected void setUseLocalCoordinates(boolean useLocalCoordinates) {&#xA;&#x9;&#x9;myUseLocalCoordinates = useLocalCoordinates;&#xA;&#x9;}&#xA;&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public org.eclipse.draw2d.RectangleFigure getUseCaseSubjectFigure_contents() {&#xA;&#x9;&#x9;return fUseCaseSubjectFigure_contents;&#xA;&#x9;}&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel getUseCaseSubjectFigure_name() {&#xA;&#x9;&#x9;return fUseCaseSubjectFigure_name;&#xA;&#x9;}&#xA;&#xA;&#xA;}&#xA;&#xA;/**&#xA; * @generated&#xA; */&#xA;static final org.eclipse.swt.graphics.Color THIS_BACK = new org.eclipse.swt.graphics.Color(null, 245, 245, 245);&#xA;&#xA;/**&#xA; * @generated&#xA; */&#xA;static final org.eclipse.swt.graphics.Font FUSECASESUBJECTFIGURE_NAME_FONT = new org.eclipse.swt.graphics.Font(org.eclipse.swt.widgets.Display.getCurrent(), org.eclipse.swt.widgets.Display.getDefault().getSystemFont().getFontData()[0].getName(), 9, org.eclipse.swt.SWT.NORMAL);&#xA;&#xA;">

+            classBody="&#xA;/**&#xA; * @generated&#xA; */&#xA;public class UseCaseSubjectFigure extends org.eclipse.draw2d.RectangleFigure {&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private org.eclipse.draw2d.RectangleFigure fUseCaseSubjectFigure_contents; &#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel fUseCaseSubjectFigure_name; &#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public UseCaseSubjectFigure() {&#xA;&#x9;&#x9;&#xA;&#x9;org.eclipse.papyrus.uml.diagram.common.draw2d.PileLayout layoutThis = new org.eclipse.papyrus.uml.diagram.common.draw2d.PileLayout();&#xA;&#xA;&#xA;&#xA;&#xA;layoutThis.setStretchBottom(&#xA;true);&#xA;&#xA;&#xA;&#x9;this.setLayoutManager(layoutThis);&#xA;&#xA;&#x9;&#x9;this.setLineWidth(1);&#xA;&#x9;this.setBackgroundColor(THIS_BACK&#xA;);&#xA;&#x9;&#x9;createContents();&#xA;&#x9;}&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private void createContents(){&#xA;&#xA;&#xA;org.eclipse.draw2d.RectangleFigure useCaseSubjectFigure_header0 = new org.eclipse.draw2d.RectangleFigure();&#xA;useCaseSubjectFigure_header0.setLineWidth(1);&#xA;&#xA;this.add(useCaseSubjectFigure_header0);&#xA;&#xA;&#x9;org.eclipse.papyrus.uml.diagram.common.draw2d.CenterLayout layoutUseCaseSubjectFigure_header0 = new org.eclipse.papyrus.uml.diagram.common.draw2d.CenterLayout();&#xA;&#xA;&#xA;&#x9;useCaseSubjectFigure_header0.setLayoutManager(layoutUseCaseSubjectFigure_header0);&#xA;&#xA;&#xA;&#xA;fUseCaseSubjectFigure_name = new org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel();&#xA;fUseCaseSubjectFigure_name.setText(&quot;&quot;);&#xA;&#xA;fUseCaseSubjectFigure_name.setFont(FUSECASESUBJECTFIGURE_NAME_FONT);&#xA;&#xA;&#xA;&#xA;fUseCaseSubjectFigure_name.setBorder(new org.eclipse.draw2d.MarginBorder(getMapMode().DPtoLP(0)&#xA;, getMapMode().DPtoLP(5)&#xA;, getMapMode().DPtoLP(5)&#xA;, getMapMode().DPtoLP(5)&#xA;));&#xA;&#xA;useCaseSubjectFigure_header0.add(fUseCaseSubjectFigure_name);&#xA;&#xA;&#xA;&#xA;&#xA;fUseCaseSubjectFigure_contents = new org.eclipse.draw2d.RectangleFigure();&#xA;fUseCaseSubjectFigure_contents.setLineWidth(1);&#xA;&#xA;this.add(fUseCaseSubjectFigure_contents);&#xA;fUseCaseSubjectFigure_contents.setLayoutManager(new org.eclipse.draw2d.StackLayout());&#xA;&#xA;&#xA;&#x9;}&#xA;&#xA;&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private boolean myUseLocalCoordinates = false;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;protected boolean useLocalCoordinates() {&#xA;&#x9;&#x9;return myUseLocalCoordinates;&#xA;&#x9;}&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;protected void setUseLocalCoordinates(boolean useLocalCoordinates) {&#xA;&#x9;&#x9;myUseLocalCoordinates = useLocalCoordinates;&#xA;&#x9;}&#xA;&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public org.eclipse.draw2d.RectangleFigure getUseCaseSubjectFigure_contents() {&#xA;&#x9;&#x9;return fUseCaseSubjectFigure_contents;&#xA;&#x9;}&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel getUseCaseSubjectFigure_name() {&#xA;&#x9;&#x9;return fUseCaseSubjectFigure_name;&#xA;&#x9;}&#xA;&#xA;&#xA;}&#xA;&#xA;/**&#xA; * @generated&#xA; */&#xA;static final org.eclipse.swt.graphics.Color THIS_BACK = new org.eclipse.swt.graphics.Color(null, 245, 245, 245);&#xA;&#xA;/**&#xA; * @generated&#xA; */&#xA;static final org.eclipse.swt.graphics.Font FUSECASESUBJECTFIGURE_NAME_FONT = new org.eclipse.swt.graphics.Font(org.eclipse.swt.widgets.Display.getCurrent(), org.eclipse.swt.widgets.Display.getDefault().getSystemFont().getFontData()[0].getName(), 9, org.eclipse.swt.SWT.NORMAL);&#xA;&#xA;">

           <attributes

               xsi:type="gmfgen:StyleAttributes"

               fixedBackground="true"/>

@@ -1231,15 +1231,15 @@
         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.POPUPBAR_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

         <modelFacet>

           <metaClass

               href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Component"/>

@@ -1297,7 +1297,7 @@
             metamodelType="/0/@diagram/@elementType"/>

         <viewmap

             xsi:type="gmfgen:FigureViewmap"

-            figureQualifiedClassName="org.eclipse.papyrus.diagram.common.figure.node.PackageFigure">

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.PackageFigure">

           <attributes

               xsi:type="gmfgen:DefaultSizeAttributes"

               width="150"

@@ -1308,15 +1308,15 @@
         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.POPUPBAR_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

         <modelFacet>

           <metaClass

               href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package"/>

@@ -1375,7 +1375,7 @@
         <viewmap

             xsi:type="gmfgen:InnerClassViewmap"

             className="CornerBentDescriptor"

-            classBody="&#xA;/**&#xA; * @generated&#xA; */&#xA;public class CornerBentDescriptor extends org.eclipse.papyrus.diagram.common.figure.node.CornerBentFigure {&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel fCornerBentContentLabel; &#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public CornerBentDescriptor() {&#xA;&#x9;&#x9;&#x9;&#x9;&#xA;&#xA;&#x9;this.setForegroundColor(org.eclipse.draw2d.ColorConstants.black);&#xA;&#x9;this.setBackgroundColor(THIS_BACK&#xA;);&#xA;&#x9;&#x9;createContents();&#xA;&#x9;}&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private void createContents(){&#xA;&#xA;&#xA;fCornerBentContentLabel = new org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel();&#xA;fCornerBentContentLabel.setText(&quot;&quot;);&#xA;&#xA;fCornerBentContentLabel.setFont(FCORNERBENTCONTENTLABEL_FONT);&#xA;&#xA;&#xA;&#xA;this.add(fCornerBentContentLabel);&#xA;&#xA;&#xA;&#x9;}&#xA;&#xA;&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private boolean myUseLocalCoordinates = false;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;protected boolean useLocalCoordinates() {&#xA;&#x9;&#x9;return myUseLocalCoordinates;&#xA;&#x9;}&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;protected void setUseLocalCoordinates(boolean useLocalCoordinates) {&#xA;&#x9;&#x9;myUseLocalCoordinates = useLocalCoordinates;&#xA;&#x9;}&#xA;&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel getCornerBentContentLabel() {&#xA;&#x9;&#x9;return fCornerBentContentLabel;&#xA;&#x9;}&#xA;&#xA;&#xA;}&#xA;&#xA;/**&#xA; * @generated&#xA; */&#xA;static final org.eclipse.swt.graphics.Color THIS_BACK = new org.eclipse.swt.graphics.Color(null, 248, 249, 214);&#xA;&#xA;/**&#xA; * @generated&#xA; */&#xA;static final org.eclipse.swt.graphics.Font FCORNERBENTCONTENTLABEL_FONT = new org.eclipse.swt.graphics.Font(org.eclipse.swt.widgets.Display.getCurrent(), &quot;Arial&quot;, 8, org.eclipse.swt.SWT.NORMAL);&#xA;&#xA;">

+            classBody="&#xA;/**&#xA; * @generated&#xA; */&#xA;public class CornerBentDescriptor extends org.eclipse.papyrus.uml.diagram.common.figure.node.CornerBentFigure {&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel fCornerBentContentLabel; &#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public CornerBentDescriptor() {&#xA;&#x9;&#x9;&#x9;&#x9;&#xA;&#xA;&#x9;this.setForegroundColor(org.eclipse.draw2d.ColorConstants.black);&#xA;&#x9;this.setBackgroundColor(THIS_BACK&#xA;);&#xA;&#x9;&#x9;createContents();&#xA;&#x9;}&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private void createContents(){&#xA;&#xA;&#xA;fCornerBentContentLabel = new org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel();&#xA;fCornerBentContentLabel.setText(&quot;&quot;);&#xA;&#xA;fCornerBentContentLabel.setFont(FCORNERBENTCONTENTLABEL_FONT);&#xA;&#xA;&#xA;&#xA;this.add(fCornerBentContentLabel);&#xA;&#xA;&#xA;&#x9;}&#xA;&#xA;&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private boolean myUseLocalCoordinates = false;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;protected boolean useLocalCoordinates() {&#xA;&#x9;&#x9;return myUseLocalCoordinates;&#xA;&#x9;}&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;protected void setUseLocalCoordinates(boolean useLocalCoordinates) {&#xA;&#x9;&#x9;myUseLocalCoordinates = useLocalCoordinates;&#xA;&#x9;}&#xA;&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel getCornerBentContentLabel() {&#xA;&#x9;&#x9;return fCornerBentContentLabel;&#xA;&#x9;}&#xA;&#xA;&#xA;}&#xA;&#xA;/**&#xA; * @generated&#xA; */&#xA;static final org.eclipse.swt.graphics.Color THIS_BACK = new org.eclipse.swt.graphics.Color(null, 248, 249, 214);&#xA;&#xA;/**&#xA; * @generated&#xA; */&#xA;static final org.eclipse.swt.graphics.Font FCORNERBENTCONTENTLABEL_FONT = new org.eclipse.swt.graphics.Font(org.eclipse.swt.widgets.Display.getCurrent(), &quot;Arial&quot;, 8, org.eclipse.swt.SWT.NORMAL);&#xA;&#xA;">

           <attributes

               xsi:type="gmfgen:StyleAttributes"

               fixedForeground="true"

@@ -1384,7 +1384,7 @@
         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.POPUPBAR_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy"/>

         <modelFacet>

           <metaClass

               href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint"/>

@@ -1450,17 +1450,17 @@
             metamodelType="/0/@diagram/@childNodes.4/@elementType"/>

         <viewmap

             xsi:type="gmfgen:FigureViewmap"

-            figureQualifiedClassName="org.eclipse.papyrus.diagram.common.figure.node.HTMLCornerBentFigure"/>

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.HTMLCornerBentFigure"/>

         <behaviour

             xsi:type="gmfgen:OpenDiagramBehaviour"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.POPUPBAR_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

         <modelFacet>

           <metaClass

               href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Comment"/>

@@ -1487,7 +1487,7 @@
           <viewmap

               xsi:type="gmfgen:ParentAssignedViewmap"

               getterName="getCornerBentFigure"

-              figureQualifiedClassName="org.eclipse.papyrus.diagram.common.figure.node.HTMLCornerBentFigure">

+              figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.HTMLCornerBentFigure">

             <attributes

                 xsi:type="gmfgen:StyleAttributes"

                 fixedFont="true"/>

@@ -1515,7 +1515,7 @@
             editHelperClassName="ShortCutDiagramEditHelper"/>

         <viewmap

             xsi:type="gmfgen:FigureViewmap"

-            figureQualifiedClassName="org.eclipse.papyrus.diagram.common.figure.node.DiagramNodeFigure">

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.DiagramNodeFigure">

           <attributes

               xsi:type="gmfgen:DefaultSizeAttributes"

               width="20"

@@ -1524,7 +1524,7 @@
         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.OPEN_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.ShortCutDiagramEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShortCutDiagramEditPolicy"/>

         <modelFacet>

           <metaClass

               href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Diagram"/>

@@ -1567,8 +1567,8 @@
         </viewmap>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy"/>

         <modelFacet

             xsi:type="gmfgen:TypeLinkModelFacet">

           <metaClass

@@ -1642,8 +1642,8 @@
         </viewmap>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy"/>

         <modelFacet

             xsi:type="gmfgen:TypeLinkModelFacet">

           <metaClass

@@ -1713,8 +1713,8 @@
             classBody="&#xA;/**&#xA; * @generated&#xA; */&#xA;public class SolidLineWDstClosedArrow extends org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx {&#xA;&#xA;&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public SolidLineWDstClosedArrow() {&#xA;&#x9;&#x9;this.setLineWidth(1);&#xA;&#xA;&#x9;&#x9;setTargetDecoration(createTargetDecoration());&#xA;&#x9;}&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private org.eclipse.draw2d.RotatableDecoration createTargetDecoration() {&#xA;&#x9;&#x9;org.eclipse.draw2d.PolygonDecoration df = new org.eclipse.draw2d.PolygonDecoration();&#xA;df.setFill(true);&#xA;df.setLineWidth(1);&#xA;&#x9;df.setBackgroundColor(org.eclipse.draw2d.ColorConstants.white);&#xA;org.eclipse.draw2d.geometry.PointList pl = new org.eclipse.draw2d.geometry.PointList();&#xA;pl.addPoint(getMapMode().DPtoLP(0)&#xA;, getMapMode().DPtoLP(0)&#xA;);&#xA;pl.addPoint(getMapMode().DPtoLP(-2)&#xA;, getMapMode().DPtoLP(2)&#xA;);&#xA;pl.addPoint(getMapMode().DPtoLP(-2)&#xA;, getMapMode().DPtoLP(-2)&#xA;);&#xA;pl.addPoint(getMapMode().DPtoLP(0)&#xA;, getMapMode().DPtoLP(0)&#xA;);&#xA;df.setTemplate(pl);&#xA;df.setScale(getMapMode().DPtoLP(7)&#xA;, getMapMode().DPtoLP(3)&#xA;);&#xA;&#x9;&#x9;return df;&#xA;&#x9;}&#xA;&#xA;&#xA;&#xA;&#xA;}&#xA;&#xA;"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy"/>

         <modelFacet

             xsi:type="gmfgen:TypeLinkModelFacet">

           <metaClass

@@ -1764,7 +1764,7 @@
             editHelperClassName="AssociationEditHelper"/>

         <viewmap

             xsi:type="gmfgen:FigureViewmap"

-            figureQualifiedClassName="org.eclipse.papyrus.diagram.usecase.figure.AssociationFigure">

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.usecase.figure.AssociationFigure">

           <attributes

               xsi:type="gmfgen:StyleAttributes"

               fixedForeground="true"

@@ -1772,8 +1772,8 @@
         </viewmap>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy"/>

         <modelFacet

             xsi:type="gmfgen:TypeLinkModelFacet"

             modelElementSelector="/0/@expressionProviders/@providers.0/@expressions.12">

@@ -1876,11 +1876,11 @@
             editHelperClassName="DependencyEditHelper"/>

         <viewmap

             xsi:type="gmfgen:FigureViewmap"

-            figureQualifiedClassName="org.eclipse.papyrus.diagram.common.figure.edge.DashedEdgeFigure"/>

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy"/>

         <modelFacet

             xsi:type="gmfgen:TypeLinkModelFacet"

             modelElementSelector="/0/@expressionProviders/@providers.0/@expressions.16">

@@ -1982,11 +1982,11 @@
             editHelperClassName="AbstractionEditHelper"/>

         <viewmap

             xsi:type="gmfgen:FigureViewmap"

-            figureQualifiedClassName="org.eclipse.papyrus.diagram.common.figure.edge.DashedEdgeFigure"/>

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeAbstractionLabelDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeAbstractionLabelDisplayEditPolicy"/>

         <modelFacet

             xsi:type="gmfgen:TypeLinkModelFacet"

             modelElementSelector="/0/@expressionProviders/@providers.0/@expressions.18">

@@ -2066,11 +2066,11 @@
             editHelperClassName="UsageEditHelper"/>

         <viewmap

             xsi:type="gmfgen:FigureViewmap"

-            figureQualifiedClassName="org.eclipse.papyrus.diagram.common.figure.edge.DashedEdgeFigure"/>

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeUsageLabelDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeUsageLabelDisplayEditPolicy"/>

         <modelFacet

             xsi:type="gmfgen:TypeLinkModelFacet"

             modelElementSelector="/0/@expressionProviders/@providers.0/@expressions.19">

@@ -2150,11 +2150,11 @@
             editHelperClassName="RealizationEditHelper"/>

         <viewmap

             xsi:type="gmfgen:FigureViewmap"

-            figureQualifiedClassName="org.eclipse.papyrus.diagram.common.figure.edge.InterfaceRealizationFigure"/>

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.edge.InterfaceRealizationFigure"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy"/>

         <modelFacet

             xsi:type="gmfgen:TypeLinkModelFacet"

             modelElementSelector="/0/@expressionProviders/@providers.0/@expressions.20">

@@ -2233,11 +2233,11 @@
             editHelperClassName="PackageMergeEditHelper"/>

         <viewmap

             xsi:type="gmfgen:FigureViewmap"

-            figureQualifiedClassName="org.eclipse.papyrus.diagram.common.figure.edge.DashedEdgeFigure"/>

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypePackageMergeLabelDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypePackageMergeLabelDisplayEditPolicy"/>

         <modelFacet

             xsi:type="gmfgen:TypeLinkModelFacet">

           <metaClass

@@ -2282,11 +2282,11 @@
             editHelperClassName="PackageImportEditHelper"/>

         <viewmap

             xsi:type="gmfgen:FigureViewmap"

-            figureQualifiedClassName="org.eclipse.papyrus.diagram.common.figure.edge.DashedEdgeFigure"/>

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypePackageImportLabelDisplayEditPolicy"/>

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypePackageImportLabelDisplayEditPolicy"/>

         <modelFacet

             xsi:type="gmfgen:TypeLinkModelFacet">

           <metaClass

@@ -2337,7 +2337,7 @@
         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="EditPolicyRoles.DRAG_DROP_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.usecase.edit.policies.CustomDiagramDragDropEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.usecase.edit.policies.CustomDiagramDragDropEditPolicy"/>

       </compartments>

       <compartments

           visualID="7010"

@@ -2357,7 +2357,7 @@
         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="EditPolicyRoles.DRAG_DROP_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.usecase.edit.policies.CustomDiagramDragDropEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.usecase.edit.policies.CustomDiagramDragDropEditPolicy"/>

       </compartments>

       <compartments

           visualID="7011"

@@ -2380,7 +2380,7 @@
         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="EditPolicyRoles.DRAG_DROP_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.usecase.edit.policies.CustomDiagramDragDropEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.usecase.edit.policies.CustomDiagramDragDropEditPolicy"/>

       </compartments>

       <compartments

           visualID="7012"

@@ -2402,7 +2402,7 @@
         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="EditPolicyRoles.DRAG_DROP_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.usecase.edit.policies.CustomDiagramDragDropEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.usecase.edit.policies.CustomDiagramDragDropEditPolicy"/>

       </compartments>

       <compartments

           visualID="7017"

@@ -2425,7 +2425,7 @@
         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="EditPolicyRoles.DRAG_DROP_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.usecase.edit.policies.CustomDiagramDragDropEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.usecase.edit.policies.CustomDiagramDragDropEditPolicy"/>

       </compartments>

       <compartments

           visualID="7014"

@@ -2447,7 +2447,7 @@
         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="EditPolicyRoles.DRAG_DROP_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.usecase.edit.policies.CustomDiagramDragDropEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.usecase.edit.policies.CustomDiagramDragDropEditPolicy"/>

       </compartments>

       <compartments

           visualID="7015"

@@ -2470,7 +2470,7 @@
         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="EditPolicyRoles.DRAG_DROP_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.usecase.edit.policies.CustomDiagramDragDropEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.usecase.edit.policies.CustomDiagramDragDropEditPolicy"/>

       </compartments>

       <compartments

           visualID="7016"

@@ -2493,11 +2493,11 @@
         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="EditPolicy.GRAPHICAL_NODE_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.CustomContainerEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="EditPolicyRoles.DRAG_DROP_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.usecase.edit.policies.CustomDiagramDragDropEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.usecase.edit.policies.CustomDiagramDragDropEditPolicy"/>

       </compartments>

       <compartments

           visualID="7013"

@@ -2520,11 +2520,11 @@
         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="EditPolicy.GRAPHICAL_NODE_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.common.editpolicies.CustomContainerEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="EditPolicyRoles.DRAG_DROP_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.diagram.usecase.edit.policies.CustomDiagramDragDropEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.usecase.edit.policies.CustomDiagramDragDropEditPolicy"/>

       </compartments>

       <palette>

         <groups

@@ -2734,7 +2734,7 @@
       </preferencePages>

     </diagram>

     <plugin

-        iD="org.eclipse.papyrus.diagram.usecase"

+        iD="org.eclipse.papyrus.uml.diagram.usecase"

         name="Papyrus useCase editor Plugin"

         provider="Papyrus"

         version="0.9.0.qualifier">

@@ -6322,18 +6322,18 @@
       <implementations

           xsi:type="gmfgen:CustomParser"

           uses="/0/@diagram/@links.10/@labels.0/@modelFacet /0/@diagram/@childNodes.6/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.0/@labels.1/@modelFacet /0/@diagram/@childNodes.8/@labels.1/@modelFacet /0/@diagram/@links.0/@labels.1/@modelFacet /0/@diagram/@links.1/@labels.1/@modelFacet /0/@diagram/@links.2/@labels.0/@modelFacet /0/@diagram/@links.3/@labels.1/@modelFacet /0/@diagram/@links.5/@labels.1/@modelFacet /0/@diagram/@links.7/@labels.1/@modelFacet /0/@diagram/@links.8/@labels.1/@modelFacet /0/@diagram/@links.9/@labels.1/@modelFacet /0/@diagram/@links.11/@labels.0/@modelFacet"

-          qualifiedName="org.eclipse.papyrus.diagram.common.parser.stereotype.AppliedStereotypeParser"/>

+          qualifiedName="org.eclipse.papyrus.uml.diagram.common.parser.stereotype.AppliedStereotypeParser"/>

       <implementations

           xsi:type="gmfgen:CustomParser"

           uses="/0/@diagram/@topLevelNodes.7/@labels.0/@modelFacet /0/@diagram/@childNodes.4/@labels.0/@modelFacet"

-          qualifiedName="org.eclipse.papyrus.diagram.common.parser.CommentParser"/>

+          qualifiedName="org.eclipse.papyrus.uml.diagram.common.parser.CommentParser"/>

     </labelParsers>

     <contextMenus

-        iD="org.eclipse.papyrus.diagram.usecase.part.LoadResourceAction"

+        iD="org.eclipse.papyrus.uml.diagram.usecase.part.LoadResourceAction"

         context="/0/@diagram">

       <items

           xsi:type="gmfgen:LoadResourceAction"

-          qualifiedClassName="org.eclipse.papyrus.diagram.usecase.part.LoadResourceAction"/>

+          qualifiedClassName="org.eclipse.papyrus.uml.diagram.usecase.part.LoadResourceAction"/>

     </contextMenus>

   </gmfgen:GenEditorGenerator>

   <papyrusgmfgenextension:PapyrusExtensionRootNode>

@@ -6342,69 +6342,69 @@
         comment="manage edit part that extends NamedElementEditPart in common"

         genView="/0/@diagram/@childNodes.11 /0/@diagram/@topLevelNodes.5"

         name="NamedElementEditPart"

-        superOwnedEditPart="org.eclipse.papyrus.diagram.common.editparts.NamedElementEditPart"/>

+        superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart"/>

     <extensionNodes

         xsi:type="papyrusgmfgenextension:ExtendedGenView"

         comment="Label in charge to display applied stereotypes on links"

         genView="/0/@diagram/@links.0 /0/@diagram/@links.1 /0/@diagram/@links.2 /0/@diagram/@links.3 /0/@diagram/@links.5 /0/@diagram/@links.7 /0/@diagram/@links.8 /0/@diagram/@links.9 /0/@diagram/@links.10 /0/@diagram/@links.11"

         name="ExtendedUMLLinks"

-        superOwnedEditPart="org.eclipse.papyrus.diagram.common.editparts.UMLConnectionNodeEditPart"/>

+        superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart"/>

     <extensionNodes

         xsi:type="papyrusgmfgenextension:ExtendedGenView"

         comment="add superclass for short cut"

         genView="/0/@diagram/@topLevelNodes.8"

         name="AbstractShortCutDiagramEditPart"

-        superOwnedEditPart="org.eclipse.papyrus.diagram.common.editparts.AbstractShortCutDiagramEditPart"/>

+        superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.AbstractShortCutDiagramEditPart"/>

     <extensionNodes

         xsi:type="papyrusgmfgenextension:ExtendedGenView"

         comment="Name of the shorcut diagram"

         genView="/0/@diagram/@topLevelNodes.8/@labels.0"

         name="AbstractShortcutDiagramNameEditPart"

-        superOwnedEditPart="org.eclipse.papyrus.diagram.common.editparts.AbstractShortcutDiagramNameEditPart"/>

+        superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.AbstractShortcutDiagramNameEditPart"/>

     <extensionNodes

         xsi:type="papyrusgmfgenextension:ExtendedGenView"

         comment="add superclass for compartment"

         genView="/0/@diagram/@compartments.0 /0/@diagram/@compartments.1 /0/@diagram/@compartments.3 /0/@diagram/@compartments.5"

         name="ResizeableListCompartmentEditPart"

-        superOwnedEditPart="org.eclipse.papyrus.diagram.common.editparts.ResizeableListCompartmentEditPart"/>

+        superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.ResizeableListCompartmentEditPart"/>

     <extensionNodes

         xsi:type="papyrusgmfgenextension:ExtendedGenView"

         comment="this is an extension to manage the comment"

         genView="/0/@diagram/@childNodes.4 /0/@diagram/@topLevelNodes.7"

         name="comment extended node"

-        superOwnedEditPart="org.eclipse.papyrus.diagram.common.editparts.AbstractCommentEditPart"/>

+        superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.AbstractCommentEditPart"/>

     <extensionNodes

         xsi:type="papyrusgmfgenextension:LabelVisibilityPreference"

         comment="HiddenName"

         role="Name"

-        iconPathRole="platform:/plugin/org.eclipse.papyrus.diagram.common/icons/label_role/name.png"

+        iconPathRole="platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/name.png"

         linkLabels="/0/@diagram/@links.3/@labels.0"

         visibleByDefault="false"/>

     <extensionNodes

         xsi:type="papyrusgmfgenextension:LabelVisibilityPreference"

         comment="Name"

         role="Name"

-        iconPathRole="platform:/plugin/org.eclipse.papyrus.diagram.common/icons/label_role/name.png"

+        iconPathRole="platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/name.png"

         linkLabels="/0/@diagram/@links.5/@labels.0 /0/@diagram/@links.7/@labels.0 /0/@diagram/@links.8/@labels.0 /0/@diagram/@links.9/@labels.0"

         externalNodeLabels="/0/@diagram/@topLevelNodes.8/@labels.0 /0/@diagram/@childNodes.6/@labels.0 /0/@diagram/@childNodes.8/@labels.0 /0/@diagram/@topLevelNodes.0/@labels.0"/>

     <extensionNodes

         xsi:type="papyrusgmfgenextension:LabelVisibilityPreference"

         comment="Stereotype"

         role="Stereotype"

-        iconPathRole="platform:/plugin/org.eclipse.papyrus.diagram.common/icons/stereotype.gif"

+        iconPathRole="platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/stereotype.gif"

         linkLabels="/0/@diagram/@links.0/@labels.1 /0/@diagram/@links.1/@labels.1 /0/@diagram/@links.2/@labels.0 /0/@diagram/@links.3/@labels.1 /0/@diagram/@links.5/@labels.1 /0/@diagram/@links.7/@labels.1 /0/@diagram/@links.8/@labels.1 /0/@diagram/@links.9/@labels.1 /0/@diagram/@links.10/@labels.0 /0/@diagram/@links.11/@labels.0"

         externalNodeLabels="/0/@diagram/@childNodes.6/@labels.1 /0/@diagram/@childNodes.8/@labels.1 /0/@diagram/@topLevelNodes.0/@labels.1"/>

     <extensionNodes

         xsi:type="papyrusgmfgenextension:ExtendedGenView"

         comment="Extended Gen View For UML compartments child label nodes, like properties in classifier representation of class diagram"

         name="UMLCompartmentEditPart"

-        superOwnedEditPart="org.eclipse.papyrus.diagram.common.editparts.UMLCompartmentEditPart"/>

+        superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.UMLCompartmentEditPart"/>

     <extensionNodes

         xsi:type="papyrusgmfgenextension:ExtendedGenView"

         comment="Manages stereotype shown with External Label"

         genView="/0/@diagram/@links.0/@labels.1 /0/@diagram/@links.1/@labels.1 /0/@diagram/@links.2/@labels.0 /0/@diagram/@links.3/@labels.1 /0/@diagram/@links.5/@labels.1 /0/@diagram/@links.7/@labels.1 /0/@diagram/@links.8/@labels.1 /0/@diagram/@links.9/@labels.1 /0/@diagram/@links.10/@labels.0 /0/@diagram/@links.11/@labels.0 /0/@diagram/@childNodes.6/@labels.1 /0/@diagram/@childNodes.8/@labels.1 /0/@diagram/@topLevelNodes.0/@labels.1"

         name="EP_Stereotypes_EXT_NODE"

-        superOwnedEditPart="org.eclipse.papyrus.diagram.common.editparts.AbstractLabelEditPart"/>

+        superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.AbstractLabelEditPart"/>

     <extensionNodes

         xsi:type="papyrusgmfgenextension:EditPartUsingReorientService"

         comment="Use the edit service for reorient command (All DirectedRelationship)"

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/models/usecaseDiagram.gmfgraph b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/models/usecaseDiagram.gmfgraph
index 96f70a7f279..8485ec07303 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/models/usecaseDiagram.gmfgraph
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/models/usecaseDiagram.gmfgraph
@@ -54,7 +54,7 @@
       <actualFigure

           xsi:type="gmfgraph:CustomFigure"

           name="ActorFigure"

-          qualifiedClassName="org.eclipse.papyrus.diagram.usecase.draw2d.StickMan"/>

+          qualifiedClassName="org.eclipse.papyrus.uml.diagram.usecase.draw2d.StickMan"/>

     </descriptors>

     <descriptors

         name="UseCaseFigure">

@@ -63,7 +63,7 @@
           name="UseCaseFigure">

         <layout

             xsi:type="gmfgraph:CustomLayout"

-            qualifiedClassName="org.eclipse.papyrus.diagram.common.draw2d.SplitEllipseLayout"/>

+            qualifiedClassName="org.eclipse.papyrus.uml.diagram.common.draw2d.SplitEllipseLayout"/>

         <foregroundColor

             xsi:type="gmfgraph:RGBColor"

             red="177"

@@ -97,7 +97,7 @@
               alignment="FILL"/>

           <border

               xsi:type="gmfgraph:CustomBorder"

-              qualifiedClassName="org.eclipse.papyrus.diagram.common.draw2d.OneLineDashedBorder"/>

+              qualifiedClassName="org.eclipse.papyrus.uml.diagram.common.draw2d.OneLineDashedBorder"/>

         </children>

       </actualFigure>

       <accessors

@@ -149,7 +149,7 @@
               outline="false">

             <layout

                 xsi:type="gmfgraph:CustomLayout"

-                qualifiedClassName="org.eclipse.papyrus.diagram.common.draw2d.CenterLayout"/>

+                qualifiedClassName="org.eclipse.papyrus.uml.diagram.common.draw2d.CenterLayout"/>

             <children

                 xsi:type="gmfgraph:Label"

                 name="UseCaseAsClassFigure_name">

@@ -201,7 +201,7 @@
             fill="false">

           <layout

               xsi:type="gmfgraph:CustomLayout"

-              qualifiedClassName="org.eclipse.papyrus.diagram.common.draw2d.CenterLayout"/>

+              qualifiedClassName="org.eclipse.papyrus.uml.diagram.common.draw2d.CenterLayout"/>

           <children

               xsi:type="gmfgraph:Label"

               name="ActorAsRectangleFigure_name"/>

@@ -218,7 +218,7 @@
           name="UseCaseSubjectFigure">

         <layout

             xsi:type="gmfgraph:CustomLayout"

-            qualifiedClassName="org.eclipse.papyrus.diagram.common.draw2d.PileLayout">

+            qualifiedClassName="org.eclipse.papyrus.uml.diagram.common.draw2d.PileLayout">

           <attributes

               name="stretchBottom"

               value="true"/>

@@ -233,7 +233,7 @@
             name="UseCaseSubjectFigure_header">

           <layout

               xsi:type="gmfgraph:CustomLayout"

-              qualifiedClassName="org.eclipse.papyrus.diagram.common.draw2d.CenterLayout"/>

+              qualifiedClassName="org.eclipse.papyrus.uml.diagram.common.draw2d.CenterLayout"/>

           <children

               xsi:type="gmfgraph:Label"

               name="UseCaseSubjectFigure_name">

@@ -270,7 +270,7 @@
       <actualFigure

           xsi:type="gmfgraph:CustomFigure"

           name="AppliedStereotypeWrappingLabel"

-          qualifiedClassName="org.eclipse.papyrus.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure"/>

+          qualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure"/>

     </descriptors>

   </figures>

   <nodes

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/models/usecaseDiagram.gmfmap b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/models/usecaseDiagram.gmfmap
index 842dbb1c898..615302952c1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/models/usecaseDiagram.gmfmap
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/models/usecaseDiagram.gmfmap
@@ -325,20 +325,20 @@
           xsi:type="gmfmap:FeatureLabelMapping"

           editPattern="">

         <diagramLabel

-            href="../../org.eclipse.papyrus.diagram.common/model/PackageElement.gmfgraph#PackageNameDiagramLabel"/>

+            href="../../org.eclipse.papyrus.uml.diagram.common/model/PackageElement.gmfgraph#PackageNameDiagramLabel"/>

         <features

             href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//NamedElement/name"/>

       </labelMappings>

       <labelMappings

           readOnly="true">

         <diagramLabel

-            href="../../org.eclipse.papyrus.diagram.common/model/PackageElement.gmfgraph#PackageStereotypesDiagramLabel"/>

+            href="../../org.eclipse.papyrus.uml.diagram.common/model/PackageElement.gmfgraph#PackageStereotypesDiagramLabel"/>

       </labelMappings>

       <tool

           xsi:type="gmftool:CreationTool"

           href="usecaseDiagram.gmftool#//@palette/@tools.0/@tools.3"/>

       <diagramNode

-          href="../../org.eclipse.papyrus.diagram.common/model/PackageElement.gmfgraph#PackageNode"/>

+          href="../../org.eclipse.papyrus.uml.diagram.common/model/PackageElement.gmfgraph#PackageNode"/>

       <children

           compartment="//@nodes.5/@ownedChild/@compartments.0"

           referencedChild="//@nodes.6/@ownedChild">

@@ -390,7 +390,7 @@
       <compartments

           children="//@nodes.5/@ownedChild/@children.1 //@nodes.5/@ownedChild/@children.2 //@nodes.5/@ownedChild/@children.3 //@nodes.5/@ownedChild/@children.0 //@nodes.5/@ownedChild/@children.4 //@nodes.5/@ownedChild/@children.5">

         <compartment

-            href="../../org.eclipse.papyrus.diagram.common/model/PackageElement.gmfgraph#PackageableElementCompartment"/>

+            href="../../org.eclipse.papyrus.uml.diagram.common/model/PackageElement.gmfgraph#PackageableElementCompartment"/>

       </compartments>

     </ownedChild>

   </nodes>

@@ -425,7 +425,7 @@
           xsi:type="gmfmap:FeatureLabelMapping"

           editPattern="">

         <diagramLabel

-            href="../../org.eclipse.papyrus.diagram.common/model/Comment.gmfgraph#CornerBentContentDiagramLabel"/>

+            href="../../org.eclipse.papyrus.uml.diagram.common/model/Comment.gmfgraph#CornerBentContentDiagramLabel"/>

         <features

             href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//NamedElement/name"/>

       </labelMappings>

@@ -433,7 +433,7 @@
           xsi:type="gmftool:CreationTool"

           href="usecaseDiagram.gmftool#//@palette/@tools.0/@tools.4"/>

       <diagramNode

-          href="../../org.eclipse.papyrus.diagram.common/model/Comment.gmfgraph#CornerBentNode"/>

+          href="../../org.eclipse.papyrus.uml.diagram.common/model/Comment.gmfgraph#CornerBentNode"/>

     </ownedChild>

   </nodes>

   <nodes>

@@ -458,7 +458,7 @@
           xsi:type="gmfmap:FeatureLabelMapping"

           editPattern="">

         <diagramLabel

-            href="../../org.eclipse.papyrus.diagram.common/model/Comment.gmfgraph#CornerBentContentDiagramLabel"/>

+            href="../../org.eclipse.papyrus.uml.diagram.common/model/Comment.gmfgraph#CornerBentContentDiagramLabel"/>

         <features

             href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//Comment/body"/>

       </labelMappings>

@@ -466,7 +466,7 @@
           xsi:type="gmftool:CreationTool"

           href="usecaseDiagram.gmftool#//@palette/@tools.0/@tools.5"/>

       <diagramNode

-          href="../../org.eclipse.papyrus.diagram.common/model/Comment.gmfgraph#CornerBentNode"/>

+          href="../../org.eclipse.papyrus.uml.diagram.common/model/Comment.gmfgraph#CornerBentNode"/>

     </ownedChild>

   </nodes>

   <links>

@@ -529,7 +529,7 @@
     <labelMappings

         readOnly="true">

       <diagramLabel

-          href="../../org.eclipse.papyrus.diagram.common/model/Generalization.gmfgraph#GeneralizationAppliedStereotypeDiagramLabel"/>

+          href="../../org.eclipse.papyrus.uml.diagram.common/model/Generalization.gmfgraph#GeneralizationAppliedStereotypeDiagramLabel"/>

     </labelMappings>

     <containmentFeature

         href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//Classifier/generalization"/>

@@ -570,14 +570,14 @@
     <labelMappings

         xsi:type="gmfmap:FeatureLabelMapping">

       <diagramLabel

-          href="../../org.eclipse.papyrus.diagram.common/model/Association.gmfgraph#AssociationNameDiagramLabel"/>

+          href="../../org.eclipse.papyrus.uml.diagram.common/model/Association.gmfgraph#AssociationNameDiagramLabel"/>

       <features

           href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//NamedElement/name"/>

     </labelMappings>

     <labelMappings

         readOnly="true">

       <diagramLabel

-          href="../../org.eclipse.papyrus.diagram.common/model/Association.gmfgraph#AppliedStereotypeAssociationDiagramLabel"/>

+          href="../../org.eclipse.papyrus.uml.diagram.common/model/Association.gmfgraph#AppliedStereotypeAssociationDiagramLabel"/>

     </labelMappings>

     <containmentFeature

         href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//Package/packagedElement"/>

@@ -585,7 +585,7 @@
         xsi:type="gmftool:CreationTool"

         href="usecaseDiagram.gmftool#//@palette/@tools.2/@tools.0"/>

     <diagramLink

-        href="../../org.eclipse.papyrus.diagram.common/model/Association.gmfgraph#AssociationConnection"/>

+        href="../../org.eclipse.papyrus.uml.diagram.common/model/Association.gmfgraph#AssociationConnection"/>

     <sourceMetaFeature

         xsi:type="ecore:EReference"

         href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//Association/endType"/>

@@ -630,14 +630,14 @@
     <labelMappings

         xsi:type="gmfmap:FeatureLabelMapping">

       <diagramLabel

-          href="../../org.eclipse.papyrus.diagram.common/model/Dependency.gmfgraph#DependencyNameDiagramLabel"/>

+          href="../../org.eclipse.papyrus.uml.diagram.common/model/Dependency.gmfgraph#DependencyNameDiagramLabel"/>

       <features

           href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//NamedElement/name"/>

     </labelMappings>

     <labelMappings

         readOnly="true">

       <diagramLabel

-          href="../../org.eclipse.papyrus.diagram.common/model/Dependency.gmfgraph#DependencyAppliedStereotypeDiagramLabel"/>

+          href="../../org.eclipse.papyrus.uml.diagram.common/model/Dependency.gmfgraph#DependencyAppliedStereotypeDiagramLabel"/>

     </labelMappings>

     <containmentFeature

         href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//Package/packagedElement"/>

@@ -645,7 +645,7 @@
         xsi:type="gmftool:CreationTool"

         href="usecaseDiagram.gmftool#//@palette/@tools.2/@tools.5"/>

     <diagramLink

-        href="../../org.eclipse.papyrus.diagram.common/model/Dependency.gmfgraph#DependencyConnection"/>

+        href="../../org.eclipse.papyrus.uml.diagram.common/model/Dependency.gmfgraph#DependencyConnection"/>

     <sourceMetaFeature

         xsi:type="ecore:EReference"

         href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//Dependency/client"/>

@@ -663,7 +663,7 @@
         xsi:type="gmftool:CreationTool"

         href="usecaseDiagram.gmftool#//@palette/@tools.2/@tools.6"/>

     <diagramLink

-        href="../../org.eclipse.papyrus.diagram.common/model/Comment.gmfgraph#CommentLinkConnection"/>

+        href="../../org.eclipse.papyrus.uml.diagram.common/model/Comment.gmfgraph#CommentLinkConnection"/>

     <linkMetaFeature

         xsi:type="ecore:EReference"

         href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//Comment/annotatedElement"/>

@@ -689,7 +689,7 @@
     <labelMappings

         xsi:type="gmfmap:FeatureLabelMapping">

       <diagramLabel

-          href="../../org.eclipse.papyrus.diagram.common/model/Dependency.gmfgraph#DependencyNameDiagramLabel"/>

+          href="../../org.eclipse.papyrus.uml.diagram.common/model/Dependency.gmfgraph#DependencyNameDiagramLabel"/>

       <features

           href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//NamedElement/name"/>

     </labelMappings>

@@ -700,14 +700,14 @@
         editorPattern="&lt;&lt;{0}>>"

         editPattern="&lt;&lt;{0}>>">

       <diagramLabel

-          href="../../org.eclipse.papyrus.diagram.common/model/Dependency.gmfgraph#DependencyAppliedStereotypeDiagramLabel"/>

+          href="../../org.eclipse.papyrus.uml.diagram.common/model/Dependency.gmfgraph#DependencyAppliedStereotypeDiagramLabel"/>

       <features

           href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//NamedElement/name"/>

     </labelMappings>

     <labelMappings

         readOnly="true">

       <diagramLabel

-          href="../../org.eclipse.papyrus.diagram.common/model/Dependency.gmfgraph#DependencyAppliedStereotypeDiagramLabel"/>

+          href="../../org.eclipse.papyrus.uml.diagram.common/model/Dependency.gmfgraph#DependencyAppliedStereotypeDiagramLabel"/>

     </labelMappings>

     <containmentFeature

         href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//Package/packagedElement"/>

@@ -715,7 +715,7 @@
         xsi:type="gmftool:CreationTool"

         href="usecaseDiagram.gmftool#//@palette/@tools.2/@tools.7"/>

     <diagramLink

-        href="../../org.eclipse.papyrus.diagram.common/model/Dependency.gmfgraph#DependencyConnection"/>

+        href="../../org.eclipse.papyrus.uml.diagram.common/model/Dependency.gmfgraph#DependencyConnection"/>

     <sourceMetaFeature

         xsi:type="ecore:EReference"

         href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//Dependency/client"/>

@@ -744,7 +744,7 @@
     <labelMappings

         xsi:type="gmfmap:FeatureLabelMapping">

       <diagramLabel

-          href="../../org.eclipse.papyrus.diagram.common/model/Dependency.gmfgraph#DependencyNameDiagramLabel"/>

+          href="../../org.eclipse.papyrus.uml.diagram.common/model/Dependency.gmfgraph#DependencyNameDiagramLabel"/>

       <features

           href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//NamedElement/name"/>

     </labelMappings>

@@ -755,14 +755,14 @@
         editorPattern="&lt;&lt;{0}>>"

         editPattern="&lt;&lt;{0}>>">

       <diagramLabel

-          href="../../org.eclipse.papyrus.diagram.common/model/Dependency.gmfgraph#DependencyAppliedStereotypeDiagramLabel"/>

+          href="../../org.eclipse.papyrus.uml.diagram.common/model/Dependency.gmfgraph#DependencyAppliedStereotypeDiagramLabel"/>

       <features

           href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//NamedElement/name"/>

     </labelMappings>

     <labelMappings

         readOnly="true">

       <diagramLabel

-          href="../../org.eclipse.papyrus.diagram.common/model/Dependency.gmfgraph#DependencyAppliedStereotypeDiagramLabel"/>

+          href="../../org.eclipse.papyrus.uml.diagram.common/model/Dependency.gmfgraph#DependencyAppliedStereotypeDiagramLabel"/>

     </labelMappings>

     <containmentFeature

         href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//Package/packagedElement"/>

@@ -770,7 +770,7 @@
         xsi:type="gmftool:CreationTool"

         href="usecaseDiagram.gmftool#//@palette/@tools.2/@tools.9"/>

     <diagramLink

-        href="../../org.eclipse.papyrus.diagram.common/model/Dependency.gmfgraph#DependencyConnection"/>

+        href="../../org.eclipse.papyrus.uml.diagram.common/model/Dependency.gmfgraph#DependencyConnection"/>

     <sourceMetaFeature

         xsi:type="ecore:EReference"

         href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//Dependency/client"/>

@@ -799,7 +799,7 @@
     <labelMappings

         xsi:type="gmfmap:FeatureLabelMapping">

       <diagramLabel

-          href="../../org.eclipse.papyrus.diagram.common/model/InterfaceRealization.gmfgraph#InterfaceRealizationNameDiagramLabel"/>

+          href="../../org.eclipse.papyrus.uml.diagram.common/model/InterfaceRealization.gmfgraph#InterfaceRealizationNameDiagramLabel"/>

       <features

           href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//NamedElement/name"/>

     </labelMappings>

@@ -810,14 +810,14 @@
         editorPattern="&lt;&lt;{0}>>"

         editPattern="&lt;&lt;{0}>>">

       <diagramLabel

-          href="../../org.eclipse.papyrus.diagram.common/model/InterfaceRealization.gmfgraph#InterfaceRealizationAppliedStereotypeDiagramLabel"/>

+          href="../../org.eclipse.papyrus.uml.diagram.common/model/InterfaceRealization.gmfgraph#InterfaceRealizationAppliedStereotypeDiagramLabel"/>

       <features

           href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//NamedElement/name"/>

     </labelMappings>

     <labelMappings

         readOnly="true">

       <diagramLabel

-          href="../../org.eclipse.papyrus.diagram.common/model/InterfaceRealization.gmfgraph#InterfaceRealizationAppliedStereotypeDiagramLabel"/>

+          href="../../org.eclipse.papyrus.uml.diagram.common/model/InterfaceRealization.gmfgraph#InterfaceRealizationAppliedStereotypeDiagramLabel"/>

     </labelMappings>

     <containmentFeature

         href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//Package/packagedElement"/>

@@ -825,7 +825,7 @@
         xsi:type="gmftool:CreationTool"

         href="usecaseDiagram.gmftool#//@palette/@tools.2/@tools.8"/>

     <diagramLink

-        href="../../org.eclipse.papyrus.diagram.common/model/InterfaceRealization.gmfgraph#InterfaceRealizationConnection"/>

+        href="../../org.eclipse.papyrus.uml.diagram.common/model/InterfaceRealization.gmfgraph#InterfaceRealizationConnection"/>

     <sourceMetaFeature

         xsi:type="ecore:EReference"

         href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//Dependency/client"/>

@@ -843,7 +843,7 @@
         xsi:type="gmftool:CreationTool"

         href="usecaseDiagram.gmftool#//@palette/@tools.2/@tools.11"/>

     <diagramLink

-        href="../../org.eclipse.papyrus.diagram.common/model/Dependency.gmfgraph#DependencyConnection"/>

+        href="../../org.eclipse.papyrus.uml.diagram.common/model/Dependency.gmfgraph#DependencyConnection"/>

     <sourceMetaFeature

         xsi:type="ecore:EReference"

         href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//PackageMerge/receivingPackage"/>

@@ -862,14 +862,14 @@
         editorPattern="&lt;&lt;{0}>>"

         editPattern="&lt;&lt;{0}>>">

       <diagramLabel

-          href="../../org.eclipse.papyrus.diagram.common/model/Dependency.gmfgraph#DependencyAppliedStereotypeDiagramLabel"/>

+          href="../../org.eclipse.papyrus.uml.diagram.common/model/Dependency.gmfgraph#DependencyAppliedStereotypeDiagramLabel"/>

       <features

           href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//PackageImport/visibility"/>

     </labelMappings>

     <labelMappings

         readOnly="true">

       <diagramLabel

-          href="../../org.eclipse.papyrus.diagram.common/model/Dependency.gmfgraph#DependencyAppliedStereotypeDiagramLabel"/>

+          href="../../org.eclipse.papyrus.uml.diagram.common/model/Dependency.gmfgraph#DependencyAppliedStereotypeDiagramLabel"/>

     </labelMappings>

     <containmentFeature

         href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//Namespace/packageImport"/>

@@ -877,7 +877,7 @@
         xsi:type="gmftool:CreationTool"

         href="usecaseDiagram.gmftool#//@palette/@tools.2/@tools.10"/>

     <diagramLink

-        href="../../org.eclipse.papyrus.diagram.common/model/Dependency.gmfgraph#DependencyConnection"/>

+        href="../../org.eclipse.papyrus.uml.diagram.common/model/Dependency.gmfgraph#DependencyConnection"/>

     <linkMetaFeature

         xsi:type="ecore:EReference"

         href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//PackageImport/importedPackage"/>

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/plugin.xml
index d3d2de0c95e..b0c9941738e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/plugin.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/plugin.xml
@@ -25,7 +25,7 @@
    <extension

          point="org.eclipse.ui.handlers">

       <handler

-            class="org.eclipse.papyrus.diagram.usecase.CreateUseCaseDiagramWithNavigationHandler"

+            class="org.eclipse.papyrus.uml.diagram.usecase.CreateUseCaseDiagramWithNavigationHandler"

             commandId="org.eclipse.papyrus.diagram.usecase.CreateUseCaseDiagramCommand">

          <activeWhen>

             <or>

@@ -54,7 +54,7 @@
                   style="push"

                   tooltip="Create a new UseCase Diagram">

                   <visibleWhen>

-                  	<reference definitionId="org.eclipse.papyrus.diagram.common.IsPapyrusActiveWithUMLModel"/>

+                  	<reference definitionId="org.eclipse.papyrus.uml.diagram.common.IsPapyrusActiveWithUMLModel"/>

                   </visibleWhen>

             </command>

          </toolbar>

@@ -72,20 +72,20 @@
                   style="push"

                   tooltip="Create a new UseCase Diagram">

                   <visibleWhen>

-                  	<reference definitionId="org.eclipse.papyrus.diagram.common.IsPapyrusActiveWithUMLModel"/>

+                  	<reference definitionId="org.eclipse.papyrus.uml.diagram.common.IsPapyrusActiveWithUMLModel"/>

                   </visibleWhen>                  

             </command>

          </menu>

       </menuContribution>

       

-	<menuContribution locationURI="popup:org.eclipse.papyrus.modelexplorer.popupmenu.creatediagram">

+	<menuContribution locationURI="popup:org.eclipse.papyrus.views.modelexplorer.popupmenu.creatediagram">

 		<command commandId="org.eclipse.papyrus.diagram.usecase.CreateUseCaseDiagramCommand"

 			icon="icons/obj16/Diagram_UseCase.gif"

 			label="Create a new UseCase Diagram"

 			style="push"

 			tooltip="Create a new UseCase Diagram">

 			<visibleWhen>

-				<reference definitionId="org.eclipse.papyrus.diagram.common.IsPapyrusActiveWithUMLModel"/>

+				<reference definitionId="org.eclipse.papyrus.uml.diagram.common.IsPapyrusActiveWithUMLModel"/>

 			</visibleWhen>

 		</command>

 	</menuContribution>      

@@ -95,14 +95,14 @@
    <extension

          point="org.eclipse.papyrus.core.papyrusDiagram">

       <editorDiagram

-            actionBarContributorId="org.eclipse.papyrus.diagram.common.part.UMLDiagramActionBarContributor"

+            actionBarContributorId="org.eclipse.papyrus.uml.diagram.common.part.UMLDiagramActionBarContributor"

             contextId="com.cea.papyrus.gmf.editor.context"

-            factoryClass="org.eclipse.papyrus.diagram.usecase.UseCaseDiagramEditorFactory"

+            factoryClass="org.eclipse.papyrus.uml.diagram.usecase.UseCaseDiagramEditorFactory"

             icon="icons/obj16/Diagram_UseCase.gif">

       </editorDiagram>

       <creationCommand

-            creationCommandClass="org.eclipse.papyrus.diagram.usecase.CreateUseCaseDiagramCommand"

-            creationCondition="org.eclipse.papyrus.diagram.usecase.UseCaseDiagramCreationCondition"

+            creationCommandClass="org.eclipse.papyrus.uml.diagram.usecase.CreateUseCaseDiagramCommand"

+            creationCondition="org.eclipse.papyrus.uml.diagram.usecase.UseCaseDiagramCreationCondition"

             icon="icons/obj16/Diagram_UseCase.gif"

             id="org.eclipse.papyrus.diagram.usecase.CreateUseCaseDiagramCommand"

             label="UML UseCase Diagram"

@@ -119,7 +119,7 @@
       <?gmfgen generated="true"?>

       <propertyContributor

             contributorId="org.eclipse.papyrus.diagram.usecase"

-            labelProvider="org.eclipse.papyrus.diagram.usecase.sheet.UMLSheetLabelProvider">

+            labelProvider="org.eclipse.papyrus.uml.diagram.usecase.sheet.UMLSheetLabelProvider">

          <propertyCategory category="domain"/>

          <propertyCategory category="visual"/>

          <propertyCategory category="extra"/>

@@ -170,10 +170,10 @@
          <propertySection

             id="property.section.domain" 

             tab="property.tab.domain"

-            class="org.eclipse.papyrus.diagram.usecase.sheet.UMLPropertySection">

+            class="org.eclipse.papyrus.uml.diagram.usecase.sheet.UMLPropertySection">

             <input type="org.eclipse.gmf.runtime.notation.View"/>

             <input type="org.eclipse.gef.EditPart"/>

-            <input type="org.eclipse.papyrus.diagram.usecase.navigator.UMLAbstractNavigatorItem"/>

+            <input type="org.eclipse.papyrus.uml.diagram.usecase.navigator.UMLAbstractNavigatorItem"/>

          </propertySection>

       </propertySections>

    </extension>

@@ -213,7 +213,7 @@
 
    <extension point="org.eclipse.gmf.runtime.emf.ui.modelingAssistantProviders" id="modelassist-provider">

       <?gmfgen generated="true"?>

-      <modelingAssistantProvider class="org.eclipse.papyrus.diagram.usecase.providers.UMLModelingAssistantProvider">

+      <modelingAssistantProvider class="org.eclipse.papyrus.uml.diagram.usecase.providers.UMLModelingAssistantProvider">

          <Priority name="Lowest"/>

          <object class="org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseDiagramEditPart" id="Package_1000"/>

          <object class="org.eclipse.papyrus.diagram.usecase.edit.parts.ActorEditPartTN" id="Actor_2011"/>

@@ -231,14 +231,14 @@
 
    <extension point="org.eclipse.gmf.runtime.common.ui.services.iconProviders" id="icon-provider">

       <?gmfgen generated="true"?>

-      <IconProvider class="org.eclipse.papyrus.diagram.usecase.providers.UMLIconProvider">

+      <IconProvider class="org.eclipse.papyrus.uml.diagram.usecase.providers.UMLIconProvider">

          <Priority name="Low"/>

       </IconProvider>

    </extension>

 
    <extension point="org.eclipse.gmf.runtime.common.ui.services.parserProviders" id="parser-provider">

       <?gmfgen generated="true"?>

-      <ParserProvider class="org.eclipse.papyrus.diagram.usecase.providers.UMLParserProvider">

+      <ParserProvider class="org.eclipse.papyrus.uml.diagram.usecase.providers.UMLParserProvider">

          <Priority name="Lowest"/>

       </ParserProvider>

    </extension>

@@ -251,7 +251,7 @@
                name="%metatype.name.Package_1000"

                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

                eclass="Package"

-               edithelper="org.eclipse.papyrus.diagram.usecase.edit.helpers.PackageEditHelper">

+               edithelper="org.eclipse.papyrus.uml.diagram.usecase.edit.helpers.PackageEditHelper">

             <param name="semanticHint" value="1000"/>

          </metamodelType>

       </metamodel>

@@ -261,7 +261,7 @@
                name="%metatype.name.Actor_2011"

                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

                eclass="Actor"

-               edithelper="org.eclipse.papyrus.diagram.usecase.edit.helpers.ActorEditHelper">

+               edithelper="org.eclipse.papyrus.uml.diagram.usecase.edit.helpers.ActorEditHelper">

             <param name="semanticHint" value="2011"/>

          </metamodelType>

       </metamodel>

@@ -280,7 +280,7 @@
                name="%metatype.name.UseCase_2013"

                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

                eclass="UseCase"

-               edithelper="org.eclipse.papyrus.diagram.usecase.edit.helpers.UseCaseEditHelper">

+               edithelper="org.eclipse.papyrus.uml.diagram.usecase.edit.helpers.UseCaseEditHelper">

             <param name="semanticHint" value="2013"/>

          </metamodelType>

       </metamodel>

@@ -299,7 +299,7 @@
                name="%metatype.name.Component_2015"

                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

                eclass="Component"

-               edithelper="org.eclipse.papyrus.diagram.usecase.edit.helpers.ComponentEditHelper">

+               edithelper="org.eclipse.papyrus.uml.diagram.usecase.edit.helpers.ComponentEditHelper">

             <param name="semanticHint" value="2015"/>

          </metamodelType>

       </metamodel>

@@ -336,7 +336,7 @@
                name="%metatype.name.Diagram_2019"

                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

                eclass="Diagram"

-               edithelper="org.eclipse.papyrus.diagram.usecase.edit.helpers.ShortCutDiagramEditHelper">

+               edithelper="org.eclipse.papyrus.uml.diagram.usecase.edit.helpers.ShortCutDiagramEditHelper">

             <param name="semanticHint" value="2019"/>

          </metamodelType>

       </metamodel>

@@ -346,7 +346,7 @@
                name="%metatype.name.ExtensionPoint_3007"

                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

                eclass="ExtensionPoint"

-               edithelper="org.eclipse.papyrus.diagram.usecase.edit.helpers.ExtensionPointEditHelper">

+               edithelper="org.eclipse.papyrus.uml.diagram.usecase.edit.helpers.ExtensionPointEditHelper">

             <param name="semanticHint" value="3007"/>

          </metamodelType>

       </metamodel>

@@ -383,7 +383,7 @@
                name="%metatype.name.Comment_3015"

                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

                eclass="Comment"

-               edithelper="org.eclipse.papyrus.diagram.usecase.edit.helpers.CommentEditHelper">

+               edithelper="org.eclipse.papyrus.uml.diagram.usecase.edit.helpers.CommentEditHelper">

             <param name="semanticHint" value="3015"/>

          </metamodelType>

       </metamodel>

@@ -393,7 +393,7 @@
                name="%metatype.name.Constraint_3017"

                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

                eclass="Constraint"

-               edithelper="org.eclipse.papyrus.diagram.usecase.edit.helpers.ConstraintEditHelper">

+               edithelper="org.eclipse.papyrus.uml.diagram.usecase.edit.helpers.ConstraintEditHelper">

             <param name="semanticHint" value="3017"/>

          </metamodelType>

       </metamodel>

@@ -457,7 +457,7 @@
                name="%metatype.name.Include_4008"

                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

                eclass="Include"

-               edithelper="org.eclipse.papyrus.diagram.usecase.edit.helpers.IncludeEditHelper">

+               edithelper="org.eclipse.papyrus.uml.diagram.usecase.edit.helpers.IncludeEditHelper">

             <param name="semanticHint" value="4008"/>

          </metamodelType>

       </metamodel>

@@ -467,7 +467,7 @@
                name="%metatype.name.Extend_4009"

                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

                eclass="Extend"

-               edithelper="org.eclipse.papyrus.diagram.usecase.edit.helpers.ExtendEditHelper">

+               edithelper="org.eclipse.papyrus.uml.diagram.usecase.edit.helpers.ExtendEditHelper">

             <param name="semanticHint" value="4009"/>

          </metamodelType>

       </metamodel>

@@ -477,7 +477,7 @@
                name="%metatype.name.Generalization_4010"

                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

                eclass="Generalization"

-               edithelper="org.eclipse.papyrus.diagram.usecase.edit.helpers.GeneralizationEditHelper">

+               edithelper="org.eclipse.papyrus.uml.diagram.usecase.edit.helpers.GeneralizationEditHelper">

             <param name="semanticHint" value="4010"/>

          </metamodelType>

       </metamodel>

@@ -487,7 +487,7 @@
                name="%metatype.name.Association_4011"

                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

                eclass="Association"

-               edithelper="org.eclipse.papyrus.diagram.usecase.edit.helpers.AssociationEditHelper">

+               edithelper="org.eclipse.papyrus.uml.diagram.usecase.edit.helpers.AssociationEditHelper">

             <param name="semanticHint" value="4011"/>

          </metamodelType>

       </metamodel>

@@ -506,7 +506,7 @@
                name="%metatype.name.Dependency_4013"

                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

                eclass="Dependency"

-               edithelper="org.eclipse.papyrus.diagram.usecase.edit.helpers.DependencyEditHelper">

+               edithelper="org.eclipse.papyrus.uml.diagram.usecase.edit.helpers.DependencyEditHelper">

             <param name="semanticHint" value="4013"/>

          </metamodelType>

       </metamodel>

@@ -525,7 +525,7 @@
                name="%metatype.name.Abstraction_4015"

                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

                eclass="Abstraction"

-               edithelper="org.eclipse.papyrus.diagram.usecase.edit.helpers.AbstractionEditHelper">

+               edithelper="org.eclipse.papyrus.uml.diagram.usecase.edit.helpers.AbstractionEditHelper">

             <param name="semanticHint" value="4015"/>

          </metamodelType>

       </metamodel>

@@ -535,7 +535,7 @@
                name="%metatype.name.Usage_4016"

                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

                eclass="Usage"

-               edithelper="org.eclipse.papyrus.diagram.usecase.edit.helpers.UsageEditHelper">

+               edithelper="org.eclipse.papyrus.uml.diagram.usecase.edit.helpers.UsageEditHelper">

             <param name="semanticHint" value="4016"/>

          </metamodelType>

       </metamodel>

@@ -545,7 +545,7 @@
                name="%metatype.name.Realization_4017"

                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

                eclass="Realization"

-               edithelper="org.eclipse.papyrus.diagram.usecase.edit.helpers.RealizationEditHelper">

+               edithelper="org.eclipse.papyrus.uml.diagram.usecase.edit.helpers.RealizationEditHelper">

             <param name="semanticHint" value="4017"/>

          </metamodelType>

       </metamodel>

@@ -555,7 +555,7 @@
                name="%metatype.name.PackageMerge_4018"

                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

                eclass="PackageMerge"

-               edithelper="org.eclipse.papyrus.diagram.usecase.edit.helpers.PackageMergeEditHelper">

+               edithelper="org.eclipse.papyrus.uml.diagram.usecase.edit.helpers.PackageMergeEditHelper">

             <param name="semanticHint" value="4018"/>

          </metamodelType>

       </metamodel>

@@ -565,7 +565,7 @@
                name="%metatype.name.PackageImport_4019"

                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

                eclass="PackageImport"

-               edithelper="org.eclipse.papyrus.diagram.usecase.edit.helpers.PackageImportEditHelper">

+               edithelper="org.eclipse.papyrus.uml.diagram.usecase.edit.helpers.PackageImportEditHelper">

             <param name="semanticHint" value="4019"/>

          </metamodelType>

       </metamodel>

@@ -625,7 +625,7 @@
            type="org.eclipse.emf.common.ui.URIEditorInput"

            namespace="org.eclipse.papyrus.diagram.usecase"

            properties="isURIEditorInput"

-           class="org.eclipse.papyrus.diagram.usecase.part.UMLUriEditorInputTester">

+           class="org.eclipse.papyrus.uml.diagram.usecase.part.UMLUriEditorInputTester">

        </propertyTester>

    </extension>

 
@@ -652,8 +652,8 @@
             id="org.eclipse.papyrus.diagram.usecase.resourceContent" 

             name="%navigatorContentName" 

             priority="normal" 

-            contentProvider="org.eclipse.papyrus.diagram.usecase.navigator.UMLNavigatorContentProvider" 

-            labelProvider="org.eclipse.papyrus.diagram.usecase.navigator.UMLNavigatorLabelProvider"

+            contentProvider="org.eclipse.papyrus.uml.diagram.usecase.navigator.UMLNavigatorContentProvider" 

+            labelProvider="org.eclipse.papyrus.uml.diagram.usecase.navigator.UMLNavigatorLabelProvider"

             icon="icons/obj16/UMLDiagramFile.gif"

             activeByDefault="true">

          <triggerPoints>

@@ -662,24 +662,24 @@
     	          <instanceof value="org.eclipse.core.resources.IFile"/>

         	      <test property="org.eclipse.core.resources.extension" value="PapyrusUMLUsecase_diagram"/>

                </and>

-               <instanceof value="org.eclipse.papyrus.diagram.usecase.navigator.UMLAbstractNavigatorItem"/>

+               <instanceof value="org.eclipse.papyrus.uml.diagram.usecase.navigator.UMLAbstractNavigatorItem"/>

             </or>

          </triggerPoints>

          <possibleChildren>

             <or>

-         	   <instanceof value="org.eclipse.papyrus.diagram.usecase.navigator.UMLAbstractNavigatorItem"/>

+         	   <instanceof value="org.eclipse.papyrus.uml.diagram.usecase.navigator.UMLAbstractNavigatorItem"/>

             </or>

          </possibleChildren>

          <commonSorter 

                id="org.eclipse.papyrus.diagram.usecase.navigatorSorter" 

-               class="org.eclipse.papyrus.diagram.usecase.navigator.UMLNavigatorSorter">

+               class="org.eclipse.papyrus.uml.diagram.usecase.navigator.UMLNavigatorSorter">

             <parentExpression>

                <or>

 	              <and>

     	             <instanceof value="org.eclipse.core.resources.IFile"/>

         	         <test property="org.eclipse.core.resources.extension" value="PapyrusUMLUsecase_diagram"/>

                   </and>

-                  <instanceof value="org.eclipse.papyrus.diagram.usecase.navigator.UMLAbstractNavigatorItem"/>

+                  <instanceof value="org.eclipse.papyrus.uml.diagram.usecase.navigator.UMLAbstractNavigatorItem"/>

                </or>

             </parentExpression>

          </commonSorter>

@@ -688,8 +688,8 @@
             id="org.eclipse.papyrus.diagram.usecase.domainResourceContent" 

             name="%domainNavigatorContentName" 

             priority="normal" 

-            contentProvider="org.eclipse.papyrus.diagram.usecase.navigator.UMLDomainNavigatorContentProvider" 

-            labelProvider="org.eclipse.papyrus.diagram.usecase.navigator.UMLDomainNavigatorLabelProvider"

+            contentProvider="org.eclipse.papyrus.uml.diagram.usecase.navigator.UMLDomainNavigatorContentProvider" 

+            labelProvider="org.eclipse.papyrus.uml.diagram.usecase.navigator.UMLDomainNavigatorLabelProvider"

             icon="icons/obj16/UMLDiagramFile.gif"

             activeByDefault="true">

          <triggerPoints>

@@ -698,19 +698,19 @@
     	          <instanceof value="org.eclipse.core.resources.IFile"/>

         	      <test property="org.eclipse.core.resources.extension" value="PapyrusUMLUsecase"/>

                </and>

-               <instanceof value="org.eclipse.papyrus.diagram.usecase.navigator.UMLDomainNavigatorItem"/>

+               <instanceof value="org.eclipse.papyrus.uml.diagram.usecase.navigator.UMLDomainNavigatorItem"/>

             </or>

          </triggerPoints>

          <possibleChildren>

-            <instanceof value="org.eclipse.papyrus.diagram.usecase.navigator.UMLDomainNavigatorItem"/>

+            <instanceof value="org.eclipse.papyrus.uml.diagram.usecase.navigator.UMLDomainNavigatorItem"/>

          </possibleChildren>

       </navigatorContent>

       <actionProvider

             id="org.eclipse.papyrus.diagram.usecase.navigatorActionProvider"

-            class="org.eclipse.papyrus.diagram.usecase.navigator.UMLNavigatorActionProvider">

+            class="org.eclipse.papyrus.uml.diagram.usecase.navigator.UMLNavigatorActionProvider">

          <enablement>

             <or>

-               <instanceof value="org.eclipse.papyrus.diagram.usecase.navigator.UMLAbstractNavigatorItem"/>

+               <instanceof value="org.eclipse.papyrus.uml.diagram.usecase.navigator.UMLAbstractNavigatorItem"/>

             </or>

          </enablement>

       </actionProvider>

@@ -720,7 +720,7 @@
       <?gmfgen generated="true"?>

       <linkHelper

             id="org.eclipse.papyrus.diagram.usecase.navigatorLinkHelper"

-            class="org.eclipse.papyrus.diagram.usecase.navigator.UMLNavigatorLinkHelper">

+            class="org.eclipse.papyrus.uml.diagram.usecase.navigator.UMLNavigatorLinkHelper">

          <editorInputEnablement>

             <and>

                <instanceof value="org.eclipse.emf.common.ui.URIEditorInput"/>

@@ -728,7 +728,7 @@
             </and>

          </editorInputEnablement>

          <selectionEnablement>

-            <instanceof value="org.eclipse.papyrus.diagram.usecase.navigator.UMLAbstractNavigatorItem"/>

+            <instanceof value="org.eclipse.papyrus.uml.diagram.usecase.navigator.UMLAbstractNavigatorItem"/>

          </selectionEnablement>

       </linkHelper>

    </extension>

@@ -736,7 +736,7 @@
       <?gmfgen generated="true"?>

       <command

          categoryId="org.eclipse.ui.category.edit"

-         defaultHandler="org.eclipse.papyrus.diagram.usecase.part.UMLDiagramUpdateCommand"

+         defaultHandler="org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramUpdateCommand"

          description="%update.diagram.description"

          id="org.eclipse.papyrus.diagram.usecase.updateDiagram"

          name="%update.diagram.name"/>

@@ -752,7 +752,7 @@
    </extension>

   <extension point="org.eclipse.core.runtime.preferences">

 		<?gmfgen generated="true"?>

-		<initializer class="org.eclipse.papyrus.diagram.usecase.preferences.DiagramPreferenceInitializer"/>

+		<initializer class="org.eclipse.papyrus.uml.diagram.usecase.preferences.DiagramPreferenceInitializer"/>

 	</extension>

 

 
@@ -768,7 +768,7 @@
                <and>

                   <with variable="activePartId"><equals value="org.eclipse.papyrus.diagram.usecase.part.UMLDiagramEditorID"/></with>

                   <with variable="selection"><iterate ifEmpty="false"> 

-                     <instanceof value="org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseDiagramEditPart"/>

+                     <instanceof value="org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseDiagramEditPart"/>

                   </iterate></with>

                </and>

             </visibleWhen>

@@ -782,7 +782,7 @@
       <command id="org.eclipse.papyrus.diagram.usecase.LoadResourceAction"

          name="Load Resource"

          categoryId="org.eclipse.papyrus.diagram.usecase.part.UMLDiagramEditorID"

-         defaultHandler="org.eclipse.papyrus.diagram.usecase.part.LoadResourceAction"/>

+         defaultHandler="org.eclipse.papyrus.uml.diagram.usecase.part.LoadResourceAction"/>

    </extension>

 
 <extension point="org.eclipse.ui.handlers" id="menu-handlers">

@@ -794,7 +794,7 @@
             id="org.eclipse.papyrus.preferences.diagrams.UseCase"

             name="UseCase Diagram"

             category="org.eclipse.papyrus.preferences.diagrams"

-            class="org.eclipse.papyrus.diagram.usecase.preferences.DiagramGeneralPreferencePage">

+            class="org.eclipse.papyrus.uml.diagram.usecase.preferences.DiagramGeneralPreferencePage">

       </page>

       
 
@@ -803,14 +803,14 @@
             id="org.eclipse.papyrus.diagram.usecase.preferences.DiagramPrintingPreferencePage"

             name="%prefpage.org.eclipse.uml2.uml.diagram.printing"

             category="org.eclipse.papyrus.preferences.diagrams.UseCase"

-            class="org.eclipse.papyrus.diagram.usecase.preferences.DiagramPrintingPreferencePage">

+            class="org.eclipse.papyrus.uml.diagram.usecase.preferences.DiagramPrintingPreferencePage">

       </page>

 
       <page

             id="org.eclipse.papyrus.diagram.usecase.preferences.DiagramRulersAndGridPreferencePage"

             name="%prefpage.org.eclipse.uml2.uml.diagram.rulersAndGrid"

             category="org.eclipse.papyrus.preferences.diagrams.UseCase"

-            class="org.eclipse.papyrus.diagram.usecase.preferences.DiagramRulersAndGridPreferencePage">

+            class="org.eclipse.papyrus.uml.diagram.usecase.preferences.DiagramRulersAndGridPreferencePage">

       </page>

 
    </extension>

@@ -821,56 +821,56 @@
 		

 	<?gmfgen generated="true"?>

 	<page  	category="org.eclipse.papyrus.preferences.diagrams.UseCase"

-			class="org.eclipse.papyrus.diagram.usecase.preferences.UseCasePreferencePage"

+			class="org.eclipse.papyrus.uml.diagram.usecase.preferences.UseCasePreferencePage"

             id="org.eclipse.papyrus.diagram.usecase.preferences.UseCasePreferencePage"

             name="UseCase Node" />

 	
 		

 	<?gmfgen generated="true"?>

 	<page  	category="org.eclipse.papyrus.preferences.diagrams.UseCase"

-			class="org.eclipse.papyrus.diagram.usecase.preferences.ShortCutDiagramPreferencePage"

+			class="org.eclipse.papyrus.uml.diagram.usecase.preferences.ShortCutDiagramPreferencePage"

             id="org.eclipse.papyrus.diagram.usecase.preferences.ShortCutDiagramPreferencePage"

             name="ShortCutDiagram Node" />

 	
 		

 	<?gmfgen generated="true"?>

 	<page  	category="org.eclipse.papyrus.preferences.diagrams.UseCase"

-			class="org.eclipse.papyrus.diagram.usecase.preferences.CommentPreferencePage"

+			class="org.eclipse.papyrus.uml.diagram.usecase.preferences.CommentPreferencePage"

             id="org.eclipse.papyrus.diagram.usecase.preferences.CommentPreferencePage"

             name="Comment Node" />

 	
 		

 	<?gmfgen generated="true"?>

 	<page  	category="org.eclipse.papyrus.preferences.diagrams.UseCase"

-			class="org.eclipse.papyrus.diagram.usecase.preferences.ConstraintPreferencePage"

+			class="org.eclipse.papyrus.uml.diagram.usecase.preferences.ConstraintPreferencePage"

             id="org.eclipse.papyrus.diagram.usecase.preferences.ConstraintPreferencePage"

             name="Constraint Node" />

 	
 		

 	<?gmfgen generated="true"?>

 	<page  	category="org.eclipse.papyrus.preferences.diagrams.UseCase"

-			class="org.eclipse.papyrus.diagram.usecase.preferences.ActorPreferencePage"

+			class="org.eclipse.papyrus.uml.diagram.usecase.preferences.ActorPreferencePage"

             id="org.eclipse.papyrus.diagram.usecase.preferences.ActorPreferencePage"

             name="Actor Node" />

 	
 		

 	<?gmfgen generated="true"?>

 	<page  	category="org.eclipse.papyrus.preferences.diagrams.UseCase"

-			class="org.eclipse.papyrus.diagram.usecase.preferences.ExtensionPointPreferencePage"

+			class="org.eclipse.papyrus.uml.diagram.usecase.preferences.ExtensionPointPreferencePage"

             id="org.eclipse.papyrus.diagram.usecase.preferences.ExtensionPointPreferencePage"

             name="ExtensionPoint Node" />

 	
 		

 	<?gmfgen generated="true"?>

 	<page  	category="org.eclipse.papyrus.preferences.diagrams.UseCase"

-			class="org.eclipse.papyrus.diagram.usecase.preferences.PackagePreferencePage"

+			class="org.eclipse.papyrus.uml.diagram.usecase.preferences.PackagePreferencePage"

             id="org.eclipse.papyrus.diagram.usecase.preferences.PackagePreferencePage"

             name="Package Node" />

 	
 		

 	<?gmfgen generated="true"?>

 	<page  	category="org.eclipse.papyrus.preferences.diagrams.UseCase"

-			class="org.eclipse.papyrus.diagram.usecase.preferences.ComponentPreferencePage"

+			class="org.eclipse.papyrus.uml.diagram.usecase.preferences.ComponentPreferencePage"

             id="org.eclipse.papyrus.diagram.usecase.preferences.ComponentPreferencePage"

             name="Component Node" />

 	
@@ -880,7 +880,7 @@
 

 	<?gmfgen generated="true"?>

 	<page  	category="org.eclipse.papyrus.preferences.diagrams.UseCase"

-			class="org.eclipse.papyrus.diagram.usecase.preferences.ExtendPreferencePage"

+			class="org.eclipse.papyrus.uml.diagram.usecase.preferences.ExtendPreferencePage"

             id="org.eclipse.papyrus.diagram.usecase.preferences.ExtendPreferencePage"

             name="Extend Link" />

 		

@@ -888,7 +888,7 @@
 

 	<?gmfgen generated="true"?>

 	<page  	category="org.eclipse.papyrus.preferences.diagrams.UseCase"

-			class="org.eclipse.papyrus.diagram.usecase.preferences.PackageMergePreferencePage"

+			class="org.eclipse.papyrus.uml.diagram.usecase.preferences.PackageMergePreferencePage"

             id="org.eclipse.papyrus.diagram.usecase.preferences.PackageMergePreferencePage"

             name="PackageMerge Link" />

 		

@@ -896,7 +896,7 @@
 

 	<?gmfgen generated="true"?>

 	<page  	category="org.eclipse.papyrus.preferences.diagrams.UseCase"

-			class="org.eclipse.papyrus.diagram.usecase.preferences.AbstractionPreferencePage"

+			class="org.eclipse.papyrus.uml.diagram.usecase.preferences.AbstractionPreferencePage"

             id="org.eclipse.papyrus.diagram.usecase.preferences.AbstractionPreferencePage"

             name="Abstraction Link" />

 		

@@ -904,7 +904,7 @@
 

 	<?gmfgen generated="true"?>

 	<page  	category="org.eclipse.papyrus.preferences.diagrams.UseCase"

-			class="org.eclipse.papyrus.diagram.usecase.preferences.AssociationPreferencePage"

+			class="org.eclipse.papyrus.uml.diagram.usecase.preferences.AssociationPreferencePage"

             id="org.eclipse.papyrus.diagram.usecase.preferences.AssociationPreferencePage"

             name="Association Link" />

 		

@@ -912,7 +912,7 @@
 

 	<?gmfgen generated="true"?>

 	<page  	category="org.eclipse.papyrus.preferences.diagrams.UseCase"

-			class="org.eclipse.papyrus.diagram.usecase.preferences.GeneralizationPreferencePage"

+			class="org.eclipse.papyrus.uml.diagram.usecase.preferences.GeneralizationPreferencePage"

             id="org.eclipse.papyrus.diagram.usecase.preferences.GeneralizationPreferencePage"

             name="Generalization Link" />

 		

@@ -920,7 +920,7 @@
 

 	<?gmfgen generated="true"?>

 	<page  	category="org.eclipse.papyrus.preferences.diagrams.UseCase"

-			class="org.eclipse.papyrus.diagram.usecase.preferences.RealizationPreferencePage"

+			class="org.eclipse.papyrus.uml.diagram.usecase.preferences.RealizationPreferencePage"

             id="org.eclipse.papyrus.diagram.usecase.preferences.RealizationPreferencePage"

             name="Realization Link" />

 		

@@ -928,7 +928,7 @@
 

 	<?gmfgen generated="true"?>

 	<page  	category="org.eclipse.papyrus.preferences.diagrams.UseCase"

-			class="org.eclipse.papyrus.diagram.usecase.preferences.DependencyPreferencePage"

+			class="org.eclipse.papyrus.uml.diagram.usecase.preferences.DependencyPreferencePage"

             id="org.eclipse.papyrus.diagram.usecase.preferences.DependencyPreferencePage"

             name="Dependency Link" />

 		

@@ -936,7 +936,7 @@
 

 	<?gmfgen generated="true"?>

 	<page  	category="org.eclipse.papyrus.preferences.diagrams.UseCase"

-			class="org.eclipse.papyrus.diagram.usecase.preferences.UsagePreferencePage"

+			class="org.eclipse.papyrus.uml.diagram.usecase.preferences.UsagePreferencePage"

             id="org.eclipse.papyrus.diagram.usecase.preferences.UsagePreferencePage"

             name="Usage Link" />

 		

@@ -944,7 +944,7 @@
 

 	<?gmfgen generated="true"?>

 	<page  	category="org.eclipse.papyrus.preferences.diagrams.UseCase"

-			class="org.eclipse.papyrus.diagram.usecase.preferences.PackageImportPreferencePage"

+			class="org.eclipse.papyrus.uml.diagram.usecase.preferences.PackageImportPreferencePage"

             id="org.eclipse.papyrus.diagram.usecase.preferences.PackageImportPreferencePage"

             name="PackageImport Link" />

 		

@@ -952,7 +952,7 @@
 

 	<?gmfgen generated="true"?>

 	<page  	category="org.eclipse.papyrus.preferences.diagrams.UseCase"

-			class="org.eclipse.papyrus.diagram.usecase.preferences.IncludePreferencePage"

+			class="org.eclipse.papyrus.uml.diagram.usecase.preferences.IncludePreferencePage"

             id="org.eclipse.papyrus.diagram.usecase.preferences.IncludePreferencePage"

             name="Include Link" />

 		

@@ -969,7 +969,7 @@
 		<paletteProvider class="org.eclipse.gmf.runtime.diagram.ui.providers.DefaultPaletteProvider">

 			<Priority name="Lowest"/>

       		<contribution

-            	factoryClass="org.eclipse.papyrus.diagram.usecase.part.UMLPaletteFactory">

+            	factoryClass="org.eclipse.papyrus.uml.diagram.usecase.part.UMLPaletteFactory">

      			<predefinedEntry id="standardGroup/noteStack/noteTool" remove="true"/> 

 				<predefinedEntry id="standardGroup/noteStack/textTool" remove="true"/> 

 				<predefinedEntry id="standardGroup/noteStack/noteattachmentTool" remove="true"/>

@@ -1178,7 +1178,7 @@
 		<paletteProvider class="org.eclipse.gmf.runtime.diagram.ui.providers.DefaultPaletteProvider">

 			<Priority name="Low"/>

       		<contribution

-            	factoryClass="org.eclipse.papyrus.diagram.usecase.part.UMLPaletteFactory">

+            	factoryClass="org.eclipse.papyrus.uml.diagram.usecase.part.UMLPaletteFactory">

      			<predefinedEntry id="standardGroup/noteStack/noteTool" remove="true"/> 

 				<predefinedEntry id="standardGroup/noteStack/textTool" remove="true"/> 

 				<predefinedEntry id="standardGroup/noteStack/noteattachmentTool" remove="true"/>

@@ -1308,7 +1308,7 @@
 	</extension>

 <extension point="org.eclipse.gmf.runtime.common.ui.services.markerNavigationProviders" id="markers-navigation">

       <?gmfgen generated="true"?>

-      <MarkerNavigationProvider class="org.eclipse.papyrus.diagram.usecase.providers.UMLMarkerNavigationProvider">

+      <MarkerNavigationProvider class="org.eclipse.papyrus.uml.diagram.usecase.providers.UMLMarkerNavigationProvider">

          <MarkerType name="org.eclipse.papyrus.diagram.usecase.diagnostic"/>

          <Priority name="Lowest"/>

       </MarkerNavigationProvider>

@@ -1321,7 +1321,7 @@
       <persistent value="true"/>

    </extension><extension id="validationDecoratorProvider" name="ValidationDecorations" point="org.eclipse.gmf.runtime.diagram.ui.decoratorProviders">

       <?gmfgen generated="true"?>

-      <decoratorProvider class="org.eclipse.papyrus.diagram.usecase.providers.UMLValidationDecoratorProvider">

+      <decoratorProvider class="org.eclipse.papyrus.uml.diagram.usecase.providers.UMLValidationDecoratorProvider">

          <Priority name="Lowest"/>

          <object class="org.eclipse.gmf.runtime.diagram.ui.editparts.IPrimaryEditPart(org.eclipse.gmf.runtime.diagram.ui)" id="PRIMARY_VIEW"/>

          <context decoratorTargets="PRIMARY_VIEW"/>

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/commands/AbstractionCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/AbstractionCreateCommand.java
index 3b675d0aefe..02df2b60060 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/commands/AbstractionCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/AbstractionCreateCommand.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.commands;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -24,8 +24,8 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.ElementInitializers;

 import org.eclipse.uml2.uml.Abstraction;

 import org.eclipse.uml2.uml.NamedElement;

 import org.eclipse.uml2.uml.Package;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/commands/AbstractionReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/AbstractionReorientCommand.java
index 6f43a22b5d3..29ad1345191 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/commands/AbstractionReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/AbstractionReorientCommand.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.commands;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -20,7 +20,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gmf.runtime.common.core.command.CommandResult;

 import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UMLBaseItemSemanticEditPolicy;

 import org.eclipse.uml2.uml.Abstraction;

 import org.eclipse.uml2.uml.NamedElement;

 import org.eclipse.uml2.uml.Package;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/commands/ActorAsRectangleCreateCommandTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/ActorAsRectangleCreateCommandTN.java
index 00678168171..b8d14d7d54f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/commands/ActorAsRectangleCreateCommandTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/ActorAsRectangleCreateCommandTN.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.commands;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -25,7 +25,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.usecase.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.ElementInitializers;

 import org.eclipse.uml2.uml.Actor;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.UMLFactory;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/commands/ActorCreateCommandTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/ActorCreateCommandTN.java
index 1d4396aa98a..309c6a17a6c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/commands/ActorCreateCommandTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/ActorCreateCommandTN.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.commands;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -25,7 +25,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.usecase.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.ElementInitializers;

 import org.eclipse.uml2.uml.Actor;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.UMLFactory;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/commands/ActorInComponentCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/ActorInComponentCreateCommand.java
index ee07cdda2e5..7bd21e04169 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/commands/ActorInComponentCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/ActorInComponentCreateCommand.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.commands;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -25,7 +25,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.usecase.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.ElementInitializers;

 import org.eclipse.uml2.uml.Actor;

 import org.eclipse.uml2.uml.Class;

 import org.eclipse.uml2.uml.UMLFactory;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/commands/ActorInPackageCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/ActorInPackageCreateCommand.java
index ea6c87586d9..6d2dd838d43 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/commands/ActorInPackageCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/ActorInPackageCreateCommand.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.commands;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -25,7 +25,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.usecase.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.ElementInitializers;

 import org.eclipse.uml2.uml.Actor;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.UMLFactory;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/commands/AssociationCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/AssociationCreateCommand.java
index 69b6938b482..1419bbc8ebf 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/commands/AssociationCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/AssociationCreateCommand.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.commands;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -24,8 +24,8 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.papyrus.diagram.usecase.command.CreateAssociationSupplement;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.command.CreateAssociationSupplement;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UMLBaseItemSemanticEditPolicy;

 import org.eclipse.uml2.uml.Association;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.Type;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/commands/AssociationReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/AssociationReorientCommand.java
index 3d09e037cdd..532956d953d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/commands/AssociationReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/AssociationReorientCommand.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.commands;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -20,8 +20,8 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gmf.runtime.common.core.command.CommandResult;

 import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.common.helper.AssociationHelper;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.helper.AssociationHelper;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UMLBaseItemSemanticEditPolicy;

 import org.eclipse.uml2.uml.Association;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.Type;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/commands/CommentAnnotatedElementCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/CommentAnnotatedElementCreateCommand.java
index 3e89242db1d..67ab80fed1c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/commands/CommentAnnotatedElementCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/CommentAnnotatedElementCreateCommand.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.commands;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -20,7 +20,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gmf.runtime.common.core.command.CommandResult;

 import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UMLBaseItemSemanticEditPolicy;

 import org.eclipse.uml2.uml.Comment;

 import org.eclipse.uml2.uml.Element;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/commands/CommentAnnotatedElementReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/CommentAnnotatedElementReorientCommand.java
index 4fd5c8a60e6..c25dfcd055a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/commands/CommentAnnotatedElementReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/CommentAnnotatedElementReorientCommand.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.commands;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -21,7 +21,7 @@ import org.eclipse.gmf.runtime.common.core.command.CommandResult;
 import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UMLBaseItemSemanticEditPolicy;

 import org.eclipse.uml2.uml.Comment;

 import org.eclipse.uml2.uml.Element;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/commands/CommentCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/CommentCreateCommandCN.java
index a16ab31f4f9..410f1eec8ef 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/commands/CommentCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/CommentCreateCommandCN.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.commands;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -25,7 +25,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.usecase.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.ElementInitializers;

 import org.eclipse.uml2.uml.Comment;

 import org.eclipse.uml2.uml.Element;

 import org.eclipse.uml2.uml.UMLFactory;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/commands/CommentCreateCommandTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/CommentCreateCommandTN.java
index 4472c90ee15..34241adafc6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/commands/CommentCreateCommandTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/CommentCreateCommandTN.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.commands;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -25,7 +25,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.usecase.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.ElementInitializers;

 import org.eclipse.uml2.uml.Comment;

 import org.eclipse.uml2.uml.Element;

 import org.eclipse.uml2.uml.UMLFactory;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/commands/ComponentCreateCommandTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/ComponentCreateCommandTN.java
index c47efd82ed2..a9de75faf88 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/commands/ComponentCreateCommandTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/ComponentCreateCommandTN.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.commands;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -25,7 +25,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.usecase.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.ElementInitializers;

 import org.eclipse.uml2.uml.Component;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.UMLFactory;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/commands/ComponentInComponentCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/ComponentInComponentCreateCommand.java
index c56f2d0fca8..8b91a94ec5f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/commands/ComponentInComponentCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/ComponentInComponentCreateCommand.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.commands;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -25,7 +25,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.usecase.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.ElementInitializers;

 import org.eclipse.uml2.uml.Component;

 import org.eclipse.uml2.uml.UMLFactory;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/commands/ComponentInPackageCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/ComponentInPackageCreateCommand.java
index b1a0715a583..931af47e4f2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/commands/ComponentInPackageCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/ComponentInPackageCreateCommand.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.commands;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -25,7 +25,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.usecase.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.ElementInitializers;

 import org.eclipse.uml2.uml.Component;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.UMLFactory;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/commands/ConstraintConstrainedElementCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/ConstraintConstrainedElementCreateCommand.java
index f9c59488852..4bc3df59d99 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/commands/ConstraintConstrainedElementCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/ConstraintConstrainedElementCreateCommand.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.commands;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -20,7 +20,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gmf.runtime.common.core.command.CommandResult;

 import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UMLBaseItemSemanticEditPolicy;

 import org.eclipse.uml2.uml.Constraint;

 import org.eclipse.uml2.uml.Element;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/commands/ConstraintConstrainedElementReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/ConstraintConstrainedElementReorientCommand.java
index 16405b8c5c4..ae68225262f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/commands/ConstraintConstrainedElementReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/ConstraintConstrainedElementReorientCommand.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.commands;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -21,7 +21,7 @@ import org.eclipse.gmf.runtime.common.core.command.CommandResult;
 import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UMLBaseItemSemanticEditPolicy;

 import org.eclipse.uml2.uml.Constraint;

 import org.eclipse.uml2.uml.Element;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/commands/ConstraintCreateCommandTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/ConstraintCreateCommandTN.java
index e36c8cc25ed..7e74a2cb412 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/commands/ConstraintCreateCommandTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/ConstraintCreateCommandTN.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.commands;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -25,7 +25,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.usecase.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.ElementInitializers;

 import org.eclipse.uml2.uml.Constraint;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.UMLFactory;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/commands/ConstraintInComponentCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/ConstraintInComponentCreateCommand.java
index d4868d9dddc..5c24f7b61a1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/commands/ConstraintInComponentCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/ConstraintInComponentCreateCommand.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.commands;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -25,7 +25,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.usecase.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.ElementInitializers;

 import org.eclipse.uml2.uml.Constraint;

 import org.eclipse.uml2.uml.Namespace;

 import org.eclipse.uml2.uml.UMLFactory;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/commands/ConstraintInPackageCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/ConstraintInPackageCreateCommand.java
index 42aacbd2ace..9ce84602120 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/commands/ConstraintInPackageCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/ConstraintInPackageCreateCommand.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.commands;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -25,7 +25,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.usecase.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.ElementInitializers;

 import org.eclipse.uml2.uml.Constraint;

 import org.eclipse.uml2.uml.Namespace;

 import org.eclipse.uml2.uml.Package;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/commands/DependencyCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/DependencyCreateCommand.java
index 82b3df3b13f..b9fad7d45d5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/commands/DependencyCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/DependencyCreateCommand.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.commands;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -24,8 +24,8 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.ElementInitializers;

 import org.eclipse.uml2.uml.Dependency;

 import org.eclipse.uml2.uml.NamedElement;

 import org.eclipse.uml2.uml.Package;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/commands/DependencyReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/DependencyReorientCommand.java
index 38ab0d2eaa3..81c91bd0ce1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/commands/DependencyReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/DependencyReorientCommand.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.commands;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -20,7 +20,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gmf.runtime.common.core.command.CommandResult;

 import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UMLBaseItemSemanticEditPolicy;

 import org.eclipse.uml2.uml.Dependency;

 import org.eclipse.uml2.uml.NamedElement;

 import org.eclipse.uml2.uml.Package;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/commands/DiagramCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/DiagramCreateCommand.java
index 20e40dc71a4..f7217fb5092 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/commands/DiagramCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/DiagramCreateCommand.java
@@ -11,7 +11,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.commands;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/commands/ExtendCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/ExtendCreateCommand.java
index b87df352f64..808da6c7284 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/commands/ExtendCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/ExtendCreateCommand.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.commands;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -24,7 +24,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UMLBaseItemSemanticEditPolicy;

 import org.eclipse.uml2.uml.Extend;

 import org.eclipse.uml2.uml.UMLFactory;

 import org.eclipse.uml2.uml.UseCase;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/commands/ExtendReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/ExtendReorientCommand.java
index 751060e242f..42ce77bd5ae 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/commands/ExtendReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/ExtendReorientCommand.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.commands;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -20,7 +20,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gmf.runtime.common.core.command.CommandResult;

 import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UMLBaseItemSemanticEditPolicy;

 import org.eclipse.uml2.uml.Extend;

 import org.eclipse.uml2.uml.UseCase;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/commands/ExtensionPointCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/ExtensionPointCreateCommand.java
index 765bb472b1a..0e5f7f4866a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/commands/ExtensionPointCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/ExtensionPointCreateCommand.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.commands;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -25,7 +25,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.usecase.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.ElementInitializers;

 import org.eclipse.uml2.uml.ExtensionPoint;

 import org.eclipse.uml2.uml.UMLFactory;

 import org.eclipse.uml2.uml.UseCase;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/commands/ExtensionPointInRectangleCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/ExtensionPointInRectangleCreateCommand.java
index 41dd4c83385..69dc90975a8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/commands/ExtensionPointInRectangleCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/ExtensionPointInRectangleCreateCommand.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.commands;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -25,7 +25,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.usecase.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.ElementInitializers;

 import org.eclipse.uml2.uml.ExtensionPoint;

 import org.eclipse.uml2.uml.UMLFactory;

 import org.eclipse.uml2.uml.UseCase;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/commands/GeneralizationCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/GeneralizationCreateCommand.java
index 6c4eb6dca6d..9d2a09eaf0f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/commands/GeneralizationCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/GeneralizationCreateCommand.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.commands;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -24,7 +24,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UMLBaseItemSemanticEditPolicy;

 import org.eclipse.uml2.uml.Classifier;

 import org.eclipse.uml2.uml.Generalization;

 import org.eclipse.uml2.uml.UMLFactory;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/commands/GeneralizationReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/GeneralizationReorientCommand.java
index 9c880b39521..8e37e439475 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/commands/GeneralizationReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/GeneralizationReorientCommand.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.commands;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -20,7 +20,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gmf.runtime.common.core.command.CommandResult;

 import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UMLBaseItemSemanticEditPolicy;

 import org.eclipse.uml2.uml.Classifier;

 import org.eclipse.uml2.uml.Generalization;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/commands/IncludeCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/IncludeCreateCommand.java
index a1d06fa3707..b9c45af91c1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/commands/IncludeCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/IncludeCreateCommand.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.commands;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -24,7 +24,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UMLBaseItemSemanticEditPolicy;

 import org.eclipse.uml2.uml.Include;

 import org.eclipse.uml2.uml.UMLFactory;

 import org.eclipse.uml2.uml.UseCase;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/commands/IncludeReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/IncludeReorientCommand.java
index 477dff60d9b..c0f97263513 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/commands/IncludeReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/IncludeReorientCommand.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.commands;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -20,7 +20,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gmf.runtime.common.core.command.CommandResult;

 import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UMLBaseItemSemanticEditPolicy;

 import org.eclipse.uml2.uml.Include;

 import org.eclipse.uml2.uml.UseCase;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/commands/PackageCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/PackageCreateCommandCN.java
index fd43b6b9690..47afd75e8bf 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/commands/PackageCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/PackageCreateCommandCN.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.commands;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -25,7 +25,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.usecase.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.ElementInitializers;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.UMLFactory;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/commands/PackageCreateCommandTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/PackageCreateCommandTN.java
index 425af5e3b2e..cfce43289f3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/commands/PackageCreateCommandTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/PackageCreateCommandTN.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.commands;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -25,7 +25,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.usecase.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.ElementInitializers;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.UMLFactory;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/commands/PackageImportCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/PackageImportCreateCommand.java
index 279904b57e4..ec37361d6df 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/commands/PackageImportCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/PackageImportCreateCommand.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.commands;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -24,7 +24,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UMLBaseItemSemanticEditPolicy;

 import org.eclipse.uml2.uml.Namespace;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.PackageImport;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/commands/PackageImportReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/PackageImportReorientCommand.java
index 155e2d766ad..f920704bff8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/commands/PackageImportReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/PackageImportReorientCommand.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.commands;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -20,7 +20,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gmf.runtime.common.core.command.CommandResult;

 import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UMLBaseItemSemanticEditPolicy;

 import org.eclipse.uml2.uml.Namespace;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.PackageImport;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/commands/PackageMergeCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/PackageMergeCreateCommand.java
index c4ab159f855..319af0f7634 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/commands/PackageMergeCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/PackageMergeCreateCommand.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.commands;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -24,7 +24,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UMLBaseItemSemanticEditPolicy;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.PackageMerge;

 import org.eclipse.uml2.uml.UMLFactory;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/commands/PackageMergeReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/PackageMergeReorientCommand.java
index ec835f53a69..9fd4bf85ed6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/commands/PackageMergeReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/PackageMergeReorientCommand.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.commands;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -20,7 +20,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gmf.runtime.common.core.command.CommandResult;

 import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UMLBaseItemSemanticEditPolicy;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.PackageMerge;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/commands/RealizationCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/RealizationCreateCommand.java
index 2077b27aea3..1ea5b350f96 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/commands/RealizationCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/RealizationCreateCommand.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.commands;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -24,8 +24,8 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.ElementInitializers;

 import org.eclipse.uml2.uml.NamedElement;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.Realization;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/commands/RealizationReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/RealizationReorientCommand.java
index 0c6ba22494b..7d3a23e7d67 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/commands/RealizationReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/RealizationReorientCommand.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.commands;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -20,7 +20,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gmf.runtime.common.core.command.CommandResult;

 import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UMLBaseItemSemanticEditPolicy;

 import org.eclipse.uml2.uml.NamedElement;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.Realization;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/commands/ShortCutDiagramCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/ShortCutDiagramCreateCommand.java
index 451e8b3d2a4..466ce75fd2d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/commands/ShortCutDiagramCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/ShortCutDiagramCreateCommand.java
@@ -11,7 +11,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.commands;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/commands/UMLReorientConnectionViewCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/UMLReorientConnectionViewCommand.java
index 84f0b983ff5..df9a2bbb753 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/commands/UMLReorientConnectionViewCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/UMLReorientConnectionViewCommand.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.commands;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.commands;

 

 import java.util.List;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/commands/UsageCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/UsageCreateCommand.java
index 89b49512a35..f2ddc322c74 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/commands/UsageCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/UsageCreateCommand.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.commands;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -24,8 +24,8 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.ElementInitializers;

 import org.eclipse.uml2.uml.NamedElement;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.UMLFactory;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/commands/UsageReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/UsageReorientCommand.java
index 7bdca8e2784..a3e0a64e5a0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/commands/UsageReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/UsageReorientCommand.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.commands;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -20,7 +20,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gmf.runtime.common.core.command.CommandResult;

 import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UMLBaseItemSemanticEditPolicy;

 import org.eclipse.uml2.uml.NamedElement;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.Usage;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/commands/UseCaseAsRectangleCreateCommandTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/UseCaseAsRectangleCreateCommandTN.java
index 4693aa046ef..4eed3ff0f3c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/commands/UseCaseAsRectangleCreateCommandTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/UseCaseAsRectangleCreateCommandTN.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.commands;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -25,7 +25,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.usecase.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.ElementInitializers;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.UMLFactory;

 import org.eclipse.uml2.uml.UseCase;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/commands/UseCaseCreateCommandTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/UseCaseCreateCommandTN.java
index 54f58d2ed38..a8a2ea33dc1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/commands/UseCaseCreateCommandTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/UseCaseCreateCommandTN.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.commands;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -25,7 +25,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.usecase.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.ElementInitializers;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.UMLFactory;

 import org.eclipse.uml2.uml.UseCase;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/commands/UseCaseInComponentCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/UseCaseInComponentCreateCommand.java
index f12a5449302..2bf129152a7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/commands/UseCaseInComponentCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/UseCaseInComponentCreateCommand.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.commands;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -25,7 +25,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.usecase.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.ElementInitializers;

 import org.eclipse.uml2.uml.Classifier;

 import org.eclipse.uml2.uml.UMLFactory;

 import org.eclipse.uml2.uml.UseCase;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/commands/UseCaseInPackageCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/UseCaseInPackageCreateCommand.java
index b53dca64233..32184e38289 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/commands/UseCaseInPackageCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/UseCaseInPackageCreateCommand.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.commands;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -25,7 +25,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.usecase.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.ElementInitializers;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.UMLFactory;

 import org.eclipse.uml2.uml.UseCase;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/helpers/AbstractionEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/helpers/AbstractionEditHelper.java
index ff662501b47..4e63e0a29c5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/helpers/AbstractionEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/helpers/AbstractionEditHelper.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.helpers;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/helpers/ActorEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/helpers/ActorEditHelper.java
index e39c0e9a4d9..464309e4273 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/helpers/ActorEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/helpers/ActorEditHelper.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.helpers;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/helpers/AssociationEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/helpers/AssociationEditHelper.java
index f281f0b3b52..79ed3c5045e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/helpers/AssociationEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/helpers/AssociationEditHelper.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.helpers;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/helpers/CommentEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/helpers/CommentEditHelper.java
index 4b0cd91b549..1517b9b6c74 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/helpers/CommentEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/helpers/CommentEditHelper.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.helpers;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/helpers/ComponentEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/helpers/ComponentEditHelper.java
index ee3cd0f79f8..0d5220b3b11 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/helpers/ComponentEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/helpers/ComponentEditHelper.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.helpers;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/helpers/ConstraintEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/helpers/ConstraintEditHelper.java
index 06a9fa1f153..400e4335538 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/helpers/ConstraintEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/helpers/ConstraintEditHelper.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.helpers;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/helpers/DependencyEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/helpers/DependencyEditHelper.java
index 7ae3e86d85d..581662a6903 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/helpers/DependencyEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/helpers/DependencyEditHelper.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.helpers;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/helpers/ExtendEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/helpers/ExtendEditHelper.java
index 7e01eed324c..9ddadf63880 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/helpers/ExtendEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/helpers/ExtendEditHelper.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.helpers;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/helpers/ExtensionPointEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/helpers/ExtensionPointEditHelper.java
index 0020bde352d..ed73108bf7d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/helpers/ExtensionPointEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/helpers/ExtensionPointEditHelper.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.helpers;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/helpers/GeneralizationEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/helpers/GeneralizationEditHelper.java
index a50381ac7f5..6d34d2e47cf 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/helpers/GeneralizationEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/helpers/GeneralizationEditHelper.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.helpers;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/helpers/IncludeEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/helpers/IncludeEditHelper.java
index 81662b7d2d6..6cc48f10225 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/helpers/IncludeEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/helpers/IncludeEditHelper.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.helpers;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/helpers/PackageEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/helpers/PackageEditHelper.java
index 0afec014aca..ddbe4eca15b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/helpers/PackageEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/helpers/PackageEditHelper.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.helpers;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/helpers/PackageImportEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/helpers/PackageImportEditHelper.java
index f06813a9b6e..283713226b7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/helpers/PackageImportEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/helpers/PackageImportEditHelper.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.helpers;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/helpers/PackageMergeEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/helpers/PackageMergeEditHelper.java
index bbb6b608ab5..6b376599831 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/helpers/PackageMergeEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/helpers/PackageMergeEditHelper.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.helpers;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/helpers/RealizationEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/helpers/RealizationEditHelper.java
index a58b49e660e..48d35f775ee 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/helpers/RealizationEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/helpers/RealizationEditHelper.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.helpers;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/helpers/ShortCutDiagramEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/helpers/ShortCutDiagramEditHelper.java
index 6ea2749d60e..298a9276023 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/helpers/ShortCutDiagramEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/helpers/ShortCutDiagramEditHelper.java
@@ -11,7 +11,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.helpers;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/helpers/UMLBaseEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/helpers/UMLBaseEditHelper.java
index 30b5bea3ade..9ce5fb34f9e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/helpers/UMLBaseEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/helpers/UMLBaseEditHelper.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.helpers;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;

@@ -25,7 +25,7 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

-import org.eclipse.papyrus.diagram.common.commands.UnapplyAllStereotypesCommand;

+import org.eclipse.papyrus.uml.diagram.common.commands.UnapplyAllStereotypesCommand;

 import org.eclipse.uml2.uml.Element;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/helpers/UsageEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/helpers/UsageEditHelper.java
index f17ecadfb92..213a861a9f3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/helpers/UsageEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/helpers/UsageEditHelper.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.helpers;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/helpers/UseCaseEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/helpers/UseCaseEditHelper.java
index e73b792d1b0..db161fae4f6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/helpers/UseCaseEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/helpers/UseCaseEditHelper.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.helpers;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/AbstractionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/AbstractionEditPart.java
index 84ad892d35b..be30dc7a292 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/AbstractionEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/AbstractionEditPart.java
@@ -11,18 +11,18 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.parts;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

 

 import org.eclipse.draw2d.Connection;

 import org.eclipse.gef.EditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.editparts.UMLConnectionNodeEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeAbstractionLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.edge.DashedEdgeFigure;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.AbstractionItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeAbstractionLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.AbstractionItemSemanticEditPolicy;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/AbstractionNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/AbstractionNameEditPart.java
index b78293f9ee4..8ae1305eb3f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/AbstractionNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/AbstractionNameEditPart.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.parts;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -51,15 +51,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editparts.ILabelRoleProvider;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -69,6 +60,15 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -116,7 +116,7 @@ public class AbstractionNameEditPart extends LabelEditPart implements ITextAware
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.usecase.edit.parts.AbstractionNameEditPart.VISUAL_ID), new Point(0, 40));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AbstractionNameEditPart.VISUAL_ID), new Point(0, 40));

 	}

 

 	/**

@@ -332,7 +332,7 @@ public class AbstractionNameEditPart extends LabelEditPart implements ITextAware
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Abstraction_4015, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.usecase.edit.parts.AbstractionNameEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Abstraction_4015, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AbstractionNameEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -581,7 +581,7 @@ public class AbstractionNameEditPart extends LabelEditPart implements ITextAware
 	 * Returns the kind of associated editor for direct edition.

 	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see

-	 *         org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 *         org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

@@ -728,7 +728,7 @@ public class AbstractionNameEditPart extends LabelEditPart implements ITextAware
 	 * @generated

 	 */

 	public String getIconPathRole() {

-		return "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/label_role/name.png";//$NON-NLS-1$

+		return "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/name.png";//$NON-NLS-1$

 	}

 

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/ActorAppliedStereotypeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorAppliedStereotypeEditPartCN.java
index 26c7206d2fb..a2587efec16 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/ActorAppliedStereotypeEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorAppliedStereotypeEditPartCN.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.parts;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -53,18 +53,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editparts.IPapyrusEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -72,6 +60,18 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialo
 import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.IPapyrusEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -131,7 +131,7 @@ implements ITextAwareEditPart, IBorderItemEditPart, IPapyrusEditPart {
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.usecase.edit.parts.ActorAppliedStereotypeEditPartCN.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorAppliedStereotypeEditPartCN.VISUAL_ID), new Point(0, 0));

 	}

 

 	/**

@@ -363,7 +363,7 @@ implements ITextAwareEditPart, IBorderItemEditPart, IPapyrusEditPart {
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Actor_2011, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.usecase.edit.parts.ActorAppliedStereotypeEditPartCN.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Actor_2011, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorAppliedStereotypeEditPartCN.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -607,7 +607,7 @@ implements ITextAwareEditPart, IBorderItemEditPart, IPapyrusEditPart {
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/ActorAppliedStereotypeEditPartTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorAppliedStereotypeEditPartTN.java
index 9822b67f156..91f393a2d42 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/ActorAppliedStereotypeEditPartTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorAppliedStereotypeEditPartTN.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.parts;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -53,18 +53,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editparts.IPapyrusEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -74,6 +62,18 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.IPapyrusEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -133,7 +133,7 @@ implements ITextAwareEditPart, IBorderItemEditPart, IPapyrusEditPart {
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.usecase.edit.parts.ActorAppliedStereotypeEditPartTN.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorAppliedStereotypeEditPartTN.VISUAL_ID), new Point(0, 0));

 	}

 

 	/**

@@ -365,7 +365,7 @@ implements ITextAwareEditPart, IBorderItemEditPart, IPapyrusEditPart {
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Actor_2011, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.usecase.edit.parts.ActorAppliedStereotypeEditPartTN.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Actor_2011, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorAppliedStereotypeEditPartTN.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -613,7 +613,7 @@ implements ITextAwareEditPart, IBorderItemEditPart, IPapyrusEditPart {
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

@@ -764,7 +764,7 @@ implements ITextAwareEditPart, IBorderItemEditPart, IPapyrusEditPart {
 	 * @generated

 	 */

 	public String getIconPathRole() {

-		return "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/stereotype.gif";//$NON-NLS-1$

+		return "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/stereotype.gif";//$NON-NLS-1$

 	}

 

 	public IFigure getPrimaryShape() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/ActorAsRectangleEditPartTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorAsRectangleEditPartTN.java
index b9cb9d6a89c..f0b5e79542e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/ActorAsRectangleEditPartTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorAsRectangleEditPartTN.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.parts;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

 

 import java.util.ArrayList;

 import java.util.LinkedList;

@@ -41,16 +41,16 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.common.draw2d.CenterLayout;

-import org.eclipse.papyrus.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

-import org.eclipse.papyrus.diagram.common.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.ActorAsRectangleItemSemanticEditPolicyTN;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.usecase.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.common.draw2d.CenterLayout;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.ActorAsRectangleItemSemanticEditPolicyTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

 import org.eclipse.swt.graphics.Color;

 

 /**

@@ -290,7 +290,7 @@ ShapeNodeEditPart {
 		if(targetEditPart instanceof ActorEditPartTN) {

 			types.add(UMLElementTypes.Generalization_4010);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.ActorAsRectangleEditPartTN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorAsRectangleEditPartTN) {

 			types.add(UMLElementTypes.Generalization_4010);

 		}

 		if(targetEditPart instanceof UseCaseEditPartTN) {

@@ -323,7 +323,7 @@ ShapeNodeEditPart {
 		if(targetEditPart instanceof ActorEditPartTN) {

 			types.add(UMLElementTypes.Association_4011);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.ActorAsRectangleEditPartTN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorAsRectangleEditPartTN) {

 			types.add(UMLElementTypes.Association_4011);

 		}

 		if(targetEditPart instanceof UseCaseEditPartTN) {

@@ -356,7 +356,7 @@ ShapeNodeEditPart {
 		if(targetEditPart instanceof ActorEditPartTN) {

 			types.add(UMLElementTypes.Dependency_4013);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.ActorAsRectangleEditPartTN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorAsRectangleEditPartTN) {

 			types.add(UMLElementTypes.Dependency_4013);

 		}

 		if(targetEditPart instanceof UseCaseEditPartTN) {

@@ -404,7 +404,7 @@ ShapeNodeEditPart {
 		if(targetEditPart instanceof ActorEditPartTN) {

 			types.add(UMLElementTypes.Abstraction_4015);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.ActorAsRectangleEditPartTN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorAsRectangleEditPartTN) {

 			types.add(UMLElementTypes.Abstraction_4015);

 		}

 		if(targetEditPart instanceof UseCaseEditPartTN) {

@@ -452,7 +452,7 @@ ShapeNodeEditPart {
 		if(targetEditPart instanceof ActorEditPartTN) {

 			types.add(UMLElementTypes.Usage_4016);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.ActorAsRectangleEditPartTN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorAsRectangleEditPartTN) {

 			types.add(UMLElementTypes.Usage_4016);

 		}

 		if(targetEditPart instanceof UseCaseEditPartTN) {

@@ -500,7 +500,7 @@ ShapeNodeEditPart {
 		if(targetEditPart instanceof ActorEditPartTN) {

 			types.add(UMLElementTypes.Realization_4017);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.ActorAsRectangleEditPartTN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorAsRectangleEditPartTN) {

 			types.add(UMLElementTypes.Realization_4017);

 		}

 		if(targetEditPart instanceof UseCaseEditPartTN) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/ActorAsRectangleNameEditPartTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorAsRectangleNameEditPartTN.java
index 4882aaaf539..18a1e9f8bff 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/ActorAsRectangleNameEditPartTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorAsRectangleNameEditPartTN.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.parts;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -51,15 +51,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.common.util.DiagramEditPartsUtil;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -69,8 +60,17 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

-import org.eclipse.papyrus.umlutils.ui.VisualInformationPapyrusConstant;

-import org.eclipse.papyrus.umlutils.ui.helper.NameLabelIconHelper;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.tools.utils.ui.VisualInformationPapyrusConstant;

+import org.eclipse.papyrus.uml.tools.utils.ui.helper.NameLabelIconHelper;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -340,7 +340,7 @@ public class ActorAsRectangleNameEditPartTN extends CompartmentEditPart implemen
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Actor_2012, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.usecase.edit.parts.ActorAsRectangleNameEditPartTN.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Actor_2012, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorAsRectangleNameEditPartTN.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -588,7 +588,7 @@ public class ActorAsRectangleNameEditPartTN extends CompartmentEditPart implemen
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/ActorEditPartTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorEditPartTN.java
index 2c0ab578dee..f9bf4914c29 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/ActorEditPartTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorEditPartTN.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.parts;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

 

 import java.util.ArrayList;

 import java.util.Collections;

@@ -47,15 +47,15 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

-import org.eclipse.papyrus.diagram.common.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.papyrus.diagram.usecase.draw2d.StickMan;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.ActorItemSemanticEditPolicyTN;

-import org.eclipse.papyrus.diagram.usecase.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.usecase.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

+import org.eclipse.papyrus.uml.diagram.usecase.draw2d.StickMan;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.ActorItemSemanticEditPolicyTN;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

 import org.eclipse.swt.graphics.Color;

 

 /**

@@ -270,7 +270,7 @@ AbstractBorderedShapeEditPart {
 	 */

 	public List<IElementType> getMARelTypesOnSourceAndTarget(IGraphicalEditPart targetEditPart) {

 		LinkedList<IElementType> types = new LinkedList<IElementType>();

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.ActorEditPartTN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorEditPartTN) {

 			types.add(UMLElementTypes.Generalization_4010);

 		}

 		if(targetEditPart instanceof ActorAsRectangleEditPartTN) {

@@ -303,7 +303,7 @@ AbstractBorderedShapeEditPart {
 		if(targetEditPart instanceof ComponentInPackageEditPart) {

 			types.add(UMLElementTypes.Generalization_4010);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.ActorEditPartTN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorEditPartTN) {

 			types.add(UMLElementTypes.Association_4011);

 		}

 		if(targetEditPart instanceof ActorAsRectangleEditPartTN) {

@@ -336,7 +336,7 @@ AbstractBorderedShapeEditPart {
 		if(targetEditPart instanceof ComponentInPackageEditPart) {

 			types.add(UMLElementTypes.Association_4011);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.ActorEditPartTN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorEditPartTN) {

 			types.add(UMLElementTypes.Dependency_4013);

 		}

 		if(targetEditPart instanceof ActorAsRectangleEditPartTN) {

@@ -384,7 +384,7 @@ AbstractBorderedShapeEditPart {
 		if(targetEditPart instanceof PackageEditPartCN) {

 			types.add(UMLElementTypes.Dependency_4013);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.ActorEditPartTN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorEditPartTN) {

 			types.add(UMLElementTypes.Abstraction_4015);

 		}

 		if(targetEditPart instanceof ActorAsRectangleEditPartTN) {

@@ -432,7 +432,7 @@ AbstractBorderedShapeEditPart {
 		if(targetEditPart instanceof PackageEditPartCN) {

 			types.add(UMLElementTypes.Abstraction_4015);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.ActorEditPartTN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorEditPartTN) {

 			types.add(UMLElementTypes.Usage_4016);

 		}

 		if(targetEditPart instanceof ActorAsRectangleEditPartTN) {

@@ -480,7 +480,7 @@ AbstractBorderedShapeEditPart {
 		if(targetEditPart instanceof PackageEditPartCN) {

 			types.add(UMLElementTypes.Usage_4016);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.ActorEditPartTN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorEditPartTN) {

 			types.add(UMLElementTypes.Realization_4017);

 		}

 		if(targetEditPart instanceof ActorAsRectangleEditPartTN) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/ActorInComponentAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorInComponentAppliedStereotypeEditPart.java
index 3922d2e8c6a..466d2ea9709 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/ActorInComponentAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorInComponentAppliedStereotypeEditPart.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.parts;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -53,18 +53,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editparts.IPapyrusEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -74,6 +62,18 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.IPapyrusEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -133,7 +133,7 @@ implements ITextAwareEditPart, IBorderItemEditPart, IPapyrusEditPart {
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.usecase.edit.parts.ActorInComponentAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorInComponentAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 0));

 	}

 

 	/**

@@ -365,7 +365,7 @@ implements ITextAwareEditPart, IBorderItemEditPart, IPapyrusEditPart {
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Actor_3018, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.usecase.edit.parts.ActorInComponentAppliedStereotypeEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Actor_3018, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorInComponentAppliedStereotypeEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -613,7 +613,7 @@ implements ITextAwareEditPart, IBorderItemEditPart, IPapyrusEditPart {
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

@@ -764,7 +764,7 @@ implements ITextAwareEditPart, IBorderItemEditPart, IPapyrusEditPart {
 	 * @generated

 	 */

 	public String getIconPathRole() {

-		return "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/stereotype.gif";//$NON-NLS-1$

+		return "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/stereotype.gif";//$NON-NLS-1$

 	}

 

 	public IFigure getPrimaryShape() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/ActorInComponentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorInComponentEditPart.java
index 0d9aa492ef9..890e0240d32 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/ActorInComponentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorInComponentEditPart.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.parts;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

 

 import java.util.ArrayList;

 import java.util.Collections;

@@ -47,15 +47,15 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

-import org.eclipse.papyrus.diagram.common.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.papyrus.diagram.usecase.draw2d.StickMan;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.ActorInComponentItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.usecase.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

+import org.eclipse.papyrus.uml.diagram.usecase.draw2d.StickMan;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.ActorInComponentItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

 import org.eclipse.swt.graphics.Color;

 

 /**

@@ -291,7 +291,7 @@ AbstractBorderedShapeEditPart {
 		if(targetEditPart instanceof ComponentInComponentEditPart) {

 			types.add(UMLElementTypes.Generalization_4010);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.ActorInComponentEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorInComponentEditPart) {

 			types.add(UMLElementTypes.Generalization_4010);

 		}

 		if(targetEditPart instanceof ActorInPackageEditPart) {

@@ -324,7 +324,7 @@ AbstractBorderedShapeEditPart {
 		if(targetEditPart instanceof ComponentInComponentEditPart) {

 			types.add(UMLElementTypes.Association_4011);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.ActorInComponentEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorInComponentEditPart) {

 			types.add(UMLElementTypes.Association_4011);

 		}

 		if(targetEditPart instanceof ActorInPackageEditPart) {

@@ -366,7 +366,7 @@ AbstractBorderedShapeEditPart {
 		if(targetEditPart instanceof ConstraintInComponentEditPart) {

 			types.add(UMLElementTypes.Dependency_4013);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.ActorInComponentEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorInComponentEditPart) {

 			types.add(UMLElementTypes.Dependency_4013);

 		}

 		if(targetEditPart instanceof ConstraintInPackageEditPart) {

@@ -414,7 +414,7 @@ AbstractBorderedShapeEditPart {
 		if(targetEditPart instanceof ConstraintInComponentEditPart) {

 			types.add(UMLElementTypes.Abstraction_4015);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.ActorInComponentEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorInComponentEditPart) {

 			types.add(UMLElementTypes.Abstraction_4015);

 		}

 		if(targetEditPart instanceof ConstraintInPackageEditPart) {

@@ -462,7 +462,7 @@ AbstractBorderedShapeEditPart {
 		if(targetEditPart instanceof ConstraintInComponentEditPart) {

 			types.add(UMLElementTypes.Usage_4016);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.ActorInComponentEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorInComponentEditPart) {

 			types.add(UMLElementTypes.Usage_4016);

 		}

 		if(targetEditPart instanceof ConstraintInPackageEditPart) {

@@ -510,7 +510,7 @@ AbstractBorderedShapeEditPart {
 		if(targetEditPart instanceof ConstraintInComponentEditPart) {

 			types.add(UMLElementTypes.Realization_4017);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.ActorInComponentEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorInComponentEditPart) {

 			types.add(UMLElementTypes.Realization_4017);

 		}

 		if(targetEditPart instanceof ConstraintInPackageEditPart) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/ActorInComponentNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorInComponentNameEditPart.java
index 501a840fcd5..b201a820a85 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/ActorInComponentNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorInComponentNameEditPart.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.parts;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -53,16 +53,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editparts.ILabelRoleProvider;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.common.util.DiagramEditPartsUtil;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -72,7 +62,17 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

-import org.eclipse.papyrus.umlutils.ui.helper.NameLabelIconHelper;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.tools.utils.ui.helper.NameLabelIconHelper;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -132,7 +132,7 @@ implements ITextAwareEditPart, IBorderItemEditPart, ILabelRoleProvider {
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.usecase.edit.parts.ActorInComponentNameEditPart.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorInComponentNameEditPart.VISUAL_ID), new Point(0, 0));

 	}

 

 	/**

@@ -375,7 +375,7 @@ implements ITextAwareEditPart, IBorderItemEditPart, ILabelRoleProvider {
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Actor_3018, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.usecase.edit.parts.ActorInComponentNameEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Actor_3018, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorInComponentNameEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -623,7 +623,7 @@ implements ITextAwareEditPart, IBorderItemEditPart, ILabelRoleProvider {
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

@@ -782,7 +782,7 @@ implements ITextAwareEditPart, IBorderItemEditPart, ILabelRoleProvider {
 	 * @generated

 	 */

 	public String getIconPathRole() {

-		return "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/label_role/name.png";//$NON-NLS-1$

+		return "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/name.png";//$NON-NLS-1$

 	}

 

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/ActorInPackageAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorInPackageAppliedStereotypeEditPart.java
index 2dc5ee28866..92a657a57c2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/ActorInPackageAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorInPackageAppliedStereotypeEditPart.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.parts;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -53,18 +53,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editparts.IPapyrusEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -74,6 +62,18 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.IPapyrusEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -133,7 +133,7 @@ implements ITextAwareEditPart, IBorderItemEditPart, IPapyrusEditPart {
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.usecase.edit.parts.ActorInPackageAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorInPackageAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 0));

 	}

 

 	/**

@@ -365,7 +365,7 @@ implements ITextAwareEditPart, IBorderItemEditPart, IPapyrusEditPart {
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Actor_3011, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.usecase.edit.parts.ActorInPackageAppliedStereotypeEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Actor_3011, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorInPackageAppliedStereotypeEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -613,7 +613,7 @@ implements ITextAwareEditPart, IBorderItemEditPart, IPapyrusEditPart {
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

@@ -764,7 +764,7 @@ implements ITextAwareEditPart, IBorderItemEditPart, IPapyrusEditPart {
 	 * @generated

 	 */

 	public String getIconPathRole() {

-		return "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/stereotype.gif";//$NON-NLS-1$

+		return "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/stereotype.gif";//$NON-NLS-1$

 	}

 

 	public IFigure getPrimaryShape() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/ActorInPackageEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorInPackageEditPart.java
index cb7fd428aa2..c4a0a2f9e81 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/ActorInPackageEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorInPackageEditPart.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.parts;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

 

 import java.util.ArrayList;

 import java.util.Collections;

@@ -47,15 +47,15 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

-import org.eclipse.papyrus.diagram.common.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.papyrus.diagram.usecase.draw2d.StickMan;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.ActorInPackageItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.usecase.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

+import org.eclipse.papyrus.uml.diagram.usecase.draw2d.StickMan;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.ActorInPackageItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

 import org.eclipse.swt.graphics.Color;

 

 /**

@@ -294,7 +294,7 @@ AbstractBorderedShapeEditPart {
 		if(targetEditPart instanceof ActorInComponentEditPart) {

 			types.add(UMLElementTypes.Generalization_4010);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.ActorInPackageEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorInPackageEditPart) {

 			types.add(UMLElementTypes.Generalization_4010);

 		}

 		if(targetEditPart instanceof UseCaseInPackageEditPart) {

@@ -327,7 +327,7 @@ AbstractBorderedShapeEditPart {
 		if(targetEditPart instanceof ActorInComponentEditPart) {

 			types.add(UMLElementTypes.Association_4011);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.ActorInPackageEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorInPackageEditPart) {

 			types.add(UMLElementTypes.Association_4011);

 		}

 		if(targetEditPart instanceof UseCaseInPackageEditPart) {

@@ -372,7 +372,7 @@ AbstractBorderedShapeEditPart {
 		if(targetEditPart instanceof ConstraintInPackageEditPart) {

 			types.add(UMLElementTypes.Dependency_4013);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.ActorInPackageEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorInPackageEditPart) {

 			types.add(UMLElementTypes.Dependency_4013);

 		}

 		if(targetEditPart instanceof UseCaseInPackageEditPart) {

@@ -420,7 +420,7 @@ AbstractBorderedShapeEditPart {
 		if(targetEditPart instanceof ConstraintInPackageEditPart) {

 			types.add(UMLElementTypes.Abstraction_4015);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.ActorInPackageEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorInPackageEditPart) {

 			types.add(UMLElementTypes.Abstraction_4015);

 		}

 		if(targetEditPart instanceof UseCaseInPackageEditPart) {

@@ -468,7 +468,7 @@ AbstractBorderedShapeEditPart {
 		if(targetEditPart instanceof ConstraintInPackageEditPart) {

 			types.add(UMLElementTypes.Usage_4016);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.ActorInPackageEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorInPackageEditPart) {

 			types.add(UMLElementTypes.Usage_4016);

 		}

 		if(targetEditPart instanceof UseCaseInPackageEditPart) {

@@ -516,7 +516,7 @@ AbstractBorderedShapeEditPart {
 		if(targetEditPart instanceof ConstraintInPackageEditPart) {

 			types.add(UMLElementTypes.Realization_4017);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.ActorInPackageEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorInPackageEditPart) {

 			types.add(UMLElementTypes.Realization_4017);

 		}

 		if(targetEditPart instanceof UseCaseInPackageEditPart) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/ActorInPackageNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorInPackageNameEditPart.java
index b1564535f88..58f7b739c80 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/ActorInPackageNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorInPackageNameEditPart.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.parts;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -53,16 +53,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editparts.ILabelRoleProvider;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.common.util.DiagramEditPartsUtil;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -72,7 +62,17 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

-import org.eclipse.papyrus.umlutils.ui.helper.NameLabelIconHelper;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.tools.utils.ui.helper.NameLabelIconHelper;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -132,7 +132,7 @@ implements ITextAwareEditPart, IBorderItemEditPart, ILabelRoleProvider {
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.usecase.edit.parts.ActorInPackageNameEditPart.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorInPackageNameEditPart.VISUAL_ID), new Point(0, 0));

 	}

 

 	/**

@@ -375,7 +375,7 @@ implements ITextAwareEditPart, IBorderItemEditPart, ILabelRoleProvider {
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Actor_3011, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.usecase.edit.parts.ActorInPackageNameEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Actor_3011, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorInPackageNameEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -623,7 +623,7 @@ implements ITextAwareEditPart, IBorderItemEditPart, ILabelRoleProvider {
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

@@ -782,7 +782,7 @@ implements ITextAwareEditPart, IBorderItemEditPart, ILabelRoleProvider {
 	 * @generated

 	 */

 	public String getIconPathRole() {

-		return "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/label_role/name.png";//$NON-NLS-1$

+		return "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/name.png";//$NON-NLS-1$

 	}

 

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/ActorNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorNameEditPartCN.java
index 96e800905bc..939ef64b912 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/ActorNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorNameEditPartCN.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.parts;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -53,15 +53,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.common.util.DiagramEditPartsUtil;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -69,7 +60,16 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialo
 import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

-import org.eclipse.papyrus.umlutils.ui.helper.NameLabelIconHelper;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.tools.utils.ui.helper.NameLabelIconHelper;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -129,7 +129,7 @@ implements ITextAwareEditPart, IBorderItemEditPart {
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.usecase.edit.parts.ActorNameEditPartCN.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorNameEditPartCN.VISUAL_ID), new Point(0, 0));

 	}

 

 	/**

@@ -372,7 +372,7 @@ implements ITextAwareEditPart, IBorderItemEditPart {
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Actor_2011, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.usecase.edit.parts.ActorNameEditPartCN.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Actor_2011, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorNameEditPartCN.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -616,7 +616,7 @@ implements ITextAwareEditPart, IBorderItemEditPart {
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/ActorNameEditPartTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorNameEditPartTN.java
index 737633396ba..930805e352f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/ActorNameEditPartTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorNameEditPartTN.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.parts;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -53,16 +53,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editparts.ILabelRoleProvider;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.common.util.DiagramEditPartsUtil;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -72,7 +62,17 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

-import org.eclipse.papyrus.umlutils.ui.helper.NameLabelIconHelper;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.tools.utils.ui.helper.NameLabelIconHelper;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -132,7 +132,7 @@ implements ITextAwareEditPart, IBorderItemEditPart, ILabelRoleProvider {
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.usecase.edit.parts.ActorNameEditPartTN.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorNameEditPartTN.VISUAL_ID), new Point(0, 0));

 	}

 

 	/**

@@ -375,7 +375,7 @@ implements ITextAwareEditPart, IBorderItemEditPart, ILabelRoleProvider {
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Actor_2011, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.usecase.edit.parts.ActorNameEditPartTN.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Actor_2011, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorNameEditPartTN.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -623,7 +623,7 @@ implements ITextAwareEditPart, IBorderItemEditPart, ILabelRoleProvider {
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

@@ -782,7 +782,7 @@ implements ITextAwareEditPart, IBorderItemEditPart, ILabelRoleProvider {
 	 * @generated

 	 */

 	public String getIconPathRole() {

-		return "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/label_role/name.png";//$NON-NLS-1$

+		return "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/name.png";//$NON-NLS-1$

 	}

 

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/AppliedStereotypeAbstractionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/AppliedStereotypeAbstractionEditPart.java
index 986356963e2..ae2a3532d9b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/AppliedStereotypeAbstractionEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/AppliedStereotypeAbstractionEditPart.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.parts;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -51,15 +51,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editparts.ILabelRoleProvider;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -69,6 +60,15 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -116,7 +116,7 @@ public class AppliedStereotypeAbstractionEditPart extends LabelEditPart implemen
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.usecase.edit.parts.AppliedStereotypeAbstractionEditPart.VISUAL_ID), new Point(0, -20));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AppliedStereotypeAbstractionEditPart.VISUAL_ID), new Point(0, -20));

 	}

 

 	/**

@@ -332,7 +332,7 @@ public class AppliedStereotypeAbstractionEditPart extends LabelEditPart implemen
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Abstraction_4015, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.usecase.edit.parts.AppliedStereotypeAbstractionEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Abstraction_4015, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AppliedStereotypeAbstractionEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -581,7 +581,7 @@ public class AppliedStereotypeAbstractionEditPart extends LabelEditPart implemen
 	 * Returns the kind of associated editor for direct edition.

 	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see

-	 *         org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 *         org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

@@ -720,7 +720,7 @@ public class AppliedStereotypeAbstractionEditPart extends LabelEditPart implemen
 	 * @generated

 	 */

 	public String getIconPathRole() {

-		return "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/stereotype.gif";//$NON-NLS-1$

+		return "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/stereotype.gif";//$NON-NLS-1$

 	}

 

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/AppliedStereotypePackageImportEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/AppliedStereotypePackageImportEditPart.java
index e3749335464..63b0ea7c297 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/AppliedStereotypePackageImportEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/AppliedStereotypePackageImportEditPart.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.parts;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -54,14 +54,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -69,6 +61,14 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialo
 import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -116,7 +116,7 @@ public class AppliedStereotypePackageImportEditPart extends LabelEditPart implem
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.usecase.edit.parts.AppliedStereotypePackageImportEditPart.VISUAL_ID), new Point(0, 40));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AppliedStereotypePackageImportEditPart.VISUAL_ID), new Point(0, 40));

 	}

 

 	/**

@@ -339,7 +339,7 @@ public class AppliedStereotypePackageImportEditPart extends LabelEditPart implem
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.PackageImport_4019, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.usecase.edit.parts.AppliedStereotypePackageImportEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.PackageImport_4019, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AppliedStereotypePackageImportEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -584,7 +584,7 @@ public class AppliedStereotypePackageImportEditPart extends LabelEditPart implem
 	 * Returns the kind of associated editor for direct edition.

 	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see

-	 *         org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 *         org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/AppliedStereotypePackageMergeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/AppliedStereotypePackageMergeEditPart.java
index fbe32af3974..79313a6f258 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/AppliedStereotypePackageMergeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/AppliedStereotypePackageMergeEditPart.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.parts;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -51,15 +51,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editparts.ILabelRoleProvider;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -69,6 +60,15 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -116,7 +116,7 @@ public class AppliedStereotypePackageMergeEditPart extends LabelEditPart impleme
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.usecase.edit.parts.AppliedStereotypePackageMergeEditPart.VISUAL_ID), new Point(0, -20));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AppliedStereotypePackageMergeEditPart.VISUAL_ID), new Point(0, -20));

 	}

 

 	/**

@@ -332,7 +332,7 @@ public class AppliedStereotypePackageMergeEditPart extends LabelEditPart impleme
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.PackageMerge_4018, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.usecase.edit.parts.AppliedStereotypePackageMergeEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.PackageMerge_4018, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AppliedStereotypePackageMergeEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -581,7 +581,7 @@ public class AppliedStereotypePackageMergeEditPart extends LabelEditPart impleme
 	 * Returns the kind of associated editor for direct edition.

 	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see

-	 *         org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 *         org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

@@ -720,7 +720,7 @@ public class AppliedStereotypePackageMergeEditPart extends LabelEditPart impleme
 	 * @generated

 	 */

 	public String getIconPathRole() {

-		return "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/stereotype.gif";//$NON-NLS-1$

+		return "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/stereotype.gif";//$NON-NLS-1$

 	}

 

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/AppliedStereotypeRealizationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/AppliedStereotypeRealizationEditPart.java
index 011f7d5386b..4e36cb9d54b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/AppliedStereotypeRealizationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/AppliedStereotypeRealizationEditPart.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.parts;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -54,14 +54,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -69,6 +61,14 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialo
 import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -116,7 +116,7 @@ public class AppliedStereotypeRealizationEditPart extends LabelEditPart implemen
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.usecase.edit.parts.AppliedStereotypeRealizationEditPart.VISUAL_ID), new Point(0, 60));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AppliedStereotypeRealizationEditPart.VISUAL_ID), new Point(0, 60));

 	}

 

 	/**

@@ -339,7 +339,7 @@ public class AppliedStereotypeRealizationEditPart extends LabelEditPart implemen
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Realization_4017, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.usecase.edit.parts.AppliedStereotypeRealizationEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Realization_4017, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AppliedStereotypeRealizationEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -584,7 +584,7 @@ public class AppliedStereotypeRealizationEditPart extends LabelEditPart implemen
 	 * Returns the kind of associated editor for direct edition.

 	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see

-	 *         org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 *         org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/AppliedStereotypeUsageEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/AppliedStereotypeUsageEditPart.java
index e52fccc3197..03d28c68828 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/AppliedStereotypeUsageEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/AppliedStereotypeUsageEditPart.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.parts;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -51,15 +51,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editparts.ILabelRoleProvider;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -69,6 +60,15 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -116,7 +116,7 @@ public class AppliedStereotypeUsageEditPart extends LabelEditPart implements ITe
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.usecase.edit.parts.AppliedStereotypeUsageEditPart.VISUAL_ID), new Point(0, -20));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AppliedStereotypeUsageEditPart.VISUAL_ID), new Point(0, -20));

 	}

 

 	/**

@@ -332,7 +332,7 @@ public class AppliedStereotypeUsageEditPart extends LabelEditPart implements ITe
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Usage_4016, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.usecase.edit.parts.AppliedStereotypeUsageEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Usage_4016, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AppliedStereotypeUsageEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -581,7 +581,7 @@ public class AppliedStereotypeUsageEditPart extends LabelEditPart implements ITe
 	 * Returns the kind of associated editor for direct edition.

 	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see

-	 *         org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 *         org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

@@ -720,7 +720,7 @@ public class AppliedStereotypeUsageEditPart extends LabelEditPart implements ITe
 	 * @generated

 	 */

 	public String getIconPathRole() {

-		return "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/stereotype.gif";//$NON-NLS-1$

+		return "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/stereotype.gif";//$NON-NLS-1$

 	}

 

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/AssociationAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/AssociationAppliedStereotypeEditPart.java
index 3fd603b7bbb..7f8cdb58d9e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/AssociationAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/AssociationAppliedStereotypeEditPart.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.parts;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -51,15 +51,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editparts.ILabelRoleProvider;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -69,6 +60,15 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -124,7 +124,7 @@ public class AssociationAppliedStereotypeEditPart extends LabelEditPart implemen
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.usecase.edit.parts.AssociationAppliedStereotypeEditPart.VISUAL_ID), new Point(0, -20));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AssociationAppliedStereotypeEditPart.VISUAL_ID), new Point(0, -20));

 	}

 

 	/**

@@ -340,7 +340,7 @@ public class AssociationAppliedStereotypeEditPart extends LabelEditPart implemen
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Association_4011, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.usecase.edit.parts.AssociationAppliedStereotypeEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Association_4011, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AssociationAppliedStereotypeEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -588,7 +588,7 @@ public class AssociationAppliedStereotypeEditPart extends LabelEditPart implemen
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

@@ -732,7 +732,7 @@ public class AssociationAppliedStereotypeEditPart extends LabelEditPart implemen
 	 * @generated

 	 */

 	public String getIconPathRole() {

-		return "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/stereotype.gif";//$NON-NLS-1$

+		return "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/stereotype.gif";//$NON-NLS-1$

 	}

 

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/AssociationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/AssociationEditPart.java
index c2d1fb954ae..44f3b1309f3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/AssociationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/AssociationEditPart.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.parts;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

 

 import org.eclipse.draw2d.Connection;

 import org.eclipse.emf.common.notify.Notification;

@@ -22,10 +22,10 @@ import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.editparts.UMLConnectionNodeEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.AssociationItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.figure.AssociationFigure;

+import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.AssociationItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.figure.AssociationFigure;

 import org.eclipse.uml2.uml.Association;

 import org.eclipse.uml2.uml.Property;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/AssociationNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/AssociationNameEditPart.java
index 1124b5b1c8a..0b634017a6e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/AssociationNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/AssociationNameEditPart.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.parts;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -51,15 +51,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editparts.ILabelRoleProvider;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -69,6 +60,15 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -116,7 +116,7 @@ public class AssociationNameEditPart extends LabelEditPart implements ITextAware
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.usecase.edit.parts.AssociationNameEditPart.VISUAL_ID), new Point(0, 40));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AssociationNameEditPart.VISUAL_ID), new Point(0, 40));

 	}

 

 	/**

@@ -332,7 +332,7 @@ public class AssociationNameEditPart extends LabelEditPart implements ITextAware
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Association_4011, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.usecase.edit.parts.AssociationNameEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Association_4011, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AssociationNameEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -581,7 +581,7 @@ public class AssociationNameEditPart extends LabelEditPart implements ITextAware
 	 * Returns the kind of associated editor for direct edition.

 	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see

-	 *         org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 *         org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

@@ -728,7 +728,7 @@ public class AssociationNameEditPart extends LabelEditPart implements ITextAware
 	 * @generated

 	 */

 	public String getIconPathRole() {

-		return "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/label_role/name.png";//$NON-NLS-1$

+		return "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/name.png";//$NON-NLS-1$

 	}

 

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/CommentAnnotatedElementEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/CommentAnnotatedElementEditPart.java
index 11d18bfce0a..81cab6baecc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/CommentAnnotatedElementEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/CommentAnnotatedElementEditPart.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.parts;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

 

 import org.eclipse.draw2d.Connection;

 import org.eclipse.draw2d.Graphics;

@@ -20,7 +20,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.CommentAnnotatedElementItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.CommentAnnotatedElementItemSemanticEditPolicy;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/CommentBodyEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/CommentBodyEditPartCN.java
index 8132af353ad..93119203771 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/CommentBodyEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/CommentBodyEditPartCN.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.parts;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -50,15 +50,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.HTMLCornerBentFigure;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -68,6 +59,15 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.HTMLCornerBentFigure;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -325,7 +325,7 @@ public class CommentBodyEditPartCN extends CompartmentEditPart implements ITextA
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Comment_3015, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.usecase.edit.parts.CommentBodyEditPartCN.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Comment_3015, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.usecase.edit.parts.CommentBodyEditPartCN.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -573,7 +573,7 @@ public class CommentBodyEditPartCN extends CompartmentEditPart implements ITextA
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/CommentBodyEditPartTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/CommentBodyEditPartTN.java
index c4458153567..3a9f66cdb14 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/CommentBodyEditPartTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/CommentBodyEditPartTN.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.parts;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -50,15 +50,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.HTMLCornerBentFigure;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -68,6 +59,15 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.HTMLCornerBentFigure;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -325,7 +325,7 @@ public class CommentBodyEditPartTN extends CompartmentEditPart implements ITextA
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Comment_2018, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.usecase.edit.parts.CommentBodyEditPartTN.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Comment_2018, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.usecase.edit.parts.CommentBodyEditPartTN.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -573,7 +573,7 @@ public class CommentBodyEditPartTN extends CompartmentEditPart implements ITextA
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/CommentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/CommentEditPartCN.java
index 4f82be2fa91..920cd464f77 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/CommentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/CommentEditPartCN.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.parts;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

 

 import java.util.ArrayList;

 import java.util.LinkedList;

@@ -40,19 +40,19 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.common.editparts.AbstractCommentEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.HTMLCornerBentFigure;

-import org.eclipse.papyrus.diagram.common.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.CommentItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.OpenDiagramEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.usecase.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractCommentEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.HTMLCornerBentFigure;

+import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.CommentItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.OpenDiagramEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

 import org.eclipse.swt.graphics.Color;

 

 /**

@@ -331,7 +331,7 @@ AbstractCommentEditPart {
 		if(targetEditPart instanceof ComponentInComponentEditPart) {

 			types.add(UMLElementTypes.CommentAnnotatedElement_4014);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.CommentEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.CommentEditPartCN) {

 			types.add(UMLElementTypes.CommentAnnotatedElement_4014);

 		}

 		if(targetEditPart instanceof ConstraintInComponentEditPart) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/CommentEditPartTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/CommentEditPartTN.java
index 59fc55dce45..f7e3c4ae30e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/CommentEditPartTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/CommentEditPartTN.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.parts;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

 

 import java.util.ArrayList;

 import java.util.LinkedList;

@@ -40,19 +40,19 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.common.editparts.AbstractCommentEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.HTMLCornerBentFigure;

-import org.eclipse.papyrus.diagram.common.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.CommentItemSemanticEditPolicyTN;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.OpenDiagramEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.usecase.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractCommentEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.HTMLCornerBentFigure;

+import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.CommentItemSemanticEditPolicyTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.OpenDiagramEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

 import org.eclipse.swt.graphics.Color;

 

 /**

@@ -322,7 +322,7 @@ AbstractCommentEditPart {
 		if(targetEditPart instanceof ConstraintEditPartTN) {

 			types.add(UMLElementTypes.CommentAnnotatedElement_4014);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.CommentEditPartTN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.CommentEditPartTN) {

 			types.add(UMLElementTypes.CommentAnnotatedElement_4014);

 		}

 		if(targetEditPart instanceof UseCaseInComponentEditPart) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/ComponentEditPartTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ComponentEditPartTN.java
index abfbeea5581..37ea13f7395 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/ComponentEditPartTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ComponentEditPartTN.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.parts;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

 

 import java.util.ArrayList;

 import java.util.LinkedList;

@@ -45,22 +45,22 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.common.draw2d.PileLayout;

-import org.eclipse.papyrus.diagram.common.editparts.IPapyrusEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.CenteredWrappedLabel;

-import org.eclipse.papyrus.diagram.common.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.papyrus.diagram.common.helper.StereotypeFigureHelper;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.ComponentItemSemanticEditPolicyTN;

-import org.eclipse.papyrus.diagram.usecase.figure.AbstractSubjectFigure;

-import org.eclipse.papyrus.diagram.usecase.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.usecase.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.common.draw2d.PileLayout;

+import org.eclipse.papyrus.uml.diagram.common.editparts.IPapyrusEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.CenteredWrappedLabel;

+import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

+import org.eclipse.papyrus.uml.diagram.common.helper.StereotypeFigureHelper;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.ComponentItemSemanticEditPolicyTN;

+import org.eclipse.papyrus.uml.diagram.usecase.figure.AbstractSubjectFigure;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.graphics.Color;

 import org.eclipse.swt.graphics.Font;

@@ -336,7 +336,7 @@ ShapeNodeEditPart implements IPapyrusEditPart {
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {

 			types.add(UMLElementTypes.Generalization_4010);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.ComponentEditPartTN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ComponentEditPartTN) {

 			types.add(UMLElementTypes.Generalization_4010);

 		}

 		if(targetEditPart instanceof UseCaseInComponentEditPart) {

@@ -369,7 +369,7 @@ ShapeNodeEditPart implements IPapyrusEditPart {
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {

 			types.add(UMLElementTypes.Association_4011);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.ComponentEditPartTN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ComponentEditPartTN) {

 			types.add(UMLElementTypes.Association_4011);

 		}

 		if(targetEditPart instanceof UseCaseInComponentEditPart) {

@@ -402,7 +402,7 @@ ShapeNodeEditPart implements IPapyrusEditPart {
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {

 			types.add(UMLElementTypes.Dependency_4013);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.ComponentEditPartTN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ComponentEditPartTN) {

 			types.add(UMLElementTypes.Dependency_4013);

 		}

 		if(targetEditPart instanceof PackageEditPartTN) {

@@ -450,7 +450,7 @@ ShapeNodeEditPart implements IPapyrusEditPart {
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {

 			types.add(UMLElementTypes.Abstraction_4015);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.ComponentEditPartTN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ComponentEditPartTN) {

 			types.add(UMLElementTypes.Abstraction_4015);

 		}

 		if(targetEditPart instanceof PackageEditPartTN) {

@@ -498,7 +498,7 @@ ShapeNodeEditPart implements IPapyrusEditPart {
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {

 			types.add(UMLElementTypes.Usage_4016);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.ComponentEditPartTN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ComponentEditPartTN) {

 			types.add(UMLElementTypes.Usage_4016);

 		}

 		if(targetEditPart instanceof PackageEditPartTN) {

@@ -546,7 +546,7 @@ ShapeNodeEditPart implements IPapyrusEditPart {
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {

 			types.add(UMLElementTypes.Realization_4017);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.ComponentEditPartTN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ComponentEditPartTN) {

 			types.add(UMLElementTypes.Realization_4017);

 		}

 		if(targetEditPart instanceof PackageEditPartTN) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/ComponentInComponentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ComponentInComponentEditPart.java
index a8dc7160ae2..533c8427789 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/ComponentInComponentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ComponentInComponentEditPart.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.parts;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

 

 import java.util.ArrayList;

 import java.util.LinkedList;

@@ -45,22 +45,22 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.common.draw2d.PileLayout;

-import org.eclipse.papyrus.diagram.common.editparts.IPapyrusEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.CenteredWrappedLabel;

-import org.eclipse.papyrus.diagram.common.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.papyrus.diagram.common.helper.StereotypeFigureHelper;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.ComponentInComponentItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.figure.AbstractSubjectFigure;

-import org.eclipse.papyrus.diagram.usecase.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.usecase.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.common.draw2d.PileLayout;

+import org.eclipse.papyrus.uml.diagram.common.editparts.IPapyrusEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.CenteredWrappedLabel;

+import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

+import org.eclipse.papyrus.uml.diagram.common.helper.StereotypeFigureHelper;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.ComponentInComponentItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.figure.AbstractSubjectFigure;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.graphics.Color;

 import org.eclipse.swt.graphics.Font;

@@ -342,7 +342,7 @@ ShapeNodeEditPart implements IPapyrusEditPart {
 		if(targetEditPart instanceof UseCaseInComponentEditPart) {

 			types.add(UMLElementTypes.Generalization_4010);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.ComponentInComponentEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ComponentInComponentEditPart) {

 			types.add(UMLElementTypes.Generalization_4010);

 		}

 		if(targetEditPart instanceof ActorInComponentEditPart) {

@@ -375,7 +375,7 @@ ShapeNodeEditPart implements IPapyrusEditPart {
 		if(targetEditPart instanceof UseCaseInComponentEditPart) {

 			types.add(UMLElementTypes.Association_4011);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.ComponentInComponentEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ComponentInComponentEditPart) {

 			types.add(UMLElementTypes.Association_4011);

 		}

 		if(targetEditPart instanceof ActorInComponentEditPart) {

@@ -414,7 +414,7 @@ ShapeNodeEditPart implements IPapyrusEditPart {
 		if(targetEditPart instanceof UseCaseInComponentEditPart) {

 			types.add(UMLElementTypes.Dependency_4013);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.ComponentInComponentEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ComponentInComponentEditPart) {

 			types.add(UMLElementTypes.Dependency_4013);

 		}

 		if(targetEditPart instanceof ConstraintInComponentEditPart) {

@@ -462,7 +462,7 @@ ShapeNodeEditPart implements IPapyrusEditPart {
 		if(targetEditPart instanceof UseCaseInComponentEditPart) {

 			types.add(UMLElementTypes.Abstraction_4015);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.ComponentInComponentEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ComponentInComponentEditPart) {

 			types.add(UMLElementTypes.Abstraction_4015);

 		}

 		if(targetEditPart instanceof ConstraintInComponentEditPart) {

@@ -510,7 +510,7 @@ ShapeNodeEditPart implements IPapyrusEditPart {
 		if(targetEditPart instanceof UseCaseInComponentEditPart) {

 			types.add(UMLElementTypes.Usage_4016);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.ComponentInComponentEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ComponentInComponentEditPart) {

 			types.add(UMLElementTypes.Usage_4016);

 		}

 		if(targetEditPart instanceof ConstraintInComponentEditPart) {

@@ -558,7 +558,7 @@ ShapeNodeEditPart implements IPapyrusEditPart {
 		if(targetEditPart instanceof UseCaseInComponentEditPart) {

 			types.add(UMLElementTypes.Realization_4017);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.ComponentInComponentEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ComponentInComponentEditPart) {

 			types.add(UMLElementTypes.Realization_4017);

 		}

 		if(targetEditPart instanceof ConstraintInComponentEditPart) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/ComponentInComponentNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ComponentInComponentNameEditPart.java
index e2232602e30..57e762910fd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/ComponentInComponentNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ComponentInComponentNameEditPart.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.parts;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -50,14 +50,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -67,6 +59,14 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -324,7 +324,7 @@ public class ComponentInComponentNameEditPart extends CompartmentEditPart implem
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Component_3016, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.usecase.edit.parts.ComponentInComponentNameEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Component_3016, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ComponentInComponentNameEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -572,7 +572,7 @@ public class ComponentInComponentNameEditPart extends CompartmentEditPart implem
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/ComponentInPackageEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ComponentInPackageEditPart.java
index 7ed4ecd3cfb..1f5bdea1010 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/ComponentInPackageEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ComponentInPackageEditPart.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.parts;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

 

 import java.util.ArrayList;

 import java.util.LinkedList;

@@ -45,22 +45,22 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.common.draw2d.PileLayout;

-import org.eclipse.papyrus.diagram.common.editparts.IPapyrusEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.CenteredWrappedLabel;

-import org.eclipse.papyrus.diagram.common.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.papyrus.diagram.common.helper.StereotypeFigureHelper;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.ComponentInPackageItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.figure.AbstractSubjectFigure;

-import org.eclipse.papyrus.diagram.usecase.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.usecase.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.common.draw2d.PileLayout;

+import org.eclipse.papyrus.uml.diagram.common.editparts.IPapyrusEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.CenteredWrappedLabel;

+import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

+import org.eclipse.papyrus.uml.diagram.common.helper.StereotypeFigureHelper;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.ComponentInPackageItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.figure.AbstractSubjectFigure;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.graphics.Color;

 import org.eclipse.swt.graphics.Font;

@@ -354,7 +354,7 @@ ShapeNodeEditPart implements IPapyrusEditPart {
 		if(targetEditPart instanceof UseCaseInPackageEditPart) {

 			types.add(UMLElementTypes.Generalization_4010);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.ComponentInPackageEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ComponentInPackageEditPart) {

 			types.add(UMLElementTypes.Generalization_4010);

 		}

 		if(targetEditPart instanceof ActorEditPartTN) {

@@ -387,7 +387,7 @@ ShapeNodeEditPart implements IPapyrusEditPart {
 		if(targetEditPart instanceof UseCaseInPackageEditPart) {

 			types.add(UMLElementTypes.Association_4011);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.ComponentInPackageEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ComponentInPackageEditPart) {

 			types.add(UMLElementTypes.Association_4011);

 		}

 		if(targetEditPart instanceof ActorEditPartTN) {

@@ -432,7 +432,7 @@ ShapeNodeEditPart implements IPapyrusEditPart {
 		if(targetEditPart instanceof UseCaseInPackageEditPart) {

 			types.add(UMLElementTypes.Dependency_4013);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.ComponentInPackageEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ComponentInPackageEditPart) {

 			types.add(UMLElementTypes.Dependency_4013);

 		}

 		if(targetEditPart instanceof PackageEditPartCN) {

@@ -480,7 +480,7 @@ ShapeNodeEditPart implements IPapyrusEditPart {
 		if(targetEditPart instanceof UseCaseInPackageEditPart) {

 			types.add(UMLElementTypes.Abstraction_4015);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.ComponentInPackageEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ComponentInPackageEditPart) {

 			types.add(UMLElementTypes.Abstraction_4015);

 		}

 		if(targetEditPart instanceof PackageEditPartCN) {

@@ -528,7 +528,7 @@ ShapeNodeEditPart implements IPapyrusEditPart {
 		if(targetEditPart instanceof UseCaseInPackageEditPart) {

 			types.add(UMLElementTypes.Usage_4016);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.ComponentInPackageEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ComponentInPackageEditPart) {

 			types.add(UMLElementTypes.Usage_4016);

 		}

 		if(targetEditPart instanceof PackageEditPartCN) {

@@ -576,7 +576,7 @@ ShapeNodeEditPart implements IPapyrusEditPart {
 		if(targetEditPart instanceof UseCaseInPackageEditPart) {

 			types.add(UMLElementTypes.Realization_4017);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.ComponentInPackageEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ComponentInPackageEditPart) {

 			types.add(UMLElementTypes.Realization_4017);

 		}

 		if(targetEditPart instanceof PackageEditPartCN) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/ComponentInPackageNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ComponentInPackageNameEditPart.java
index e873d600939..d7785b55214 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/ComponentInPackageNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ComponentInPackageNameEditPart.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.parts;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -50,14 +50,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -67,6 +59,14 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -324,7 +324,7 @@ public class ComponentInPackageNameEditPart extends CompartmentEditPart implemen
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Component_3013, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.usecase.edit.parts.ComponentInPackageNameEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Component_3013, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ComponentInPackageNameEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -572,7 +572,7 @@ public class ComponentInPackageNameEditPart extends CompartmentEditPart implemen
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/ComponentNameEditPartTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ComponentNameEditPartTN.java
index e10c89c1336..699962bb0cf 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/ComponentNameEditPartTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ComponentNameEditPartTN.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.parts;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -50,14 +50,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -67,6 +59,14 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -324,7 +324,7 @@ public class ComponentNameEditPartTN extends CompartmentEditPart implements ITex
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Component_2015, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.usecase.edit.parts.ComponentNameEditPartTN.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Component_2015, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ComponentNameEditPartTN.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -572,7 +572,7 @@ public class ComponentNameEditPartTN extends CompartmentEditPart implements ITex
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/ComponentUsecases2EditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ComponentUsecases2EditPart.java
index ba0e0cc3ac7..f137cbb6ed0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/ComponentUsecases2EditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ComponentUsecases2EditPart.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.parts;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

 

 import org.eclipse.draw2d.IFigure;

 import org.eclipse.draw2d.geometry.Dimension;

@@ -27,10 +27,10 @@ import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.editpolicies.DuplicatePasteEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.ComponentUsecases2ItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.CustomDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.part.Messages;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.ComponentUsecases2ItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.part.Messages;

 

 /**

  * @generated

@@ -76,7 +76,7 @@ public class ComponentUsecases2EditPart extends ShapeCompartmentEditPart {
 		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

 

 		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.diagram.usecase.edit.policies.ComponentUsecases2CanonicalEditPolicy());

+		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.usecase.edit.policies.ComponentUsecases2CanonicalEditPolicy());

 

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/ComponentUsecases3EditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ComponentUsecases3EditPart.java
index de5195822e2..a159d9f300b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/ComponentUsecases3EditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ComponentUsecases3EditPart.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.parts;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

 

 import org.eclipse.draw2d.IFigure;

 import org.eclipse.draw2d.geometry.Dimension;

@@ -27,10 +27,10 @@ import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.editpolicies.DuplicatePasteEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.ComponentUsecases3ItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.CustomDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.part.Messages;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.ComponentUsecases3ItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.part.Messages;

 

 /**

  * @generated

@@ -76,7 +76,7 @@ public class ComponentUsecases3EditPart extends ShapeCompartmentEditPart {
 		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

 

 		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.diagram.usecase.edit.policies.ComponentUsecases3CanonicalEditPolicy());

+		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.usecase.edit.policies.ComponentUsecases3CanonicalEditPolicy());

 

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/ComponentUsecasesEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ComponentUsecasesEditPart.java
index d3dbbfc50ba..76b1de8cfbe 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/ComponentUsecasesEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ComponentUsecasesEditPart.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.parts;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

 

 import org.eclipse.draw2d.IFigure;

 import org.eclipse.draw2d.geometry.Dimension;

@@ -27,10 +27,10 @@ import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.editpolicies.DuplicatePasteEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.ComponentUsecasesItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.CustomDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.part.Messages;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.ComponentUsecasesItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.part.Messages;

 

 /**

  * @generated

@@ -76,7 +76,7 @@ public class ComponentUsecasesEditPart extends ShapeCompartmentEditPart {
 		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

 

 		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.diagram.usecase.edit.policies.ComponentUsecasesCanonicalEditPolicy());

+		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.usecase.edit.policies.ComponentUsecasesCanonicalEditPolicy());

 

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/ConstraintConstrainedElementEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ConstraintConstrainedElementEditPart.java
index 9ce75c08562..6451090cc2b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/ConstraintConstrainedElementEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ConstraintConstrainedElementEditPart.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.parts;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

 

 import org.eclipse.draw2d.Connection;

 import org.eclipse.draw2d.Graphics;

@@ -20,7 +20,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.ConstraintConstrainedElementItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.ConstraintConstrainedElementItemSemanticEditPolicy;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/ConstraintEditPartTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ConstraintEditPartTN.java
index 2fc6b3192ee..dcf1b45fa16 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/ConstraintEditPartTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ConstraintEditPartTN.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.parts;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

 

 import java.util.ArrayList;

 import java.util.LinkedList;

@@ -42,15 +42,15 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.CornerBentFigure;

-import org.eclipse.papyrus.diagram.common.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.ConstraintItemSemanticEditPolicyTN;

-import org.eclipse.papyrus.diagram.usecase.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.usecase.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.CornerBentFigure;

+import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.ConstraintItemSemanticEditPolicyTN;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.graphics.Color;

 import org.eclipse.swt.graphics.Font;

@@ -312,7 +312,7 @@ ShapeNodeEditPart {
 		if(targetEditPart instanceof PackageEditPartTN) {

 			types.add(UMLElementTypes.ConstraintConstrainedElement_4012);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.ConstraintEditPartTN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintEditPartTN) {

 			types.add(UMLElementTypes.ConstraintConstrainedElement_4012);

 		}

 		if(targetEditPart instanceof CommentEditPartTN) {

@@ -366,7 +366,7 @@ ShapeNodeEditPart {
 		if(targetEditPart instanceof PackageEditPartTN) {

 			types.add(UMLElementTypes.Dependency_4013);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.ConstraintEditPartTN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintEditPartTN) {

 			types.add(UMLElementTypes.Dependency_4013);

 		}

 		if(targetEditPart instanceof UseCaseInComponentEditPart) {

@@ -414,7 +414,7 @@ ShapeNodeEditPart {
 		if(targetEditPart instanceof PackageEditPartTN) {

 			types.add(UMLElementTypes.Abstraction_4015);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.ConstraintEditPartTN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintEditPartTN) {

 			types.add(UMLElementTypes.Abstraction_4015);

 		}

 		if(targetEditPart instanceof UseCaseInComponentEditPart) {

@@ -462,7 +462,7 @@ ShapeNodeEditPart {
 		if(targetEditPart instanceof PackageEditPartTN) {

 			types.add(UMLElementTypes.Usage_4016);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.ConstraintEditPartTN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintEditPartTN) {

 			types.add(UMLElementTypes.Usage_4016);

 		}

 		if(targetEditPart instanceof UseCaseInComponentEditPart) {

@@ -510,7 +510,7 @@ ShapeNodeEditPart {
 		if(targetEditPart instanceof PackageEditPartTN) {

 			types.add(UMLElementTypes.Realization_4017);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.ConstraintEditPartTN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintEditPartTN) {

 			types.add(UMLElementTypes.Realization_4017);

 		}

 		if(targetEditPart instanceof UseCaseInComponentEditPart) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/ConstraintInComponentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ConstraintInComponentEditPart.java
index 9d258992719..f5e65689bd4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/ConstraintInComponentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ConstraintInComponentEditPart.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.parts;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

 

 import java.util.ArrayList;

 import java.util.LinkedList;

@@ -42,15 +42,15 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.CornerBentFigure;

-import org.eclipse.papyrus.diagram.common.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.ConstraintInComponentItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.usecase.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.CornerBentFigure;

+import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.ConstraintInComponentItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.graphics.Color;

 import org.eclipse.swt.graphics.Font;

@@ -327,7 +327,7 @@ ShapeNodeEditPart {
 		if(targetEditPart instanceof CommentEditPartCN) {

 			types.add(UMLElementTypes.ConstraintConstrainedElement_4012);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.ConstraintInComponentEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintInComponentEditPart) {

 			types.add(UMLElementTypes.ConstraintConstrainedElement_4012);

 		}

 		if(targetEditPart instanceof ActorInComponentEditPart) {

@@ -375,7 +375,7 @@ ShapeNodeEditPart {
 		if(targetEditPart instanceof ComponentInComponentEditPart) {

 			types.add(UMLElementTypes.Dependency_4013);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.ConstraintInComponentEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintInComponentEditPart) {

 			types.add(UMLElementTypes.Dependency_4013);

 		}

 		if(targetEditPart instanceof ActorInComponentEditPart) {

@@ -423,7 +423,7 @@ ShapeNodeEditPart {
 		if(targetEditPart instanceof ComponentInComponentEditPart) {

 			types.add(UMLElementTypes.Abstraction_4015);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.ConstraintInComponentEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintInComponentEditPart) {

 			types.add(UMLElementTypes.Abstraction_4015);

 		}

 		if(targetEditPart instanceof ActorInComponentEditPart) {

@@ -471,7 +471,7 @@ ShapeNodeEditPart {
 		if(targetEditPart instanceof ComponentInComponentEditPart) {

 			types.add(UMLElementTypes.Usage_4016);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.ConstraintInComponentEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintInComponentEditPart) {

 			types.add(UMLElementTypes.Usage_4016);

 		}

 		if(targetEditPart instanceof ActorInComponentEditPart) {

@@ -519,7 +519,7 @@ ShapeNodeEditPart {
 		if(targetEditPart instanceof ComponentInComponentEditPart) {

 			types.add(UMLElementTypes.Realization_4017);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.ConstraintInComponentEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintInComponentEditPart) {

 			types.add(UMLElementTypes.Realization_4017);

 		}

 		if(targetEditPart instanceof ActorInComponentEditPart) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/ConstraintInComponentNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ConstraintInComponentNameEditPart.java
index b5962c74623..1a3b8716c7f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/ConstraintInComponentNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ConstraintInComponentNameEditPart.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.parts;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -50,14 +50,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -67,6 +59,14 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -324,7 +324,7 @@ public class ConstraintInComponentNameEditPart extends CompartmentEditPart imple
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Constraint_3017, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.usecase.edit.parts.ConstraintInComponentNameEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Constraint_3017, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintInComponentNameEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -572,7 +572,7 @@ public class ConstraintInComponentNameEditPart extends CompartmentEditPart imple
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/ConstraintInPackageEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ConstraintInPackageEditPart.java
index 4ec72aa2b56..51910beb8b2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/ConstraintInPackageEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ConstraintInPackageEditPart.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.parts;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

 

 import java.util.ArrayList;

 import java.util.LinkedList;

@@ -42,15 +42,15 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.CornerBentFigure;

-import org.eclipse.papyrus.diagram.common.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.ConstraintInPackageItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.usecase.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.CornerBentFigure;

+import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.ConstraintInPackageItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.graphics.Color;

 import org.eclipse.swt.graphics.Font;

@@ -333,7 +333,7 @@ ShapeNodeEditPart {
 		if(targetEditPart instanceof ActorInComponentEditPart) {

 			types.add(UMLElementTypes.ConstraintConstrainedElement_4012);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.ConstraintInPackageEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintInPackageEditPart) {

 			types.add(UMLElementTypes.ConstraintConstrainedElement_4012);

 		}

 		if(targetEditPart instanceof ActorInPackageEditPart) {

@@ -381,7 +381,7 @@ ShapeNodeEditPart {
 		if(targetEditPart instanceof ActorInComponentEditPart) {

 			types.add(UMLElementTypes.Dependency_4013);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.ConstraintInPackageEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintInPackageEditPart) {

 			types.add(UMLElementTypes.Dependency_4013);

 		}

 		if(targetEditPart instanceof ActorInPackageEditPart) {

@@ -429,7 +429,7 @@ ShapeNodeEditPart {
 		if(targetEditPart instanceof ActorInComponentEditPart) {

 			types.add(UMLElementTypes.Abstraction_4015);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.ConstraintInPackageEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintInPackageEditPart) {

 			types.add(UMLElementTypes.Abstraction_4015);

 		}

 		if(targetEditPart instanceof ActorInPackageEditPart) {

@@ -477,7 +477,7 @@ ShapeNodeEditPart {
 		if(targetEditPart instanceof ActorInComponentEditPart) {

 			types.add(UMLElementTypes.Usage_4016);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.ConstraintInPackageEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintInPackageEditPart) {

 			types.add(UMLElementTypes.Usage_4016);

 		}

 		if(targetEditPart instanceof ActorInPackageEditPart) {

@@ -525,7 +525,7 @@ ShapeNodeEditPart {
 		if(targetEditPart instanceof ActorInComponentEditPart) {

 			types.add(UMLElementTypes.Realization_4017);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.ConstraintInPackageEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintInPackageEditPart) {

 			types.add(UMLElementTypes.Realization_4017);

 		}

 		if(targetEditPart instanceof ActorInPackageEditPart) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/ConstraintInPackageNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ConstraintInPackageNameEditPart.java
index 86a3509a15e..97bdbfa7037 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/ConstraintInPackageNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ConstraintInPackageNameEditPart.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.parts;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -50,14 +50,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -67,6 +59,14 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -324,7 +324,7 @@ public class ConstraintInPackageNameEditPart extends CompartmentEditPart impleme
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Constraint_3010, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.usecase.edit.parts.ConstraintInPackageNameEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Constraint_3010, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintInPackageNameEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -572,7 +572,7 @@ public class ConstraintInPackageNameEditPart extends CompartmentEditPart impleme
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/ConstraintNameEditPartTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ConstraintNameEditPartTN.java
index 4be30b8fe2e..629dfa009e3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/ConstraintNameEditPartTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ConstraintNameEditPartTN.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.parts;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -50,14 +50,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -67,6 +59,14 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -324,7 +324,7 @@ public class ConstraintNameEditPartTN extends CompartmentEditPart implements ITe
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Constraint_2017, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.usecase.edit.parts.ConstraintNameEditPartTN.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Constraint_2017, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintNameEditPartTN.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -572,7 +572,7 @@ public class ConstraintNameEditPartTN extends CompartmentEditPart implements ITe
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/DependencyAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/DependencyAppliedStereotypeEditPart.java
index 8a3598d015c..67c3da8e885 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/DependencyAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/DependencyAppliedStereotypeEditPart.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.parts;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -51,15 +51,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editparts.ILabelRoleProvider;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -69,6 +60,15 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -124,7 +124,7 @@ public class DependencyAppliedStereotypeEditPart extends LabelEditPart implement
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.usecase.edit.parts.DependencyAppliedStereotypeEditPart.VISUAL_ID), new Point(0, -20));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.usecase.edit.parts.DependencyAppliedStereotypeEditPart.VISUAL_ID), new Point(0, -20));

 	}

 

 	/**

@@ -340,7 +340,7 @@ public class DependencyAppliedStereotypeEditPart extends LabelEditPart implement
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Dependency_4013, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.usecase.edit.parts.DependencyAppliedStereotypeEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Dependency_4013, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.usecase.edit.parts.DependencyAppliedStereotypeEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -588,7 +588,7 @@ public class DependencyAppliedStereotypeEditPart extends LabelEditPart implement
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

@@ -732,7 +732,7 @@ public class DependencyAppliedStereotypeEditPart extends LabelEditPart implement
 	 * @generated

 	 */

 	public String getIconPathRole() {

-		return "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/stereotype.gif";//$NON-NLS-1$

+		return "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/stereotype.gif";//$NON-NLS-1$

 	}

 

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/DependencyEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/DependencyEditPart.java
index 5db5f52d110..085ecdd3768 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/DependencyEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/DependencyEditPart.java
@@ -11,17 +11,17 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.parts;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

 

 import org.eclipse.draw2d.Connection;

 import org.eclipse.gef.EditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.editparts.UMLConnectionNodeEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.edge.DashedEdgeFigure;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.DependencyItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.DependencyItemSemanticEditPolicy;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/DependencyNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/DependencyNameEditPart.java
index 73a9cf1a24d..d7fa6b31e5f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/DependencyNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/DependencyNameEditPart.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.parts;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -51,15 +51,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editparts.ILabelRoleProvider;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -69,6 +60,15 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -116,7 +116,7 @@ public class DependencyNameEditPart extends LabelEditPart implements ITextAwareE
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.usecase.edit.parts.DependencyNameEditPart.VISUAL_ID), new Point(0, 40));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.usecase.edit.parts.DependencyNameEditPart.VISUAL_ID), new Point(0, 40));

 	}

 

 	/**

@@ -332,7 +332,7 @@ public class DependencyNameEditPart extends LabelEditPart implements ITextAwareE
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Dependency_4013, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.usecase.edit.parts.DependencyNameEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Dependency_4013, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.usecase.edit.parts.DependencyNameEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -581,7 +581,7 @@ public class DependencyNameEditPart extends LabelEditPart implements ITextAwareE
 	 * Returns the kind of associated editor for direct edition.

 	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see

-	 *         org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 *         org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

@@ -728,7 +728,7 @@ public class DependencyNameEditPart extends LabelEditPart implements ITextAwareE
 	 * @generated

 	 */

 	public String getIconPathRole() {

-		return "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/label_role/name.png";//$NON-NLS-1$

+		return "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/name.png";//$NON-NLS-1$

 	}

 

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/DiagramNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/DiagramNameEditPart.java
index aa7c8acf559..78537b36cc8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/DiagramNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/DiagramNameEditPart.java
@@ -11,7 +11,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.parts;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -52,16 +52,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editparts.AbstractShortcutDiagramNameEditPart;

-import org.eclipse.papyrus.diagram.common.editparts.ILabelRoleProvider;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -71,6 +61,16 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractShortcutDiagramNameEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -118,7 +118,7 @@ public class DiagramNameEditPart extends AbstractShortcutDiagramNameEditPart imp
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.usecase.edit.parts.DiagramNameEditPart.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.usecase.edit.parts.DiagramNameEditPart.VISUAL_ID), new Point(0, 0));

 	}

 

 	/**

@@ -349,7 +349,7 @@ public class DiagramNameEditPart extends AbstractShortcutDiagramNameEditPart imp
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Diagram_2019, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.usecase.edit.parts.DiagramNameEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Diagram_2019, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.usecase.edit.parts.DiagramNameEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -598,7 +598,7 @@ public class DiagramNameEditPart extends AbstractShortcutDiagramNameEditPart imp
 	 * Returns the kind of associated editor for direct edition.

 	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see

-	 *         org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 *         org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

@@ -754,7 +754,7 @@ public class DiagramNameEditPart extends AbstractShortcutDiagramNameEditPart imp
 	 * @generated

 	 */

 	public String getIconPathRole() {

-		return "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/label_role/name.png";//$NON-NLS-1$

+		return "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/name.png";//$NON-NLS-1$

 	}

 

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/ExtendAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ExtendAppliedStereotypeEditPart.java
index 1be6d9089c0..b27546d61b3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/ExtendAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ExtendAppliedStereotypeEditPart.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.parts;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -51,15 +51,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editparts.ILabelRoleProvider;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -69,6 +60,15 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -124,7 +124,7 @@ public class ExtendAppliedStereotypeEditPart extends LabelEditPart implements IT
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.usecase.edit.parts.ExtendAppliedStereotypeEditPart.VISUAL_ID), new Point(0, -20));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ExtendAppliedStereotypeEditPart.VISUAL_ID), new Point(0, -20));

 	}

 

 	/**

@@ -340,7 +340,7 @@ public class ExtendAppliedStereotypeEditPart extends LabelEditPart implements IT
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Extend_4009, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.usecase.edit.parts.ExtendAppliedStereotypeEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Extend_4009, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ExtendAppliedStereotypeEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -588,7 +588,7 @@ public class ExtendAppliedStereotypeEditPart extends LabelEditPart implements IT
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

@@ -732,7 +732,7 @@ public class ExtendAppliedStereotypeEditPart extends LabelEditPart implements IT
 	 * @generated

 	 */

 	public String getIconPathRole() {

-		return "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/stereotype.gif";//$NON-NLS-1$

+		return "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/stereotype.gif";//$NON-NLS-1$

 	}

 

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/ExtendEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ExtendEditPart.java
index 01d705ada82..f39bd3868fb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/ExtendEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ExtendEditPart.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.parts;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

 

 import org.eclipse.draw2d.ColorConstants;

 import org.eclipse.draw2d.Connection;

@@ -23,10 +23,10 @@ import org.eclipse.gef.EditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.editparts.UMLConnectionNodeEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.edge.UMLEdgeFigure;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.ExtendItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.edge.UMLEdgeFigure;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.ExtendItemSemanticEditPolicy;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/ExtendsLink_fixedEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ExtendsLink_fixedEditPart.java
index bbe12b23d93..705fb233d94 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/ExtendsLink_fixedEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ExtendsLink_fixedEditPart.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.parts;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -51,14 +51,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -68,6 +60,14 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -115,7 +115,7 @@ public class ExtendsLink_fixedEditPart extends LabelEditPart implements ITextAwa
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.usecase.edit.parts.ExtendsLink_fixedEditPart.VISUAL_ID), new Point(0, 20));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ExtendsLink_fixedEditPart.VISUAL_ID), new Point(0, 20));

 	}

 

 	/**

@@ -331,7 +331,7 @@ public class ExtendsLink_fixedEditPart extends LabelEditPart implements ITextAwa
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Extend_4009, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.usecase.edit.parts.ExtendsLink_fixedEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Extend_4009, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ExtendsLink_fixedEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -580,7 +580,7 @@ public class ExtendsLink_fixedEditPart extends LabelEditPart implements ITextAwa
 	 * Returns the kind of associated editor for direct edition.

 	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see

-	 *         org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 *         org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/ExtensionPointEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ExtensionPointEditPart.java
index d3b453cbfeb..60522414904 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/ExtensionPointEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ExtensionPointEditPart.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.parts;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -56,18 +56,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.AppliedStereotypeExtensionPointLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.ExtensionPointItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.UMLTextNonResizableEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -77,6 +65,18 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.AppliedStereotypeExtensionPointLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.ExtensionPointItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UMLTextNonResizableEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -338,7 +338,7 @@ public class ExtensionPointEditPart extends CompartmentEditPart implements IText
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.ExtensionPoint_3007, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.usecase.edit.parts.ExtensionPointEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.ExtensionPoint_3007, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ExtensionPointEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -587,7 +587,7 @@ public class ExtensionPointEditPart extends CompartmentEditPart implements IText
 	 * Returns the kind of associated editor for direct edition.

 	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see

-	 *         org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 *         org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/ExtensionPointInRectangleEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ExtensionPointInRectangleEditPart.java
index 2854a28ae25..f532aa3e0a7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/ExtensionPointInRectangleEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ExtensionPointInRectangleEditPart.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.parts;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -56,18 +56,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.AppliedStereotypeExtensionPointLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.ExtensionPointInRectangleItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.UMLTextNonResizableEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -77,6 +65,18 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.AppliedStereotypeExtensionPointLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.ExtensionPointInRectangleItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UMLTextNonResizableEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -346,7 +346,7 @@ public class ExtensionPointInRectangleEditPart extends CompartmentEditPart imple
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.ExtensionPoint_3008, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.usecase.edit.parts.ExtensionPointInRectangleEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.ExtensionPoint_3008, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ExtensionPointInRectangleEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -594,7 +594,7 @@ public class ExtensionPointInRectangleEditPart extends CompartmentEditPart imple
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/GeneralizationAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/GeneralizationAppliedStereotypeEditPart.java
index bca2679265e..8b2b7c96050 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/GeneralizationAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/GeneralizationAppliedStereotypeEditPart.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.parts;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -51,15 +51,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editparts.ILabelRoleProvider;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -69,6 +60,15 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -124,7 +124,7 @@ public class GeneralizationAppliedStereotypeEditPart extends LabelEditPart imple
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.usecase.edit.parts.GeneralizationAppliedStereotypeEditPart.VISUAL_ID), new Point(0, -20));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.usecase.edit.parts.GeneralizationAppliedStereotypeEditPart.VISUAL_ID), new Point(0, -20));

 	}

 

 	/**

@@ -340,7 +340,7 @@ public class GeneralizationAppliedStereotypeEditPart extends LabelEditPart imple
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Generalization_4010, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.usecase.edit.parts.GeneralizationAppliedStereotypeEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Generalization_4010, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.usecase.edit.parts.GeneralizationAppliedStereotypeEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -588,7 +588,7 @@ public class GeneralizationAppliedStereotypeEditPart extends LabelEditPart imple
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

@@ -732,7 +732,7 @@ public class GeneralizationAppliedStereotypeEditPart extends LabelEditPart imple
 	 * @generated

 	 */

 	public String getIconPathRole() {

-		return "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/stereotype.gif";//$NON-NLS-1$

+		return "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/stereotype.gif";//$NON-NLS-1$

 	}

 

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/GeneralizationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/GeneralizationEditPart.java
index f1f263bf631..4f956a01161 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/GeneralizationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/GeneralizationEditPart.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.parts;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

 

 import org.eclipse.draw2d.ColorConstants;

 import org.eclipse.draw2d.Connection;

@@ -22,10 +22,10 @@ import org.eclipse.gef.EditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.editparts.UMLConnectionNodeEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.edge.UMLEdgeFigure;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.GeneralizationItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.edge.UMLEdgeFigure;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.GeneralizationItemSemanticEditPolicy;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/IncludeAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/IncludeAppliedStereotypeEditPart.java
index 9a663b2ba01..5a98d30eed6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/IncludeAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/IncludeAppliedStereotypeEditPart.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.parts;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -51,15 +51,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editparts.ILabelRoleProvider;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -69,6 +60,15 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -124,7 +124,7 @@ public class IncludeAppliedStereotypeEditPart extends LabelEditPart implements I
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.usecase.edit.parts.IncludeAppliedStereotypeEditPart.VISUAL_ID), new Point(0, -20));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.usecase.edit.parts.IncludeAppliedStereotypeEditPart.VISUAL_ID), new Point(0, -20));

 	}

 

 	/**

@@ -340,7 +340,7 @@ public class IncludeAppliedStereotypeEditPart extends LabelEditPart implements I
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Include_4008, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.usecase.edit.parts.IncludeAppliedStereotypeEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Include_4008, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.usecase.edit.parts.IncludeAppliedStereotypeEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -588,7 +588,7 @@ public class IncludeAppliedStereotypeEditPart extends LabelEditPart implements I
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

@@ -732,7 +732,7 @@ public class IncludeAppliedStereotypeEditPart extends LabelEditPart implements I
 	 * @generated

 	 */

 	public String getIconPathRole() {

-		return "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/stereotype.gif";//$NON-NLS-1$

+		return "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/stereotype.gif";//$NON-NLS-1$

 	}

 

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/IncludeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/IncludeEditPart.java
index 60530c63384..3651e62036b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/IncludeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/IncludeEditPart.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.parts;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

 

 import org.eclipse.draw2d.ColorConstants;

 import org.eclipse.draw2d.Connection;

@@ -23,10 +23,10 @@ import org.eclipse.gef.EditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.editparts.UMLConnectionNodeEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.edge.UMLEdgeFigure;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.IncludeItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.edge.UMLEdgeFigure;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.IncludeItemSemanticEditPolicy;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/IncludeLink_fixedEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/IncludeLink_fixedEditPart.java
index 084e43af8bf..de11d87a23f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/IncludeLink_fixedEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/IncludeLink_fixedEditPart.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.parts;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -51,14 +51,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -68,6 +60,14 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -115,7 +115,7 @@ public class IncludeLink_fixedEditPart extends LabelEditPart implements ITextAwa
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.usecase.edit.parts.IncludeLink_fixedEditPart.VISUAL_ID), new Point(0, 20));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.usecase.edit.parts.IncludeLink_fixedEditPart.VISUAL_ID), new Point(0, 20));

 	}

 

 	/**

@@ -331,7 +331,7 @@ public class IncludeLink_fixedEditPart extends LabelEditPart implements ITextAwa
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Include_4008, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.usecase.edit.parts.IncludeLink_fixedEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Include_4008, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.usecase.edit.parts.IncludeLink_fixedEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -580,7 +580,7 @@ public class IncludeLink_fixedEditPart extends LabelEditPart implements ITextAwa
 	 * Returns the kind of associated editor for direct edition.

 	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see

-	 *         org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 *         org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/PackageEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/PackageEditPartCN.java
index 3c82640edf9..3758003c2e3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/PackageEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/PackageEditPartCN.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.parts;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

 

 import java.util.ArrayList;

 import java.util.LinkedList;

@@ -40,21 +40,21 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.common.editparts.NamedElementEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.PackageFigure;

-import org.eclipse.papyrus.diagram.common.figure.node.PackageNodePlateFigure;

-import org.eclipse.papyrus.diagram.common.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.OpenDiagramEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.PackageItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.diagram.usecase.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.usecase.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.PackageFigure;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.PackageNodePlateFigure;

+import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.OpenDiagramEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.PackageItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

 import org.eclipse.swt.graphics.Color;

 

 /**

@@ -370,7 +370,7 @@ NamedElementEditPart {
 		if(targetEditPart instanceof ComponentInPackageEditPart) {

 			types.add(UMLElementTypes.Dependency_4013);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.PackageEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageEditPartCN) {

 			types.add(UMLElementTypes.Dependency_4013);

 		}

 		if(targetEditPart instanceof ActorEditPartTN) {

@@ -418,7 +418,7 @@ NamedElementEditPart {
 		if(targetEditPart instanceof ComponentInPackageEditPart) {

 			types.add(UMLElementTypes.Abstraction_4015);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.PackageEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageEditPartCN) {

 			types.add(UMLElementTypes.Abstraction_4015);

 		}

 		if(targetEditPart instanceof ActorEditPartTN) {

@@ -466,7 +466,7 @@ NamedElementEditPart {
 		if(targetEditPart instanceof ComponentInPackageEditPart) {

 			types.add(UMLElementTypes.Usage_4016);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.PackageEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageEditPartCN) {

 			types.add(UMLElementTypes.Usage_4016);

 		}

 		if(targetEditPart instanceof ActorEditPartTN) {

@@ -514,19 +514,19 @@ NamedElementEditPart {
 		if(targetEditPart instanceof ComponentInPackageEditPart) {

 			types.add(UMLElementTypes.Realization_4017);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.PackageEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageEditPartCN) {

 			types.add(UMLElementTypes.Realization_4017);

 		}

 		if(targetEditPart instanceof PackageEditPartTN) {

 			types.add(UMLElementTypes.PackageMerge_4018);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.PackageEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageEditPartCN) {

 			types.add(UMLElementTypes.PackageMerge_4018);

 		}

 		if(targetEditPart instanceof PackageEditPartTN) {

 			types.add(UMLElementTypes.PackageImport_4019);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.PackageEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageEditPartCN) {

 			types.add(UMLElementTypes.PackageImport_4019);

 		}

 		return types;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/PackageEditPartTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/PackageEditPartTN.java
index efd2a549646..3dd82c06a5f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/PackageEditPartTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/PackageEditPartTN.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.parts;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

 

 import java.util.ArrayList;

 import java.util.LinkedList;

@@ -40,21 +40,21 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.common.editparts.NamedElementEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.PackageFigure;

-import org.eclipse.papyrus.diagram.common.figure.node.PackageNodePlateFigure;

-import org.eclipse.papyrus.diagram.common.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.OpenDiagramEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.PackageItemSemanticEditPolicyTN;

-import org.eclipse.papyrus.diagram.usecase.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.usecase.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.PackageFigure;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.PackageNodePlateFigure;

+import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.OpenDiagramEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.PackageItemSemanticEditPolicyTN;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

 import org.eclipse.swt.graphics.Color;

 

 /**

@@ -339,7 +339,7 @@ public class PackageEditPartTN extends NamedElementEditPart {
 		if(targetEditPart instanceof ComponentEditPartTN) {

 			types.add(UMLElementTypes.Dependency_4013);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.PackageEditPartTN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageEditPartTN) {

 			types.add(UMLElementTypes.Dependency_4013);

 		}

 		if(targetEditPart instanceof ConstraintEditPartTN) {

@@ -387,7 +387,7 @@ public class PackageEditPartTN extends NamedElementEditPart {
 		if(targetEditPart instanceof ComponentEditPartTN) {

 			types.add(UMLElementTypes.Abstraction_4015);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.PackageEditPartTN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageEditPartTN) {

 			types.add(UMLElementTypes.Abstraction_4015);

 		}

 		if(targetEditPart instanceof ConstraintEditPartTN) {

@@ -435,7 +435,7 @@ public class PackageEditPartTN extends NamedElementEditPart {
 		if(targetEditPart instanceof ComponentEditPartTN) {

 			types.add(UMLElementTypes.Usage_4016);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.PackageEditPartTN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageEditPartTN) {

 			types.add(UMLElementTypes.Usage_4016);

 		}

 		if(targetEditPart instanceof ConstraintEditPartTN) {

@@ -483,7 +483,7 @@ public class PackageEditPartTN extends NamedElementEditPart {
 		if(targetEditPart instanceof ComponentEditPartTN) {

 			types.add(UMLElementTypes.Realization_4017);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.PackageEditPartTN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageEditPartTN) {

 			types.add(UMLElementTypes.Realization_4017);

 		}

 		if(targetEditPart instanceof ConstraintEditPartTN) {

@@ -516,13 +516,13 @@ public class PackageEditPartTN extends NamedElementEditPart {
 		if(targetEditPart instanceof PackageEditPartCN) {

 			types.add(UMLElementTypes.Realization_4017);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.PackageEditPartTN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageEditPartTN) {

 			types.add(UMLElementTypes.PackageMerge_4018);

 		}

 		if(targetEditPart instanceof PackageEditPartCN) {

 			types.add(UMLElementTypes.PackageMerge_4018);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.PackageEditPartTN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageEditPartTN) {

 			types.add(UMLElementTypes.PackageImport_4019);

 		}

 		if(targetEditPart instanceof PackageEditPartCN) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/PackageImportAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/PackageImportAppliedStereotypeEditPart.java
index b2877315f93..e9b01cf707b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/PackageImportAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/PackageImportAppliedStereotypeEditPart.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.parts;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -51,15 +51,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editparts.ILabelRoleProvider;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -69,6 +60,15 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -124,7 +124,7 @@ public class PackageImportAppliedStereotypeEditPart extends LabelEditPart implem
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.usecase.edit.parts.PackageImportAppliedStereotypeEditPart.VISUAL_ID), new Point(0, -20));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageImportAppliedStereotypeEditPart.VISUAL_ID), new Point(0, -20));

 	}

 

 	/**

@@ -340,7 +340,7 @@ public class PackageImportAppliedStereotypeEditPart extends LabelEditPart implem
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.PackageImport_4019, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.usecase.edit.parts.PackageImportAppliedStereotypeEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.PackageImport_4019, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageImportAppliedStereotypeEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -588,7 +588,7 @@ public class PackageImportAppliedStereotypeEditPart extends LabelEditPart implem
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

@@ -732,7 +732,7 @@ public class PackageImportAppliedStereotypeEditPart extends LabelEditPart implem
 	 * @generated

 	 */

 	public String getIconPathRole() {

-		return "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/stereotype.gif";//$NON-NLS-1$

+		return "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/stereotype.gif";//$NON-NLS-1$

 	}

 

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/PackageImportEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/PackageImportEditPart.java
index 3de08342e91..ed8a1234fc0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/PackageImportEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/PackageImportEditPart.java
@@ -11,18 +11,18 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.parts;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

 

 import org.eclipse.draw2d.Connection;

 import org.eclipse.gef.EditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.editparts.UMLConnectionNodeEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypePackageImportLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.edge.DashedEdgeFigure;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.PackageImportItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypePackageImportLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.PackageImportItemSemanticEditPolicy;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/PackageMergeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/PackageMergeEditPart.java
index 76b4c0c7bcf..f581b097321 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/PackageMergeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/PackageMergeEditPart.java
@@ -11,18 +11,18 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.parts;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

 

 import org.eclipse.draw2d.Connection;

 import org.eclipse.gef.EditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.editparts.UMLConnectionNodeEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypePackageMergeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.edge.DashedEdgeFigure;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.PackageMergeItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypePackageMergeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.PackageMergeItemSemanticEditPolicy;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/PackageNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/PackageNameEditPartCN.java
index 1f600f3c124..95028411876 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/PackageNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/PackageNameEditPartCN.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.parts;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -51,15 +51,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.common.util.DiagramEditPartsUtil;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -69,8 +60,17 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

-import org.eclipse.papyrus.umlutils.ui.VisualInformationPapyrusConstant;

-import org.eclipse.papyrus.umlutils.ui.helper.NameLabelIconHelper;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.tools.utils.ui.VisualInformationPapyrusConstant;

+import org.eclipse.papyrus.uml.tools.utils.ui.helper.NameLabelIconHelper;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -332,7 +332,7 @@ public class PackageNameEditPartCN extends CompartmentEditPart implements ITextA
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Package_3014, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.usecase.edit.parts.PackageNameEditPartCN.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Package_3014, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageNameEditPartCN.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -581,7 +581,7 @@ public class PackageNameEditPartCN extends CompartmentEditPart implements ITextA
 	 * Returns the kind of associated editor for direct edition.

 	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see

-	 *         org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 *         org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/PackageNameEditPartTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/PackageNameEditPartTN.java
index 33c0e077d3b..8d4551b7029 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/PackageNameEditPartTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/PackageNameEditPartTN.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.parts;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -51,15 +51,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.common.util.DiagramEditPartsUtil;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -69,8 +60,17 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

-import org.eclipse.papyrus.umlutils.ui.VisualInformationPapyrusConstant;

-import org.eclipse.papyrus.umlutils.ui.helper.NameLabelIconHelper;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.tools.utils.ui.VisualInformationPapyrusConstant;

+import org.eclipse.papyrus.uml.tools.utils.ui.helper.NameLabelIconHelper;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -332,7 +332,7 @@ public class PackageNameEditPartTN extends CompartmentEditPart implements ITextA
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Package_2016, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.usecase.edit.parts.PackageNameEditPartTN.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Package_2016, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageNameEditPartTN.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -581,7 +581,7 @@ public class PackageNameEditPartTN extends CompartmentEditPart implements ITextA
 	 * Returns the kind of associated editor for direct edition.

 	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see

-	 *         org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 *         org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/PackagePackageableElementCompartment2EditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/PackagePackageableElementCompartment2EditPart.java
index def730c49c9..4ee2d4e9bd1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/PackagePackageableElementCompartment2EditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/PackagePackageableElementCompartment2EditPart.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.parts;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

 

 import org.eclipse.draw2d.IFigure;

 import org.eclipse.draw2d.geometry.Dimension;

@@ -28,11 +28,11 @@ import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.editpolicies.CustomContainerEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.DuplicatePasteEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.CustomDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.PackagePackageableElementCompartment2ItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.part.Messages;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.PackagePackageableElementCompartment2ItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.part.Messages;

 

 /**

  * @generated

@@ -78,7 +78,7 @@ public class PackagePackageableElementCompartment2EditPart extends ShapeCompartm
 		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

 

 		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.diagram.usecase.edit.policies.PackagePackageableElementCompartment2CanonicalEditPolicy());

+		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.usecase.edit.policies.PackagePackageableElementCompartment2CanonicalEditPolicy());

 

 		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/PackagePackageableElementCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/PackagePackageableElementCompartmentEditPart.java
index 0ae92ac0b42..cf21e0e4ecc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/PackagePackageableElementCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/PackagePackageableElementCompartmentEditPart.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.parts;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

 

 import org.eclipse.draw2d.IFigure;

 import org.eclipse.draw2d.geometry.Dimension;

@@ -28,11 +28,11 @@ import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.editpolicies.CustomContainerEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.DuplicatePasteEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.CustomDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.PackagePackageableElementCompartmentItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.part.Messages;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.PackagePackageableElementCompartmentItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.part.Messages;

 

 /**

  * @generated

@@ -78,7 +78,7 @@ public class PackagePackageableElementCompartmentEditPart extends ShapeCompartme
 		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

 

 		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.diagram.usecase.edit.policies.PackagePackageableElementCompartmentCanonicalEditPolicy());

+		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.usecase.edit.policies.PackagePackageableElementCompartmentCanonicalEditPolicy());

 

 		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/RealizationAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/RealizationAppliedStereotypeEditPart.java
index 41beabe476c..f697c929f9c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/RealizationAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/RealizationAppliedStereotypeEditPart.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.parts;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -51,15 +51,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editparts.ILabelRoleProvider;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -69,6 +60,15 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -124,7 +124,7 @@ public class RealizationAppliedStereotypeEditPart extends LabelEditPart implemen
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.usecase.edit.parts.RealizationAppliedStereotypeEditPart.VISUAL_ID), new Point(0, -20));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.usecase.edit.parts.RealizationAppliedStereotypeEditPart.VISUAL_ID), new Point(0, -20));

 	}

 

 	/**

@@ -340,7 +340,7 @@ public class RealizationAppliedStereotypeEditPart extends LabelEditPart implemen
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Realization_4017, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.usecase.edit.parts.RealizationAppliedStereotypeEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Realization_4017, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.usecase.edit.parts.RealizationAppliedStereotypeEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -588,7 +588,7 @@ public class RealizationAppliedStereotypeEditPart extends LabelEditPart implemen
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

@@ -732,7 +732,7 @@ public class RealizationAppliedStereotypeEditPart extends LabelEditPart implemen
 	 * @generated

 	 */

 	public String getIconPathRole() {

-		return "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/stereotype.gif";//$NON-NLS-1$

+		return "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/stereotype.gif";//$NON-NLS-1$

 	}

 

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/RealizationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/RealizationEditPart.java
index da12c70c41a..50f994a69e7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/RealizationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/RealizationEditPart.java
@@ -11,17 +11,17 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.parts;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

 

 import org.eclipse.draw2d.Connection;

 import org.eclipse.gef.EditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.editparts.UMLConnectionNodeEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.edge.InterfaceRealizationFigure;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.RealizationItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.edge.InterfaceRealizationFigure;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.RealizationItemSemanticEditPolicy;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/RealizationNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/RealizationNameEditPart.java
index b7e499d7aef..2068ca954e0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/RealizationNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/RealizationNameEditPart.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.parts;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -51,15 +51,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editparts.ILabelRoleProvider;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -69,6 +60,15 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -116,7 +116,7 @@ public class RealizationNameEditPart extends LabelEditPart implements ITextAware
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.usecase.edit.parts.RealizationNameEditPart.VISUAL_ID), new Point(0, 40));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.usecase.edit.parts.RealizationNameEditPart.VISUAL_ID), new Point(0, 40));

 	}

 

 	/**

@@ -332,7 +332,7 @@ public class RealizationNameEditPart extends LabelEditPart implements ITextAware
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Realization_4017, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.usecase.edit.parts.RealizationNameEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Realization_4017, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.usecase.edit.parts.RealizationNameEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -581,7 +581,7 @@ public class RealizationNameEditPart extends LabelEditPart implements ITextAware
 	 * Returns the kind of associated editor for direct edition.

 	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see

-	 *         org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 *         org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

@@ -728,7 +728,7 @@ public class RealizationNameEditPart extends LabelEditPart implements ITextAware
 	 * @generated

 	 */

 	public String getIconPathRole() {

-		return "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/label_role/name.png";//$NON-NLS-1$

+		return "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/name.png";//$NON-NLS-1$

 	}

 

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/ShortCutDiagramEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ShortCutDiagramEditPart.java
index dea6d3e3fdf..bec80320b0e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/ShortCutDiagramEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ShortCutDiagramEditPart.java
@@ -11,7 +11,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.parts;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -51,15 +51,15 @@ import org.eclipse.papyrus.core.editorsfactory.IPageIconsRegistry;
 import org.eclipse.papyrus.core.editorsfactory.PageIconsRegistry;

 import org.eclipse.papyrus.core.services.ServiceException;

 import org.eclipse.papyrus.core.utils.EditorUtils;

-import org.eclipse.papyrus.diagram.common.editparts.AbstractShortCutDiagramEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.ShortCutDiagramEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.DiagramNodeFigure;

-import org.eclipse.papyrus.diagram.common.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.ShortCutDiagramItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.usecase.part.UMLVisualIDRegistry;

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractShortCutDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShortCutDiagramEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.DiagramNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.ShortCutDiagramItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;

 import org.eclipse.swt.graphics.Color;

 import org.eclipse.swt.graphics.Image;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/UMLEditPartFactory.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UMLEditPartFactory.java
index 46937175e34..16c2b4a65aa 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/UMLEditPartFactory.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UMLEditPartFactory.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.parts;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

 

 import org.eclipse.draw2d.FigureUtilities;

 import org.eclipse.draw2d.Label;

@@ -24,8 +24,8 @@ import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.viewers.CellEditor;

-import org.eclipse.papyrus.diagram.common.figure.node.IMultilineEditableFigure;

-import org.eclipse.papyrus.diagram.usecase.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.IMultilineEditableFigure;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.widgets.Text;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/UsageEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UsageEditPart.java
index ddd65e9140f..c7653f04671 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/UsageEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UsageEditPart.java
@@ -11,18 +11,18 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.parts;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

 

 import org.eclipse.draw2d.Connection;

 import org.eclipse.gef.EditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.editparts.UMLConnectionNodeEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeUsageLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.edge.DashedEdgeFigure;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.UsageItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeUsageLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UsageItemSemanticEditPolicy;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/UsageNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UsageNameEditPart.java
index 04d8bea04c0..742a727f16a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/UsageNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UsageNameEditPart.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.parts;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -51,15 +51,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editparts.ILabelRoleProvider;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -69,6 +60,15 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLParserProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -116,7 +116,7 @@ public class UsageNameEditPart extends LabelEditPart implements ITextAwareEditPa
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.usecase.edit.parts.UsageNameEditPart.VISUAL_ID), new Point(0, 40));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UsageNameEditPart.VISUAL_ID), new Point(0, 40));

 	}

 

 	/**

@@ -332,7 +332,7 @@ public class UsageNameEditPart extends LabelEditPart implements ITextAwareEditPa
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Usage_4016, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.usecase.edit.parts.UsageNameEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Usage_4016, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UsageNameEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -581,7 +581,7 @@ public class UsageNameEditPart extends LabelEditPart implements ITextAwareEditPa
 	 * Returns the kind of associated editor for direct edition.

 	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see

-	 *         org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 *         org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

@@ -728,7 +728,7 @@ public class UsageNameEditPart extends LabelEditPart implements ITextAwareEditPa
 	 * @generated

 	 */

 	public String getIconPathRole() {

-		return "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/label_role/name.png";//$NON-NLS-1$

+		return "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/name.png";//$NON-NLS-1$

 	}

 

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/UseCaseAsRectangleEditPartTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UseCaseAsRectangleEditPartTN.java
index bfdf236bdd8..a4011c35385 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/UseCaseAsRectangleEditPartTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UseCaseAsRectangleEditPartTN.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.parts;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

 

 import java.util.ArrayList;

 import java.util.LinkedList;

@@ -47,17 +47,17 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.common.draw2d.CenterLayout;

-import org.eclipse.papyrus.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

-import org.eclipse.papyrus.diagram.common.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.UseCaseAsRectangleItemSemanticEditPolicyTN;

-import org.eclipse.papyrus.diagram.usecase.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.usecase.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.common.draw2d.CenterLayout;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UseCaseAsRectangleItemSemanticEditPolicyTN;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.graphics.Color;

 import org.eclipse.swt.graphics.Font;

@@ -320,7 +320,7 @@ ShapeNodeEditPart {
 		if(targetEditPart instanceof UseCaseEditPartTN) {

 			types.add(UMLElementTypes.Include_4008);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseAsRectangleEditPartTN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseAsRectangleEditPartTN) {

 			types.add(UMLElementTypes.Include_4008);

 		}

 		if(targetEditPart instanceof UseCaseInComponentEditPart) {

@@ -332,7 +332,7 @@ ShapeNodeEditPart {
 		if(targetEditPart instanceof UseCaseEditPartTN) {

 			types.add(UMLElementTypes.Extend_4009);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseAsRectangleEditPartTN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseAsRectangleEditPartTN) {

 			types.add(UMLElementTypes.Extend_4009);

 		}

 		if(targetEditPart instanceof UseCaseInComponentEditPart) {

@@ -350,7 +350,7 @@ ShapeNodeEditPart {
 		if(targetEditPart instanceof UseCaseEditPartTN) {

 			types.add(UMLElementTypes.Generalization_4010);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseAsRectangleEditPartTN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseAsRectangleEditPartTN) {

 			types.add(UMLElementTypes.Generalization_4010);

 		}

 		if(targetEditPart instanceof ComponentEditPartTN) {

@@ -383,7 +383,7 @@ ShapeNodeEditPart {
 		if(targetEditPart instanceof UseCaseEditPartTN) {

 			types.add(UMLElementTypes.Association_4011);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseAsRectangleEditPartTN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseAsRectangleEditPartTN) {

 			types.add(UMLElementTypes.Association_4011);

 		}

 		if(targetEditPart instanceof ComponentEditPartTN) {

@@ -416,7 +416,7 @@ ShapeNodeEditPart {
 		if(targetEditPart instanceof UseCaseEditPartTN) {

 			types.add(UMLElementTypes.Dependency_4013);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseAsRectangleEditPartTN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseAsRectangleEditPartTN) {

 			types.add(UMLElementTypes.Dependency_4013);

 		}

 		if(targetEditPart instanceof ComponentEditPartTN) {

@@ -464,7 +464,7 @@ ShapeNodeEditPart {
 		if(targetEditPart instanceof UseCaseEditPartTN) {

 			types.add(UMLElementTypes.Abstraction_4015);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseAsRectangleEditPartTN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseAsRectangleEditPartTN) {

 			types.add(UMLElementTypes.Abstraction_4015);

 		}

 		if(targetEditPart instanceof ComponentEditPartTN) {

@@ -512,7 +512,7 @@ ShapeNodeEditPart {
 		if(targetEditPart instanceof UseCaseEditPartTN) {

 			types.add(UMLElementTypes.Usage_4016);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseAsRectangleEditPartTN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseAsRectangleEditPartTN) {

 			types.add(UMLElementTypes.Usage_4016);

 		}

 		if(targetEditPart instanceof ComponentEditPartTN) {

@@ -560,7 +560,7 @@ ShapeNodeEditPart {
 		if(targetEditPart instanceof UseCaseEditPartTN) {

 			types.add(UMLElementTypes.Realization_4017);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseAsRectangleEditPartTN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseAsRectangleEditPartTN) {

 			types.add(UMLElementTypes.Realization_4017);

 		}

 		if(targetEditPart instanceof ComponentEditPartTN) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/UseCaseAsRectangleNameEditPartTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UseCaseAsRectangleNameEditPartTN.java
index 97bbb12b36a..83d571654ef 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/UseCaseAsRectangleNameEditPartTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UseCaseAsRectangleNameEditPartTN.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.parts;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -51,15 +51,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.common.util.DiagramEditPartsUtil;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -69,8 +60,17 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

-import org.eclipse.papyrus.umlutils.ui.VisualInformationPapyrusConstant;

-import org.eclipse.papyrus.umlutils.ui.helper.NameLabelIconHelper;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.tools.utils.ui.VisualInformationPapyrusConstant;

+import org.eclipse.papyrus.uml.tools.utils.ui.helper.NameLabelIconHelper;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -340,7 +340,7 @@ public class UseCaseAsRectangleNameEditPartTN extends CompartmentEditPart implem
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.UseCase_2014, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseAsRectangleNameEditPartTN.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.UseCase_2014, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseAsRectangleNameEditPartTN.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -588,7 +588,7 @@ public class UseCaseAsRectangleNameEditPartTN extends CompartmentEditPart implem
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/UseCaseDiagramEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UseCaseDiagramEditPart.java
index 2d45c8f1d49..cf032934432 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/UseCaseDiagramEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UseCaseDiagramEditPart.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.parts;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -27,12 +27,12 @@ import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.NonResizableLabelEditPolicy;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.editpolicies.DuplicatePasteEditPolicy;

-import org.eclipse.papyrus.diagram.common.providers.ViewInfo;

-import org.eclipse.papyrus.diagram.common.util.MDTUtil;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.CustomDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.UseCaseDiagramItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.providers.ViewInfo;

+import org.eclipse.papyrus.uml.diagram.common.util.MDTUtil;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UseCaseDiagramItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;

 

 /**

  * @generated

@@ -66,7 +66,7 @@ public class UseCaseDiagramEditPart extends DiagramEditPart {
 		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new UseCaseDiagramItemSemanticEditPolicy());

 

 		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.diagram.usecase.edit.policies.UseCaseDiagramCanonicalEditPolicy());

+		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UseCaseDiagramCanonicalEditPolicy());

 

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

 		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.POPUPBAR_ROLE);

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/UseCaseEditPartTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UseCaseEditPartTN.java
index 08fd08e8cb8..5f54b0b3cd0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/UseCaseEditPartTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UseCaseEditPartTN.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.parts;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

 

 import java.util.ArrayList;

 import java.util.LinkedList;

@@ -42,19 +42,19 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.common.editparts.IPapyrusEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.CreateExtensionPointEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.UseCaseItemSemanticEditPolicyTN;

-import org.eclipse.papyrus.diagram.usecase.figure.UseCaseFigure;

-import org.eclipse.papyrus.diagram.usecase.figure.UseCaseNodeFigure;

-import org.eclipse.papyrus.diagram.usecase.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.common.editparts.IPapyrusEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.CreateExtensionPointEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UseCaseItemSemanticEditPolicyTN;

+import org.eclipse.papyrus.uml.diagram.usecase.figure.UseCaseFigure;

+import org.eclipse.papyrus.uml.diagram.usecase.figure.UseCaseNodeFigure;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

 import org.eclipse.swt.graphics.Color;

 

 /**

@@ -317,7 +317,7 @@ ShapeNodeEditPart implements IPapyrusEditPart {
 	 */

 	public List<IElementType> getMARelTypesOnSourceAndTarget(IGraphicalEditPart targetEditPart) {

 		LinkedList<IElementType> types = new LinkedList<IElementType>();

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseEditPartTN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseEditPartTN) {

 			types.add(UMLElementTypes.Include_4008);

 		}

 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {

@@ -329,7 +329,7 @@ ShapeNodeEditPart implements IPapyrusEditPart {
 		if(targetEditPart instanceof UseCaseInPackageEditPart) {

 			types.add(UMLElementTypes.Include_4008);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseEditPartTN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseEditPartTN) {

 			types.add(UMLElementTypes.Extend_4009);

 		}

 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {

@@ -347,7 +347,7 @@ ShapeNodeEditPart implements IPapyrusEditPart {
 		if(targetEditPart instanceof ActorAsRectangleEditPartTN) {

 			types.add(UMLElementTypes.Generalization_4010);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseEditPartTN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseEditPartTN) {

 			types.add(UMLElementTypes.Generalization_4010);

 		}

 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {

@@ -380,7 +380,7 @@ ShapeNodeEditPart implements IPapyrusEditPart {
 		if(targetEditPart instanceof ActorAsRectangleEditPartTN) {

 			types.add(UMLElementTypes.Association_4011);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseEditPartTN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseEditPartTN) {

 			types.add(UMLElementTypes.Association_4011);

 		}

 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {

@@ -413,7 +413,7 @@ ShapeNodeEditPart implements IPapyrusEditPart {
 		if(targetEditPart instanceof ActorAsRectangleEditPartTN) {

 			types.add(UMLElementTypes.Dependency_4013);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseEditPartTN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseEditPartTN) {

 			types.add(UMLElementTypes.Dependency_4013);

 		}

 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {

@@ -461,7 +461,7 @@ ShapeNodeEditPart implements IPapyrusEditPart {
 		if(targetEditPart instanceof ActorAsRectangleEditPartTN) {

 			types.add(UMLElementTypes.Abstraction_4015);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseEditPartTN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseEditPartTN) {

 			types.add(UMLElementTypes.Abstraction_4015);

 		}

 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {

@@ -509,7 +509,7 @@ ShapeNodeEditPart implements IPapyrusEditPart {
 		if(targetEditPart instanceof ActorAsRectangleEditPartTN) {

 			types.add(UMLElementTypes.Usage_4016);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseEditPartTN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseEditPartTN) {

 			types.add(UMLElementTypes.Usage_4016);

 		}

 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {

@@ -557,7 +557,7 @@ ShapeNodeEditPart implements IPapyrusEditPart {
 		if(targetEditPart instanceof ActorAsRectangleEditPartTN) {

 			types.add(UMLElementTypes.Realization_4017);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseEditPartTN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseEditPartTN) {

 			types.add(UMLElementTypes.Realization_4017);

 		}

 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/UseCaseInComponentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UseCaseInComponentEditPart.java
index 176c3af6391..63e20e335a6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/UseCaseInComponentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UseCaseInComponentEditPart.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.parts;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

 

 import java.util.ArrayList;

 import java.util.LinkedList;

@@ -42,19 +42,19 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.common.editparts.IPapyrusEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.CreateExtensionPointEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.UseCaseInComponentItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.figure.UseCaseFigure;

-import org.eclipse.papyrus.diagram.usecase.figure.UseCaseNodeFigure;

-import org.eclipse.papyrus.diagram.usecase.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.common.editparts.IPapyrusEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.CreateExtensionPointEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UseCaseInComponentItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.figure.UseCaseFigure;

+import org.eclipse.papyrus.uml.diagram.usecase.figure.UseCaseNodeFigure;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

 import org.eclipse.swt.graphics.Color;

 

 /**

@@ -323,7 +323,7 @@ ShapeNodeEditPart implements IPapyrusEditPart {
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {

 			types.add(UMLElementTypes.Include_4008);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseInComponentEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseInComponentEditPart) {

 			types.add(UMLElementTypes.Include_4008);

 		}

 		if(targetEditPart instanceof UseCaseInPackageEditPart) {

@@ -335,7 +335,7 @@ ShapeNodeEditPart implements IPapyrusEditPart {
 		if(targetEditPart instanceof UseCaseAsRectangleEditPartTN) {

 			types.add(UMLElementTypes.Extend_4009);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseInComponentEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseInComponentEditPart) {

 			types.add(UMLElementTypes.Extend_4009);

 		}

 		if(targetEditPart instanceof UseCaseInPackageEditPart) {

@@ -356,7 +356,7 @@ ShapeNodeEditPart implements IPapyrusEditPart {
 		if(targetEditPart instanceof ComponentEditPartTN) {

 			types.add(UMLElementTypes.Generalization_4010);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseInComponentEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseInComponentEditPart) {

 			types.add(UMLElementTypes.Generalization_4010);

 		}

 		if(targetEditPart instanceof ComponentInComponentEditPart) {

@@ -389,7 +389,7 @@ ShapeNodeEditPart implements IPapyrusEditPart {
 		if(targetEditPart instanceof ComponentEditPartTN) {

 			types.add(UMLElementTypes.Association_4011);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseInComponentEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseInComponentEditPart) {

 			types.add(UMLElementTypes.Association_4011);

 		}

 		if(targetEditPart instanceof ComponentInComponentEditPart) {

@@ -428,7 +428,7 @@ ShapeNodeEditPart implements IPapyrusEditPart {
 		if(targetEditPart instanceof ConstraintEditPartTN) {

 			types.add(UMLElementTypes.Dependency_4013);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseInComponentEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseInComponentEditPart) {

 			types.add(UMLElementTypes.Dependency_4013);

 		}

 		if(targetEditPart instanceof ComponentInComponentEditPart) {

@@ -476,7 +476,7 @@ ShapeNodeEditPart implements IPapyrusEditPart {
 		if(targetEditPart instanceof ConstraintEditPartTN) {

 			types.add(UMLElementTypes.Abstraction_4015);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseInComponentEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseInComponentEditPart) {

 			types.add(UMLElementTypes.Abstraction_4015);

 		}

 		if(targetEditPart instanceof ComponentInComponentEditPart) {

@@ -524,7 +524,7 @@ ShapeNodeEditPart implements IPapyrusEditPart {
 		if(targetEditPart instanceof ConstraintEditPartTN) {

 			types.add(UMLElementTypes.Usage_4016);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseInComponentEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseInComponentEditPart) {

 			types.add(UMLElementTypes.Usage_4016);

 		}

 		if(targetEditPart instanceof ComponentInComponentEditPart) {

@@ -572,7 +572,7 @@ ShapeNodeEditPart implements IPapyrusEditPart {
 		if(targetEditPart instanceof ConstraintEditPartTN) {

 			types.add(UMLElementTypes.Realization_4017);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseInComponentEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseInComponentEditPart) {

 			types.add(UMLElementTypes.Realization_4017);

 		}

 		if(targetEditPart instanceof ComponentInComponentEditPart) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/UseCaseInComponentNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UseCaseInComponentNameEditPart.java
index b6114250738..9bf3dfff6d5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/UseCaseInComponentNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UseCaseInComponentNameEditPart.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.parts;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -51,15 +51,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.common.util.DiagramEditPartsUtil;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -69,8 +60,17 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

-import org.eclipse.papyrus.umlutils.ui.VisualInformationPapyrusConstant;

-import org.eclipse.papyrus.umlutils.ui.helper.NameLabelIconHelper;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.tools.utils.ui.VisualInformationPapyrusConstant;

+import org.eclipse.papyrus.uml.tools.utils.ui.helper.NameLabelIconHelper;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -340,7 +340,7 @@ public class UseCaseInComponentNameEditPart extends CompartmentEditPart implemen
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.UseCase_3009, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseInComponentNameEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.UseCase_3009, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseInComponentNameEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -588,7 +588,7 @@ public class UseCaseInComponentNameEditPart extends CompartmentEditPart implemen
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/UseCaseInPackageEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UseCaseInPackageEditPart.java
index 9906424fd3b..f448848a4fc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/UseCaseInPackageEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UseCaseInPackageEditPart.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.parts;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

 

 import java.util.ArrayList;

 import java.util.LinkedList;

@@ -42,19 +42,19 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.common.editparts.IPapyrusEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.CreateExtensionPointEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.UseCaseInPackageItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.figure.UseCaseFigure;

-import org.eclipse.papyrus.diagram.usecase.figure.UseCaseNodeFigure;

-import org.eclipse.papyrus.diagram.usecase.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.common.editparts.IPapyrusEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.CreateExtensionPointEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UseCaseInPackageItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.figure.UseCaseFigure;

+import org.eclipse.papyrus.uml.diagram.usecase.figure.UseCaseNodeFigure;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

 import org.eclipse.swt.graphics.Color;

 

 /**

@@ -326,7 +326,7 @@ ShapeNodeEditPart implements IPapyrusEditPart {
 		if(targetEditPart instanceof UseCaseInComponentEditPart) {

 			types.add(UMLElementTypes.Include_4008);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseInPackageEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseInPackageEditPart) {

 			types.add(UMLElementTypes.Include_4008);

 		}

 		if(targetEditPart instanceof UseCaseEditPartTN) {

@@ -338,7 +338,7 @@ ShapeNodeEditPart implements IPapyrusEditPart {
 		if(targetEditPart instanceof UseCaseInComponentEditPart) {

 			types.add(UMLElementTypes.Extend_4009);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseInPackageEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseInPackageEditPart) {

 			types.add(UMLElementTypes.Extend_4009);

 		}

 		if(targetEditPart instanceof ActorEditPartTN) {

@@ -368,7 +368,7 @@ ShapeNodeEditPart implements IPapyrusEditPart {
 		if(targetEditPart instanceof ActorInPackageEditPart) {

 			types.add(UMLElementTypes.Generalization_4010);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseInPackageEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseInPackageEditPart) {

 			types.add(UMLElementTypes.Generalization_4010);

 		}

 		if(targetEditPart instanceof ComponentInPackageEditPart) {

@@ -401,7 +401,7 @@ ShapeNodeEditPart implements IPapyrusEditPart {
 		if(targetEditPart instanceof ActorInPackageEditPart) {

 			types.add(UMLElementTypes.Association_4011);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseInPackageEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseInPackageEditPart) {

 			types.add(UMLElementTypes.Association_4011);

 		}

 		if(targetEditPart instanceof ComponentInPackageEditPart) {

@@ -446,7 +446,7 @@ ShapeNodeEditPart implements IPapyrusEditPart {
 		if(targetEditPart instanceof ActorInPackageEditPart) {

 			types.add(UMLElementTypes.Dependency_4013);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseInPackageEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseInPackageEditPart) {

 			types.add(UMLElementTypes.Dependency_4013);

 		}

 		if(targetEditPart instanceof ComponentInPackageEditPart) {

@@ -494,7 +494,7 @@ ShapeNodeEditPart implements IPapyrusEditPart {
 		if(targetEditPart instanceof ActorInPackageEditPart) {

 			types.add(UMLElementTypes.Abstraction_4015);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseInPackageEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseInPackageEditPart) {

 			types.add(UMLElementTypes.Abstraction_4015);

 		}

 		if(targetEditPart instanceof ComponentInPackageEditPart) {

@@ -542,7 +542,7 @@ ShapeNodeEditPart implements IPapyrusEditPart {
 		if(targetEditPart instanceof ActorInPackageEditPart) {

 			types.add(UMLElementTypes.Usage_4016);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseInPackageEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseInPackageEditPart) {

 			types.add(UMLElementTypes.Usage_4016);

 		}

 		if(targetEditPart instanceof ComponentInPackageEditPart) {

@@ -590,7 +590,7 @@ ShapeNodeEditPart implements IPapyrusEditPart {
 		if(targetEditPart instanceof ActorInPackageEditPart) {

 			types.add(UMLElementTypes.Realization_4017);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseInPackageEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseInPackageEditPart) {

 			types.add(UMLElementTypes.Realization_4017);

 		}

 		if(targetEditPart instanceof ComponentInPackageEditPart) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/UseCaseInPackageNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UseCaseInPackageNameEditPart.java
index c7a7c47d3ea..e47dba065e8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/UseCaseInPackageNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UseCaseInPackageNameEditPart.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.parts;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -51,15 +51,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.common.util.DiagramEditPartsUtil;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -69,8 +60,17 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

-import org.eclipse.papyrus.umlutils.ui.VisualInformationPapyrusConstant;

-import org.eclipse.papyrus.umlutils.ui.helper.NameLabelIconHelper;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.tools.utils.ui.VisualInformationPapyrusConstant;

+import org.eclipse.papyrus.uml.tools.utils.ui.helper.NameLabelIconHelper;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -340,7 +340,7 @@ public class UseCaseInPackageNameEditPart extends CompartmentEditPart implements
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.UseCase_3012, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseInPackageNameEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.UseCase_3012, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseInPackageNameEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -588,7 +588,7 @@ public class UseCaseInPackageNameEditPart extends CompartmentEditPart implements
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/UseCaseNameEditPartTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UseCaseNameEditPartTN.java
index 01833d8d861..72ddc3a1ba3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/UseCaseNameEditPartTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UseCaseNameEditPartTN.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.parts;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -51,15 +51,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.common.util.DiagramEditPartsUtil;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLParserProvider;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -69,8 +60,17 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

-import org.eclipse.papyrus.umlutils.ui.VisualInformationPapyrusConstant;

-import org.eclipse.papyrus.umlutils.ui.helper.NameLabelIconHelper;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.tools.utils.ui.VisualInformationPapyrusConstant;

+import org.eclipse.papyrus.uml.tools.utils.ui.helper.NameLabelIconHelper;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -340,7 +340,7 @@ public class UseCaseNameEditPartTN extends CompartmentEditPart implements ITextA
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.UseCase_2013, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseNameEditPartTN.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.UseCase_2013, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseNameEditPartTN.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -588,7 +588,7 @@ public class UseCaseNameEditPartTN extends CompartmentEditPart implements ITextA
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/UseCasePointsEditPartTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UseCasePointsEditPartTN.java
index d770e69c1ed..758cc80a8b8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/UseCasePointsEditPartTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UseCasePointsEditPartTN.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.parts;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

 

 import org.eclipse.draw2d.IFigure;

 import org.eclipse.draw2d.geometry.Dimension;

@@ -26,11 +26,11 @@ import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.editparts.ResizeableListCompartmentEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.DuplicatePasteEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.CustomDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.UseCasePointsItemSemanticEditPolicyTN;

-import org.eclipse.papyrus.diagram.usecase.part.Messages;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ResizeableListCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UseCasePointsItemSemanticEditPolicyTN;

+import org.eclipse.papyrus.uml.diagram.usecase.part.Messages;

 

 /**

  * @generated

@@ -89,7 +89,7 @@ extends ResizeableListCompartmentEditPart
 		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

 

 		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.diagram.usecase.edit.policies.UseCasePointsCanonicalEditPolicyTN());

+		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UseCasePointsCanonicalEditPolicyTN());

 

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/UseCasePointsInComponentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UseCasePointsInComponentEditPart.java
index 9d3bbe83677..438d0fc6118 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/UseCasePointsInComponentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UseCasePointsInComponentEditPart.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.parts;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

 

 import org.eclipse.draw2d.IFigure;

 import org.eclipse.draw2d.geometry.Dimension;

@@ -26,11 +26,11 @@ import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.editparts.ResizeableListCompartmentEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.DuplicatePasteEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.CustomDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.UseCasePointsInComponentItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.part.Messages;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ResizeableListCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UseCasePointsInComponentItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.part.Messages;

 

 /**

  * @generated

@@ -87,7 +87,7 @@ extends ResizeableListCompartmentEditPart
 		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

 

 		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.diagram.usecase.edit.policies.UseCasePointsInComponentCanonicalEditPolicy());

+		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UseCasePointsInComponentCanonicalEditPolicy());

 

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/UseCasePointsInPackageEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UseCasePointsInPackageEditPart.java
index 24116a073e5..0d4be50dd38 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/UseCasePointsInPackageEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UseCasePointsInPackageEditPart.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.parts;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

 

 import org.eclipse.draw2d.IFigure;

 import org.eclipse.draw2d.geometry.Dimension;

@@ -26,11 +26,11 @@ import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.editparts.ResizeableListCompartmentEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.DuplicatePasteEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.CustomDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.UseCasePointsInPackageItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.part.Messages;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ResizeableListCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UseCasePointsInPackageItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.part.Messages;

 

 /**

  * @generated

@@ -87,7 +87,7 @@ extends ResizeableListCompartmentEditPart
 		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

 

 		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.diagram.usecase.edit.policies.UseCasePointsInPackageCanonicalEditPolicy());

+		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UseCasePointsInPackageCanonicalEditPolicy());

 

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/UseCasePointsInRectangleEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UseCasePointsInRectangleEditPart.java
index 992c5ded1b9..fc9b0391cce 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/parts/UseCasePointsInRectangleEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UseCasePointsInRectangleEditPart.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.parts;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

 

 import org.eclipse.draw2d.geometry.Dimension;

 import org.eclipse.draw2d.geometry.Point;

@@ -25,11 +25,11 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.editparts.ResizeableListCompartmentEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.DuplicatePasteEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.CustomDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.UseCasePointsInRectangleItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.part.Messages;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ResizeableListCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UseCasePointsInRectangleItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.part.Messages;

 

 /**

  * @generated

@@ -78,7 +78,7 @@ extends ResizeableListCompartmentEditPart
 		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

 

 		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.diagram.usecase.edit.policies.UseCasePointsInRectangleCanonicalEditPolicy());

+		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UseCasePointsInRectangleCanonicalEditPolicy());

 

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/AbstractionItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/AbstractionItemSemanticEditPolicy.java
index 7e6e953a6db..8c3ad789474 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/AbstractionItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/AbstractionItemSemanticEditPolicy.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.policies;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -22,23 +22,23 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/ActorAsRectangleItemSemanticEditPolicyTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/ActorAsRectangleItemSemanticEditPolicyTN.java
index ce83a246472..ed5832b5078 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/ActorAsRectangleItemSemanticEditPolicyTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/ActorAsRectangleItemSemanticEditPolicyTN.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.policies;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -22,30 +22,30 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.AssociationCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.AssociationReorientCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.PackageImportCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.AssociationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.AssociationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.GeneralizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.PackageImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AssociationEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageImportEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/ActorInComponentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/ActorInComponentItemSemanticEditPolicy.java
index 7651df97b73..63dd0ec0e8f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/ActorInComponentItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/ActorInComponentItemSemanticEditPolicy.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.policies;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -22,30 +22,30 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.AssociationCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.AssociationReorientCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.PackageImportCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.AssociationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.AssociationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.GeneralizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.PackageImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AssociationEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageImportEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/ActorInPackageItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/ActorInPackageItemSemanticEditPolicy.java
index f7f766d2d12..ee8a9b54c80 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/ActorInPackageItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/ActorInPackageItemSemanticEditPolicy.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.policies;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -22,30 +22,30 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.AssociationCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.AssociationReorientCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.PackageImportCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.AssociationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.AssociationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.GeneralizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.PackageImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AssociationEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageImportEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/ActorItemSemanticEditPolicyTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/ActorItemSemanticEditPolicyTN.java
index 76f941fc479..77fbe334154 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/ActorItemSemanticEditPolicyTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/ActorItemSemanticEditPolicyTN.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.policies;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -22,30 +22,30 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.AssociationCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.AssociationReorientCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.PackageImportCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.AssociationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.AssociationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.GeneralizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.PackageImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AssociationEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageImportEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/AssociationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/AssociationItemSemanticEditPolicy.java
index 74791391b1d..fd20d530e68 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/AssociationItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/AssociationItemSemanticEditPolicy.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.policies;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -22,30 +22,30 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.AssociationCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.AssociationReorientCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.PackageImportCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.AssociationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.AssociationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.GeneralizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.PackageImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AssociationEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageImportEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/CommentAnnotatedElementItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/CommentAnnotatedElementItemSemanticEditPolicy.java
index 81bbe03cbd3..fc61fd10967 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/CommentAnnotatedElementItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/CommentAnnotatedElementItemSemanticEditPolicy.java
@@ -11,12 +11,12 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.policies;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.policies;

 

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/CommentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/CommentItemSemanticEditPolicyCN.java
index 3d42874cb30..f719c7ded8a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/CommentItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/CommentItemSemanticEditPolicyCN.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.policies;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -21,15 +21,15 @@ import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/CommentItemSemanticEditPolicyTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/CommentItemSemanticEditPolicyTN.java
index 796460b3239..23631ab5ff6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/CommentItemSemanticEditPolicyTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/CommentItemSemanticEditPolicyTN.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.policies;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -21,15 +21,15 @@ import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/ComponentInComponentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/ComponentInComponentItemSemanticEditPolicy.java
index 507c6847d6e..70e23cc14ba 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/ComponentInComponentItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/ComponentInComponentItemSemanticEditPolicy.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.policies;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -22,30 +22,30 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.AssociationCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.AssociationReorientCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.PackageImportCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.AssociationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.AssociationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.GeneralizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.PackageImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AssociationEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageImportEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/ComponentInPackageItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/ComponentInPackageItemSemanticEditPolicy.java
index 69fcd48bf85..72ac4e9a497 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/ComponentInPackageItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/ComponentInPackageItemSemanticEditPolicy.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.policies;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -22,30 +22,30 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.AssociationCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.AssociationReorientCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.PackageImportCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.AssociationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.AssociationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.GeneralizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.PackageImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AssociationEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageImportEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/ComponentItemSemanticEditPolicyTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/ComponentItemSemanticEditPolicyTN.java
index 30b905c53d9..97856b5f049 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/ComponentItemSemanticEditPolicyTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/ComponentItemSemanticEditPolicyTN.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.policies;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -22,30 +22,30 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.AssociationCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.AssociationReorientCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.PackageImportCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.AssociationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.AssociationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.GeneralizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.PackageImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AssociationEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageImportEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/ComponentUsecases2CanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/ComponentUsecases2CanonicalEditPolicy.java
index 51f34984314..46d1497666c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/ComponentUsecases2CanonicalEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/ComponentUsecases2CanonicalEditPolicy.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.policies;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.policies;

 

 import java.util.ArrayList;

 import java.util.Collection;

@@ -35,14 +35,14 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
 import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ActorInComponentEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.CommentEditPartCN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ComponentInComponentEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ConstraintInComponentEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseInComponentEditPart;

-import org.eclipse.papyrus.diagram.usecase.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.diagram.usecase.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.diagram.usecase.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorInComponentEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.CommentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ComponentInComponentEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintInComponentEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseInComponentEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramUpdater;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLNodeDescriptor;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;

 import org.eclipse.uml2.uml.UMLPackage;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/ComponentUsecases2ItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/ComponentUsecases2ItemSemanticEditPolicy.java
index 3def89a861a..29d0d169196 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/ComponentUsecases2ItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/ComponentUsecases2ItemSemanticEditPolicy.java
@@ -11,16 +11,16 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.policies;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.policies;

 

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.ActorInComponentCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.CommentCreateCommandCN;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.ComponentInComponentCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.ConstraintInComponentCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.UseCaseInComponentCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ActorInComponentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.CommentCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ComponentInComponentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ConstraintInComponentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.UseCaseInComponentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/ComponentUsecases3CanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/ComponentUsecases3CanonicalEditPolicy.java
index a981b277d0a..0ba73b165be 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/ComponentUsecases3CanonicalEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/ComponentUsecases3CanonicalEditPolicy.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.policies;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.policies;

 

 import java.util.ArrayList;

 import java.util.Collection;

@@ -35,14 +35,14 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
 import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ActorInComponentEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.CommentEditPartCN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ComponentInComponentEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ConstraintInComponentEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseInComponentEditPart;

-import org.eclipse.papyrus.diagram.usecase.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.diagram.usecase.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.diagram.usecase.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorInComponentEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.CommentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ComponentInComponentEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintInComponentEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseInComponentEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramUpdater;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLNodeDescriptor;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;

 import org.eclipse.uml2.uml.UMLPackage;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/ComponentUsecases3ItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/ComponentUsecases3ItemSemanticEditPolicy.java
index 19e7fd429e0..1a5617757c6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/ComponentUsecases3ItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/ComponentUsecases3ItemSemanticEditPolicy.java
@@ -11,16 +11,16 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.policies;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.policies;

 

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.ActorInComponentCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.CommentCreateCommandCN;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.ComponentInComponentCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.ConstraintInComponentCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.UseCaseInComponentCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ActorInComponentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.CommentCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ComponentInComponentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ConstraintInComponentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.UseCaseInComponentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/ComponentUsecasesCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/ComponentUsecasesCanonicalEditPolicy.java
index 653a1763499..d3cb6bf4151 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/ComponentUsecasesCanonicalEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/ComponentUsecasesCanonicalEditPolicy.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.policies;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.policies;

 

 import java.util.ArrayList;

 import java.util.Collection;

@@ -35,14 +35,14 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
 import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ActorInComponentEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.CommentEditPartCN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ComponentInComponentEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ConstraintInComponentEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseInComponentEditPart;

-import org.eclipse.papyrus.diagram.usecase.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.diagram.usecase.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.diagram.usecase.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorInComponentEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.CommentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ComponentInComponentEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintInComponentEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseInComponentEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramUpdater;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLNodeDescriptor;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;

 import org.eclipse.uml2.uml.UMLPackage;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/ComponentUsecasesItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/ComponentUsecasesItemSemanticEditPolicy.java
index 12e094c1a35..1872593d213 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/ComponentUsecasesItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/ComponentUsecasesItemSemanticEditPolicy.java
@@ -11,16 +11,16 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.policies;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.policies;

 

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.ActorInComponentCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.CommentCreateCommandCN;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.ComponentInComponentCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.ConstraintInComponentCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.UseCaseInComponentCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ActorInComponentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.CommentCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ComponentInComponentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ConstraintInComponentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.UseCaseInComponentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/ConstraintConstrainedElementItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/ConstraintConstrainedElementItemSemanticEditPolicy.java
index 2c90cbdf8a4..39d845a8a32 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/ConstraintConstrainedElementItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/ConstraintConstrainedElementItemSemanticEditPolicy.java
@@ -11,12 +11,12 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.policies;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.policies;

 

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/ConstraintInComponentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/ConstraintInComponentItemSemanticEditPolicy.java
index 9b03d9f392f..d9d4f0bb1ac 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/ConstraintInComponentItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/ConstraintInComponentItemSemanticEditPolicy.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.policies;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -22,23 +22,23 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/ConstraintInPackageItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/ConstraintInPackageItemSemanticEditPolicy.java
index 8f5bc09c197..6bcb353e236 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/ConstraintInPackageItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/ConstraintInPackageItemSemanticEditPolicy.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.policies;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -22,23 +22,23 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/ConstraintItemSemanticEditPolicyTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/ConstraintItemSemanticEditPolicyTN.java
index e9b42fd843f..1b49310ff5d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/ConstraintItemSemanticEditPolicyTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/ConstraintItemSemanticEditPolicyTN.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.policies;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -22,23 +22,23 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/DependencyItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/DependencyItemSemanticEditPolicy.java
index 695baec58e3..3d4e21a51d5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/DependencyItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/DependencyItemSemanticEditPolicy.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.policies;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -22,23 +22,23 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/ExtendItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/ExtendItemSemanticEditPolicy.java
index 1b8b138ffc7..1a219cba2ea 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/ExtendItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/ExtendItemSemanticEditPolicy.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.policies;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -22,23 +22,23 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/ExtensionPointInRectangleItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/ExtensionPointInRectangleItemSemanticEditPolicy.java
index 7de3f401c55..efaab53116f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/ExtensionPointInRectangleItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/ExtensionPointInRectangleItemSemanticEditPolicy.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.policies;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.policies;

 

 import java.util.ArrayList;

 import java.util.List;

@@ -24,7 +24,7 @@ import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalC
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/ExtensionPointItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/ExtensionPointItemSemanticEditPolicy.java
index 2760794266a..c554748238f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/ExtensionPointItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/ExtensionPointItemSemanticEditPolicy.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.policies;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.policies;

 

 import java.util.ArrayList;

 import java.util.List;

@@ -24,7 +24,7 @@ import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalC
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/GeneralizationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/GeneralizationItemSemanticEditPolicy.java
index 04c1ac67330..da4b7e59ead 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/GeneralizationItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/GeneralizationItemSemanticEditPolicy.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.policies;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -21,15 +21,15 @@ import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/IncludeItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/IncludeItemSemanticEditPolicy.java
index 3878015d1de..7771f95f806 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/IncludeItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/IncludeItemSemanticEditPolicy.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.policies;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -22,23 +22,23 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/OpenDiagramEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/OpenDiagramEditPolicy.java
index 54ea3a0d481..c142ca2ece9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/OpenDiagramEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/OpenDiagramEditPolicy.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.policies;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.policies;

 

 import java.io.IOException;

 import java.lang.reflect.InvocationTargetException;

@@ -41,11 +41,11 @@ import org.eclipse.gmf.runtime.notation.HintedDiagramLinkStyle;
 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.Style;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

-import org.eclipse.papyrus.diagram.usecase.part.Messages;

-import org.eclipse.papyrus.diagram.usecase.part.UMLDiagramEditor;

-import org.eclipse.papyrus.diagram.usecase.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.usecase.part.UMLDiagramEditorUtil;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.part.Messages;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditor;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorUtil;

 import org.eclipse.ui.IEditorInput;

 import org.eclipse.ui.IWorkbenchPage;

 import org.eclipse.ui.PlatformUI;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/PackageImportItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/PackageImportItemSemanticEditPolicy.java
index 33e83ac7a60..5a8a631e5a3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/PackageImportItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/PackageImportItemSemanticEditPolicy.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.policies;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -21,15 +21,15 @@ import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/PackageItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/PackageItemSemanticEditPolicyCN.java
index 0bc3a9640b9..44e42e94153 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/PackageItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/PackageItemSemanticEditPolicyCN.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.policies;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -22,27 +22,27 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.PackageImportCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.PackageMergeCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.PackageMergeEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.PackageImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.PackageMergeCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageImportEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageMergeEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/PackageItemSemanticEditPolicyTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/PackageItemSemanticEditPolicyTN.java
index 7537c9992c1..663aa5fed30 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/PackageItemSemanticEditPolicyTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/PackageItemSemanticEditPolicyTN.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.policies;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -22,27 +22,27 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.PackageImportCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.PackageMergeCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.PackageMergeEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.PackageImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.PackageMergeCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageImportEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageMergeEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/PackageMergeItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/PackageMergeItemSemanticEditPolicy.java
index 9bd0b871a6b..74ac1945bf8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/PackageMergeItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/PackageMergeItemSemanticEditPolicy.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.policies;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -21,15 +21,15 @@ import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/PackagePackageableElementCompartment2CanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/PackagePackageableElementCompartment2CanonicalEditPolicy.java
index 88cfba2774a..a571411a286 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/PackagePackageableElementCompartment2CanonicalEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/PackagePackageableElementCompartment2CanonicalEditPolicy.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.policies;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.policies;

 

 import java.util.ArrayList;

 import java.util.Collection;

@@ -35,15 +35,15 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
 import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ActorInPackageEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.CommentEditPartCN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ComponentInPackageEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ConstraintInPackageEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.PackageEditPartCN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseInPackageEditPart;

-import org.eclipse.papyrus.diagram.usecase.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.diagram.usecase.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.diagram.usecase.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorInPackageEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.CommentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ComponentInPackageEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintInPackageEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageEditPartCN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseInPackageEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramUpdater;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLNodeDescriptor;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;

 import org.eclipse.uml2.uml.UMLPackage;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/PackagePackageableElementCompartment2ItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/PackagePackageableElementCompartment2ItemSemanticEditPolicy.java
index a77f0505ccd..6f8933ffd49 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/PackagePackageableElementCompartment2ItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/PackagePackageableElementCompartment2ItemSemanticEditPolicy.java
@@ -11,17 +11,17 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.policies;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.policies;

 

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.ActorInPackageCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.CommentCreateCommandCN;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.ComponentInPackageCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.ConstraintInPackageCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.PackageCreateCommandCN;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.UseCaseInPackageCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ActorInPackageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.CommentCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ComponentInPackageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ConstraintInPackageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.PackageCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.UseCaseInPackageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/PackagePackageableElementCompartmentCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/PackagePackageableElementCompartmentCanonicalEditPolicy.java
index 690dfa83b4b..0a0faacf8e6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/PackagePackageableElementCompartmentCanonicalEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/PackagePackageableElementCompartmentCanonicalEditPolicy.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.policies;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.policies;

 

 import java.util.ArrayList;

 import java.util.Collection;

@@ -35,15 +35,15 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
 import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ActorInPackageEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.CommentEditPartCN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ComponentInPackageEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ConstraintInPackageEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.PackageEditPartCN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseInPackageEditPart;

-import org.eclipse.papyrus.diagram.usecase.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.diagram.usecase.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.diagram.usecase.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorInPackageEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.CommentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ComponentInPackageEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintInPackageEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageEditPartCN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseInPackageEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramUpdater;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLNodeDescriptor;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;

 import org.eclipse.uml2.uml.UMLPackage;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/PackagePackageableElementCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/PackagePackageableElementCompartmentItemSemanticEditPolicy.java
index d1d22bd587b..b3ef1f5d53c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/PackagePackageableElementCompartmentItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/PackagePackageableElementCompartmentItemSemanticEditPolicy.java
@@ -11,17 +11,17 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.policies;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.policies;

 

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.ActorInPackageCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.CommentCreateCommandCN;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.ComponentInPackageCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.ConstraintInPackageCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.PackageCreateCommandCN;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.UseCaseInPackageCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ActorInPackageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.CommentCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ComponentInPackageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ConstraintInPackageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.PackageCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.UseCaseInPackageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/RealizationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/RealizationItemSemanticEditPolicy.java
index 0b3d3c0d3ef..8f07523d50c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/RealizationItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/RealizationItemSemanticEditPolicy.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.policies;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -22,23 +22,23 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/ShortCutDiagramItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/ShortCutDiagramItemSemanticEditPolicy.java
index 14b2920fac6..852dee112be 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/ShortCutDiagramItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/ShortCutDiagramItemSemanticEditPolicy.java
@@ -11,7 +11,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.policies;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -19,9 +19,9 @@ import org.eclipse.gef.commands.UnexecutableCommand;
 import org.eclipse.gmf.runtime.common.core.command.ICommand;

 import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/UMLBaseItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/UMLBaseItemSemanticEditPolicy.java
index 4802c99b7fe..2794c422ac8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/UMLBaseItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/UMLBaseItemSemanticEditPolicy.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.policies;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.policies;

 

 import java.util.Collections;

 import java.util.Iterator;

@@ -47,14 +47,14 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelations
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.usecase.edit.helpers.UMLBaseEditHelper;

-import org.eclipse.papyrus.diagram.usecase.expressions.UMLOCLFactory;

-import org.eclipse.papyrus.diagram.usecase.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.usecase.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

 import org.eclipse.papyrus.extendedtypes.types.IExtendedHintedElementType;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.helpers.UMLBaseEditHelper;

+import org.eclipse.papyrus.uml.diagram.usecase.expressions.UMLOCLFactory;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

 import org.eclipse.uml2.uml.Abstraction;

 import org.eclipse.uml2.uml.Association;

 import org.eclipse.uml2.uml.Classifier;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/UMLTextNonResizableEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/UMLTextNonResizableEditPolicy.java
index 7c1589b9a61..52f8987be07 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/UMLTextNonResizableEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/UMLTextNonResizableEditPolicy.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.policies;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.policies;

 

 import java.util.Collections;

 import java.util.List;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/UMLTextSelectionEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/UMLTextSelectionEditPolicy.java
index b353d2ee32a..455d2af1d5e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/UMLTextSelectionEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/UMLTextSelectionEditPolicy.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.policies;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.policies;

 

 import org.eclipse.draw2d.ColorConstants;

 import org.eclipse.draw2d.Figure;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/UsageItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/UsageItemSemanticEditPolicy.java
index 5b59f3db38d..26e41d8eefc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/UsageItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/UsageItemSemanticEditPolicy.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.policies;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -22,23 +22,23 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/UseCaseAsRectangleItemSemanticEditPolicyTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/UseCaseAsRectangleItemSemanticEditPolicyTN.java
index 028f12d2321..aa810880fc4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/UseCaseAsRectangleItemSemanticEditPolicyTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/UseCaseAsRectangleItemSemanticEditPolicyTN.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.policies;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -22,34 +22,34 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.AssociationCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.AssociationReorientCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.ExtendCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.IncludeCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.PackageImportCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ExtendEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.IncludeEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.AssociationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.AssociationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ExtendCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.GeneralizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.IncludeCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.PackageImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AssociationEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ExtendEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.IncludeEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageImportEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/UseCaseDiagramCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/UseCaseDiagramCanonicalEditPolicy.java
index 5fb7c6d6f1a..4ff3db5b0dd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/UseCaseDiagramCanonicalEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/UseCaseDiagramCanonicalEditPolicy.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.policies;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.policies;

 

 import java.util.ArrayList;

 import java.util.Collection;

@@ -52,40 +52,40 @@ import org.eclipse.gmf.runtime.notation.Location;
 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.Size;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ActorAsRectangleEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ActorEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ActorInComponentEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ActorInPackageEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.CommentEditPartCN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.CommentEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ComponentEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ComponentInComponentEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ComponentInPackageEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ConstraintEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ConstraintInComponentEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ConstraintInPackageEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ExtendEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.IncludeEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.PackageEditPartCN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.PackageEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.PackageMergeEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ShortCutDiagramEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseAsRectangleEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseInComponentEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseInPackageEditPart;

-import org.eclipse.papyrus.diagram.usecase.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.diagram.usecase.part.UMLLinkDescriptor;

-import org.eclipse.papyrus.diagram.usecase.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.diagram.usecase.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorAsRectangleEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorInComponentEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorInPackageEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AssociationEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.CommentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.CommentEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ComponentEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ComponentInComponentEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ComponentInPackageEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintInComponentEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintInPackageEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ExtendEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.IncludeEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageEditPartCN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageImportEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageMergeEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ShortCutDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseAsRectangleEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseInComponentEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseInPackageEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramUpdater;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLLinkDescriptor;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLNodeDescriptor;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;

 import org.eclipse.uml2.uml.UMLPackage;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/UseCaseDiagramItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/UseCaseDiagramItemSemanticEditPolicy.java
index c6402ee643d..50d9f679382 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/UseCaseDiagramItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/UseCaseDiagramItemSemanticEditPolicy.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.policies;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.policies;

 

 import org.eclipse.emf.transaction.TransactionalEditingDomain;

 import org.eclipse.gef.commands.Command;

@@ -19,17 +19,17 @@ import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DuplicateElementsRequest;

 import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.papyrus.diagram.common.commands.DuplicateNamedElementCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.ActorAsRectangleCreateCommandTN;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.ActorCreateCommandTN;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.CommentCreateCommandTN;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.ComponentCreateCommandTN;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.ConstraintCreateCommandTN;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.PackageCreateCommandTN;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.ShortCutDiagramCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.UseCaseAsRectangleCreateCommandTN;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.UseCaseCreateCommandTN;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.common.commands.DuplicateNamedElementCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ActorAsRectangleCreateCommandTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ActorCreateCommandTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.CommentCreateCommandTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ComponentCreateCommandTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ConstraintCreateCommandTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.PackageCreateCommandTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ShortCutDiagramCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.UseCaseAsRectangleCreateCommandTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.UseCaseCreateCommandTN;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/UseCaseInComponentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/UseCaseInComponentItemSemanticEditPolicy.java
index 7f14951c467..062c9bdcdbd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/UseCaseInComponentItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/UseCaseInComponentItemSemanticEditPolicy.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.policies;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -22,34 +22,34 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.AssociationCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.AssociationReorientCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.ExtendCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.IncludeCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.PackageImportCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ExtendEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.IncludeEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.AssociationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.AssociationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ExtendCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.GeneralizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.IncludeCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.PackageImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AssociationEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ExtendEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.IncludeEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageImportEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/UseCaseInPackageItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/UseCaseInPackageItemSemanticEditPolicy.java
index 6886a4f1d12..3bc865bc8f2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/UseCaseInPackageItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/UseCaseInPackageItemSemanticEditPolicy.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.policies;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -22,34 +22,34 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.AssociationCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.AssociationReorientCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.ExtendCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.IncludeCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.PackageImportCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ExtendEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.IncludeEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.AssociationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.AssociationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ExtendCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.GeneralizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.IncludeCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.PackageImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AssociationEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ExtendEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.IncludeEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageImportEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/UseCaseItemSemanticEditPolicyTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/UseCaseItemSemanticEditPolicyTN.java
index 125107116c7..084bfe9bc78 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/UseCaseItemSemanticEditPolicyTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/UseCaseItemSemanticEditPolicyTN.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.policies;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -22,34 +22,34 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.AssociationCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.AssociationReorientCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.ExtendCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.IncludeCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.PackageImportCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ExtendEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.IncludeEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.AssociationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.AssociationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ExtendCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.GeneralizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.IncludeCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.PackageImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AssociationEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ExtendEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.IncludeEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageImportEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/UseCasePointsCanonicalEditPolicyTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/UseCasePointsCanonicalEditPolicyTN.java
index be24af93de1..92d54384bc7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/UseCasePointsCanonicalEditPolicyTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/UseCasePointsCanonicalEditPolicyTN.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.policies;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.policies;

 

 import java.util.ArrayList;

 import java.util.Collection;

@@ -33,10 +33,10 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
 import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ExtensionPointEditPart;

-import org.eclipse.papyrus.diagram.usecase.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.diagram.usecase.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.diagram.usecase.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ExtensionPointEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramUpdater;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLNodeDescriptor;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;

 import org.eclipse.uml2.uml.UMLPackage;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/UseCasePointsInComponentCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/UseCasePointsInComponentCanonicalEditPolicy.java
index e2023d8e450..69c22a23852 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/UseCasePointsInComponentCanonicalEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/UseCasePointsInComponentCanonicalEditPolicy.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.policies;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.policies;

 

 import java.util.ArrayList;

 import java.util.Collection;

@@ -33,10 +33,10 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
 import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ExtensionPointEditPart;

-import org.eclipse.papyrus.diagram.usecase.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.diagram.usecase.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.diagram.usecase.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ExtensionPointEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramUpdater;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLNodeDescriptor;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;

 import org.eclipse.uml2.uml.UMLPackage;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/UseCasePointsInComponentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/UseCasePointsInComponentItemSemanticEditPolicy.java
index a20e1680045..77afcd95753 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/UseCasePointsInComponentItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/UseCasePointsInComponentItemSemanticEditPolicy.java
@@ -11,12 +11,12 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.policies;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.policies;

 

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.ExtensionPointCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ExtensionPointCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/UseCasePointsInPackageCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/UseCasePointsInPackageCanonicalEditPolicy.java
index ae8065263b2..36647d0388d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/UseCasePointsInPackageCanonicalEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/UseCasePointsInPackageCanonicalEditPolicy.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.policies;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.policies;

 

 import java.util.ArrayList;

 import java.util.Collection;

@@ -33,10 +33,10 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
 import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ExtensionPointEditPart;

-import org.eclipse.papyrus.diagram.usecase.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.diagram.usecase.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.diagram.usecase.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ExtensionPointEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramUpdater;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLNodeDescriptor;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;

 import org.eclipse.uml2.uml.UMLPackage;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/UseCasePointsInPackageItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/UseCasePointsInPackageItemSemanticEditPolicy.java
index cb2f9f358b7..e4963289766 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/UseCasePointsInPackageItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/UseCasePointsInPackageItemSemanticEditPolicy.java
@@ -11,12 +11,12 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.policies;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.policies;

 

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.ExtensionPointCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ExtensionPointCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/UseCasePointsInRectangleCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/UseCasePointsInRectangleCanonicalEditPolicy.java
index a9a9dd3d9b6..fac47e534b3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/UseCasePointsInRectangleCanonicalEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/UseCasePointsInRectangleCanonicalEditPolicy.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.policies;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.policies;

 

 import java.util.ArrayList;

 import java.util.Collection;

@@ -33,10 +33,10 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
 import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ExtensionPointInRectangleEditPart;

-import org.eclipse.papyrus.diagram.usecase.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.diagram.usecase.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.diagram.usecase.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ExtensionPointInRectangleEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramUpdater;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLNodeDescriptor;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;

 import org.eclipse.uml2.uml.UMLPackage;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/UseCasePointsInRectangleItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/UseCasePointsInRectangleItemSemanticEditPolicy.java
index 33f3893ed53..fd1378d0537 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/UseCasePointsInRectangleItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/UseCasePointsInRectangleItemSemanticEditPolicy.java
@@ -11,12 +11,12 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.policies;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.policies;

 

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.ExtensionPointInRectangleCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ExtensionPointInRectangleCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/UseCasePointsItemSemanticEditPolicyTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/UseCasePointsItemSemanticEditPolicyTN.java
index 8aa0ca1ff9c..445283e6042 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/edit/policies/UseCasePointsItemSemanticEditPolicyTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/UseCasePointsItemSemanticEditPolicyTN.java
@@ -11,12 +11,12 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.edit.policies;

+package org.eclipse.papyrus.uml.diagram.usecase.edit.policies;

 

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.diagram.usecase.edit.commands.ExtensionPointCreateCommand;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ExtensionPointCreateCommand;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/expressions/UMLAbstractExpression.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/expressions/UMLAbstractExpression.java
index aa36704b24f..45480e25588 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/expressions/UMLAbstractExpression.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/expressions/UMLAbstractExpression.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.expressions;

+package org.eclipse.papyrus.uml.diagram.usecase.expressions;

 

 import java.math.BigDecimal;

 import java.math.BigInteger;

@@ -25,7 +25,7 @@ import org.eclipse.emf.ecore.EDataType;
 import org.eclipse.emf.ecore.EEnum;

 import org.eclipse.emf.ecore.EEnumLiteral;

 import org.eclipse.emf.ecore.util.EcoreUtil;

-import org.eclipse.papyrus.diagram.usecase.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/expressions/UMLOCLFactory.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/expressions/UMLOCLFactory.java
index accc3ad017c..a34adaeb913 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/expressions/UMLOCLFactory.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/expressions/UMLOCLFactory.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.expressions;

+package org.eclipse.papyrus.uml.diagram.usecase.expressions;

 

 import java.util.Collections;

 import java.util.Map;

@@ -28,7 +28,7 @@ import org.eclipse.ocl.ecore.OCL.Helper;
 import org.eclipse.ocl.ecore.OCLExpression;

 import org.eclipse.ocl.ecore.Variable;

 import org.eclipse.ocl.options.ParsingOptions;

-import org.eclipse.papyrus.diagram.usecase.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/navigator/UMLAbstractNavigatorItem.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/navigator/UMLAbstractNavigatorItem.java
index 9a035f5723f..1035ba67e4e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/navigator/UMLAbstractNavigatorItem.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/navigator/UMLAbstractNavigatorItem.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.navigator;

+package org.eclipse.papyrus.uml.diagram.usecase.navigator;

 

 import org.eclipse.core.runtime.IAdapterFactory;

 import org.eclipse.core.runtime.Platform;

@@ -31,13 +31,13 @@ public abstract class UMLAbstractNavigatorItem extends PlatformObject {
 		final ITabbedPropertySheetPageContributor propertySheetPageContributor = new ITabbedPropertySheetPageContributor() {

 

 			public String getContributorId() {

-				return "org.eclipse.papyrus.diagram.usecase"; //$NON-NLS-1$

+				return "org.eclipse.papyrus.uml.diagram.usecase"; //$NON-NLS-1$

 			}

 		};

 		Platform.getAdapterManager().registerAdapters(new IAdapterFactory() {

 

 			public Object getAdapter(Object adaptableObject, Class adapterType) {

-				if(adaptableObject instanceof org.eclipse.papyrus.diagram.usecase.navigator.UMLAbstractNavigatorItem && adapterType == ITabbedPropertySheetPageContributor.class) {

+				if(adaptableObject instanceof org.eclipse.papyrus.uml.diagram.usecase.navigator.UMLAbstractNavigatorItem && adapterType == ITabbedPropertySheetPageContributor.class) {

 					return propertySheetPageContributor;

 				}

 				return null;

@@ -46,7 +46,7 @@ public abstract class UMLAbstractNavigatorItem extends PlatformObject {
 			public Class[] getAdapterList() {

 				return supportedTypes;

 			}

-		}, org.eclipse.papyrus.diagram.usecase.navigator.UMLAbstractNavigatorItem.class);

+		}, org.eclipse.papyrus.uml.diagram.usecase.navigator.UMLAbstractNavigatorItem.class);

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/navigator/UMLDomainNavigatorContentProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/navigator/UMLDomainNavigatorContentProvider.java
index 8e31d144c24..710857a0a15 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/navigator/UMLDomainNavigatorContentProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/navigator/UMLDomainNavigatorContentProvider.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.navigator;

+package org.eclipse.papyrus.uml.diagram.usecase.navigator;

 

 import java.util.ArrayList;

 import java.util.Collection;

@@ -28,7 +28,7 @@ import org.eclipse.emf.transaction.TransactionalEditingDomain;
 import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;

 import org.eclipse.gmf.runtime.emf.core.GMFEditingDomainFactory;

 import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.papyrus.diagram.usecase.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin;

 import org.eclipse.ui.IMemento;

 import org.eclipse.ui.navigator.ICommonContentExtensionSite;

 import org.eclipse.ui.navigator.ICommonContentProvider;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/navigator/UMLDomainNavigatorItem.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/navigator/UMLDomainNavigatorItem.java
index 00d8b79138e..e554948743c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/navigator/UMLDomainNavigatorItem.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/navigator/UMLDomainNavigatorItem.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.navigator;

+package org.eclipse.papyrus.uml.diagram.usecase.navigator;

 

 import org.eclipse.core.runtime.IAdapterFactory;

 import org.eclipse.core.runtime.Platform;

@@ -34,8 +34,8 @@ public class UMLDomainNavigatorItem extends PlatformObject {
 		Platform.getAdapterManager().registerAdapters(new IAdapterFactory() {

 

 			public Object getAdapter(Object adaptableObject, Class adapterType) {

-				if(adaptableObject instanceof org.eclipse.papyrus.diagram.usecase.navigator.UMLDomainNavigatorItem) {

-					org.eclipse.papyrus.diagram.usecase.navigator.UMLDomainNavigatorItem domainNavigatorItem = (org.eclipse.papyrus.diagram.usecase.navigator.UMLDomainNavigatorItem)adaptableObject;

+				if(adaptableObject instanceof org.eclipse.papyrus.uml.diagram.usecase.navigator.UMLDomainNavigatorItem) {

+					org.eclipse.papyrus.uml.diagram.usecase.navigator.UMLDomainNavigatorItem domainNavigatorItem = (org.eclipse.papyrus.uml.diagram.usecase.navigator.UMLDomainNavigatorItem)adaptableObject;

 					EObject eObject = domainNavigatorItem.getEObject();

 					if(adapterType == EObject.class) {

 						return eObject;

@@ -51,7 +51,7 @@ public class UMLDomainNavigatorItem extends PlatformObject {
 			public Class[] getAdapterList() {

 				return supportedTypes;

 			}

-		}, org.eclipse.papyrus.diagram.usecase.navigator.UMLDomainNavigatorItem.class);

+		}, org.eclipse.papyrus.uml.diagram.usecase.navigator.UMLDomainNavigatorItem.class);

 	}

 

 	/**

@@ -103,8 +103,8 @@ public class UMLDomainNavigatorItem extends PlatformObject {
 	 * @generated

 	 */

 	public boolean equals(Object obj) {

-		if(obj instanceof org.eclipse.papyrus.diagram.usecase.navigator.UMLDomainNavigatorItem) {

-			return EcoreUtil.getURI(getEObject()).equals(EcoreUtil.getURI(((org.eclipse.papyrus.diagram.usecase.navigator.UMLDomainNavigatorItem)obj).getEObject()));

+		if(obj instanceof org.eclipse.papyrus.uml.diagram.usecase.navigator.UMLDomainNavigatorItem) {

+			return EcoreUtil.getURI(getEObject()).equals(EcoreUtil.getURI(((org.eclipse.papyrus.uml.diagram.usecase.navigator.UMLDomainNavigatorItem)obj).getEObject()));

 		}

 		return super.equals(obj);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/navigator/UMLDomainNavigatorLabelProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/navigator/UMLDomainNavigatorLabelProvider.java
index 58430150231..18aabd60e3c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/navigator/UMLDomainNavigatorLabelProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/navigator/UMLDomainNavigatorLabelProvider.java
@@ -11,11 +11,11 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.navigator;

+package org.eclipse.papyrus.uml.diagram.usecase.navigator;

 

 import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;

 import org.eclipse.jface.viewers.ILabelProviderListener;

-import org.eclipse.papyrus.diagram.usecase.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin;

 import org.eclipse.swt.graphics.Image;

 import org.eclipse.ui.IMemento;

 import org.eclipse.ui.navigator.ICommonContentExtensionSite;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/navigator/UMLNavigatorActionProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/navigator/UMLNavigatorActionProvider.java
index edcbe42d58c..34fe02b5506 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/navigator/UMLNavigatorActionProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/navigator/UMLNavigatorActionProvider.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.navigator;

+package org.eclipse.papyrus.uml.diagram.usecase.navigator;

 

 import org.eclipse.core.runtime.IAdaptable;

 import org.eclipse.emf.common.ui.URIEditorInput;

@@ -25,11 +25,11 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.action.Action;

 import org.eclipse.jface.action.IMenuManager;

 import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

-import org.eclipse.papyrus.diagram.usecase.part.Messages;

-import org.eclipse.papyrus.diagram.usecase.part.UMLDiagramEditor;

-import org.eclipse.papyrus.diagram.usecase.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.usecase.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.part.Messages;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditor;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;

 import org.eclipse.ui.IActionBars;

 import org.eclipse.ui.IEditorInput;

 import org.eclipse.ui.IWorkbenchPage;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/navigator/UMLNavigatorContentProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/navigator/UMLNavigatorContentProvider.java
index bce7ab2f0c9..e8daefc7f08 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/navigator/UMLNavigatorContentProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/navigator/UMLNavigatorContentProvider.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.navigator;

+package org.eclipse.papyrus.uml.diagram.usecase.navigator;

 

 import java.util.ArrayList;

 import java.util.Collection;

@@ -30,50 +30,50 @@ import org.eclipse.gmf.runtime.notation.Diagram;
 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ActorAsRectangleEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ActorEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ActorInComponentEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ActorInPackageEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.CommentEditPartCN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.CommentEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ComponentEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ComponentInComponentEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ComponentInPackageEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ComponentUsecases2EditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ComponentUsecases3EditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ComponentUsecasesEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ConstraintEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ConstraintInComponentEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ConstraintInPackageEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ExtendEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ExtensionPointEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ExtensionPointInRectangleEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.IncludeEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.PackageEditPartCN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.PackageEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.PackageMergeEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.PackagePackageableElementCompartment2EditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.PackagePackageableElementCompartmentEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseAsRectangleEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseInComponentEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseInPackageEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCasePointsEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCasePointsInComponentEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCasePointsInPackageEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCasePointsInRectangleEditPart;

-import org.eclipse.papyrus.diagram.usecase.part.Messages;

-import org.eclipse.papyrus.diagram.usecase.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorAsRectangleEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorInComponentEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorInPackageEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AssociationEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.CommentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.CommentEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ComponentEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ComponentInComponentEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ComponentInPackageEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ComponentUsecases2EditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ComponentUsecases3EditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ComponentUsecasesEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintInComponentEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintInPackageEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ExtendEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ExtensionPointEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ExtensionPointInRectangleEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.IncludeEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageEditPartCN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageImportEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageMergeEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackagePackageableElementCompartment2EditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackagePackageableElementCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseAsRectangleEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseInComponentEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseInPackageEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCasePointsEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCasePointsInComponentEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCasePointsInPackageEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCasePointsInRectangleEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.part.Messages;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;

 import org.eclipse.ui.IMemento;

 import org.eclipse.ui.navigator.ICommonContentExtensionSite;

 import org.eclipse.ui.navigator.ICommonContentProvider;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/navigator/UMLNavigatorGroup.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/navigator/UMLNavigatorGroup.java
index c73b2e0fc78..1988b8db05c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/navigator/UMLNavigatorGroup.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/navigator/UMLNavigatorGroup.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.navigator;

+package org.eclipse.papyrus.uml.diagram.usecase.navigator;

 

 import java.util.Collection;

 import java.util.LinkedList;

@@ -91,8 +91,8 @@ public class UMLNavigatorGroup extends UMLAbstractNavigatorItem {
 	 * @generated

 	 */

 	public boolean equals(Object obj) {

-		if(obj instanceof org.eclipse.papyrus.diagram.usecase.navigator.UMLNavigatorGroup) {

-			org.eclipse.papyrus.diagram.usecase.navigator.UMLNavigatorGroup anotherGroup = (org.eclipse.papyrus.diagram.usecase.navigator.UMLNavigatorGroup)obj;

+		if(obj instanceof org.eclipse.papyrus.uml.diagram.usecase.navigator.UMLNavigatorGroup) {

+			org.eclipse.papyrus.uml.diagram.usecase.navigator.UMLNavigatorGroup anotherGroup = (org.eclipse.papyrus.uml.diagram.usecase.navigator.UMLNavigatorGroup)obj;

 			if(getGroupName().equals(anotherGroup.getGroupName())) {

 				return getParent().equals(anotherGroup.getParent());

 			}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/navigator/UMLNavigatorItem.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/navigator/UMLNavigatorItem.java
index 04491c20c57..89af3b76585 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/navigator/UMLNavigatorItem.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/navigator/UMLNavigatorItem.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.navigator;

+package org.eclipse.papyrus.uml.diagram.usecase.navigator;

 

 import org.eclipse.core.runtime.IAdapterFactory;

 import org.eclipse.core.runtime.Platform;

@@ -32,8 +32,8 @@ public class UMLNavigatorItem extends UMLAbstractNavigatorItem {
 		Platform.getAdapterManager().registerAdapters(new IAdapterFactory() {

 

 			public Object getAdapter(Object adaptableObject, Class adapterType) {

-				if(adaptableObject instanceof org.eclipse.papyrus.diagram.usecase.navigator.UMLNavigatorItem && (adapterType == View.class || adapterType == EObject.class)) {

-					return ((org.eclipse.papyrus.diagram.usecase.navigator.UMLNavigatorItem)adaptableObject).getView();

+				if(adaptableObject instanceof org.eclipse.papyrus.uml.diagram.usecase.navigator.UMLNavigatorItem && (adapterType == View.class || adapterType == EObject.class)) {

+					return ((org.eclipse.papyrus.uml.diagram.usecase.navigator.UMLNavigatorItem)adaptableObject).getView();

 				}

 				return null;

 			}

@@ -41,7 +41,7 @@ public class UMLNavigatorItem extends UMLAbstractNavigatorItem {
 			public Class[] getAdapterList() {

 				return supportedTypes;

 			}

-		}, org.eclipse.papyrus.diagram.usecase.navigator.UMLNavigatorItem.class);

+		}, org.eclipse.papyrus.uml.diagram.usecase.navigator.UMLNavigatorItem.class);

 	}

 

 	/**

@@ -81,8 +81,8 @@ public class UMLNavigatorItem extends UMLAbstractNavigatorItem {
 	 * @generated

 	 */

 	public boolean equals(Object obj) {

-		if(obj instanceof org.eclipse.papyrus.diagram.usecase.navigator.UMLNavigatorItem) {

-			return EcoreUtil.getURI(getView()).equals(EcoreUtil.getURI(((org.eclipse.papyrus.diagram.usecase.navigator.UMLNavigatorItem)obj).getView()));

+		if(obj instanceof org.eclipse.papyrus.uml.diagram.usecase.navigator.UMLNavigatorItem) {

+			return EcoreUtil.getURI(getView()).equals(EcoreUtil.getURI(((org.eclipse.papyrus.uml.diagram.usecase.navigator.UMLNavigatorItem)obj).getView()));

 		}

 		return super.equals(obj);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/navigator/UMLNavigatorLabelProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/navigator/UMLNavigatorLabelProvider.java
index e274c3d54c4..9b98c8e1a8a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/navigator/UMLNavigatorLabelProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/navigator/UMLNavigatorLabelProvider.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.navigator;

+package org.eclipse.papyrus.uml.diagram.usecase.navigator;

 

 import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

 import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

@@ -24,71 +24,71 @@ import org.eclipse.jface.viewers.ITreePathLabelProvider;
 import org.eclipse.jface.viewers.LabelProvider;

 import org.eclipse.jface.viewers.TreePath;

 import org.eclipse.jface.viewers.ViewerLabel;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.AbstractionNameEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ActorAsRectangleEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ActorAsRectangleNameEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ActorEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ActorInComponentEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ActorInComponentNameEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ActorInPackageEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ActorInPackageNameEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ActorNameEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.AppliedStereotypePackageMergeEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.AssociationNameEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.CommentBodyEditPartCN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.CommentBodyEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.CommentEditPartCN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.CommentEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ComponentEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ComponentInComponentEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ComponentInComponentNameEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ComponentInPackageEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ComponentInPackageNameEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ComponentNameEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ConstraintEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ConstraintInComponentEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ConstraintInComponentNameEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ConstraintInPackageEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ConstraintInPackageNameEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ConstraintNameEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.DependencyNameEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ExtendEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ExtendsLink_fixedEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ExtensionPointEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ExtensionPointInRectangleEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.GeneralizationAppliedStereotypeEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.IncludeEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.IncludeLink_fixedEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.PackageEditPartCN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.PackageEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.PackageImportAppliedStereotypeEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.PackageMergeEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.PackageNameEditPartCN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.PackageNameEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.RealizationNameEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UsageNameEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseAsRectangleEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseAsRectangleNameEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseInComponentEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseInComponentNameEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseInPackageEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseInPackageNameEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseNameEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.usecase.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AbstractionNameEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorAsRectangleEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorAsRectangleNameEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorInComponentEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorInComponentNameEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorInPackageEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorInPackageNameEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorNameEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AppliedStereotypePackageMergeEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AssociationEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AssociationNameEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.CommentBodyEditPartCN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.CommentBodyEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.CommentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.CommentEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ComponentEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ComponentInComponentEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ComponentInComponentNameEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ComponentInPackageEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ComponentInPackageNameEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ComponentNameEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintInComponentEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintInComponentNameEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintInPackageEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintInPackageNameEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintNameEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.DependencyNameEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ExtendEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ExtendsLink_fixedEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ExtensionPointEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ExtensionPointInRectangleEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.GeneralizationAppliedStereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.IncludeEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.IncludeLink_fixedEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageEditPartCN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageImportAppliedStereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageImportEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageMergeEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageNameEditPartCN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageNameEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.RealizationNameEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UsageNameEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseAsRectangleEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseAsRectangleNameEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseInComponentEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseInComponentNameEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseInPackageEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseInPackageNameEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseNameEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLParserProvider;

 import org.eclipse.swt.graphics.Image;

 import org.eclipse.ui.IMemento;

 import org.eclipse.ui.navigator.ICommonContentExtensionSite;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/navigator/UMLNavigatorLinkHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/navigator/UMLNavigatorLinkHelper.java
index 5911e1ea663..1c4ad169b68 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/navigator/UMLNavigatorLinkHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/navigator/UMLNavigatorLinkHelper.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.navigator;

+package org.eclipse.papyrus.uml.diagram.usecase.navigator;

 

 import org.eclipse.core.resources.IFile;

 import org.eclipse.emf.common.ui.URIEditorInput;

@@ -29,7 +29,7 @@ import org.eclipse.gmf.runtime.notation.Diagram;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.viewers.IStructuredSelection;

 import org.eclipse.jface.viewers.StructuredSelection;

-import org.eclipse.papyrus.diagram.usecase.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin;

 import org.eclipse.ui.IEditorInput;

 import org.eclipse.ui.IEditorPart;

 import org.eclipse.ui.IWorkbenchPage;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/navigator/UMLNavigatorSorter.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/navigator/UMLNavigatorSorter.java
index 6d425fce7e2..95d55adab35 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/navigator/UMLNavigatorSorter.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/navigator/UMLNavigatorSorter.java
@@ -11,10 +11,10 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.navigator;

+package org.eclipse.papyrus.uml.diagram.usecase.navigator;

 

 import org.eclipse.jface.viewers.ViewerSorter;

-import org.eclipse.papyrus.diagram.usecase.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/parsers/AbstractParser.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/parsers/AbstractParser.java
index 8ae4a4c1220..653601a7d1f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/parsers/AbstractParser.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/parsers/AbstractParser.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.parsers;

+package org.eclipse.papyrus.uml.diagram.usecase.parsers;

 

 import java.util.Arrays;

 

@@ -35,8 +35,8 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.SetValueCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;

 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.osgi.util.NLS;

-import org.eclipse.papyrus.diagram.usecase.part.Messages;

-import org.eclipse.papyrus.diagram.usecase.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.usecase.part.Messages;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/parsers/MessageFormatParser.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/parsers/MessageFormatParser.java
index c5003237325..2a15937ef55 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/parsers/MessageFormatParser.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/parsers/MessageFormatParser.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.parsers;

+package org.eclipse.papyrus.uml.diagram.usecase.parsers;

 

 import java.text.FieldPosition;

 import java.text.MessageFormat;

@@ -24,8 +24,8 @@ import org.eclipse.gmf.runtime.common.core.command.ICommand;
 import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

 import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

 import org.eclipse.osgi.util.NLS;

-import org.eclipse.papyrus.diagram.usecase.part.Messages;

-import org.eclipse.papyrus.diagram.usecase.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.usecase.part.Messages;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/part/DiagramEditorContextMenuProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/part/DiagramEditorContextMenuProvider.java
index f2f4b72b1b7..1d578ae043c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/part/DiagramEditorContextMenuProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/part/DiagramEditorContextMenuProvider.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.part;

+package org.eclipse.papyrus.uml.diagram.usecase.part;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.transaction.util.TransactionUtil;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/part/LoadResourceAction.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/part/LoadResourceAction.java
index 6b96f76a006..ebcb2491b05 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/part/LoadResourceAction.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/part/LoadResourceAction.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.part;

+package org.eclipse.papyrus.uml.diagram.usecase.part;

 

 import org.eclipse.core.commands.AbstractHandler;

 import org.eclipse.core.commands.ExecutionEvent;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/part/Messages.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/part/Messages.java
index 05ba6564518..5dd768e6fca 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/part/Messages.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/part/Messages.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.part;

+package org.eclipse.papyrus.uml.diagram.usecase.part;

 

 import org.eclipse.osgi.util.NLS;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/part/ModelElementSelectionPage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/part/ModelElementSelectionPage.java
index db3b5d6dc5a..69b03d19edc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/part/ModelElementSelectionPage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/part/ModelElementSelectionPage.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.part;

+package org.eclipse.papyrus.uml.diagram.usecase.part;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.ecore.util.FeatureMap;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/part/UMLCreationWizard.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/part/UMLCreationWizard.java
index b3854a6d870..adaef7f4024 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/part/UMLCreationWizard.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/part/UMLCreationWizard.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.part;

+package org.eclipse.papyrus.uml.diagram.usecase.part;

 

 import java.lang.reflect.InvocationTargetException;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/part/UMLCreationWizardPage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/part/UMLCreationWizardPage.java
index b0aa5855410..1f675f9ced1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/part/UMLCreationWizardPage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/part/UMLCreationWizardPage.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.part;

+package org.eclipse.papyrus.uml.diagram.usecase.part;

 

 import org.eclipse.core.runtime.IPath;

 import org.eclipse.core.runtime.Path;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/part/UMLDiagramActionBarContributor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/part/UMLDiagramActionBarContributor.java
index f028029a5da..eccf8f5d111 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/part/UMLDiagramActionBarContributor.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/part/UMLDiagramActionBarContributor.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.part;

+package org.eclipse.papyrus.uml.diagram.usecase.part;

 

 import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramActionBarContributor;

 import org.eclipse.jface.action.GroupMarker;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/part/UMLDiagramEditor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/part/UMLDiagramEditor.java
index 5df3c033483..0048e14cd54 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/part/UMLDiagramEditor.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/part/UMLDiagramEditor.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.part;

+package org.eclipse.papyrus.uml.diagram.usecase.part;

 

 import java.util.EventObject;

 

@@ -46,12 +46,12 @@ import org.eclipse.papyrus.core.adaptor.gmf.GmfMultiDiagramDocumentProvider;
 import org.eclipse.papyrus.core.editor.IMultiDiagramEditor;

 import org.eclipse.papyrus.core.services.ServiceException;

 import org.eclipse.papyrus.core.services.ServicesRegistry;

-import org.eclipse.papyrus.diagram.common.listeners.DropTargetListener;

-import org.eclipse.papyrus.diagram.common.part.PapyrusPaletteContextMenuProvider;

-import org.eclipse.papyrus.diagram.common.part.PapyrusPaletteViewer;

-import org.eclipse.papyrus.diagram.common.part.UmlGmfDiagramEditor;

-import org.eclipse.papyrus.diagram.common.service.PapyrusPaletteService;

-import org.eclipse.papyrus.diagram.usecase.navigator.UMLNavigatorItem;

+import org.eclipse.papyrus.uml.diagram.common.listeners.DropTargetListener;

+import org.eclipse.papyrus.uml.diagram.common.part.PapyrusPaletteContextMenuProvider;

+import org.eclipse.papyrus.uml.diagram.common.part.PapyrusPaletteViewer;

+import org.eclipse.papyrus.uml.diagram.common.part.UmlGmfDiagramEditor;

+import org.eclipse.papyrus.uml.diagram.common.service.PapyrusPaletteService;

+import org.eclipse.papyrus.uml.diagram.usecase.navigator.UMLNavigatorItem;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.dnd.TransferData;

 import org.eclipse.swt.events.KeyEvent;

@@ -74,12 +74,12 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh
 	/**

 	 * @generated

 	 */

-	public static final String ID = "org.eclipse.papyrus.diagram.usecase.part.UMLDiagramEditorID"; //$NON-NLS-1$

+	public static final String ID = "org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorID"; //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final String CONTEXT_ID = "org.eclipse.papyrus.diagram.usecase.ui.diagramContext"; //$NON-NLS-1$

+	public static final String CONTEXT_ID = "org.eclipse.papyrus.uml.diagram.usecase.ui.diagramContext"; //$NON-NLS-1$

 

 	/**

 	 * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/part/UMLDiagramEditorPlugin.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/part/UMLDiagramEditorPlugin.java
index 7d6b0569eb4..dc701e2bbc6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/part/UMLDiagramEditorPlugin.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/part/UMLDiagramEditorPlugin.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.part;

+package org.eclipse.papyrus.uml.diagram.usecase.part;

 

 import java.util.ArrayList;

 import java.util.List;

@@ -31,11 +31,11 @@ import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;
 import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.resource.ImageDescriptor;

-import org.eclipse.papyrus.diagram.usecase.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.usecase.expressions.UMLOCLFactory;

-import org.eclipse.papyrus.diagram.usecase.preferences.DiagramPreferenceInitializer;

-import org.eclipse.papyrus.diagram.usecase.providers.ElementInitializers;

 import org.eclipse.papyrus.preferences.Activator;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.expressions.UMLOCLFactory;

+import org.eclipse.papyrus.uml.diagram.usecase.preferences.DiagramPreferenceInitializer;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.ElementInitializers;

 import org.eclipse.swt.graphics.Image;

 import org.eclipse.ui.plugin.AbstractUIPlugin;

 import org.eclipse.uml2.uml.edit.providers.UMLItemProviderAdapterFactory;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/part/UMLDiagramEditorUtil.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/part/UMLDiagramEditorUtil.java
index c92f53ab067..7dc3d64ce0b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/part/UMLDiagramEditorUtil.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/part/UMLDiagramEditorUtil.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.part;

+package org.eclipse.papyrus.uml.diagram.usecase.part;

 

 import java.io.IOException;

 import java.util.Collections;

@@ -56,7 +56,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.dialogs.IDialogSettings;

 import org.eclipse.jface.wizard.Wizard;

 import org.eclipse.jface.wizard.WizardDialog;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

 import org.eclipse.swt.widgets.Shell;

 import org.eclipse.ui.IWorkbenchPage;

 import org.eclipse.ui.PartInitException;

@@ -177,8 +177,8 @@ public class UMLDiagramEditorUtil {
 				}

 

 				try {

-					modelResource.save(org.eclipse.papyrus.diagram.usecase.part.UMLDiagramEditorUtil.getSaveOptions());

-					diagramResource.save(org.eclipse.papyrus.diagram.usecase.part.UMLDiagramEditorUtil.getSaveOptions());

+					modelResource.save(org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorUtil.getSaveOptions());

+					diagramResource.save(org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorUtil.getSaveOptions());

 				} catch (IOException e) {

 

 					UMLDiagramEditorPlugin.getInstance().logError("Unable to store model and diagram resources", e); //$NON-NLS-1$

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/part/UMLDiagramUpdateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/part/UMLDiagramUpdateCommand.java
index 7ea6566ffdc..1611871663d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/part/UMLDiagramUpdateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/part/UMLDiagramUpdateCommand.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.part;

+package org.eclipse.papyrus.uml.diagram.usecase.part;

 

 import java.util.Iterator;

 import java.util.List;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/part/UMLDiagramUpdater.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/part/UMLDiagramUpdater.java
index 68f5debd900..e55bd0d84d0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/part/UMLDiagramUpdater.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/part/UMLDiagramUpdater.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.part;

+package org.eclipse.papyrus.uml.diagram.usecase.part;

 

 import java.util.Collection;

 import java.util.Collections;

@@ -25,50 +25,50 @@ import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.resource.Resource;

 import org.eclipse.emf.ecore.util.EcoreUtil;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ActorAsRectangleEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ActorEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ActorInComponentEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ActorInPackageEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.CommentEditPartCN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.CommentEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ComponentEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ComponentInComponentEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ComponentInPackageEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ComponentUsecases2EditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ComponentUsecases3EditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ComponentUsecasesEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ConstraintEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ConstraintInComponentEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ConstraintInPackageEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ExtendEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ExtensionPointEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ExtensionPointInRectangleEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.IncludeEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.PackageEditPartCN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.PackageEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.PackageMergeEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.PackagePackageableElementCompartment2EditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.PackagePackageableElementCompartmentEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ShortCutDiagramEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseAsRectangleEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseInComponentEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseInPackageEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCasePointsEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCasePointsInComponentEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCasePointsInPackageEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCasePointsInRectangleEditPart;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorAsRectangleEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorInComponentEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorInPackageEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AssociationEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.CommentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.CommentEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ComponentEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ComponentInComponentEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ComponentInPackageEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ComponentUsecases2EditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ComponentUsecases3EditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ComponentUsecasesEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintInComponentEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintInPackageEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ExtendEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ExtensionPointEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ExtensionPointInRectangleEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.IncludeEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageEditPartCN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageImportEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageMergeEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackagePackageableElementCompartment2EditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackagePackageableElementCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ShortCutDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseAsRectangleEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseInComponentEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseInPackageEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCasePointsEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCasePointsInComponentEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCasePointsInPackageEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCasePointsInRectangleEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

 import org.eclipse.uml2.uml.Abstraction;

 import org.eclipse.uml2.uml.Actor;

 import org.eclipse.uml2.uml.Association;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/part/UMLDocumentProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/part/UMLDocumentProvider.java
index d3b4c0d3970..22f75135455 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/part/UMLDocumentProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/part/UMLDocumentProvider.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.part;

+package org.eclipse.papyrus.uml.diagram.usecase.part;

 

 import java.io.IOException;

 import java.util.ArrayList;

@@ -150,7 +150,7 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi
 	 */

 	private TransactionalEditingDomain createEditingDomain() {

 		TransactionalEditingDomain editingDomain = DiagramEditingDomainFactory.getInstance().createEditingDomain();

-		editingDomain.setID("org.eclipse.papyrus.diagram.usecase.EditingDomain"); //$NON-NLS-1$

+		editingDomain.setID("org.eclipse.papyrus.uml.diagram.usecase.EditingDomain"); //$NON-NLS-1$

 		final NotificationFilter diagramResourceModifiedFilter = NotificationFilter.createNotifierFilter(editingDomain.getResourceSet()).and(NotificationFilter.createEventTypeFilter(Notification.ADD)).and(NotificationFilter.createFeatureFilter(ResourceSet.class, ResourceSet.RESOURCE_SET__RESOURCES));

 		editingDomain.getResourceSet().eAdapters().add(new Adapter() {

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/part/UMLInitDiagramFileAction.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/part/UMLInitDiagramFileAction.java
index 48021fa6e66..0bde052f2d4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/part/UMLInitDiagramFileAction.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/part/UMLInitDiagramFileAction.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.part;

+package org.eclipse.papyrus.uml.diagram.usecase.part;

 

 import org.eclipse.core.resources.IFile;

 import org.eclipse.emf.common.util.URI;

@@ -27,7 +27,7 @@ import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;

 import org.eclipse.jface.wizard.Wizard;

 import org.eclipse.osgi.util.NLS;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

 import org.eclipse.swt.widgets.Shell;

 import org.eclipse.ui.IObjectActionDelegate;

 import org.eclipse.ui.IWorkbenchPart;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/part/UMLLinkDescriptor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/part/UMLLinkDescriptor.java
index 583b2c8940f..7b1c7dabafe 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/part/UMLLinkDescriptor.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/part/UMLLinkDescriptor.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.part;

+package org.eclipse.papyrus.uml.diagram.usecase.part;

 

 import org.eclipse.core.runtime.IAdaptable;

 import org.eclipse.emf.ecore.EObject;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/part/UMLMatchingStrategy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/part/UMLMatchingStrategy.java
index 0dc9b13cf99..ad623d0a5cc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/part/UMLMatchingStrategy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/part/UMLMatchingStrategy.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.part;

+package org.eclipse.papyrus.uml.diagram.usecase.part;

 

 import org.eclipse.emf.common.ui.URIEditorInput;

 import org.eclipse.ui.IEditorInput;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/part/UMLNewDiagramFileWizard.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/part/UMLNewDiagramFileWizard.java
index d98c7faab78..0925c7147c4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/part/UMLNewDiagramFileWizard.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/part/UMLNewDiagramFileWizard.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.part;

+package org.eclipse.papyrus.uml.diagram.usecase.part;

 

 import java.io.IOException;

 import java.util.LinkedList;

@@ -38,7 +38,7 @@ import org.eclipse.gmf.runtime.notation.Diagram;
 import org.eclipse.jface.viewers.StructuredSelection;

 import org.eclipse.jface.wizard.Wizard;

 import org.eclipse.osgi.util.NLS;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

 import org.eclipse.ui.PartInitException;

 import org.eclipse.ui.dialogs.WizardNewFileCreationPage;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/part/UMLNodeDescriptor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/part/UMLNodeDescriptor.java
index 31c152b4c49..c6fbc309d85 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/part/UMLNodeDescriptor.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/part/UMLNodeDescriptor.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.part;

+package org.eclipse.papyrus.uml.diagram.usecase.part;

 

 import org.eclipse.emf.ecore.EObject;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/part/UMLPaletteFactory.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/part/UMLPaletteFactory.java
index 516955bf36e..12ed83cc26a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/part/UMLPaletteFactory.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/part/UMLPaletteFactory.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.part;

+package org.eclipse.papyrus.uml.diagram.usecase.part;

 

 import java.util.ArrayList;

 import java.util.List;

@@ -19,9 +19,9 @@ import java.util.List;
 import org.eclipse.gef.Tool;

 import org.eclipse.gmf.runtime.diagram.ui.services.palette.PaletteFactory;

 import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.papyrus.diagram.common.service.AspectUnspecifiedTypeConnectionTool;

-import org.eclipse.papyrus.diagram.common.service.AspectUnspecifiedTypeCreationTool;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.common.service.AspectUnspecifiedTypeConnectionTool;

+import org.eclipse.papyrus.uml.diagram.common.service.AspectUnspecifiedTypeCreationTool;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/part/UMLUriEditorInputTester.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/part/UMLUriEditorInputTester.java
index 3e950bdf3e3..cb29a374156 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/part/UMLUriEditorInputTester.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/part/UMLUriEditorInputTester.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.part;

+package org.eclipse.papyrus.uml.diagram.usecase.part;

 

 import org.eclipse.core.expressions.PropertyTester;

 import org.eclipse.emf.common.ui.URIEditorInput;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/part/UMLVisualIDRegistry.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/part/UMLVisualIDRegistry.java
index d4a405b1ce7..fa67c56b253 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/part/UMLVisualIDRegistry.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/part/UMLVisualIDRegistry.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.part;

+package org.eclipse.papyrus.uml.diagram.usecase.part;

 

 import org.eclipse.core.runtime.Platform;

 import org.eclipse.emf.ecore.EAnnotation;

@@ -19,89 +19,89 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gmf.runtime.notation.Diagram;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.providers.BaseViewInfo;

-import org.eclipse.papyrus.diagram.common.providers.ViewInfo;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.AbstractionNameEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ActorAppliedStereotypeEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ActorAsRectangleEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ActorAsRectangleNameEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ActorEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ActorInComponentAppliedStereotypeEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ActorInComponentEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ActorInComponentNameEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ActorInPackageAppliedStereotypeEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ActorInPackageEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ActorInPackageNameEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ActorNameEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.AppliedStereotypeAbstractionEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.AppliedStereotypePackageMergeEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.AppliedStereotypeUsageEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.AssociationAppliedStereotypeEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.AssociationNameEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.CommentBodyEditPartCN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.CommentBodyEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.CommentEditPartCN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.CommentEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ComponentEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ComponentInComponentEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ComponentInComponentNameEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ComponentInPackageEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ComponentInPackageNameEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ComponentNameEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ComponentUsecases2EditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ComponentUsecases3EditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ComponentUsecasesEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ConstraintEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ConstraintInComponentEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ConstraintInComponentNameEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ConstraintInPackageEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ConstraintInPackageNameEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ConstraintNameEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.DependencyAppliedStereotypeEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.DependencyNameEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.DiagramNameEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ExtendAppliedStereotypeEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ExtendEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ExtendsLink_fixedEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ExtensionPointEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ExtensionPointInRectangleEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.GeneralizationAppliedStereotypeEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.IncludeAppliedStereotypeEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.IncludeEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.IncludeLink_fixedEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.PackageEditPartCN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.PackageEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.PackageImportAppliedStereotypeEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.PackageMergeEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.PackageNameEditPartCN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.PackageNameEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.PackagePackageableElementCompartment2EditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.PackagePackageableElementCompartmentEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.RealizationAppliedStereotypeEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.RealizationNameEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ShortCutDiagramEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UsageNameEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseAsRectangleEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseAsRectangleNameEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseInComponentEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseInComponentNameEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseInPackageEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseInPackageNameEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseNameEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCasePointsEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCasePointsInComponentEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCasePointsInPackageEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCasePointsInRectangleEditPart;

-import org.eclipse.papyrus.diagram.usecase.expressions.UMLOCLFactory;

+import org.eclipse.papyrus.uml.diagram.common.providers.BaseViewInfo;

+import org.eclipse.papyrus.uml.diagram.common.providers.ViewInfo;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AbstractionNameEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorAppliedStereotypeEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorAsRectangleEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorAsRectangleNameEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorInComponentAppliedStereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorInComponentEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorInComponentNameEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorInPackageAppliedStereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorInPackageEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorInPackageNameEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorNameEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AppliedStereotypeAbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AppliedStereotypePackageMergeEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AppliedStereotypeUsageEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AssociationAppliedStereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AssociationEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AssociationNameEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.CommentBodyEditPartCN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.CommentBodyEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.CommentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.CommentEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ComponentEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ComponentInComponentEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ComponentInComponentNameEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ComponentInPackageEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ComponentInPackageNameEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ComponentNameEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ComponentUsecases2EditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ComponentUsecases3EditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ComponentUsecasesEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintInComponentEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintInComponentNameEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintInPackageEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintInPackageNameEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintNameEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.DependencyAppliedStereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.DependencyNameEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.DiagramNameEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ExtendAppliedStereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ExtendEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ExtendsLink_fixedEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ExtensionPointEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ExtensionPointInRectangleEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.GeneralizationAppliedStereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.IncludeAppliedStereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.IncludeEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.IncludeLink_fixedEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageEditPartCN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageImportAppliedStereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageImportEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageMergeEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageNameEditPartCN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageNameEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackagePackageableElementCompartment2EditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackagePackageableElementCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.RealizationAppliedStereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.RealizationNameEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ShortCutDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UsageNameEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseAsRectangleEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseAsRectangleNameEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseInComponentEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseInComponentNameEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseInPackageEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseInPackageNameEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseNameEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCasePointsEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCasePointsInComponentEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCasePointsInPackageEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCasePointsInRectangleEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.expressions.UMLOCLFactory;

 import org.eclipse.uml2.uml.Abstraction;

 import org.eclipse.uml2.uml.Association;

 import org.eclipse.uml2.uml.Dependency;

@@ -121,7 +121,7 @@ public class UMLVisualIDRegistry {
 	/**

 	 * @generated

 	 */

-	private static final String DEBUG_KEY = "org.eclipse.papyrus.diagram.usecase/debug/visualID"; //$NON-NLS-1$

+	private static final String DEBUG_KEY = "org.eclipse.papyrus.uml.diagram.usecase/debug/visualID"; //$NON-NLS-1$

 

 	/**

 	 * @generated

@@ -134,7 +134,7 @@ public class UMLVisualIDRegistry {
 				return -1;

 			}

 		}

-		return org.eclipse.papyrus.diagram.usecase.part.UMLVisualIDRegistry.getVisualID(view.getType());

+		return org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry.getVisualID(view.getType());

 	}

 

 	/**

@@ -194,13 +194,13 @@ public class UMLVisualIDRegistry {
 		if(domainElement == null) {

 			return -1;

 		}

-		String containerModelID = org.eclipse.papyrus.diagram.usecase.part.UMLVisualIDRegistry.getModelID(containerView);

+		String containerModelID = org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry.getModelID(containerView);

 		if(!UseCaseDiagramEditPart.MODEL_ID.equals(containerModelID)) {

 			return -1;

 		}

 		int containerVisualID;

 		if(UseCaseDiagramEditPart.MODEL_ID.equals(containerModelID)) {

-			containerVisualID = org.eclipse.papyrus.diagram.usecase.part.UMLVisualIDRegistry.getVisualID(containerView);

+			containerVisualID = org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry.getVisualID(containerView);

 		} else {

 			if(containerView instanceof Diagram) {

 				containerVisualID = UseCaseDiagramEditPart.VISUAL_ID;

@@ -437,13 +437,13 @@ public class UMLVisualIDRegistry {
 	 * @generated

 	 */

 	public static boolean canCreateNode(View containerView, int nodeVisualID) {

-		String containerModelID = org.eclipse.papyrus.diagram.usecase.part.UMLVisualIDRegistry.getModelID(containerView);

+		String containerModelID = org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry.getModelID(containerView);

 		if(!UseCaseDiagramEditPart.MODEL_ID.equals(containerModelID)) {

 			return false;

 		}

 		int containerVisualID;

 		if(UseCaseDiagramEditPart.MODEL_ID.equals(containerModelID)) {

-			containerVisualID = org.eclipse.papyrus.diagram.usecase.part.UMLVisualIDRegistry.getVisualID(containerView);

+			containerVisualID = org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry.getVisualID(containerView);

 		} else {

 			if(containerView instanceof Diagram) {

 				containerVisualID = UseCaseDiagramEditPart.VISUAL_ID;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/part/ValidateAction.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/part/ValidateAction.java
index 0355b19bbe2..40b3161c2cd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/part/ValidateAction.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/part/ValidateAction.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.usecase.part;

+package org.eclipse.papyrus.uml.diagram.usecase.part;

 

 import java.lang.reflect.InvocationTargetException;

 import java.util.ArrayList;

@@ -29,8 +29,8 @@ import org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.action.Action;

 import org.eclipse.jface.operation.IRunnableWithProgress;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLMarkerNavigationProvider;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLValidationProvider;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLMarkerNavigationProvider;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLValidationProvider;

 import org.eclipse.ui.IEditorPart;

 import org.eclipse.ui.IWorkbenchPage;

 import org.eclipse.ui.IWorkbenchPart;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/preferences/AbstractionPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/AbstractionPreferencePage.java
index 783649aebc8..7f1f8aafb35 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/preferences/AbstractionPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/AbstractionPreferencePage.java
@@ -11,17 +11,17 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.preferences;

+package org.eclipse.papyrus.uml.diagram.usecase.preferences;

 

 import java.util.Map;

 import java.util.TreeMap;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.common.util.StringComparator;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

-import org.eclipse.papyrus.diagram.usecase.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusLinkPreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

@@ -63,8 +63,8 @@ public class AbstractionPreferencePage extends AbstractPapyrusLinkPreferencePage
 	 */

 	private static TreeMap<String, String> getStaticLabelRole() {

 		TreeMap<String, String> map = new TreeMap<String, String>(new StringComparator());

-		map.put("Name", "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/label_role/name.png");//$NON-NLS-1$ //$NON-NLS-2$

-		map.put("Stereotype", "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/stereotype.gif");//$NON-NLS-1$ //$NON-NLS-2$

+		map.put("Name", "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/name.png");//$NON-NLS-1$ //$NON-NLS-2$

+		map.put("Stereotype", "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/stereotype.gif");//$NON-NLS-1$ //$NON-NLS-2$

 		return map;

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/preferences/ActorPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/ActorPreferencePage.java
index c0a9db2e22d..3c31e4995b3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/preferences/ActorPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/ActorPreferencePage.java
@@ -11,13 +11,13 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.preferences;

+package org.eclipse.papyrus.uml.diagram.usecase.preferences;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

-import org.eclipse.papyrus.diagram.usecase.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/preferences/AssociationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/AssociationPreferencePage.java
index 5ea887300d4..ba91a24afd0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/preferences/AssociationPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/AssociationPreferencePage.java
@@ -11,17 +11,17 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.preferences;

+package org.eclipse.papyrus.uml.diagram.usecase.preferences;

 

 import java.util.Map;

 import java.util.TreeMap;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.common.util.StringComparator;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

-import org.eclipse.papyrus.diagram.usecase.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusLinkPreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

@@ -63,8 +63,8 @@ public class AssociationPreferencePage extends AbstractPapyrusLinkPreferencePage
 	 */

 	private static TreeMap<String, String> getStaticLabelRole() {

 		TreeMap<String, String> map = new TreeMap<String, String>(new StringComparator());

-		map.put("Name", "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/label_role/name.png");//$NON-NLS-1$ //$NON-NLS-2$

-		map.put("Stereotype", "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/stereotype.gif");//$NON-NLS-1$ //$NON-NLS-2$

+		map.put("Name", "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/name.png");//$NON-NLS-1$ //$NON-NLS-2$

+		map.put("Stereotype", "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/stereotype.gif");//$NON-NLS-1$ //$NON-NLS-2$

 		return map;

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/preferences/CommentPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/CommentPreferencePage.java
index 56569e9795a..3b8efd59d0a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/preferences/CommentPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/CommentPreferencePage.java
@@ -11,13 +11,13 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.preferences;

+package org.eclipse.papyrus.uml.diagram.usecase.preferences;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

-import org.eclipse.papyrus.diagram.usecase.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/preferences/ComponentPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/ComponentPreferencePage.java
index 48fd13b4aba..d7a90d503db 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/preferences/ComponentPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/ComponentPreferencePage.java
@@ -11,16 +11,16 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.preferences;

+package org.eclipse.papyrus.uml.diagram.usecase.preferences;

 

 import java.util.Map;

 import java.util.TreeMap;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

-import org.eclipse.papyrus.diagram.usecase.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/preferences/ConstraintPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/ConstraintPreferencePage.java
index e131ac82657..b452f2210f5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/preferences/ConstraintPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/ConstraintPreferencePage.java
@@ -11,13 +11,13 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.preferences;

+package org.eclipse.papyrus.uml.diagram.usecase.preferences;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

-import org.eclipse.papyrus.diagram.usecase.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/preferences/DependencyPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/DependencyPreferencePage.java
index 6c6f1d31f24..be329da478f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/preferences/DependencyPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/DependencyPreferencePage.java
@@ -11,17 +11,17 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.preferences;

+package org.eclipse.papyrus.uml.diagram.usecase.preferences;

 

 import java.util.Map;

 import java.util.TreeMap;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.common.util.StringComparator;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

-import org.eclipse.papyrus.diagram.usecase.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusLinkPreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

@@ -63,8 +63,8 @@ public class DependencyPreferencePage extends AbstractPapyrusLinkPreferencePage
 	 */

 	private static TreeMap<String, String> getStaticLabelRole() {

 		TreeMap<String, String> map = new TreeMap<String, String>(new StringComparator());

-		map.put("Name", "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/label_role/name.png");//$NON-NLS-1$ //$NON-NLS-2$

-		map.put("Stereotype", "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/stereotype.gif");//$NON-NLS-1$ //$NON-NLS-2$

+		map.put("Name", "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/name.png");//$NON-NLS-1$ //$NON-NLS-2$

+		map.put("Stereotype", "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/stereotype.gif");//$NON-NLS-1$ //$NON-NLS-2$

 		return map;

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/preferences/DiagramAppearancePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/DiagramAppearancePreferencePage.java
index 021e82ee103..c607c2299e7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/preferences/DiagramAppearancePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/DiagramAppearancePreferencePage.java
@@ -11,10 +11,10 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.preferences;

+package org.eclipse.papyrus.uml.diagram.usecase.preferences;

 

 import org.eclipse.gmf.runtime.diagram.ui.preferences.AppearancePreferencePage;

-import org.eclipse.papyrus.diagram.usecase.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/preferences/DiagramConnectionsPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/DiagramConnectionsPreferencePage.java
index 09b9590bb85..4a52cc471d2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/preferences/DiagramConnectionsPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/DiagramConnectionsPreferencePage.java
@@ -11,10 +11,10 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.preferences;

+package org.eclipse.papyrus.uml.diagram.usecase.preferences;

 

 import org.eclipse.gmf.runtime.diagram.ui.preferences.ConnectionsPreferencePage;

-import org.eclipse.papyrus.diagram.usecase.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/preferences/DiagramGeneralPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/DiagramGeneralPreferencePage.java
index 77405654344..f9cfe278f9d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/preferences/DiagramGeneralPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/DiagramGeneralPreferencePage.java
@@ -11,11 +11,11 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.preferences;

+package org.eclipse.papyrus.uml.diagram.usecase.preferences;

 

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

-import org.eclipse.papyrus.diagram.usecase.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.DiagramPreferencePage;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/preferences/DiagramPreferenceInitializer.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/DiagramPreferenceInitializer.java
index bc5368cd094..a4df25328eb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/preferences/DiagramPreferenceInitializer.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/DiagramPreferenceInitializer.java
@@ -11,11 +11,11 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.preferences;

+package org.eclipse.papyrus.uml.diagram.usecase.preferences;

 

 import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.usecase.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/preferences/DiagramPrintingPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/DiagramPrintingPreferencePage.java
index 24e98bd7992..a1757356c5f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/preferences/DiagramPrintingPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/DiagramPrintingPreferencePage.java
@@ -11,10 +11,10 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.preferences;

+package org.eclipse.papyrus.uml.diagram.usecase.preferences;

 

 import org.eclipse.gmf.runtime.diagram.ui.preferences.PrintingPreferencePage;

-import org.eclipse.papyrus.diagram.usecase.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/preferences/DiagramRulersAndGridPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/DiagramRulersAndGridPreferencePage.java
index 3471d0cd2f0..c32a8a9e9e2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/preferences/DiagramRulersAndGridPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/DiagramRulersAndGridPreferencePage.java
@@ -11,10 +11,10 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.preferences;

+package org.eclipse.papyrus.uml.diagram.usecase.preferences;

 

 import org.eclipse.gmf.runtime.diagram.ui.preferences.RulerGridPreferencePage;

-import org.eclipse.papyrus.diagram.usecase.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/preferences/ExtendPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/ExtendPreferencePage.java
index 2ed26c71d89..f1467539482 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/preferences/ExtendPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/ExtendPreferencePage.java
@@ -11,17 +11,17 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.preferences;

+package org.eclipse.papyrus.uml.diagram.usecase.preferences;

 

 import java.util.Map;

 import java.util.TreeMap;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.common.util.StringComparator;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

-import org.eclipse.papyrus.diagram.usecase.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusLinkPreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

@@ -63,7 +63,7 @@ public class ExtendPreferencePage extends AbstractPapyrusLinkPreferencePage {
 	 */

 	private static TreeMap<String, String> getStaticLabelRole() {

 		TreeMap<String, String> map = new TreeMap<String, String>(new StringComparator());

-		map.put("Stereotype", "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/stereotype.gif");//$NON-NLS-1$ //$NON-NLS-2$

+		map.put("Stereotype", "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/stereotype.gif");//$NON-NLS-1$ //$NON-NLS-2$

 		return map;

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/preferences/ExtensionPointPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/ExtensionPointPreferencePage.java
index 37f532c9572..fc268d1a11e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/preferences/ExtensionPointPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/ExtensionPointPreferencePage.java
@@ -11,13 +11,13 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.preferences;

+package org.eclipse.papyrus.uml.diagram.usecase.preferences;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

-import org.eclipse.papyrus.diagram.usecase.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/preferences/GeneralizationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/GeneralizationPreferencePage.java
index af9562c98a9..c31107c22c7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/preferences/GeneralizationPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/GeneralizationPreferencePage.java
@@ -11,17 +11,17 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.preferences;

+package org.eclipse.papyrus.uml.diagram.usecase.preferences;

 

 import java.util.Map;

 import java.util.TreeMap;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.common.util.StringComparator;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

-import org.eclipse.papyrus.diagram.usecase.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusLinkPreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

@@ -63,7 +63,7 @@ public class GeneralizationPreferencePage extends AbstractPapyrusLinkPreferenceP
 	 */

 	private static TreeMap<String, String> getStaticLabelRole() {

 		TreeMap<String, String> map = new TreeMap<String, String>(new StringComparator());

-		map.put("Stereotype", "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/stereotype.gif");//$NON-NLS-1$ //$NON-NLS-2$

+		map.put("Stereotype", "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/stereotype.gif");//$NON-NLS-1$ //$NON-NLS-2$

 		return map;

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/preferences/IncludePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/IncludePreferencePage.java
index 0385d5de1a3..95cf01c0ba8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/preferences/IncludePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/IncludePreferencePage.java
@@ -11,17 +11,17 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.preferences;

+package org.eclipse.papyrus.uml.diagram.usecase.preferences;

 

 import java.util.Map;

 import java.util.TreeMap;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.common.util.StringComparator;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

-import org.eclipse.papyrus.diagram.usecase.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusLinkPreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

@@ -63,7 +63,7 @@ public class IncludePreferencePage extends AbstractPapyrusLinkPreferencePage {
 	 */

 	private static TreeMap<String, String> getStaticLabelRole() {

 		TreeMap<String, String> map = new TreeMap<String, String>(new StringComparator());

-		map.put("Stereotype", "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/stereotype.gif");//$NON-NLS-1$ //$NON-NLS-2$

+		map.put("Stereotype", "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/stereotype.gif");//$NON-NLS-1$ //$NON-NLS-2$

 		return map;

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/preferences/PackageImportPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/PackageImportPreferencePage.java
index 082fdee7126..1cc74b3f080 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/preferences/PackageImportPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/PackageImportPreferencePage.java
@@ -11,17 +11,17 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.preferences;

+package org.eclipse.papyrus.uml.diagram.usecase.preferences;

 

 import java.util.Map;

 import java.util.TreeMap;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.common.util.StringComparator;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

-import org.eclipse.papyrus.diagram.usecase.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusLinkPreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

@@ -63,7 +63,7 @@ public class PackageImportPreferencePage extends AbstractPapyrusLinkPreferencePa
 	 */

 	private static TreeMap<String, String> getStaticLabelRole() {

 		TreeMap<String, String> map = new TreeMap<String, String>(new StringComparator());

-		map.put("Stereotype", "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/stereotype.gif");//$NON-NLS-1$ //$NON-NLS-2$

+		map.put("Stereotype", "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/stereotype.gif");//$NON-NLS-1$ //$NON-NLS-2$

 		return map;

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/preferences/PackageMergePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/PackageMergePreferencePage.java
index b6ce3504965..c3b0f2e8482 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/preferences/PackageMergePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/PackageMergePreferencePage.java
@@ -11,17 +11,17 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.preferences;

+package org.eclipse.papyrus.uml.diagram.usecase.preferences;

 

 import java.util.Map;

 import java.util.TreeMap;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.common.util.StringComparator;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

-import org.eclipse.papyrus.diagram.usecase.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusLinkPreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

@@ -63,7 +63,7 @@ public class PackageMergePreferencePage extends AbstractPapyrusLinkPreferencePag
 	 */

 	private static TreeMap<String, String> getStaticLabelRole() {

 		TreeMap<String, String> map = new TreeMap<String, String>(new StringComparator());

-		map.put("Stereotype", "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/stereotype.gif");//$NON-NLS-1$ //$NON-NLS-2$

+		map.put("Stereotype", "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/stereotype.gif");//$NON-NLS-1$ //$NON-NLS-2$

 		return map;

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/preferences/PackagePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/PackagePreferencePage.java
index c5d55c90077..a3ccf724122 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/preferences/PackagePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/PackagePreferencePage.java
@@ -11,16 +11,16 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.preferences;

+package org.eclipse.papyrus.uml.diagram.usecase.preferences;

 

 import java.util.Map;

 import java.util.TreeMap;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

-import org.eclipse.papyrus.diagram.usecase.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/preferences/RealizationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/RealizationPreferencePage.java
index 0ec5c53f26e..0664bdd64d4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/preferences/RealizationPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/RealizationPreferencePage.java
@@ -11,17 +11,17 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.preferences;

+package org.eclipse.papyrus.uml.diagram.usecase.preferences;

 

 import java.util.Map;

 import java.util.TreeMap;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.common.util.StringComparator;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

-import org.eclipse.papyrus.diagram.usecase.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusLinkPreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

@@ -63,8 +63,8 @@ public class RealizationPreferencePage extends AbstractPapyrusLinkPreferencePage
 	 */

 	private static TreeMap<String, String> getStaticLabelRole() {

 		TreeMap<String, String> map = new TreeMap<String, String>(new StringComparator());

-		map.put("Name", "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/label_role/name.png");//$NON-NLS-1$ //$NON-NLS-2$

-		map.put("Stereotype", "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/stereotype.gif");//$NON-NLS-1$ //$NON-NLS-2$

+		map.put("Name", "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/name.png");//$NON-NLS-1$ //$NON-NLS-2$

+		map.put("Stereotype", "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/stereotype.gif");//$NON-NLS-1$ //$NON-NLS-2$

 		return map;

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/preferences/ShortCutDiagramPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/ShortCutDiagramPreferencePage.java
index 53e1d8ab481..2c7d3ed9d87 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/preferences/ShortCutDiagramPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/ShortCutDiagramPreferencePage.java
@@ -11,17 +11,17 @@
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.preferences;

+package org.eclipse.papyrus.uml.diagram.usecase.preferences;

 

 import java.util.Map;

 import java.util.TreeMap;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.common.util.StringComparator;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

-import org.eclipse.papyrus.diagram.usecase.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

@@ -77,7 +77,7 @@ public class ShortCutDiagramPreferencePage extends AbstractPapyrusNodePreference
 	 */

 	private static TreeMap<String, String> getStaticLabelRole() {

 		TreeMap<String, String> map = new TreeMap<String, String>(new StringComparator());

-		map.put("Name", "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/label_role/name.png");//$NON-NLS-1$

+		map.put("Name", "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/name.png");//$NON-NLS-1$

 		return map;

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/preferences/UsagePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/UsagePreferencePage.java
index 29c1d115eac..4c144225d9a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/preferences/UsagePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/UsagePreferencePage.java
@@ -11,17 +11,17 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.preferences;

+package org.eclipse.papyrus.uml.diagram.usecase.preferences;

 

 import java.util.Map;

 import java.util.TreeMap;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.common.util.StringComparator;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

-import org.eclipse.papyrus.diagram.usecase.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusLinkPreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

@@ -63,8 +63,8 @@ public class UsagePreferencePage extends AbstractPapyrusLinkPreferencePage {
 	 */

 	private static TreeMap<String, String> getStaticLabelRole() {

 		TreeMap<String, String> map = new TreeMap<String, String>(new StringComparator());

-		map.put("Name", "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/label_role/name.png");//$NON-NLS-1$ //$NON-NLS-2$

-		map.put("Stereotype", "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/stereotype.gif");//$NON-NLS-1$ //$NON-NLS-2$

+		map.put("Name", "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/name.png");//$NON-NLS-1$ //$NON-NLS-2$

+		map.put("Stereotype", "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/stereotype.gif");//$NON-NLS-1$ //$NON-NLS-2$

 		return map;

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/preferences/UseCaseDiagramPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/UseCaseDiagramPreferencePage.java
index d568ff0a994..9934c229903 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/preferences/UseCaseDiagramPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/UseCaseDiagramPreferencePage.java
@@ -11,11 +11,11 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.preferences;

+package org.eclipse.papyrus.uml.diagram.usecase.preferences;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.usecase.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusPreferencePage;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin;

 import org.eclipse.swt.widgets.Composite;

 

 public class UseCaseDiagramPreferencePage extends AbstractPapyrusPreferencePage {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/preferences/UseCasePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/UseCasePreferencePage.java
index 9aaa57e606c..472e7f40744 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/preferences/UseCasePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/UseCasePreferencePage.java
@@ -11,16 +11,16 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.preferences;

+package org.eclipse.papyrus.uml.diagram.usecase.preferences;

 

 import java.util.Map;

 import java.util.TreeMap;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

-import org.eclipse.papyrus.diagram.usecase.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/providers/ElementInitializers.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/ElementInitializers.java
index 09da8f03a77..432055bde45 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/providers/ElementInitializers.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/ElementInitializers.java
@@ -11,13 +11,13 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.providers;

+package org.eclipse.papyrus.uml.diagram.usecase.providers;

 

 import java.util.Collection;

 

-import org.eclipse.papyrus.diagram.common.helper.NamedElementHelper;

-import org.eclipse.papyrus.diagram.usecase.expressions.UMLOCLFactory;

-import org.eclipse.papyrus.diagram.usecase.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.common.helper.NamedElementHelper;

+import org.eclipse.papyrus.uml.diagram.usecase.expressions.UMLOCLFactory;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin;

 import org.eclipse.uml2.uml.Abstraction;

 import org.eclipse.uml2.uml.Actor;

 import org.eclipse.uml2.uml.Association;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/providers/UMLEditPartProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLEditPartProvider.java
index 303a945122d..32d77240399 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/providers/UMLEditPartProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLEditPartProvider.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.providers;

+package org.eclipse.papyrus.uml.diagram.usecase.providers;

 

 import java.lang.ref.WeakReference;

 

@@ -23,9 +23,9 @@ import org.eclipse.gmf.runtime.diagram.ui.services.editpart.AbstractEditPartProv
 import org.eclipse.gmf.runtime.diagram.ui.services.editpart.CreateGraphicEditPartOperation;

 import org.eclipse.gmf.runtime.diagram.ui.services.editpart.IEditPartOperation;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UMLEditPartFactory;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

-import org.eclipse.papyrus.diagram.usecase.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UMLEditPartFactory;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/providers/UMLElementTypes.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLElementTypes.java
index 9acc7622e8c..1fc711a0570 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/providers/UMLElementTypes.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLElementTypes.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.providers;

+package org.eclipse.papyrus.uml.diagram.usecase.providers;

 

 import java.util.HashSet;

 import java.util.IdentityHashMap;

@@ -28,41 +28,41 @@ import org.eclipse.gmf.runtime.emf.type.core.IElementType;
 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.jface.resource.ImageDescriptor;

 import org.eclipse.jface.resource.ImageRegistry;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ActorAsRectangleEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ActorEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ActorInComponentEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ActorInPackageEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.CommentEditPartCN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.CommentEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ComponentEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ComponentInComponentEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ComponentInPackageEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ConstraintEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ConstraintInComponentEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ConstraintInPackageEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ExtendEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ExtensionPointEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ExtensionPointInRectangleEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.IncludeEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.PackageEditPartCN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.PackageEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.PackageMergeEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ShortCutDiagramEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseAsRectangleEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseInComponentEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseInPackageEditPart;

-import org.eclipse.papyrus.diagram.usecase.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorAsRectangleEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorInComponentEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorInPackageEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AssociationEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.CommentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.CommentEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ComponentEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ComponentInComponentEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ComponentInPackageEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintInComponentEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintInPackageEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ExtendEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ExtensionPointEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ExtensionPointInRectangleEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.IncludeEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageEditPartCN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageImportEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageMergeEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ShortCutDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseAsRectangleEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseInComponentEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseInPackageEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin;

 import org.eclipse.swt.graphics.Image;

 import org.eclipse.uml2.uml.UMLPackage;

 

@@ -95,172 +95,172 @@ public class UMLElementTypes {
 	/**

 	 * @generated

 	 */

-	public static final IElementType Package_1000 = getElementType("org.eclipse.papyrus.diagram.usecase.Package_1000"); //$NON-NLS-1$

+	public static final IElementType Package_1000 = getElementType("org.eclipse.papyrus.uml.diagram.usecase.Package_1000"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Actor_2011 = getElementType("org.eclipse.papyrus.diagram.usecase.Actor_2011"); //$NON-NLS-1$

+	public static final IElementType Actor_2011 = getElementType("org.eclipse.papyrus.uml.diagram.usecase.Actor_2011"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Actor_2012 = getElementType("org.eclipse.papyrus.diagram.usecase.Actor_2012"); //$NON-NLS-1$

+	public static final IElementType Actor_2012 = getElementType("org.eclipse.papyrus.uml.diagram.usecase.Actor_2012"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType UseCase_2013 = getElementType("org.eclipse.papyrus.diagram.usecase.UseCase_2013"); //$NON-NLS-1$

+	public static final IElementType UseCase_2013 = getElementType("org.eclipse.papyrus.uml.diagram.usecase.UseCase_2013"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType UseCase_2014 = getElementType("org.eclipse.papyrus.diagram.usecase.UseCase_2014"); //$NON-NLS-1$

+	public static final IElementType UseCase_2014 = getElementType("org.eclipse.papyrus.uml.diagram.usecase.UseCase_2014"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Component_2015 = getElementType("org.eclipse.papyrus.diagram.usecase.Component_2015"); //$NON-NLS-1$

+	public static final IElementType Component_2015 = getElementType("org.eclipse.papyrus.uml.diagram.usecase.Component_2015"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Package_2016 = getElementType("org.eclipse.papyrus.diagram.usecase.Package_2016"); //$NON-NLS-1$

+	public static final IElementType Package_2016 = getElementType("org.eclipse.papyrus.uml.diagram.usecase.Package_2016"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Constraint_2017 = getElementType("org.eclipse.papyrus.diagram.usecase.Constraint_2017"); //$NON-NLS-1$

+	public static final IElementType Constraint_2017 = getElementType("org.eclipse.papyrus.uml.diagram.usecase.Constraint_2017"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Comment_2018 = getElementType("org.eclipse.papyrus.diagram.usecase.Comment_2018"); //$NON-NLS-1$

+	public static final IElementType Comment_2018 = getElementType("org.eclipse.papyrus.uml.diagram.usecase.Comment_2018"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Diagram_2019 = getElementType("org.eclipse.papyrus.diagram.usecase.Diagram_2019"); //$NON-NLS-1$

+	public static final IElementType Diagram_2019 = getElementType("org.eclipse.papyrus.uml.diagram.usecase.Diagram_2019"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType ExtensionPoint_3007 = getElementType("org.eclipse.papyrus.diagram.usecase.ExtensionPoint_3007"); //$NON-NLS-1$

+	public static final IElementType ExtensionPoint_3007 = getElementType("org.eclipse.papyrus.uml.diagram.usecase.ExtensionPoint_3007"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType ExtensionPoint_3008 = getElementType("org.eclipse.papyrus.diagram.usecase.ExtensionPoint_3008"); //$NON-NLS-1$

+	public static final IElementType ExtensionPoint_3008 = getElementType("org.eclipse.papyrus.uml.diagram.usecase.ExtensionPoint_3008"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType UseCase_3009 = getElementType("org.eclipse.papyrus.diagram.usecase.UseCase_3009"); //$NON-NLS-1$

+	public static final IElementType UseCase_3009 = getElementType("org.eclipse.papyrus.uml.diagram.usecase.UseCase_3009"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Component_3016 = getElementType("org.eclipse.papyrus.diagram.usecase.Component_3016"); //$NON-NLS-1$

+	public static final IElementType Component_3016 = getElementType("org.eclipse.papyrus.uml.diagram.usecase.Component_3016"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Comment_3015 = getElementType("org.eclipse.papyrus.diagram.usecase.Comment_3015"); //$NON-NLS-1$

+	public static final IElementType Comment_3015 = getElementType("org.eclipse.papyrus.uml.diagram.usecase.Comment_3015"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Constraint_3017 = getElementType("org.eclipse.papyrus.diagram.usecase.Constraint_3017"); //$NON-NLS-1$

+	public static final IElementType Constraint_3017 = getElementType("org.eclipse.papyrus.uml.diagram.usecase.Constraint_3017"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Actor_3018 = getElementType("org.eclipse.papyrus.diagram.usecase.Actor_3018"); //$NON-NLS-1$

+	public static final IElementType Actor_3018 = getElementType("org.eclipse.papyrus.uml.diagram.usecase.Actor_3018"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Constraint_3010 = getElementType("org.eclipse.papyrus.diagram.usecase.Constraint_3010"); //$NON-NLS-1$

+	public static final IElementType Constraint_3010 = getElementType("org.eclipse.papyrus.uml.diagram.usecase.Constraint_3010"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Actor_3011 = getElementType("org.eclipse.papyrus.diagram.usecase.Actor_3011"); //$NON-NLS-1$

+	public static final IElementType Actor_3011 = getElementType("org.eclipse.papyrus.uml.diagram.usecase.Actor_3011"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType UseCase_3012 = getElementType("org.eclipse.papyrus.diagram.usecase.UseCase_3012"); //$NON-NLS-1$

+	public static final IElementType UseCase_3012 = getElementType("org.eclipse.papyrus.uml.diagram.usecase.UseCase_3012"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Component_3013 = getElementType("org.eclipse.papyrus.diagram.usecase.Component_3013"); //$NON-NLS-1$

+	public static final IElementType Component_3013 = getElementType("org.eclipse.papyrus.uml.diagram.usecase.Component_3013"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Package_3014 = getElementType("org.eclipse.papyrus.diagram.usecase.Package_3014"); //$NON-NLS-1$

+	public static final IElementType Package_3014 = getElementType("org.eclipse.papyrus.uml.diagram.usecase.Package_3014"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Include_4008 = getElementType("org.eclipse.papyrus.diagram.usecase.Include_4008"); //$NON-NLS-1$

+	public static final IElementType Include_4008 = getElementType("org.eclipse.papyrus.uml.diagram.usecase.Include_4008"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Extend_4009 = getElementType("org.eclipse.papyrus.diagram.usecase.Extend_4009"); //$NON-NLS-1$

+	public static final IElementType Extend_4009 = getElementType("org.eclipse.papyrus.uml.diagram.usecase.Extend_4009"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Generalization_4010 = getElementType("org.eclipse.papyrus.diagram.usecase.Generalization_4010"); //$NON-NLS-1$

+	public static final IElementType Generalization_4010 = getElementType("org.eclipse.papyrus.uml.diagram.usecase.Generalization_4010"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Association_4011 = getElementType("org.eclipse.papyrus.diagram.usecase.Association_4011"); //$NON-NLS-1$

+	public static final IElementType Association_4011 = getElementType("org.eclipse.papyrus.uml.diagram.usecase.Association_4011"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType ConstraintConstrainedElement_4012 = getElementType("org.eclipse.papyrus.diagram.usecase.ConstraintConstrainedElement_4012"); //$NON-NLS-1$

+	public static final IElementType ConstraintConstrainedElement_4012 = getElementType("org.eclipse.papyrus.uml.diagram.usecase.ConstraintConstrainedElement_4012"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Dependency_4013 = getElementType("org.eclipse.papyrus.diagram.usecase.Dependency_4013"); //$NON-NLS-1$

+	public static final IElementType Dependency_4013 = getElementType("org.eclipse.papyrus.uml.diagram.usecase.Dependency_4013"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType CommentAnnotatedElement_4014 = getElementType("org.eclipse.papyrus.diagram.usecase.CommentAnnotatedElement_4014"); //$NON-NLS-1$

+	public static final IElementType CommentAnnotatedElement_4014 = getElementType("org.eclipse.papyrus.uml.diagram.usecase.CommentAnnotatedElement_4014"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Abstraction_4015 = getElementType("org.eclipse.papyrus.diagram.usecase.Abstraction_4015"); //$NON-NLS-1$

+	public static final IElementType Abstraction_4015 = getElementType("org.eclipse.papyrus.uml.diagram.usecase.Abstraction_4015"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Usage_4016 = getElementType("org.eclipse.papyrus.diagram.usecase.Usage_4016"); //$NON-NLS-1$

+	public static final IElementType Usage_4016 = getElementType("org.eclipse.papyrus.uml.diagram.usecase.Usage_4016"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Realization_4017 = getElementType("org.eclipse.papyrus.diagram.usecase.Realization_4017"); //$NON-NLS-1$

+	public static final IElementType Realization_4017 = getElementType("org.eclipse.papyrus.uml.diagram.usecase.Realization_4017"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType PackageMerge_4018 = getElementType("org.eclipse.papyrus.diagram.usecase.PackageMerge_4018"); //$NON-NLS-1$

+	public static final IElementType PackageMerge_4018 = getElementType("org.eclipse.papyrus.uml.diagram.usecase.PackageMerge_4018"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType PackageImport_4019 = getElementType("org.eclipse.papyrus.diagram.usecase.PackageImport_4019"); //$NON-NLS-1$

+	public static final IElementType PackageImport_4019 = getElementType("org.eclipse.papyrus.uml.diagram.usecase.PackageImport_4019"); //$NON-NLS-1$

 

 	/**

 	 * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/providers/UMLIconProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLIconProvider.java
index 59f7609203e..51939db1e8f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/providers/UMLIconProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLIconProvider.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.providers;

+package org.eclipse.papyrus.uml.diagram.usecase.providers;

 

 import org.eclipse.core.runtime.IAdaptable;

 import org.eclipse.gmf.runtime.common.core.service.AbstractProvider;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/providers/UMLMarkerNavigationProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLMarkerNavigationProvider.java
index 2359b71ba16..b7a6281ac3f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/providers/UMLMarkerNavigationProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLMarkerNavigationProvider.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.usecase.providers;

+package org.eclipse.papyrus.uml.diagram.usecase.providers;

 

 import java.util.Arrays;

 import java.util.Map;

@@ -12,8 +12,8 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gef.EditPart;

 import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditor;

 import org.eclipse.gmf.runtime.emf.ui.providers.marker.AbstractModelMarkerNavigationProvider;

-import org.eclipse.papyrus.diagram.usecase.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.usecase.part.UMLDiagramEditorUtil;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorUtil;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/providers/UMLModelingAssistantProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLModelingAssistantProvider.java
index 301c47b2a22..db3d904f008 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/providers/UMLModelingAssistantProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLModelingAssistantProvider.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.providers;

+package org.eclipse.papyrus.uml.diagram.usecase.providers;

 

 import java.util.ArrayList;

 import java.util.Collection;

@@ -30,32 +30,32 @@ import org.eclipse.gmf.runtime.emf.ui.services.modelingassistant.ModelingAssista
 import org.eclipse.gmf.runtime.notation.Diagram;

 import org.eclipse.jface.viewers.ILabelProvider;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ActorAsRectangleEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ActorEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ActorInComponentEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ActorInPackageEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.CommentEditPartCN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.CommentEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ComponentEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ComponentInComponentEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ComponentInPackageEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ComponentUsecases2EditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ComponentUsecases3EditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ComponentUsecasesEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ConstraintEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ConstraintInComponentEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ConstraintInPackageEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.PackageEditPartCN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.PackageEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.PackagePackageableElementCompartment2EditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.PackagePackageableElementCompartmentEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseAsRectangleEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseInComponentEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseInPackageEditPart;

-import org.eclipse.papyrus.diagram.usecase.part.Messages;

-import org.eclipse.papyrus.diagram.usecase.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorAsRectangleEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorInComponentEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorInPackageEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.CommentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.CommentEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ComponentEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ComponentInComponentEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ComponentInPackageEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ComponentUsecases2EditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ComponentUsecases3EditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ComponentUsecasesEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintInComponentEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintInPackageEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageEditPartCN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackagePackageableElementCompartment2EditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackagePackageableElementCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseAsRectangleEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseInComponentEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseInPackageEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.part.Messages;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin;

 import org.eclipse.swt.widgets.Display;

 import org.eclipse.swt.widgets.Shell;

 import org.eclipse.ui.dialogs.ElementListSelectionDialog;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/providers/UMLParserProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLParserProvider.java
index d9abec5dadb..e5b3641340f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/providers/UMLParserProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLParserProvider.java
@@ -12,7 +12,7 @@
  *  manage label for package import visibility

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.providers;

+package org.eclipse.papyrus.uml.diagram.usecase.providers;

 

 import org.eclipse.core.runtime.IAdaptable;

 import org.eclipse.emf.ecore.EAttribute;

@@ -27,49 +27,49 @@ import org.eclipse.gmf.runtime.emf.type.core.IElementType;
 import org.eclipse.gmf.runtime.emf.ui.services.parser.ParserHintAdapter;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.parser.CommentParser;

-import org.eclipse.papyrus.diagram.common.parser.stereotype.AppliedStereotypeParser;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.AbstractionNameEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ActorAppliedStereotypeEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ActorAsRectangleNameEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ActorInComponentAppliedStereotypeEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ActorInComponentNameEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ActorInPackageAppliedStereotypeEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ActorInPackageNameEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ActorNameEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.AppliedStereotypeAbstractionEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.AppliedStereotypePackageMergeEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.AppliedStereotypeUsageEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.AssociationAppliedStereotypeEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.AssociationNameEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.CommentBodyEditPartCN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.CommentBodyEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ComponentInComponentNameEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ComponentInPackageNameEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ComponentNameEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ConstraintInComponentNameEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ConstraintInPackageNameEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ConstraintNameEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.DependencyAppliedStereotypeEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.DependencyNameEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.DiagramNameEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ExtendAppliedStereotypeEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ExtensionPointEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ExtensionPointInRectangleEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.GeneralizationAppliedStereotypeEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.IncludeAppliedStereotypeEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.PackageImportAppliedStereotypeEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.PackageNameEditPartCN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.PackageNameEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.RealizationAppliedStereotypeEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.RealizationNameEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UsageNameEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseAsRectangleNameEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseInComponentNameEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseInPackageNameEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseNameEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.parsers.MessageFormatParser;

-import org.eclipse.papyrus.diagram.usecase.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.common.parser.CommentParser;

+import org.eclipse.papyrus.uml.diagram.common.parser.stereotype.AppliedStereotypeParser;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AbstractionNameEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorAppliedStereotypeEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorAsRectangleNameEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorInComponentAppliedStereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorInComponentNameEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorInPackageAppliedStereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorInPackageNameEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorNameEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AppliedStereotypeAbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AppliedStereotypePackageMergeEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AppliedStereotypeUsageEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AssociationAppliedStereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AssociationNameEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.CommentBodyEditPartCN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.CommentBodyEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ComponentInComponentNameEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ComponentInPackageNameEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ComponentNameEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintInComponentNameEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintInPackageNameEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintNameEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.DependencyAppliedStereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.DependencyNameEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.DiagramNameEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ExtendAppliedStereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ExtensionPointEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ExtensionPointInRectangleEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.GeneralizationAppliedStereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.IncludeAppliedStereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageImportAppliedStereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageNameEditPartCN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageNameEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.RealizationAppliedStereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.RealizationNameEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UsageNameEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseAsRectangleNameEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseInComponentNameEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseInPackageNameEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseNameEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.parsers.MessageFormatParser;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;

 import org.eclipse.uml2.uml.UMLPackage;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/providers/UMLValidationDecoratorProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLValidationDecoratorProvider.java
index f8c323a6c88..4da56aa9864 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/providers/UMLValidationDecoratorProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLValidationDecoratorProvider.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.diagram.usecase.providers;

+package org.eclipse.papyrus.uml.diagram.usecase.providers;

 

 import org.eclipse.gef.EditDomain;

 import org.eclipse.gef.EditPart;

@@ -11,10 +11,10 @@ import org.eclipse.gmf.runtime.diagram.ui.services.decorator.IDecoratorProvider;
 import org.eclipse.gmf.runtime.diagram.ui.services.decorator.IDecoratorTarget;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.providers.ValidationDecoratorProvider;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

-import org.eclipse.papyrus.diagram.usecase.part.UMLDiagramEditor;

-import org.eclipse.papyrus.diagram.usecase.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.common.providers.ValidationDecoratorProvider;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditor;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/providers/UMLValidationProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLValidationProvider.java
index 24e781c443d..c87b6017114 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/providers/UMLValidationProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLValidationProvider.java
@@ -1,10 +1,10 @@
-package org.eclipse.papyrus.diagram.usecase.providers;

+package org.eclipse.papyrus.uml.diagram.usecase.providers;

 

 import org.eclipse.emf.transaction.TransactionalEditingDomain;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

-import org.eclipse.papyrus.diagram.usecase.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.usecase.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/providers/UMLViewProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLViewProvider.java
index a527747e2e2..4a26b6181cb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/providers/UMLViewProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLViewProvider.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.providers;

+package org.eclipse.papyrus.uml.diagram.usecase.providers;

 

 import java.util.ArrayList;

 

@@ -52,92 +52,92 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.gmf.runtime.notation.datatype.RelativeBendpoint;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.common.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.AbstractionNameEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ActorAppliedStereotypeEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ActorAsRectangleEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ActorAsRectangleNameEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ActorEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ActorInComponentAppliedStereotypeEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ActorInComponentEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ActorInComponentNameEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ActorInPackageAppliedStereotypeEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ActorInPackageEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ActorInPackageNameEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ActorNameEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.AppliedStereotypeAbstractionEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.AppliedStereotypePackageMergeEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.AppliedStereotypeUsageEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.AssociationAppliedStereotypeEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.AssociationNameEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.CommentBodyEditPartCN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.CommentBodyEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.CommentEditPartCN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.CommentEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ComponentEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ComponentInComponentEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ComponentInComponentNameEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ComponentInPackageEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ComponentInPackageNameEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ComponentNameEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ComponentUsecases2EditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ComponentUsecases3EditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ComponentUsecasesEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ConstraintEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ConstraintInComponentEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ConstraintInComponentNameEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ConstraintInPackageEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ConstraintInPackageNameEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ConstraintNameEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.DependencyAppliedStereotypeEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.DependencyNameEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.DiagramNameEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ExtendAppliedStereotypeEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ExtendEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ExtendsLink_fixedEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ExtensionPointEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ExtensionPointInRectangleEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.GeneralizationAppliedStereotypeEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.IncludeAppliedStereotypeEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.IncludeEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.IncludeLink_fixedEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.PackageEditPartCN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.PackageEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.PackageImportAppliedStereotypeEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.PackageMergeEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.PackageNameEditPartCN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.PackageNameEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.PackagePackageableElementCompartment2EditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.PackagePackageableElementCompartmentEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.RealizationAppliedStereotypeEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.RealizationNameEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.ShortCutDiagramEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UsageNameEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseAsRectangleEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseAsRectangleNameEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseInComponentEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseInComponentNameEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseInPackageEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseInPackageNameEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCaseNameEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCasePointsEditPartTN;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCasePointsInComponentEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCasePointsInPackageEditPart;

-import org.eclipse.papyrus.diagram.usecase.edit.parts.UseCasePointsInRectangleEditPart;

-import org.eclipse.papyrus.diagram.usecase.part.UMLVisualIDRegistry;

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AbstractionNameEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorAppliedStereotypeEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorAsRectangleEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorAsRectangleNameEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorInComponentAppliedStereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorInComponentEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorInComponentNameEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorInPackageAppliedStereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorInPackageEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorInPackageNameEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorNameEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AppliedStereotypeAbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AppliedStereotypePackageMergeEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AppliedStereotypeUsageEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AssociationAppliedStereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AssociationEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AssociationNameEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.CommentBodyEditPartCN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.CommentBodyEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.CommentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.CommentEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ComponentEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ComponentInComponentEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ComponentInComponentNameEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ComponentInPackageEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ComponentInPackageNameEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ComponentNameEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ComponentUsecases2EditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ComponentUsecases3EditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ComponentUsecasesEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintInComponentEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintInComponentNameEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintInPackageEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintInPackageNameEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintNameEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.DependencyAppliedStereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.DependencyNameEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.DiagramNameEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ExtendAppliedStereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ExtendEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ExtendsLink_fixedEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ExtensionPointEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ExtensionPointInRectangleEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.GeneralizationAppliedStereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.IncludeAppliedStereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.IncludeEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.IncludeLink_fixedEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageEditPartCN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageImportAppliedStereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageImportEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageMergeEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageNameEditPartCN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageNameEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackagePackageableElementCompartment2EditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackagePackageableElementCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.RealizationAppliedStereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.RealizationNameEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ShortCutDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UsageNameEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseAsRectangleEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseAsRectangleNameEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseInComponentEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseInComponentNameEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseInPackageEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseInPackageNameEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseNameEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCasePointsEditPartTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCasePointsInComponentEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCasePointsInPackageEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCasePointsInRectangleEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.graphics.FontData;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/sheet/UMLPropertySection.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/sheet/UMLPropertySection.java
index c7103a75db4..64a0490ab2f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/sheet/UMLPropertySection.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/sheet/UMLPropertySection.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.sheet;

+package org.eclipse.papyrus.uml.diagram.usecase.sheet;

 

 import java.util.ArrayList;

 import java.util.Iterator;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/sheet/UMLSheetLabelProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/sheet/UMLSheetLabelProvider.java
index 14c85fb1180..bd6119fb314 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/diagram/usecase/sheet/UMLSheetLabelProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/sheet/UMLSheetLabelProvider.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.usecase.sheet;

+package org.eclipse.papyrus.uml.diagram.usecase.sheet;

 

 import org.eclipse.core.runtime.IAdaptable;

 import org.eclipse.gmf.runtime.emf.type.core.IElementType;

@@ -19,9 +19,9 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.viewers.BaseLabelProvider;

 import org.eclipse.jface.viewers.ILabelProvider;

 import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.papyrus.diagram.usecase.navigator.UMLNavigatorGroup;

-import org.eclipse.papyrus.diagram.usecase.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.usecase.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.usecase.navigator.UMLNavigatorGroup;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

 import org.eclipse.swt.graphics.Image;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/META-INF/MANIFEST.MF
index 2ce97c124ed..f06236f13d9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/META-INF/MANIFEST.MF
@@ -3,17 +3,17 @@ Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="0.9.0",
  org.eclipse.emf.edit.ui;bundle-version="2.4.0",

  org.eclipse.emf.ecore.edit;bundle-version="2.4.0",

  org.eclipse.ui.intro;bundle-version="3.4.0"

-Export-Package: org.eclipse.papyrus.wizards,

- org.eclipse.papyrus.wizards.category,

- org.eclipse.papyrus.wizards.kind,

- org.eclipse.papyrus.wizards.pages

+Export-Package: org.eclipse.papyrus.uml.diagram.wizards,

+ org.eclipse.papyrus.uml.diagram.wizards.category,

+ org.eclipse.papyrus.uml.diagram.wizards.kind,

+ org.eclipse.papyrus.uml.diagram.wizards.pages

 Bundle-Vendor: %pluginProvider

 Bundle-ActivationPolicy: lazy

 Bundle-Version: 0.9.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.wizards.Activator

+Bundle-Activator: org.eclipse.papyrus.uml.diagram.wizards.Activator

 Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.wizards;singleton:=true

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/plugin.xml
index 236f3ab5a40..fc20f3385ce 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/plugin.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/plugin.xml
@@ -7,7 +7,7 @@
 	</category>

 	<wizard

          category="org.eclipse.papyrus.wizards.category"

-         class="org.eclipse.papyrus.wizards.NewPapyrusProjectWizard"

+         class="org.eclipse.papyrus.uml.diagram.wizards.NewPapyrusProjectWizard"

          finalPerspective="org.eclipse.papyrus.core.perspective"         

          icon="icons/papyrus/new_papyrus_project.gif"

          id="org.eclipse.papyrus.wizards.1createproject"

@@ -19,7 +19,7 @@
 	</wizard>

     <wizard

          category="org.eclipse.papyrus.wizards.category"

-         class="org.eclipse.papyrus.wizards.InitModelWizard"

+         class="org.eclipse.papyrus.uml.diagram.wizards.InitModelWizard"

          finalPerspective="org.eclipse.papyrus.core.perspective"

          icon="icons/papyrus/new_papyrus_model.gif"

          id="org.eclipse.papyrus.wizards.createmodel"

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/wizards/Activator.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/Activator.java
index 7876df59b50..5c8f535a402 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/wizards/Activator.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/Activator.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Obeo - initial API and implementation
  *******************************************************************************/
-package org.eclipse.papyrus.wizards;
+package org.eclipse.papyrus.uml.diagram.wizards;
 
 import org.eclipse.papyrus.log.LogHelper;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/wizards/CreateModelWizard.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/CreateModelWizard.java
index 88ce296ab53..064d8d87c8a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/wizards/CreateModelWizard.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/CreateModelWizard.java
@@ -10,9 +10,9 @@
  *     Tatiana Fesenko(CEA) - [313179] Refactor CreateModelWizard

  *     Saadia Dhouib (CEA LIST) - Implementation of loading diagrams from template files  (.uml, .di , .notation)

  *******************************************************************************/

-package org.eclipse.papyrus.wizards;

+package org.eclipse.papyrus.uml.diagram.wizards;

 

-import static org.eclipse.papyrus.wizards.Activator.log;

+import static org.eclipse.papyrus.uml.diagram.wizards.Activator.log;

 

 import java.io.IOException;

 import java.util.Arrays;

@@ -37,14 +37,14 @@ import org.eclipse.papyrus.core.extension.commands.ICreationCommand;
 import org.eclipse.papyrus.core.extension.commands.IModelCreationCommand;

 import org.eclipse.papyrus.core.utils.DiResourceSet;

 import org.eclipse.papyrus.core.utils.EditorUtils;

-import org.eclipse.papyrus.wizards.category.DiagramCategoryDescriptor;

-import org.eclipse.papyrus.wizards.category.DiagramCategoryRegistry;

-import org.eclipse.papyrus.wizards.category.NewPapyrusModelCommand;

-import org.eclipse.papyrus.wizards.pages.NewModelFilePage;

-import org.eclipse.papyrus.wizards.pages.SelectDiagramCategoryPage;

-import org.eclipse.papyrus.wizards.pages.SelectDiagramKindPage;

-import org.eclipse.papyrus.wizards.pages.SelectDiagramKindPage.CategoryProvider;

-import org.eclipse.papyrus.wizards.template.InitFromTemplateCommand;

+import org.eclipse.papyrus.uml.diagram.wizards.category.DiagramCategoryDescriptor;

+import org.eclipse.papyrus.uml.diagram.wizards.category.DiagramCategoryRegistry;

+import org.eclipse.papyrus.uml.diagram.wizards.category.NewPapyrusModelCommand;

+import org.eclipse.papyrus.uml.diagram.wizards.pages.NewModelFilePage;

+import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectDiagramCategoryPage;

+import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectDiagramKindPage;

+import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectDiagramKindPage.CategoryProvider;

+import org.eclipse.papyrus.uml.diagram.wizards.template.InitFromTemplateCommand;

 import org.eclipse.ui.INewWizard;

 import org.eclipse.ui.IWorkbench;

 import org.eclipse.ui.IWorkbenchPage;

@@ -66,7 +66,7 @@ import org.eclipse.ui.ide.IDE;
 public class CreateModelWizard extends Wizard implements INewWizard {

 

 	/** The Constant WIZARD_ID. */

-	public static final String WIZARD_ID = "org.eclipse.papyrus.wizards.createmodel"; //$NON-NLS-1$

+	public static final String WIZARD_ID = "org.eclipse.papyrus.uml.diagram.wizards.createmodel"; //$NON-NLS-1$

 

 	/** The Constant NEW_MODEL_SETTINGS. */

 	public static final String NEW_MODEL_SETTINGS = "NewModelWizard"; //$NON-NLS-1$

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/wizards/CreateSeveralModelsWizard.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/CreateSeveralModelsWizard.java
index 652c49d25ba..bbf988ec6c4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/wizards/CreateSeveralModelsWizard.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/CreateSeveralModelsWizard.java
@@ -11,7 +11,7 @@
  *  Tatiana Fesenko (CEA LIST) - Initial API and implementation
  *
  *****************************************************************************/
-package org.eclipse.papyrus.wizards;
+package org.eclipse.papyrus.uml.diagram.wizards;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -27,9 +27,9 @@ import org.eclipse.core.runtime.Status;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.wizard.IWizardPage;
 import org.eclipse.papyrus.core.utils.DiResourceSet;
-import org.eclipse.papyrus.wizards.pages.NewModelFilePage;
-import org.eclipse.papyrus.wizards.pages.SelectDiagramCategoryPage;
-import org.eclipse.papyrus.wizards.pages.SelectDiagramKindPage;
+import org.eclipse.papyrus.uml.diagram.wizards.pages.NewModelFilePage;
+import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectDiagramCategoryPage;
+import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectDiagramKindPage;
 import org.eclipse.ui.IWorkbench;
 
 /**
@@ -47,7 +47,7 @@ public class CreateSeveralModelsWizard extends CreateModelWizard {
 	private IStructuredSelection mySelection;
 
 	/* (non-Javadoc)
-	 * @see org.eclipse.papyrus.wizards.CreateModelWizard#createNewModelFilePage(org.eclipse.jface.viewers.IStructuredSelection)
+	 * @see org.eclipse.papyrus.uml.diagram.wizards.CreateModelWizard#createNewModelFilePage(org.eclipse.jface.viewers.IStructuredSelection)
 	 */
 	@Override
 	protected NewModelFilePage createNewModelFilePage(IStructuredSelection selection) {
@@ -55,7 +55,7 @@ public class CreateSeveralModelsWizard extends CreateModelWizard {
 	}
 
 	/* (non-Javadoc)
-	 * @see org.eclipse.papyrus.wizards.CreateModelWizard#init(org.eclipse.ui.IWorkbench, org.eclipse.jface.viewers.IStructuredSelection)
+	 * @see org.eclipse.papyrus.uml.diagram.wizards.CreateModelWizard#init(org.eclipse.ui.IWorkbench, org.eclipse.jface.viewers.IStructuredSelection)
 	 */
 	@Override
 	public void init(IWorkbench workbench, IStructuredSelection selection) {
@@ -64,7 +64,7 @@ public class CreateSeveralModelsWizard extends CreateModelWizard {
 	}
 
 	/* (non-Javadoc)
-	 * @see org.eclipse.papyrus.wizards.CreateModelWizard#diagramCategoryChanged(java.lang.String[])
+	 * @see org.eclipse.papyrus.uml.diagram.wizards.CreateModelWizard#diagramCategoryChanged(java.lang.String[])
 	 */
 	@Override
 	public IStatus diagramCategoryChanged(String... newCategories) {
@@ -135,7 +135,7 @@ public class CreateSeveralModelsWizard extends CreateModelWizard {
 	}
 	
 	/* (non-Javadoc)
-	 * @see org.eclipse.papyrus.wizards.CreateModelWizard#createSelectDiagramCategoryPage()
+	 * @see org.eclipse.papyrus.uml.diagram.wizards.CreateModelWizard#createSelectDiagramCategoryPage()
 	 */
 	@Override
 	protected SelectDiagramCategoryPage createSelectDiagramCategoryPage() {
@@ -163,7 +163,7 @@ public class CreateSeveralModelsWizard extends CreateModelWizard {
 	}
 	
 	/* (non-Javadoc)
-	 * @see org.eclipse.papyrus.wizards.CreateModelWizard#createNewModelFile(java.lang.String)
+	 * @see org.eclipse.papyrus.uml.diagram.wizards.CreateModelWizard#createNewModelFile(java.lang.String)
 	 */
 	@Override
 	protected IFile createNewModelFile(String category) {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/wizards/InitDiagramAction.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/InitDiagramAction.java
index cdb56665a08..b605a4aa181 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/wizards/InitDiagramAction.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/InitDiagramAction.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Obeo - initial API and implementation
  *******************************************************************************/
-package org.eclipse.papyrus.wizards;
+package org.eclipse.papyrus.uml.diagram.wizards;
 
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.viewers.ISelection;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/wizards/InitModelWizard.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/InitModelWizard.java
index a8c200311bd..53cc5c795e1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/wizards/InitModelWizard.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/InitModelWizard.java
@@ -11,7 +11,7 @@
  *  Tatiana Fesenko (CEA LIST) - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.wizards;

+package org.eclipse.papyrus.uml.diagram.wizards;

 

 import org.eclipse.core.resources.IFile;

 import org.eclipse.emf.ecore.EObject;

@@ -19,11 +19,11 @@ import org.eclipse.emf.transaction.RecordingCommand;
 import org.eclipse.jface.viewers.IStructuredSelection;

 import org.eclipse.papyrus.core.utils.DiResourceSet;

 import org.eclipse.papyrus.resource.uml.UmlModel;

-import org.eclipse.papyrus.wizards.category.PapyrusModelFromExistingDomainModelCommand;

-import org.eclipse.papyrus.wizards.pages.NewModelFilePage;

-import org.eclipse.papyrus.wizards.pages.SelectDiagramKindPage;

-import org.eclipse.papyrus.wizards.pages.SelectDiagramKindPage.CategoryProvider;

-import org.eclipse.papyrus.wizards.pages.SelectRootElementPage;

+import org.eclipse.papyrus.uml.diagram.wizards.category.PapyrusModelFromExistingDomainModelCommand;

+import org.eclipse.papyrus.uml.diagram.wizards.pages.NewModelFilePage;

+import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectDiagramKindPage;

+import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectRootElementPage;

+import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectDiagramKindPage.CategoryProvider;

 import org.eclipse.ui.IWorkbench;

 

 /**

@@ -212,7 +212,7 @@ public class InitModelWizard extends CreateModelWizard {
 	}

 

 	/* (non-Javadoc)

-	 * @see org.eclipse.papyrus.wizards.CreateModelWizard#getDiagramFileExtension(java.lang.String)

+	 * @see org.eclipse.papyrus.uml.diagram.wizards.CreateModelWizard#getDiagramFileExtension(java.lang.String)

 	 */

 	@Override

 	protected String getDiagramFileExtension(String diagramCategoryId) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/wizards/Messages.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/Messages.java
index 593c1e974a2..550ec9ac44b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/wizards/Messages.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/Messages.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.wizards;
+package org.eclipse.papyrus.uml.diagram.wizards;
 
 import org.eclipse.osgi.util.NLS;
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/wizards/NewPapyrusProjectWithMultiModelsWizard.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/NewPapyrusProjectWithMultiModelsWizard.java
index bdc29af359a..5ced126acae 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/wizards/NewPapyrusProjectWithMultiModelsWizard.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/NewPapyrusProjectWithMultiModelsWizard.java
@@ -11,13 +11,13 @@
  *  Tatiana Fesenko (CEA LIST) - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.wizards;

+package org.eclipse.papyrus.uml.diagram.wizards;

 

 import org.eclipse.core.resources.IFile;

 import org.eclipse.core.resources.IProject;

 import org.eclipse.core.runtime.CoreException;

 import org.eclipse.papyrus.core.utils.DiResourceSet;

-import org.eclipse.papyrus.wizards.pages.SelectDiagramCategoryPage;

+import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectDiagramCategoryPage;

 

 /**

  * The Wizard creates a new Project and a several Papyrus Models of different categories inside it.

@@ -28,7 +28,7 @@ public class NewPapyrusProjectWithMultiModelsWizard extends NewPapyrusProjectWiz
 	private boolean myDoNotCreateModelForNoDiagrams;

 	

 	/** The Constant WIZARD_ID. */

-	public static final String WIZARD_ID = "org.eclipse.papyrus.wizards.1createproject.several"; //$NON-NLS-1$

+	public static final String WIZARD_ID = "org.eclipse.papyrus.uml.diagram.wizards.1createproject.several"; //$NON-NLS-1$

 

 	

 	/**

@@ -48,7 +48,7 @@ public class NewPapyrusProjectWithMultiModelsWizard extends NewPapyrusProjectWiz
 	}

 	

 	/* (non-Javadoc)

-	 * @see org.eclipse.papyrus.wizards.CreateModelWizard#createSelectDiagramCategoryPage()

+	 * @see org.eclipse.papyrus.uml.diagram.wizards.CreateModelWizard#createSelectDiagramCategoryPage()

 	 */

 	@Override

 	protected SelectDiagramCategoryPage createSelectDiagramCategoryPage() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/wizards/NewPapyrusProjectWizard.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/NewPapyrusProjectWizard.java
index 21157cecb10..91859af6955 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/wizards/NewPapyrusProjectWizard.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/NewPapyrusProjectWizard.java
@@ -11,7 +11,7 @@
  *  Tatiana Fesenko (CEA LIST) - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.wizards;

+package org.eclipse.papyrus.uml.diagram.wizards;

 

 import java.net.URI;

 

@@ -24,7 +24,7 @@ import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.NullProgressMonitor;

 import org.eclipse.core.runtime.SubProgressMonitor;

 import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.papyrus.wizards.pages.NewModelFilePage;

+import org.eclipse.papyrus.uml.diagram.wizards.pages.NewModelFilePage;

 import org.eclipse.ui.IWorkbench;

 import org.eclipse.ui.dialogs.WizardNewProjectCreationPage;

 

@@ -34,7 +34,7 @@ import org.eclipse.ui.dialogs.WizardNewProjectCreationPage;
 public class NewPapyrusProjectWizard extends CreateModelWizard {

 

 	/** The Constant WIZARD_ID. */

-	public static final String WIZARD_ID = "org.eclipse.papyrus.wizards.1createproject"; //$NON-NLS-1$

+	public static final String WIZARD_ID = "org.eclipse.papyrus.uml.diagram.wizards.1createproject"; //$NON-NLS-1$

 

 	/** The new project page. */

 	private WizardNewProjectCreationPage myNewProjectPage;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/wizards/NewProjectAction.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/NewProjectAction.java
index 00aca331a33..3f513fbfbfb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/wizards/NewProjectAction.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/NewProjectAction.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Tatiana Fesenko (CEA LIST) - Initial API and implementation

  *

- *****************************************************************************/package org.eclipse.papyrus.wizards;

+ *****************************************************************************/package org.eclipse.papyrus.uml.diagram.wizards;

 

 import java.util.Properties;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/wizards/SettingsHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/SettingsHelper.java
index e2661bd06c5..d7b84ebf944 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/wizards/SettingsHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/SettingsHelper.java
@@ -11,7 +11,7 @@
  *  Tatiana Fesenko (CEA LIST) - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.wizards;

+package org.eclipse.papyrus.uml.diagram.wizards;

 

 import java.util.ArrayList;

 import java.util.Collections;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/wizards/category/DiagramCategoryDescriptor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/category/DiagramCategoryDescriptor.java
index 4c4a040cfe7..30597698509 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/wizards/category/DiagramCategoryDescriptor.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/category/DiagramCategoryDescriptor.java
@@ -11,7 +11,7 @@
  *  Tatiana Fesenko (CEA LIST) - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.wizards.category;

+package org.eclipse.papyrus.uml.diagram.wizards.category;

 

 import org.eclipse.jface.resource.ImageDescriptor;

 import org.eclipse.papyrus.core.editor.BackboneException;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/wizards/category/DiagramCategoryRegistry.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/category/DiagramCategoryRegistry.java
index a510fedcb19..5e7160864bc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/wizards/category/DiagramCategoryRegistry.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/category/DiagramCategoryRegistry.java
@@ -11,9 +11,9 @@
  *  Tatiana Fesenko (CEA LIST) - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.wizards.category;

+package org.eclipse.papyrus.uml.diagram.wizards.category;

 

-import static org.eclipse.papyrus.wizards.Activator.log;

+import static org.eclipse.papyrus.uml.diagram.wizards.Activator.log;

 

 import java.util.ArrayList;

 import java.util.HashMap;

@@ -27,7 +27,7 @@ import org.eclipse.core.runtime.Platform;
 import org.eclipse.papyrus.core.extension.BadClassNameException;

 import org.eclipse.papyrus.core.extension.ExtensionUtils;

 import org.eclipse.papyrus.core.extension.commands.IModelCreationCommand;

-import org.eclipse.papyrus.wizards.Messages;

+import org.eclipse.papyrus.uml.diagram.wizards.Messages;

 import org.eclipse.ui.plugin.AbstractUIPlugin;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/wizards/category/NewPapyrusModelCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/category/NewPapyrusModelCommand.java
index 74ab2de9f04..b18b938e696 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/wizards/category/NewPapyrusModelCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/category/NewPapyrusModelCommand.java
@@ -11,7 +11,7 @@
  *  Tatiana Fesenko (CEA LIST) - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.wizards.category;

+package org.eclipse.papyrus.uml.diagram.wizards.category;

 

 import org.eclipse.core.resources.IFile;

 import org.eclipse.emf.transaction.RecordingCommand;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/wizards/category/PapyrusModelFromExistingDomainModelCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/category/PapyrusModelFromExistingDomainModelCommand.java
index 6102160db71..9257c5e7523 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/wizards/category/PapyrusModelFromExistingDomainModelCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/category/PapyrusModelFromExistingDomainModelCommand.java
@@ -11,7 +11,7 @@
  *  Tatiana Fesenko (CEA LIST) - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.wizards.category;

+package org.eclipse.papyrus.uml.diagram.wizards.category;

 

 import org.eclipse.core.resources.IFile;

 import org.eclipse.core.runtime.IPath;

@@ -22,7 +22,7 @@ import org.eclipse.papyrus.resource.ModelSet;
 import org.eclipse.papyrus.resource.notation.NotationModel;

 import org.eclipse.papyrus.resource.sasheditor.DiModel;

 import org.eclipse.papyrus.resource.uml.UmlModel;

-import org.eclipse.papyrus.wizards.CreateModelWizard.DiResourceSetExt;

+import org.eclipse.papyrus.uml.diagram.wizards.CreateModelWizard.DiResourceSetExt;

 

 /**

  * The command to initialize Papyrus diagram for a given domain model.

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/wizards/kind/DiagramKindContentProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/kind/DiagramKindContentProvider.java
index b181593dd6d..e7de8463a05 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/wizards/kind/DiagramKindContentProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/kind/DiagramKindContentProvider.java
@@ -11,7 +11,7 @@
  *  Tatiana Fesenko (CEA LIST) - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.wizards.kind;

+package org.eclipse.papyrus.uml.diagram.wizards.kind;

 

 import java.util.ArrayList;

 import java.util.Collections;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/wizards/kind/DiagramKindLabelProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/kind/DiagramKindLabelProvider.java
index 64925e0ef29..2b84d2a023e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/wizards/kind/DiagramKindLabelProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/kind/DiagramKindLabelProvider.java
@@ -11,13 +11,13 @@
  *  Tatiana Fesenko (CEA LIST) - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.wizards.kind;

+package org.eclipse.papyrus.uml.diagram.wizards.kind;

 

 import org.eclipse.jface.resource.ImageDescriptor;

 import org.eclipse.jface.viewers.ILabelProvider;

 import org.eclipse.jface.viewers.ILabelProviderListener;

 import org.eclipse.papyrus.core.extension.commands.CreationCommandDescriptor;

-import org.eclipse.papyrus.wizards.Messages;

+import org.eclipse.papyrus.uml.diagram.wizards.Messages;

 import org.eclipse.swt.graphics.Image;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/wizards/pages/NewModelFilePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/pages/NewModelFilePage.java
index f3d846c9218..3318cb09cb0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/wizards/pages/NewModelFilePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/pages/NewModelFilePage.java
@@ -9,7 +9,7 @@
  *     Obeo - initial API and implementation
  *     Tatiana Fesenko(CEA) - initial API and implementation
  *******************************************************************************/
-package org.eclipse.papyrus.wizards.pages;
+package org.eclipse.papyrus.uml.diagram.wizards.pages;
 
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.IPath;
@@ -17,8 +17,8 @@ import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.papyrus.wizards.Activator;
-import org.eclipse.papyrus.wizards.Messages;
+import org.eclipse.papyrus.uml.diagram.wizards.Activator;
+import org.eclipse.papyrus.uml.diagram.wizards.Messages;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/wizards/pages/SelectDiagramCategoryPage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/pages/SelectDiagramCategoryPage.java
index 75fa5934dbf..ae6eae83669 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/wizards/pages/SelectDiagramCategoryPage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/pages/SelectDiagramCategoryPage.java
@@ -11,7 +11,7 @@
  *  Tatiana Fesenko (CEA LIST) - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.wizards.pages;

+package org.eclipse.papyrus.uml.diagram.wizards.pages;

 

 import java.util.ArrayList;

 import java.util.Arrays;

@@ -25,11 +25,11 @@ import org.eclipse.jface.dialogs.IMessageProvider;
 import org.eclipse.jface.resource.ImageDescriptor;

 import org.eclipse.jface.wizard.IWizard;

 import org.eclipse.jface.wizard.WizardPage;

-import org.eclipse.papyrus.wizards.CreateModelWizard;

-import org.eclipse.papyrus.wizards.Messages;

-import org.eclipse.papyrus.wizards.SettingsHelper;

-import org.eclipse.papyrus.wizards.category.DiagramCategoryDescriptor;

-import org.eclipse.papyrus.wizards.category.DiagramCategoryRegistry;

+import org.eclipse.papyrus.uml.diagram.wizards.CreateModelWizard;

+import org.eclipse.papyrus.uml.diagram.wizards.Messages;

+import org.eclipse.papyrus.uml.diagram.wizards.SettingsHelper;

+import org.eclipse.papyrus.uml.diagram.wizards.category.DiagramCategoryDescriptor;

+import org.eclipse.papyrus.uml.diagram.wizards.category.DiagramCategoryRegistry;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.events.SelectionEvent;

 import org.eclipse.swt.events.SelectionListener;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/wizards/pages/SelectDiagramKindPage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/pages/SelectDiagramKindPage.java
index b7e26aea02e..5a430fefa28 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/wizards/pages/SelectDiagramKindPage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/pages/SelectDiagramKindPage.java
@@ -10,9 +10,9 @@
  *     Tatiana Fesenko(CEA) - improved look&feel
  *     Saadia Dhouib (CEA LIST) - Implementation of loading diagrams from template files  (.uml, .di , .notation)
  *******************************************************************************/
-package org.eclipse.papyrus.wizards.pages;
+package org.eclipse.papyrus.uml.diagram.wizards.pages;
 
-import static org.eclipse.papyrus.wizards.Activator.log;
+import static org.eclipse.papyrus.uml.diagram.wizards.Activator.log;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -29,12 +29,12 @@ import org.eclipse.papyrus.core.extension.commands.CreationCommandDescriptor;
 import org.eclipse.papyrus.core.extension.commands.CreationCommandRegistry;
 import org.eclipse.papyrus.core.extension.commands.ICreationCommand;
 import org.eclipse.papyrus.core.extension.commands.ICreationCommandRegistry;
-import org.eclipse.papyrus.wizards.Messages;
-import org.eclipse.papyrus.wizards.SettingsHelper;
-import org.eclipse.papyrus.wizards.kind.DiagramKindContentProvider;
-import org.eclipse.papyrus.wizards.kind.DiagramKindLabelProvider;
-import org.eclipse.papyrus.wizards.template.ModelTemplateDescription;
-import org.eclipse.papyrus.wizards.template.SelectModelTemplateComposite;
+import org.eclipse.papyrus.uml.diagram.wizards.Messages;
+import org.eclipse.papyrus.uml.diagram.wizards.SettingsHelper;
+import org.eclipse.papyrus.uml.diagram.wizards.kind.DiagramKindContentProvider;
+import org.eclipse.papyrus.uml.diagram.wizards.kind.DiagramKindLabelProvider;
+import org.eclipse.papyrus.uml.diagram.wizards.template.ModelTemplateDescription;
+import org.eclipse.papyrus.uml.diagram.wizards.template.SelectModelTemplateComposite;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.ModifyEvent;
 import org.eclipse.swt.events.ModifyListener;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/wizards/pages/SelectRootElementPage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/pages/SelectRootElementPage.java
index 9eebb060e2e..9c57ef473ef 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/wizards/pages/SelectRootElementPage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/pages/SelectRootElementPage.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Obeo - initial API and implementation
  *******************************************************************************/
-package org.eclipse.papyrus.wizards.pages;
+package org.eclipse.papyrus.uml.diagram.wizards.pages;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -32,7 +32,7 @@ import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.jface.wizard.WizardPage;
 import org.eclipse.papyrus.resource.ModelSet;
-import org.eclipse.papyrus.wizards.Messages;
+import org.eclipse.papyrus.uml.diagram.wizards.Messages;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/wizards/template/InitFromTemplateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/template/InitFromTemplateCommand.java
index f0bbd5f37ee..4af72e52f51 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/wizards/template/InitFromTemplateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/template/InitFromTemplateCommand.java
@@ -11,7 +11,7 @@
  *  Tatiana Fesenko (CEA LIST) - Initial API and implementation

  *	Saadia Dhouib (CEA LIST) - Implementation of loading diagrams from template files  (.uml, .di , .notation)

  *****************************************************************************/

-package org.eclipse.papyrus.wizards.template;

+package org.eclipse.papyrus.uml.diagram.wizards.template;

 

 import java.io.IOException;

 import java.util.ArrayList;

@@ -35,7 +35,7 @@ import org.eclipse.gmf.runtime.notation.Diagram;
 import org.eclipse.papyrus.core.utils.DiResourceSet;

 

 import org.eclipse.papyrus.sashwindows.di.SashWindowsMngr;

-import org.eclipse.papyrus.wizards.utils.WizardsHelper;

+import org.eclipse.papyrus.uml.diagram.wizards.utils.WizardsHelper;

 

 

 /**

@@ -94,7 +94,7 @@ public class InitFromTemplateCommand extends RecordingCommand {
 	protected void doExecute() {

 		try {

 			initializeFromTemplate();

-			//verify if .di file and .notation file were filled in the org.eclipse.papyrus.wizards.templates extension

+			//verify if .di file and .notation file were filled in the org.eclipse.papyrus.uml.diagram.wizards.templates extension

 

 		} catch (IOException e) {

 			// TODO Auto-generated catch block

@@ -128,7 +128,7 @@ public class InitFromTemplateCommand extends RecordingCommand {
 

 

 		//2. test if di and notation exist

-		//verify if .di file and .notation file were filled in the org.eclipse.papyrus.wizards.templates extension

+		//verify if .di file and .notation file were filled in the org.eclipse.papyrus.uml.diagram.wizards.templates extension

 		if ((myDiTemplatePath!=null) && (myNotationTemplatePath!=null)){

 			//2.1 verify if the .di , .notation and .uml files have the same name

 			String diFileName= WizardsHelper.getFileNameWithoutExtension(myDiTemplatePath);

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/wizards/template/ModelTemplateDescription.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/template/ModelTemplateDescription.java
index 29c7e5cee26..4477e9cda3e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/wizards/template/ModelTemplateDescription.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/template/ModelTemplateDescription.java
@@ -11,9 +11,9 @@
  *  Tatiana Fesenko (CEA LIST) - Initial API and implementation

  *	Saadia Dhouib (CEA LIST) - Implementation of loading diagrams from template files  (.uml, .di , .notation)

  *****************************************************************************/

-package org.eclipse.papyrus.wizards.template;

+package org.eclipse.papyrus.uml.diagram.wizards.template;

 

-import org.eclipse.papyrus.wizards.utils.WizardsHelper;

+import org.eclipse.papyrus.uml.diagram.wizards.utils.WizardsHelper;

 

 /**

  * The Class ModelTemplateDescription.

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/wizards/template/ModelTemplatesContentProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/template/ModelTemplatesContentProvider.java
index b63eb77c0d7..e5551f0d1eb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/wizards/template/ModelTemplatesContentProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/template/ModelTemplatesContentProvider.java
@@ -11,7 +11,7 @@
  *  Tatiana Fesenko (CEA LIST) - Initial API and implementation

  *	Saadia Dhouib (CEA LIST) - Implementation of loading diagrams from template files  (.uml, .di , .notation)

  *****************************************************************************/

-package org.eclipse.papyrus.wizards.template;

+package org.eclipse.papyrus.uml.diagram.wizards.template;

 

 import java.util.ArrayList;

 import java.util.Collection;

@@ -34,7 +34,7 @@ import org.eclipse.papyrus.core.extension.commands.CreationCommandDescriptor;
 public class ModelTemplatesContentProvider implements IStructuredContentProvider {

 

 	/** The Constant EXTENSION_POINT_ID. */

-	private static final String EXTENSION_POINT_ID = "org.eclipse.papyrus.wizards.templates"; //$NON-NLS-1$

+	private static final String EXTENSION_POINT_ID = "org.eclipse.papyrus.uml.diagram.wizards.templates"; //$NON-NLS-1$

 

 	/** The Constant ATTRIBUTE_NAME. */

 	private static final String ATTRIBUTE_NAME = "name"; //$NON-NLS-1$

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/wizards/template/ModelTemplatesLabelProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/template/ModelTemplatesLabelProvider.java
index 2bbf02c3944..5baf1f9a4a7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/wizards/template/ModelTemplatesLabelProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/template/ModelTemplatesLabelProvider.java
@@ -11,11 +11,11 @@
  *  Tatiana Fesenko (CEA LIST) - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.wizards.template;

+package org.eclipse.papyrus.uml.diagram.wizards.template;

 

 import org.eclipse.jface.viewers.ILabelProviderListener;

 import org.eclipse.jface.viewers.ITableLabelProvider;

-import org.eclipse.papyrus.wizards.Messages;

+import org.eclipse.papyrus.uml.diagram.wizards.Messages;

 import org.eclipse.swt.graphics.Image;

 

 /**

@@ -46,7 +46,7 @@ public class ModelTemplatesLabelProvider implements ITableLabelProvider {
 	public String getColumnText(Object element, int columnIndex) {

 		if(element instanceof ModelTemplateDescription) {

 			ModelTemplateDescription modelTemplate = (ModelTemplateDescription)element;

-			return Messages.bind(org.eclipse.papyrus.wizards.Messages.ModelTemplatesLabelProvider_model_template_description_text, modelTemplate.getName(), modelTemplate.getFileName());

+			return Messages.bind(org.eclipse.papyrus.uml.diagram.wizards.Messages.ModelTemplatesLabelProvider_model_template_description_text, modelTemplate.getName(), modelTemplate.getFileName());

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/wizards/template/SelectModelTemplateComposite.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/template/SelectModelTemplateComposite.java
index 5e0ec828ffb..6d44bef4316 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/wizards/template/SelectModelTemplateComposite.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/template/SelectModelTemplateComposite.java
@@ -11,7 +11,7 @@
  *  Tatiana Fesenko (CEA LIST) - Initial API and implementation

  *	Saadia Dhouib (CEA LIST) - Implementation of loading diagrams from template files  (.uml, .di , .notation)

  *****************************************************************************/

-package org.eclipse.papyrus.wizards.template;

+package org.eclipse.papyrus.uml.diagram.wizards.template;

 

 import org.eclipse.jface.viewers.CheckboxTableViewer;

 import org.eclipse.swt.SWT;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/wizards/utils/WizardsHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/utils/WizardsHelper.java
index 613b8730269..d9cbab084ca 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/wizards/utils/WizardsHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/utils/WizardsHelper.java
@@ -11,7 +11,7 @@
  *  Saadia DHOUIB (CEA LIST) - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.wizards.utils;

+package org.eclipse.papyrus.uml.diagram.wizards.utils;

 

 // TODO: Auto-generated Javadoc

 /**

diff --git a/plugins/uml/org.eclipse.papyrus.uml.documentation/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.documentation/META-INF/MANIFEST.MF
index fa4ce0466bc..40b15f19dd3 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.documentation/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.uml.documentation/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@ Bundle-Version: 0.9.0.qualifier
 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.documentation.uml.Activator

+Bundle-Activator: org.eclipse.papyrus.views.documentation.uml.Activator

 Bundle-SymbolicName: org.eclipse.papyrus.uml.documentation;singleton:=true

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

 

diff --git a/plugins/uml/org.eclipse.papyrus.uml.documentation/plugin.xml b/plugins/uml/org.eclipse.papyrus.uml.documentation/plugin.xml
index c4c1a6c2967..0dda50cf40e 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.documentation/plugin.xml
+++ b/plugins/uml/org.eclipse.papyrus.uml.documentation/plugin.xml
@@ -2,19 +2,19 @@
 <?eclipse version="3.4"?>

 <plugin>

    <extension

-         point="org.eclipse.papyrus.documentation.documentationManager">

+         point="org.eclipse.papyrus.views.documentation.documentationManager">

       <documentationManager

-            managerClass="org.eclipse.papyrus.documentation.uml.UMLDocumentationManager"

+            managerClass="org.eclipse.papyrus.views.documentation.uml.UMLDocumentationManager"

             modelNsURI="http://www.eclipse.org/uml2/3.0.0/UML"

             priority="Lowest">

       </documentationManager>

       <documentationManager

-            managerClass="org.eclipse.papyrus.documentation.uml.UMLDocumentationManager"

+            managerClass="org.eclipse.papyrus.views.documentation.uml.UMLDocumentationManager"

             modelNsURI="http://www.eclipse.org/uml2/2.1.0/UML"

             priority="Lowest">

       </documentationManager>

       <documentationManager

-            managerClass="org.eclipse.papyrus.documentation.uml.UMLDocumentationManager"

+            managerClass="org.eclipse.papyrus.views.documentation.uml.UMLDocumentationManager"

             modelNsURI="http://www.eclipse.org/uml2/2.0.0/UML"

             priority="Lowest">

       </documentationManager>

diff --git a/plugins/uml/org.eclipse.papyrus.uml.documentation/src/org/eclipse/papyrus/documentation/uml/Messages.java b/plugins/uml/org.eclipse.papyrus.uml.documentation/src/org/eclipse/papyrus/documentation/uml/Messages.java
index ef39a9d4575..f71b7a3dbf4 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.documentation/src/org/eclipse/papyrus/documentation/uml/Messages.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.documentation/src/org/eclipse/papyrus/documentation/uml/Messages.java
@@ -17,7 +17,7 @@ import org.eclipse.osgi.util.NLS;
 

 public class Messages extends NLS {

 

-	private static final String BUNDLE_NAME = "org.eclipse.papyrus.documentation.uml.messages"; //$NON-NLS-1$

+	private static final String BUNDLE_NAME = "org.eclipse.papyrus.views.documentation.uml.messages"; //$NON-NLS-1$

 

 	public static String UMLDocumentationManager_DocOnDocCommentError;

 

diff --git a/plugins/uml/org.eclipse.papyrus.uml.documentation/src/org/eclipse/papyrus/documentation/uml/UMLAddOrRemoveAssociatedResourceCommand.java b/plugins/uml/org.eclipse.papyrus.uml.documentation/src/org/eclipse/papyrus/documentation/uml/UMLAddOrRemoveAssociatedResourceCommand.java
index 417a0bfcabf..f238f5781cd 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.documentation/src/org/eclipse/papyrus/documentation/uml/UMLAddOrRemoveAssociatedResourceCommand.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.documentation/src/org/eclipse/papyrus/documentation/uml/UMLAddOrRemoveAssociatedResourceCommand.java
@@ -19,8 +19,8 @@ import java.util.Set;
 import org.eclipse.emf.common.command.AbstractCommand;

 import org.eclipse.emf.common.util.EList;

 import org.eclipse.emf.common.util.URI;

-import org.eclipse.papyrus.documentation.IDocumentationChangedListener;

 import org.eclipse.papyrus.uml.profile.IUMLDocumentationConstants;

+import org.eclipse.papyrus.views.documentation.IDocumentationChangedListener;

 import org.eclipse.uml2.uml.Comment;

 import org.eclipse.uml2.uml.Element;

 import org.eclipse.uml2.uml.Stereotype;

@@ -41,7 +41,7 @@ public class UMLAddOrRemoveAssociatedResourceCommand extends AbstractCommand {
 	private String resourceURIString;

 

 	public UMLAddOrRemoveAssociatedResourceCommand(boolean remove, Element element, URI resourceURI, Set<IDocumentationChangedListener> documentationChangedListeners) {

-		super(org.eclipse.papyrus.documentation.Messages.AddOrRemoveAssociatedResourceCommandLabel);

+		super(org.eclipse.papyrus.views.documentation.Messages.AddOrRemoveAssociatedResourceCommandLabel);

 		this.remove = remove;

 		this.element = element;

 		this.resourceURIString = resourceURI.toString();

diff --git a/plugins/uml/org.eclipse.papyrus.uml.documentation/src/org/eclipse/papyrus/documentation/uml/UMLChangeDocumentationCommand.java b/plugins/uml/org.eclipse.papyrus.uml.documentation/src/org/eclipse/papyrus/documentation/uml/UMLChangeDocumentationCommand.java
index 42e87031c92..9a9d7dee12a 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.documentation/src/org/eclipse/papyrus/documentation/uml/UMLChangeDocumentationCommand.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.documentation/src/org/eclipse/papyrus/documentation/uml/UMLChangeDocumentationCommand.java
@@ -23,8 +23,8 @@ import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.resource.Resource;

 import org.eclipse.emf.ecore.resource.ResourceSet;

 import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;

-import org.eclipse.papyrus.documentation.IDocumentationChangedListener;

 import org.eclipse.papyrus.uml.profile.IUMLDocumentationConstants;

+import org.eclipse.papyrus.views.documentation.IDocumentationChangedListener;

 import org.eclipse.uml2.uml.Comment;

 import org.eclipse.uml2.uml.Element;

 import org.eclipse.uml2.uml.NamedElement;

@@ -53,7 +53,7 @@ public class UMLChangeDocumentationCommand extends AbstractCommand {
 	private Set<IDocumentationChangedListener> documentationChangedListeners;

 

 	public UMLChangeDocumentationCommand(Element element, String newDocumentation, Set<IDocumentationChangedListener> documentationChangedListeners) {

-		super(org.eclipse.papyrus.documentation.Messages.ChangeDocCommandLabel);

+		super(org.eclipse.papyrus.views.documentation.Messages.ChangeDocCommandLabel);

 		this.element = element;

 		this.newComment = newDocumentation;

 		this.documentationChangedListeners = documentationChangedListeners;

diff --git a/plugins/uml/org.eclipse.papyrus.uml.documentation/src/org/eclipse/papyrus/documentation/uml/UMLDocumentationManager.java b/plugins/uml/org.eclipse.papyrus.uml.documentation/src/org/eclipse/papyrus/documentation/uml/UMLDocumentationManager.java
index 106b5573451..279b097e981 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.documentation/src/org/eclipse/papyrus/documentation/uml/UMLDocumentationManager.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.documentation/src/org/eclipse/papyrus/documentation/uml/UMLDocumentationManager.java
@@ -22,10 +22,10 @@ import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.common.util.EList;

 import org.eclipse.emf.common.util.URI;

 import org.eclipse.emf.ecore.EObject;

-import org.eclipse.papyrus.documentation.DocumentationUnsupportedException;

-import org.eclipse.papyrus.documentation.IDocumentationChangedListener;

-import org.eclipse.papyrus.documentation.IDocumentationManager;

 import org.eclipse.papyrus.uml.profile.IUMLDocumentationConstants;

+import org.eclipse.papyrus.views.documentation.DocumentationUnsupportedException;

+import org.eclipse.papyrus.views.documentation.IDocumentationChangedListener;

+import org.eclipse.papyrus.views.documentation.IDocumentationManager;

 import org.eclipse.uml2.uml.Comment;

 import org.eclipse.uml2.uml.Element;

 import org.eclipse.uml2.uml.Stereotype;