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

165 files changed, 449 insertions, 450 deletions

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/.settings/org.eclipse.core.resources.prefs b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/.settings/org.eclipse.core.resources.prefs
index 03d9a9af8b8..952db234996 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/.settings/org.eclipse.core.resources.prefs
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/.settings/org.eclipse.core.resources.prefs
@@ -1,3 +1,3 @@
-#Mon May 16 11:03:24 CEST 2011

+#Fri Nov 04 16:40:04 CET 2011

 eclipse.preferences.version=1

-encoding//src/org/eclipse/papyrus/properties/notation/messages/messages.properties=ISO-8859-1

+encoding//src/org/eclipse/papyrus/infra/gmfdiag/properties/messages/messages.properties=ISO-8859-1

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/META-INF/MANIFEST.MF
index e50e109c2a6..16f2a195f10 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/META-INF/MANIFEST.MF
@@ -20,7 +20,7 @@ Bundle-ActivationPolicy: lazy
 Bundle-Version: 0.9.0.qualifier

 Bundle-Name: %Bundle-Name

 Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.properties.notation.Activator

+Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.properties.Activator

 Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.properties;singleton:=true

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

 

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/OSGI-INF/l10n/bundle.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/OSGI-INF/l10n/bundle.properties
index 66add7ebfdf..22d0644a227 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/OSGI-INF/l10n/bundle.properties
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/OSGI-INF/l10n/bundle.properties
@@ -1,3 +1,3 @@
-#Properties file for org.eclipse.papyrus.properties.notation

+#Properties file for org.eclipse.papyrus.infra.gmfdiag.properties

 Bundle-Vendor = www.eclipse.org

 Bundle-Name = Notation
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi
index 23752350e8e..a5475431cd1 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi
@@ -2,11 +2,11 @@
 <environment:Environment xmi:version="2.0"

 	xmlns:xmi="http://www.omg.org/XMI" xmlns:environment="http://www.eclipse.org/papyrus/properties/environment">

 	<modelElementFactories name="GMF Notation"

-		factoryClass="org.eclipse.papyrus.properties.notation.modelelement.NotationModelElementFactory" />

+		factoryClass="org.eclipse.papyrus.infra.gmfdiag.properties.modelelement.NotationModelElementFactory" />

 	<constraintTypes label="GMF Notation Constraint"

-		constraintClass="org.eclipse.papyrus.properties.notation.constraint.GMFNotationConstraint" />

+		constraintClass="org.eclipse.papyrus.infra.gmfdiag.properties.constraint.GMFNotationConstraint" />

 	<constraintTypes label="HasEditPolicy"

-		constraintClass="org.eclipse.papyrus.properties.notation.constraint.HasEditPolicy" />

+		constraintClass="org.eclipse.papyrus.infra.gmfdiag.properties.constraint.HasEditPolicy" />

 	<constraintTypes label="isGMFEditPart"

-		constraintClass="org.eclipse.papyrus.properties.notation.constraint.IsEditPartConstraint" />

+		constraintClass="org.eclipse.papyrus.infra.gmfdiag.properties.constraint.IsEditPartConstraint" />

 </environment:Environment>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation.ctx b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation.ctx
index 8a070dff72c..440de5d800e 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation.ctx
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation.ctx
@@ -412,952 +412,952 @@
   </tabs>

   <views name="Single Diagram" sections="//@tabs.0/@sections.20" automaticContext="true" datacontexts="//@dataContexts.0/@elements.20">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleDiagram">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="Diagram"/>

     </constraints>

   </views>

   <views name="Single Edge" sections="//@tabs.0/@sections.0" automaticContext="true" datacontexts="//@dataContexts.0/@elements.0">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleEdge">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="Edge"/>

     </constraints>

   </views>

   <views name="Single Node" sections="//@tabs.0/@sections.1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.1">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleNode">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="Node"/>

     </constraints>

   </views>

   <views name="Single Style" sections="//@tabs.0/@sections.2" automaticContext="true" datacontexts="//@dataContexts.0/@elements.2">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="Style"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

     </constraints>

   </views>

   <views name="FillStyle" sections="//@tabs.0/@sections.3" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.3">

     <constraints xsi:type="contexts:SimpleConstraint" name="isFillStyle" overrideable="false">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="FillStyle"/>

     </constraints>

   </views>

   <views name="LineStyle" sections="//@tabs.0/@sections.4" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.4">

     <constraints xsi:type="contexts:SimpleConstraint" name="isLineStyle" overrideable="false">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="LineStyle"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

     </constraints>

   </views>

   <views name="FontStyle" sections="//@tabs.0/@sections.5" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.5">

     <constraints xsi:type="contexts:SimpleConstraint" name="isFontStyle" overrideable="false">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="FontStyle"/>

     </constraints>

   </views>

   <views name="Single TitleStyle" sections="//@tabs.0/@sections.6" automaticContext="true" datacontexts="//@dataContexts.0/@elements.6">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleTitleStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="TitleStyle"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

     </constraints>

   </views>

   <views name="Single SortingStyle" sections="//@tabs.0/@sections.7" automaticContext="true" datacontexts="//@dataContexts.0/@elements.7">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleSortingStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="SortingStyle"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

     </constraints>

   </views>

   <views name="Single DescriptionStyle" sections="//@tabs.0/@sections.8" automaticContext="true" datacontexts="//@dataContexts.0/@elements.8">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleDescriptionStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="DescriptionStyle"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

     </constraints>

   </views>

   <views name="Single LayoutConstraint" sections="//@tabs.0/@sections.9" automaticContext="true" datacontexts="//@dataContexts.0/@elements.9">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleLayoutConstraint">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="LayoutConstraint"/>

     </constraints>

   </views>

   <views name="Single Size" sections="//@tabs.0/@sections.10" automaticContext="true" datacontexts="//@dataContexts.0/@elements.10">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleSize">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="Size"/>

     </constraints>

   </views>

   <views name="Single Location" sections="//@tabs.0/@sections.11" automaticContext="true" datacontexts="//@dataContexts.0/@elements.11">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleLocation">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="Location"/>

     </constraints>

   </views>

   <views name="Single Bounds" sections="//@tabs.0/@sections.12" automaticContext="true" datacontexts="//@dataContexts.0/@elements.12">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleBounds">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="Bounds"/>

     </constraints>

   </views>

   <views name="Single Ratio" sections="//@tabs.0/@sections.13" automaticContext="true" datacontexts="//@dataContexts.0/@elements.13">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleRatio">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="Ratio"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

     </constraints>

   </views>

   <views name="Single Anchor" sections="//@tabs.0/@sections.14" automaticContext="true" datacontexts="//@dataContexts.0/@elements.14">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleAnchor">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="Anchor"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

     </constraints>

   </views>

   <views name="Single Bendpoints" sections="//@tabs.0/@sections.15" automaticContext="true" datacontexts="//@dataContexts.0/@elements.15">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleBendpoints">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="Bendpoints"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

     </constraints>

   </views>

   <views name="Single IdentityAnchor" sections="//@tabs.0/@sections.16" automaticContext="true" datacontexts="//@dataContexts.0/@elements.16">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleIdentityAnchor">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="IdentityAnchor"/>

     </constraints>

   </views>

   <views name="Single RoutingStyle" sections="//@tabs.0/@sections.17" automaticContext="true" datacontexts="//@dataContexts.0/@elements.17">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleRoutingStyle" overrideable="false" overriddenConstraints="//@views.84/@constraints.0">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="RoutingStyle"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

     </constraints>

   </views>

   <views name="Single View" sections="//@tabs.0/@sections.18" automaticContext="true" datacontexts="//@dataContexts.0/@elements.18">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleView">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="View"/>

     </constraints>

   </views>

   <views name="Single RelativeBendpoints" sections="//@tabs.0/@sections.19" automaticContext="true" datacontexts="//@dataContexts.0/@elements.19">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleRelativeBendpoints">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="RelativeBendpoints"/>

     </constraints>

   </views>

   <views name="Single Image" sections="//@tabs.0/@sections.21" automaticContext="true" datacontexts="//@dataContexts.0/@elements.21">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleImage">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="Image"/>

     </constraints>

   </views>

   <views name="Single CanonicalStyle" sections="//@tabs.0/@sections.22" automaticContext="true" datacontexts="//@dataContexts.0/@elements.22">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleCanonicalStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="CanonicalStyle"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

     </constraints>

   </views>

   <views name="Single ShapeStyle" sections="//@tabs.0/@sections.23" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.23">

     <constraints xsi:type="contexts:SimpleConstraint" name="isShapeStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="ShapeStyle"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

     </constraints>

   </views>

   <views name="Single ConnectorStyle" sections="//@tabs.0/@sections.24" automaticContext="true" datacontexts="//@dataContexts.0/@elements.24">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleConnectorStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="ConnectorStyle"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

     </constraints>

   </views>

   <views name="Single PageStyle" sections="//@tabs.0/@sections.25" automaticContext="true" datacontexts="//@dataContexts.0/@elements.25">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSinglePageStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="PageStyle"/>

     </constraints>

   </views>

   <views name="Single DrawerStyle" sections="//@tabs.0/@sections.26" automaticContext="true" datacontexts="//@dataContexts.0/@elements.26">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleDrawerStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="DrawerStyle"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

     </constraints>

   </views>

   <views name="Single GuideStyle" sections="//@tabs.0/@sections.27" automaticContext="true" datacontexts="//@dataContexts.0/@elements.27">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleGuideStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="GuideStyle"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

     </constraints>

   </views>

   <views name="Single Guide" sections="//@tabs.0/@sections.28" automaticContext="true" datacontexts="//@dataContexts.0/@elements.28">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleGuide">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="Guide"/>

     </constraints>

   </views>

   <views name="Single NodeEntry" sections="//@tabs.0/@sections.29" automaticContext="true" datacontexts="//@dataContexts.0/@elements.29">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleNodeEntry">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="NodeEntry"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

     </constraints>

   </views>

   <views name="Single FilteringStyle" sections="//@tabs.0/@sections.30" automaticContext="true" datacontexts="//@dataContexts.0/@elements.30">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleFilteringStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="FilteringStyle"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

     </constraints>

   </views>

   <views name="Single DiagramStyle" sections="//@tabs.0/@sections.31" automaticContext="true" datacontexts="//@dataContexts.0/@elements.31">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleDiagramStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="DiagramStyle"/>

     </constraints>

   </views>

   <views name="Single ImageStyle" sections="//@tabs.0/@sections.32" automaticContext="true" datacontexts="//@dataContexts.0/@elements.32">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleImageStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="ImageStyle"/>

     </constraints>

   </views>

   <views name="Single ImageBufferStyle" sections="//@tabs.0/@sections.33" automaticContext="true" datacontexts="//@dataContexts.0/@elements.33">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleImageBufferStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="ImageBufferStyle"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

     </constraints>

   </views>

   <views name="Single PropertiesSetStyle" sections="//@tabs.0/@sections.34" automaticContext="true" datacontexts="//@dataContexts.0/@elements.34">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSinglePropertiesSetStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="PropertiesSetStyle"/>

     </constraints>

   </views>

   <views name="Single StringToPropertyValueMapEntry" sections="//@tabs.0/@sections.35" automaticContext="true" datacontexts="//@dataContexts.0/@elements.35">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleStringToPropertyValueMapEntry">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="StringToPropertyValueMapEntry"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

     </constraints>

   </views>

   <views name="Single PropertyValue" sections="//@tabs.0/@sections.36" automaticContext="true" datacontexts="//@dataContexts.0/@elements.36">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSinglePropertyValue">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="PropertyValue"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

     </constraints>

   </views>

   <views name="Single SingleValueStyle" sections="//@tabs.0/@sections.37" automaticContext="true" datacontexts="//@dataContexts.0/@elements.37">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleSingleValueStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="SingleValueStyle"/>

     </constraints>

   </views>

   <views name="Single ListValueStyle" sections="//@tabs.0/@sections.38" automaticContext="true" datacontexts="//@dataContexts.0/@elements.38">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleListValueStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="ListValueStyle"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

     </constraints>

   </views>

   <views name="Single NamedStyle" sections="//@tabs.0/@sections.39" automaticContext="true" datacontexts="//@dataContexts.0/@elements.39">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleNamedStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="NamedStyle"/>

     </constraints>

   </views>

   <views name="Single StringObjectConverter" sections="//@tabs.0/@sections.40" automaticContext="true" datacontexts="//@dataContexts.0/@elements.40">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleStringObjectConverter">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="StringObjectConverter"/>

     </constraints>

   </views>

   <views name="Single DataTypeStyle" sections="//@tabs.0/@sections.41" automaticContext="true" datacontexts="//@dataContexts.0/@elements.41">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleDataTypeStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="DataTypeStyle"/>

     </constraints>

   </views>

   <views name="Single IntValueStyle" sections="//@tabs.0/@sections.42" automaticContext="true" datacontexts="//@dataContexts.0/@elements.42">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleIntValueStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="IntValueStyle"/>

     </constraints>

   </views>

   <views name="Single IntListValueStyle" sections="//@tabs.0/@sections.43" automaticContext="true" datacontexts="//@dataContexts.0/@elements.43">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleIntListValueStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="IntListValueStyle"/>

     </constraints>

   </views>

   <views name="Single BooleanValueStyle" sections="//@tabs.0/@sections.44" automaticContext="true" datacontexts="//@dataContexts.0/@elements.44">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleBooleanValueStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="BooleanValueStyle"/>

     </constraints>

   </views>

   <views name="Single DoubleValueStyle" sections="//@tabs.0/@sections.45" automaticContext="true" datacontexts="//@dataContexts.0/@elements.45">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleDoubleValueStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="DoubleValueStyle"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

     </constraints>

   </views>

   <views name="Single DoubleListValueStyle" sections="//@tabs.0/@sections.46" automaticContext="true" datacontexts="//@dataContexts.0/@elements.46">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleDoubleListValueStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="DoubleListValueStyle"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

     </constraints>

   </views>

   <views name="Single StringValueStyle" sections="//@tabs.0/@sections.47" automaticContext="true" datacontexts="//@dataContexts.0/@elements.47">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleStringValueStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="StringValueStyle"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

     </constraints>

   </views>

   <views name="Single StringListValueStyle" sections="//@tabs.0/@sections.48" automaticContext="true" datacontexts="//@dataContexts.0/@elements.48">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleStringListValueStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="StringListValueStyle"/>

     </constraints>

   </views>

   <views name="Single EObjectValueStyle" sections="//@tabs.0/@sections.49" automaticContext="true" datacontexts="//@dataContexts.0/@elements.49">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleEObjectValueStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="EObjectValueStyle"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

     </constraints>

   </views>

   <views name="Single EObjectListValueStyle" sections="//@tabs.0/@sections.50" automaticContext="true" datacontexts="//@dataContexts.0/@elements.50">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleEObjectListValueStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="EObjectListValueStyle"/>

     </constraints>

   </views>

   <views name="Single ByteArrayValueStyle" sections="//@tabs.0/@sections.51" automaticContext="true" datacontexts="//@dataContexts.0/@elements.51">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleByteArrayValueStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="ByteArrayValueStyle"/>

     </constraints>

   </views>

   <views name="Single BooleanListValueStyle" sections="//@tabs.0/@sections.52" automaticContext="true" datacontexts="//@dataContexts.0/@elements.52">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleBooleanListValueStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="BooleanListValueStyle"/>

     </constraints>

   </views>

   <views name="Single HintedDiagramLinkStyle" sections="//@tabs.0/@sections.53" automaticContext="true" datacontexts="//@dataContexts.0/@elements.53">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleHintedDiagramLinkStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="HintedDiagramLinkStyle"/>

     </constraints>

   </views>

   <views name="Single DiagramLinkStyle" sections="//@tabs.0/@sections.54" automaticContext="true" datacontexts="//@dataContexts.0/@elements.54">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleDiagramLinkStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="DiagramLinkStyle"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

     </constraints>

   </views>

   <views name="Single MultiDiagramLinkStyle" sections="//@tabs.0/@sections.55" automaticContext="true" datacontexts="//@dataContexts.0/@elements.55">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleMultiDiagramLinkStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="MultiDiagramLinkStyle"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

     </constraints>

   </views>

   <views name="Single TextStyle" sections="//@tabs.0/@sections.56" automaticContext="true" datacontexts="//@dataContexts.0/@elements.56">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleTextStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="TextStyle"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

     </constraints>

   </views>

   <views name="Single LineTypeStyle" sections="//@tabs.0/@sections.57" automaticContext="true" datacontexts="//@dataContexts.0/@elements.57">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleLineTypeStyle" overrideable="false">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="LineTypeStyle"/>

     </constraints>

   </views>

   <views name="Single ArrowStyle" sections="//@tabs.0/@sections.58" automaticContext="true" datacontexts="//@dataContexts.0/@elements.58">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleArrowStyle" overrideable="false">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="ArrowStyle"/>

     </constraints>

   </views>

   <views name="Single Shape" sections="//@tabs.0/@sections.59" automaticContext="true" datacontexts="//@dataContexts.0/@elements.59">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleShape">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="Shape"/>

     </constraints>

   </views>

   <views name="Single Compartment" sections="//@tabs.0/@sections.60" automaticContext="true" datacontexts="//@dataContexts.0/@elements.60">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleCompartment">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="Compartment"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

     </constraints>

   </views>

   <views name="Single ListCompartment" sections="//@tabs.0/@sections.61" automaticContext="true" datacontexts="//@dataContexts.0/@elements.61">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleListCompartment">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="ListCompartment"/>

     </constraints>

   </views>

   <views name="Single Connector" sections="//@tabs.0/@sections.62" automaticContext="true" datacontexts="//@dataContexts.0/@elements.62">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleConnector">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="Connector"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

     </constraints>

   </views>

   <views name="Single StandardDiagram" sections="//@tabs.0/@sections.63" automaticContext="true" datacontexts="//@dataContexts.0/@elements.63">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleStandardDiagram">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="StandardDiagram"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

     </constraints>

   </views>

   <views name="Single DecorationNode" sections="//@tabs.0/@sections.64" automaticContext="true" datacontexts="//@dataContexts.0/@elements.64">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleDecorationNode">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="DecorationNode"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

     </constraints>

   </views>

   <views name="Single BasicDecorationNode" sections="//@tabs.0/@sections.65" automaticContext="true" datacontexts="//@dataContexts.0/@elements.65">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleBasicDecorationNode">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="BasicDecorationNode"/>

     </constraints>

   </views>

   <views name="Single BasicCompartment" sections="//@tabs.0/@sections.66" automaticContext="true" datacontexts="//@dataContexts.0/@elements.66">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleBasicCompartment">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="BasicCompartment"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

     </constraints>

   </views>

   <views name="Single BasicSemanticCompartment" sections="//@tabs.0/@sections.67" automaticContext="true" datacontexts="//@dataContexts.0/@elements.67">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleBasicSemanticCompartment">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="BasicSemanticCompartment"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

     </constraints>

   </views>

   <views name="Single SemanticListCompartment" sections="//@tabs.0/@sections.68" automaticContext="true" datacontexts="//@dataContexts.0/@elements.68">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleSemanticListCompartment">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="SemanticListCompartment"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

     </constraints>

   </views>

   <views name="RoundedCornersStyle" sections="//@tabs.0/@sections.69" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.69">

     <constraints xsi:type="contexts:SimpleConstraint" name="isRoundedCornersStyle" overrideable="false">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="RoundedCornersStyle"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

     </constraints>

   </views>

   <views name="Multiple Edge" sections="//@tabs.0/@sections.70" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.0">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleEdge">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="Edge"/>

     </constraints>

   </views>

   <views name="Multiple Node" sections="//@tabs.0/@sections.71" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.1">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleNode">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="Node"/>

     </constraints>

   </views>

   <views name="Multiple Style" sections="//@tabs.0/@sections.72" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.2">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="Style"/>

     </constraints>

   </views>

   <views name="Multiple TitleStyle" sections="//@tabs.0/@sections.73" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.6">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleTitleStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="TitleStyle"/>

     </constraints>

   </views>

   <views name="Multiple SortingStyle" sections="//@tabs.0/@sections.74" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.7">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleSortingStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="SortingStyle"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

     </constraints>

   </views>

   <views name="Multiple DescriptionStyle" sections="//@tabs.0/@sections.75" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.8">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleDescriptionStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="DescriptionStyle"/>

     </constraints>

   </views>

   <views name="Multiple LayoutConstraint" sections="//@tabs.0/@sections.76" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.9">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleLayoutConstraint">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="LayoutConstraint"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

     </constraints>

   </views>

   <views name="Multiple Size" sections="//@tabs.0/@sections.77" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.10">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleSize">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="Size"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

     </constraints>

   </views>

   <views name="Multiple Location" sections="//@tabs.0/@sections.78" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.11">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleLocation">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="Location"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

     </constraints>

   </views>

   <views name="Multiple Bounds" sections="//@tabs.0/@sections.79" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.12">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleBounds">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="Bounds"/>

     </constraints>

   </views>

   <views name="Multiple Ratio" sections="//@tabs.0/@sections.80" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.13">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleRatio">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="Ratio"/>

     </constraints>

   </views>

   <views name="Multiple Anchor" sections="//@tabs.0/@sections.81" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.14">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleAnchor">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="Anchor"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

     </constraints>

   </views>

   <views name="Multiple Bendpoints" sections="//@tabs.0/@sections.82" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.15">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleBendpoints">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="Bendpoints"/>

     </constraints>

   </views>

   <views name="Multiple IdentityAnchor" sections="//@tabs.0/@sections.83" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.16">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleIdentityAnchor">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="IdentityAnchor"/>

     </constraints>

   </views>

   <views name="Multiple RoutingStyle" sections="//@tabs.0/@sections.84" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.17">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleRoutingStyle" overrideable="false">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="RoutingStyle"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

     </constraints>

   </views>

   <views name="Multiple View" sections="//@tabs.0/@sections.85" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.18">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleView">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="View"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

     </constraints>

   </views>

   <views name="Multiple RelativeBendpoints" sections="//@tabs.0/@sections.86" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.19">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleRelativeBendpoints">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="RelativeBendpoints"/>

     </constraints>

   </views>

   <views name="Multiple Diagram" sections="//@tabs.0/@sections.87" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.20">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleDiagram">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="Diagram"/>

     </constraints>

   </views>

   <views name="Multiple Image" sections="//@tabs.0/@sections.88" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.21">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleImage">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="Image"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

     </constraints>

   </views>

   <views name="Multiple CanonicalStyle" sections="//@tabs.0/@sections.89" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.22">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleCanonicalStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="CanonicalStyle"/>

     </constraints>

   </views>

   <views name="Multiple ConnectorStyle" sections="//@tabs.0/@sections.90" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.24">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleConnectorStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="ConnectorStyle"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

     </constraints>

   </views>

   <views name="Multiple PageStyle" sections="//@tabs.0/@sections.91" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.25">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultiplePageStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="PageStyle"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

     </constraints>

   </views>

   <views name="Multiple DrawerStyle" sections="//@tabs.0/@sections.92" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.26">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleDrawerStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="DrawerStyle"/>

     </constraints>

   </views>

   <views name="Multiple GuideStyle" sections="//@tabs.0/@sections.93" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.27">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleGuideStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="GuideStyle"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

     </constraints>

   </views>

   <views name="Multiple Guide" sections="//@tabs.0/@sections.94" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.28">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleGuide">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="Guide"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

     </constraints>

   </views>

   <views name="Multiple NodeEntry" sections="//@tabs.0/@sections.95" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.29">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleNodeEntry">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="NodeEntry"/>

     </constraints>

   </views>

   <views name="Multiple FilteringStyle" sections="//@tabs.0/@sections.96" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.30">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleFilteringStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="FilteringStyle"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

     </constraints>

   </views>

   <views name="Multiple DiagramStyle" sections="//@tabs.0/@sections.97" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.31">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleDiagramStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="DiagramStyle"/>

     </constraints>

   </views>

   <views name="Multiple ImageStyle" sections="//@tabs.0/@sections.98" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.32">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleImageStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="ImageStyle"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

     </constraints>

   </views>

   <views name="Multiple ImageBufferStyle" sections="//@tabs.0/@sections.99" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.33">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleImageBufferStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="ImageBufferStyle"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

     </constraints>

   </views>

   <views name="Multiple PropertiesSetStyle" sections="//@tabs.0/@sections.100" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.34">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultiplePropertiesSetStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="PropertiesSetStyle"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

     </constraints>

   </views>

   <views name="Multiple StringToPropertyValueMapEntry" sections="//@tabs.0/@sections.101" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.35">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleStringToPropertyValueMapEntry">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="StringToPropertyValueMapEntry"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

     </constraints>

   </views>

   <views name="Multiple PropertyValue" sections="//@tabs.0/@sections.102" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.36">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultiplePropertyValue">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="PropertyValue"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

     </constraints>

   </views>

   <views name="Multiple SingleValueStyle" sections="//@tabs.0/@sections.103" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.37">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleSingleValueStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="SingleValueStyle"/>

     </constraints>

   </views>

   <views name="Multiple ListValueStyle" sections="//@tabs.0/@sections.104" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.38">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleListValueStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="ListValueStyle"/>

     </constraints>

   </views>

   <views name="Multiple NamedStyle" sections="//@tabs.0/@sections.105" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.39">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleNamedStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="NamedStyle"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

     </constraints>

   </views>

   <views name="Multiple StringObjectConverter" sections="//@tabs.0/@sections.106" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.40">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleStringObjectConverter">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="StringObjectConverter"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

     </constraints>

   </views>

   <views name="Multiple DataTypeStyle" sections="//@tabs.0/@sections.107" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.41">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleDataTypeStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="DataTypeStyle"/>

     </constraints>

   </views>

   <views name="Multiple IntValueStyle" sections="//@tabs.0/@sections.108" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.42">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleIntValueStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="IntValueStyle"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

     </constraints>

   </views>

   <views name="Multiple IntListValueStyle" sections="//@tabs.0/@sections.109" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.43">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleIntListValueStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="IntListValueStyle"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

     </constraints>

   </views>

   <views name="Multiple BooleanValueStyle" sections="//@tabs.0/@sections.110" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.44">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleBooleanValueStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="BooleanValueStyle"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

     </constraints>

   </views>

   <views name="Multiple DoubleValueStyle" sections="//@tabs.0/@sections.111" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.45">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleDoubleValueStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="DoubleValueStyle"/>

     </constraints>

   </views>

   <views name="Multiple DoubleListValueStyle" sections="//@tabs.0/@sections.112" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.46">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleDoubleListValueStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="DoubleListValueStyle"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

     </constraints>

   </views>

   <views name="Multiple StringValueStyle" sections="//@tabs.0/@sections.113" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.47">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleStringValueStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="StringValueStyle"/>

     </constraints>

   </views>

   <views name="Multiple StringListValueStyle" sections="//@tabs.0/@sections.114" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.48">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleStringListValueStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="StringListValueStyle"/>

     </constraints>

   </views>

   <views name="Multiple EObjectValueStyle" sections="//@tabs.0/@sections.115" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.49">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleEObjectValueStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="EObjectValueStyle"/>

     </constraints>

   </views>

   <views name="Multiple EObjectListValueStyle" sections="//@tabs.0/@sections.116" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.50">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleEObjectListValueStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="EObjectListValueStyle"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

     </constraints>

   </views>

   <views name="Multiple ByteArrayValueStyle" sections="//@tabs.0/@sections.117" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.51">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleByteArrayValueStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="ByteArrayValueStyle"/>

     </constraints>

   </views>

   <views name="Multiple BooleanListValueStyle" sections="//@tabs.0/@sections.118" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.52">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleBooleanListValueStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="BooleanListValueStyle"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

     </constraints>

   </views>

   <views name="Multiple HintedDiagramLinkStyle" sections="//@tabs.0/@sections.119" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.53">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleHintedDiagramLinkStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="HintedDiagramLinkStyle"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

     </constraints>

   </views>

   <views name="Multiple DiagramLinkStyle" sections="//@tabs.0/@sections.120" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.54">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleDiagramLinkStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="DiagramLinkStyle"/>

     </constraints>

   </views>

   <views name="Multiple MultiDiagramLinkStyle" sections="//@tabs.0/@sections.121" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.55">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleMultiDiagramLinkStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="MultiDiagramLinkStyle"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

     </constraints>

   </views>

   <views name="Multiple TextStyle" sections="//@tabs.0/@sections.122" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.56">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleTextStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="TextStyle"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

     </constraints>

   </views>

   <views name="Multiple LineTypeStyle" sections="//@tabs.0/@sections.123" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.57">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleLineTypeStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="LineTypeStyle"/>

     </constraints>

   </views>

   <views name="Multiple ArrowStyle" sections="//@tabs.0/@sections.124" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.58">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleArrowStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="ArrowStyle"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

     </constraints>

   </views>

   <views name="Multiple Shape" sections="//@tabs.0/@sections.125" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.59">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleShape">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="Shape"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

     </constraints>

   </views>

   <views name="Multiple Compartment" sections="//@tabs.0/@sections.126" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.60">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleCompartment">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="Compartment"/>

     </constraints>

   </views>

   <views name="Multiple ListCompartment" sections="//@tabs.0/@sections.127" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.61">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleListCompartment">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="ListCompartment"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

     </constraints>

   </views>

   <views name="Multiple Connector" sections="//@tabs.0/@sections.128" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.62">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleConnector">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="Connector"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

     </constraints>

   </views>

   <views name="Multiple StandardDiagram" sections="//@tabs.0/@sections.129" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.63">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleStandardDiagram">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="StandardDiagram"/>

     </constraints>

   </views>

   <views name="Multiple DecorationNode" sections="//@tabs.0/@sections.130" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.64">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleDecorationNode">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="DecorationNode"/>

     </constraints>

   </views>

   <views name="Multiple BasicDecorationNode" sections="//@tabs.0/@sections.131" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.65">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleBasicDecorationNode">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="BasicDecorationNode"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

     </constraints>

   </views>

   <views name="Multiple BasicCompartment" sections="//@tabs.0/@sections.132" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.66">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleBasicCompartment">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="BasicCompartment"/>

     </constraints>

   </views>

   <views name="Multiple BasicSemanticCompartment" sections="//@tabs.0/@sections.133" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.67">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleBasicSemanticCompartment">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="BasicSemanticCompartment"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

     </constraints>

   </views>

   <views name="Multiple SemanticListCompartment" sections="//@tabs.0/@sections.134" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.68">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleSemanticListCompartment">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="SemanticListCompartment"/>

     </constraints>

   </views>

   <views name="SingleGradientData" sections="//@tabs.0/@sections.135">

     <constraints xsi:type="contexts:SimpleConstraint" name="isGradientData">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties/model/Environment.xmi#//@constraintTypes.3"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.3"/>

       <properties xsi:type="contexts:ValueProperty" name="class" value="org.eclipse.gmf.runtime.notation.datatype.GradientData"/>

     </constraints>

   </views>

@@ -1588,6 +1588,6 @@
       <properties name="gradientStyle" type="Enumeration"/>

       <properties name="activate" label="Activate" type="Boolean"/>

     </elements>

-    <modelElementFactory href="ppe:/environment/org.eclipse.papyrus.properties.notation/model/Environment.xmi#//@modelElementFactories.0"/>

+    <modelElementFactory href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@modelElementFactories.0"/>

   </dataContexts>

 </contexts:Context>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/FillStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/FillStyle.xwt
index 6da37fbf797..371432a832e 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/FillStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/FillStyle.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"

-	xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

-	xmlns:gmf="clr-namespace:org.eclipse.papyrus.widgets.gmf.editors"

+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

+	xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns:gmf="clr-namespace:org.eclipse.papyrus.infra.gmfdiag.widgets.editors"

 	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"

 	text="Fill">

 	<Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/FontStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/FontStyle.xwt
index 1330dda633a..47b7aa17565 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/FontStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/FontStyle.xwt
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

 	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

-	xmlns:gmf="clr-namespace:org.eclipse.papyrus.widgets.gmf.editors">

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns:gmf="clr-namespace:org.eclipse.papyrus.infra.gmfdiag.widgets.editors">

 	<Composite.layout>

 		<GridLayout></GridLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/LineStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/LineStyle.xwt
index 4c08b32ba1f..fb9625b6c70 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/LineStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/LineStyle.xwt
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" xmlns:gmf="clr-namespace:org.eclipse.papyrus.widgets.gmf.editors"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" text="Line">

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns:j="clr-namespace:java.lang" xmlns:gmf="clr-namespace:org.eclipse.papyrus.infra.gmfdiag.widgets.editors"

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" text="Line">

 	<Composite.layout>

 		<GridLayout></GridLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleAnchor.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleAnchor.xwt
index d263b89f6f8..4a2db70155f 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleAnchor.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleAnchor.xwt
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

 	xmlns:x="http://www.eclipse.org/xwt">

 	<Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleArrowStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleArrowStyle.xwt
index 370619276f8..d39c548a243 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleArrowStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleArrowStyle.xwt
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets">

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleBasicCompartment.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleBasicCompartment.xwt
index 75a689592eb..cda13d2e069 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleBasicCompartment.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleBasicCompartment.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets">

+	xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleBasicDecorationNode.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleBasicDecorationNode.xwt
index 7de10d50755..a09bc27f944 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleBasicDecorationNode.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleBasicDecorationNode.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets">

+	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleBasicSemanticCompartment.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleBasicSemanticCompartment.xwt
index 22ccf8267bf..90ddedc0d02 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleBasicSemanticCompartment.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleBasicSemanticCompartment.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns:j="clr-namespace:java.lang"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout">

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"

+	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleBendpoints.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleBendpoints.xwt
index 01d3bfc35d8..9047bd98f8e 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleBendpoints.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleBendpoints.xwt
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns:x="http://www.eclipse.org/xwt">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleBooleanListValueStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleBooleanListValueStyle.xwt
index 6191253c3dd..51204c02825 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleBooleanListValueStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleBooleanListValueStyle.xwt
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleBooleanValueStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleBooleanValueStyle.xwt
index dcb969f9e73..a8c3646c414 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleBooleanValueStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleBooleanValueStyle.xwt
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

+	xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns:x="http://www.eclipse.org/xwt">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleBounds.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleBounds.xwt
index 01d3bfc35d8..9047bd98f8e 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleBounds.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleBounds.xwt
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns:x="http://www.eclipse.org/xwt">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleByteArrayValueStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleByteArrayValueStyle.xwt
index 0d8a7039afe..9ba4ce8ae90 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleByteArrayValueStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleByteArrayValueStyle.xwt
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns:j="clr-namespace:java.lang"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleCanonicalStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleCanonicalStyle.xwt
index cd24c89f432..a5ea7d43e6d 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleCanonicalStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleCanonicalStyle.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"

+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

 	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns="http://www.eclipse.org/xwt/presentation">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleCompartment.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleCompartment.xwt
index 00f54c3f8ef..626d55169c8 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleCompartment.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleCompartment.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets">

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleConnector.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleConnector.xwt
index 62e572a1c13..f4e33545fb9 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleConnector.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleConnector.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets">

+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleConnectorStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleConnectorStyle.xwt
index 72f21dcf740..d12e2bc0d41 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleConnectorStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleConnectorStyle.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"

+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

 	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout">

+	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleDataTypeStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleDataTypeStyle.xwt
index 9f4c88f4daf..d69369c20ec 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleDataTypeStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleDataTypeStyle.xwt
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleDecorationNode.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleDecorationNode.xwt
index 9b6774a429a..c06f378902d 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleDecorationNode.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleDecorationNode.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns:j="clr-namespace:java.lang"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

 	xmlns:x="http://www.eclipse.org/xwt">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleDescriptionStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleDescriptionStyle.xwt
index 73828868e32..fe12aa8cdc9 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleDescriptionStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleDescriptionStyle.xwt
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

 	xmlns="http://www.eclipse.org/xwt/presentation">

 	<Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleDiagram.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleDiagram.xwt
index 7aa05c29f13..c68deeb42cb 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleDiagram.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleDiagram.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets">

+	xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleDiagramLinkStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleDiagramLinkStyle.xwt
index 18f080a1740..efa18b1c194 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleDiagramLinkStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleDiagramLinkStyle.xwt
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout">

+	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleDiagramStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleDiagramStyle.xwt
index 9cb72eaa1eb..f66296009f9 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleDiagramStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleDiagramStyle.xwt
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"

+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

 	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleDoubleListValueStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleDoubleListValueStyle.xwt
index e82f3b4cc84..22ddc4a4d54 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleDoubleListValueStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleDoubleListValueStyle.xwt
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns="http://www.eclipse.org/xwt/presentation">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleDoubleValueStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleDoubleValueStyle.xwt
index a6a71cb4f47..48685e97082 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleDoubleValueStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleDoubleValueStyle.xwt
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout">

+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleDrawerStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleDrawerStyle.xwt
index c62d154c4c0..936f5239e31 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleDrawerStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleDrawerStyle.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"

+	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

 	xmlns:j="clr-namespace:java.lang">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleEObjectListValueStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleEObjectListValueStyle.xwt
index d263b89f6f8..4a2db70155f 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleEObjectListValueStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleEObjectListValueStyle.xwt
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

 	xmlns:x="http://www.eclipse.org/xwt">

 	<Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleEObjectValueStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleEObjectValueStyle.xwt
index 18f080a1740..efa18b1c194 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleEObjectValueStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleEObjectValueStyle.xwt
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout">

+	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleEdge.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleEdge.xwt
index bdc0ecc2b6a..5d4ec443107 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleEdge.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleEdge.xwt
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns="http://www.eclipse.org/xwt/presentation"

 	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets">

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleFillStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleFillStyle.xwt
index a3c89475dd3..92b43a2ebb4 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleFillStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleFillStyle.xwt
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:gmf="clr-namespace:org.eclipse.papyrus.widgets.gmf.editors">

+	xmlns:gmf="clr-namespace:org.eclipse.papyrus.infra.gmfdiag.widgets.editors">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleFilteringStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleFilteringStyle.xwt
index 1f29cf3d3b6..c827c87b59b 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleFilteringStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleFilteringStyle.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

 	xmlns:x="http://www.eclipse.org/xwt">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleFontStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleFontStyle.xwt
index 543ccb37c8b..ea846fff252 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleFontStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleFontStyle.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

-	xmlns:gmf="clr-namespace:org.eclipse.papyrus.widgets.gmf.editors"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"

+<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns:gmf="clr-namespace:org.eclipse.papyrus.infra.gmfdiag.widgets.editors"

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

 	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

 	xmlns:x="http://www.eclipse.org/xwt" text="Font">

 	<Group.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleGuide.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleGuide.xwt
index 5e4d52f1360..5d444d290de 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleGuide.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleGuide.xwt
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"

+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

 	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleGuideStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleGuideStyle.xwt
index dcb969f9e73..a8c3646c414 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleGuideStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleGuideStyle.xwt
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

+	xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns:x="http://www.eclipse.org/xwt">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleHintedDiagramLinkStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleHintedDiagramLinkStyle.xwt
index a6a71cb4f47..48685e97082 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleHintedDiagramLinkStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleHintedDiagramLinkStyle.xwt
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout">

+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleIdentityAnchor.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleIdentityAnchor.xwt
index e2ea3fa7c75..abe6b00910f 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleIdentityAnchor.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleIdentityAnchor.xwt
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

 	xmlns="http://www.eclipse.org/xwt/presentation">

 	<Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleImage.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleImage.xwt
index 6191253c3dd..51204c02825 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleImage.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleImage.xwt
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleImageBufferStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleImageBufferStyle.xwt
index a57e92a2dd7..0f03fd30c5d 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleImageBufferStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleImageBufferStyle.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns="http://www.eclipse.org/xwt/presentation"

 	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout">

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleImageStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleImageStyle.xwt
index d7edce78b15..5875b27a695 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleImageStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleImageStyle.xwt
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout">

+	xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleIntListValueStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleIntListValueStyle.xwt
index 18f080a1740..efa18b1c194 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleIntListValueStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleIntListValueStyle.xwt
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout">

+	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleIntValueStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleIntValueStyle.xwt
index e2ea3fa7c75..abe6b00910f 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleIntValueStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleIntValueStyle.xwt
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

 	xmlns="http://www.eclipse.org/xwt/presentation">

 	<Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleLayoutConstraint.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleLayoutConstraint.xwt
index ac165c9d1f4..b4b832b78ea 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleLayoutConstraint.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleLayoutConstraint.xwt
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleLineStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleLineStyle.xwt
index 665541894ab..4aa07d55061 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleLineStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleLineStyle.xwt
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Group xmlns:j="clr-namespace:java.lang"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"

-	xmlns:gmf="clr-namespace:org.eclipse.papyrus.widgets.gmf.editors"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

+	xmlns:gmf="clr-namespace:org.eclipse.papyrus.infra.gmfdiag.widgets.editors"

 	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

 	text="Line">

 	<Group.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleLineTypeStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleLineTypeStyle.xwt
index 285cb13321b..a7a7092d6ad 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleLineTypeStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleLineTypeStyle.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns="http://www.eclipse.org/xwt/presentation">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleListCompartment.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleListCompartment.xwt
index 2081f95bbfb..5f22a2fa278 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleListCompartment.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleListCompartment.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

 	xmlns="http://www.eclipse.org/xwt/presentation">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleListValueStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleListValueStyle.xwt
index bd8b2c63107..4d0cc388e09 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleListValueStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleListValueStyle.xwt
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns="http://www.eclipse.org/xwt/presentation">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleLocation.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleLocation.xwt
index 9f4c88f4daf..d69369c20ec 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleLocation.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleLocation.xwt
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleMultiDiagramLinkStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleMultiDiagramLinkStyle.xwt
index bd8b2c63107..4d0cc388e09 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleMultiDiagramLinkStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleMultiDiagramLinkStyle.xwt
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns="http://www.eclipse.org/xwt/presentation">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleNamedStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleNamedStyle.xwt
index c9a9dc39633..73058aaffc8 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleNamedStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleNamedStyle.xwt
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"

 	xmlns:x="http://www.eclipse.org/xwt">

 	<Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleNode.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleNode.xwt
index 5366fabe7ae..77130c48e63 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleNode.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleNode.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets">

+	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleNodeEntry.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleNodeEntry.xwt
index b527093a727..3805db4c2ce 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleNodeEntry.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleNodeEntry.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation">

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultiplePageStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultiplePageStyle.xwt
index 78a386189d4..e3af9b0c8e8 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultiplePageStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultiplePageStyle.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

 	xmlns="http://www.eclipse.org/xwt/presentation">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultiplePropertiesSetStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultiplePropertiesSetStyle.xwt
index c9a9dc39633..73058aaffc8 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultiplePropertiesSetStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultiplePropertiesSetStyle.xwt
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"

 	xmlns:x="http://www.eclipse.org/xwt">

 	<Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultiplePropertyValue.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultiplePropertyValue.xwt
index 73828868e32..fe12aa8cdc9 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultiplePropertyValue.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultiplePropertyValue.xwt
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

 	xmlns="http://www.eclipse.org/xwt/presentation">

 	<Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleRatio.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleRatio.xwt
index fe484d0ccbd..06b744321e8 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleRatio.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleRatio.xwt
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

 	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout">

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleRelativeBendpoints.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleRelativeBendpoints.xwt
index 2b413368884..0972b3893fb 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleRelativeBendpoints.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleRelativeBendpoints.xwt
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns:j="clr-namespace:java.lang">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleRoundedCornersStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleRoundedCornersStyle.xwt
index a523ae9c344..d6dfd8c9379 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleRoundedCornersStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleRoundedCornersStyle.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"

 	xmlns:j="clr-namespace:java.lang">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleRoutingStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleRoutingStyle.xwt
index da61c5c3653..6a39ad636ee 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleRoutingStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleRoutingStyle.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets">

+	xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">

 	<Composite.layout>

 		<GridLayout numColumns="2" makeColumnsEqualWidth="true"></GridLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleSemanticListCompartment.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleSemanticListCompartment.xwt
index eb6bea79cdc..888fc6d68ff 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleSemanticListCompartment.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleSemanticListCompartment.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

 	xmlns:x="http://www.eclipse.org/xwt">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleShape.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleShape.xwt
index 8720cc253c4..ac0a53ec02c 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleShape.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleShape.xwt
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets">

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleShapeStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleShapeStyle.xwt
index 77ccfd4b46d..153489f2dc3 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleShapeStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleShapeStyle.xwt
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns:j="clr-namespace:java.lang"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets">

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleSingleValueStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleSingleValueStyle.xwt
index e82f3b4cc84..22ddc4a4d54 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleSingleValueStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleSingleValueStyle.xwt
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns="http://www.eclipse.org/xwt/presentation">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleSize.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleSize.xwt
index 665daeb4b4d..b2d51628ca9 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleSize.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleSize.xwt
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"

 	xmlns:j="clr-namespace:java.lang">

 	<Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleSortingStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleSortingStyle.xwt
index 1ee4d2d67bf..d4581387e24 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleSortingStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleSortingStyle.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleStandardDiagram.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleStandardDiagram.xwt
index b4ef9370bdd..ffd18b54e90 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleStandardDiagram.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleStandardDiagram.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets">

+	xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleStringListValueStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleStringListValueStyle.xwt
index 9f4c88f4daf..d69369c20ec 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleStringListValueStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleStringListValueStyle.xwt
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleStringObjectConverter.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleStringObjectConverter.xwt
index a6a71cb4f47..48685e97082 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleStringObjectConverter.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleStringObjectConverter.xwt
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout">

+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleStringToPropertyValueMapEntry.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleStringToPropertyValueMapEntry.xwt
index f16e30c6471..755961dc28d 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleStringToPropertyValueMapEntry.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleStringToPropertyValueMapEntry.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns="http://www.eclipse.org/xwt/presentation"

 	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout">

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleStringValueStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleStringValueStyle.xwt
index 2b413368884..0972b3893fb 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleStringValueStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleStringValueStyle.xwt
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns:j="clr-namespace:java.lang">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleStyle.xwt
index c9a9dc39633..73058aaffc8 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleStyle.xwt
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"

 	xmlns:x="http://www.eclipse.org/xwt">

 	<Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleTextStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleTextStyle.xwt
index 4c4edff3af7..81cb9df8340 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleTextStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleTextStyle.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

 	xmlns:j="clr-namespace:java.lang">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleTitleStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleTitleStyle.xwt
index b9302a23f79..d9404104afa 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleTitleStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleTitleStyle.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"

+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

 	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns="http://www.eclipse.org/xwt/presentation">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleView.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleView.xwt
index 00545f4676f..63b5d95e26f 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleView.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/MultipleView.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation">

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/RoundedCornersStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/RoundedCornersStyle.xwt
index 3c3b8989f7e..d27ceb5e7ee 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/RoundedCornersStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/RoundedCornersStyle.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets">

+	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/ShapeStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/ShapeStyle.xwt
index a958640604b..daba3afe64f 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/ShapeStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/ShapeStyle.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout">

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleAnchor.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleAnchor.xwt
index 0d8a7039afe..9ba4ce8ae90 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleAnchor.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleAnchor.xwt
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns:j="clr-namespace:java.lang"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleArrowStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleArrowStyle.xwt
index 86faa0d420c..a4f143abcfc 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleArrowStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleArrowStyle.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns:j="clr-namespace:java.lang">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleBasicCompartment.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleBasicCompartment.xwt
index 9c43a778823..cc62f120831 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleBasicCompartment.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleBasicCompartment.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

 	xmlns:j="clr-namespace:java.lang">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleBasicDecorationNode.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleBasicDecorationNode.xwt
index ab19fd69e8e..3e09e2359ef 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleBasicDecorationNode.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleBasicDecorationNode.xwt
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"

+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

 	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

 	xmlns:x="http://www.eclipse.org/xwt">

 	<Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleBasicSemanticCompartment.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleBasicSemanticCompartment.xwt
index 237a8df3144..760f8e3f73e 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleBasicSemanticCompartment.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleBasicSemanticCompartment.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

 	xmlns:j="clr-namespace:java.lang">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleBendpoints.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleBendpoints.xwt
index 2b413368884..0972b3893fb 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleBendpoints.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleBendpoints.xwt
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns:j="clr-namespace:java.lang">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleBooleanListValueStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleBooleanListValueStyle.xwt
index 22a82ab1a8a..d13178eea6b 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleBooleanListValueStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleBooleanListValueStyle.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"

+	xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

 	xmlns:x="http://www.eclipse.org/xwt">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleBooleanValueStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleBooleanValueStyle.xwt
index 3ca7c9c6161..ded90ee49ca 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleBooleanValueStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleBooleanValueStyle.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

+	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns:j="clr-namespace:java.lang">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleBounds.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleBounds.xwt
index e2ea3fa7c75..abe6b00910f 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleBounds.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleBounds.xwt
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

 	xmlns="http://www.eclipse.org/xwt/presentation">

 	<Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleByteArrayValueStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleByteArrayValueStyle.xwt
index d0b6701b525..98996d392d4 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleByteArrayValueStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleByteArrayValueStyle.xwt
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"

+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"

 	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleCanonicalStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleCanonicalStyle.xwt
index c73bc172adb..0ab224c66d7 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleCanonicalStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleCanonicalStyle.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout">

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleCompartment.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleCompartment.xwt
index b6fe9832580..23d86901735 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleCompartment.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleCompartment.xwt
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleConnector.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleConnector.xwt
index 6c1c32d6629..544df2e1fa5 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleConnector.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleConnector.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"

+	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

 	xmlns:j="clr-namespace:java.lang">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleConnectorStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleConnectorStyle.xwt
index 5da9c76d12f..b676bdcba92 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleConnectorStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleConnectorStyle.xwt
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"

+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

 	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

 	xmlns:j="clr-namespace:java.lang">

 	<Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleDataTypeStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleDataTypeStyle.xwt
index 500f8351be1..3e2716acb23 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleDataTypeStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleDataTypeStyle.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns:j="clr-namespace:java.lang"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

 	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleDecorationNode.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleDecorationNode.xwt
index c3a4979eb2f..1a27520d7bf 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleDecorationNode.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleDecorationNode.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleDescriptionStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleDescriptionStyle.xwt
index da0ed071244..37ea0dfa5c4 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleDescriptionStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleDescriptionStyle.xwt
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleDiagram.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleDiagram.xwt
index 21078a542f0..94417b8fd6a 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleDiagram.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleDiagram.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns:j="clr-namespace:java.lang"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

+	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns="http://www.eclipse.org/xwt/presentation">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleDiagramLinkStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleDiagramLinkStyle.xwt
index 2112b11f868..5b713533e38 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleDiagramLinkStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleDiagramLinkStyle.xwt
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"

+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

 	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

 	xmlns:j="clr-namespace:java.lang">

 	<Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleDiagramStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleDiagramStyle.xwt
index f3167101430..f82cdd033ab 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleDiagramStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleDiagramStyle.xwt
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"

-	xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

+	xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleDoubleListValueStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleDoubleListValueStyle.xwt
index 8a4db8d7420..fd2e7a6d719 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleDoubleListValueStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleDoubleListValueStyle.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"

+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

 	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout">

+	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleDoubleValueStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleDoubleValueStyle.xwt
index 99ea3becc60..8acba25d40d 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleDoubleValueStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleDoubleValueStyle.xwt
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"

+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

 	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleDrawerStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleDrawerStyle.xwt
index 1a130e3a2cd..bee910a29ea 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleDrawerStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleDrawerStyle.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

 	xmlns:x="http://www.eclipse.org/xwt">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleEObjectListValueStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleEObjectListValueStyle.xwt
index 45a629f9d7e..2be197173b4 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleEObjectListValueStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleEObjectListValueStyle.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

 	xmlns:j="clr-namespace:java.lang">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleEObjectValueStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleEObjectValueStyle.xwt
index 7ed8fe72bc8..79a35ec271b 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleEObjectValueStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleEObjectValueStyle.xwt
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

 	xmlns:j="clr-namespace:java.lang">

 	<Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleEdge.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleEdge.xwt
index 39d92b796a8..7dd1cc74b9a 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleEdge.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleEdge.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"

+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

 	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns:x="http://www.eclipse.org/xwt">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleFillStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleFillStyle.xwt
index 23767b40903..a9cfff796a8 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleFillStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleFillStyle.xwt
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:gmf="clr-namespace:org.eclipse.papyrus.widgets.gmf.editors"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

+	xmlns:gmf="clr-namespace:org.eclipse.papyrus.infra.gmfdiag.widgets.editors"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" text="Fill">

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" text="Fill">

 	<Composite.layout>

 		<GridLayout></GridLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleFilteringStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleFilteringStyle.xwt
index 8b11b6795d2..ce703282aa9 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleFilteringStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleFilteringStyle.xwt
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

 	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout">

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleFontStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleFontStyle.xwt
index f0eaf0dc86c..f6f48522265 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleFontStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleFontStyle.xwt
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:gmf="clr-namespace:org.eclipse.papyrus.widgets.gmf.editors">

+	xmlns:x="http://www.eclipse.org/xwt" xmlns:gmf="clr-namespace:org.eclipse.papyrus.infra.gmfdiag.widgets.editors">

 	<Composite.layout>

 		<GridLayout></GridLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleGradientData.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleGradientData.xwt
index f66a5ece5c5..8e9f9232ce8 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleGradientData.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleGradientData.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

-	xmlns:gmf="clr-namespace:org.eclipse.papyrus.widgets.gmf.editors"

+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns:gmf="clr-namespace:org.eclipse.papyrus.infra.gmfdiag.widgets.editors"

 	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"

 	text="Gradient">

 	<Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleGuide.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleGuide.xwt
index 7ac41a45eba..0fbb85ce502 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleGuide.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleGuide.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout">

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleGuideStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleGuideStyle.xwt
index 18f080a1740..efa18b1c194 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleGuideStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleGuideStyle.xwt
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout">

+	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleHintedDiagramLinkStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleHintedDiagramLinkStyle.xwt
index f6e87943062..3578891bc27 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleHintedDiagramLinkStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleHintedDiagramLinkStyle.xwt
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets">

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleIdentityAnchor.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleIdentityAnchor.xwt
index b61df46be92..00abe47a686 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleIdentityAnchor.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleIdentityAnchor.xwt
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

+	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns:j="clr-namespace:java.lang">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleImage.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleImage.xwt
index 683498da341..b830da2e4a0 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleImage.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleImage.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"

 	xmlns:j="clr-namespace:java.lang">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleImageBufferStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleImageBufferStyle.xwt
index 0df5d28706c..cf4fdbbd40c 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleImageBufferStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleImageBufferStyle.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

 	xmlns:j="clr-namespace:java.lang">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleImageStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleImageStyle.xwt
index 19c4bc04e8e..0c7469f7e2e 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleImageStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleImageStyle.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleIntListValueStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleIntListValueStyle.xwt
index 3bb8fed9ad6..8e8ce84ae50 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleIntListValueStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleIntListValueStyle.xwt
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns:j="clr-namespace:java.lang"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

 	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout">

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleIntValueStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleIntValueStyle.xwt
index 8f64c1b5c78..436d1b861d0 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleIntValueStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleIntValueStyle.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets">

+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleLayoutConstraint.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleLayoutConstraint.xwt
index 73828868e32..fe12aa8cdc9 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleLayoutConstraint.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleLayoutConstraint.xwt
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

 	xmlns="http://www.eclipse.org/xwt/presentation">

 	<Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleLineStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleLineStyle.xwt
index 2778b45f8ad..530a34ebc56 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleLineStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleLineStyle.xwt
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

-	xmlns:gmf="clr-namespace:org.eclipse.papyrus.widgets.gmf.editors"

+	xmlns:gmf="clr-namespace:org.eclipse.papyrus.infra.gmfdiag.widgets.editors"

 	xmlns="http://www.eclipse.org/xwt/presentation" text="Line">

 	<Composite.layout>

 		<GridLayout></GridLayout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleLineTypeStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleLineTypeStyle.xwt
index 29fce581b35..dd020c57332 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleLineTypeStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleLineTypeStyle.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

 	xmlns:j="clr-namespace:java.lang">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleListCompartment.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleListCompartment.xwt
index b3ffc8fce74..39841341d5b 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleListCompartment.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleListCompartment.xwt
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns="http://www.eclipse.org/xwt/presentation"

 	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets">

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleListValueStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleListValueStyle.xwt
index c73ce45fa19..f93c25d6e30 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleListValueStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleListValueStyle.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns="http://www.eclipse.org/xwt/presentation">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleLocation.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleLocation.xwt
index 6191253c3dd..51204c02825 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleLocation.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleLocation.xwt
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleMultiDiagramLinkStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleMultiDiagramLinkStyle.xwt
index a1c3a5c1b22..a3ae57286cd 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleMultiDiagramLinkStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleMultiDiagramLinkStyle.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleNamedStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleNamedStyle.xwt
index 52bfbf133cd..ebc3888e5b6 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleNamedStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleNamedStyle.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout">

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleNode.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleNode.xwt
index afb8f4df879..b23f43ed80e 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleNode.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleNode.xwt
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns="http://www.eclipse.org/xwt/presentation"

 	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout">

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleNodeEntry.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleNodeEntry.xwt
index b9fd226bedc..eabf278145d 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleNodeEntry.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleNodeEntry.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns:j="clr-namespace:java.lang"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SinglePageStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SinglePageStyle.xwt
index 04f75dd2222..5163c98313e 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SinglePageStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SinglePageStyle.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets">

+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SinglePropertiesSetStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SinglePropertiesSetStyle.xwt
index c4ec5143625..e40367039d5 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SinglePropertiesSetStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SinglePropertiesSetStyle.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

 	xmlns:x="http://www.eclipse.org/xwt">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SinglePropertyValue.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SinglePropertyValue.xwt
index cf2cda74902..5701a91a7c8 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SinglePropertyValue.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SinglePropertyValue.xwt
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"

+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

 	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

 	xmlns="http://www.eclipse.org/xwt/presentation">

 	<Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleRatio.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleRatio.xwt
index cb0761d7b46..3309b472c64 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleRatio.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleRatio.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout">

+	xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleRelativeBendpoints.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleRelativeBendpoints.xwt
index 7b8d3240da4..345fa6160d9 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleRelativeBendpoints.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleRelativeBendpoints.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation">

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleRoundedCornersStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleRoundedCornersStyle.xwt
index 77ccfd4b46d..153489f2dc3 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleRoundedCornersStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleRoundedCornersStyle.xwt
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns:j="clr-namespace:java.lang"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets">

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleRoutingStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleRoutingStyle.xwt
index ffddb4f85f7..b21e7d0c467 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleRoutingStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleRoutingStyle.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"

+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

 	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout">

+	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

 	<Composite.layout>

 		<GridLayout numColumns="2" makeColumnsEqualWidth="true"></GridLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleSemanticListCompartment.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleSemanticListCompartment.xwt
index 43a3dccee98..0a6c147cce3 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleSemanticListCompartment.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleSemanticListCompartment.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation">

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleShape.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleShape.xwt
index f00d7f8cd1b..f0ce3cc1278 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleShape.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleShape.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" xmlns:gmf="clr-namespace:org.eclipse.papyrus.widgets.gmf.editors"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"

+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns:j="clr-namespace:java.lang" xmlns:gmf="clr-namespace:org.eclipse.papyrus.infra.gmfdiag.widgets.editors"

+	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

 	xmlns="http://www.eclipse.org/xwt/presentation">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleShapeStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleShapeStyle.xwt
index 250068b8dca..d2d785c0f3f 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleShapeStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleShapeStyle.xwt
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"

+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

 	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleSingleValueStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleSingleValueStyle.xwt
index 1777a6b4e8f..ff383d62bac 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleSingleValueStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleSingleValueStyle.xwt
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"

+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

 	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleSize.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleSize.xwt
index d7edce78b15..5875b27a695 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleSize.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleSize.xwt
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout">

+	xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleSortingStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleSortingStyle.xwt
index 1500336d605..007128c1105 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleSortingStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleSortingStyle.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets">

+	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleStandardDiagram.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleStandardDiagram.xwt
index d9bb822c8f7..1c9d333e339 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleStandardDiagram.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleStandardDiagram.xwt
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

 	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout">

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleStringListValueStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleStringListValueStyle.xwt
index 18a95105c22..0225ad16a0b 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleStringListValueStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleStringListValueStyle.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"

+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

 	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns:j="clr-namespace:java.lang">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleStringObjectConverter.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleStringObjectConverter.xwt
index ed9756a59de..ad991d92b1e 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleStringObjectConverter.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleStringObjectConverter.xwt
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout">

+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleStringToPropertyValueMapEntry.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleStringToPropertyValueMapEntry.xwt
index 03993d0f062..4c29e1ab4cd 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleStringToPropertyValueMapEntry.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleStringToPropertyValueMapEntry.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"

 	xmlns:j="clr-namespace:java.lang">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleStringValueStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleStringValueStyle.xwt
index a16c9cd35bd..bfea5d3ba6b 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleStringValueStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleStringValueStyle.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns:j="clr-namespace:java.lang"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleStyle.xwt
index ed9756a59de..ad991d92b1e 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleStyle.xwt
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout">

+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleTextStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleTextStyle.xwt
index 7c7faa203c1..c287cb61d2c 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleTextStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleTextStyle.xwt
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"

+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

 	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleTitleStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleTitleStyle.xwt
index 147468422bc..50b895807ee 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleTitleStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleTitleStyle.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets">

+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleView.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleView.xwt
index a7f45cd3772..f776d748c5a 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleView.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/ui/SingleView.xwt
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"

+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

 	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

 	xmlns="http://www.eclipse.org/xwt/presentation">

 	<Composite.layout>

@@ -11,7 +11,7 @@
 			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

 		</Composite.layout>

 		<ppe:BooleanToggle text="Hello, world"

-			image="/org.eclipse.papyrus.widgets/icons/papyrus.png" input="{Binding}"

+			image="/org.eclipse.papyrus.infra.widgets/icons/papyrus.png" input="{Binding}"

 			property="notation:View:visible"></ppe:BooleanToggle>

 		<ppe:BooleanRadio input="{Binding}" property="notation:View:mutable"></ppe:BooleanRadio>

 	</Composite>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/plugin.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/plugin.xml
index 963df2b943f..619d6a4c09c 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/plugin.xml
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/plugin.xml
@@ -2,14 +2,13 @@
 <?eclipse version="3.4"?>

 <plugin>

    <extension

-         point="org.eclipse.papyrus.properties.context">

+         point="org.eclipse.papyrus.views.properties.context">

       <context

-            contextModel="model/notation.ctx"

-            loadDefault="true">

+            contextModel="model/notation.ctx">

       </context>

    </extension>

    <extension

-         point="org.eclipse.papyrus.properties.environment">

+         point="org.eclipse.papyrus.views.properties.environment">

       <environment

             environmentModel="model/Environment.xmi">

       </environment>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/properties/notation/Activator.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/Activator.java
index d86a22e5a8e..bf276c6fd2f 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/properties/notation/Activator.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/Activator.java
@@ -9,9 +9,9 @@
  * Contributors:

  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.properties.notation;

+package org.eclipse.papyrus.infra.gmfdiag.properties;

 

-import org.eclipse.papyrus.log.LogHelper;

+import org.eclipse.papyrus.infra.core.log.LogHelper;

 import org.eclipse.ui.plugin.AbstractUIPlugin;

 import org.osgi.framework.BundleContext;

 

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/properties/notation/constraint/GMFNotationConstraint.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/constraint/GMFNotationConstraint.java
index 46f04548bfa..b94c29b570d 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/properties/notation/constraint/GMFNotationConstraint.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/constraint/GMFNotationConstraint.java
@@ -9,13 +9,13 @@
  * Contributors:

  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.properties.notation.constraint;

+package org.eclipse.papyrus.infra.gmfdiag.properties.constraint;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.EditPart;

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

-import org.eclipse.papyrus.properties.constraints.EMFInstanceOfConstraint;

-import org.eclipse.papyrus.properties.util.EMFHelper;

+import org.eclipse.papyrus.views.properties.constraints.EMFInstanceOfConstraint;

+import org.eclipse.papyrus.views.properties.util.EMFHelper;

 

 /**

  * A constraint for the GMF Notation metamodel

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/properties/notation/constraint/HasEditPolicy.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/constraint/HasEditPolicy.java
index 502fea7fc67..cbbdcc02b85 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/properties/notation/constraint/HasEditPolicy.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/constraint/HasEditPolicy.java
@@ -9,12 +9,12 @@
  * Contributors:

  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.properties.notation.constraint;

+package org.eclipse.papyrus.infra.gmfdiag.properties.constraint;

 

 import org.eclipse.gef.GraphicalEditPart;

-import org.eclipse.papyrus.properties.constraints.AbstractConstraint;

-import org.eclipse.papyrus.properties.constraints.Constraint;

-import org.eclipse.papyrus.properties.contexts.SimpleConstraint;

+import org.eclipse.papyrus.views.properties.constraints.AbstractConstraint;

+import org.eclipse.papyrus.views.properties.constraints.Constraint;

+import org.eclipse.papyrus.views.properties.contexts.SimpleConstraint;

 

 /**

  * 

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/properties/notation/constraint/IsEditPartConstraint.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/constraint/IsEditPartConstraint.java
index 121e724d496..5e7c0c6435c 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/properties/notation/constraint/IsEditPartConstraint.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/constraint/IsEditPartConstraint.java
@@ -9,11 +9,11 @@
  * Contributors:

  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.properties.notation.constraint;

+package org.eclipse.papyrus.infra.gmfdiag.properties.constraint;

 

 import org.eclipse.gef.EditPart;

-import org.eclipse.papyrus.properties.constraints.AbstractConstraint;

-import org.eclipse.papyrus.properties.constraints.Constraint;

+import org.eclipse.papyrus.views.properties.constraints.AbstractConstraint;

+import org.eclipse.papyrus.views.properties.constraints.Constraint;

 

 /**

  * Tests if the selection is an EditPart

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/properties/notation/databinding/GradientDataObservableValue.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/databinding/GradientDataObservableValue.java
index d9249f79e7e..d6b0af38fa2 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/properties/notation/databinding/GradientDataObservableValue.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/databinding/GradientDataObservableValue.java
@@ -9,7 +9,7 @@
  * Contributors:

  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.properties.notation.databinding;

+package org.eclipse.papyrus.infra.gmfdiag.properties.databinding;

 

 import org.eclipse.core.databinding.observable.value.AbstractObservableValue;

 import org.eclipse.gmf.runtime.notation.datatype.GradientData;

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/properties/notation/databinding/GradientObservableValue.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/databinding/GradientObservableValue.java
index b613f3d9094..743a4421e52 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/properties/notation/databinding/GradientObservableValue.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/databinding/GradientObservableValue.java
@@ -9,13 +9,13 @@
  * Contributors:

  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.properties.notation.databinding;

+package org.eclipse.papyrus.infra.gmfdiag.properties.databinding;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.ecore.EStructuralFeature;

 import org.eclipse.emf.edit.domain.EditingDomain;

 import org.eclipse.gmf.runtime.notation.datatype.GradientData;

-import org.eclipse.papyrus.properties.uml.databinding.PapyrusObservableValue;

+import org.eclipse.papyrus.uml.properties.databinding.PapyrusObservableValue;

 

 /**

  * An IObservableValue for a Gradient

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/properties/notation/databinding/ObservableGradientData.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/databinding/ObservableGradientData.java
index 4711b767319..47caae7f46c 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/properties/notation/databinding/ObservableGradientData.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/databinding/ObservableGradientData.java
@@ -9,7 +9,7 @@
  * Contributors:

  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.properties.notation.databinding;

+package org.eclipse.papyrus.infra.gmfdiag.properties.databinding;

 

 import org.eclipse.core.databinding.observable.value.IObservableValue;

 import org.eclipse.gmf.runtime.notation.datatype.GradientData;

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/properties/notation/messages/Messages.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/messages/Messages.java
index 3d33f115a47..c11acda4ea4 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/properties/notation/messages/Messages.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/messages/Messages.java
@@ -9,13 +9,13 @@
  * Contributors:

  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.properties.notation.messages;

+package org.eclipse.papyrus.infra.gmfdiag.properties.messages;

 

 import org.eclipse.osgi.util.NLS;

 

 public class Messages extends NLS {

 

-	private static final String BUNDLE_NAME = "org.eclipse.papyrus.properties.notation.messages.messages"; //$NON-NLS-1$

+	private static final String BUNDLE_NAME = "org.eclipse.papyrus.infra.gmfdiag.properties.messages.messages"; //$NON-NLS-1$

 

 	public static String GradientDataModelElement_Horizontal;

 

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/properties/notation/messages/messages.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/messages/messages.properties
index a18c5148bd8..a18c5148bd8 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/properties/notation/messages/messages.properties
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/messages/messages.properties
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/properties/notation/modelelement/GMFModelElement.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/GMFModelElement.java
index 86d3ee71c90..2ecfa0dc03e 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/properties/notation/modelelement/GMFModelElement.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/GMFModelElement.java
@@ -9,7 +9,7 @@
  * Contributors:

  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.properties.notation.modelelement;

+package org.eclipse.papyrus.infra.gmfdiag.properties.modelelement;

 

 import org.eclipse.core.databinding.observable.IObservable;

 import org.eclipse.core.databinding.observable.list.IObservableList;

@@ -21,11 +21,11 @@ import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.edit.domain.EditingDomain;

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

 import org.eclipse.jface.viewers.ILabelProvider;

-import org.eclipse.papyrus.properties.modelelement.EMFModelElement;

-import org.eclipse.papyrus.properties.notation.databinding.GradientObservableValue;

-import org.eclipse.papyrus.properties.notation.providers.GMFLabelProvider;

-import org.eclipse.papyrus.properties.uml.databinding.PapyrusObservableList;

-import org.eclipse.papyrus.properties.uml.databinding.PapyrusObservableValue;

+import org.eclipse.papyrus.infra.gmfdiag.properties.databinding.GradientObservableValue;

+import org.eclipse.papyrus.infra.gmfdiag.properties.providers.GMFLabelProvider;

+import org.eclipse.papyrus.uml.properties.databinding.PapyrusObservableList;

+import org.eclipse.papyrus.uml.properties.databinding.PapyrusObservableValue;

+import org.eclipse.papyrus.views.properties.modelelement.EMFModelElement;

 

 /**

  * A ModelElement to represent an element of the GMF Notation metamodel

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/properties/notation/modelelement/GradientDataModelElement.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/GradientDataModelElement.java
index 1e0f8294525..c68abb5158f 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/properties/notation/modelelement/GradientDataModelElement.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/GradientDataModelElement.java
@@ -9,19 +9,19 @@
  * Contributors:

  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.properties.notation.modelelement;

+package org.eclipse.papyrus.infra.gmfdiag.properties.modelelement;

 

 import org.eclipse.core.databinding.observable.IObservable;

 import org.eclipse.gmf.runtime.notation.datatype.GradientData;

 import org.eclipse.jface.viewers.ILabelProvider;

 import org.eclipse.jface.viewers.LabelProvider;

-import org.eclipse.papyrus.properties.modelelement.AbstractModelElement;

-import org.eclipse.papyrus.properties.notation.Activator;

-import org.eclipse.papyrus.properties.notation.databinding.GradientDataObservableValue;

-import org.eclipse.papyrus.properties.notation.databinding.GradientDataObservableValue.GradientProperty;

-import org.eclipse.papyrus.properties.notation.messages.Messages;

-import org.eclipse.papyrus.widgets.providers.AbstractStaticContentProvider;

-import org.eclipse.papyrus.widgets.providers.IStaticContentProvider;

+import org.eclipse.papyrus.infra.gmfdiag.properties.Activator;

+import org.eclipse.papyrus.infra.gmfdiag.properties.databinding.GradientDataObservableValue;

+import org.eclipse.papyrus.infra.gmfdiag.properties.databinding.GradientDataObservableValue.GradientProperty;

+import org.eclipse.papyrus.infra.gmfdiag.properties.messages.Messages;

+import org.eclipse.papyrus.infra.widgets.providers.AbstractStaticContentProvider;

+import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;

+import org.eclipse.papyrus.views.properties.modelelement.AbstractModelElement;

 

 /**

  * A ModelElement for manipulating GradientData

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/properties/notation/modelelement/NotationModelElementFactory.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/NotationModelElementFactory.java
index 8f9a6dc7153..9d54fd9a7fc 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/properties/notation/modelelement/NotationModelElementFactory.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/NotationModelElementFactory.java
@@ -9,7 +9,7 @@
  * Contributors:

  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.properties.notation.modelelement;

+package org.eclipse.papyrus.infra.gmfdiag.properties.modelelement;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;

@@ -17,10 +17,10 @@ import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.gef.EditPart;

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

 import org.eclipse.gmf.runtime.notation.datatype.GradientData;

-import org.eclipse.papyrus.properties.contexts.DataContextElement;

-import org.eclipse.papyrus.properties.modelelement.ModelElement;

-import org.eclipse.papyrus.properties.modelelement.ModelElementFactory;

-import org.eclipse.papyrus.properties.util.EMFHelper;

+import org.eclipse.papyrus.views.properties.contexts.DataContextElement;

+import org.eclipse.papyrus.views.properties.modelelement.ModelElement;

+import org.eclipse.papyrus.views.properties.modelelement.ModelElementFactory;

+import org.eclipse.papyrus.views.properties.util.EMFHelper;

 

 /**

  * A factory for handling the GMF Notation elements

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/properties/notation/providers/GMFLabelProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/providers/GMFLabelProvider.java
index 0c674e75305..2a046a03c43 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/properties/notation/providers/GMFLabelProvider.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/providers/GMFLabelProvider.java
@@ -9,14 +9,14 @@
  * Contributors:

  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.properties.notation.providers;

+package org.eclipse.papyrus.infra.gmfdiag.properties.providers;

 

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

-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.properties.providers.EMFObjectLabelProvider;

+import org.eclipse.papyrus.infra.core.editorsfactory.IPageIconsRegistry;

+import org.eclipse.papyrus.infra.core.editorsfactory.PageIconsRegistry;

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

+import org.eclipse.papyrus.infra.core.utils.EditorUtils;

+import org.eclipse.papyrus.views.properties.providers.EMFObjectLabelProvider;

 import org.eclipse.swt.graphics.Image;

 

 /**