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
author: cletavernie 2011-11-10 09:16:09 +0000
committer: cletavernie 2011-11-10 09:16:09 +0000
commit: 28db7def625d0aa14f3d0ade72045023481686c4 (patch)
tree: 5166a21e25d823ac768d85939fc0bd35181b56da /plugins/views/properties/org.eclipse.papyrus.views.properties.model
parent: 760e03be3cac41d0e1c96ff28f3bfd9a6350dab9 (diff)
download: org.eclipse.papyrus-28db7def625d0aa14f3d0ade72045023481686c4.tar.gz
org.eclipse.papyrus-28db7def625d0aa14f3d0ade72045023481686c4.tar.xz
org.eclipse.papyrus-28db7def625d0aa14f3d0ade72045023481686c4.zip
97 files changed, 1296 insertions, 1296 deletions
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/META-INF/MANIFEST.MF b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/META-INF/MANIFEST.MF
index 53031872320..3d589ed73a5 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/META-INF/MANIFEST.MF
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/META-INF/MANIFEST.MF
@@ -1,15 +1,15 @@
 Manifest-Version: 1.0
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;bundle-version="2.7.0";visibility:=reexport
-Export-Package: org.eclipse.papyrus.properties.contexts,
- org.eclipse.papyrus.properties.contexts.impl,
- org.eclipse.papyrus.properties.contexts.util,
- org.eclipse.papyrus.properties.environment,
- org.eclipse.papyrus.properties.environment.impl,
- org.eclipse.papyrus.properties.environment.util,
- org.eclipse.papyrus.properties.ui,
- org.eclipse.papyrus.properties.ui.impl,
- org.eclipse.papyrus.properties.ui.util
+Export-Package: org.eclipse.papyrus.views.properties.contexts,
+ org.eclipse.papyrus.views.properties.contexts.impl,
+ org.eclipse.papyrus.views.properties.contexts.util,
+ org.eclipse.papyrus.views.properties.environment,
+ org.eclipse.papyrus.views.properties.environment.impl,
+ org.eclipse.papyrus.views.properties.environment.util,
+ org.eclipse.papyrus.views.properties.ui,
+ org.eclipse.papyrus.views.properties.ui.impl,
+ org.eclipse.papyrus.views.properties.ui.util
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/Model/Properties.genmodel b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/Model/Properties.genmodel
index 9a40605c513..a904f2dac49 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/Model/Properties.genmodel
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/Model/Properties.genmodel
@@ -12,7 +12,7 @@
   <foreignModel>Properties.ecore</foreignModel>
   <genPackages prefix="Properties" basePackage="org.eclipse.papyrus" disposableProviderFactory="true"
       ecorePackage="Properties.ecore#/">
-    <nestedGenPackages prefix="Environment" basePackage="org.eclipse.papyrus.properties"
+    <nestedGenPackages prefix="Environment" basePackage="org.eclipse.papyrus.views.properties"
         disposableProviderFactory="true" ecorePackage="Properties.ecore#//environment">
       <genEnums typeSafeEnumCompatible="false" ecoreEnum="Properties.ecore#//environment/Type">
         <genEnumLiterals ecoreEnumLiteral="Properties.ecore#//environment/Type/String"/>
@@ -64,7 +64,7 @@
             ecoreFeature="ecore:EReference Properties.ecore#//environment/MiscClass/namespace"/>
       </genClasses>
     </nestedGenPackages>
-    <nestedGenPackages prefix="Contexts" basePackage="org.eclipse.papyrus.properties"
+    <nestedGenPackages prefix="Contexts" basePackage="org.eclipse.papyrus.views.properties"
         disposableProviderFactory="true" ecorePackage="Properties.ecore#//contexts">
       <genClasses ecoreClass="Properties.ecore#//contexts/Context">
         <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Properties.ecore#//contexts/Context/name"/>
@@ -156,7 +156,7 @@
             ecoreFeature="ecore:EReference Properties.ecore#//contexts/ReferenceProperty/value"/>
       </genClasses>
     </nestedGenPackages>
-    <nestedGenPackages prefix="Ui" basePackage="org.eclipse.papyrus.properties" disposableProviderFactory="true"
+    <nestedGenPackages prefix="Ui" basePackage="org.eclipse.papyrus.views.properties" disposableProviderFactory="true"
         ecorePackage="Properties.ecore#//ui">
       <genClasses ecoreClass="Properties.ecore#//ui/Element"/>
       <genClasses image="false" ecoreClass="Properties.ecore#//ui/UIComponent">
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/plugin.xml b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/plugin.xml
index c08382c2b05..58c83f6d4c8 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/plugin.xml
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/plugin.xml
@@ -13,21 +13,21 @@
 	<extension point="org.eclipse.emf.ecore.generated_package">
       <package
             uri="http://www.eclipse.org/papyrus/properties/environment"
-            class="org.eclipse.papyrus.properties.environment.EnvironmentPackage"
+            class="org.eclipse.papyrus.views.properties.environment.EnvironmentPackage"
             genModel="Model/Properties.genmodel"/>
    </extension>
 
    <extension point="org.eclipse.emf.ecore.generated_package">
       <package
             uri="http://www.eclipse.org/papyrus/properties/contexts"
-            class="org.eclipse.papyrus.properties.contexts.ContextsPackage"
+            class="org.eclipse.papyrus.views.properties.contexts.ContextsPackage"
             genModel="Model/Properties.genmodel"/>
    </extension>
 
    <extension point="org.eclipse.emf.ecore.generated_package">
       <package
             uri="http://www.eclipse.org/papyrus/properties/ui"
-            class="org.eclipse.papyrus.properties.ui.UiPackage"
+            class="org.eclipse.papyrus.views.properties.ui.UiPackage"
             genModel="Model/Properties.genmodel"/>
    </extension>
 
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/contexts/CompositeConstraint.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/contexts/CompositeConstraint.java
index 989cd566b01..68c051dc16e 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/contexts/CompositeConstraint.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/contexts/CompositeConstraint.java
@@ -9,7 +9,7 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.contexts;
+package org.eclipse.papyrus.views.properties.contexts;
 
 import org.eclipse.emf.common.util.EList;
 
@@ -21,11 +21,11 @@ import org.eclipse.emf.common.util.EList;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.properties.contexts.CompositeConstraint#getConstraints <em>Constraints</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.contexts.CompositeConstraint#getConstraints <em>Constraints</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.papyrus.properties.contexts.ContextsPackage#getCompositeConstraint()
+ * @see org.eclipse.papyrus.views.properties.contexts.ContextsPackage#getCompositeConstraint()
  * @model
  * @generated
  */
@@ -33,14 +33,14 @@ public interface CompositeConstraint extends ConstraintDescriptor {
 
 	/**
 	 * Returns the value of the '<em><b>Constraints</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.properties.contexts.SimpleConstraint}.
+	 * The list contents are of type {@link org.eclipse.papyrus.views.properties.contexts.SimpleConstraint}.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Constraints</em>' containment reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Constraints</em>' containment reference list.
-	 * @see org.eclipse.papyrus.properties.contexts.ContextsPackage#getCompositeConstraint_Constraints()
+	 * @see org.eclipse.papyrus.views.properties.contexts.ContextsPackage#getCompositeConstraint_Constraints()
 	 * @model containment="true"
 	 * @generated
 	 */
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/contexts/ConfigProperty.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/contexts/ConfigProperty.java
index 0b60fac52fa..39f23dd6202 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/contexts/ConfigProperty.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/contexts/ConfigProperty.java
@@ -9,7 +9,7 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.contexts;
+package org.eclipse.papyrus.views.properties.contexts;
 
 import org.eclipse.emf.ecore.EObject;
 
@@ -21,11 +21,11 @@ import org.eclipse.emf.ecore.EObject;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.properties.contexts.ConfigProperty#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.contexts.ConfigProperty#getName <em>Name</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.papyrus.properties.contexts.ContextsPackage#getConfigProperty()
+ * @see org.eclipse.papyrus.views.properties.contexts.ContextsPackage#getConfigProperty()
  * @model abstract="true"
  * @generated
  */
@@ -40,14 +40,14 @@ public interface ConfigProperty extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Name</em>' attribute.
 	 * @see #setName(String)
-	 * @see org.eclipse.papyrus.properties.contexts.ContextsPackage#getConfigProperty_Name()
+	 * @see org.eclipse.papyrus.views.properties.contexts.ContextsPackage#getConfigProperty_Name()
 	 * @model required="true"
 	 * @generated
 	 */
 	String getName();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.properties.contexts.ConfigProperty#getName <em>Name</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.views.properties.contexts.ConfigProperty#getName <em>Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Name</em>' attribute.
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/contexts/ConstraintDescriptor.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/contexts/ConstraintDescriptor.java
index 2e38e4ce1e2..e687874be9e 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/contexts/ConstraintDescriptor.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/contexts/ConstraintDescriptor.java
@@ -9,13 +9,13 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.contexts;
+package org.eclipse.papyrus.views.properties.contexts;
 
 import org.eclipse.emf.common.util.EList;
 
 import org.eclipse.emf.ecore.EObject;
 
-import org.eclipse.papyrus.properties.environment.ConstraintType;
+import org.eclipse.papyrus.views.properties.environment.ConstraintType;
 
 /**
  * <!-- begin-user-doc -->
@@ -25,14 +25,14 @@ import org.eclipse.papyrus.properties.environment.ConstraintType;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.properties.contexts.ConstraintDescriptor#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.contexts.ConstraintDescriptor#getDisplay <em>Display</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.contexts.ConstraintDescriptor#isOverrideable <em>Overrideable</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.contexts.ConstraintDescriptor#getOverriddenConstraints <em>Overridden Constraints</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.contexts.ConstraintDescriptor#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.contexts.ConstraintDescriptor#getDisplay <em>Display</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.contexts.ConstraintDescriptor#isOverrideable <em>Overrideable</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.contexts.ConstraintDescriptor#getOverriddenConstraints <em>Overridden Constraints</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.papyrus.properties.contexts.ContextsPackage#getConstraintDescriptor()
+ * @see org.eclipse.papyrus.views.properties.contexts.ContextsPackage#getConstraintDescriptor()
  * @model abstract="true"
  * @generated
  */
@@ -47,14 +47,14 @@ public interface ConstraintDescriptor extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Name</em>' attribute.
 	 * @see #setName(String)
-	 * @see org.eclipse.papyrus.properties.contexts.ContextsPackage#getConstraintDescriptor_Name()
+	 * @see org.eclipse.papyrus.views.properties.contexts.ContextsPackage#getConstraintDescriptor_Name()
 	 * @model required="true"
 	 * @generated
 	 */
 	String getName();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.properties.contexts.ConstraintDescriptor#getName <em>Name</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.views.properties.contexts.ConstraintDescriptor#getName <em>Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Name</em>' attribute.
@@ -65,7 +65,7 @@ public interface ConstraintDescriptor extends EObject {
 
 	/**
 	 * Returns the value of the '<em><b>Display</b></em>' container reference.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.properties.contexts.DisplayUnit#getConstraints <em>Constraints</em>}'.
+	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.views.properties.contexts.DisplayUnit#getConstraints <em>Constraints</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Display</em>' container reference isn't clear,
@@ -74,15 +74,15 @@ public interface ConstraintDescriptor extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Display</em>' container reference.
 	 * @see #setDisplay(DisplayUnit)
-	 * @see org.eclipse.papyrus.properties.contexts.ContextsPackage#getConstraintDescriptor_Display()
-	 * @see org.eclipse.papyrus.properties.contexts.DisplayUnit#getConstraints
+	 * @see org.eclipse.papyrus.views.properties.contexts.ContextsPackage#getConstraintDescriptor_Display()
+	 * @see org.eclipse.papyrus.views.properties.contexts.DisplayUnit#getConstraints
 	 * @model opposite="constraints" transient="false"
 	 * @generated
 	 */
 	DisplayUnit getDisplay();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.properties.contexts.ConstraintDescriptor#getDisplay <em>Display</em>}' container reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.views.properties.contexts.ConstraintDescriptor#getDisplay <em>Display</em>}' container reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Display</em>' container reference.
@@ -93,7 +93,7 @@ public interface ConstraintDescriptor extends EObject {
 
 	/**
 	 * Returns the value of the '<em><b>Overridden Constraints</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.properties.contexts.SimpleConstraint}.
+	 * The list contents are of type {@link org.eclipse.papyrus.views.properties.contexts.SimpleConstraint}.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Overridden Constraints</em>' reference list isn't clear,
@@ -101,7 +101,7 @@ public interface ConstraintDescriptor extends EObject {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Overridden Constraints</em>' reference list.
-	 * @see org.eclipse.papyrus.properties.contexts.ContextsPackage#getConstraintDescriptor_OverriddenConstraints()
+	 * @see org.eclipse.papyrus.views.properties.contexts.ContextsPackage#getConstraintDescriptor_OverriddenConstraints()
 	 * @model
 	 * @generated
 	 */
@@ -118,14 +118,14 @@ public interface ConstraintDescriptor extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Overrideable</em>' attribute.
 	 * @see #setOverrideable(boolean)
-	 * @see org.eclipse.papyrus.properties.contexts.ContextsPackage#getConstraintDescriptor_Overrideable()
+	 * @see org.eclipse.papyrus.views.properties.contexts.ContextsPackage#getConstraintDescriptor_Overrideable()
 	 * @model default="true" required="true"
 	 * @generated
 	 */
 	boolean isOverrideable();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.properties.contexts.ConstraintDescriptor#isOverrideable <em>Overrideable</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.views.properties.contexts.ConstraintDescriptor#isOverrideable <em>Overrideable</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Overrideable</em>' attribute.
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/contexts/Context.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/contexts/Context.java
index e0f4f2ae2d5..0b62eee091b 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/contexts/Context.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/contexts/Context.java
@@ -9,7 +9,7 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.contexts;
+package org.eclipse.papyrus.views.properties.contexts;
 
 import org.eclipse.emf.common.util.EList;
 
@@ -24,15 +24,15 @@ import org.eclipse.emf.ecore.EObject;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.properties.contexts.Context#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.contexts.Context#getDependencies <em>Dependencies</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.contexts.Context#getTabs <em>Tabs</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.contexts.Context#getViews <em>Views</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.contexts.Context#getDataContexts <em>Data Contexts</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.contexts.Context#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.contexts.Context#getDependencies <em>Dependencies</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.contexts.Context#getTabs <em>Tabs</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.contexts.Context#getViews <em>Views</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.contexts.Context#getDataContexts <em>Data Contexts</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.papyrus.properties.contexts.ContextsPackage#getContext()
+ * @see org.eclipse.papyrus.views.properties.contexts.ContextsPackage#getContext()
  * @model
  * @generated
  */
@@ -47,14 +47,14 @@ public interface Context extends EModelElement {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Name</em>' attribute.
 	 * @see #setName(String)
-	 * @see org.eclipse.papyrus.properties.contexts.ContextsPackage#getContext_Name()
+	 * @see org.eclipse.papyrus.views.properties.contexts.ContextsPackage#getContext_Name()
 	 * @model required="true"
 	 * @generated
 	 */
 	String getName();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.properties.contexts.Context#getName <em>Name</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.views.properties.contexts.Context#getName <em>Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Name</em>' attribute.
@@ -65,8 +65,8 @@ public interface Context extends EModelElement {
 
 	/**
 	 * Returns the value of the '<em><b>Views</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.properties.contexts.View}.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.properties.contexts.View#getContext <em>Context</em>}'.
+	 * The list contents are of type {@link org.eclipse.papyrus.views.properties.contexts.View}.
+	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.views.properties.contexts.View#getContext <em>Context</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Views</em>' containment reference list isn't clear,
@@ -74,8 +74,8 @@ public interface Context extends EModelElement {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Views</em>' containment reference list.
-	 * @see org.eclipse.papyrus.properties.contexts.ContextsPackage#getContext_Views()
-	 * @see org.eclipse.papyrus.properties.contexts.View#getContext
+	 * @see org.eclipse.papyrus.views.properties.contexts.ContextsPackage#getContext_Views()
+	 * @see org.eclipse.papyrus.views.properties.contexts.View#getContext
 	 * @model opposite="context" containment="true"
 	 * @generated
 	 */
@@ -83,7 +83,7 @@ public interface Context extends EModelElement {
 
 	/**
 	 * Returns the value of the '<em><b>Tabs</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.properties.contexts.Tab}.
+	 * The list contents are of type {@link org.eclipse.papyrus.views.properties.contexts.Tab}.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Tabs</em>' containment reference list isn't clear,
@@ -91,7 +91,7 @@ public interface Context extends EModelElement {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Tabs</em>' containment reference list.
-	 * @see org.eclipse.papyrus.properties.contexts.ContextsPackage#getContext_Tabs()
+	 * @see org.eclipse.papyrus.views.properties.contexts.ContextsPackage#getContext_Tabs()
 	 * @model containment="true"
 	 * @generated
 	 */
@@ -99,7 +99,7 @@ public interface Context extends EModelElement {
 
 	/**
 	 * Returns the value of the '<em><b>Data Contexts</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.properties.contexts.DataContextRoot}.
+	 * The list contents are of type {@link org.eclipse.papyrus.views.properties.contexts.DataContextRoot}.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Data Contexts</em>' containment reference list isn't clear,
@@ -107,7 +107,7 @@ public interface Context extends EModelElement {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Data Contexts</em>' containment reference list.
-	 * @see org.eclipse.papyrus.properties.contexts.ContextsPackage#getContext_DataContexts()
+	 * @see org.eclipse.papyrus.views.properties.contexts.ContextsPackage#getContext_DataContexts()
 	 * @model containment="true"
 	 * @generated
 	 */
@@ -115,7 +115,7 @@ public interface Context extends EModelElement {
 
 	/**
 	 * Returns the value of the '<em><b>Dependencies</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.properties.contexts.Context}.
+	 * The list contents are of type {@link org.eclipse.papyrus.views.properties.contexts.Context}.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Dependencies</em>' reference list isn't clear,
@@ -123,7 +123,7 @@ public interface Context extends EModelElement {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Dependencies</em>' reference list.
-	 * @see org.eclipse.papyrus.properties.contexts.ContextsPackage#getContext_Dependencies()
+	 * @see org.eclipse.papyrus.views.properties.contexts.ContextsPackage#getContext_Dependencies()
 	 * @model ordered="false"
 	 * @generated
 	 */
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/contexts/ContextsFactory.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/contexts/ContextsFactory.java
index dcca12efd7f..3dff11f1a52 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/contexts/ContextsFactory.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/contexts/ContextsFactory.java
@@ -9,7 +9,7 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.contexts;
+package org.eclipse.papyrus.views.properties.contexts;
 
 import org.eclipse.emf.ecore.EFactory;
 
@@ -18,7 +18,7 @@ import org.eclipse.emf.ecore.EFactory;
  * The <b>Factory</b> for the model.
  * It provides a create method for each non-abstract class of the model.
  * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.properties.contexts.ContextsPackage
+ * @see org.eclipse.papyrus.views.properties.contexts.ContextsPackage
  * @generated
  */
 public interface ContextsFactory extends EFactory {
@@ -28,7 +28,7 @@ public interface ContextsFactory extends EFactory {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	ContextsFactory eINSTANCE = org.eclipse.papyrus.properties.contexts.impl.ContextsFactoryImpl.init();
+	ContextsFactory eINSTANCE = org.eclipse.papyrus.views.properties.contexts.impl.ContextsFactoryImpl.init();
 
 	/**
 	 * Returns a new object of class '<em>Context</em>'.
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/contexts/ContextsPackage.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/contexts/ContextsPackage.java
index 0ff39ab2dd1..4df6fa88e34 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/contexts/ContextsPackage.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/contexts/ContextsPackage.java
@@ -9,7 +9,7 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.contexts;
+package org.eclipse.papyrus.views.properties.contexts;
 
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
@@ -28,7 +28,7 @@ import org.eclipse.emf.ecore.EcorePackage;
  *   <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.properties.contexts.ContextsFactory
+ * @see org.eclipse.papyrus.views.properties.contexts.ContextsFactory
  * @model kind="package"
  * @generated
  */
@@ -63,14 +63,14 @@ public interface ContextsPackage extends EPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	ContextsPackage eINSTANCE = org.eclipse.papyrus.properties.contexts.impl.ContextsPackageImpl.init();
+	ContextsPackage eINSTANCE = org.eclipse.papyrus.views.properties.contexts.impl.ContextsPackageImpl.init();
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.properties.contexts.impl.ContextImpl <em>Context</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.views.properties.contexts.impl.ContextImpl <em>Context</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.properties.contexts.impl.ContextImpl
-	 * @see org.eclipse.papyrus.properties.contexts.impl.ContextsPackageImpl#getContext()
+	 * @see org.eclipse.papyrus.views.properties.contexts.impl.ContextImpl
+	 * @see org.eclipse.papyrus.views.properties.contexts.impl.ContextsPackageImpl#getContext()
 	 * @generated
 	 */
 	int CONTEXT = 0;
@@ -139,11 +139,11 @@ public interface ContextsPackage extends EPackage {
 	int CONTEXT_FEATURE_COUNT = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 5;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.properties.contexts.impl.DisplayUnitImpl <em>Display Unit</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.views.properties.contexts.impl.DisplayUnitImpl <em>Display Unit</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.properties.contexts.impl.DisplayUnitImpl
-	 * @see org.eclipse.papyrus.properties.contexts.impl.ContextsPackageImpl#getDisplayUnit()
+	 * @see org.eclipse.papyrus.views.properties.contexts.impl.DisplayUnitImpl
+	 * @see org.eclipse.papyrus.views.properties.contexts.impl.ContextsPackageImpl#getDisplayUnit()
 	 * @generated
 	 */
 	int DISPLAY_UNIT = 1;
@@ -167,21 +167,21 @@ public interface ContextsPackage extends EPackage {
 	int DISPLAY_UNIT_FEATURE_COUNT = 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.properties.contexts.impl.ViewImpl <em>View</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.views.properties.contexts.impl.ViewImpl <em>View</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.properties.contexts.impl.ViewImpl
-	 * @see org.eclipse.papyrus.properties.contexts.impl.ContextsPackageImpl#getView()
+	 * @see org.eclipse.papyrus.views.properties.contexts.impl.ViewImpl
+	 * @see org.eclipse.papyrus.views.properties.contexts.impl.ContextsPackageImpl#getView()
 	 * @generated
 	 */
 	int VIEW = 3;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.properties.contexts.impl.TabImpl <em>Tab</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.views.properties.contexts.impl.TabImpl <em>Tab</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.properties.contexts.impl.TabImpl
-	 * @see org.eclipse.papyrus.properties.contexts.impl.ContextsPackageImpl#getTab()
+	 * @see org.eclipse.papyrus.views.properties.contexts.impl.TabImpl
+	 * @see org.eclipse.papyrus.views.properties.contexts.impl.ContextsPackageImpl#getTab()
 	 * @generated
 	 */
 	int TAB = 2;
@@ -340,11 +340,11 @@ public interface ContextsPackage extends EPackage {
 	int VIEW_FEATURE_COUNT = DISPLAY_UNIT_FEATURE_COUNT + 6;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.properties.contexts.impl.SectionImpl <em>Section</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.views.properties.contexts.impl.SectionImpl <em>Section</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.properties.contexts.impl.SectionImpl
-	 * @see org.eclipse.papyrus.properties.contexts.impl.ContextsPackageImpl#getSection()
+	 * @see org.eclipse.papyrus.views.properties.contexts.impl.SectionImpl
+	 * @see org.eclipse.papyrus.views.properties.contexts.impl.ContextsPackageImpl#getSection()
 	 * @generated
 	 */
 	int SECTION = 4;
@@ -404,11 +404,11 @@ public interface ContextsPackage extends EPackage {
 	int SECTION_FEATURE_COUNT = DISPLAY_UNIT_FEATURE_COUNT + 4;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.properties.contexts.impl.DataContextElementImpl <em>Data Context Element</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.views.properties.contexts.impl.DataContextElementImpl <em>Data Context Element</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.properties.contexts.impl.DataContextElementImpl
-	 * @see org.eclipse.papyrus.properties.contexts.impl.ContextsPackageImpl#getDataContextElement()
+	 * @see org.eclipse.papyrus.views.properties.contexts.impl.DataContextElementImpl
+	 * @see org.eclipse.papyrus.views.properties.contexts.impl.ContextsPackageImpl#getDataContextElement()
 	 * @generated
 	 */
 	int DATA_CONTEXT_ELEMENT = 5;
@@ -459,11 +459,11 @@ public interface ContextsPackage extends EPackage {
 	int DATA_CONTEXT_ELEMENT_FEATURE_COUNT = 4;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.properties.contexts.impl.PropertyImpl <em>Property</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.views.properties.contexts.impl.PropertyImpl <em>Property</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.properties.contexts.impl.PropertyImpl
-	 * @see org.eclipse.papyrus.properties.contexts.impl.ContextsPackageImpl#getProperty()
+	 * @see org.eclipse.papyrus.views.properties.contexts.impl.PropertyImpl
+	 * @see org.eclipse.papyrus.views.properties.contexts.impl.ContextsPackageImpl#getProperty()
 	 * @generated
 	 */
 	int PROPERTY = 6;
@@ -532,11 +532,11 @@ public interface ContextsPackage extends EPackage {
 	int PROPERTY_FEATURE_COUNT = 6;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.properties.contexts.impl.UnknownPropertyImpl <em>Unknown Property</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.views.properties.contexts.impl.UnknownPropertyImpl <em>Unknown Property</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.properties.contexts.impl.UnknownPropertyImpl
-	 * @see org.eclipse.papyrus.properties.contexts.impl.ContextsPackageImpl#getUnknownProperty()
+	 * @see org.eclipse.papyrus.views.properties.contexts.impl.UnknownPropertyImpl
+	 * @see org.eclipse.papyrus.views.properties.contexts.impl.ContextsPackageImpl#getUnknownProperty()
 	 * @generated
 	 */
 	int UNKNOWN_PROPERTY = 7;
@@ -605,11 +605,11 @@ public interface ContextsPackage extends EPackage {
 	int UNKNOWN_PROPERTY_FEATURE_COUNT = PROPERTY_FEATURE_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.properties.contexts.impl.DataContextPackageImpl <em>Data Context Package</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.views.properties.contexts.impl.DataContextPackageImpl <em>Data Context Package</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.properties.contexts.impl.DataContextPackageImpl
-	 * @see org.eclipse.papyrus.properties.contexts.impl.ContextsPackageImpl#getDataContextPackage()
+	 * @see org.eclipse.papyrus.views.properties.contexts.impl.DataContextPackageImpl
+	 * @see org.eclipse.papyrus.views.properties.contexts.impl.ContextsPackageImpl#getDataContextPackage()
 	 * @generated
 	 */
 	int DATA_CONTEXT_PACKAGE = 8;
@@ -669,11 +669,11 @@ public interface ContextsPackage extends EPackage {
 	int DATA_CONTEXT_PACKAGE_FEATURE_COUNT = DATA_CONTEXT_ELEMENT_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.properties.contexts.impl.DataContextRootImpl <em>Data Context Root</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.views.properties.contexts.impl.DataContextRootImpl <em>Data Context Root</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.properties.contexts.impl.DataContextRootImpl
-	 * @see org.eclipse.papyrus.properties.contexts.impl.ContextsPackageImpl#getDataContextRoot()
+	 * @see org.eclipse.papyrus.views.properties.contexts.impl.DataContextRootImpl
+	 * @see org.eclipse.papyrus.views.properties.contexts.impl.ContextsPackageImpl#getDataContextRoot()
 	 * @generated
 	 */
 	int DATA_CONTEXT_ROOT = 9;
@@ -751,11 +751,11 @@ public interface ContextsPackage extends EPackage {
 	int DATA_CONTEXT_ROOT_FEATURE_COUNT = DATA_CONTEXT_PACKAGE_FEATURE_COUNT + 2;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.properties.contexts.impl.ConstraintDescriptorImpl <em>Constraint Descriptor</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.views.properties.contexts.impl.ConstraintDescriptorImpl <em>Constraint Descriptor</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.properties.contexts.impl.ConstraintDescriptorImpl
-	 * @see org.eclipse.papyrus.properties.contexts.impl.ContextsPackageImpl#getConstraintDescriptor()
+	 * @see org.eclipse.papyrus.views.properties.contexts.impl.ConstraintDescriptorImpl
+	 * @see org.eclipse.papyrus.views.properties.contexts.impl.ContextsPackageImpl#getConstraintDescriptor()
 	 * @generated
 	 */
 	int CONSTRAINT_DESCRIPTOR = 10;
@@ -806,11 +806,11 @@ public interface ContextsPackage extends EPackage {
 	int CONSTRAINT_DESCRIPTOR_FEATURE_COUNT = 4;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.properties.contexts.impl.SimpleConstraintImpl <em>Simple Constraint</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.views.properties.contexts.impl.SimpleConstraintImpl <em>Simple Constraint</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.properties.contexts.impl.SimpleConstraintImpl
-	 * @see org.eclipse.papyrus.properties.contexts.impl.ContextsPackageImpl#getSimpleConstraint()
+	 * @see org.eclipse.papyrus.views.properties.contexts.impl.SimpleConstraintImpl
+	 * @see org.eclipse.papyrus.views.properties.contexts.impl.ContextsPackageImpl#getSimpleConstraint()
 	 * @generated
 	 */
 	int SIMPLE_CONSTRAINT = 11;
@@ -879,11 +879,11 @@ public interface ContextsPackage extends EPackage {
 	int SIMPLE_CONSTRAINT_FEATURE_COUNT = CONSTRAINT_DESCRIPTOR_FEATURE_COUNT + 2;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.properties.contexts.impl.CompositeConstraintImpl <em>Composite Constraint</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.views.properties.contexts.impl.CompositeConstraintImpl <em>Composite Constraint</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.properties.contexts.impl.CompositeConstraintImpl
-	 * @see org.eclipse.papyrus.properties.contexts.impl.ContextsPackageImpl#getCompositeConstraint()
+	 * @see org.eclipse.papyrus.views.properties.contexts.impl.CompositeConstraintImpl
+	 * @see org.eclipse.papyrus.views.properties.contexts.impl.ContextsPackageImpl#getCompositeConstraint()
 	 * @generated
 	 */
 	int COMPOSITE_CONSTRAINT = 12;
@@ -943,11 +943,11 @@ public interface ContextsPackage extends EPackage {
 	int COMPOSITE_CONSTRAINT_FEATURE_COUNT = CONSTRAINT_DESCRIPTOR_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.properties.contexts.impl.ConfigPropertyImpl <em>Config Property</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.views.properties.contexts.impl.ConfigPropertyImpl <em>Config Property</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.properties.contexts.impl.ConfigPropertyImpl
-	 * @see org.eclipse.papyrus.properties.contexts.impl.ContextsPackageImpl#getConfigProperty()
+	 * @see org.eclipse.papyrus.views.properties.contexts.impl.ConfigPropertyImpl
+	 * @see org.eclipse.papyrus.views.properties.contexts.impl.ContextsPackageImpl#getConfigProperty()
 	 * @generated
 	 */
 	int CONFIG_PROPERTY = 13;
@@ -971,11 +971,11 @@ public interface ContextsPackage extends EPackage {
 	int CONFIG_PROPERTY_FEATURE_COUNT = 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.properties.contexts.impl.ValuePropertyImpl <em>Value Property</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.views.properties.contexts.impl.ValuePropertyImpl <em>Value Property</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.properties.contexts.impl.ValuePropertyImpl
-	 * @see org.eclipse.papyrus.properties.contexts.impl.ContextsPackageImpl#getValueProperty()
+	 * @see org.eclipse.papyrus.views.properties.contexts.impl.ValuePropertyImpl
+	 * @see org.eclipse.papyrus.views.properties.contexts.impl.ContextsPackageImpl#getValueProperty()
 	 * @generated
 	 */
 	int VALUE_PROPERTY = 14;
@@ -1008,11 +1008,11 @@ public interface ContextsPackage extends EPackage {
 	int VALUE_PROPERTY_FEATURE_COUNT = CONFIG_PROPERTY_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.properties.contexts.impl.ReferencePropertyImpl <em>Reference Property</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.views.properties.contexts.impl.ReferencePropertyImpl <em>Reference Property</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.properties.contexts.impl.ReferencePropertyImpl
-	 * @see org.eclipse.papyrus.properties.contexts.impl.ContextsPackageImpl#getReferenceProperty()
+	 * @see org.eclipse.papyrus.views.properties.contexts.impl.ReferencePropertyImpl
+	 * @see org.eclipse.papyrus.views.properties.contexts.impl.ContextsPackageImpl#getReferenceProperty()
 	 * @generated
 	 */
 	int REFERENCE_PROPERTY = 15;
@@ -1046,677 +1046,677 @@ public interface ContextsPackage extends EPackage {
 
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.properties.contexts.Context <em>Context</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.views.properties.contexts.Context <em>Context</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Context</em>'.
-	 * @see org.eclipse.papyrus.properties.contexts.Context
+	 * @see org.eclipse.papyrus.views.properties.contexts.Context
 	 * @generated
 	 */
 	EClass getContext();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.properties.contexts.Context#getName <em>Name</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.views.properties.contexts.Context#getName <em>Name</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.papyrus.properties.contexts.Context#getName()
+	 * @see org.eclipse.papyrus.views.properties.contexts.Context#getName()
 	 * @see #getContext()
 	 * @generated
 	 */
 	EAttribute getContext_Name();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.properties.contexts.Context#getViews <em>Views</em>}'.
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.views.properties.contexts.Context#getViews <em>Views</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the containment reference list '<em>Views</em>'.
-	 * @see org.eclipse.papyrus.properties.contexts.Context#getViews()
+	 * @see org.eclipse.papyrus.views.properties.contexts.Context#getViews()
 	 * @see #getContext()
 	 * @generated
 	 */
 	EReference getContext_Views();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.properties.contexts.Context#getTabs <em>Tabs</em>}'.
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.views.properties.contexts.Context#getTabs <em>Tabs</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the containment reference list '<em>Tabs</em>'.
-	 * @see org.eclipse.papyrus.properties.contexts.Context#getTabs()
+	 * @see org.eclipse.papyrus.views.properties.contexts.Context#getTabs()
 	 * @see #getContext()
 	 * @generated
 	 */
 	EReference getContext_Tabs();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.properties.contexts.Context#getDataContexts <em>Data Contexts</em>}'.
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.views.properties.contexts.Context#getDataContexts <em>Data Contexts</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the containment reference list '<em>Data Contexts</em>'.
-	 * @see org.eclipse.papyrus.properties.contexts.Context#getDataContexts()
+	 * @see org.eclipse.papyrus.views.properties.contexts.Context#getDataContexts()
 	 * @see #getContext()
 	 * @generated
 	 */
 	EReference getContext_DataContexts();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.properties.contexts.Context#getDependencies <em>Dependencies</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.views.properties.contexts.Context#getDependencies <em>Dependencies</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference list '<em>Dependencies</em>'.
-	 * @see org.eclipse.papyrus.properties.contexts.Context#getDependencies()
+	 * @see org.eclipse.papyrus.views.properties.contexts.Context#getDependencies()
 	 * @see #getContext()
 	 * @generated
 	 */
 	EReference getContext_Dependencies();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.properties.contexts.DisplayUnit <em>Display Unit</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.views.properties.contexts.DisplayUnit <em>Display Unit</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Display Unit</em>'.
-	 * @see org.eclipse.papyrus.properties.contexts.DisplayUnit
+	 * @see org.eclipse.papyrus.views.properties.contexts.DisplayUnit
 	 * @generated
 	 */
 	EClass getDisplayUnit();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.properties.contexts.DisplayUnit#getConstraints <em>Constraints</em>}'.
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.views.properties.contexts.DisplayUnit#getConstraints <em>Constraints</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the containment reference list '<em>Constraints</em>'.
-	 * @see org.eclipse.papyrus.properties.contexts.DisplayUnit#getConstraints()
+	 * @see org.eclipse.papyrus.views.properties.contexts.DisplayUnit#getConstraints()
 	 * @see #getDisplayUnit()
 	 * @generated
 	 */
 	EReference getDisplayUnit_Constraints();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.properties.contexts.View <em>View</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.views.properties.contexts.View <em>View</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>View</em>'.
-	 * @see org.eclipse.papyrus.properties.contexts.View
+	 * @see org.eclipse.papyrus.views.properties.contexts.View
 	 * @generated
 	 */
 	EClass getView();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.properties.contexts.View#getName <em>Name</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.views.properties.contexts.View#getName <em>Name</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.papyrus.properties.contexts.View#getName()
+	 * @see org.eclipse.papyrus.views.properties.contexts.View#getName()
 	 * @see #getView()
 	 * @generated
 	 */
 	EAttribute getView_Name();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.properties.contexts.View#getSections <em>Sections</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.views.properties.contexts.View#getSections <em>Sections</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference list '<em>Sections</em>'.
-	 * @see org.eclipse.papyrus.properties.contexts.View#getSections()
+	 * @see org.eclipse.papyrus.views.properties.contexts.View#getSections()
 	 * @see #getView()
 	 * @generated
 	 */
 	EReference getView_Sections();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.properties.contexts.View#getElementMultiplicity <em>Element Multiplicity</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.views.properties.contexts.View#getElementMultiplicity <em>Element Multiplicity</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Element Multiplicity</em>'.
-	 * @see org.eclipse.papyrus.properties.contexts.View#getElementMultiplicity()
+	 * @see org.eclipse.papyrus.views.properties.contexts.View#getElementMultiplicity()
 	 * @see #getView()
 	 * @generated
 	 */
 	EAttribute getView_ElementMultiplicity();
 
 	/**
-	 * Returns the meta object for the container reference '{@link org.eclipse.papyrus.properties.contexts.View#getContext <em>Context</em>}'.
+	 * Returns the meta object for the container reference '{@link org.eclipse.papyrus.views.properties.contexts.View#getContext <em>Context</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the container reference '<em>Context</em>'.
-	 * @see org.eclipse.papyrus.properties.contexts.View#getContext()
+	 * @see org.eclipse.papyrus.views.properties.contexts.View#getContext()
 	 * @see #getView()
 	 * @generated
 	 */
 	EReference getView_Context();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.properties.contexts.View#isAutomaticContext <em>Automatic Context</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.views.properties.contexts.View#isAutomaticContext <em>Automatic Context</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Automatic Context</em>'.
-	 * @see org.eclipse.papyrus.properties.contexts.View#isAutomaticContext()
+	 * @see org.eclipse.papyrus.views.properties.contexts.View#isAutomaticContext()
 	 * @see #getView()
 	 * @generated
 	 */
 	EAttribute getView_AutomaticContext();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.properties.contexts.View#getDatacontexts <em>Datacontexts</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.views.properties.contexts.View#getDatacontexts <em>Datacontexts</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference list '<em>Datacontexts</em>'.
-	 * @see org.eclipse.papyrus.properties.contexts.View#getDatacontexts()
+	 * @see org.eclipse.papyrus.views.properties.contexts.View#getDatacontexts()
 	 * @see #getView()
 	 * @generated
 	 */
 	EReference getView_Datacontexts();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.properties.contexts.Tab <em>Tab</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.views.properties.contexts.Tab <em>Tab</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Tab</em>'.
-	 * @see org.eclipse.papyrus.properties.contexts.Tab
+	 * @see org.eclipse.papyrus.views.properties.contexts.Tab
 	 * @generated
 	 */
 	EClass getTab();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.properties.contexts.Tab#getLabel <em>Label</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.views.properties.contexts.Tab#getLabel <em>Label</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Label</em>'.
-	 * @see org.eclipse.papyrus.properties.contexts.Tab#getLabel()
+	 * @see org.eclipse.papyrus.views.properties.contexts.Tab#getLabel()
 	 * @see #getTab()
 	 * @generated
 	 */
 	EAttribute getTab_Label();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.properties.contexts.Tab#getId <em>Id</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.views.properties.contexts.Tab#getId <em>Id</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see org.eclipse.papyrus.properties.contexts.Tab#getId()
+	 * @see org.eclipse.papyrus.views.properties.contexts.Tab#getId()
 	 * @see #getTab()
 	 * @generated
 	 */
 	EAttribute getTab_Id();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.properties.contexts.Tab#getCategory <em>Category</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.views.properties.contexts.Tab#getCategory <em>Category</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Category</em>'.
-	 * @see org.eclipse.papyrus.properties.contexts.Tab#getCategory()
+	 * @see org.eclipse.papyrus.views.properties.contexts.Tab#getCategory()
 	 * @see #getTab()
 	 * @generated
 	 */
 	EAttribute getTab_Category();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.properties.contexts.Tab#getImage <em>Image</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.views.properties.contexts.Tab#getImage <em>Image</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Image</em>'.
-	 * @see org.eclipse.papyrus.properties.contexts.Tab#getImage()
+	 * @see org.eclipse.papyrus.views.properties.contexts.Tab#getImage()
 	 * @see #getTab()
 	 * @generated
 	 */
 	EAttribute getTab_Image();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.properties.contexts.Tab#getAfterTab <em>After Tab</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.views.properties.contexts.Tab#getAfterTab <em>After Tab</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>After Tab</em>'.
-	 * @see org.eclipse.papyrus.properties.contexts.Tab#getAfterTab()
+	 * @see org.eclipse.papyrus.views.properties.contexts.Tab#getAfterTab()
 	 * @see #getTab()
 	 * @generated
 	 */
 	EReference getTab_AfterTab();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.properties.contexts.Tab#getSections <em>Sections</em>}'.
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.views.properties.contexts.Tab#getSections <em>Sections</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the containment reference list '<em>Sections</em>'.
-	 * @see org.eclipse.papyrus.properties.contexts.Tab#getSections()
+	 * @see org.eclipse.papyrus.views.properties.contexts.Tab#getSections()
 	 * @see #getTab()
 	 * @generated
 	 */
 	EReference getTab_Sections();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.properties.contexts.Tab#isIndented <em>Indented</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.views.properties.contexts.Tab#isIndented <em>Indented</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Indented</em>'.
-	 * @see org.eclipse.papyrus.properties.contexts.Tab#isIndented()
+	 * @see org.eclipse.papyrus.views.properties.contexts.Tab#isIndented()
 	 * @see #getTab()
 	 * @generated
 	 */
 	EAttribute getTab_Indented();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.properties.contexts.Tab#getPriority <em>Priority</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.views.properties.contexts.Tab#getPriority <em>Priority</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Priority</em>'.
-	 * @see org.eclipse.papyrus.properties.contexts.Tab#getPriority()
+	 * @see org.eclipse.papyrus.views.properties.contexts.Tab#getPriority()
 	 * @see #getTab()
 	 * @generated
 	 */
 	EAttribute getTab_Priority();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.properties.contexts.Section <em>Section</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.views.properties.contexts.Section <em>Section</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Section</em>'.
-	 * @see org.eclipse.papyrus.properties.contexts.Section
+	 * @see org.eclipse.papyrus.views.properties.contexts.Section
 	 * @generated
 	 */
 	EClass getSection();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.properties.contexts.Section#getName <em>Name</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.views.properties.contexts.Section#getName <em>Name</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.papyrus.properties.contexts.Section#getName()
+	 * @see org.eclipse.papyrus.views.properties.contexts.Section#getName()
 	 * @see #getSection()
 	 * @generated
 	 */
 	EAttribute getSection_Name();
 
 	/**
-	 * Returns the meta object for the container reference '{@link org.eclipse.papyrus.properties.contexts.Section#getTab <em>Tab</em>}'.
+	 * Returns the meta object for the container reference '{@link org.eclipse.papyrus.views.properties.contexts.Section#getTab <em>Tab</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the container reference '<em>Tab</em>'.
-	 * @see org.eclipse.papyrus.properties.contexts.Section#getTab()
+	 * @see org.eclipse.papyrus.views.properties.contexts.Section#getTab()
 	 * @see #getSection()
 	 * @generated
 	 */
 	EReference getSection_Tab();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.properties.contexts.Section#getSectionFile <em>Section File</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.views.properties.contexts.Section#getSectionFile <em>Section File</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Section File</em>'.
-	 * @see org.eclipse.papyrus.properties.contexts.Section#getSectionFile()
+	 * @see org.eclipse.papyrus.views.properties.contexts.Section#getSectionFile()
 	 * @see #getSection()
 	 * @generated
 	 */
 	EAttribute getSection_SectionFile();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.properties.contexts.Section#getWidget <em>Widget</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.views.properties.contexts.Section#getWidget <em>Widget</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Widget</em>'.
-	 * @see org.eclipse.papyrus.properties.contexts.Section#getWidget()
+	 * @see org.eclipse.papyrus.views.properties.contexts.Section#getWidget()
 	 * @see #getSection()
 	 * @generated
 	 */
 	EReference getSection_Widget();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.properties.contexts.DataContextElement <em>Data Context Element</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.views.properties.contexts.DataContextElement <em>Data Context Element</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Data Context Element</em>'.
-	 * @see org.eclipse.papyrus.properties.contexts.DataContextElement
+	 * @see org.eclipse.papyrus.views.properties.contexts.DataContextElement
 	 * @generated
 	 */
 	EClass getDataContextElement();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.properties.contexts.DataContextElement#getName <em>Name</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.views.properties.contexts.DataContextElement#getName <em>Name</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.papyrus.properties.contexts.DataContextElement#getName()
+	 * @see org.eclipse.papyrus.views.properties.contexts.DataContextElement#getName()
 	 * @see #getDataContextElement()
 	 * @generated
 	 */
 	EAttribute getDataContextElement_Name();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.properties.contexts.DataContextElement#getProperties <em>Properties</em>}'.
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.views.properties.contexts.DataContextElement#getProperties <em>Properties</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the containment reference list '<em>Properties</em>'.
-	 * @see org.eclipse.papyrus.properties.contexts.DataContextElement#getProperties()
+	 * @see org.eclipse.papyrus.views.properties.contexts.DataContextElement#getProperties()
 	 * @see #getDataContextElement()
 	 * @generated
 	 */
 	EReference getDataContextElement_Properties();
 
 	/**
-	 * Returns the meta object for the container reference '{@link org.eclipse.papyrus.properties.contexts.DataContextElement#getPackage <em>Package</em>}'.
+	 * Returns the meta object for the container reference '{@link org.eclipse.papyrus.views.properties.contexts.DataContextElement#getPackage <em>Package</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the container reference '<em>Package</em>'.
-	 * @see org.eclipse.papyrus.properties.contexts.DataContextElement#getPackage()
+	 * @see org.eclipse.papyrus.views.properties.contexts.DataContextElement#getPackage()
 	 * @see #getDataContextElement()
 	 * @generated
 	 */
 	EReference getDataContextElement_Package();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.properties.contexts.DataContextElement#getSupertypes <em>Supertypes</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.views.properties.contexts.DataContextElement#getSupertypes <em>Supertypes</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference list '<em>Supertypes</em>'.
-	 * @see org.eclipse.papyrus.properties.contexts.DataContextElement#getSupertypes()
+	 * @see org.eclipse.papyrus.views.properties.contexts.DataContextElement#getSupertypes()
 	 * @see #getDataContextElement()
 	 * @generated
 	 */
 	EReference getDataContextElement_Supertypes();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.properties.contexts.Property <em>Property</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.views.properties.contexts.Property <em>Property</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Property</em>'.
-	 * @see org.eclipse.papyrus.properties.contexts.Property
+	 * @see org.eclipse.papyrus.views.properties.contexts.Property
 	 * @generated
 	 */
 	EClass getProperty();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.properties.contexts.Property#getName <em>Name</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.views.properties.contexts.Property#getName <em>Name</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.papyrus.properties.contexts.Property#getName()
+	 * @see org.eclipse.papyrus.views.properties.contexts.Property#getName()
 	 * @see #getProperty()
 	 * @generated
 	 */
 	EAttribute getProperty_Name();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.properties.contexts.Property#getLabel <em>Label</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.views.properties.contexts.Property#getLabel <em>Label</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Label</em>'.
-	 * @see org.eclipse.papyrus.properties.contexts.Property#getLabel()
+	 * @see org.eclipse.papyrus.views.properties.contexts.Property#getLabel()
 	 * @see #getProperty()
 	 * @generated
 	 */
 	EAttribute getProperty_Label();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.properties.contexts.Property#getType <em>Type</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.views.properties.contexts.Property#getType <em>Type</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Type</em>'.
-	 * @see org.eclipse.papyrus.properties.contexts.Property#getType()
+	 * @see org.eclipse.papyrus.views.properties.contexts.Property#getType()
 	 * @see #getProperty()
 	 * @generated
 	 */
 	EAttribute getProperty_Type();
 
 	/**
-	 * Returns the meta object for the container reference '{@link org.eclipse.papyrus.properties.contexts.Property#getContextElement <em>Context Element</em>}'.
+	 * Returns the meta object for the container reference '{@link org.eclipse.papyrus.views.properties.contexts.Property#getContextElement <em>Context Element</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the container reference '<em>Context Element</em>'.
-	 * @see org.eclipse.papyrus.properties.contexts.Property#getContextElement()
+	 * @see org.eclipse.papyrus.views.properties.contexts.Property#getContextElement()
 	 * @see #getProperty()
 	 * @generated
 	 */
 	EReference getProperty_ContextElement();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.properties.contexts.Property#getMultiplicity <em>Multiplicity</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.views.properties.contexts.Property#getMultiplicity <em>Multiplicity</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Multiplicity</em>'.
-	 * @see org.eclipse.papyrus.properties.contexts.Property#getMultiplicity()
+	 * @see org.eclipse.papyrus.views.properties.contexts.Property#getMultiplicity()
 	 * @see #getProperty()
 	 * @generated
 	 */
 	EAttribute getProperty_Multiplicity();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.properties.contexts.Property#getDescription <em>Description</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.views.properties.contexts.Property#getDescription <em>Description</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Description</em>'.
-	 * @see org.eclipse.papyrus.properties.contexts.Property#getDescription()
+	 * @see org.eclipse.papyrus.views.properties.contexts.Property#getDescription()
 	 * @see #getProperty()
 	 * @generated
 	 */
 	EAttribute getProperty_Description();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.properties.contexts.UnknownProperty <em>Unknown Property</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.views.properties.contexts.UnknownProperty <em>Unknown Property</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Unknown Property</em>'.
-	 * @see org.eclipse.papyrus.properties.contexts.UnknownProperty
+	 * @see org.eclipse.papyrus.views.properties.contexts.UnknownProperty
 	 * @generated
 	 */
 	EClass getUnknownProperty();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.properties.contexts.DataContextPackage <em>Data Context Package</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.views.properties.contexts.DataContextPackage <em>Data Context Package</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Data Context Package</em>'.
-	 * @see org.eclipse.papyrus.properties.contexts.DataContextPackage
+	 * @see org.eclipse.papyrus.views.properties.contexts.DataContextPackage
 	 * @generated
 	 */
 	EClass getDataContextPackage();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.properties.contexts.DataContextPackage#getElements <em>Elements</em>}'.
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.views.properties.contexts.DataContextPackage#getElements <em>Elements</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the containment reference list '<em>Elements</em>'.
-	 * @see org.eclipse.papyrus.properties.contexts.DataContextPackage#getElements()
+	 * @see org.eclipse.papyrus.views.properties.contexts.DataContextPackage#getElements()
 	 * @see #getDataContextPackage()
 	 * @generated
 	 */
 	EReference getDataContextPackage_Elements();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.properties.contexts.DataContextRoot <em>Data Context Root</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.views.properties.contexts.DataContextRoot <em>Data Context Root</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Data Context Root</em>'.
-	 * @see org.eclipse.papyrus.properties.contexts.DataContextRoot
+	 * @see org.eclipse.papyrus.views.properties.contexts.DataContextRoot
 	 * @generated
 	 */
 	EClass getDataContextRoot();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.properties.contexts.DataContextRoot#getLabel <em>Label</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.views.properties.contexts.DataContextRoot#getLabel <em>Label</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Label</em>'.
-	 * @see org.eclipse.papyrus.properties.contexts.DataContextRoot#getLabel()
+	 * @see org.eclipse.papyrus.views.properties.contexts.DataContextRoot#getLabel()
 	 * @see #getDataContextRoot()
 	 * @generated
 	 */
 	EAttribute getDataContextRoot_Label();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.properties.contexts.DataContextRoot#getModelElementFactory <em>Model Element Factory</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.views.properties.contexts.DataContextRoot#getModelElementFactory <em>Model Element Factory</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Model Element Factory</em>'.
-	 * @see org.eclipse.papyrus.properties.contexts.DataContextRoot#getModelElementFactory()
+	 * @see org.eclipse.papyrus.views.properties.contexts.DataContextRoot#getModelElementFactory()
 	 * @see #getDataContextRoot()
 	 * @generated
 	 */
 	EReference getDataContextRoot_ModelElementFactory();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.properties.contexts.ConstraintDescriptor <em>Constraint Descriptor</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.views.properties.contexts.ConstraintDescriptor <em>Constraint Descriptor</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Constraint Descriptor</em>'.
-	 * @see org.eclipse.papyrus.properties.contexts.ConstraintDescriptor
+	 * @see org.eclipse.papyrus.views.properties.contexts.ConstraintDescriptor
 	 * @generated
 	 */
 	EClass getConstraintDescriptor();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.properties.contexts.ConstraintDescriptor#getName <em>Name</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.views.properties.contexts.ConstraintDescriptor#getName <em>Name</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.papyrus.properties.contexts.ConstraintDescriptor#getName()
+	 * @see org.eclipse.papyrus.views.properties.contexts.ConstraintDescriptor#getName()
 	 * @see #getConstraintDescriptor()
 	 * @generated
 	 */
 	EAttribute getConstraintDescriptor_Name();
 
 	/**
-	 * Returns the meta object for the container reference '{@link org.eclipse.papyrus.properties.contexts.ConstraintDescriptor#getDisplay <em>Display</em>}'.
+	 * Returns the meta object for the container reference '{@link org.eclipse.papyrus.views.properties.contexts.ConstraintDescriptor#getDisplay <em>Display</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the container reference '<em>Display</em>'.
-	 * @see org.eclipse.papyrus.properties.contexts.ConstraintDescriptor#getDisplay()
+	 * @see org.eclipse.papyrus.views.properties.contexts.ConstraintDescriptor#getDisplay()
 	 * @see #getConstraintDescriptor()
 	 * @generated
 	 */
 	EReference getConstraintDescriptor_Display();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.properties.contexts.ConstraintDescriptor#getOverriddenConstraints <em>Overridden Constraints</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.views.properties.contexts.ConstraintDescriptor#getOverriddenConstraints <em>Overridden Constraints</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference list '<em>Overridden Constraints</em>'.
-	 * @see org.eclipse.papyrus.properties.contexts.ConstraintDescriptor#getOverriddenConstraints()
+	 * @see org.eclipse.papyrus.views.properties.contexts.ConstraintDescriptor#getOverriddenConstraints()
 	 * @see #getConstraintDescriptor()
 	 * @generated
 	 */
 	EReference getConstraintDescriptor_OverriddenConstraints();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.properties.contexts.SimpleConstraint <em>Simple Constraint</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.views.properties.contexts.SimpleConstraint <em>Simple Constraint</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Simple Constraint</em>'.
-	 * @see org.eclipse.papyrus.properties.contexts.SimpleConstraint
+	 * @see org.eclipse.papyrus.views.properties.contexts.SimpleConstraint
 	 * @generated
 	 */
 	EClass getSimpleConstraint();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.properties.contexts.SimpleConstraint#getConstraintType <em>Constraint Type</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.views.properties.contexts.SimpleConstraint#getConstraintType <em>Constraint Type</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Constraint Type</em>'.
-	 * @see org.eclipse.papyrus.properties.contexts.SimpleConstraint#getConstraintType()
+	 * @see org.eclipse.papyrus.views.properties.contexts.SimpleConstraint#getConstraintType()
 	 * @see #getSimpleConstraint()
 	 * @generated
 	 */
 	EReference getSimpleConstraint_ConstraintType();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.properties.contexts.SimpleConstraint#getProperties <em>Properties</em>}'.
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.views.properties.contexts.SimpleConstraint#getProperties <em>Properties</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the containment reference list '<em>Properties</em>'.
-	 * @see org.eclipse.papyrus.properties.contexts.SimpleConstraint#getProperties()
+	 * @see org.eclipse.papyrus.views.properties.contexts.SimpleConstraint#getProperties()
 	 * @see #getSimpleConstraint()
 	 * @generated
 	 */
 	EReference getSimpleConstraint_Properties();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.properties.contexts.CompositeConstraint <em>Composite Constraint</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.views.properties.contexts.CompositeConstraint <em>Composite Constraint</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Composite Constraint</em>'.
-	 * @see org.eclipse.papyrus.properties.contexts.CompositeConstraint
+	 * @see org.eclipse.papyrus.views.properties.contexts.CompositeConstraint
 	 * @generated
 	 */
 	EClass getCompositeConstraint();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.properties.contexts.CompositeConstraint#getConstraints <em>Constraints</em>}'.
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.views.properties.contexts.CompositeConstraint#getConstraints <em>Constraints</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the containment reference list '<em>Constraints</em>'.
-	 * @see org.eclipse.papyrus.properties.contexts.CompositeConstraint#getConstraints()
+	 * @see org.eclipse.papyrus.views.properties.contexts.CompositeConstraint#getConstraints()
 	 * @see #getCompositeConstraint()
 	 * @generated
 	 */
 	EReference getCompositeConstraint_Constraints();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.properties.contexts.ConstraintDescriptor#isOverrideable <em>Overrideable</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.views.properties.contexts.ConstraintDescriptor#isOverrideable <em>Overrideable</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Overrideable</em>'.
-	 * @see org.eclipse.papyrus.properties.contexts.ConstraintDescriptor#isOverrideable()
+	 * @see org.eclipse.papyrus.views.properties.contexts.ConstraintDescriptor#isOverrideable()
 	 * @see #getConstraintDescriptor()
 	 * @generated
 	 */
 	EAttribute getConstraintDescriptor_Overrideable();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.properties.contexts.ConfigProperty <em>Config Property</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.views.properties.contexts.ConfigProperty <em>Config Property</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Config Property</em>'.
-	 * @see org.eclipse.papyrus.properties.contexts.ConfigProperty
+	 * @see org.eclipse.papyrus.views.properties.contexts.ConfigProperty
 	 * @generated
 	 */
 	EClass getConfigProperty();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.properties.contexts.ConfigProperty#getName <em>Name</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.views.properties.contexts.ConfigProperty#getName <em>Name</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.papyrus.properties.contexts.ConfigProperty#getName()
+	 * @see org.eclipse.papyrus.views.properties.contexts.ConfigProperty#getName()
 	 * @see #getConfigProperty()
 	 * @generated
 	 */
 	EAttribute getConfigProperty_Name();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.properties.contexts.ValueProperty <em>Value Property</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.views.properties.contexts.ValueProperty <em>Value Property</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Value Property</em>'.
-	 * @see org.eclipse.papyrus.properties.contexts.ValueProperty
+	 * @see org.eclipse.papyrus.views.properties.contexts.ValueProperty
 	 * @generated
 	 */
 	EClass getValueProperty();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.properties.contexts.ValueProperty#getValue <em>Value</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.views.properties.contexts.ValueProperty#getValue <em>Value</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Value</em>'.
-	 * @see org.eclipse.papyrus.properties.contexts.ValueProperty#getValue()
+	 * @see org.eclipse.papyrus.views.properties.contexts.ValueProperty#getValue()
 	 * @see #getValueProperty()
 	 * @generated
 	 */
 	EAttribute getValueProperty_Value();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.properties.contexts.ReferenceProperty <em>Reference Property</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.views.properties.contexts.ReferenceProperty <em>Reference Property</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Reference Property</em>'.
-	 * @see org.eclipse.papyrus.properties.contexts.ReferenceProperty
+	 * @see org.eclipse.papyrus.views.properties.contexts.ReferenceProperty
 	 * @generated
 	 */
 	EClass getReferenceProperty();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.properties.contexts.ReferenceProperty#getValue <em>Value</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.views.properties.contexts.ReferenceProperty#getValue <em>Value</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Value</em>'.
-	 * @see org.eclipse.papyrus.properties.contexts.ReferenceProperty#getValue()
+	 * @see org.eclipse.papyrus.views.properties.contexts.ReferenceProperty#getValue()
 	 * @see #getReferenceProperty()
 	 * @generated
 	 */
@@ -1745,11 +1745,11 @@ public interface ContextsPackage extends EPackage {
 	 */
 	interface Literals {
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.properties.contexts.impl.ContextImpl <em>Context</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.views.properties.contexts.impl.ContextImpl <em>Context</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.properties.contexts.impl.ContextImpl
-		 * @see org.eclipse.papyrus.properties.contexts.impl.ContextsPackageImpl#getContext()
+		 * @see org.eclipse.papyrus.views.properties.contexts.impl.ContextImpl
+		 * @see org.eclipse.papyrus.views.properties.contexts.impl.ContextsPackageImpl#getContext()
 		 * @generated
 		 */
 		EClass CONTEXT = eINSTANCE.getContext();
@@ -1795,11 +1795,11 @@ public interface ContextsPackage extends EPackage {
 		EReference CONTEXT__DEPENDENCIES = eINSTANCE.getContext_Dependencies();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.properties.contexts.impl.DisplayUnitImpl <em>Display Unit</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.views.properties.contexts.impl.DisplayUnitImpl <em>Display Unit</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.properties.contexts.impl.DisplayUnitImpl
-		 * @see org.eclipse.papyrus.properties.contexts.impl.ContextsPackageImpl#getDisplayUnit()
+		 * @see org.eclipse.papyrus.views.properties.contexts.impl.DisplayUnitImpl
+		 * @see org.eclipse.papyrus.views.properties.contexts.impl.ContextsPackageImpl#getDisplayUnit()
 		 * @generated
 		 */
 		EClass DISPLAY_UNIT = eINSTANCE.getDisplayUnit();
@@ -1813,11 +1813,11 @@ public interface ContextsPackage extends EPackage {
 		EReference DISPLAY_UNIT__CONSTRAINTS = eINSTANCE.getDisplayUnit_Constraints();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.properties.contexts.impl.ViewImpl <em>View</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.views.properties.contexts.impl.ViewImpl <em>View</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.properties.contexts.impl.ViewImpl
-		 * @see org.eclipse.papyrus.properties.contexts.impl.ContextsPackageImpl#getView()
+		 * @see org.eclipse.papyrus.views.properties.contexts.impl.ViewImpl
+		 * @see org.eclipse.papyrus.views.properties.contexts.impl.ContextsPackageImpl#getView()
 		 * @generated
 		 */
 		EClass VIEW = eINSTANCE.getView();
@@ -1871,11 +1871,11 @@ public interface ContextsPackage extends EPackage {
 		EReference VIEW__DATACONTEXTS = eINSTANCE.getView_Datacontexts();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.properties.contexts.impl.TabImpl <em>Tab</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.views.properties.contexts.impl.TabImpl <em>Tab</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.properties.contexts.impl.TabImpl
-		 * @see org.eclipse.papyrus.properties.contexts.impl.ContextsPackageImpl#getTab()
+		 * @see org.eclipse.papyrus.views.properties.contexts.impl.TabImpl
+		 * @see org.eclipse.papyrus.views.properties.contexts.impl.ContextsPackageImpl#getTab()
 		 * @generated
 		 */
 		EClass TAB = eINSTANCE.getTab();
@@ -1945,11 +1945,11 @@ public interface ContextsPackage extends EPackage {
 		EAttribute TAB__PRIORITY = eINSTANCE.getTab_Priority();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.properties.contexts.impl.SectionImpl <em>Section</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.views.properties.contexts.impl.SectionImpl <em>Section</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.properties.contexts.impl.SectionImpl
-		 * @see org.eclipse.papyrus.properties.contexts.impl.ContextsPackageImpl#getSection()
+		 * @see org.eclipse.papyrus.views.properties.contexts.impl.SectionImpl
+		 * @see org.eclipse.papyrus.views.properties.contexts.impl.ContextsPackageImpl#getSection()
 		 * @generated
 		 */
 		EClass SECTION = eINSTANCE.getSection();
@@ -1987,11 +1987,11 @@ public interface ContextsPackage extends EPackage {
 		EReference SECTION__WIDGET = eINSTANCE.getSection_Widget();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.properties.contexts.impl.DataContextElementImpl <em>Data Context Element</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.views.properties.contexts.impl.DataContextElementImpl <em>Data Context Element</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.properties.contexts.impl.DataContextElementImpl
-		 * @see org.eclipse.papyrus.properties.contexts.impl.ContextsPackageImpl#getDataContextElement()
+		 * @see org.eclipse.papyrus.views.properties.contexts.impl.DataContextElementImpl
+		 * @see org.eclipse.papyrus.views.properties.contexts.impl.ContextsPackageImpl#getDataContextElement()
 		 * @generated
 		 */
 		EClass DATA_CONTEXT_ELEMENT = eINSTANCE.getDataContextElement();
@@ -2029,11 +2029,11 @@ public interface ContextsPackage extends EPackage {
 		EReference DATA_CONTEXT_ELEMENT__SUPERTYPES = eINSTANCE.getDataContextElement_Supertypes();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.properties.contexts.impl.PropertyImpl <em>Property</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.views.properties.contexts.impl.PropertyImpl <em>Property</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.properties.contexts.impl.PropertyImpl
-		 * @see org.eclipse.papyrus.properties.contexts.impl.ContextsPackageImpl#getProperty()
+		 * @see org.eclipse.papyrus.views.properties.contexts.impl.PropertyImpl
+		 * @see org.eclipse.papyrus.views.properties.contexts.impl.ContextsPackageImpl#getProperty()
 		 * @generated
 		 */
 		EClass PROPERTY = eINSTANCE.getProperty();
@@ -2087,21 +2087,21 @@ public interface ContextsPackage extends EPackage {
 		EAttribute PROPERTY__DESCRIPTION = eINSTANCE.getProperty_Description();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.properties.contexts.impl.UnknownPropertyImpl <em>Unknown Property</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.views.properties.contexts.impl.UnknownPropertyImpl <em>Unknown Property</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.properties.contexts.impl.UnknownPropertyImpl
-		 * @see org.eclipse.papyrus.properties.contexts.impl.ContextsPackageImpl#getUnknownProperty()
+		 * @see org.eclipse.papyrus.views.properties.contexts.impl.UnknownPropertyImpl
+		 * @see org.eclipse.papyrus.views.properties.contexts.impl.ContextsPackageImpl#getUnknownProperty()
 		 * @generated
 		 */
 		EClass UNKNOWN_PROPERTY = eINSTANCE.getUnknownProperty();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.properties.contexts.impl.DataContextPackageImpl <em>Data Context Package</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.views.properties.contexts.impl.DataContextPackageImpl <em>Data Context Package</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.properties.contexts.impl.DataContextPackageImpl
-		 * @see org.eclipse.papyrus.properties.contexts.impl.ContextsPackageImpl#getDataContextPackage()
+		 * @see org.eclipse.papyrus.views.properties.contexts.impl.DataContextPackageImpl
+		 * @see org.eclipse.papyrus.views.properties.contexts.impl.ContextsPackageImpl#getDataContextPackage()
 		 * @generated
 		 */
 		EClass DATA_CONTEXT_PACKAGE = eINSTANCE.getDataContextPackage();
@@ -2115,11 +2115,11 @@ public interface ContextsPackage extends EPackage {
 		EReference DATA_CONTEXT_PACKAGE__ELEMENTS = eINSTANCE.getDataContextPackage_Elements();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.properties.contexts.impl.DataContextRootImpl <em>Data Context Root</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.views.properties.contexts.impl.DataContextRootImpl <em>Data Context Root</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.properties.contexts.impl.DataContextRootImpl
-		 * @see org.eclipse.papyrus.properties.contexts.impl.ContextsPackageImpl#getDataContextRoot()
+		 * @see org.eclipse.papyrus.views.properties.contexts.impl.DataContextRootImpl
+		 * @see org.eclipse.papyrus.views.properties.contexts.impl.ContextsPackageImpl#getDataContextRoot()
 		 * @generated
 		 */
 		EClass DATA_CONTEXT_ROOT = eINSTANCE.getDataContextRoot();
@@ -2141,11 +2141,11 @@ public interface ContextsPackage extends EPackage {
 		EReference DATA_CONTEXT_ROOT__MODEL_ELEMENT_FACTORY = eINSTANCE.getDataContextRoot_ModelElementFactory();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.properties.contexts.impl.ConstraintDescriptorImpl <em>Constraint Descriptor</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.views.properties.contexts.impl.ConstraintDescriptorImpl <em>Constraint Descriptor</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.properties.contexts.impl.ConstraintDescriptorImpl
-		 * @see org.eclipse.papyrus.properties.contexts.impl.ContextsPackageImpl#getConstraintDescriptor()
+		 * @see org.eclipse.papyrus.views.properties.contexts.impl.ConstraintDescriptorImpl
+		 * @see org.eclipse.papyrus.views.properties.contexts.impl.ContextsPackageImpl#getConstraintDescriptor()
 		 * @generated
 		 */
 		EClass CONSTRAINT_DESCRIPTOR = eINSTANCE.getConstraintDescriptor();
@@ -2175,11 +2175,11 @@ public interface ContextsPackage extends EPackage {
 		EReference CONSTRAINT_DESCRIPTOR__OVERRIDDEN_CONSTRAINTS = eINSTANCE.getConstraintDescriptor_OverriddenConstraints();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.properties.contexts.impl.SimpleConstraintImpl <em>Simple Constraint</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.views.properties.contexts.impl.SimpleConstraintImpl <em>Simple Constraint</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.properties.contexts.impl.SimpleConstraintImpl
-		 * @see org.eclipse.papyrus.properties.contexts.impl.ContextsPackageImpl#getSimpleConstraint()
+		 * @see org.eclipse.papyrus.views.properties.contexts.impl.SimpleConstraintImpl
+		 * @see org.eclipse.papyrus.views.properties.contexts.impl.ContextsPackageImpl#getSimpleConstraint()
 		 * @generated
 		 */
 		EClass SIMPLE_CONSTRAINT = eINSTANCE.getSimpleConstraint();
@@ -2201,11 +2201,11 @@ public interface ContextsPackage extends EPackage {
 		EReference SIMPLE_CONSTRAINT__PROPERTIES = eINSTANCE.getSimpleConstraint_Properties();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.properties.contexts.impl.CompositeConstraintImpl <em>Composite Constraint</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.views.properties.contexts.impl.CompositeConstraintImpl <em>Composite Constraint</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.properties.contexts.impl.CompositeConstraintImpl
-		 * @see org.eclipse.papyrus.properties.contexts.impl.ContextsPackageImpl#getCompositeConstraint()
+		 * @see org.eclipse.papyrus.views.properties.contexts.impl.CompositeConstraintImpl
+		 * @see org.eclipse.papyrus.views.properties.contexts.impl.ContextsPackageImpl#getCompositeConstraint()
 		 * @generated
 		 */
 		EClass COMPOSITE_CONSTRAINT = eINSTANCE.getCompositeConstraint();
@@ -2227,11 +2227,11 @@ public interface ContextsPackage extends EPackage {
 		EAttribute CONSTRAINT_DESCRIPTOR__OVERRIDEABLE = eINSTANCE.getConstraintDescriptor_Overrideable();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.properties.contexts.impl.ConfigPropertyImpl <em>Config Property</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.views.properties.contexts.impl.ConfigPropertyImpl <em>Config Property</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.properties.contexts.impl.ConfigPropertyImpl
-		 * @see org.eclipse.papyrus.properties.contexts.impl.ContextsPackageImpl#getConfigProperty()
+		 * @see org.eclipse.papyrus.views.properties.contexts.impl.ConfigPropertyImpl
+		 * @see org.eclipse.papyrus.views.properties.contexts.impl.ContextsPackageImpl#getConfigProperty()
 		 * @generated
 		 */
 		EClass CONFIG_PROPERTY = eINSTANCE.getConfigProperty();
@@ -2245,11 +2245,11 @@ public interface ContextsPackage extends EPackage {
 		EAttribute CONFIG_PROPERTY__NAME = eINSTANCE.getConfigProperty_Name();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.properties.contexts.impl.ValuePropertyImpl <em>Value Property</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.views.properties.contexts.impl.ValuePropertyImpl <em>Value Property</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.properties.contexts.impl.ValuePropertyImpl
-		 * @see org.eclipse.papyrus.properties.contexts.impl.ContextsPackageImpl#getValueProperty()
+		 * @see org.eclipse.papyrus.views.properties.contexts.impl.ValuePropertyImpl
+		 * @see org.eclipse.papyrus.views.properties.contexts.impl.ContextsPackageImpl#getValueProperty()
 		 * @generated
 		 */
 		EClass VALUE_PROPERTY = eINSTANCE.getValueProperty();
@@ -2263,11 +2263,11 @@ public interface ContextsPackage extends EPackage {
 		EAttribute VALUE_PROPERTY__VALUE = eINSTANCE.getValueProperty_Value();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.properties.contexts.impl.ReferencePropertyImpl <em>Reference Property</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.views.properties.contexts.impl.ReferencePropertyImpl <em>Reference Property</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.properties.contexts.impl.ReferencePropertyImpl
-		 * @see org.eclipse.papyrus.properties.contexts.impl.ContextsPackageImpl#getReferenceProperty()
+		 * @see org.eclipse.papyrus.views.properties.contexts.impl.ReferencePropertyImpl
+		 * @see org.eclipse.papyrus.views.properties.contexts.impl.ContextsPackageImpl#getReferenceProperty()
 		 * @generated
 		 */
 		EClass REFERENCE_PROPERTY = eINSTANCE.getReferenceProperty();
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/contexts/DataContextElement.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/contexts/DataContextElement.java
index aadfc3b708a..25774bcd0e8 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/contexts/DataContextElement.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/contexts/DataContextElement.java
@@ -9,7 +9,7 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.contexts;
+package org.eclipse.papyrus.views.properties.contexts;
 
 import org.eclipse.emf.common.util.EList;
 
@@ -23,14 +23,14 @@ import org.eclipse.emf.ecore.EObject;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.properties.contexts.DataContextElement#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.contexts.DataContextElement#getProperties <em>Properties</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.contexts.DataContextElement#getPackage <em>Package</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.contexts.DataContextElement#getSupertypes <em>Supertypes</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.contexts.DataContextElement#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.contexts.DataContextElement#getProperties <em>Properties</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.contexts.DataContextElement#getPackage <em>Package</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.contexts.DataContextElement#getSupertypes <em>Supertypes</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.papyrus.properties.contexts.ContextsPackage#getDataContextElement()
+ * @see org.eclipse.papyrus.views.properties.contexts.ContextsPackage#getDataContextElement()
  * @model
  * @generated
  */
@@ -45,14 +45,14 @@ public interface DataContextElement extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Name</em>' attribute.
 	 * @see #setName(String)
-	 * @see org.eclipse.papyrus.properties.contexts.ContextsPackage#getDataContextElement_Name()
+	 * @see org.eclipse.papyrus.views.properties.contexts.ContextsPackage#getDataContextElement_Name()
 	 * @model required="true"
 	 * @generated
 	 */
 	String getName();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.properties.contexts.DataContextElement#getName <em>Name</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.views.properties.contexts.DataContextElement#getName <em>Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Name</em>' attribute.
@@ -63,8 +63,8 @@ public interface DataContextElement extends EObject {
 
 	/**
 	 * Returns the value of the '<em><b>Properties</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.properties.contexts.Property}.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.properties.contexts.Property#getContextElement <em>Context Element</em>}'.
+	 * The list contents are of type {@link org.eclipse.papyrus.views.properties.contexts.Property}.
+	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.views.properties.contexts.Property#getContextElement <em>Context Element</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Properties</em>' containment reference list isn't clear,
@@ -72,8 +72,8 @@ public interface DataContextElement extends EObject {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Properties</em>' containment reference list.
-	 * @see org.eclipse.papyrus.properties.contexts.ContextsPackage#getDataContextElement_Properties()
-	 * @see org.eclipse.papyrus.properties.contexts.Property#getContextElement
+	 * @see org.eclipse.papyrus.views.properties.contexts.ContextsPackage#getDataContextElement_Properties()
+	 * @see org.eclipse.papyrus.views.properties.contexts.Property#getContextElement
 	 * @model opposite="contextElement" containment="true"
 	 * @generated
 	 */
@@ -81,7 +81,7 @@ public interface DataContextElement extends EObject {
 
 	/**
 	 * Returns the value of the '<em><b>Package</b></em>' container reference.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.properties.contexts.DataContextPackage#getElements <em>Elements</em>}'.
+	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.views.properties.contexts.DataContextPackage#getElements <em>Elements</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Package</em>' container reference isn't clear,
@@ -90,15 +90,15 @@ public interface DataContextElement extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Package</em>' container reference.
 	 * @see #setPackage(DataContextPackage)
-	 * @see org.eclipse.papyrus.properties.contexts.ContextsPackage#getDataContextElement_Package()
-	 * @see org.eclipse.papyrus.properties.contexts.DataContextPackage#getElements
+	 * @see org.eclipse.papyrus.views.properties.contexts.ContextsPackage#getDataContextElement_Package()
+	 * @see org.eclipse.papyrus.views.properties.contexts.DataContextPackage#getElements
 	 * @model opposite="elements" transient="false"
 	 * @generated
 	 */
 	DataContextPackage getPackage();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.properties.contexts.DataContextElement#getPackage <em>Package</em>}' container reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.views.properties.contexts.DataContextElement#getPackage <em>Package</em>}' container reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Package</em>' container reference.
@@ -109,7 +109,7 @@ public interface DataContextElement extends EObject {
 
 	/**
 	 * Returns the value of the '<em><b>Supertypes</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.properties.contexts.DataContextElement}.
+	 * The list contents are of type {@link org.eclipse.papyrus.views.properties.contexts.DataContextElement}.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Supertypes</em>' reference list isn't clear,
@@ -117,7 +117,7 @@ public interface DataContextElement extends EObject {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Supertypes</em>' reference list.
-	 * @see org.eclipse.papyrus.properties.contexts.ContextsPackage#getDataContextElement_Supertypes()
+	 * @see org.eclipse.papyrus.views.properties.contexts.ContextsPackage#getDataContextElement_Supertypes()
 	 * @model
 	 * @generated
 	 */
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/contexts/DataContextPackage.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/contexts/DataContextPackage.java
index df1aef61e62..5cbcc0849cc 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/contexts/DataContextPackage.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/contexts/DataContextPackage.java
@@ -9,7 +9,7 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.contexts;
+package org.eclipse.papyrus.views.properties.contexts;
 
 import org.eclipse.emf.common.util.EList;
 
@@ -21,19 +21,19 @@ import org.eclipse.emf.common.util.EList;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.properties.contexts.DataContextPackage#getElements <em>Elements</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.contexts.DataContextPackage#getElements <em>Elements</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.papyrus.properties.contexts.ContextsPackage#getDataContextPackage()
+ * @see org.eclipse.papyrus.views.properties.contexts.ContextsPackage#getDataContextPackage()
  * @model
  * @generated
  */
 public interface DataContextPackage extends DataContextElement {
 	/**
 	 * Returns the value of the '<em><b>Elements</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.properties.contexts.DataContextElement}.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.properties.contexts.DataContextElement#getPackage <em>Package</em>}'.
+	 * The list contents are of type {@link org.eclipse.papyrus.views.properties.contexts.DataContextElement}.
+	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.views.properties.contexts.DataContextElement#getPackage <em>Package</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Elements</em>' containment reference list isn't clear,
@@ -41,8 +41,8 @@ public interface DataContextPackage extends DataContextElement {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Elements</em>' containment reference list.
-	 * @see org.eclipse.papyrus.properties.contexts.ContextsPackage#getDataContextPackage_Elements()
-	 * @see org.eclipse.papyrus.properties.contexts.DataContextElement#getPackage
+	 * @see org.eclipse.papyrus.views.properties.contexts.ContextsPackage#getDataContextPackage_Elements()
+	 * @see org.eclipse.papyrus.views.properties.contexts.DataContextElement#getPackage
 	 * @model opposite="package" containment="true"
 	 * @generated
 	 */
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/contexts/DataContextRoot.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/contexts/DataContextRoot.java
index 0b0eb7e0ce8..0bd6a8333bc 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/contexts/DataContextRoot.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/contexts/DataContextRoot.java
@@ -9,9 +9,9 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.contexts;
+package org.eclipse.papyrus.views.properties.contexts;
 
-import org.eclipse.papyrus.properties.environment.ModelElementFactoryDescriptor;
+import org.eclipse.papyrus.views.properties.environment.ModelElementFactoryDescriptor;
 
 /**
  * <!-- begin-user-doc -->
@@ -21,12 +21,12 @@ import org.eclipse.papyrus.properties.environment.ModelElementFactoryDescriptor;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.properties.contexts.DataContextRoot#getLabel <em>Label</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.contexts.DataContextRoot#getModelElementFactory <em>Model Element Factory</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.contexts.DataContextRoot#getLabel <em>Label</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.contexts.DataContextRoot#getModelElementFactory <em>Model Element Factory</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.papyrus.properties.contexts.ContextsPackage#getDataContextRoot()
+ * @see org.eclipse.papyrus.views.properties.contexts.ContextsPackage#getDataContextRoot()
  * @model
  * @generated
  */
@@ -41,14 +41,14 @@ public interface DataContextRoot extends DataContextPackage {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Label</em>' attribute.
 	 * @see #setLabel(String)
-	 * @see org.eclipse.papyrus.properties.contexts.ContextsPackage#getDataContextRoot_Label()
+	 * @see org.eclipse.papyrus.views.properties.contexts.ContextsPackage#getDataContextRoot_Label()
 	 * @model required="true"
 	 * @generated
 	 */
 	String getLabel();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.properties.contexts.DataContextRoot#getLabel <em>Label</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.views.properties.contexts.DataContextRoot#getLabel <em>Label</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Label</em>' attribute.
@@ -67,14 +67,14 @@ public interface DataContextRoot extends DataContextPackage {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Model Element Factory</em>' reference.
 	 * @see #setModelElementFactory(ModelElementFactoryDescriptor)
-	 * @see org.eclipse.papyrus.properties.contexts.ContextsPackage#getDataContextRoot_ModelElementFactory()
+	 * @see org.eclipse.papyrus.views.properties.contexts.ContextsPackage#getDataContextRoot_ModelElementFactory()
 	 * @model required="true"
 	 * @generated
 	 */
 	ModelElementFactoryDescriptor getModelElementFactory();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.properties.contexts.DataContextRoot#getModelElementFactory <em>Model Element Factory</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.views.properties.contexts.DataContextRoot#getModelElementFactory <em>Model Element Factory</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Model Element Factory</em>' reference.
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/contexts/DisplayUnit.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/contexts/DisplayUnit.java
index 4723339b286..ecfe2e298b5 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/contexts/DisplayUnit.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/contexts/DisplayUnit.java
@@ -9,7 +9,7 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.contexts;
+package org.eclipse.papyrus.views.properties.contexts;
 
 import org.eclipse.emf.common.util.EList;
 
@@ -23,19 +23,19 @@ import org.eclipse.emf.ecore.EObject;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.properties.contexts.DisplayUnit#getConstraints <em>Constraints</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.contexts.DisplayUnit#getConstraints <em>Constraints</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.papyrus.properties.contexts.ContextsPackage#getDisplayUnit()
+ * @see org.eclipse.papyrus.views.properties.contexts.ContextsPackage#getDisplayUnit()
  * @model abstract="true"
  * @generated
  */
 public interface DisplayUnit extends EObject {
 	/**
 	 * Returns the value of the '<em><b>Constraints</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.properties.contexts.ConstraintDescriptor}.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.properties.contexts.ConstraintDescriptor#getDisplay <em>Display</em>}'.
+	 * The list contents are of type {@link org.eclipse.papyrus.views.properties.contexts.ConstraintDescriptor}.
+	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.views.properties.contexts.ConstraintDescriptor#getDisplay <em>Display</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Constraints</em>' containment reference list isn't clear,
@@ -43,8 +43,8 @@ public interface DisplayUnit extends EObject {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Constraints</em>' containment reference list.
-	 * @see org.eclipse.papyrus.properties.contexts.ContextsPackage#getDisplayUnit_Constraints()
-	 * @see org.eclipse.papyrus.properties.contexts.ConstraintDescriptor#getDisplay
+	 * @see org.eclipse.papyrus.views.properties.contexts.ContextsPackage#getDisplayUnit_Constraints()
+	 * @see org.eclipse.papyrus.views.properties.contexts.ConstraintDescriptor#getDisplay
 	 * @model opposite="display" containment="true"
 	 * @generated
 	 */
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/contexts/Property.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/contexts/Property.java
index 070e3bafd68..302fc83ea3b 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/contexts/Property.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/contexts/Property.java
@@ -9,11 +9,11 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.contexts;
+package org.eclipse.papyrus.views.properties.contexts;
 
 import org.eclipse.emf.ecore.EObject;
 
-import org.eclipse.papyrus.properties.environment.Type;
+import org.eclipse.papyrus.views.properties.environment.Type;
 
 /**
  * <!-- begin-user-doc -->
@@ -23,16 +23,16 @@ import org.eclipse.papyrus.properties.environment.Type;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.properties.contexts.Property#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.contexts.Property#getLabel <em>Label</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.contexts.Property#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.contexts.Property#getContextElement <em>Context Element</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.contexts.Property#getMultiplicity <em>Multiplicity</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.contexts.Property#getDescription <em>Description</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.contexts.Property#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.contexts.Property#getLabel <em>Label</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.contexts.Property#getType <em>Type</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.contexts.Property#getContextElement <em>Context Element</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.contexts.Property#getMultiplicity <em>Multiplicity</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.contexts.Property#getDescription <em>Description</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.papyrus.properties.contexts.ContextsPackage#getProperty()
+ * @see org.eclipse.papyrus.views.properties.contexts.ContextsPackage#getProperty()
  * @model
  * @generated
  */
@@ -47,14 +47,14 @@ public interface Property extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Name</em>' attribute.
 	 * @see #setName(String)
-	 * @see org.eclipse.papyrus.properties.contexts.ContextsPackage#getProperty_Name()
+	 * @see org.eclipse.papyrus.views.properties.contexts.ContextsPackage#getProperty_Name()
 	 * @model required="true"
 	 * @generated
 	 */
 	String getName();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.properties.contexts.Property#getName <em>Name</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.views.properties.contexts.Property#getName <em>Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Name</em>' attribute.
@@ -73,14 +73,14 @@ public interface Property extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Label</em>' attribute.
 	 * @see #setLabel(String)
-	 * @see org.eclipse.papyrus.properties.contexts.ContextsPackage#getProperty_Label()
+	 * @see org.eclipse.papyrus.views.properties.contexts.ContextsPackage#getProperty_Label()
 	 * @model
 	 * @generated
 	 */
 	String getLabel();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.properties.contexts.Property#getLabel <em>Label</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.views.properties.contexts.Property#getLabel <em>Label</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Label</em>' attribute.
@@ -91,7 +91,7 @@ public interface Property extends EObject {
 
 	/**
 	 * Returns the value of the '<em><b>Type</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.papyrus.properties.environment.Type}.
+	 * The literals are from the enumeration {@link org.eclipse.papyrus.views.properties.environment.Type}.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Type</em>' attribute isn't clear,
@@ -99,20 +99,20 @@ public interface Property extends EObject {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Type</em>' attribute.
-	 * @see org.eclipse.papyrus.properties.environment.Type
+	 * @see org.eclipse.papyrus.views.properties.environment.Type
 	 * @see #setType(Type)
-	 * @see org.eclipse.papyrus.properties.contexts.ContextsPackage#getProperty_Type()
+	 * @see org.eclipse.papyrus.views.properties.contexts.ContextsPackage#getProperty_Type()
 	 * @model required="true"
 	 * @generated
 	 */
 	Type getType();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.properties.contexts.Property#getType <em>Type</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.views.properties.contexts.Property#getType <em>Type</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Type</em>' attribute.
-	 * @see org.eclipse.papyrus.properties.environment.Type
+	 * @see org.eclipse.papyrus.views.properties.environment.Type
 	 * @see #getType()
 	 * @generated
 	 */
@@ -120,7 +120,7 @@ public interface Property extends EObject {
 
 	/**
 	 * Returns the value of the '<em><b>Context Element</b></em>' container reference.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.properties.contexts.DataContextElement#getProperties <em>Properties</em>}'.
+	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.views.properties.contexts.DataContextElement#getProperties <em>Properties</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Context Element</em>' container reference isn't clear,
@@ -129,15 +129,15 @@ public interface Property extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Context Element</em>' container reference.
 	 * @see #setContextElement(DataContextElement)
-	 * @see org.eclipse.papyrus.properties.contexts.ContextsPackage#getProperty_ContextElement()
-	 * @see org.eclipse.papyrus.properties.contexts.DataContextElement#getProperties
+	 * @see org.eclipse.papyrus.views.properties.contexts.ContextsPackage#getProperty_ContextElement()
+	 * @see org.eclipse.papyrus.views.properties.contexts.DataContextElement#getProperties
 	 * @model opposite="properties" transient="false"
 	 * @generated
 	 */
 	DataContextElement getContextElement();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.properties.contexts.Property#getContextElement <em>Context Element</em>}' container reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.views.properties.contexts.Property#getContextElement <em>Context Element</em>}' container reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Context Element</em>' container reference.
@@ -157,14 +157,14 @@ public interface Property extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Multiplicity</em>' attribute.
 	 * @see #setMultiplicity(int)
-	 * @see org.eclipse.papyrus.properties.contexts.ContextsPackage#getProperty_Multiplicity()
+	 * @see org.eclipse.papyrus.views.properties.contexts.ContextsPackage#getProperty_Multiplicity()
 	 * @model default="1" required="true"
 	 * @generated
 	 */
 	int getMultiplicity();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.properties.contexts.Property#getMultiplicity <em>Multiplicity</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.views.properties.contexts.Property#getMultiplicity <em>Multiplicity</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Multiplicity</em>' attribute.
@@ -183,14 +183,14 @@ public interface Property extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Description</em>' attribute.
 	 * @see #setDescription(String)
-	 * @see org.eclipse.papyrus.properties.contexts.ContextsPackage#getProperty_Description()
+	 * @see org.eclipse.papyrus.views.properties.contexts.ContextsPackage#getProperty_Description()
 	 * @model
 	 * @generated
 	 */
 	String getDescription();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.properties.contexts.Property#getDescription <em>Description</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.views.properties.contexts.Property#getDescription <em>Description</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Description</em>' attribute.
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/contexts/ReferenceProperty.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/contexts/ReferenceProperty.java
index f7fd803b499..3c35ec4ca74 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/contexts/ReferenceProperty.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/contexts/ReferenceProperty.java
@@ -9,7 +9,7 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.contexts;
+package org.eclipse.papyrus.views.properties.contexts;
 
 import org.eclipse.emf.ecore.EObject;
 
@@ -21,11 +21,11 @@ import org.eclipse.emf.ecore.EObject;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.properties.contexts.ReferenceProperty#getValue <em>Value</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.contexts.ReferenceProperty#getValue <em>Value</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.papyrus.properties.contexts.ContextsPackage#getReferenceProperty()
+ * @see org.eclipse.papyrus.views.properties.contexts.ContextsPackage#getReferenceProperty()
  * @model
  * @generated
  */
@@ -40,14 +40,14 @@ public interface ReferenceProperty extends ConfigProperty {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Value</em>' reference.
 	 * @see #setValue(EObject)
-	 * @see org.eclipse.papyrus.properties.contexts.ContextsPackage#getReferenceProperty_Value()
+	 * @see org.eclipse.papyrus.views.properties.contexts.ContextsPackage#getReferenceProperty_Value()
 	 * @model required="true"
 	 * @generated
 	 */
 	EObject getValue();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.properties.contexts.ReferenceProperty#getValue <em>Value</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.views.properties.contexts.ReferenceProperty#getValue <em>Value</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Value</em>' reference.
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/contexts/Section.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/contexts/Section.java
index 1728bab41d8..5858beac742 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/contexts/Section.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/contexts/Section.java
@@ -9,9 +9,9 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.contexts;
+package org.eclipse.papyrus.views.properties.contexts;
 
-import org.eclipse.papyrus.properties.ui.CompositeWidget;
+import org.eclipse.papyrus.views.properties.ui.CompositeWidget;
 
 /**
  * <!-- begin-user-doc -->
@@ -21,14 +21,14 @@ import org.eclipse.papyrus.properties.ui.CompositeWidget;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.properties.contexts.Section#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.contexts.Section#getTab <em>Tab</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.contexts.Section#getSectionFile <em>Section File</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.contexts.Section#getWidget <em>Widget</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.contexts.Section#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.contexts.Section#getTab <em>Tab</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.contexts.Section#getSectionFile <em>Section File</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.contexts.Section#getWidget <em>Widget</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.papyrus.properties.contexts.ContextsPackage#getSection()
+ * @see org.eclipse.papyrus.views.properties.contexts.ContextsPackage#getSection()
  * @model
  * @generated
  */
@@ -43,14 +43,14 @@ public interface Section extends DisplayUnit {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Name</em>' attribute.
 	 * @see #setName(String)
-	 * @see org.eclipse.papyrus.properties.contexts.ContextsPackage#getSection_Name()
+	 * @see org.eclipse.papyrus.views.properties.contexts.ContextsPackage#getSection_Name()
 	 * @model required="true"
 	 * @generated
 	 */
 	String getName();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.properties.contexts.Section#getName <em>Name</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.views.properties.contexts.Section#getName <em>Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Name</em>' attribute.
@@ -61,7 +61,7 @@ public interface Section extends DisplayUnit {
 
 	/**
 	 * Returns the value of the '<em><b>Tab</b></em>' container reference.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.properties.contexts.Tab#getSections <em>Sections</em>}'.
+	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.views.properties.contexts.Tab#getSections <em>Sections</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Tab</em>' container reference isn't clear,
@@ -70,15 +70,15 @@ public interface Section extends DisplayUnit {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Tab</em>' container reference.
 	 * @see #setTab(Tab)
-	 * @see org.eclipse.papyrus.properties.contexts.ContextsPackage#getSection_Tab()
-	 * @see org.eclipse.papyrus.properties.contexts.Tab#getSections
+	 * @see org.eclipse.papyrus.views.properties.contexts.ContextsPackage#getSection_Tab()
+	 * @see org.eclipse.papyrus.views.properties.contexts.Tab#getSections
 	 * @model opposite="sections" required="true" transient="false"
 	 * @generated
 	 */
 	Tab getTab();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.properties.contexts.Section#getTab <em>Tab</em>}' container reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.views.properties.contexts.Section#getTab <em>Tab</em>}' container reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Tab</em>' container reference.
@@ -97,14 +97,14 @@ public interface Section extends DisplayUnit {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Section File</em>' attribute.
 	 * @see #setSectionFile(String)
-	 * @see org.eclipse.papyrus.properties.contexts.ContextsPackage#getSection_SectionFile()
+	 * @see org.eclipse.papyrus.views.properties.contexts.ContextsPackage#getSection_SectionFile()
 	 * @model required="true"
 	 * @generated
 	 */
 	String getSectionFile();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.properties.contexts.Section#getSectionFile <em>Section File</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.views.properties.contexts.Section#getSectionFile <em>Section File</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Section File</em>' attribute.
@@ -123,14 +123,14 @@ public interface Section extends DisplayUnit {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Widget</em>' reference.
 	 * @see #setWidget(CompositeWidget)
-	 * @see org.eclipse.papyrus.properties.contexts.ContextsPackage#getSection_Widget()
+	 * @see org.eclipse.papyrus.views.properties.contexts.ContextsPackage#getSection_Widget()
 	 * @model required="true"
 	 * @generated
 	 */
 	CompositeWidget getWidget();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.properties.contexts.Section#getWidget <em>Widget</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.views.properties.contexts.Section#getWidget <em>Widget</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Widget</em>' reference.
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/contexts/SimpleConstraint.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/contexts/SimpleConstraint.java
index de8930994c8..504c4f47f94 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/contexts/SimpleConstraint.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/contexts/SimpleConstraint.java
@@ -9,11 +9,11 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.contexts;
+package org.eclipse.papyrus.views.properties.contexts;
 
 import org.eclipse.emf.common.util.EList;
 
-import org.eclipse.papyrus.properties.environment.ConstraintType;
+import org.eclipse.papyrus.views.properties.environment.ConstraintType;
 
 /**
  * <!-- begin-user-doc -->
@@ -23,12 +23,12 @@ import org.eclipse.papyrus.properties.environment.ConstraintType;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.properties.contexts.SimpleConstraint#getConstraintType <em>Constraint Type</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.contexts.SimpleConstraint#getProperties <em>Properties</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.contexts.SimpleConstraint#getConstraintType <em>Constraint Type</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.contexts.SimpleConstraint#getProperties <em>Properties</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.papyrus.properties.contexts.ContextsPackage#getSimpleConstraint()
+ * @see org.eclipse.papyrus.views.properties.contexts.ContextsPackage#getSimpleConstraint()
  * @model
  * @generated
  */
@@ -43,14 +43,14 @@ public interface SimpleConstraint extends ConstraintDescriptor {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Constraint Type</em>' reference.
 	 * @see #setConstraintType(ConstraintType)
-	 * @see org.eclipse.papyrus.properties.contexts.ContextsPackage#getSimpleConstraint_ConstraintType()
+	 * @see org.eclipse.papyrus.views.properties.contexts.ContextsPackage#getSimpleConstraint_ConstraintType()
 	 * @model required="true"
 	 * @generated
 	 */
 	ConstraintType getConstraintType();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.properties.contexts.SimpleConstraint#getConstraintType <em>Constraint Type</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.views.properties.contexts.SimpleConstraint#getConstraintType <em>Constraint Type</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Constraint Type</em>' reference.
@@ -61,7 +61,7 @@ public interface SimpleConstraint extends ConstraintDescriptor {
 
 	/**
 	 * Returns the value of the '<em><b>Properties</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.properties.contexts.ConfigProperty}.
+	 * The list contents are of type {@link org.eclipse.papyrus.views.properties.contexts.ConfigProperty}.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Properties</em>' containment reference list isn't clear,
@@ -69,7 +69,7 @@ public interface SimpleConstraint extends ConstraintDescriptor {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Properties</em>' containment reference list.
-	 * @see org.eclipse.papyrus.properties.contexts.ContextsPackage#getSimpleConstraint_Properties()
+	 * @see org.eclipse.papyrus.views.properties.contexts.ContextsPackage#getSimpleConstraint_Properties()
 	 * @model containment="true"
 	 * @generated
 	 */
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/contexts/Tab.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/contexts/Tab.java
index e357ccf2475..71245dd3ee1 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/contexts/Tab.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/contexts/Tab.java
@@ -9,7 +9,7 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.contexts;
+package org.eclipse.papyrus.views.properties.contexts;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EObject;
@@ -22,18 +22,18 @@ import org.eclipse.emf.ecore.EObject;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.properties.contexts.Tab#getLabel <em>Label</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.contexts.Tab#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.contexts.Tab#getCategory <em>Category</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.contexts.Tab#getImage <em>Image</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.contexts.Tab#getAfterTab <em>After Tab</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.contexts.Tab#getSections <em>Sections</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.contexts.Tab#isIndented <em>Indented</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.contexts.Tab#getPriority <em>Priority</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.contexts.Tab#getLabel <em>Label</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.contexts.Tab#getId <em>Id</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.contexts.Tab#getCategory <em>Category</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.contexts.Tab#getImage <em>Image</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.contexts.Tab#getAfterTab <em>After Tab</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.contexts.Tab#getSections <em>Sections</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.contexts.Tab#isIndented <em>Indented</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.contexts.Tab#getPriority <em>Priority</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.papyrus.properties.contexts.ContextsPackage#getTab()
+ * @see org.eclipse.papyrus.views.properties.contexts.ContextsPackage#getTab()
  * @model
  * @generated
  */
@@ -48,14 +48,14 @@ public interface Tab extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Label</em>' attribute.
 	 * @see #setLabel(String)
-	 * @see org.eclipse.papyrus.properties.contexts.ContextsPackage#getTab_Label()
+	 * @see org.eclipse.papyrus.views.properties.contexts.ContextsPackage#getTab_Label()
 	 * @model required="true"
 	 * @generated
 	 */
 	String getLabel();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.properties.contexts.Tab#getLabel <em>Label</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.views.properties.contexts.Tab#getLabel <em>Label</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Label</em>' attribute.
@@ -73,14 +73,14 @@ public interface Tab extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Id</em>' attribute.
 	 * @see #setId(String)
-	 * @see org.eclipse.papyrus.properties.contexts.ContextsPackage#getTab_Id()
+	 * @see org.eclipse.papyrus.views.properties.contexts.ContextsPackage#getTab_Id()
 	 * @model required="true"
 	 * @generated
 	 */
 	String getId();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.properties.contexts.Tab#getId <em>Id</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.views.properties.contexts.Tab#getId <em>Id</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Id</em>' attribute.
@@ -98,14 +98,14 @@ public interface Tab extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Category</em>' attribute.
 	 * @see #setCategory(String)
-	 * @see org.eclipse.papyrus.properties.contexts.ContextsPackage#getTab_Category()
+	 * @see org.eclipse.papyrus.views.properties.contexts.ContextsPackage#getTab_Category()
 	 * @model
 	 * @generated
 	 */
 	String getCategory();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.properties.contexts.Tab#getCategory <em>Category</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.views.properties.contexts.Tab#getCategory <em>Category</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Category</em>' attribute.
@@ -123,14 +123,14 @@ public interface Tab extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Image</em>' attribute.
 	 * @see #setImage(String)
-	 * @see org.eclipse.papyrus.properties.contexts.ContextsPackage#getTab_Image()
+	 * @see org.eclipse.papyrus.views.properties.contexts.ContextsPackage#getTab_Image()
 	 * @model
 	 * @generated
 	 */
 	String getImage();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.properties.contexts.Tab#getImage <em>Image</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.views.properties.contexts.Tab#getImage <em>Image</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Image</em>' attribute.
@@ -148,14 +148,14 @@ public interface Tab extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>After Tab</em>' reference.
 	 * @see #setAfterTab(Tab)
-	 * @see org.eclipse.papyrus.properties.contexts.ContextsPackage#getTab_AfterTab()
+	 * @see org.eclipse.papyrus.views.properties.contexts.ContextsPackage#getTab_AfterTab()
 	 * @model
 	 * @generated
 	 */
 	Tab getAfterTab();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.properties.contexts.Tab#getAfterTab <em>After Tab</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.views.properties.contexts.Tab#getAfterTab <em>After Tab</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>After Tab</em>' reference.
@@ -166,16 +166,16 @@ public interface Tab extends EObject {
 
 	/**
 	 * Returns the value of the '<em><b>Sections</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.properties.contexts.Section}.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.properties.contexts.Section#getTab <em>Tab</em>}'.
+	 * The list contents are of type {@link org.eclipse.papyrus.views.properties.contexts.Section}.
+	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.views.properties.contexts.Section#getTab <em>Tab</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Sections</em>' containment reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Sections</em>' containment reference list.
-	 * @see org.eclipse.papyrus.properties.contexts.ContextsPackage#getTab_Sections()
-	 * @see org.eclipse.papyrus.properties.contexts.Section#getTab
+	 * @see org.eclipse.papyrus.views.properties.contexts.ContextsPackage#getTab_Sections()
+	 * @see org.eclipse.papyrus.views.properties.contexts.Section#getTab
 	 * @model opposite="tab" containment="true"
 	 * @generated
 	 */
@@ -191,14 +191,14 @@ public interface Tab extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Indented</em>' attribute.
 	 * @see #setIndented(boolean)
-	 * @see org.eclipse.papyrus.properties.contexts.ContextsPackage#getTab_Indented()
+	 * @see org.eclipse.papyrus.views.properties.contexts.ContextsPackage#getTab_Indented()
 	 * @model default="false" required="true"
 	 * @generated
 	 */
 	boolean isIndented();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.properties.contexts.Tab#isIndented <em>Indented</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.views.properties.contexts.Tab#isIndented <em>Indented</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Indented</em>' attribute.
@@ -217,14 +217,14 @@ public interface Tab extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Priority</em>' attribute.
 	 * @see #setPriority(int)
-	 * @see org.eclipse.papyrus.properties.contexts.ContextsPackage#getTab_Priority()
+	 * @see org.eclipse.papyrus.views.properties.contexts.ContextsPackage#getTab_Priority()
 	 * @model
 	 * @generated
 	 */
 	int getPriority();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.properties.contexts.Tab#getPriority <em>Priority</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.views.properties.contexts.Tab#getPriority <em>Priority</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Priority</em>' attribute.
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/contexts/UnknownProperty.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/contexts/UnknownProperty.java
index 809ad41c17e..72bf472ce77 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/contexts/UnknownProperty.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/contexts/UnknownProperty.java
@@ -9,7 +9,7 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.contexts;
+package org.eclipse.papyrus.views.properties.contexts;
 
 
 /**
@@ -18,7 +18,7 @@ package org.eclipse.papyrus.properties.contexts;
  * <!-- end-user-doc -->
  *
  *
- * @see org.eclipse.papyrus.properties.contexts.ContextsPackage#getUnknownProperty()
+ * @see org.eclipse.papyrus.views.properties.contexts.ContextsPackage#getUnknownProperty()
  * @model
  * @generated
  */
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/contexts/ValueProperty.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/contexts/ValueProperty.java
index 5eb157de61b..358ac0d6c97 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/contexts/ValueProperty.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/contexts/ValueProperty.java
@@ -9,7 +9,7 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.contexts;
+package org.eclipse.papyrus.views.properties.contexts;
 
 
 /**
@@ -20,11 +20,11 @@ package org.eclipse.papyrus.properties.contexts;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.properties.contexts.ValueProperty#getValue <em>Value</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.contexts.ValueProperty#getValue <em>Value</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.papyrus.properties.contexts.ContextsPackage#getValueProperty()
+ * @see org.eclipse.papyrus.views.properties.contexts.ContextsPackage#getValueProperty()
  * @model
  * @generated
  */
@@ -39,14 +39,14 @@ public interface ValueProperty extends ConfigProperty {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Value</em>' attribute.
 	 * @see #setValue(String)
-	 * @see org.eclipse.papyrus.properties.contexts.ContextsPackage#getValueProperty_Value()
+	 * @see org.eclipse.papyrus.views.properties.contexts.ContextsPackage#getValueProperty_Value()
 	 * @model required="true"
 	 * @generated
 	 */
 	String getValue();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.properties.contexts.ValueProperty#getValue <em>Value</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.views.properties.contexts.ValueProperty#getValue <em>Value</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Value</em>' attribute.
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/contexts/View.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/contexts/View.java
index 4ed03a87ae7..a8295a84677 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/contexts/View.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/contexts/View.java
@@ -9,7 +9,7 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.contexts;
+package org.eclipse.papyrus.views.properties.contexts;
 
 import org.eclipse.emf.common.util.EList;
 
@@ -21,16 +21,16 @@ import org.eclipse.emf.common.util.EList;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.properties.contexts.View#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.contexts.View#getSections <em>Sections</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.contexts.View#getElementMultiplicity <em>Element Multiplicity</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.contexts.View#getContext <em>Context</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.contexts.View#isAutomaticContext <em>Automatic Context</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.contexts.View#getDatacontexts <em>Datacontexts</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.contexts.View#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.contexts.View#getSections <em>Sections</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.contexts.View#getElementMultiplicity <em>Element Multiplicity</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.contexts.View#getContext <em>Context</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.contexts.View#isAutomaticContext <em>Automatic Context</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.contexts.View#getDatacontexts <em>Datacontexts</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.papyrus.properties.contexts.ContextsPackage#getView()
+ * @see org.eclipse.papyrus.views.properties.contexts.ContextsPackage#getView()
  * @model
  * @generated
  */
@@ -45,14 +45,14 @@ public interface View extends DisplayUnit {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Name</em>' attribute.
 	 * @see #setName(String)
-	 * @see org.eclipse.papyrus.properties.contexts.ContextsPackage#getView_Name()
+	 * @see org.eclipse.papyrus.views.properties.contexts.ContextsPackage#getView_Name()
 	 * @model required="true"
 	 * @generated
 	 */
 	String getName();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.properties.contexts.View#getName <em>Name</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.views.properties.contexts.View#getName <em>Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Name</em>' attribute.
@@ -63,7 +63,7 @@ public interface View extends DisplayUnit {
 
 	/**
 	 * Returns the value of the '<em><b>Sections</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.properties.contexts.Section}.
+	 * The list contents are of type {@link org.eclipse.papyrus.views.properties.contexts.Section}.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Sections</em>' reference list isn't clear,
@@ -71,7 +71,7 @@ public interface View extends DisplayUnit {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Sections</em>' reference list.
-	 * @see org.eclipse.papyrus.properties.contexts.ContextsPackage#getView_Sections()
+	 * @see org.eclipse.papyrus.views.properties.contexts.ContextsPackage#getView_Sections()
 	 * @model
 	 * @generated
 	 */
@@ -88,14 +88,14 @@ public interface View extends DisplayUnit {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Element Multiplicity</em>' attribute.
 	 * @see #setElementMultiplicity(int)
-	 * @see org.eclipse.papyrus.properties.contexts.ContextsPackage#getView_ElementMultiplicity()
+	 * @see org.eclipse.papyrus.views.properties.contexts.ContextsPackage#getView_ElementMultiplicity()
 	 * @model default="1" required="true"
 	 * @generated
 	 */
 	int getElementMultiplicity();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.properties.contexts.View#getElementMultiplicity <em>Element Multiplicity</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.views.properties.contexts.View#getElementMultiplicity <em>Element Multiplicity</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Element Multiplicity</em>' attribute.
@@ -106,7 +106,7 @@ public interface View extends DisplayUnit {
 
 	/**
 	 * Returns the value of the '<em><b>Context</b></em>' container reference.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.properties.contexts.Context#getViews <em>Views</em>}'.
+	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.views.properties.contexts.Context#getViews <em>Views</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Context</em>' container reference isn't clear,
@@ -115,15 +115,15 @@ public interface View extends DisplayUnit {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Context</em>' container reference.
 	 * @see #setContext(Context)
-	 * @see org.eclipse.papyrus.properties.contexts.ContextsPackage#getView_Context()
-	 * @see org.eclipse.papyrus.properties.contexts.Context#getViews
+	 * @see org.eclipse.papyrus.views.properties.contexts.ContextsPackage#getView_Context()
+	 * @see org.eclipse.papyrus.views.properties.contexts.Context#getViews
 	 * @model opposite="views" required="true" transient="false"
 	 * @generated
 	 */
 	Context getContext();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.properties.contexts.View#getContext <em>Context</em>}' container reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.views.properties.contexts.View#getContext <em>Context</em>}' container reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Context</em>' container reference.
@@ -142,14 +142,14 @@ public interface View extends DisplayUnit {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Automatic Context</em>' attribute.
 	 * @see #setAutomaticContext(boolean)
-	 * @see org.eclipse.papyrus.properties.contexts.ContextsPackage#getView_AutomaticContext()
+	 * @see org.eclipse.papyrus.views.properties.contexts.ContextsPackage#getView_AutomaticContext()
 	 * @model required="true"
 	 * @generated
 	 */
 	boolean isAutomaticContext();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.properties.contexts.View#isAutomaticContext <em>Automatic Context</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.views.properties.contexts.View#isAutomaticContext <em>Automatic Context</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Automatic Context</em>' attribute.
@@ -160,7 +160,7 @@ public interface View extends DisplayUnit {
 
 	/**
 	 * Returns the value of the '<em><b>Datacontexts</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.properties.contexts.DataContextElement}.
+	 * The list contents are of type {@link org.eclipse.papyrus.views.properties.contexts.DataContextElement}.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Datacontexts</em>' reference list isn't clear,
@@ -168,7 +168,7 @@ public interface View extends DisplayUnit {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Datacontexts</em>' reference list.
-	 * @see org.eclipse.papyrus.properties.contexts.ContextsPackage#getView_Datacontexts()
+	 * @see org.eclipse.papyrus.views.properties.contexts.ContextsPackage#getView_Datacontexts()
 	 * @model
 	 * @generated
 	 */
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/contexts/impl/CompositeConstraintImpl.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/contexts/impl/CompositeConstraintImpl.java
index 72a1aba4f33..38758e1ffd3 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/contexts/impl/CompositeConstraintImpl.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/contexts/impl/CompositeConstraintImpl.java
@@ -9,7 +9,7 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.contexts.impl;
+package org.eclipse.papyrus.views.properties.contexts.impl;
 
 import java.util.Collection;
 
@@ -23,9 +23,9 @@ import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
 
-import org.eclipse.papyrus.properties.contexts.CompositeConstraint;
-import org.eclipse.papyrus.properties.contexts.ContextsPackage;
-import org.eclipse.papyrus.properties.contexts.SimpleConstraint;
+import org.eclipse.papyrus.views.properties.contexts.CompositeConstraint;
+import org.eclipse.papyrus.views.properties.contexts.ContextsPackage;
+import org.eclipse.papyrus.views.properties.contexts.SimpleConstraint;
 
 /**
  * <!-- begin-user-doc -->
@@ -34,7 +34,7 @@ import org.eclipse.papyrus.properties.contexts.SimpleConstraint;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.properties.contexts.impl.CompositeConstraintImpl#getConstraints <em>Constraints</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.contexts.impl.CompositeConstraintImpl#getConstraints <em>Constraints</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/contexts/impl/ConfigPropertyImpl.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/contexts/impl/ConfigPropertyImpl.java
index cc4c9598cd2..8405acb0221 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/contexts/impl/ConfigPropertyImpl.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/contexts/impl/ConfigPropertyImpl.java
@@ -9,7 +9,7 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.contexts.impl;
+package org.eclipse.papyrus.views.properties.contexts.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -18,8 +18,8 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
 
-import org.eclipse.papyrus.properties.contexts.ConfigProperty;
-import org.eclipse.papyrus.properties.contexts.ContextsPackage;
+import org.eclipse.papyrus.views.properties.contexts.ConfigProperty;
+import org.eclipse.papyrus.views.properties.contexts.ContextsPackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -28,7 +28,7 @@ import org.eclipse.papyrus.properties.contexts.ContextsPackage;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.properties.contexts.impl.ConfigPropertyImpl#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.contexts.impl.ConfigPropertyImpl#getName <em>Name</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/contexts/impl/ConstraintDescriptorImpl.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/contexts/impl/ConstraintDescriptorImpl.java
index f26b373bc3d..c6c6c101379 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/contexts/impl/ConstraintDescriptorImpl.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/contexts/impl/ConstraintDescriptorImpl.java
@@ -9,7 +9,7 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.contexts.impl;
+package org.eclipse.papyrus.views.properties.contexts.impl;
 
 import java.util.Collection;
 
@@ -29,13 +29,13 @@ import org.eclipse.emf.ecore.util.EObjectResolvingEList;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.ecore.util.InternalEList;
 
-import org.eclipse.papyrus.properties.contexts.ConfigProperty;
-import org.eclipse.papyrus.properties.contexts.ConstraintDescriptor;
-import org.eclipse.papyrus.properties.contexts.ContextsPackage;
-import org.eclipse.papyrus.properties.contexts.DisplayUnit;
 
-import org.eclipse.papyrus.properties.contexts.SimpleConstraint;
-import org.eclipse.papyrus.properties.environment.ConstraintType;
+import org.eclipse.papyrus.views.properties.contexts.ConfigProperty;
+import org.eclipse.papyrus.views.properties.contexts.ConstraintDescriptor;
+import org.eclipse.papyrus.views.properties.contexts.ContextsPackage;
+import org.eclipse.papyrus.views.properties.contexts.DisplayUnit;
+import org.eclipse.papyrus.views.properties.contexts.SimpleConstraint;
+import org.eclipse.papyrus.views.properties.environment.ConstraintType;
 
 /**
  * <!-- begin-user-doc -->
@@ -44,10 +44,10 @@ import org.eclipse.papyrus.properties.environment.ConstraintType;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.properties.contexts.impl.ConstraintDescriptorImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.contexts.impl.ConstraintDescriptorImpl#getDisplay <em>Display</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.contexts.impl.ConstraintDescriptorImpl#isOverrideable <em>Overrideable</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.contexts.impl.ConstraintDescriptorImpl#getOverriddenConstraints <em>Overridden Constraints</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.contexts.impl.ConstraintDescriptorImpl#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.contexts.impl.ConstraintDescriptorImpl#getDisplay <em>Display</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.contexts.impl.ConstraintDescriptorImpl#isOverrideable <em>Overrideable</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.contexts.impl.ConstraintDescriptorImpl#getOverriddenConstraints <em>Overridden Constraints</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/contexts/impl/ContextImpl.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/contexts/impl/ContextImpl.java
index 5110cb03b69..0fcedf2063b 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/contexts/impl/ContextImpl.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/contexts/impl/ContextImpl.java
@@ -9,7 +9,7 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.contexts.impl;
+package org.eclipse.papyrus.views.properties.contexts.impl;
 
 import java.util.Collection;
 
@@ -30,11 +30,11 @@ import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
 import org.eclipse.emf.ecore.util.EObjectResolvingEList;
 import org.eclipse.emf.ecore.util.InternalEList;
 
-import org.eclipse.papyrus.properties.contexts.Context;
-import org.eclipse.papyrus.properties.contexts.ContextsPackage;
-import org.eclipse.papyrus.properties.contexts.DataContextRoot;
-import org.eclipse.papyrus.properties.contexts.Tab;
-import org.eclipse.papyrus.properties.contexts.View;
+import org.eclipse.papyrus.views.properties.contexts.Context;
+import org.eclipse.papyrus.views.properties.contexts.ContextsPackage;
+import org.eclipse.papyrus.views.properties.contexts.DataContextRoot;
+import org.eclipse.papyrus.views.properties.contexts.Tab;
+import org.eclipse.papyrus.views.properties.contexts.View;
 
 /**
  * <!-- begin-user-doc -->
@@ -43,11 +43,11 @@ import org.eclipse.papyrus.properties.contexts.View;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.properties.contexts.impl.ContextImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.contexts.impl.ContextImpl#getDependencies <em>Dependencies</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.contexts.impl.ContextImpl#getTabs <em>Tabs</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.contexts.impl.ContextImpl#getViews <em>Views</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.contexts.impl.ContextImpl#getDataContexts <em>Data Contexts</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.contexts.impl.ContextImpl#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.contexts.impl.ContextImpl#getDependencies <em>Dependencies</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.contexts.impl.ContextImpl#getTabs <em>Tabs</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.contexts.impl.ContextImpl#getViews <em>Views</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.contexts.impl.ContextImpl#getDataContexts <em>Data Contexts</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/contexts/impl/ContextsFactoryImpl.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/contexts/impl/ContextsFactoryImpl.java
index 78f943dd059..4194a511e78 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/contexts/impl/ContextsFactoryImpl.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/contexts/impl/ContextsFactoryImpl.java
@@ -9,7 +9,7 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.contexts.impl;
+package org.eclipse.papyrus.views.properties.contexts.impl;
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
@@ -19,7 +19,7 @@ import org.eclipse.emf.ecore.impl.EFactoryImpl;
 
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
 
-import org.eclipse.papyrus.properties.contexts.*;
+import org.eclipse.papyrus.views.properties.contexts.*;
 
 /**
  * <!-- begin-user-doc -->
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/contexts/impl/ContextsPackageImpl.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/contexts/impl/ContextsPackageImpl.java
index 7bb338bbf70..5259bdc18ed 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/contexts/impl/ContextsPackageImpl.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/contexts/impl/ContextsPackageImpl.java
@@ -9,7 +9,7 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.contexts.impl;
+package org.eclipse.papyrus.views.properties.contexts.impl;
 
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
@@ -19,32 +19,32 @@ import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.ecore.EcorePackage;
 import org.eclipse.emf.ecore.impl.EPackageImpl;
 
-import org.eclipse.papyrus.properties.contexts.CompositeConstraint;
-import org.eclipse.papyrus.properties.contexts.ConfigProperty;
-import org.eclipse.papyrus.properties.contexts.ConstraintDescriptor;
-import org.eclipse.papyrus.properties.contexts.Context;
-import org.eclipse.papyrus.properties.contexts.ContextsFactory;
-import org.eclipse.papyrus.properties.contexts.ContextsPackage;
-import org.eclipse.papyrus.properties.contexts.DataContextElement;
-import org.eclipse.papyrus.properties.contexts.DataContextPackage;
-import org.eclipse.papyrus.properties.contexts.DataContextRoot;
-import org.eclipse.papyrus.properties.contexts.DisplayUnit;
-import org.eclipse.papyrus.properties.contexts.Property;
-import org.eclipse.papyrus.properties.contexts.ReferenceProperty;
-import org.eclipse.papyrus.properties.contexts.Section;
-import org.eclipse.papyrus.properties.contexts.SimpleConstraint;
-import org.eclipse.papyrus.properties.contexts.Tab;
-import org.eclipse.papyrus.properties.contexts.UnknownProperty;
-import org.eclipse.papyrus.properties.contexts.ValueProperty;
-import org.eclipse.papyrus.properties.contexts.View;
-
-import org.eclipse.papyrus.properties.environment.EnvironmentPackage;
-
-import org.eclipse.papyrus.properties.environment.impl.EnvironmentPackageImpl;
-
-import org.eclipse.papyrus.properties.ui.UiPackage;
-
-import org.eclipse.papyrus.properties.ui.impl.UiPackageImpl;
+
+
+
+
+import org.eclipse.papyrus.views.properties.contexts.CompositeConstraint;
+import org.eclipse.papyrus.views.properties.contexts.ConfigProperty;
+import org.eclipse.papyrus.views.properties.contexts.ConstraintDescriptor;
+import org.eclipse.papyrus.views.properties.contexts.Context;
+import org.eclipse.papyrus.views.properties.contexts.ContextsFactory;
+import org.eclipse.papyrus.views.properties.contexts.ContextsPackage;
+import org.eclipse.papyrus.views.properties.contexts.DataContextElement;
+import org.eclipse.papyrus.views.properties.contexts.DataContextPackage;
+import org.eclipse.papyrus.views.properties.contexts.DataContextRoot;
+import org.eclipse.papyrus.views.properties.contexts.DisplayUnit;
+import org.eclipse.papyrus.views.properties.contexts.Property;
+import org.eclipse.papyrus.views.properties.contexts.ReferenceProperty;
+import org.eclipse.papyrus.views.properties.contexts.Section;
+import org.eclipse.papyrus.views.properties.contexts.SimpleConstraint;
+import org.eclipse.papyrus.views.properties.contexts.Tab;
+import org.eclipse.papyrus.views.properties.contexts.UnknownProperty;
+import org.eclipse.papyrus.views.properties.contexts.ValueProperty;
+import org.eclipse.papyrus.views.properties.contexts.View;
+import org.eclipse.papyrus.views.properties.environment.EnvironmentPackage;
+import org.eclipse.papyrus.views.properties.environment.impl.EnvironmentPackageImpl;
+import org.eclipse.papyrus.views.properties.ui.UiPackage;
+import org.eclipse.papyrus.views.properties.ui.impl.UiPackageImpl;
 
 /**
  * <!-- begin-user-doc -->
@@ -176,7 +176,7 @@ public class ContextsPackageImpl extends EPackageImpl implements ContextsPackage
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.eclipse.papyrus.properties.contexts.ContextsPackage#eNS_URI
+	 * @see org.eclipse.papyrus.views.properties.contexts.ContextsPackage#eNS_URI
 	 * @see #init()
 	 * @generated
 	 */
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/contexts/impl/DataContextElementImpl.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/contexts/impl/DataContextElementImpl.java
index e242bf01061..0ca1b5278cf 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/contexts/impl/DataContextElementImpl.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/contexts/impl/DataContextElementImpl.java
@@ -9,7 +9,7 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.contexts.impl;
+package org.eclipse.papyrus.views.properties.contexts.impl;
 
 import java.util.Collection;
 
@@ -24,10 +24,10 @@ import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
 import org.eclipse.emf.ecore.util.EObjectResolvingEList;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.papyrus.properties.contexts.ContextsPackage;
-import org.eclipse.papyrus.properties.contexts.DataContextElement;
-import org.eclipse.papyrus.properties.contexts.DataContextPackage;
-import org.eclipse.papyrus.properties.contexts.Property;
+import org.eclipse.papyrus.views.properties.contexts.ContextsPackage;
+import org.eclipse.papyrus.views.properties.contexts.DataContextElement;
+import org.eclipse.papyrus.views.properties.contexts.DataContextPackage;
+import org.eclipse.papyrus.views.properties.contexts.Property;
 
 /**
  * <!-- begin-user-doc -->
@@ -36,10 +36,10 @@ import org.eclipse.papyrus.properties.contexts.Property;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.properties.contexts.impl.DataContextElementImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.contexts.impl.DataContextElementImpl#getProperties <em>Properties</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.contexts.impl.DataContextElementImpl#getPackage <em>Package</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.contexts.impl.DataContextElementImpl#getSupertypes <em>Supertypes</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.contexts.impl.DataContextElementImpl#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.contexts.impl.DataContextElementImpl#getProperties <em>Properties</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.contexts.impl.DataContextElementImpl#getPackage <em>Package</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.contexts.impl.DataContextElementImpl#getSupertypes <em>Supertypes</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/contexts/impl/DataContextPackageImpl.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/contexts/impl/DataContextPackageImpl.java
index c677653826b..6e72dc82d73 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/contexts/impl/DataContextPackageImpl.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/contexts/impl/DataContextPackageImpl.java
@@ -9,7 +9,7 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.contexts.impl;
+package org.eclipse.papyrus.views.properties.contexts.impl;
 
 import java.util.Collection;
 
@@ -23,9 +23,9 @@ import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
 import org.eclipse.emf.ecore.util.InternalEList;
 
-import org.eclipse.papyrus.properties.contexts.ContextsPackage;
-import org.eclipse.papyrus.properties.contexts.DataContextElement;
-import org.eclipse.papyrus.properties.contexts.DataContextPackage;
+import org.eclipse.papyrus.views.properties.contexts.ContextsPackage;
+import org.eclipse.papyrus.views.properties.contexts.DataContextElement;
+import org.eclipse.papyrus.views.properties.contexts.DataContextPackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -34,7 +34,7 @@ import org.eclipse.papyrus.properties.contexts.DataContextPackage;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.properties.contexts.impl.DataContextPackageImpl#getElements <em>Elements</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.contexts.impl.DataContextPackageImpl#getElements <em>Elements</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/contexts/impl/DataContextRootImpl.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/contexts/impl/DataContextRootImpl.java
index 56445f6cc3d..9390250de8a 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/contexts/impl/DataContextRootImpl.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/contexts/impl/DataContextRootImpl.java
@@ -9,7 +9,7 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.contexts.impl;
+package org.eclipse.papyrus.views.properties.contexts.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -18,10 +18,10 @@ import org.eclipse.emf.ecore.InternalEObject;
 
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 
-import org.eclipse.papyrus.properties.contexts.ContextsPackage;
-import org.eclipse.papyrus.properties.contexts.DataContextRoot;
 
-import org.eclipse.papyrus.properties.environment.ModelElementFactoryDescriptor;
+import org.eclipse.papyrus.views.properties.contexts.ContextsPackage;
+import org.eclipse.papyrus.views.properties.contexts.DataContextRoot;
+import org.eclipse.papyrus.views.properties.environment.ModelElementFactoryDescriptor;
 
 /**
  * <!-- begin-user-doc -->
@@ -30,8 +30,8 @@ import org.eclipse.papyrus.properties.environment.ModelElementFactoryDescriptor;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.properties.contexts.impl.DataContextRootImpl#getLabel <em>Label</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.contexts.impl.DataContextRootImpl#getModelElementFactory <em>Model Element Factory</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.contexts.impl.DataContextRootImpl#getLabel <em>Label</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.contexts.impl.DataContextRootImpl#getModelElementFactory <em>Model Element Factory</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/contexts/impl/DisplayUnitImpl.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/contexts/impl/DisplayUnitImpl.java
index b5bdb4af823..34e3ab2e506 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/contexts/impl/DisplayUnitImpl.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/contexts/impl/DisplayUnitImpl.java
@@ -9,7 +9,7 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.contexts.impl;
+package org.eclipse.papyrus.views.properties.contexts.impl;
 
 import java.util.Collection;
 
@@ -25,9 +25,9 @@ import org.eclipse.emf.ecore.impl.EObjectImpl;
 import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
 import org.eclipse.emf.ecore.util.InternalEList;
 
-import org.eclipse.papyrus.properties.contexts.ConstraintDescriptor;
-import org.eclipse.papyrus.properties.contexts.ContextsPackage;
-import org.eclipse.papyrus.properties.contexts.DisplayUnit;
+import org.eclipse.papyrus.views.properties.contexts.ConstraintDescriptor;
+import org.eclipse.papyrus.views.properties.contexts.ContextsPackage;
+import org.eclipse.papyrus.views.properties.contexts.DisplayUnit;
 
 /**
  * <!-- begin-user-doc -->
@@ -36,7 +36,7 @@ import org.eclipse.papyrus.properties.contexts.DisplayUnit;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.properties.contexts.impl.DisplayUnitImpl#getConstraints <em>Constraints</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.contexts.impl.DisplayUnitImpl#getConstraints <em>Constraints</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/contexts/impl/PropertyImpl.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/contexts/impl/PropertyImpl.java
index 2898c2d57f1..839e4c24351 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/contexts/impl/PropertyImpl.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/contexts/impl/PropertyImpl.java
@@ -9,7 +9,7 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.contexts.impl;
+package org.eclipse.papyrus.views.properties.contexts.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
@@ -18,10 +18,10 @@ import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
 import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.papyrus.properties.contexts.ContextsPackage;
-import org.eclipse.papyrus.properties.contexts.DataContextElement;
-import org.eclipse.papyrus.properties.contexts.Property;
-import org.eclipse.papyrus.properties.environment.Type;
+import org.eclipse.papyrus.views.properties.contexts.ContextsPackage;
+import org.eclipse.papyrus.views.properties.contexts.DataContextElement;
+import org.eclipse.papyrus.views.properties.contexts.Property;
+import org.eclipse.papyrus.views.properties.environment.Type;
 
 /**
  * <!-- begin-user-doc -->
@@ -30,12 +30,12 @@ import org.eclipse.papyrus.properties.environment.Type;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.properties.contexts.impl.PropertyImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.contexts.impl.PropertyImpl#getLabel <em>Label</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.contexts.impl.PropertyImpl#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.contexts.impl.PropertyImpl#getContextElement <em>Context Element</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.contexts.impl.PropertyImpl#getMultiplicity <em>Multiplicity</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.contexts.impl.PropertyImpl#getDescription <em>Description</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.contexts.impl.PropertyImpl#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.contexts.impl.PropertyImpl#getLabel <em>Label</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.contexts.impl.PropertyImpl#getType <em>Type</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.contexts.impl.PropertyImpl#getContextElement <em>Context Element</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.contexts.impl.PropertyImpl#getMultiplicity <em>Multiplicity</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.contexts.impl.PropertyImpl#getDescription <em>Description</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/contexts/impl/ReferencePropertyImpl.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/contexts/impl/ReferencePropertyImpl.java
index f62a06d88d5..9bbe6ad1c07 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/contexts/impl/ReferencePropertyImpl.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/contexts/impl/ReferencePropertyImpl.java
@@ -9,7 +9,7 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.contexts.impl;
+package org.eclipse.papyrus.views.properties.contexts.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -19,8 +19,8 @@ import org.eclipse.emf.ecore.InternalEObject;
 
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 
-import org.eclipse.papyrus.properties.contexts.ContextsPackage;
-import org.eclipse.papyrus.properties.contexts.ReferenceProperty;
+import org.eclipse.papyrus.views.properties.contexts.ContextsPackage;
+import org.eclipse.papyrus.views.properties.contexts.ReferenceProperty;
 
 /**
  * <!-- begin-user-doc -->
@@ -29,7 +29,7 @@ import org.eclipse.papyrus.properties.contexts.ReferenceProperty;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.properties.contexts.impl.ReferencePropertyImpl#getValue <em>Value</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.contexts.impl.ReferencePropertyImpl#getValue <em>Value</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/contexts/impl/SectionImpl.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/contexts/impl/SectionImpl.java
index 4827c6c6998..c77d5ae9d4e 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/contexts/impl/SectionImpl.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/contexts/impl/SectionImpl.java
@@ -9,7 +9,7 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.contexts.impl;
+package org.eclipse.papyrus.views.properties.contexts.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
@@ -21,11 +21,11 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
 
 import org.eclipse.emf.ecore.util.EcoreUtil;
 
-import org.eclipse.papyrus.properties.contexts.ContextsPackage;
-import org.eclipse.papyrus.properties.contexts.Section;
-import org.eclipse.papyrus.properties.contexts.Tab;
 
-import org.eclipse.papyrus.properties.ui.CompositeWidget;
+import org.eclipse.papyrus.views.properties.contexts.ContextsPackage;
+import org.eclipse.papyrus.views.properties.contexts.Section;
+import org.eclipse.papyrus.views.properties.contexts.Tab;
+import org.eclipse.papyrus.views.properties.ui.CompositeWidget;
 
 /**
  * <!-- begin-user-doc -->
@@ -34,10 +34,10 @@ import org.eclipse.papyrus.properties.ui.CompositeWidget;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.properties.contexts.impl.SectionImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.contexts.impl.SectionImpl#getTab <em>Tab</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.contexts.impl.SectionImpl#getSectionFile <em>Section File</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.contexts.impl.SectionImpl#getWidget <em>Widget</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.contexts.impl.SectionImpl#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.contexts.impl.SectionImpl#getTab <em>Tab</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.contexts.impl.SectionImpl#getSectionFile <em>Section File</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.contexts.impl.SectionImpl#getWidget <em>Widget</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/contexts/impl/SimpleConstraintImpl.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/contexts/impl/SimpleConstraintImpl.java
index c8453ef4d8e..90e2f935fbc 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/contexts/impl/SimpleConstraintImpl.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/contexts/impl/SimpleConstraintImpl.java
@@ -9,7 +9,7 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.contexts.impl;
+package org.eclipse.papyrus.views.properties.contexts.impl;
 
 import java.util.Collection;
 
@@ -26,11 +26,11 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
 
-import org.eclipse.papyrus.properties.contexts.ConfigProperty;
-import org.eclipse.papyrus.properties.contexts.ContextsPackage;
-import org.eclipse.papyrus.properties.contexts.SimpleConstraint;
 
-import org.eclipse.papyrus.properties.environment.ConstraintType;
+import org.eclipse.papyrus.views.properties.contexts.ConfigProperty;
+import org.eclipse.papyrus.views.properties.contexts.ContextsPackage;
+import org.eclipse.papyrus.views.properties.contexts.SimpleConstraint;
+import org.eclipse.papyrus.views.properties.environment.ConstraintType;
 
 /**
  * <!-- begin-user-doc -->
@@ -39,8 +39,8 @@ import org.eclipse.papyrus.properties.environment.ConstraintType;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.properties.contexts.impl.SimpleConstraintImpl#getConstraintType <em>Constraint Type</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.contexts.impl.SimpleConstraintImpl#getProperties <em>Properties</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.contexts.impl.SimpleConstraintImpl#getConstraintType <em>Constraint Type</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.contexts.impl.SimpleConstraintImpl#getProperties <em>Properties</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/contexts/impl/TabImpl.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/contexts/impl/TabImpl.java
index 3451d6c5a2e..0e3f0b5c65b 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/contexts/impl/TabImpl.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/contexts/impl/TabImpl.java
@@ -9,7 +9,7 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.contexts.impl;
+package org.eclipse.papyrus.views.properties.contexts.impl;
 
 import java.util.Collection;
 
@@ -22,9 +22,9 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
 import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
 import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.papyrus.properties.contexts.ContextsPackage;
-import org.eclipse.papyrus.properties.contexts.Section;
-import org.eclipse.papyrus.properties.contexts.Tab;
+import org.eclipse.papyrus.views.properties.contexts.ContextsPackage;
+import org.eclipse.papyrus.views.properties.contexts.Section;
+import org.eclipse.papyrus.views.properties.contexts.Tab;
 
 /**
  * <!-- begin-user-doc -->
@@ -33,14 +33,14 @@ import org.eclipse.papyrus.properties.contexts.Tab;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.properties.contexts.impl.TabImpl#getLabel <em>Label</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.contexts.impl.TabImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.contexts.impl.TabImpl#getCategory <em>Category</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.contexts.impl.TabImpl#getImage <em>Image</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.contexts.impl.TabImpl#getAfterTab <em>After Tab</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.contexts.impl.TabImpl#getSections <em>Sections</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.contexts.impl.TabImpl#isIndented <em>Indented</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.contexts.impl.TabImpl#getPriority <em>Priority</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.contexts.impl.TabImpl#getLabel <em>Label</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.contexts.impl.TabImpl#getId <em>Id</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.contexts.impl.TabImpl#getCategory <em>Category</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.contexts.impl.TabImpl#getImage <em>Image</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.contexts.impl.TabImpl#getAfterTab <em>After Tab</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.contexts.impl.TabImpl#getSections <em>Sections</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.contexts.impl.TabImpl#isIndented <em>Indented</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.contexts.impl.TabImpl#getPriority <em>Priority</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/contexts/impl/UnknownPropertyImpl.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/contexts/impl/UnknownPropertyImpl.java
index 1354a7601bc..d9a9acb8697 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/contexts/impl/UnknownPropertyImpl.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/contexts/impl/UnknownPropertyImpl.java
@@ -9,12 +9,12 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.contexts.impl;
+package org.eclipse.papyrus.views.properties.contexts.impl;
 
 import org.eclipse.emf.ecore.EClass;
 
-import org.eclipse.papyrus.properties.contexts.ContextsPackage;
-import org.eclipse.papyrus.properties.contexts.UnknownProperty;
+import org.eclipse.papyrus.views.properties.contexts.ContextsPackage;
+import org.eclipse.papyrus.views.properties.contexts.UnknownProperty;
 
 /**
  * <!-- begin-user-doc -->
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/contexts/impl/ValuePropertyImpl.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/contexts/impl/ValuePropertyImpl.java
index 60a16ad63ce..dd79deec51d 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/contexts/impl/ValuePropertyImpl.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/contexts/impl/ValuePropertyImpl.java
@@ -9,7 +9,7 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.contexts.impl;
+package org.eclipse.papyrus.views.properties.contexts.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -17,8 +17,8 @@ import org.eclipse.emf.ecore.EClass;
 
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 
-import org.eclipse.papyrus.properties.contexts.ContextsPackage;
-import org.eclipse.papyrus.properties.contexts.ValueProperty;
+import org.eclipse.papyrus.views.properties.contexts.ContextsPackage;
+import org.eclipse.papyrus.views.properties.contexts.ValueProperty;
 
 /**
  * <!-- begin-user-doc -->
@@ -27,7 +27,7 @@ import org.eclipse.papyrus.properties.contexts.ValueProperty;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.properties.contexts.impl.ValuePropertyImpl#getValue <em>Value</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.contexts.impl.ValuePropertyImpl#getValue <em>Value</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/contexts/impl/ViewImpl.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/contexts/impl/ViewImpl.java
index a5f0d02143f..c9b3cf00685 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/contexts/impl/ViewImpl.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/contexts/impl/ViewImpl.java
@@ -9,7 +9,7 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.contexts.impl;
+package org.eclipse.papyrus.views.properties.contexts.impl;
 
 import java.util.Collection;
 
@@ -26,11 +26,11 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.util.EObjectResolvingEList;
 
 import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.papyrus.properties.contexts.Context;
-import org.eclipse.papyrus.properties.contexts.ContextsPackage;
-import org.eclipse.papyrus.properties.contexts.DataContextElement;
-import org.eclipse.papyrus.properties.contexts.Section;
-import org.eclipse.papyrus.properties.contexts.View;
+import org.eclipse.papyrus.views.properties.contexts.Context;
+import org.eclipse.papyrus.views.properties.contexts.ContextsPackage;
+import org.eclipse.papyrus.views.properties.contexts.DataContextElement;
+import org.eclipse.papyrus.views.properties.contexts.Section;
+import org.eclipse.papyrus.views.properties.contexts.View;
 
 /**
  * <!-- begin-user-doc -->
@@ -39,12 +39,12 @@ import org.eclipse.papyrus.properties.contexts.View;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.properties.contexts.impl.ViewImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.contexts.impl.ViewImpl#getSections <em>Sections</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.contexts.impl.ViewImpl#getElementMultiplicity <em>Element Multiplicity</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.contexts.impl.ViewImpl#getContext <em>Context</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.contexts.impl.ViewImpl#isAutomaticContext <em>Automatic Context</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.contexts.impl.ViewImpl#getDatacontexts <em>Datacontexts</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.contexts.impl.ViewImpl#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.contexts.impl.ViewImpl#getSections <em>Sections</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.contexts.impl.ViewImpl#getElementMultiplicity <em>Element Multiplicity</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.contexts.impl.ViewImpl#getContext <em>Context</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.contexts.impl.ViewImpl#isAutomaticContext <em>Automatic Context</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.contexts.impl.ViewImpl#getDatacontexts <em>Datacontexts</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/contexts/util/ContextsAdapterFactory.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/contexts/util/ContextsAdapterFactory.java
index 3474dccc926..d0259ee063d 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/contexts/util/ContextsAdapterFactory.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/contexts/util/ContextsAdapterFactory.java
@@ -9,7 +9,7 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.contexts.util;
+package org.eclipse.papyrus.views.properties.contexts.util;
 
 import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.notify.Notifier;
@@ -19,14 +19,14 @@ import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
 import org.eclipse.emf.ecore.EModelElement;
 import org.eclipse.emf.ecore.EObject;
 
-import org.eclipse.papyrus.properties.contexts.*;
+import org.eclipse.papyrus.views.properties.contexts.*;
 
 /**
  * <!-- begin-user-doc -->
  * The <b>Adapter Factory</b> for the model.
  * It provides an adapter <code>createXXX</code> method for each class of the model.
  * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.properties.contexts.ContextsPackage
+ * @see org.eclipse.papyrus.views.properties.contexts.ContextsPackage
  * @generated
  */
 public class ContextsAdapterFactory extends AdapterFactoryImpl {
@@ -166,13 +166,13 @@ public class ContextsAdapterFactory extends AdapterFactoryImpl {
 
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.properties.contexts.Context <em>Context</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.views.properties.contexts.Context <em>Context</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.properties.contexts.Context
+	 * @see org.eclipse.papyrus.views.properties.contexts.Context
 	 * @generated
 	 */
 	public Adapter createContextAdapter() {
@@ -180,13 +180,13 @@ public class ContextsAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.properties.contexts.DisplayUnit <em>Display Unit</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.views.properties.contexts.DisplayUnit <em>Display Unit</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.properties.contexts.DisplayUnit
+	 * @see org.eclipse.papyrus.views.properties.contexts.DisplayUnit
 	 * @generated
 	 */
 	public Adapter createDisplayUnitAdapter() {
@@ -194,13 +194,13 @@ public class ContextsAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.properties.contexts.View <em>View</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.views.properties.contexts.View <em>View</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.properties.contexts.View
+	 * @see org.eclipse.papyrus.views.properties.contexts.View
 	 * @generated
 	 */
 	public Adapter createViewAdapter() {
@@ -208,13 +208,13 @@ public class ContextsAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.properties.contexts.Tab <em>Tab</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.views.properties.contexts.Tab <em>Tab</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.properties.contexts.Tab
+	 * @see org.eclipse.papyrus.views.properties.contexts.Tab
 	 * @generated
 	 */
 	public Adapter createTabAdapter() {
@@ -222,13 +222,13 @@ public class ContextsAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.properties.contexts.Section <em>Section</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.views.properties.contexts.Section <em>Section</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.properties.contexts.Section
+	 * @see org.eclipse.papyrus.views.properties.contexts.Section
 	 * @generated
 	 */
 	public Adapter createSectionAdapter() {
@@ -236,13 +236,13 @@ public class ContextsAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.properties.contexts.DataContextElement <em>Data Context Element</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.views.properties.contexts.DataContextElement <em>Data Context Element</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.properties.contexts.DataContextElement
+	 * @see org.eclipse.papyrus.views.properties.contexts.DataContextElement
 	 * @generated
 	 */
 	public Adapter createDataContextElementAdapter() {
@@ -250,13 +250,13 @@ public class ContextsAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.properties.contexts.Property <em>Property</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.views.properties.contexts.Property <em>Property</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.properties.contexts.Property
+	 * @see org.eclipse.papyrus.views.properties.contexts.Property
 	 * @generated
 	 */
 	public Adapter createPropertyAdapter() {
@@ -264,13 +264,13 @@ public class ContextsAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.properties.contexts.UnknownProperty <em>Unknown Property</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.views.properties.contexts.UnknownProperty <em>Unknown Property</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.properties.contexts.UnknownProperty
+	 * @see org.eclipse.papyrus.views.properties.contexts.UnknownProperty
 	 * @generated
 	 */
 	public Adapter createUnknownPropertyAdapter() {
@@ -278,13 +278,13 @@ public class ContextsAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.properties.contexts.DataContextPackage <em>Data Context Package</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.views.properties.contexts.DataContextPackage <em>Data Context Package</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.properties.contexts.DataContextPackage
+	 * @see org.eclipse.papyrus.views.properties.contexts.DataContextPackage
 	 * @generated
 	 */
 	public Adapter createDataContextPackageAdapter() {
@@ -292,13 +292,13 @@ public class ContextsAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.properties.contexts.DataContextRoot <em>Data Context Root</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.views.properties.contexts.DataContextRoot <em>Data Context Root</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.properties.contexts.DataContextRoot
+	 * @see org.eclipse.papyrus.views.properties.contexts.DataContextRoot
 	 * @generated
 	 */
 	public Adapter createDataContextRootAdapter() {
@@ -306,13 +306,13 @@ public class ContextsAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.properties.contexts.ConstraintDescriptor <em>Constraint Descriptor</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.views.properties.contexts.ConstraintDescriptor <em>Constraint Descriptor</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.properties.contexts.ConstraintDescriptor
+	 * @see org.eclipse.papyrus.views.properties.contexts.ConstraintDescriptor
 	 * @generated
 	 */
 	public Adapter createConstraintDescriptorAdapter() {
@@ -320,13 +320,13 @@ public class ContextsAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.properties.contexts.SimpleConstraint <em>Simple Constraint</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.views.properties.contexts.SimpleConstraint <em>Simple Constraint</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.properties.contexts.SimpleConstraint
+	 * @see org.eclipse.papyrus.views.properties.contexts.SimpleConstraint
 	 * @generated
 	 */
 	public Adapter createSimpleConstraintAdapter() {
@@ -334,13 +334,13 @@ public class ContextsAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.properties.contexts.CompositeConstraint <em>Composite Constraint</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.views.properties.contexts.CompositeConstraint <em>Composite Constraint</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.properties.contexts.CompositeConstraint
+	 * @see org.eclipse.papyrus.views.properties.contexts.CompositeConstraint
 	 * @generated
 	 */
 	public Adapter createCompositeConstraintAdapter() {
@@ -348,13 +348,13 @@ public class ContextsAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.properties.contexts.ConfigProperty <em>Config Property</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.views.properties.contexts.ConfigProperty <em>Config Property</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.properties.contexts.ConfigProperty
+	 * @see org.eclipse.papyrus.views.properties.contexts.ConfigProperty
 	 * @generated
 	 */
 	public Adapter createConfigPropertyAdapter() {
@@ -362,13 +362,13 @@ public class ContextsAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.properties.contexts.ValueProperty <em>Value Property</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.views.properties.contexts.ValueProperty <em>Value Property</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.properties.contexts.ValueProperty
+	 * @see org.eclipse.papyrus.views.properties.contexts.ValueProperty
 	 * @generated
 	 */
 	public Adapter createValuePropertyAdapter() {
@@ -376,13 +376,13 @@ public class ContextsAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.properties.contexts.ReferenceProperty <em>Reference Property</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.views.properties.contexts.ReferenceProperty <em>Reference Property</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.properties.contexts.ReferenceProperty
+	 * @see org.eclipse.papyrus.views.properties.contexts.ReferenceProperty
 	 * @generated
 	 */
 	public Adapter createReferencePropertyAdapter() {
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/contexts/util/ContextsSwitch.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/contexts/util/ContextsSwitch.java
index 041325ce669..02f1a85f4ea 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/contexts/util/ContextsSwitch.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/contexts/util/ContextsSwitch.java
@@ -9,7 +9,7 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.contexts.util;
+package org.eclipse.papyrus.views.properties.contexts.util;
 
 import org.eclipse.emf.ecore.EModelElement;
 import java.util.List;
@@ -19,7 +19,7 @@ import org.eclipse.emf.ecore.EObject;
 
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.util.Switch;
-import org.eclipse.papyrus.properties.contexts.*;
+import org.eclipse.papyrus.views.properties.contexts.*;
 
 /**
  * <!-- begin-user-doc -->
@@ -31,7 +31,7 @@ import org.eclipse.papyrus.properties.contexts.*;
  * until a non-null result is returned,
  * which is the result of the switch.
  * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.properties.contexts.ContextsPackage
+ * @see org.eclipse.papyrus.views.properties.contexts.ContextsPackage
  * @generated
  */
 public class ContextsSwitch<T> extends Switch<T> {
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/environment/CompositeWidgetType.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/environment/CompositeWidgetType.java
index e068839756c..1dcf5146190 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/environment/CompositeWidgetType.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/environment/CompositeWidgetType.java
@@ -9,7 +9,7 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.environment;
+package org.eclipse.papyrus.views.properties.environment;
 
 
 /**
@@ -18,7 +18,7 @@ package org.eclipse.papyrus.properties.environment;
  * <!-- end-user-doc -->
  *
  *
- * @see org.eclipse.papyrus.properties.environment.EnvironmentPackage#getCompositeWidgetType()
+ * @see org.eclipse.papyrus.views.properties.environment.EnvironmentPackage#getCompositeWidgetType()
  * @model
  * @generated
  */
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/environment/ConstraintType.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/environment/ConstraintType.java
index 5cd19aa24e7..db4c83020c3 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/environment/ConstraintType.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/environment/ConstraintType.java
@@ -9,7 +9,7 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.environment;
+package org.eclipse.papyrus.views.properties.environment;
 
 import org.eclipse.emf.ecore.EObject;
 
@@ -21,12 +21,12 @@ import org.eclipse.emf.ecore.EObject;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.properties.environment.ConstraintType#getLabel <em>Label</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.environment.ConstraintType#getConstraintClass <em>Constraint Class</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.environment.ConstraintType#getLabel <em>Label</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.environment.ConstraintType#getConstraintClass <em>Constraint Class</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.papyrus.properties.environment.EnvironmentPackage#getConstraintType()
+ * @see org.eclipse.papyrus.views.properties.environment.EnvironmentPackage#getConstraintType()
  * @model
  * @generated
  */
@@ -41,14 +41,14 @@ public interface ConstraintType extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Label</em>' attribute.
 	 * @see #setLabel(String)
-	 * @see org.eclipse.papyrus.properties.environment.EnvironmentPackage#getConstraintType_Label()
+	 * @see org.eclipse.papyrus.views.properties.environment.EnvironmentPackage#getConstraintType_Label()
 	 * @model required="true"
 	 * @generated
 	 */
 	String getLabel();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.properties.environment.ConstraintType#getLabel <em>Label</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.views.properties.environment.ConstraintType#getLabel <em>Label</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Label</em>' attribute.
@@ -67,14 +67,14 @@ public interface ConstraintType extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Constraint Class</em>' attribute.
 	 * @see #setConstraintClass(String)
-	 * @see org.eclipse.papyrus.properties.environment.EnvironmentPackage#getConstraintType_ConstraintClass()
+	 * @see org.eclipse.papyrus.views.properties.environment.EnvironmentPackage#getConstraintType_ConstraintClass()
 	 * @model required="true"
 	 * @generated
 	 */
 	String getConstraintClass();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.properties.environment.ConstraintType#getConstraintClass <em>Constraint Class</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.views.properties.environment.ConstraintType#getConstraintClass <em>Constraint Class</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Constraint Class</em>' attribute.
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/environment/ContentProviderType.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/environment/ContentProviderType.java
index 67e569b7b22..2f9e06d5ae2 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/environment/ContentProviderType.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/environment/ContentProviderType.java
@@ -9,7 +9,7 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.environment;
+package org.eclipse.papyrus.views.properties.environment;
 
 import org.eclipse.emf.ecore.EObject;
 
@@ -19,7 +19,7 @@ import org.eclipse.emf.ecore.EObject;
  * <!-- end-user-doc -->
  *
  *
- * @see org.eclipse.papyrus.properties.environment.EnvironmentPackage#getContentProviderType()
+ * @see org.eclipse.papyrus.views.properties.environment.EnvironmentPackage#getContentProviderType()
  * @model
  * @generated
  */
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/environment/Environment.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/environment/Environment.java
index 3f65780abbc..b65e10e06a2 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/environment/Environment.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/environment/Environment.java
@@ -9,14 +9,14 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.environment;
+package org.eclipse.papyrus.views.properties.environment;
 
 import org.eclipse.emf.common.util.EList;
 
 import org.eclipse.emf.ecore.EModelElement;
 import org.eclipse.emf.ecore.EObject;
 
-import org.eclipse.papyrus.properties.contexts.Context;
+import org.eclipse.papyrus.views.properties.contexts.Context;
 
 /**
  * <!-- begin-user-doc -->
@@ -26,25 +26,25 @@ import org.eclipse.papyrus.properties.contexts.Context;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.properties.environment.Environment#getModelElementFactories <em>Model Element Factories</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.environment.Environment#getConstraintTypes <em>Constraint Types</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.environment.Environment#getWidgetTypes <em>Widget Types</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.environment.Environment#getPropertyEditorTypes <em>Property Editor Types</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.environment.Environment#getCompositeWidgetTypes <em>Composite Widget Types</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.environment.Environment#getLayoutTypes <em>Layout Types</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.environment.Environment#getNamespaces <em>Namespaces</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.environment.Environment#getMiscClasses <em>Misc Classes</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.environment.Environment#getModelElementFactories <em>Model Element Factories</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.environment.Environment#getConstraintTypes <em>Constraint Types</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.environment.Environment#getWidgetTypes <em>Widget Types</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.environment.Environment#getPropertyEditorTypes <em>Property Editor Types</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.environment.Environment#getCompositeWidgetTypes <em>Composite Widget Types</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.environment.Environment#getLayoutTypes <em>Layout Types</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.environment.Environment#getNamespaces <em>Namespaces</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.environment.Environment#getMiscClasses <em>Misc Classes</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.papyrus.properties.environment.EnvironmentPackage#getEnvironment()
+ * @see org.eclipse.papyrus.views.properties.environment.EnvironmentPackage#getEnvironment()
  * @model
  * @generated
  */
 public interface Environment extends EModelElement {
 	/**
 	 * Returns the value of the '<em><b>Model Element Factories</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.properties.environment.ModelElementFactoryDescriptor}.
+	 * The list contents are of type {@link org.eclipse.papyrus.views.properties.environment.ModelElementFactoryDescriptor}.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Model Element Factories</em>' containment reference list isn't clear,
@@ -52,7 +52,7 @@ public interface Environment extends EModelElement {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Model Element Factories</em>' containment reference list.
-	 * @see org.eclipse.papyrus.properties.environment.EnvironmentPackage#getEnvironment_ModelElementFactories()
+	 * @see org.eclipse.papyrus.views.properties.environment.EnvironmentPackage#getEnvironment_ModelElementFactories()
 	 * @model containment="true"
 	 * @generated
 	 */
@@ -60,7 +60,7 @@ public interface Environment extends EModelElement {
 
 	/**
 	 * Returns the value of the '<em><b>Constraint Types</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.properties.environment.ConstraintType}.
+	 * The list contents are of type {@link org.eclipse.papyrus.views.properties.environment.ConstraintType}.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Constraint Types</em>' containment reference list isn't clear,
@@ -68,7 +68,7 @@ public interface Environment extends EModelElement {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Constraint Types</em>' containment reference list.
-	 * @see org.eclipse.papyrus.properties.environment.EnvironmentPackage#getEnvironment_ConstraintTypes()
+	 * @see org.eclipse.papyrus.views.properties.environment.EnvironmentPackage#getEnvironment_ConstraintTypes()
 	 * @model containment="true"
 	 * @generated
 	 */
@@ -76,7 +76,7 @@ public interface Environment extends EModelElement {
 
 	/**
 	 * Returns the value of the '<em><b>Widget Types</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.properties.environment.StandardWidgetType}.
+	 * The list contents are of type {@link org.eclipse.papyrus.views.properties.environment.StandardWidgetType}.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Widget Types</em>' containment reference list isn't clear,
@@ -84,7 +84,7 @@ public interface Environment extends EModelElement {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Widget Types</em>' containment reference list.
-	 * @see org.eclipse.papyrus.properties.environment.EnvironmentPackage#getEnvironment_WidgetTypes()
+	 * @see org.eclipse.papyrus.views.properties.environment.EnvironmentPackage#getEnvironment_WidgetTypes()
 	 * @model containment="true"
 	 * @generated
 	 */
@@ -92,7 +92,7 @@ public interface Environment extends EModelElement {
 
 	/**
 	 * Returns the value of the '<em><b>Property Editor Types</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.properties.environment.PropertyEditorType}.
+	 * The list contents are of type {@link org.eclipse.papyrus.views.properties.environment.PropertyEditorType}.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Property Editor Types</em>' containment reference list isn't clear,
@@ -100,7 +100,7 @@ public interface Environment extends EModelElement {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Property Editor Types</em>' containment reference list.
-	 * @see org.eclipse.papyrus.properties.environment.EnvironmentPackage#getEnvironment_PropertyEditorTypes()
+	 * @see org.eclipse.papyrus.views.properties.environment.EnvironmentPackage#getEnvironment_PropertyEditorTypes()
 	 * @model containment="true"
 	 * @generated
 	 */
@@ -108,7 +108,7 @@ public interface Environment extends EModelElement {
 
 	/**
 	 * Returns the value of the '<em><b>Composite Widget Types</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.properties.environment.CompositeWidgetType}.
+	 * The list contents are of type {@link org.eclipse.papyrus.views.properties.environment.CompositeWidgetType}.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Composite Widget Types</em>' containment reference list isn't clear,
@@ -116,7 +116,7 @@ public interface Environment extends EModelElement {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Composite Widget Types</em>' containment reference list.
-	 * @see org.eclipse.papyrus.properties.environment.EnvironmentPackage#getEnvironment_CompositeWidgetTypes()
+	 * @see org.eclipse.papyrus.views.properties.environment.EnvironmentPackage#getEnvironment_CompositeWidgetTypes()
 	 * @model containment="true"
 	 * @generated
 	 */
@@ -124,7 +124,7 @@ public interface Environment extends EModelElement {
 
 	/**
 	 * Returns the value of the '<em><b>Layout Types</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.properties.environment.LayoutType}.
+	 * The list contents are of type {@link org.eclipse.papyrus.views.properties.environment.LayoutType}.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Layout Types</em>' containment reference list isn't clear,
@@ -132,7 +132,7 @@ public interface Environment extends EModelElement {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Layout Types</em>' containment reference list.
-	 * @see org.eclipse.papyrus.properties.environment.EnvironmentPackage#getEnvironment_LayoutTypes()
+	 * @see org.eclipse.papyrus.views.properties.environment.EnvironmentPackage#getEnvironment_LayoutTypes()
 	 * @model containment="true"
 	 * @generated
 	 */
@@ -140,7 +140,7 @@ public interface Environment extends EModelElement {
 
 	/**
 	 * Returns the value of the '<em><b>Namespaces</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.properties.environment.Namespace}.
+	 * The list contents are of type {@link org.eclipse.papyrus.views.properties.environment.Namespace}.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Namespaces</em>' containment reference list isn't clear,
@@ -148,7 +148,7 @@ public interface Environment extends EModelElement {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Namespaces</em>' containment reference list.
-	 * @see org.eclipse.papyrus.properties.environment.EnvironmentPackage#getEnvironment_Namespaces()
+	 * @see org.eclipse.papyrus.views.properties.environment.EnvironmentPackage#getEnvironment_Namespaces()
 	 * @model containment="true"
 	 * @generated
 	 */
@@ -156,7 +156,7 @@ public interface Environment extends EModelElement {
 
 	/**
 	 * Returns the value of the '<em><b>Misc Classes</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.properties.environment.MiscClass}.
+	 * The list contents are of type {@link org.eclipse.papyrus.views.properties.environment.MiscClass}.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Misc Classes</em>' containment reference list isn't clear,
@@ -164,7 +164,7 @@ public interface Environment extends EModelElement {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Misc Classes</em>' containment reference list.
-	 * @see org.eclipse.papyrus.properties.environment.EnvironmentPackage#getEnvironment_MiscClasses()
+	 * @see org.eclipse.papyrus.views.properties.environment.EnvironmentPackage#getEnvironment_MiscClasses()
 	 * @model containment="true"
 	 * @generated
 	 */
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/environment/EnvironmentFactory.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/environment/EnvironmentFactory.java
index 309566da781..f578bdb8328 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/environment/EnvironmentFactory.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/environment/EnvironmentFactory.java
@@ -9,7 +9,7 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.environment;
+package org.eclipse.papyrus.views.properties.environment;
 
 import org.eclipse.emf.ecore.EFactory;
 
@@ -18,7 +18,7 @@ import org.eclipse.emf.ecore.EFactory;
  * The <b>Factory</b> for the model.
  * It provides a create method for each non-abstract class of the model.
  * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.properties.environment.EnvironmentPackage
+ * @see org.eclipse.papyrus.views.properties.environment.EnvironmentPackage
  * @generated
  */
 public interface EnvironmentFactory extends EFactory {
@@ -28,7 +28,7 @@ public interface EnvironmentFactory extends EFactory {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	EnvironmentFactory eINSTANCE = org.eclipse.papyrus.properties.environment.impl.EnvironmentFactoryImpl.init();
+	EnvironmentFactory eINSTANCE = org.eclipse.papyrus.views.properties.environment.impl.EnvironmentFactoryImpl.init();
 
 	/**
 	 * Returns a new object of class '<em>Environment</em>'.
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/environment/EnvironmentPackage.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/environment/EnvironmentPackage.java
index 32f7ca4aff3..c6956f68ef3 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/environment/EnvironmentPackage.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/environment/EnvironmentPackage.java
@@ -9,7 +9,7 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.environment;
+package org.eclipse.papyrus.views.properties.environment;
 
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
@@ -29,7 +29,7 @@ import org.eclipse.emf.ecore.EcorePackage;
  *   <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.properties.environment.EnvironmentFactory
+ * @see org.eclipse.papyrus.views.properties.environment.EnvironmentFactory
  * @model kind="package"
  * @generated
  */
@@ -64,14 +64,14 @@ public interface EnvironmentPackage extends EPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	EnvironmentPackage eINSTANCE = org.eclipse.papyrus.properties.environment.impl.EnvironmentPackageImpl.init();
+	EnvironmentPackage eINSTANCE = org.eclipse.papyrus.views.properties.environment.impl.EnvironmentPackageImpl.init();
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.properties.environment.impl.EnvironmentImpl <em>Environment</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.views.properties.environment.impl.EnvironmentImpl <em>Environment</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.properties.environment.impl.EnvironmentImpl
-	 * @see org.eclipse.papyrus.properties.environment.impl.EnvironmentPackageImpl#getEnvironment()
+	 * @see org.eclipse.papyrus.views.properties.environment.impl.EnvironmentImpl
+	 * @see org.eclipse.papyrus.views.properties.environment.impl.EnvironmentPackageImpl#getEnvironment()
 	 * @generated
 	 */
 	int ENVIRONMENT = 0;
@@ -167,11 +167,11 @@ public interface EnvironmentPackage extends EPackage {
 	int ENVIRONMENT_FEATURE_COUNT = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 8;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.properties.environment.impl.WidgetTypeImpl <em>Widget Type</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.views.properties.environment.impl.WidgetTypeImpl <em>Widget Type</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.properties.environment.impl.WidgetTypeImpl
-	 * @see org.eclipse.papyrus.properties.environment.impl.EnvironmentPackageImpl#getWidgetType()
+	 * @see org.eclipse.papyrus.views.properties.environment.impl.WidgetTypeImpl
+	 * @see org.eclipse.papyrus.views.properties.environment.impl.EnvironmentPackageImpl#getWidgetType()
 	 * @generated
 	 */
 	int WIDGET_TYPE = 2;
@@ -213,11 +213,11 @@ public interface EnvironmentPackage extends EPackage {
 	int WIDGET_TYPE_FEATURE_COUNT = 3;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.properties.environment.impl.PropertyEditorTypeImpl <em>Property Editor Type</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.views.properties.environment.impl.PropertyEditorTypeImpl <em>Property Editor Type</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.properties.environment.impl.PropertyEditorTypeImpl
-	 * @see org.eclipse.papyrus.properties.environment.impl.EnvironmentPackageImpl#getPropertyEditorType()
+	 * @see org.eclipse.papyrus.views.properties.environment.impl.PropertyEditorTypeImpl
+	 * @see org.eclipse.papyrus.views.properties.environment.impl.EnvironmentPackageImpl#getPropertyEditorType()
 	 * @generated
 	 */
 	int PROPERTY_EDITOR_TYPE = 1;
@@ -277,11 +277,11 @@ public interface EnvironmentPackage extends EPackage {
 	int PROPERTY_EDITOR_TYPE_FEATURE_COUNT = WIDGET_TYPE_FEATURE_COUNT + 2;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.properties.environment.impl.CompositeWidgetTypeImpl <em>Composite Widget Type</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.views.properties.environment.impl.CompositeWidgetTypeImpl <em>Composite Widget Type</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.properties.environment.impl.CompositeWidgetTypeImpl
-	 * @see org.eclipse.papyrus.properties.environment.impl.EnvironmentPackageImpl#getCompositeWidgetType()
+	 * @see org.eclipse.papyrus.views.properties.environment.impl.CompositeWidgetTypeImpl
+	 * @see org.eclipse.papyrus.views.properties.environment.impl.EnvironmentPackageImpl#getCompositeWidgetType()
 	 * @generated
 	 */
 	int COMPOSITE_WIDGET_TYPE = 3;
@@ -323,11 +323,11 @@ public interface EnvironmentPackage extends EPackage {
 	int COMPOSITE_WIDGET_TYPE_FEATURE_COUNT = WIDGET_TYPE_FEATURE_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.properties.environment.impl.LayoutTypeImpl <em>Layout Type</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.views.properties.environment.impl.LayoutTypeImpl <em>Layout Type</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.properties.environment.impl.LayoutTypeImpl
-	 * @see org.eclipse.papyrus.properties.environment.impl.EnvironmentPackageImpl#getLayoutType()
+	 * @see org.eclipse.papyrus.views.properties.environment.impl.LayoutTypeImpl
+	 * @see org.eclipse.papyrus.views.properties.environment.impl.EnvironmentPackageImpl#getLayoutType()
 	 * @generated
 	 */
 	int LAYOUT_TYPE = 4;
@@ -369,11 +369,11 @@ public interface EnvironmentPackage extends EPackage {
 	int LAYOUT_TYPE_FEATURE_COUNT = WIDGET_TYPE_FEATURE_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.properties.environment.impl.ConstraintTypeImpl <em>Constraint Type</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.views.properties.environment.impl.ConstraintTypeImpl <em>Constraint Type</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.properties.environment.impl.ConstraintTypeImpl
-	 * @see org.eclipse.papyrus.properties.environment.impl.EnvironmentPackageImpl#getConstraintType()
+	 * @see org.eclipse.papyrus.views.properties.environment.impl.ConstraintTypeImpl
+	 * @see org.eclipse.papyrus.views.properties.environment.impl.EnvironmentPackageImpl#getConstraintType()
 	 * @generated
 	 */
 	int CONSTRAINT_TYPE = 5;
@@ -406,11 +406,11 @@ public interface EnvironmentPackage extends EPackage {
 	int CONSTRAINT_TYPE_FEATURE_COUNT = 2;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.properties.environment.impl.ModelElementFactoryDescriptorImpl <em>Model Element Factory Descriptor</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.views.properties.environment.impl.ModelElementFactoryDescriptorImpl <em>Model Element Factory Descriptor</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.properties.environment.impl.ModelElementFactoryDescriptorImpl
-	 * @see org.eclipse.papyrus.properties.environment.impl.EnvironmentPackageImpl#getModelElementFactoryDescriptor()
+	 * @see org.eclipse.papyrus.views.properties.environment.impl.ModelElementFactoryDescriptorImpl
+	 * @see org.eclipse.papyrus.views.properties.environment.impl.EnvironmentPackageImpl#getModelElementFactoryDescriptor()
 	 * @generated
 	 */
 	int MODEL_ELEMENT_FACTORY_DESCRIPTOR = 6;
@@ -443,11 +443,11 @@ public interface EnvironmentPackage extends EPackage {
 	int MODEL_ELEMENT_FACTORY_DESCRIPTOR_FEATURE_COUNT = 2;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.properties.environment.impl.StandardWidgetTypeImpl <em>Standard Widget Type</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.views.properties.environment.impl.StandardWidgetTypeImpl <em>Standard Widget Type</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.properties.environment.impl.StandardWidgetTypeImpl
-	 * @see org.eclipse.papyrus.properties.environment.impl.EnvironmentPackageImpl#getStandardWidgetType()
+	 * @see org.eclipse.papyrus.views.properties.environment.impl.StandardWidgetTypeImpl
+	 * @see org.eclipse.papyrus.views.properties.environment.impl.EnvironmentPackageImpl#getStandardWidgetType()
 	 * @generated
 	 */
 	int STANDARD_WIDGET_TYPE = 7;
@@ -489,11 +489,11 @@ public interface EnvironmentPackage extends EPackage {
 	int STANDARD_WIDGET_TYPE_FEATURE_COUNT = WIDGET_TYPE_FEATURE_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.properties.environment.impl.NamespaceImpl <em>Namespace</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.views.properties.environment.impl.NamespaceImpl <em>Namespace</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.properties.environment.impl.NamespaceImpl
-	 * @see org.eclipse.papyrus.properties.environment.impl.EnvironmentPackageImpl#getNamespace()
+	 * @see org.eclipse.papyrus.views.properties.environment.impl.NamespaceImpl
+	 * @see org.eclipse.papyrus.views.properties.environment.impl.EnvironmentPackageImpl#getNamespace()
 	 * @generated
 	 */
 	int NAMESPACE = 8;
@@ -535,11 +535,11 @@ public interface EnvironmentPackage extends EPackage {
 	int NAMESPACE_FEATURE_COUNT = 3;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.properties.environment.impl.MiscClassImpl <em>Misc Class</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.views.properties.environment.impl.MiscClassImpl <em>Misc Class</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.properties.environment.impl.MiscClassImpl
-	 * @see org.eclipse.papyrus.properties.environment.impl.EnvironmentPackageImpl#getMiscClass()
+	 * @see org.eclipse.papyrus.views.properties.environment.impl.MiscClassImpl
+	 * @see org.eclipse.papyrus.views.properties.environment.impl.EnvironmentPackageImpl#getMiscClass()
 	 * @generated
 	 */
 	int MISC_CLASS = 9;
@@ -581,375 +581,375 @@ public interface EnvironmentPackage extends EPackage {
 	int MISC_CLASS_FEATURE_COUNT = 3;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.properties.environment.Type <em>Type</em>}' enum.
+	 * The meta object id for the '{@link org.eclipse.papyrus.views.properties.environment.Type <em>Type</em>}' enum.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.properties.environment.Type
-	 * @see org.eclipse.papyrus.properties.environment.impl.EnvironmentPackageImpl#getType()
+	 * @see org.eclipse.papyrus.views.properties.environment.Type
+	 * @see org.eclipse.papyrus.views.properties.environment.impl.EnvironmentPackageImpl#getType()
 	 * @generated
 	 */
 	int TYPE = 10;
 
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.properties.environment.Environment <em>Environment</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.views.properties.environment.Environment <em>Environment</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Environment</em>'.
-	 * @see org.eclipse.papyrus.properties.environment.Environment
+	 * @see org.eclipse.papyrus.views.properties.environment.Environment
 	 * @generated
 	 */
 	EClass getEnvironment();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.properties.environment.Environment#getModelElementFactories <em>Model Element Factories</em>}'.
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.views.properties.environment.Environment#getModelElementFactories <em>Model Element Factories</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the containment reference list '<em>Model Element Factories</em>'.
-	 * @see org.eclipse.papyrus.properties.environment.Environment#getModelElementFactories()
+	 * @see org.eclipse.papyrus.views.properties.environment.Environment#getModelElementFactories()
 	 * @see #getEnvironment()
 	 * @generated
 	 */
 	EReference getEnvironment_ModelElementFactories();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.properties.environment.Environment#getConstraintTypes <em>Constraint Types</em>}'.
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.views.properties.environment.Environment#getConstraintTypes <em>Constraint Types</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the containment reference list '<em>Constraint Types</em>'.
-	 * @see org.eclipse.papyrus.properties.environment.Environment#getConstraintTypes()
+	 * @see org.eclipse.papyrus.views.properties.environment.Environment#getConstraintTypes()
 	 * @see #getEnvironment()
 	 * @generated
 	 */
 	EReference getEnvironment_ConstraintTypes();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.properties.environment.Environment#getWidgetTypes <em>Widget Types</em>}'.
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.views.properties.environment.Environment#getWidgetTypes <em>Widget Types</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the containment reference list '<em>Widget Types</em>'.
-	 * @see org.eclipse.papyrus.properties.environment.Environment#getWidgetTypes()
+	 * @see org.eclipse.papyrus.views.properties.environment.Environment#getWidgetTypes()
 	 * @see #getEnvironment()
 	 * @generated
 	 */
 	EReference getEnvironment_WidgetTypes();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.properties.environment.Environment#getPropertyEditorTypes <em>Property Editor Types</em>}'.
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.views.properties.environment.Environment#getPropertyEditorTypes <em>Property Editor Types</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the containment reference list '<em>Property Editor Types</em>'.
-	 * @see org.eclipse.papyrus.properties.environment.Environment#getPropertyEditorTypes()
+	 * @see org.eclipse.papyrus.views.properties.environment.Environment#getPropertyEditorTypes()
 	 * @see #getEnvironment()
 	 * @generated
 	 */
 	EReference getEnvironment_PropertyEditorTypes();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.properties.environment.Environment#getCompositeWidgetTypes <em>Composite Widget Types</em>}'.
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.views.properties.environment.Environment#getCompositeWidgetTypes <em>Composite Widget Types</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the containment reference list '<em>Composite Widget Types</em>'.
-	 * @see org.eclipse.papyrus.properties.environment.Environment#getCompositeWidgetTypes()
+	 * @see org.eclipse.papyrus.views.properties.environment.Environment#getCompositeWidgetTypes()
 	 * @see #getEnvironment()
 	 * @generated
 	 */
 	EReference getEnvironment_CompositeWidgetTypes();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.properties.environment.Environment#getLayoutTypes <em>Layout Types</em>}'.
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.views.properties.environment.Environment#getLayoutTypes <em>Layout Types</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the containment reference list '<em>Layout Types</em>'.
-	 * @see org.eclipse.papyrus.properties.environment.Environment#getLayoutTypes()
+	 * @see org.eclipse.papyrus.views.properties.environment.Environment#getLayoutTypes()
 	 * @see #getEnvironment()
 	 * @generated
 	 */
 	EReference getEnvironment_LayoutTypes();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.properties.environment.Environment#getNamespaces <em>Namespaces</em>}'.
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.views.properties.environment.Environment#getNamespaces <em>Namespaces</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the containment reference list '<em>Namespaces</em>'.
-	 * @see org.eclipse.papyrus.properties.environment.Environment#getNamespaces()
+	 * @see org.eclipse.papyrus.views.properties.environment.Environment#getNamespaces()
 	 * @see #getEnvironment()
 	 * @generated
 	 */
 	EReference getEnvironment_Namespaces();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.properties.environment.Environment#getMiscClasses <em>Misc Classes</em>}'.
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.views.properties.environment.Environment#getMiscClasses <em>Misc Classes</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the containment reference list '<em>Misc Classes</em>'.
-	 * @see org.eclipse.papyrus.properties.environment.Environment#getMiscClasses()
+	 * @see org.eclipse.papyrus.views.properties.environment.Environment#getMiscClasses()
 	 * @see #getEnvironment()
 	 * @generated
 	 */
 	EReference getEnvironment_MiscClasses();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.properties.environment.PropertyEditorType <em>Property Editor Type</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.views.properties.environment.PropertyEditorType <em>Property Editor Type</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Property Editor Type</em>'.
-	 * @see org.eclipse.papyrus.properties.environment.PropertyEditorType
+	 * @see org.eclipse.papyrus.views.properties.environment.PropertyEditorType
 	 * @generated
 	 */
 	EClass getPropertyEditorType();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.properties.environment.PropertyEditorType#getType <em>Type</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.views.properties.environment.PropertyEditorType#getType <em>Type</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Type</em>'.
-	 * @see org.eclipse.papyrus.properties.environment.PropertyEditorType#getType()
+	 * @see org.eclipse.papyrus.views.properties.environment.PropertyEditorType#getType()
 	 * @see #getPropertyEditorType()
 	 * @generated
 	 */
 	EAttribute getPropertyEditorType_Type();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.properties.environment.PropertyEditorType#getMultiplicity <em>Multiplicity</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.views.properties.environment.PropertyEditorType#getMultiplicity <em>Multiplicity</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Multiplicity</em>'.
-	 * @see org.eclipse.papyrus.properties.environment.PropertyEditorType#getMultiplicity()
+	 * @see org.eclipse.papyrus.views.properties.environment.PropertyEditorType#getMultiplicity()
 	 * @see #getPropertyEditorType()
 	 * @generated
 	 */
 	EAttribute getPropertyEditorType_Multiplicity();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.properties.environment.WidgetType <em>Widget Type</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.views.properties.environment.WidgetType <em>Widget Type</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Widget Type</em>'.
-	 * @see org.eclipse.papyrus.properties.environment.WidgetType
+	 * @see org.eclipse.papyrus.views.properties.environment.WidgetType
 	 * @generated
 	 */
 	EClass getWidgetType();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.properties.environment.WidgetType#getLabel <em>Label</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.views.properties.environment.WidgetType#getLabel <em>Label</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Label</em>'.
-	 * @see org.eclipse.papyrus.properties.environment.WidgetType#getLabel()
+	 * @see org.eclipse.papyrus.views.properties.environment.WidgetType#getLabel()
 	 * @see #getWidgetType()
 	 * @generated
 	 */
 	EAttribute getWidgetType_Label();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.properties.environment.WidgetType#getWidgetClass <em>Widget Class</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.views.properties.environment.WidgetType#getWidgetClass <em>Widget Class</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Widget Class</em>'.
-	 * @see org.eclipse.papyrus.properties.environment.WidgetType#getWidgetClass()
+	 * @see org.eclipse.papyrus.views.properties.environment.WidgetType#getWidgetClass()
 	 * @see #getWidgetType()
 	 * @generated
 	 */
 	EAttribute getWidgetType_WidgetClass();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.properties.environment.WidgetType#getNamespace <em>Namespace</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.views.properties.environment.WidgetType#getNamespace <em>Namespace</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Namespace</em>'.
-	 * @see org.eclipse.papyrus.properties.environment.WidgetType#getNamespace()
+	 * @see org.eclipse.papyrus.views.properties.environment.WidgetType#getNamespace()
 	 * @see #getWidgetType()
 	 * @generated
 	 */
 	EReference getWidgetType_Namespace();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.properties.environment.CompositeWidgetType <em>Composite Widget Type</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.views.properties.environment.CompositeWidgetType <em>Composite Widget Type</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Composite Widget Type</em>'.
-	 * @see org.eclipse.papyrus.properties.environment.CompositeWidgetType
+	 * @see org.eclipse.papyrus.views.properties.environment.CompositeWidgetType
 	 * @generated
 	 */
 	EClass getCompositeWidgetType();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.properties.environment.LayoutType <em>Layout Type</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.views.properties.environment.LayoutType <em>Layout Type</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Layout Type</em>'.
-	 * @see org.eclipse.papyrus.properties.environment.LayoutType
+	 * @see org.eclipse.papyrus.views.properties.environment.LayoutType
 	 * @generated
 	 */
 	EClass getLayoutType();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.properties.environment.ConstraintType <em>Constraint Type</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.views.properties.environment.ConstraintType <em>Constraint Type</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Constraint Type</em>'.
-	 * @see org.eclipse.papyrus.properties.environment.ConstraintType
+	 * @see org.eclipse.papyrus.views.properties.environment.ConstraintType
 	 * @generated
 	 */
 	EClass getConstraintType();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.properties.environment.ConstraintType#getLabel <em>Label</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.views.properties.environment.ConstraintType#getLabel <em>Label</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Label</em>'.
-	 * @see org.eclipse.papyrus.properties.environment.ConstraintType#getLabel()
+	 * @see org.eclipse.papyrus.views.properties.environment.ConstraintType#getLabel()
 	 * @see #getConstraintType()
 	 * @generated
 	 */
 	EAttribute getConstraintType_Label();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.properties.environment.ConstraintType#getConstraintClass <em>Constraint Class</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.views.properties.environment.ConstraintType#getConstraintClass <em>Constraint Class</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Constraint Class</em>'.
-	 * @see org.eclipse.papyrus.properties.environment.ConstraintType#getConstraintClass()
+	 * @see org.eclipse.papyrus.views.properties.environment.ConstraintType#getConstraintClass()
 	 * @see #getConstraintType()
 	 * @generated
 	 */
 	EAttribute getConstraintType_ConstraintClass();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.properties.environment.ModelElementFactoryDescriptor <em>Model Element Factory Descriptor</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.views.properties.environment.ModelElementFactoryDescriptor <em>Model Element Factory Descriptor</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Model Element Factory Descriptor</em>'.
-	 * @see org.eclipse.papyrus.properties.environment.ModelElementFactoryDescriptor
+	 * @see org.eclipse.papyrus.views.properties.environment.ModelElementFactoryDescriptor
 	 * @generated
 	 */
 	EClass getModelElementFactoryDescriptor();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.properties.environment.ModelElementFactoryDescriptor#getName <em>Name</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.views.properties.environment.ModelElementFactoryDescriptor#getName <em>Name</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.papyrus.properties.environment.ModelElementFactoryDescriptor#getName()
+	 * @see org.eclipse.papyrus.views.properties.environment.ModelElementFactoryDescriptor#getName()
 	 * @see #getModelElementFactoryDescriptor()
 	 * @generated
 	 */
 	EAttribute getModelElementFactoryDescriptor_Name();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.properties.environment.ModelElementFactoryDescriptor#getFactoryClass <em>Factory Class</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.views.properties.environment.ModelElementFactoryDescriptor#getFactoryClass <em>Factory Class</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Factory Class</em>'.
-	 * @see org.eclipse.papyrus.properties.environment.ModelElementFactoryDescriptor#getFactoryClass()
+	 * @see org.eclipse.papyrus.views.properties.environment.ModelElementFactoryDescriptor#getFactoryClass()
 	 * @see #getModelElementFactoryDescriptor()
 	 * @generated
 	 */
 	EAttribute getModelElementFactoryDescriptor_FactoryClass();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.properties.environment.StandardWidgetType <em>Standard Widget Type</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.views.properties.environment.StandardWidgetType <em>Standard Widget Type</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Standard Widget Type</em>'.
-	 * @see org.eclipse.papyrus.properties.environment.StandardWidgetType
+	 * @see org.eclipse.papyrus.views.properties.environment.StandardWidgetType
 	 * @generated
 	 */
 	EClass getStandardWidgetType();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.properties.environment.Namespace <em>Namespace</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.views.properties.environment.Namespace <em>Namespace</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Namespace</em>'.
-	 * @see org.eclipse.papyrus.properties.environment.Namespace
+	 * @see org.eclipse.papyrus.views.properties.environment.Namespace
 	 * @generated
 	 */
 	EClass getNamespace();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.properties.environment.Namespace#getPrefix <em>Prefix</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.views.properties.environment.Namespace#getPrefix <em>Prefix</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Prefix</em>'.
-	 * @see org.eclipse.papyrus.properties.environment.Namespace#getPrefix()
+	 * @see org.eclipse.papyrus.views.properties.environment.Namespace#getPrefix()
 	 * @see #getNamespace()
 	 * @generated
 	 */
 	EAttribute getNamespace_Prefix();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.properties.environment.Namespace#getName <em>Name</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.views.properties.environment.Namespace#getName <em>Name</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.papyrus.properties.environment.Namespace#getName()
+	 * @see org.eclipse.papyrus.views.properties.environment.Namespace#getName()
 	 * @see #getNamespace()
 	 * @generated
 	 */
 	EAttribute getNamespace_Name();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.properties.environment.Namespace#getValue <em>Value</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.views.properties.environment.Namespace#getValue <em>Value</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Value</em>'.
-	 * @see org.eclipse.papyrus.properties.environment.Namespace#getValue()
+	 * @see org.eclipse.papyrus.views.properties.environment.Namespace#getValue()
 	 * @see #getNamespace()
 	 * @generated
 	 */
 	EAttribute getNamespace_Value();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.properties.environment.MiscClass <em>Misc Class</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.views.properties.environment.MiscClass <em>Misc Class</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Misc Class</em>'.
-	 * @see org.eclipse.papyrus.properties.environment.MiscClass
+	 * @see org.eclipse.papyrus.views.properties.environment.MiscClass
 	 * @generated
 	 */
 	EClass getMiscClass();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.properties.environment.MiscClass#getLabel <em>Label</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.views.properties.environment.MiscClass#getLabel <em>Label</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Label</em>'.
-	 * @see org.eclipse.papyrus.properties.environment.MiscClass#getLabel()
+	 * @see org.eclipse.papyrus.views.properties.environment.MiscClass#getLabel()
 	 * @see #getMiscClass()
 	 * @generated
 	 */
 	EAttribute getMiscClass_Label();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.properties.environment.MiscClass#getClass_ <em>Class</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.views.properties.environment.MiscClass#getClass_ <em>Class</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Class</em>'.
-	 * @see org.eclipse.papyrus.properties.environment.MiscClass#getClass_()
+	 * @see org.eclipse.papyrus.views.properties.environment.MiscClass#getClass_()
 	 * @see #getMiscClass()
 	 * @generated
 	 */
 	EAttribute getMiscClass_Class();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.properties.environment.MiscClass#getNamespace <em>Namespace</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.views.properties.environment.MiscClass#getNamespace <em>Namespace</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Namespace</em>'.
-	 * @see org.eclipse.papyrus.properties.environment.MiscClass#getNamespace()
+	 * @see org.eclipse.papyrus.views.properties.environment.MiscClass#getNamespace()
 	 * @see #getMiscClass()
 	 * @generated
 	 */
 	EReference getMiscClass_Namespace();
 
 	/**
-	 * Returns the meta object for enum '{@link org.eclipse.papyrus.properties.environment.Type <em>Type</em>}'.
+	 * Returns the meta object for enum '{@link org.eclipse.papyrus.views.properties.environment.Type <em>Type</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for enum '<em>Type</em>'.
-	 * @see org.eclipse.papyrus.properties.environment.Type
+	 * @see org.eclipse.papyrus.views.properties.environment.Type
 	 * @generated
 	 */
 	EEnum getType();
@@ -977,11 +977,11 @@ public interface EnvironmentPackage extends EPackage {
 	 */
 	interface Literals {
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.properties.environment.impl.EnvironmentImpl <em>Environment</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.views.properties.environment.impl.EnvironmentImpl <em>Environment</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.properties.environment.impl.EnvironmentImpl
-		 * @see org.eclipse.papyrus.properties.environment.impl.EnvironmentPackageImpl#getEnvironment()
+		 * @see org.eclipse.papyrus.views.properties.environment.impl.EnvironmentImpl
+		 * @see org.eclipse.papyrus.views.properties.environment.impl.EnvironmentPackageImpl#getEnvironment()
 		 * @generated
 		 */
 		EClass ENVIRONMENT = eINSTANCE.getEnvironment();
@@ -1051,11 +1051,11 @@ public interface EnvironmentPackage extends EPackage {
 		EReference ENVIRONMENT__MISC_CLASSES = eINSTANCE.getEnvironment_MiscClasses();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.properties.environment.impl.PropertyEditorTypeImpl <em>Property Editor Type</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.views.properties.environment.impl.PropertyEditorTypeImpl <em>Property Editor Type</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.properties.environment.impl.PropertyEditorTypeImpl
-		 * @see org.eclipse.papyrus.properties.environment.impl.EnvironmentPackageImpl#getPropertyEditorType()
+		 * @see org.eclipse.papyrus.views.properties.environment.impl.PropertyEditorTypeImpl
+		 * @see org.eclipse.papyrus.views.properties.environment.impl.EnvironmentPackageImpl#getPropertyEditorType()
 		 * @generated
 		 */
 		EClass PROPERTY_EDITOR_TYPE = eINSTANCE.getPropertyEditorType();
@@ -1077,11 +1077,11 @@ public interface EnvironmentPackage extends EPackage {
 		EAttribute PROPERTY_EDITOR_TYPE__MULTIPLICITY = eINSTANCE.getPropertyEditorType_Multiplicity();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.properties.environment.impl.WidgetTypeImpl <em>Widget Type</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.views.properties.environment.impl.WidgetTypeImpl <em>Widget Type</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.properties.environment.impl.WidgetTypeImpl
-		 * @see org.eclipse.papyrus.properties.environment.impl.EnvironmentPackageImpl#getWidgetType()
+		 * @see org.eclipse.papyrus.views.properties.environment.impl.WidgetTypeImpl
+		 * @see org.eclipse.papyrus.views.properties.environment.impl.EnvironmentPackageImpl#getWidgetType()
 		 * @generated
 		 */
 		EClass WIDGET_TYPE = eINSTANCE.getWidgetType();
@@ -1111,31 +1111,31 @@ public interface EnvironmentPackage extends EPackage {
 		EReference WIDGET_TYPE__NAMESPACE = eINSTANCE.getWidgetType_Namespace();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.properties.environment.impl.CompositeWidgetTypeImpl <em>Composite Widget Type</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.views.properties.environment.impl.CompositeWidgetTypeImpl <em>Composite Widget Type</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.properties.environment.impl.CompositeWidgetTypeImpl
-		 * @see org.eclipse.papyrus.properties.environment.impl.EnvironmentPackageImpl#getCompositeWidgetType()
+		 * @see org.eclipse.papyrus.views.properties.environment.impl.CompositeWidgetTypeImpl
+		 * @see org.eclipse.papyrus.views.properties.environment.impl.EnvironmentPackageImpl#getCompositeWidgetType()
 		 * @generated
 		 */
 		EClass COMPOSITE_WIDGET_TYPE = eINSTANCE.getCompositeWidgetType();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.properties.environment.impl.LayoutTypeImpl <em>Layout Type</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.views.properties.environment.impl.LayoutTypeImpl <em>Layout Type</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.properties.environment.impl.LayoutTypeImpl
-		 * @see org.eclipse.papyrus.properties.environment.impl.EnvironmentPackageImpl#getLayoutType()
+		 * @see org.eclipse.papyrus.views.properties.environment.impl.LayoutTypeImpl
+		 * @see org.eclipse.papyrus.views.properties.environment.impl.EnvironmentPackageImpl#getLayoutType()
 		 * @generated
 		 */
 		EClass LAYOUT_TYPE = eINSTANCE.getLayoutType();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.properties.environment.impl.ConstraintTypeImpl <em>Constraint Type</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.views.properties.environment.impl.ConstraintTypeImpl <em>Constraint Type</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.properties.environment.impl.ConstraintTypeImpl
-		 * @see org.eclipse.papyrus.properties.environment.impl.EnvironmentPackageImpl#getConstraintType()
+		 * @see org.eclipse.papyrus.views.properties.environment.impl.ConstraintTypeImpl
+		 * @see org.eclipse.papyrus.views.properties.environment.impl.EnvironmentPackageImpl#getConstraintType()
 		 * @generated
 		 */
 		EClass CONSTRAINT_TYPE = eINSTANCE.getConstraintType();
@@ -1157,11 +1157,11 @@ public interface EnvironmentPackage extends EPackage {
 		EAttribute CONSTRAINT_TYPE__CONSTRAINT_CLASS = eINSTANCE.getConstraintType_ConstraintClass();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.properties.environment.impl.ModelElementFactoryDescriptorImpl <em>Model Element Factory Descriptor</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.views.properties.environment.impl.ModelElementFactoryDescriptorImpl <em>Model Element Factory Descriptor</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.properties.environment.impl.ModelElementFactoryDescriptorImpl
-		 * @see org.eclipse.papyrus.properties.environment.impl.EnvironmentPackageImpl#getModelElementFactoryDescriptor()
+		 * @see org.eclipse.papyrus.views.properties.environment.impl.ModelElementFactoryDescriptorImpl
+		 * @see org.eclipse.papyrus.views.properties.environment.impl.EnvironmentPackageImpl#getModelElementFactoryDescriptor()
 		 * @generated
 		 */
 		EClass MODEL_ELEMENT_FACTORY_DESCRIPTOR = eINSTANCE.getModelElementFactoryDescriptor();
@@ -1183,21 +1183,21 @@ public interface EnvironmentPackage extends EPackage {
 		EAttribute MODEL_ELEMENT_FACTORY_DESCRIPTOR__FACTORY_CLASS = eINSTANCE.getModelElementFactoryDescriptor_FactoryClass();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.properties.environment.impl.StandardWidgetTypeImpl <em>Standard Widget Type</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.views.properties.environment.impl.StandardWidgetTypeImpl <em>Standard Widget Type</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.properties.environment.impl.StandardWidgetTypeImpl
-		 * @see org.eclipse.papyrus.properties.environment.impl.EnvironmentPackageImpl#getStandardWidgetType()
+		 * @see org.eclipse.papyrus.views.properties.environment.impl.StandardWidgetTypeImpl
+		 * @see org.eclipse.papyrus.views.properties.environment.impl.EnvironmentPackageImpl#getStandardWidgetType()
 		 * @generated
 		 */
 		EClass STANDARD_WIDGET_TYPE = eINSTANCE.getStandardWidgetType();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.properties.environment.impl.NamespaceImpl <em>Namespace</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.views.properties.environment.impl.NamespaceImpl <em>Namespace</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.properties.environment.impl.NamespaceImpl
-		 * @see org.eclipse.papyrus.properties.environment.impl.EnvironmentPackageImpl#getNamespace()
+		 * @see org.eclipse.papyrus.views.properties.environment.impl.NamespaceImpl
+		 * @see org.eclipse.papyrus.views.properties.environment.impl.EnvironmentPackageImpl#getNamespace()
 		 * @generated
 		 */
 		EClass NAMESPACE = eINSTANCE.getNamespace();
@@ -1227,11 +1227,11 @@ public interface EnvironmentPackage extends EPackage {
 		EAttribute NAMESPACE__VALUE = eINSTANCE.getNamespace_Value();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.properties.environment.impl.MiscClassImpl <em>Misc Class</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.views.properties.environment.impl.MiscClassImpl <em>Misc Class</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.properties.environment.impl.MiscClassImpl
-		 * @see org.eclipse.papyrus.properties.environment.impl.EnvironmentPackageImpl#getMiscClass()
+		 * @see org.eclipse.papyrus.views.properties.environment.impl.MiscClassImpl
+		 * @see org.eclipse.papyrus.views.properties.environment.impl.EnvironmentPackageImpl#getMiscClass()
 		 * @generated
 		 */
 		EClass MISC_CLASS = eINSTANCE.getMiscClass();
@@ -1261,11 +1261,11 @@ public interface EnvironmentPackage extends EPackage {
 		EReference MISC_CLASS__NAMESPACE = eINSTANCE.getMiscClass_Namespace();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.properties.environment.Type <em>Type</em>}' enum.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.views.properties.environment.Type <em>Type</em>}' enum.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.properties.environment.Type
-		 * @see org.eclipse.papyrus.properties.environment.impl.EnvironmentPackageImpl#getType()
+		 * @see org.eclipse.papyrus.views.properties.environment.Type
+		 * @see org.eclipse.papyrus.views.properties.environment.impl.EnvironmentPackageImpl#getType()
 		 * @generated
 		 */
 		EEnum TYPE = eINSTANCE.getType();
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/environment/LayoutType.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/environment/LayoutType.java
index 478072dab10..5f7762f75e3 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/environment/LayoutType.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/environment/LayoutType.java
@@ -9,7 +9,7 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.environment;
+package org.eclipse.papyrus.views.properties.environment;
 
 import org.eclipse.emf.ecore.EObject;
 
@@ -19,7 +19,7 @@ import org.eclipse.emf.ecore.EObject;
  * <!-- end-user-doc -->
  *
  *
- * @see org.eclipse.papyrus.properties.environment.EnvironmentPackage#getLayoutType()
+ * @see org.eclipse.papyrus.views.properties.environment.EnvironmentPackage#getLayoutType()
  * @model
  * @generated
  */
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/environment/MiscClass.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/environment/MiscClass.java
index c6d4312eb46..6928b411a0b 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/environment/MiscClass.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/environment/MiscClass.java
@@ -9,7 +9,7 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.environment;
+package org.eclipse.papyrus.views.properties.environment;
 
 import org.eclipse.emf.ecore.EObject;
 
@@ -21,13 +21,13 @@ import org.eclipse.emf.ecore.EObject;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.properties.environment.MiscClass#getLabel <em>Label</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.environment.MiscClass#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.environment.MiscClass#getNamespace <em>Namespace</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.environment.MiscClass#getLabel <em>Label</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.environment.MiscClass#getClass_ <em>Class</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.environment.MiscClass#getNamespace <em>Namespace</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.papyrus.properties.environment.EnvironmentPackage#getMiscClass()
+ * @see org.eclipse.papyrus.views.properties.environment.EnvironmentPackage#getMiscClass()
  * @model
  * @generated
  */
@@ -42,14 +42,14 @@ public interface MiscClass extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Label</em>' attribute.
 	 * @see #setLabel(String)
-	 * @see org.eclipse.papyrus.properties.environment.EnvironmentPackage#getMiscClass_Label()
+	 * @see org.eclipse.papyrus.views.properties.environment.EnvironmentPackage#getMiscClass_Label()
 	 * @model
 	 * @generated
 	 */
 	String getLabel();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.properties.environment.MiscClass#getLabel <em>Label</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.views.properties.environment.MiscClass#getLabel <em>Label</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Label</em>' attribute.
@@ -68,14 +68,14 @@ public interface MiscClass extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Class</em>' attribute.
 	 * @see #setClass(String)
-	 * @see org.eclipse.papyrus.properties.environment.EnvironmentPackage#getMiscClass_Class()
+	 * @see org.eclipse.papyrus.views.properties.environment.EnvironmentPackage#getMiscClass_Class()
 	 * @model required="true"
 	 * @generated
 	 */
 	String getClass_();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.properties.environment.MiscClass#getClass_ <em>Class</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.views.properties.environment.MiscClass#getClass_ <em>Class</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Class</em>' attribute.
@@ -94,14 +94,14 @@ public interface MiscClass extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Namespace</em>' reference.
 	 * @see #setNamespace(Namespace)
-	 * @see org.eclipse.papyrus.properties.environment.EnvironmentPackage#getMiscClass_Namespace()
+	 * @see org.eclipse.papyrus.views.properties.environment.EnvironmentPackage#getMiscClass_Namespace()
 	 * @model
 	 * @generated
 	 */
 	Namespace getNamespace();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.properties.environment.MiscClass#getNamespace <em>Namespace</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.views.properties.environment.MiscClass#getNamespace <em>Namespace</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Namespace</em>' reference.
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/environment/ModelElementFactoryDescriptor.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/environment/ModelElementFactoryDescriptor.java
index db81e701413..cabcaa5d0c2 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/environment/ModelElementFactoryDescriptor.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/environment/ModelElementFactoryDescriptor.java
@@ -9,7 +9,7 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.environment;
+package org.eclipse.papyrus.views.properties.environment;
 
 import org.eclipse.emf.ecore.EObject;
 
@@ -21,12 +21,12 @@ import org.eclipse.emf.ecore.EObject;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.properties.environment.ModelElementFactoryDescriptor#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.environment.ModelElementFactoryDescriptor#getFactoryClass <em>Factory Class</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.environment.ModelElementFactoryDescriptor#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.environment.ModelElementFactoryDescriptor#getFactoryClass <em>Factory Class</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.papyrus.properties.environment.EnvironmentPackage#getModelElementFactoryDescriptor()
+ * @see org.eclipse.papyrus.views.properties.environment.EnvironmentPackage#getModelElementFactoryDescriptor()
  * @model
  * @generated
  */
@@ -41,14 +41,14 @@ public interface ModelElementFactoryDescriptor extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Name</em>' attribute.
 	 * @see #setName(String)
-	 * @see org.eclipse.papyrus.properties.environment.EnvironmentPackage#getModelElementFactoryDescriptor_Name()
+	 * @see org.eclipse.papyrus.views.properties.environment.EnvironmentPackage#getModelElementFactoryDescriptor_Name()
 	 * @model required="true"
 	 * @generated
 	 */
 	String getName();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.properties.environment.ModelElementFactoryDescriptor#getName <em>Name</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.views.properties.environment.ModelElementFactoryDescriptor#getName <em>Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Name</em>' attribute.
@@ -67,14 +67,14 @@ public interface ModelElementFactoryDescriptor extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Factory Class</em>' attribute.
 	 * @see #setFactoryClass(String)
-	 * @see org.eclipse.papyrus.properties.environment.EnvironmentPackage#getModelElementFactoryDescriptor_FactoryClass()
+	 * @see org.eclipse.papyrus.views.properties.environment.EnvironmentPackage#getModelElementFactoryDescriptor_FactoryClass()
 	 * @model required="true"
 	 * @generated
 	 */
 	String getFactoryClass();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.properties.environment.ModelElementFactoryDescriptor#getFactoryClass <em>Factory Class</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.views.properties.environment.ModelElementFactoryDescriptor#getFactoryClass <em>Factory Class</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Factory Class</em>' attribute.
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/environment/Namespace.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/environment/Namespace.java
index cd1cfa34204..07c5f5ac5f2 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/environment/Namespace.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/environment/Namespace.java
@@ -9,7 +9,7 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.environment;
+package org.eclipse.papyrus.views.properties.environment;
 
 import org.eclipse.emf.ecore.EObject;
 
@@ -21,13 +21,13 @@ import org.eclipse.emf.ecore.EObject;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.properties.environment.Namespace#getPrefix <em>Prefix</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.environment.Namespace#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.environment.Namespace#getValue <em>Value</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.environment.Namespace#getPrefix <em>Prefix</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.environment.Namespace#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.environment.Namespace#getValue <em>Value</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.papyrus.properties.environment.EnvironmentPackage#getNamespace()
+ * @see org.eclipse.papyrus.views.properties.environment.EnvironmentPackage#getNamespace()
  * @model
  * @generated
  */
@@ -42,14 +42,14 @@ public interface Namespace extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Prefix</em>' attribute.
 	 * @see #setPrefix(String)
-	 * @see org.eclipse.papyrus.properties.environment.EnvironmentPackage#getNamespace_Prefix()
+	 * @see org.eclipse.papyrus.views.properties.environment.EnvironmentPackage#getNamespace_Prefix()
 	 * @model
 	 * @generated
 	 */
 	String getPrefix();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.properties.environment.Namespace#getPrefix <em>Prefix</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.views.properties.environment.Namespace#getPrefix <em>Prefix</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Prefix</em>' attribute.
@@ -68,14 +68,14 @@ public interface Namespace extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Name</em>' attribute.
 	 * @see #setName(String)
-	 * @see org.eclipse.papyrus.properties.environment.EnvironmentPackage#getNamespace_Name()
+	 * @see org.eclipse.papyrus.views.properties.environment.EnvironmentPackage#getNamespace_Name()
 	 * @model
 	 * @generated
 	 */
 	String getName();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.properties.environment.Namespace#getName <em>Name</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.views.properties.environment.Namespace#getName <em>Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Name</em>' attribute.
@@ -94,14 +94,14 @@ public interface Namespace extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Value</em>' attribute.
 	 * @see #setValue(String)
-	 * @see org.eclipse.papyrus.properties.environment.EnvironmentPackage#getNamespace_Value()
+	 * @see org.eclipse.papyrus.views.properties.environment.EnvironmentPackage#getNamespace_Value()
 	 * @model required="true"
 	 * @generated
 	 */
 	String getValue();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.properties.environment.Namespace#getValue <em>Value</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.views.properties.environment.Namespace#getValue <em>Value</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Value</em>' attribute.
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/environment/PropertyEditorType.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/environment/PropertyEditorType.java
index 00bc86b3556..b6a7f8b719a 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/environment/PropertyEditorType.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/environment/PropertyEditorType.java
@@ -9,7 +9,7 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.environment;
+package org.eclipse.papyrus.views.properties.environment;
 
 
 /**
@@ -20,19 +20,19 @@ package org.eclipse.papyrus.properties.environment;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.properties.environment.PropertyEditorType#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.environment.PropertyEditorType#getMultiplicity <em>Multiplicity</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.environment.PropertyEditorType#getType <em>Type</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.environment.PropertyEditorType#getMultiplicity <em>Multiplicity</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.papyrus.properties.environment.EnvironmentPackage#getPropertyEditorType()
+ * @see org.eclipse.papyrus.views.properties.environment.EnvironmentPackage#getPropertyEditorType()
  * @model
  * @generated
  */
 public interface PropertyEditorType extends WidgetType {
 	/**
 	 * Returns the value of the '<em><b>Type</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.papyrus.properties.environment.Type}.
+	 * The literals are from the enumeration {@link org.eclipse.papyrus.views.properties.environment.Type}.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Type</em>' attribute isn't clear,
@@ -40,20 +40,20 @@ public interface PropertyEditorType extends WidgetType {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Type</em>' attribute.
-	 * @see org.eclipse.papyrus.properties.environment.Type
+	 * @see org.eclipse.papyrus.views.properties.environment.Type
 	 * @see #setType(Type)
-	 * @see org.eclipse.papyrus.properties.environment.EnvironmentPackage#getPropertyEditorType_Type()
+	 * @see org.eclipse.papyrus.views.properties.environment.EnvironmentPackage#getPropertyEditorType_Type()
 	 * @model required="true"
 	 * @generated
 	 */
 	Type getType();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.properties.environment.PropertyEditorType#getType <em>Type</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.views.properties.environment.PropertyEditorType#getType <em>Type</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Type</em>' attribute.
-	 * @see org.eclipse.papyrus.properties.environment.Type
+	 * @see org.eclipse.papyrus.views.properties.environment.Type
 	 * @see #getType()
 	 * @generated
 	 */
@@ -70,14 +70,14 @@ public interface PropertyEditorType extends WidgetType {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Multiplicity</em>' attribute.
 	 * @see #setMultiplicity(int)
-	 * @see org.eclipse.papyrus.properties.environment.EnvironmentPackage#getPropertyEditorType_Multiplicity()
+	 * @see org.eclipse.papyrus.views.properties.environment.EnvironmentPackage#getPropertyEditorType_Multiplicity()
 	 * @model default="1" required="true"
 	 * @generated
 	 */
 	int getMultiplicity();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.properties.environment.PropertyEditorType#getMultiplicity <em>Multiplicity</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.views.properties.environment.PropertyEditorType#getMultiplicity <em>Multiplicity</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Multiplicity</em>' attribute.
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/environment/StandardWidgetType.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/environment/StandardWidgetType.java
index 159c1cc9293..fb0dd1449df 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/environment/StandardWidgetType.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/environment/StandardWidgetType.java
@@ -9,7 +9,7 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.environment;
+package org.eclipse.papyrus.views.properties.environment;
 
 
 /**
@@ -18,7 +18,7 @@ package org.eclipse.papyrus.properties.environment;
  * <!-- end-user-doc -->
  *
  *
- * @see org.eclipse.papyrus.properties.environment.EnvironmentPackage#getStandardWidgetType()
+ * @see org.eclipse.papyrus.views.properties.environment.EnvironmentPackage#getStandardWidgetType()
  * @model
  * @generated
  */
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/environment/Type.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/environment/Type.java
index fb9788e36a2..aeffb49a7c4 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/environment/Type.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/environment/Type.java
@@ -9,7 +9,7 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.environment;
+package org.eclipse.papyrus.views.properties.environment;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -22,7 +22,7 @@ import org.eclipse.emf.common.util.Enumerator;
  * A representation of the literals of the enumeration '<em><b>Type</b></em>',
  * and utility methods for working with them.
  * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.properties.environment.EnvironmentPackage#getType()
+ * @see org.eclipse.papyrus.views.properties.environment.EnvironmentPackage#getType()
  * @model
  * @generated
  */
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/environment/WidgetType.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/environment/WidgetType.java
index d28f359394d..bca73c1e0ea 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/environment/WidgetType.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/environment/WidgetType.java
@@ -9,7 +9,7 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.environment;
+package org.eclipse.papyrus.views.properties.environment;
 
 import org.eclipse.emf.ecore.EObject;
 
@@ -21,13 +21,13 @@ import org.eclipse.emf.ecore.EObject;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.properties.environment.WidgetType#getLabel <em>Label</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.environment.WidgetType#getWidgetClass <em>Widget Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.environment.WidgetType#getNamespace <em>Namespace</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.environment.WidgetType#getLabel <em>Label</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.environment.WidgetType#getWidgetClass <em>Widget Class</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.environment.WidgetType#getNamespace <em>Namespace</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.papyrus.properties.environment.EnvironmentPackage#getWidgetType()
+ * @see org.eclipse.papyrus.views.properties.environment.EnvironmentPackage#getWidgetType()
  * @model abstract="true"
  * @generated
  */
@@ -42,14 +42,14 @@ public interface WidgetType extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Label</em>' attribute.
 	 * @see #setLabel(String)
-	 * @see org.eclipse.papyrus.properties.environment.EnvironmentPackage#getWidgetType_Label()
+	 * @see org.eclipse.papyrus.views.properties.environment.EnvironmentPackage#getWidgetType_Label()
 	 * @model required="true"
 	 * @generated
 	 */
 	String getLabel();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.properties.environment.WidgetType#getLabel <em>Label</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.views.properties.environment.WidgetType#getLabel <em>Label</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Label</em>' attribute.
@@ -68,14 +68,14 @@ public interface WidgetType extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Widget Class</em>' attribute.
 	 * @see #setWidgetClass(String)
-	 * @see org.eclipse.papyrus.properties.environment.EnvironmentPackage#getWidgetType_WidgetClass()
+	 * @see org.eclipse.papyrus.views.properties.environment.EnvironmentPackage#getWidgetType_WidgetClass()
 	 * @model required="true"
 	 * @generated
 	 */
 	String getWidgetClass();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.properties.environment.WidgetType#getWidgetClass <em>Widget Class</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.views.properties.environment.WidgetType#getWidgetClass <em>Widget Class</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Widget Class</em>' attribute.
@@ -94,14 +94,14 @@ public interface WidgetType extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Namespace</em>' reference.
 	 * @see #setNamespace(Namespace)
-	 * @see org.eclipse.papyrus.properties.environment.EnvironmentPackage#getWidgetType_Namespace()
+	 * @see org.eclipse.papyrus.views.properties.environment.EnvironmentPackage#getWidgetType_Namespace()
 	 * @model
 	 * @generated
 	 */
 	Namespace getNamespace();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.properties.environment.WidgetType#getNamespace <em>Namespace</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.views.properties.environment.WidgetType#getNamespace <em>Namespace</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Namespace</em>' reference.
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/environment/impl/CompositeWidgetTypeImpl.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/environment/impl/CompositeWidgetTypeImpl.java
index bd24906466d..d4ec846b60e 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/environment/impl/CompositeWidgetTypeImpl.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/environment/impl/CompositeWidgetTypeImpl.java
@@ -9,12 +9,12 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.environment.impl;
+package org.eclipse.papyrus.views.properties.environment.impl;
 
 import org.eclipse.emf.ecore.EClass;
 
-import org.eclipse.papyrus.properties.environment.CompositeWidgetType;
-import org.eclipse.papyrus.properties.environment.EnvironmentPackage;
+import org.eclipse.papyrus.views.properties.environment.CompositeWidgetType;
+import org.eclipse.papyrus.views.properties.environment.EnvironmentPackage;
 
 /**
  * <!-- begin-user-doc -->
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/environment/impl/ConstraintTypeImpl.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/environment/impl/ConstraintTypeImpl.java
index 8921804e3a9..b22a61773bb 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/environment/impl/ConstraintTypeImpl.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/environment/impl/ConstraintTypeImpl.java
@@ -9,14 +9,14 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.environment.impl;
+package org.eclipse.papyrus.views.properties.environment.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.papyrus.properties.environment.ConstraintType;
-import org.eclipse.papyrus.properties.environment.EnvironmentPackage;
+import org.eclipse.papyrus.views.properties.environment.ConstraintType;
+import org.eclipse.papyrus.views.properties.environment.EnvironmentPackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -25,8 +25,8 @@ import org.eclipse.papyrus.properties.environment.EnvironmentPackage;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.properties.environment.impl.ConstraintTypeImpl#getLabel <em>Label</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.environment.impl.ConstraintTypeImpl#getConstraintClass <em>Constraint Class</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.environment.impl.ConstraintTypeImpl#getLabel <em>Label</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.environment.impl.ConstraintTypeImpl#getConstraintClass <em>Constraint Class</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/environment/impl/EnvironmentFactoryImpl.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/environment/impl/EnvironmentFactoryImpl.java
index 52235e4fbfb..eab3e10bcd3 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/environment/impl/EnvironmentFactoryImpl.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/environment/impl/EnvironmentFactoryImpl.java
@@ -9,7 +9,7 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.environment.impl;
+package org.eclipse.papyrus.views.properties.environment.impl;
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EDataType;
@@ -20,7 +20,7 @@ import org.eclipse.emf.ecore.impl.EFactoryImpl;
 
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
 
-import org.eclipse.papyrus.properties.environment.*;
+import org.eclipse.papyrus.views.properties.environment.*;
 
 /**
  * <!-- begin-user-doc -->
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/environment/impl/EnvironmentImpl.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/environment/impl/EnvironmentImpl.java
index 37a4c7178ed..c4c64e151aa 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/environment/impl/EnvironmentImpl.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/environment/impl/EnvironmentImpl.java
@@ -9,7 +9,7 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.environment.impl;
+package org.eclipse.papyrus.views.properties.environment.impl;
 
 import java.util.Collection;
 
@@ -27,18 +27,18 @@ import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.EObjectResolvingEList;
 import org.eclipse.emf.ecore.util.InternalEList;
 
-import org.eclipse.papyrus.properties.contexts.Context;
 
-import org.eclipse.papyrus.properties.environment.CompositeWidgetType;
-import org.eclipse.papyrus.properties.environment.ConstraintType;
-import org.eclipse.papyrus.properties.environment.Environment;
-import org.eclipse.papyrus.properties.environment.EnvironmentPackage;
-import org.eclipse.papyrus.properties.environment.LayoutType;
-import org.eclipse.papyrus.properties.environment.MiscClass;
-import org.eclipse.papyrus.properties.environment.ModelElementFactoryDescriptor;
-import org.eclipse.papyrus.properties.environment.Namespace;
-import org.eclipse.papyrus.properties.environment.PropertyEditorType;
-import org.eclipse.papyrus.properties.environment.StandardWidgetType;
+import org.eclipse.papyrus.views.properties.contexts.Context;
+import org.eclipse.papyrus.views.properties.environment.CompositeWidgetType;
+import org.eclipse.papyrus.views.properties.environment.ConstraintType;
+import org.eclipse.papyrus.views.properties.environment.Environment;
+import org.eclipse.papyrus.views.properties.environment.EnvironmentPackage;
+import org.eclipse.papyrus.views.properties.environment.LayoutType;
+import org.eclipse.papyrus.views.properties.environment.MiscClass;
+import org.eclipse.papyrus.views.properties.environment.ModelElementFactoryDescriptor;
+import org.eclipse.papyrus.views.properties.environment.Namespace;
+import org.eclipse.papyrus.views.properties.environment.PropertyEditorType;
+import org.eclipse.papyrus.views.properties.environment.StandardWidgetType;
 
 /**
  * <!-- begin-user-doc -->
@@ -47,14 +47,14 @@ import org.eclipse.papyrus.properties.environment.StandardWidgetType;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.properties.environment.impl.EnvironmentImpl#getModelElementFactories <em>Model Element Factories</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.environment.impl.EnvironmentImpl#getConstraintTypes <em>Constraint Types</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.environment.impl.EnvironmentImpl#getWidgetTypes <em>Widget Types</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.environment.impl.EnvironmentImpl#getPropertyEditorTypes <em>Property Editor Types</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.environment.impl.EnvironmentImpl#getCompositeWidgetTypes <em>Composite Widget Types</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.environment.impl.EnvironmentImpl#getLayoutTypes <em>Layout Types</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.environment.impl.EnvironmentImpl#getNamespaces <em>Namespaces</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.environment.impl.EnvironmentImpl#getMiscClasses <em>Misc Classes</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.environment.impl.EnvironmentImpl#getModelElementFactories <em>Model Element Factories</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.environment.impl.EnvironmentImpl#getConstraintTypes <em>Constraint Types</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.environment.impl.EnvironmentImpl#getWidgetTypes <em>Widget Types</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.environment.impl.EnvironmentImpl#getPropertyEditorTypes <em>Property Editor Types</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.environment.impl.EnvironmentImpl#getCompositeWidgetTypes <em>Composite Widget Types</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.environment.impl.EnvironmentImpl#getLayoutTypes <em>Layout Types</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.environment.impl.EnvironmentImpl#getNamespaces <em>Namespaces</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.environment.impl.EnvironmentImpl#getMiscClasses <em>Misc Classes</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/environment/impl/EnvironmentPackageImpl.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/environment/impl/EnvironmentPackageImpl.java
index 404df03eb77..c0efd1ff5fe 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/environment/impl/EnvironmentPackageImpl.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/environment/impl/EnvironmentPackageImpl.java
@@ -9,7 +9,7 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.environment.impl;
+package org.eclipse.papyrus.views.properties.environment.impl;
 
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
@@ -20,28 +20,28 @@ import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.ecore.EcorePackage;
 import org.eclipse.emf.ecore.impl.EPackageImpl;
 
-import org.eclipse.papyrus.properties.contexts.ContextsPackage;
 
-import org.eclipse.papyrus.properties.contexts.impl.ContextsPackageImpl;
 
-import org.eclipse.papyrus.properties.environment.CompositeWidgetType;
-import org.eclipse.papyrus.properties.environment.ConstraintType;
-import org.eclipse.papyrus.properties.environment.ContentProviderType;
-import org.eclipse.papyrus.properties.environment.Environment;
-import org.eclipse.papyrus.properties.environment.EnvironmentFactory;
-import org.eclipse.papyrus.properties.environment.EnvironmentPackage;
-import org.eclipse.papyrus.properties.environment.LayoutType;
-import org.eclipse.papyrus.properties.environment.MiscClass;
-import org.eclipse.papyrus.properties.environment.ModelElementFactoryDescriptor;
-import org.eclipse.papyrus.properties.environment.Namespace;
-import org.eclipse.papyrus.properties.environment.PropertyEditorType;
-import org.eclipse.papyrus.properties.environment.StandardWidgetType;
-import org.eclipse.papyrus.properties.environment.Type;
-import org.eclipse.papyrus.properties.environment.WidgetType;
 
-import org.eclipse.papyrus.properties.ui.UiPackage;
 
-import org.eclipse.papyrus.properties.ui.impl.UiPackageImpl;
+import org.eclipse.papyrus.views.properties.contexts.ContextsPackage;
+import org.eclipse.papyrus.views.properties.contexts.impl.ContextsPackageImpl;
+import org.eclipse.papyrus.views.properties.environment.CompositeWidgetType;
+import org.eclipse.papyrus.views.properties.environment.ConstraintType;
+import org.eclipse.papyrus.views.properties.environment.ContentProviderType;
+import org.eclipse.papyrus.views.properties.environment.Environment;
+import org.eclipse.papyrus.views.properties.environment.EnvironmentFactory;
+import org.eclipse.papyrus.views.properties.environment.EnvironmentPackage;
+import org.eclipse.papyrus.views.properties.environment.LayoutType;
+import org.eclipse.papyrus.views.properties.environment.MiscClass;
+import org.eclipse.papyrus.views.properties.environment.ModelElementFactoryDescriptor;
+import org.eclipse.papyrus.views.properties.environment.Namespace;
+import org.eclipse.papyrus.views.properties.environment.PropertyEditorType;
+import org.eclipse.papyrus.views.properties.environment.StandardWidgetType;
+import org.eclipse.papyrus.views.properties.environment.Type;
+import org.eclipse.papyrus.views.properties.environment.WidgetType;
+import org.eclipse.papyrus.views.properties.ui.UiPackage;
+import org.eclipse.papyrus.views.properties.ui.impl.UiPackageImpl;
 
 /**
  * <!-- begin-user-doc -->
@@ -138,7 +138,7 @@ public class EnvironmentPackageImpl extends EPackageImpl implements EnvironmentP
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.eclipse.papyrus.properties.environment.EnvironmentPackage#eNS_URI
+	 * @see org.eclipse.papyrus.views.properties.environment.EnvironmentPackage#eNS_URI
 	 * @see #init()
 	 * @generated
 	 */
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/environment/impl/LayoutTypeImpl.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/environment/impl/LayoutTypeImpl.java
index 9d92364c203..3ab95e377e9 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/environment/impl/LayoutTypeImpl.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/environment/impl/LayoutTypeImpl.java
@@ -9,7 +9,7 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.environment.impl;
+package org.eclipse.papyrus.views.properties.environment.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -18,8 +18,8 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
 
-import org.eclipse.papyrus.properties.environment.EnvironmentPackage;
-import org.eclipse.papyrus.properties.environment.LayoutType;
+import org.eclipse.papyrus.views.properties.environment.EnvironmentPackage;
+import org.eclipse.papyrus.views.properties.environment.LayoutType;
 
 /**
  * <!-- begin-user-doc -->
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/environment/impl/MiscClassImpl.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/environment/impl/MiscClassImpl.java
index 7666514e050..5fb6ddb1f74 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/environment/impl/MiscClassImpl.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/environment/impl/MiscClassImpl.java
@@ -9,7 +9,7 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.environment.impl;
+package org.eclipse.papyrus.views.properties.environment.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -19,9 +19,9 @@ import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
 
-import org.eclipse.papyrus.properties.environment.EnvironmentPackage;
-import org.eclipse.papyrus.properties.environment.MiscClass;
-import org.eclipse.papyrus.properties.environment.Namespace;
+import org.eclipse.papyrus.views.properties.environment.EnvironmentPackage;
+import org.eclipse.papyrus.views.properties.environment.MiscClass;
+import org.eclipse.papyrus.views.properties.environment.Namespace;
 
 /**
  * <!-- begin-user-doc -->
@@ -30,9 +30,9 @@ import org.eclipse.papyrus.properties.environment.Namespace;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.properties.environment.impl.MiscClassImpl#getLabel <em>Label</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.environment.impl.MiscClassImpl#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.environment.impl.MiscClassImpl#getNamespace <em>Namespace</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.environment.impl.MiscClassImpl#getLabel <em>Label</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.environment.impl.MiscClassImpl#getClass_ <em>Class</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.environment.impl.MiscClassImpl#getNamespace <em>Namespace</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/environment/impl/ModelElementFactoryDescriptorImpl.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/environment/impl/ModelElementFactoryDescriptorImpl.java
index 9850903c3b0..18881f45825 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/environment/impl/ModelElementFactoryDescriptorImpl.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/environment/impl/ModelElementFactoryDescriptorImpl.java
@@ -9,7 +9,7 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.environment.impl;
+package org.eclipse.papyrus.views.properties.environment.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -18,8 +18,8 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
 
-import org.eclipse.papyrus.properties.environment.EnvironmentPackage;
-import org.eclipse.papyrus.properties.environment.ModelElementFactoryDescriptor;
+import org.eclipse.papyrus.views.properties.environment.EnvironmentPackage;
+import org.eclipse.papyrus.views.properties.environment.ModelElementFactoryDescriptor;
 
 /**
  * <!-- begin-user-doc -->
@@ -28,8 +28,8 @@ import org.eclipse.papyrus.properties.environment.ModelElementFactoryDescriptor;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.properties.environment.impl.ModelElementFactoryDescriptorImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.environment.impl.ModelElementFactoryDescriptorImpl#getFactoryClass <em>Factory Class</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.environment.impl.ModelElementFactoryDescriptorImpl#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.environment.impl.ModelElementFactoryDescriptorImpl#getFactoryClass <em>Factory Class</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/environment/impl/NamespaceImpl.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/environment/impl/NamespaceImpl.java
index 5ec5337210d..1a0d7e4a728 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/environment/impl/NamespaceImpl.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/environment/impl/NamespaceImpl.java
@@ -9,7 +9,7 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.environment.impl;
+package org.eclipse.papyrus.views.properties.environment.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -18,8 +18,8 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
 
-import org.eclipse.papyrus.properties.environment.EnvironmentPackage;
-import org.eclipse.papyrus.properties.environment.Namespace;
+import org.eclipse.papyrus.views.properties.environment.EnvironmentPackage;
+import org.eclipse.papyrus.views.properties.environment.Namespace;
 
 /**
  * <!-- begin-user-doc -->
@@ -28,9 +28,9 @@ import org.eclipse.papyrus.properties.environment.Namespace;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.properties.environment.impl.NamespaceImpl#getPrefix <em>Prefix</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.environment.impl.NamespaceImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.environment.impl.NamespaceImpl#getValue <em>Value</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.environment.impl.NamespaceImpl#getPrefix <em>Prefix</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.environment.impl.NamespaceImpl#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.environment.impl.NamespaceImpl#getValue <em>Value</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/environment/impl/PropertyEditorTypeImpl.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/environment/impl/PropertyEditorTypeImpl.java
index 70935e1812b..03093e32a4c 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/environment/impl/PropertyEditorTypeImpl.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/environment/impl/PropertyEditorTypeImpl.java
@@ -9,7 +9,7 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.environment.impl;
+package org.eclipse.papyrus.views.properties.environment.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -17,9 +17,9 @@ import org.eclipse.emf.ecore.EClass;
 
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 
-import org.eclipse.papyrus.properties.environment.EnvironmentPackage;
-import org.eclipse.papyrus.properties.environment.PropertyEditorType;
-import org.eclipse.papyrus.properties.environment.Type;
+import org.eclipse.papyrus.views.properties.environment.EnvironmentPackage;
+import org.eclipse.papyrus.views.properties.environment.PropertyEditorType;
+import org.eclipse.papyrus.views.properties.environment.Type;
 
 /**
  * <!-- begin-user-doc -->
@@ -28,8 +28,8 @@ import org.eclipse.papyrus.properties.environment.Type;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.properties.environment.impl.PropertyEditorTypeImpl#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.environment.impl.PropertyEditorTypeImpl#getMultiplicity <em>Multiplicity</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.environment.impl.PropertyEditorTypeImpl#getType <em>Type</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.environment.impl.PropertyEditorTypeImpl#getMultiplicity <em>Multiplicity</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/environment/impl/StandardWidgetTypeImpl.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/environment/impl/StandardWidgetTypeImpl.java
index 6de74f99569..e9ab238da7e 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/environment/impl/StandardWidgetTypeImpl.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/environment/impl/StandardWidgetTypeImpl.java
@@ -9,12 +9,12 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.environment.impl;
+package org.eclipse.papyrus.views.properties.environment.impl;
 
 import org.eclipse.emf.ecore.EClass;
 
-import org.eclipse.papyrus.properties.environment.EnvironmentPackage;
-import org.eclipse.papyrus.properties.environment.StandardWidgetType;
+import org.eclipse.papyrus.views.properties.environment.EnvironmentPackage;
+import org.eclipse.papyrus.views.properties.environment.StandardWidgetType;
 
 /**
  * <!-- begin-user-doc -->
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/environment/impl/WidgetTypeImpl.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/environment/impl/WidgetTypeImpl.java
index 6adb8bff95c..768b517f3a8 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/environment/impl/WidgetTypeImpl.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/environment/impl/WidgetTypeImpl.java
@@ -9,7 +9,7 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.environment.impl;
+package org.eclipse.papyrus.views.properties.environment.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -19,9 +19,9 @@ import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
 
-import org.eclipse.papyrus.properties.environment.EnvironmentPackage;
-import org.eclipse.papyrus.properties.environment.Namespace;
-import org.eclipse.papyrus.properties.environment.WidgetType;
+import org.eclipse.papyrus.views.properties.environment.EnvironmentPackage;
+import org.eclipse.papyrus.views.properties.environment.Namespace;
+import org.eclipse.papyrus.views.properties.environment.WidgetType;
 
 /**
  * <!-- begin-user-doc -->
@@ -30,9 +30,9 @@ import org.eclipse.papyrus.properties.environment.WidgetType;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.properties.environment.impl.WidgetTypeImpl#getLabel <em>Label</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.environment.impl.WidgetTypeImpl#getWidgetClass <em>Widget Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.environment.impl.WidgetTypeImpl#getNamespace <em>Namespace</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.environment.impl.WidgetTypeImpl#getLabel <em>Label</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.environment.impl.WidgetTypeImpl#getWidgetClass <em>Widget Class</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.environment.impl.WidgetTypeImpl#getNamespace <em>Namespace</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/environment/util/EnvironmentAdapterFactory.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/environment/util/EnvironmentAdapterFactory.java
index a27337f3673..dee9872b661 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/environment/util/EnvironmentAdapterFactory.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/environment/util/EnvironmentAdapterFactory.java
@@ -9,7 +9,7 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.environment.util;
+package org.eclipse.papyrus.views.properties.environment.util;
 
 import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.notify.Notifier;
@@ -19,14 +19,14 @@ import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
 import org.eclipse.emf.ecore.EModelElement;
 import org.eclipse.emf.ecore.EObject;
 
-import org.eclipse.papyrus.properties.environment.*;
+import org.eclipse.papyrus.views.properties.environment.*;
 
 /**
  * <!-- begin-user-doc -->
  * The <b>Adapter Factory</b> for the model.
  * It provides an adapter <code>createXXX</code> method for each class of the model.
  * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.properties.environment.EnvironmentPackage
+ * @see org.eclipse.papyrus.views.properties.environment.EnvironmentPackage
  * @generated
  */
 public class EnvironmentAdapterFactory extends AdapterFactoryImpl {
@@ -142,13 +142,13 @@ public class EnvironmentAdapterFactory extends AdapterFactoryImpl {
 
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.properties.environment.Environment <em>Environment</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.views.properties.environment.Environment <em>Environment</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.properties.environment.Environment
+	 * @see org.eclipse.papyrus.views.properties.environment.Environment
 	 * @generated
 	 */
 	public Adapter createEnvironmentAdapter() {
@@ -156,13 +156,13 @@ public class EnvironmentAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.properties.environment.PropertyEditorType <em>Property Editor Type</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.views.properties.environment.PropertyEditorType <em>Property Editor Type</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.properties.environment.PropertyEditorType
+	 * @see org.eclipse.papyrus.views.properties.environment.PropertyEditorType
 	 * @generated
 	 */
 	public Adapter createPropertyEditorTypeAdapter() {
@@ -170,13 +170,13 @@ public class EnvironmentAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.properties.environment.WidgetType <em>Widget Type</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.views.properties.environment.WidgetType <em>Widget Type</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.properties.environment.WidgetType
+	 * @see org.eclipse.papyrus.views.properties.environment.WidgetType
 	 * @generated
 	 */
 	public Adapter createWidgetTypeAdapter() {
@@ -184,13 +184,13 @@ public class EnvironmentAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.properties.environment.CompositeWidgetType <em>Composite Widget Type</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.views.properties.environment.CompositeWidgetType <em>Composite Widget Type</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.properties.environment.CompositeWidgetType
+	 * @see org.eclipse.papyrus.views.properties.environment.CompositeWidgetType
 	 * @generated
 	 */
 	public Adapter createCompositeWidgetTypeAdapter() {
@@ -198,13 +198,13 @@ public class EnvironmentAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.properties.environment.LayoutType <em>Layout Type</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.views.properties.environment.LayoutType <em>Layout Type</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.properties.environment.LayoutType
+	 * @see org.eclipse.papyrus.views.properties.environment.LayoutType
 	 * @generated
 	 */
 	public Adapter createLayoutTypeAdapter() {
@@ -212,13 +212,13 @@ public class EnvironmentAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.properties.environment.ConstraintType <em>Constraint Type</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.views.properties.environment.ConstraintType <em>Constraint Type</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.properties.environment.ConstraintType
+	 * @see org.eclipse.papyrus.views.properties.environment.ConstraintType
 	 * @generated
 	 */
 	public Adapter createConstraintTypeAdapter() {
@@ -226,13 +226,13 @@ public class EnvironmentAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.properties.environment.ModelElementFactoryDescriptor <em>Model Element Factory Descriptor</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.views.properties.environment.ModelElementFactoryDescriptor <em>Model Element Factory Descriptor</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.properties.environment.ModelElementFactoryDescriptor
+	 * @see org.eclipse.papyrus.views.properties.environment.ModelElementFactoryDescriptor
 	 * @generated
 	 */
 	public Adapter createModelElementFactoryDescriptorAdapter() {
@@ -240,13 +240,13 @@ public class EnvironmentAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.properties.environment.StandardWidgetType <em>Standard Widget Type</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.views.properties.environment.StandardWidgetType <em>Standard Widget Type</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.properties.environment.StandardWidgetType
+	 * @see org.eclipse.papyrus.views.properties.environment.StandardWidgetType
 	 * @generated
 	 */
 	public Adapter createStandardWidgetTypeAdapter() {
@@ -254,13 +254,13 @@ public class EnvironmentAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.properties.environment.Namespace <em>Namespace</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.views.properties.environment.Namespace <em>Namespace</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.properties.environment.Namespace
+	 * @see org.eclipse.papyrus.views.properties.environment.Namespace
 	 * @generated
 	 */
 	public Adapter createNamespaceAdapter() {
@@ -268,13 +268,13 @@ public class EnvironmentAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.properties.environment.MiscClass <em>Misc Class</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.views.properties.environment.MiscClass <em>Misc Class</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.properties.environment.MiscClass
+	 * @see org.eclipse.papyrus.views.properties.environment.MiscClass
 	 * @generated
 	 */
 	public Adapter createMiscClassAdapter() {
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/environment/util/EnvironmentSwitch.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/environment/util/EnvironmentSwitch.java
index ec2a5ae978f..bc65692bd30 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/environment/util/EnvironmentSwitch.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/environment/util/EnvironmentSwitch.java
@@ -9,7 +9,7 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.environment.util;
+package org.eclipse.papyrus.views.properties.environment.util;
 
 import org.eclipse.emf.ecore.EModelElement;
 import java.util.List;
@@ -19,7 +19,7 @@ import org.eclipse.emf.ecore.EObject;
 
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.util.Switch;
-import org.eclipse.papyrus.properties.environment.*;
+import org.eclipse.papyrus.views.properties.environment.*;
 
 /**
  * <!-- begin-user-doc -->
@@ -31,7 +31,7 @@ import org.eclipse.papyrus.properties.environment.*;
  * until a non-null result is returned,
  * which is the result of the switch.
  * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.properties.environment.EnvironmentPackage
+ * @see org.eclipse.papyrus.views.properties.environment.EnvironmentPackage
  * @generated
  */
 public class EnvironmentSwitch<T> extends Switch<T> {
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/ui/CompositeWidget.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/ui/CompositeWidget.java
index 1c3b42fc8c6..1d3b4be492c 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/ui/CompositeWidget.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/ui/CompositeWidget.java
@@ -9,11 +9,11 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.ui;
+package org.eclipse.papyrus.views.properties.ui;
 
 import org.eclipse.emf.common.util.EList;
 
-import org.eclipse.papyrus.properties.environment.CompositeWidgetType;
+import org.eclipse.papyrus.views.properties.environment.CompositeWidgetType;
 
 /**
  * <!-- begin-user-doc -->
@@ -23,13 +23,13 @@ import org.eclipse.papyrus.properties.environment.CompositeWidgetType;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.properties.ui.CompositeWidget#getLayout <em>Layout</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.ui.CompositeWidget#getWidgets <em>Widgets</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.ui.CompositeWidget#getWidgetType <em>Widget Type</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.ui.CompositeWidget#getLayout <em>Layout</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.ui.CompositeWidget#getWidgets <em>Widgets</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.ui.CompositeWidget#getWidgetType <em>Widget Type</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.papyrus.properties.ui.UiPackage#getCompositeWidget()
+ * @see org.eclipse.papyrus.views.properties.ui.UiPackage#getCompositeWidget()
  * @model
  * @generated
  */
@@ -44,14 +44,14 @@ public interface CompositeWidget extends Widget {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Layout</em>' containment reference.
 	 * @see #setLayout(Layout)
-	 * @see org.eclipse.papyrus.properties.ui.UiPackage#getCompositeWidget_Layout()
+	 * @see org.eclipse.papyrus.views.properties.ui.UiPackage#getCompositeWidget_Layout()
 	 * @model containment="true" required="true"
 	 * @generated
 	 */
 	Layout getLayout();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.properties.ui.CompositeWidget#getLayout <em>Layout</em>}' containment reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.views.properties.ui.CompositeWidget#getLayout <em>Layout</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Layout</em>' containment reference.
@@ -62,7 +62,7 @@ public interface CompositeWidget extends Widget {
 
 	/**
 	 * Returns the value of the '<em><b>Widgets</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.properties.ui.Widget}.
+	 * The list contents are of type {@link org.eclipse.papyrus.views.properties.ui.Widget}.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Widgets</em>' containment reference list isn't clear,
@@ -70,7 +70,7 @@ public interface CompositeWidget extends Widget {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Widgets</em>' containment reference list.
-	 * @see org.eclipse.papyrus.properties.ui.UiPackage#getCompositeWidget_Widgets()
+	 * @see org.eclipse.papyrus.views.properties.ui.UiPackage#getCompositeWidget_Widgets()
 	 * @model containment="true"
 	 * @generated
 	 */
@@ -86,14 +86,14 @@ public interface CompositeWidget extends Widget {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Widget Type</em>' reference.
 	 * @see #setWidgetType(CompositeWidgetType)
-	 * @see org.eclipse.papyrus.properties.ui.UiPackage#getCompositeWidget_WidgetType()
+	 * @see org.eclipse.papyrus.views.properties.ui.UiPackage#getCompositeWidget_WidgetType()
 	 * @model required="true"
 	 * @generated
 	 */
 	CompositeWidgetType getWidgetType();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.properties.ui.CompositeWidget#getWidgetType <em>Widget Type</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.views.properties.ui.CompositeWidget#getWidgetType <em>Widget Type</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Widget Type</em>' reference.
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/ui/Element.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/ui/Element.java
index fdd7819815d..a01ec13549a 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/ui/Element.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/ui/Element.java
@@ -9,7 +9,7 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.ui;
+package org.eclipse.papyrus.views.properties.ui;
 
 import org.eclipse.emf.ecore.EObject;
 
@@ -19,7 +19,7 @@ import org.eclipse.emf.ecore.EObject;
  * <!-- end-user-doc -->
  *
  *
- * @see org.eclipse.papyrus.properties.ui.UiPackage#getElement()
+ * @see org.eclipse.papyrus.views.properties.ui.UiPackage#getElement()
  * @model
  * @generated
  */
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/ui/Layout.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/ui/Layout.java
index dd8b3ad380d..037668655e7 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/ui/Layout.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/ui/Layout.java
@@ -9,9 +9,9 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.ui;
+package org.eclipse.papyrus.views.properties.ui;
 
-import org.eclipse.papyrus.properties.environment.LayoutType;
+import org.eclipse.papyrus.views.properties.environment.LayoutType;
 
 /**
  * <!-- begin-user-doc -->
@@ -21,11 +21,11 @@ import org.eclipse.papyrus.properties.environment.LayoutType;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.properties.ui.Layout#getLayoutType <em>Layout Type</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.ui.Layout#getLayoutType <em>Layout Type</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.papyrus.properties.ui.UiPackage#getLayout()
+ * @see org.eclipse.papyrus.views.properties.ui.UiPackage#getLayout()
  * @model
  * @generated
  */
@@ -40,14 +40,14 @@ public interface Layout extends UIComponent {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Layout Type</em>' reference.
 	 * @see #setLayoutType(LayoutType)
-	 * @see org.eclipse.papyrus.properties.ui.UiPackage#getLayout_LayoutType()
+	 * @see org.eclipse.papyrus.views.properties.ui.UiPackage#getLayout_LayoutType()
 	 * @model required="true"
 	 * @generated
 	 */
 	LayoutType getLayoutType();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.properties.ui.Layout#getLayoutType <em>Layout Type</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.views.properties.ui.Layout#getLayoutType <em>Layout Type</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Layout Type</em>' reference.
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/ui/PropertyEditor.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/ui/PropertyEditor.java
index d7261be051b..6909137d904 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/ui/PropertyEditor.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/ui/PropertyEditor.java
@@ -9,12 +9,12 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.ui;
+package org.eclipse.papyrus.views.properties.ui;
 
-import org.eclipse.papyrus.properties.contexts.Property;
 
-import org.eclipse.papyrus.properties.contexts.UnknownProperty;
-import org.eclipse.papyrus.properties.environment.PropertyEditorType;
+import org.eclipse.papyrus.views.properties.contexts.Property;
+import org.eclipse.papyrus.views.properties.contexts.UnknownProperty;
+import org.eclipse.papyrus.views.properties.environment.PropertyEditorType;
 
 /**
  * <!-- begin-user-doc -->
@@ -24,17 +24,17 @@ import org.eclipse.papyrus.properties.environment.PropertyEditorType;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.properties.ui.PropertyEditor#getProperty <em>Property</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.ui.PropertyEditor#isReadOnly <em>Read Only</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.ui.PropertyEditor#getWidgetType <em>Widget Type</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.ui.PropertyEditor#getUnresolvedProperty <em>Unresolved Property</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.ui.PropertyEditor#getContentProviderClass <em>Content Provider Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.ui.PropertyEditor#isShowLabel <em>Show Label</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.ui.PropertyEditor#getCustomLabel <em>Custom Label</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.ui.PropertyEditor#getProperty <em>Property</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.ui.PropertyEditor#isReadOnly <em>Read Only</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.ui.PropertyEditor#getWidgetType <em>Widget Type</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.ui.PropertyEditor#getUnresolvedProperty <em>Unresolved Property</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.ui.PropertyEditor#getContentProviderClass <em>Content Provider Class</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.ui.PropertyEditor#isShowLabel <em>Show Label</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.ui.PropertyEditor#getCustomLabel <em>Custom Label</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.papyrus.properties.ui.UiPackage#getPropertyEditor()
+ * @see org.eclipse.papyrus.views.properties.ui.UiPackage#getPropertyEditor()
  * @model
  * @generated
  */
@@ -49,14 +49,14 @@ public interface PropertyEditor extends Widget {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Property</em>' reference.
 	 * @see #setProperty(Property)
-	 * @see org.eclipse.papyrus.properties.ui.UiPackage#getPropertyEditor_Property()
+	 * @see org.eclipse.papyrus.views.properties.ui.UiPackage#getPropertyEditor_Property()
 	 * @model required="true"
 	 * @generated
 	 */
 	Property getProperty();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.properties.ui.PropertyEditor#getProperty <em>Property</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.views.properties.ui.PropertyEditor#getProperty <em>Property</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Property</em>' reference.
@@ -76,14 +76,14 @@ public interface PropertyEditor extends Widget {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Read Only</em>' attribute.
 	 * @see #setReadOnly(boolean)
-	 * @see org.eclipse.papyrus.properties.ui.UiPackage#getPropertyEditor_ReadOnly()
+	 * @see org.eclipse.papyrus.views.properties.ui.UiPackage#getPropertyEditor_ReadOnly()
 	 * @model default="false" required="true"
 	 * @generated
 	 */
 	boolean isReadOnly();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.properties.ui.PropertyEditor#isReadOnly <em>Read Only</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.views.properties.ui.PropertyEditor#isReadOnly <em>Read Only</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Read Only</em>' attribute.
@@ -102,14 +102,14 @@ public interface PropertyEditor extends Widget {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Widget Type</em>' reference.
 	 * @see #setWidgetType(PropertyEditorType)
-	 * @see org.eclipse.papyrus.properties.ui.UiPackage#getPropertyEditor_WidgetType()
+	 * @see org.eclipse.papyrus.views.properties.ui.UiPackage#getPropertyEditor_WidgetType()
 	 * @model required="true"
 	 * @generated
 	 */
 	PropertyEditorType getWidgetType();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.properties.ui.PropertyEditor#getWidgetType <em>Widget Type</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.views.properties.ui.PropertyEditor#getWidgetType <em>Widget Type</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Widget Type</em>' reference.
@@ -128,14 +128,14 @@ public interface PropertyEditor extends Widget {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Unresolved Property</em>' containment reference.
 	 * @see #setUnresolvedProperty(UnknownProperty)
-	 * @see org.eclipse.papyrus.properties.ui.UiPackage#getPropertyEditor_UnresolvedProperty()
+	 * @see org.eclipse.papyrus.views.properties.ui.UiPackage#getPropertyEditor_UnresolvedProperty()
 	 * @model containment="true"
 	 * @generated
 	 */
 	UnknownProperty getUnresolvedProperty();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.properties.ui.PropertyEditor#getUnresolvedProperty <em>Unresolved Property</em>}' containment reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.views.properties.ui.PropertyEditor#getUnresolvedProperty <em>Unresolved Property</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Unresolved Property</em>' containment reference.
@@ -154,14 +154,14 @@ public interface PropertyEditor extends Widget {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Content Provider Class</em>' attribute.
 	 * @see #setContentProviderClass(String)
-	 * @see org.eclipse.papyrus.properties.ui.UiPackage#getPropertyEditor_ContentProviderClass()
+	 * @see org.eclipse.papyrus.views.properties.ui.UiPackage#getPropertyEditor_ContentProviderClass()
 	 * @model
 	 * @generated
 	 */
 	String getContentProviderClass();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.properties.ui.PropertyEditor#getContentProviderClass <em>Content Provider Class</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.views.properties.ui.PropertyEditor#getContentProviderClass <em>Content Provider Class</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Content Provider Class</em>' attribute.
@@ -181,14 +181,14 @@ public interface PropertyEditor extends Widget {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Show Label</em>' attribute.
 	 * @see #setShowLabel(boolean)
-	 * @see org.eclipse.papyrus.properties.ui.UiPackage#getPropertyEditor_ShowLabel()
+	 * @see org.eclipse.papyrus.views.properties.ui.UiPackage#getPropertyEditor_ShowLabel()
 	 * @model default="true" required="true"
 	 * @generated
 	 */
 	boolean isShowLabel();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.properties.ui.PropertyEditor#isShowLabel <em>Show Label</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.views.properties.ui.PropertyEditor#isShowLabel <em>Show Label</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Show Label</em>' attribute.
@@ -207,14 +207,14 @@ public interface PropertyEditor extends Widget {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Custom Label</em>' attribute.
 	 * @see #setCustomLabel(String)
-	 * @see org.eclipse.papyrus.properties.ui.UiPackage#getPropertyEditor_CustomLabel()
+	 * @see org.eclipse.papyrus.views.properties.ui.UiPackage#getPropertyEditor_CustomLabel()
 	 * @model
 	 * @generated
 	 */
 	String getCustomLabel();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.properties.ui.PropertyEditor#getCustomLabel <em>Custom Label</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.views.properties.ui.PropertyEditor#getCustomLabel <em>Custom Label</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Custom Label</em>' attribute.
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/ui/ReferenceAttribute.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/ui/ReferenceAttribute.java
index e72978a0668..afc1cf8c721 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/ui/ReferenceAttribute.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/ui/ReferenceAttribute.java
@@ -9,7 +9,7 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.ui;
+package org.eclipse.papyrus.views.properties.ui;
 
 
 /**
@@ -20,11 +20,11 @@ package org.eclipse.papyrus.properties.ui;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.properties.ui.ReferenceAttribute#getValue <em>Value</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.ui.ReferenceAttribute#getValue <em>Value</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.papyrus.properties.ui.UiPackage#getReferenceAttribute()
+ * @see org.eclipse.papyrus.views.properties.ui.UiPackage#getReferenceAttribute()
  * @model
  * @generated
  */
@@ -39,14 +39,14 @@ public interface ReferenceAttribute extends WidgetAttribute {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Value</em>' containment reference.
 	 * @see #setValue(UIComponent)
-	 * @see org.eclipse.papyrus.properties.ui.UiPackage#getReferenceAttribute_Value()
+	 * @see org.eclipse.papyrus.views.properties.ui.UiPackage#getReferenceAttribute_Value()
 	 * @model containment="true" required="true"
 	 * @generated
 	 */
 	UIComponent getValue();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.properties.ui.ReferenceAttribute#getValue <em>Value</em>}' containment reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.views.properties.ui.ReferenceAttribute#getValue <em>Value</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Value</em>' containment reference.
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/ui/StandardWidget.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/ui/StandardWidget.java
index 9eb19855482..c4ad3d460cc 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/ui/StandardWidget.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/ui/StandardWidget.java
@@ -9,9 +9,9 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.ui;
+package org.eclipse.papyrus.views.properties.ui;
 
-import org.eclipse.papyrus.properties.environment.StandardWidgetType;
+import org.eclipse.papyrus.views.properties.environment.StandardWidgetType;
 
 /**
  * <!-- begin-user-doc -->
@@ -21,11 +21,11 @@ import org.eclipse.papyrus.properties.environment.StandardWidgetType;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.properties.ui.StandardWidget#getWidgetType <em>Widget Type</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.ui.StandardWidget#getWidgetType <em>Widget Type</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.papyrus.properties.ui.UiPackage#getStandardWidget()
+ * @see org.eclipse.papyrus.views.properties.ui.UiPackage#getStandardWidget()
  * @model
  * @generated
  */
@@ -40,14 +40,14 @@ public interface StandardWidget extends Widget {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Widget Type</em>' reference.
 	 * @see #setWidgetType(StandardWidgetType)
-	 * @see org.eclipse.papyrus.properties.ui.UiPackage#getStandardWidget_WidgetType()
+	 * @see org.eclipse.papyrus.views.properties.ui.UiPackage#getStandardWidget_WidgetType()
 	 * @model required="true"
 	 * @generated
 	 */
 	StandardWidgetType getWidgetType();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.properties.ui.StandardWidget#getWidgetType <em>Widget Type</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.views.properties.ui.StandardWidget#getWidgetType <em>Widget Type</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Widget Type</em>' reference.
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/ui/UIComponent.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/ui/UIComponent.java
index 09bedbcd799..8b54b6a99ef 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/ui/UIComponent.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/ui/UIComponent.java
@@ -9,7 +9,7 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.ui;
+package org.eclipse.papyrus.views.properties.ui;
 
 import org.eclipse.emf.common.util.EList;
 
@@ -21,18 +21,18 @@ import org.eclipse.emf.common.util.EList;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.properties.ui.UIComponent#getAttributes <em>Attributes</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.ui.UIComponent#getAttributes <em>Attributes</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.papyrus.properties.ui.UiPackage#getUIComponent()
+ * @see org.eclipse.papyrus.views.properties.ui.UiPackage#getUIComponent()
  * @model abstract="true"
  * @generated
  */
 public interface UIComponent extends Element {
 	/**
 	 * Returns the value of the '<em><b>Attributes</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.properties.ui.WidgetAttribute}.
+	 * The list contents are of type {@link org.eclipse.papyrus.views.properties.ui.WidgetAttribute}.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Attributes</em>' containment reference list isn't clear,
@@ -40,7 +40,7 @@ public interface UIComponent extends Element {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Attributes</em>' containment reference list.
-	 * @see org.eclipse.papyrus.properties.ui.UiPackage#getUIComponent_Attributes()
+	 * @see org.eclipse.papyrus.views.properties.ui.UiPackage#getUIComponent_Attributes()
 	 * @model containment="true"
 	 * @generated
 	 */
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/ui/UiFactory.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/ui/UiFactory.java
index 582988becd0..a8829b839e5 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/ui/UiFactory.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/ui/UiFactory.java
@@ -9,7 +9,7 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.ui;
+package org.eclipse.papyrus.views.properties.ui;
 
 import org.eclipse.emf.ecore.EFactory;
 
@@ -18,7 +18,7 @@ import org.eclipse.emf.ecore.EFactory;
  * The <b>Factory</b> for the model.
  * It provides a create method for each non-abstract class of the model.
  * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.properties.ui.UiPackage
+ * @see org.eclipse.papyrus.views.properties.ui.UiPackage
  * @generated
  */
 public interface UiFactory extends EFactory {
@@ -28,7 +28,7 @@ public interface UiFactory extends EFactory {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	UiFactory eINSTANCE = org.eclipse.papyrus.properties.ui.impl.UiFactoryImpl.init();
+	UiFactory eINSTANCE = org.eclipse.papyrus.views.properties.ui.impl.UiFactoryImpl.init();
 
 	/**
 	 * Returns a new object of class '<em>Element</em>'.
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/ui/UiPackage.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/ui/UiPackage.java
index 3248e767036..57c2f56284a 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/ui/UiPackage.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/ui/UiPackage.java
@@ -9,7 +9,7 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.ui;
+package org.eclipse.papyrus.views.properties.ui;
 
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
@@ -27,7 +27,7 @@ import org.eclipse.emf.ecore.EReference;
  *   <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.properties.ui.UiFactory
+ * @see org.eclipse.papyrus.views.properties.ui.UiFactory
  * @model kind="package"
  * @generated
  */
@@ -62,14 +62,14 @@ public interface UiPackage extends EPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	UiPackage eINSTANCE = org.eclipse.papyrus.properties.ui.impl.UiPackageImpl.init();
+	UiPackage eINSTANCE = org.eclipse.papyrus.views.properties.ui.impl.UiPackageImpl.init();
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.properties.ui.impl.ElementImpl <em>Element</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.views.properties.ui.impl.ElementImpl <em>Element</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.properties.ui.impl.ElementImpl
-	 * @see org.eclipse.papyrus.properties.ui.impl.UiPackageImpl#getElement()
+	 * @see org.eclipse.papyrus.views.properties.ui.impl.ElementImpl
+	 * @see org.eclipse.papyrus.views.properties.ui.impl.UiPackageImpl#getElement()
 	 * @generated
 	 */
 	int ELEMENT = 0;
@@ -84,11 +84,11 @@ public interface UiPackage extends EPackage {
 	int ELEMENT_FEATURE_COUNT = 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.properties.ui.impl.UIComponentImpl <em>UI Component</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.views.properties.ui.impl.UIComponentImpl <em>UI Component</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.properties.ui.impl.UIComponentImpl
-	 * @see org.eclipse.papyrus.properties.ui.impl.UiPackageImpl#getUIComponent()
+	 * @see org.eclipse.papyrus.views.properties.ui.impl.UIComponentImpl
+	 * @see org.eclipse.papyrus.views.properties.ui.impl.UiPackageImpl#getUIComponent()
 	 * @generated
 	 */
 	int UI_COMPONENT = 1;
@@ -112,11 +112,11 @@ public interface UiPackage extends EPackage {
 	int UI_COMPONENT_FEATURE_COUNT = ELEMENT_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.properties.ui.impl.WidgetImpl <em>Widget</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.views.properties.ui.impl.WidgetImpl <em>Widget</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.properties.ui.impl.WidgetImpl
-	 * @see org.eclipse.papyrus.properties.ui.impl.UiPackageImpl#getWidget()
+	 * @see org.eclipse.papyrus.views.properties.ui.impl.WidgetImpl
+	 * @see org.eclipse.papyrus.views.properties.ui.impl.UiPackageImpl#getWidget()
 	 * @generated
 	 */
 	int WIDGET = 2;
@@ -140,11 +140,11 @@ public interface UiPackage extends EPackage {
 	int WIDGET_FEATURE_COUNT = UI_COMPONENT_FEATURE_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.properties.ui.impl.StandardWidgetImpl <em>Standard Widget</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.views.properties.ui.impl.StandardWidgetImpl <em>Standard Widget</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.properties.ui.impl.StandardWidgetImpl
-	 * @see org.eclipse.papyrus.properties.ui.impl.UiPackageImpl#getStandardWidget()
+	 * @see org.eclipse.papyrus.views.properties.ui.impl.StandardWidgetImpl
+	 * @see org.eclipse.papyrus.views.properties.ui.impl.UiPackageImpl#getStandardWidget()
 	 * @generated
 	 */
 	int STANDARD_WIDGET = 3;
@@ -177,11 +177,11 @@ public interface UiPackage extends EPackage {
 	int STANDARD_WIDGET_FEATURE_COUNT = WIDGET_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.properties.ui.impl.PropertyEditorImpl <em>Property Editor</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.views.properties.ui.impl.PropertyEditorImpl <em>Property Editor</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.properties.ui.impl.PropertyEditorImpl
-	 * @see org.eclipse.papyrus.properties.ui.impl.UiPackageImpl#getPropertyEditor()
+	 * @see org.eclipse.papyrus.views.properties.ui.impl.PropertyEditorImpl
+	 * @see org.eclipse.papyrus.views.properties.ui.impl.UiPackageImpl#getPropertyEditor()
 	 * @generated
 	 */
 	int PROPERTY_EDITOR = 4;
@@ -268,11 +268,11 @@ public interface UiPackage extends EPackage {
 	int PROPERTY_EDITOR_FEATURE_COUNT = WIDGET_FEATURE_COUNT + 7;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.properties.ui.impl.CompositeWidgetImpl <em>Composite Widget</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.views.properties.ui.impl.CompositeWidgetImpl <em>Composite Widget</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.properties.ui.impl.CompositeWidgetImpl
-	 * @see org.eclipse.papyrus.properties.ui.impl.UiPackageImpl#getCompositeWidget()
+	 * @see org.eclipse.papyrus.views.properties.ui.impl.CompositeWidgetImpl
+	 * @see org.eclipse.papyrus.views.properties.ui.impl.UiPackageImpl#getCompositeWidget()
 	 * @generated
 	 */
 	int COMPOSITE_WIDGET = 5;
@@ -323,51 +323,51 @@ public interface UiPackage extends EPackage {
 	int COMPOSITE_WIDGET_FEATURE_COUNT = WIDGET_FEATURE_COUNT + 3;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.properties.ui.impl.LayoutImpl <em>Layout</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.views.properties.ui.impl.LayoutImpl <em>Layout</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.properties.ui.impl.LayoutImpl
-	 * @see org.eclipse.papyrus.properties.ui.impl.UiPackageImpl#getLayout()
+	 * @see org.eclipse.papyrus.views.properties.ui.impl.LayoutImpl
+	 * @see org.eclipse.papyrus.views.properties.ui.impl.UiPackageImpl#getLayout()
 	 * @generated
 	 */
 	int LAYOUT = 7;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.properties.ui.impl.WidgetAttributeImpl <em>Widget Attribute</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.views.properties.ui.impl.WidgetAttributeImpl <em>Widget Attribute</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.properties.ui.impl.WidgetAttributeImpl
-	 * @see org.eclipse.papyrus.properties.ui.impl.UiPackageImpl#getWidgetAttribute()
+	 * @see org.eclipse.papyrus.views.properties.ui.impl.WidgetAttributeImpl
+	 * @see org.eclipse.papyrus.views.properties.ui.impl.UiPackageImpl#getWidgetAttribute()
 	 * @generated
 	 */
 	int WIDGET_ATTRIBUTE = 8;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.properties.ui.impl.ValueAttributeImpl <em>Value Attribute</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.views.properties.ui.impl.ValueAttributeImpl <em>Value Attribute</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.properties.ui.impl.ValueAttributeImpl
-	 * @see org.eclipse.papyrus.properties.ui.impl.UiPackageImpl#getValueAttribute()
+	 * @see org.eclipse.papyrus.views.properties.ui.impl.ValueAttributeImpl
+	 * @see org.eclipse.papyrus.views.properties.ui.impl.UiPackageImpl#getValueAttribute()
 	 * @generated
 	 */
 	int VALUE_ATTRIBUTE = 9;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.properties.ui.impl.ReferenceAttributeImpl <em>Reference Attribute</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.views.properties.ui.impl.ReferenceAttributeImpl <em>Reference Attribute</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.properties.ui.impl.ReferenceAttributeImpl
-	 * @see org.eclipse.papyrus.properties.ui.impl.UiPackageImpl#getReferenceAttribute()
+	 * @see org.eclipse.papyrus.views.properties.ui.impl.ReferenceAttributeImpl
+	 * @see org.eclipse.papyrus.views.properties.ui.impl.UiPackageImpl#getReferenceAttribute()
 	 * @generated
 	 */
 	int REFERENCE_ATTRIBUTE = 10;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.properties.ui.impl.UnknownComponentImpl <em>Unknown Component</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.views.properties.ui.impl.UnknownComponentImpl <em>Unknown Component</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.properties.ui.impl.UnknownComponentImpl
-	 * @see org.eclipse.papyrus.properties.ui.impl.UiPackageImpl#getUnknownComponent()
+	 * @see org.eclipse.papyrus.views.properties.ui.impl.UnknownComponentImpl
+	 * @see org.eclipse.papyrus.views.properties.ui.impl.UiPackageImpl#getUnknownComponent()
 	 * @generated
 	 */
 	int UNKNOWN_COMPONENT = 6;
@@ -500,297 +500,297 @@ public interface UiPackage extends EPackage {
 
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.properties.ui.Element <em>Element</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.views.properties.ui.Element <em>Element</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Element</em>'.
-	 * @see org.eclipse.papyrus.properties.ui.Element
+	 * @see org.eclipse.papyrus.views.properties.ui.Element
 	 * @generated
 	 */
 	EClass getElement();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.properties.ui.UIComponent <em>UI Component</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.views.properties.ui.UIComponent <em>UI Component</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>UI Component</em>'.
-	 * @see org.eclipse.papyrus.properties.ui.UIComponent
+	 * @see org.eclipse.papyrus.views.properties.ui.UIComponent
 	 * @generated
 	 */
 	EClass getUIComponent();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.properties.ui.UIComponent#getAttributes <em>Attributes</em>}'.
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.views.properties.ui.UIComponent#getAttributes <em>Attributes</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the containment reference list '<em>Attributes</em>'.
-	 * @see org.eclipse.papyrus.properties.ui.UIComponent#getAttributes()
+	 * @see org.eclipse.papyrus.views.properties.ui.UIComponent#getAttributes()
 	 * @see #getUIComponent()
 	 * @generated
 	 */
 	EReference getUIComponent_Attributes();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.properties.ui.Widget <em>Widget</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.views.properties.ui.Widget <em>Widget</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Widget</em>'.
-	 * @see org.eclipse.papyrus.properties.ui.Widget
+	 * @see org.eclipse.papyrus.views.properties.ui.Widget
 	 * @generated
 	 */
 	EClass getWidget();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.properties.ui.StandardWidget <em>Standard Widget</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.views.properties.ui.StandardWidget <em>Standard Widget</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Standard Widget</em>'.
-	 * @see org.eclipse.papyrus.properties.ui.StandardWidget
+	 * @see org.eclipse.papyrus.views.properties.ui.StandardWidget
 	 * @generated
 	 */
 	EClass getStandardWidget();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.properties.ui.StandardWidget#getWidgetType <em>Widget Type</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.views.properties.ui.StandardWidget#getWidgetType <em>Widget Type</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Widget Type</em>'.
-	 * @see org.eclipse.papyrus.properties.ui.StandardWidget#getWidgetType()
+	 * @see org.eclipse.papyrus.views.properties.ui.StandardWidget#getWidgetType()
 	 * @see #getStandardWidget()
 	 * @generated
 	 */
 	EReference getStandardWidget_WidgetType();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.properties.ui.PropertyEditor <em>Property Editor</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.views.properties.ui.PropertyEditor <em>Property Editor</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Property Editor</em>'.
-	 * @see org.eclipse.papyrus.properties.ui.PropertyEditor
+	 * @see org.eclipse.papyrus.views.properties.ui.PropertyEditor
 	 * @generated
 	 */
 	EClass getPropertyEditor();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.properties.ui.PropertyEditor#getProperty <em>Property</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.views.properties.ui.PropertyEditor#getProperty <em>Property</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Property</em>'.
-	 * @see org.eclipse.papyrus.properties.ui.PropertyEditor#getProperty()
+	 * @see org.eclipse.papyrus.views.properties.ui.PropertyEditor#getProperty()
 	 * @see #getPropertyEditor()
 	 * @generated
 	 */
 	EReference getPropertyEditor_Property();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.properties.ui.PropertyEditor#isReadOnly <em>Read Only</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.views.properties.ui.PropertyEditor#isReadOnly <em>Read Only</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Read Only</em>'.
-	 * @see org.eclipse.papyrus.properties.ui.PropertyEditor#isReadOnly()
+	 * @see org.eclipse.papyrus.views.properties.ui.PropertyEditor#isReadOnly()
 	 * @see #getPropertyEditor()
 	 * @generated
 	 */
 	EAttribute getPropertyEditor_ReadOnly();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.properties.ui.PropertyEditor#getWidgetType <em>Widget Type</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.views.properties.ui.PropertyEditor#getWidgetType <em>Widget Type</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Widget Type</em>'.
-	 * @see org.eclipse.papyrus.properties.ui.PropertyEditor#getWidgetType()
+	 * @see org.eclipse.papyrus.views.properties.ui.PropertyEditor#getWidgetType()
 	 * @see #getPropertyEditor()
 	 * @generated
 	 */
 	EReference getPropertyEditor_WidgetType();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.properties.ui.PropertyEditor#getUnresolvedProperty <em>Unresolved Property</em>}'.
+	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.views.properties.ui.PropertyEditor#getUnresolvedProperty <em>Unresolved Property</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the containment reference '<em>Unresolved Property</em>'.
-	 * @see org.eclipse.papyrus.properties.ui.PropertyEditor#getUnresolvedProperty()
+	 * @see org.eclipse.papyrus.views.properties.ui.PropertyEditor#getUnresolvedProperty()
 	 * @see #getPropertyEditor()
 	 * @generated
 	 */
 	EReference getPropertyEditor_UnresolvedProperty();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.properties.ui.PropertyEditor#getContentProviderClass <em>Content Provider Class</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.views.properties.ui.PropertyEditor#getContentProviderClass <em>Content Provider Class</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Content Provider Class</em>'.
-	 * @see org.eclipse.papyrus.properties.ui.PropertyEditor#getContentProviderClass()
+	 * @see org.eclipse.papyrus.views.properties.ui.PropertyEditor#getContentProviderClass()
 	 * @see #getPropertyEditor()
 	 * @generated
 	 */
 	EAttribute getPropertyEditor_ContentProviderClass();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.properties.ui.PropertyEditor#isShowLabel <em>Show Label</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.views.properties.ui.PropertyEditor#isShowLabel <em>Show Label</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Show Label</em>'.
-	 * @see org.eclipse.papyrus.properties.ui.PropertyEditor#isShowLabel()
+	 * @see org.eclipse.papyrus.views.properties.ui.PropertyEditor#isShowLabel()
 	 * @see #getPropertyEditor()
 	 * @generated
 	 */
 	EAttribute getPropertyEditor_ShowLabel();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.properties.ui.PropertyEditor#getCustomLabel <em>Custom Label</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.views.properties.ui.PropertyEditor#getCustomLabel <em>Custom Label</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Custom Label</em>'.
-	 * @see org.eclipse.papyrus.properties.ui.PropertyEditor#getCustomLabel()
+	 * @see org.eclipse.papyrus.views.properties.ui.PropertyEditor#getCustomLabel()
 	 * @see #getPropertyEditor()
 	 * @generated
 	 */
 	EAttribute getPropertyEditor_CustomLabel();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.properties.ui.CompositeWidget <em>Composite Widget</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.views.properties.ui.CompositeWidget <em>Composite Widget</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Composite Widget</em>'.
-	 * @see org.eclipse.papyrus.properties.ui.CompositeWidget
+	 * @see org.eclipse.papyrus.views.properties.ui.CompositeWidget
 	 * @generated
 	 */
 	EClass getCompositeWidget();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.properties.ui.CompositeWidget#getLayout <em>Layout</em>}'.
+	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.views.properties.ui.CompositeWidget#getLayout <em>Layout</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the containment reference '<em>Layout</em>'.
-	 * @see org.eclipse.papyrus.properties.ui.CompositeWidget#getLayout()
+	 * @see org.eclipse.papyrus.views.properties.ui.CompositeWidget#getLayout()
 	 * @see #getCompositeWidget()
 	 * @generated
 	 */
 	EReference getCompositeWidget_Layout();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.properties.ui.CompositeWidget#getWidgets <em>Widgets</em>}'.
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.views.properties.ui.CompositeWidget#getWidgets <em>Widgets</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the containment reference list '<em>Widgets</em>'.
-	 * @see org.eclipse.papyrus.properties.ui.CompositeWidget#getWidgets()
+	 * @see org.eclipse.papyrus.views.properties.ui.CompositeWidget#getWidgets()
 	 * @see #getCompositeWidget()
 	 * @generated
 	 */
 	EReference getCompositeWidget_Widgets();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.properties.ui.CompositeWidget#getWidgetType <em>Widget Type</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.views.properties.ui.CompositeWidget#getWidgetType <em>Widget Type</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Widget Type</em>'.
-	 * @see org.eclipse.papyrus.properties.ui.CompositeWidget#getWidgetType()
+	 * @see org.eclipse.papyrus.views.properties.ui.CompositeWidget#getWidgetType()
 	 * @see #getCompositeWidget()
 	 * @generated
 	 */
 	EReference getCompositeWidget_WidgetType();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.properties.ui.Layout <em>Layout</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.views.properties.ui.Layout <em>Layout</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Layout</em>'.
-	 * @see org.eclipse.papyrus.properties.ui.Layout
+	 * @see org.eclipse.papyrus.views.properties.ui.Layout
 	 * @generated
 	 */
 	EClass getLayout();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.properties.ui.Layout#getLayoutType <em>Layout Type</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.views.properties.ui.Layout#getLayoutType <em>Layout Type</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Layout Type</em>'.
-	 * @see org.eclipse.papyrus.properties.ui.Layout#getLayoutType()
+	 * @see org.eclipse.papyrus.views.properties.ui.Layout#getLayoutType()
 	 * @see #getLayout()
 	 * @generated
 	 */
 	EReference getLayout_LayoutType();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.properties.ui.WidgetAttribute <em>Widget Attribute</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.views.properties.ui.WidgetAttribute <em>Widget Attribute</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Widget Attribute</em>'.
-	 * @see org.eclipse.papyrus.properties.ui.WidgetAttribute
+	 * @see org.eclipse.papyrus.views.properties.ui.WidgetAttribute
 	 * @generated
 	 */
 	EClass getWidgetAttribute();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.properties.ui.WidgetAttribute#getName <em>Name</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.views.properties.ui.WidgetAttribute#getName <em>Name</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.papyrus.properties.ui.WidgetAttribute#getName()
+	 * @see org.eclipse.papyrus.views.properties.ui.WidgetAttribute#getName()
 	 * @see #getWidgetAttribute()
 	 * @generated
 	 */
 	EAttribute getWidgetAttribute_Name();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.properties.ui.ValueAttribute <em>Value Attribute</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.views.properties.ui.ValueAttribute <em>Value Attribute</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Value Attribute</em>'.
-	 * @see org.eclipse.papyrus.properties.ui.ValueAttribute
+	 * @see org.eclipse.papyrus.views.properties.ui.ValueAttribute
 	 * @generated
 	 */
 	EClass getValueAttribute();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.properties.ui.ValueAttribute#getValue <em>Value</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.views.properties.ui.ValueAttribute#getValue <em>Value</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Value</em>'.
-	 * @see org.eclipse.papyrus.properties.ui.ValueAttribute#getValue()
+	 * @see org.eclipse.papyrus.views.properties.ui.ValueAttribute#getValue()
 	 * @see #getValueAttribute()
 	 * @generated
 	 */
 	EAttribute getValueAttribute_Value();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.properties.ui.ReferenceAttribute <em>Reference Attribute</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.views.properties.ui.ReferenceAttribute <em>Reference Attribute</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Reference Attribute</em>'.
-	 * @see org.eclipse.papyrus.properties.ui.ReferenceAttribute
+	 * @see org.eclipse.papyrus.views.properties.ui.ReferenceAttribute
 	 * @generated
 	 */
 	EClass getReferenceAttribute();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.properties.ui.ReferenceAttribute#getValue <em>Value</em>}'.
+	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.views.properties.ui.ReferenceAttribute#getValue <em>Value</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the containment reference '<em>Value</em>'.
-	 * @see org.eclipse.papyrus.properties.ui.ReferenceAttribute#getValue()
+	 * @see org.eclipse.papyrus.views.properties.ui.ReferenceAttribute#getValue()
 	 * @see #getReferenceAttribute()
 	 * @generated
 	 */
 	EReference getReferenceAttribute_Value();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.properties.ui.UnknownComponent <em>Unknown Component</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.views.properties.ui.UnknownComponent <em>Unknown Component</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Unknown Component</em>'.
-	 * @see org.eclipse.papyrus.properties.ui.UnknownComponent
+	 * @see org.eclipse.papyrus.views.properties.ui.UnknownComponent
 	 * @generated
 	 */
 	EClass getUnknownComponent();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.properties.ui.UnknownComponent#getTypeName <em>Type Name</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.views.properties.ui.UnknownComponent#getTypeName <em>Type Name</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Type Name</em>'.
-	 * @see org.eclipse.papyrus.properties.ui.UnknownComponent#getTypeName()
+	 * @see org.eclipse.papyrus.views.properties.ui.UnknownComponent#getTypeName()
 	 * @see #getUnknownComponent()
 	 * @generated
 	 */
@@ -819,21 +819,21 @@ public interface UiPackage extends EPackage {
 	 */
 	interface Literals {
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.properties.ui.impl.ElementImpl <em>Element</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.views.properties.ui.impl.ElementImpl <em>Element</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.properties.ui.impl.ElementImpl
-		 * @see org.eclipse.papyrus.properties.ui.impl.UiPackageImpl#getElement()
+		 * @see org.eclipse.papyrus.views.properties.ui.impl.ElementImpl
+		 * @see org.eclipse.papyrus.views.properties.ui.impl.UiPackageImpl#getElement()
 		 * @generated
 		 */
 		EClass ELEMENT = eINSTANCE.getElement();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.properties.ui.impl.UIComponentImpl <em>UI Component</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.views.properties.ui.impl.UIComponentImpl <em>UI Component</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.properties.ui.impl.UIComponentImpl
-		 * @see org.eclipse.papyrus.properties.ui.impl.UiPackageImpl#getUIComponent()
+		 * @see org.eclipse.papyrus.views.properties.ui.impl.UIComponentImpl
+		 * @see org.eclipse.papyrus.views.properties.ui.impl.UiPackageImpl#getUIComponent()
 		 * @generated
 		 */
 		EClass UI_COMPONENT = eINSTANCE.getUIComponent();
@@ -847,21 +847,21 @@ public interface UiPackage extends EPackage {
 		EReference UI_COMPONENT__ATTRIBUTES = eINSTANCE.getUIComponent_Attributes();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.properties.ui.impl.WidgetImpl <em>Widget</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.views.properties.ui.impl.WidgetImpl <em>Widget</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.properties.ui.impl.WidgetImpl
-		 * @see org.eclipse.papyrus.properties.ui.impl.UiPackageImpl#getWidget()
+		 * @see org.eclipse.papyrus.views.properties.ui.impl.WidgetImpl
+		 * @see org.eclipse.papyrus.views.properties.ui.impl.UiPackageImpl#getWidget()
 		 * @generated
 		 */
 		EClass WIDGET = eINSTANCE.getWidget();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.properties.ui.impl.StandardWidgetImpl <em>Standard Widget</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.views.properties.ui.impl.StandardWidgetImpl <em>Standard Widget</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.properties.ui.impl.StandardWidgetImpl
-		 * @see org.eclipse.papyrus.properties.ui.impl.UiPackageImpl#getStandardWidget()
+		 * @see org.eclipse.papyrus.views.properties.ui.impl.StandardWidgetImpl
+		 * @see org.eclipse.papyrus.views.properties.ui.impl.UiPackageImpl#getStandardWidget()
 		 * @generated
 		 */
 		EClass STANDARD_WIDGET = eINSTANCE.getStandardWidget();
@@ -875,11 +875,11 @@ public interface UiPackage extends EPackage {
 		EReference STANDARD_WIDGET__WIDGET_TYPE = eINSTANCE.getStandardWidget_WidgetType();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.properties.ui.impl.PropertyEditorImpl <em>Property Editor</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.views.properties.ui.impl.PropertyEditorImpl <em>Property Editor</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.properties.ui.impl.PropertyEditorImpl
-		 * @see org.eclipse.papyrus.properties.ui.impl.UiPackageImpl#getPropertyEditor()
+		 * @see org.eclipse.papyrus.views.properties.ui.impl.PropertyEditorImpl
+		 * @see org.eclipse.papyrus.views.properties.ui.impl.UiPackageImpl#getPropertyEditor()
 		 * @generated
 		 */
 		EClass PROPERTY_EDITOR = eINSTANCE.getPropertyEditor();
@@ -941,11 +941,11 @@ public interface UiPackage extends EPackage {
 		EAttribute PROPERTY_EDITOR__CUSTOM_LABEL = eINSTANCE.getPropertyEditor_CustomLabel();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.properties.ui.impl.CompositeWidgetImpl <em>Composite Widget</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.views.properties.ui.impl.CompositeWidgetImpl <em>Composite Widget</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.properties.ui.impl.CompositeWidgetImpl
-		 * @see org.eclipse.papyrus.properties.ui.impl.UiPackageImpl#getCompositeWidget()
+		 * @see org.eclipse.papyrus.views.properties.ui.impl.CompositeWidgetImpl
+		 * @see org.eclipse.papyrus.views.properties.ui.impl.UiPackageImpl#getCompositeWidget()
 		 * @generated
 		 */
 		EClass COMPOSITE_WIDGET = eINSTANCE.getCompositeWidget();
@@ -975,11 +975,11 @@ public interface UiPackage extends EPackage {
 		EReference COMPOSITE_WIDGET__WIDGET_TYPE = eINSTANCE.getCompositeWidget_WidgetType();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.properties.ui.impl.LayoutImpl <em>Layout</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.views.properties.ui.impl.LayoutImpl <em>Layout</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.properties.ui.impl.LayoutImpl
-		 * @see org.eclipse.papyrus.properties.ui.impl.UiPackageImpl#getLayout()
+		 * @see org.eclipse.papyrus.views.properties.ui.impl.LayoutImpl
+		 * @see org.eclipse.papyrus.views.properties.ui.impl.UiPackageImpl#getLayout()
 		 * @generated
 		 */
 		EClass LAYOUT = eINSTANCE.getLayout();
@@ -993,11 +993,11 @@ public interface UiPackage extends EPackage {
 		EReference LAYOUT__LAYOUT_TYPE = eINSTANCE.getLayout_LayoutType();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.properties.ui.impl.WidgetAttributeImpl <em>Widget Attribute</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.views.properties.ui.impl.WidgetAttributeImpl <em>Widget Attribute</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.properties.ui.impl.WidgetAttributeImpl
-		 * @see org.eclipse.papyrus.properties.ui.impl.UiPackageImpl#getWidgetAttribute()
+		 * @see org.eclipse.papyrus.views.properties.ui.impl.WidgetAttributeImpl
+		 * @see org.eclipse.papyrus.views.properties.ui.impl.UiPackageImpl#getWidgetAttribute()
 		 * @generated
 		 */
 		EClass WIDGET_ATTRIBUTE = eINSTANCE.getWidgetAttribute();
@@ -1011,11 +1011,11 @@ public interface UiPackage extends EPackage {
 		EAttribute WIDGET_ATTRIBUTE__NAME = eINSTANCE.getWidgetAttribute_Name();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.properties.ui.impl.ValueAttributeImpl <em>Value Attribute</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.views.properties.ui.impl.ValueAttributeImpl <em>Value Attribute</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.properties.ui.impl.ValueAttributeImpl
-		 * @see org.eclipse.papyrus.properties.ui.impl.UiPackageImpl#getValueAttribute()
+		 * @see org.eclipse.papyrus.views.properties.ui.impl.ValueAttributeImpl
+		 * @see org.eclipse.papyrus.views.properties.ui.impl.UiPackageImpl#getValueAttribute()
 		 * @generated
 		 */
 		EClass VALUE_ATTRIBUTE = eINSTANCE.getValueAttribute();
@@ -1029,11 +1029,11 @@ public interface UiPackage extends EPackage {
 		EAttribute VALUE_ATTRIBUTE__VALUE = eINSTANCE.getValueAttribute_Value();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.properties.ui.impl.ReferenceAttributeImpl <em>Reference Attribute</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.views.properties.ui.impl.ReferenceAttributeImpl <em>Reference Attribute</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.properties.ui.impl.ReferenceAttributeImpl
-		 * @see org.eclipse.papyrus.properties.ui.impl.UiPackageImpl#getReferenceAttribute()
+		 * @see org.eclipse.papyrus.views.properties.ui.impl.ReferenceAttributeImpl
+		 * @see org.eclipse.papyrus.views.properties.ui.impl.UiPackageImpl#getReferenceAttribute()
 		 * @generated
 		 */
 		EClass REFERENCE_ATTRIBUTE = eINSTANCE.getReferenceAttribute();
@@ -1047,11 +1047,11 @@ public interface UiPackage extends EPackage {
 		EReference REFERENCE_ATTRIBUTE__VALUE = eINSTANCE.getReferenceAttribute_Value();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.properties.ui.impl.UnknownComponentImpl <em>Unknown Component</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.views.properties.ui.impl.UnknownComponentImpl <em>Unknown Component</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.properties.ui.impl.UnknownComponentImpl
-		 * @see org.eclipse.papyrus.properties.ui.impl.UiPackageImpl#getUnknownComponent()
+		 * @see org.eclipse.papyrus.views.properties.ui.impl.UnknownComponentImpl
+		 * @see org.eclipse.papyrus.views.properties.ui.impl.UiPackageImpl#getUnknownComponent()
 		 * @generated
 		 */
 		EClass UNKNOWN_COMPONENT = eINSTANCE.getUnknownComponent();
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/ui/UnknownComponent.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/ui/UnknownComponent.java
index 7b629aff96f..5c5ac0e3974 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/ui/UnknownComponent.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/ui/UnknownComponent.java
@@ -9,7 +9,7 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.ui;
+package org.eclipse.papyrus.views.properties.ui;
 
 
 /**
@@ -20,11 +20,11 @@ package org.eclipse.papyrus.properties.ui;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.properties.ui.UnknownComponent#getTypeName <em>Type Name</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.ui.UnknownComponent#getTypeName <em>Type Name</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.papyrus.properties.ui.UiPackage#getUnknownComponent()
+ * @see org.eclipse.papyrus.views.properties.ui.UiPackage#getUnknownComponent()
  * @model
  * @generated
  */
@@ -39,14 +39,14 @@ public interface UnknownComponent extends Widget {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Type Name</em>' attribute.
 	 * @see #setTypeName(String)
-	 * @see org.eclipse.papyrus.properties.ui.UiPackage#getUnknownComponent_TypeName()
+	 * @see org.eclipse.papyrus.views.properties.ui.UiPackage#getUnknownComponent_TypeName()
 	 * @model required="true"
 	 * @generated
 	 */
 	String getTypeName();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.properties.ui.UnknownComponent#getTypeName <em>Type Name</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.views.properties.ui.UnknownComponent#getTypeName <em>Type Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Type Name</em>' attribute.
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/ui/ValueAttribute.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/ui/ValueAttribute.java
index 5662486cb81..b43059a595a 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/ui/ValueAttribute.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/ui/ValueAttribute.java
@@ -9,7 +9,7 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.ui;
+package org.eclipse.papyrus.views.properties.ui;
 
 
 /**
@@ -20,11 +20,11 @@ package org.eclipse.papyrus.properties.ui;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.properties.ui.ValueAttribute#getValue <em>Value</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.ui.ValueAttribute#getValue <em>Value</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.papyrus.properties.ui.UiPackage#getValueAttribute()
+ * @see org.eclipse.papyrus.views.properties.ui.UiPackage#getValueAttribute()
  * @model
  * @generated
  */
@@ -39,14 +39,14 @@ public interface ValueAttribute extends WidgetAttribute {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Value</em>' attribute.
 	 * @see #setValue(String)
-	 * @see org.eclipse.papyrus.properties.ui.UiPackage#getValueAttribute_Value()
+	 * @see org.eclipse.papyrus.views.properties.ui.UiPackage#getValueAttribute_Value()
 	 * @model required="true"
 	 * @generated
 	 */
 	String getValue();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.properties.ui.ValueAttribute#getValue <em>Value</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.views.properties.ui.ValueAttribute#getValue <em>Value</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Value</em>' attribute.
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/ui/Widget.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/ui/Widget.java
index 8e6e71517f0..2b68958d1c7 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/ui/Widget.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/ui/Widget.java
@@ -9,7 +9,7 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.ui;
+package org.eclipse.papyrus.views.properties.ui;
 
 
 /**
@@ -18,7 +18,7 @@ package org.eclipse.papyrus.properties.ui;
  * <!-- end-user-doc -->
  *
  *
- * @see org.eclipse.papyrus.properties.ui.UiPackage#getWidget()
+ * @see org.eclipse.papyrus.views.properties.ui.UiPackage#getWidget()
  * @model abstract="true"
  * @generated
  */
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/ui/WidgetAttribute.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/ui/WidgetAttribute.java
index d13d82d46dc..60e81446a7e 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/ui/WidgetAttribute.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/ui/WidgetAttribute.java
@@ -9,7 +9,7 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.ui;
+package org.eclipse.papyrus.views.properties.ui;
 
 
 /**
@@ -20,11 +20,11 @@ package org.eclipse.papyrus.properties.ui;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.properties.ui.WidgetAttribute#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.ui.WidgetAttribute#getName <em>Name</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.papyrus.properties.ui.UiPackage#getWidgetAttribute()
+ * @see org.eclipse.papyrus.views.properties.ui.UiPackage#getWidgetAttribute()
  * @model abstract="true"
  * @generated
  */
@@ -39,14 +39,14 @@ public interface WidgetAttribute extends Element {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Name</em>' attribute.
 	 * @see #setName(String)
-	 * @see org.eclipse.papyrus.properties.ui.UiPackage#getWidgetAttribute_Name()
+	 * @see org.eclipse.papyrus.views.properties.ui.UiPackage#getWidgetAttribute_Name()
 	 * @model required="true"
 	 * @generated
 	 */
 	String getName();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.properties.ui.WidgetAttribute#getName <em>Name</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.views.properties.ui.WidgetAttribute#getName <em>Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Name</em>' attribute.
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/ui/impl/CompositeWidgetImpl.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/ui/impl/CompositeWidgetImpl.java
index dcb405a0a23..9a62fc1b1d6 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/ui/impl/CompositeWidgetImpl.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/ui/impl/CompositeWidgetImpl.java
@@ -9,7 +9,7 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.ui.impl;
+package org.eclipse.papyrus.views.properties.ui.impl;
 
 import java.util.Collection;
 
@@ -26,12 +26,12 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
 
-import org.eclipse.papyrus.properties.environment.CompositeWidgetType;
 
-import org.eclipse.papyrus.properties.ui.CompositeWidget;
-import org.eclipse.papyrus.properties.ui.Layout;
-import org.eclipse.papyrus.properties.ui.UiPackage;
-import org.eclipse.papyrus.properties.ui.Widget;
+import org.eclipse.papyrus.views.properties.environment.CompositeWidgetType;
+import org.eclipse.papyrus.views.properties.ui.CompositeWidget;
+import org.eclipse.papyrus.views.properties.ui.Layout;
+import org.eclipse.papyrus.views.properties.ui.UiPackage;
+import org.eclipse.papyrus.views.properties.ui.Widget;
 
 /**
  * <!-- begin-user-doc -->
@@ -40,9 +40,9 @@ import org.eclipse.papyrus.properties.ui.Widget;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.properties.ui.impl.CompositeWidgetImpl#getLayout <em>Layout</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.ui.impl.CompositeWidgetImpl#getWidgets <em>Widgets</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.ui.impl.CompositeWidgetImpl#getWidgetType <em>Widget Type</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.ui.impl.CompositeWidgetImpl#getLayout <em>Layout</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.ui.impl.CompositeWidgetImpl#getWidgets <em>Widgets</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.ui.impl.CompositeWidgetImpl#getWidgetType <em>Widget Type</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/ui/impl/ElementImpl.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/ui/impl/ElementImpl.java
index 480cc1de05d..f79e47cbc4d 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/ui/impl/ElementImpl.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/ui/impl/ElementImpl.java
@@ -9,14 +9,14 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.ui.impl;
+package org.eclipse.papyrus.views.properties.ui.impl;
 
 import org.eclipse.emf.ecore.EClass;
 
 import org.eclipse.emf.ecore.impl.EObjectImpl;
 
-import org.eclipse.papyrus.properties.ui.Element;
-import org.eclipse.papyrus.properties.ui.UiPackage;
+import org.eclipse.papyrus.views.properties.ui.Element;
+import org.eclipse.papyrus.views.properties.ui.UiPackage;
 
 /**
  * <!-- begin-user-doc -->
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/ui/impl/LayoutImpl.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/ui/impl/LayoutImpl.java
index 8da341afee5..f7520417623 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/ui/impl/LayoutImpl.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/ui/impl/LayoutImpl.java
@@ -9,7 +9,7 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.ui.impl;
+package org.eclipse.papyrus.views.properties.ui.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -18,10 +18,10 @@ import org.eclipse.emf.ecore.InternalEObject;
 
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 
-import org.eclipse.papyrus.properties.environment.LayoutType;
 
-import org.eclipse.papyrus.properties.ui.Layout;
-import org.eclipse.papyrus.properties.ui.UiPackage;
+import org.eclipse.papyrus.views.properties.environment.LayoutType;
+import org.eclipse.papyrus.views.properties.ui.Layout;
+import org.eclipse.papyrus.views.properties.ui.UiPackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -30,7 +30,7 @@ import org.eclipse.papyrus.properties.ui.UiPackage;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.properties.ui.impl.LayoutImpl#getLayoutType <em>Layout Type</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.ui.impl.LayoutImpl#getLayoutType <em>Layout Type</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/ui/impl/PropertyEditorImpl.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/ui/impl/PropertyEditorImpl.java
index 8554f48a481..14169251877 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/ui/impl/PropertyEditorImpl.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/ui/impl/PropertyEditorImpl.java
@@ -9,7 +9,7 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.ui.impl;
+package org.eclipse.papyrus.views.properties.ui.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -19,13 +19,13 @@ import org.eclipse.emf.ecore.InternalEObject;
 
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 
-import org.eclipse.papyrus.properties.contexts.Property;
 
-import org.eclipse.papyrus.properties.contexts.UnknownProperty;
-import org.eclipse.papyrus.properties.environment.PropertyEditorType;
 
-import org.eclipse.papyrus.properties.ui.PropertyEditor;
-import org.eclipse.papyrus.properties.ui.UiPackage;
+import org.eclipse.papyrus.views.properties.contexts.Property;
+import org.eclipse.papyrus.views.properties.contexts.UnknownProperty;
+import org.eclipse.papyrus.views.properties.environment.PropertyEditorType;
+import org.eclipse.papyrus.views.properties.ui.PropertyEditor;
+import org.eclipse.papyrus.views.properties.ui.UiPackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -34,13 +34,13 @@ import org.eclipse.papyrus.properties.ui.UiPackage;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.properties.ui.impl.PropertyEditorImpl#getProperty <em>Property</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.ui.impl.PropertyEditorImpl#isReadOnly <em>Read Only</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.ui.impl.PropertyEditorImpl#getWidgetType <em>Widget Type</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.ui.impl.PropertyEditorImpl#getUnresolvedProperty <em>Unresolved Property</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.ui.impl.PropertyEditorImpl#getContentProviderClass <em>Content Provider Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.ui.impl.PropertyEditorImpl#isShowLabel <em>Show Label</em>}</li>
- *   <li>{@link org.eclipse.papyrus.properties.ui.impl.PropertyEditorImpl#getCustomLabel <em>Custom Label</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.ui.impl.PropertyEditorImpl#getProperty <em>Property</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.ui.impl.PropertyEditorImpl#isReadOnly <em>Read Only</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.ui.impl.PropertyEditorImpl#getWidgetType <em>Widget Type</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.ui.impl.PropertyEditorImpl#getUnresolvedProperty <em>Unresolved Property</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.ui.impl.PropertyEditorImpl#getContentProviderClass <em>Content Provider Class</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.ui.impl.PropertyEditorImpl#isShowLabel <em>Show Label</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.ui.impl.PropertyEditorImpl#getCustomLabel <em>Custom Label</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/ui/impl/ReferenceAttributeImpl.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/ui/impl/ReferenceAttributeImpl.java
index 59653a17176..e2ecaa76cd0 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/ui/impl/ReferenceAttributeImpl.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/ui/impl/ReferenceAttributeImpl.java
@@ -9,7 +9,7 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.ui.impl;
+package org.eclipse.papyrus.views.properties.ui.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
@@ -19,9 +19,9 @@ import org.eclipse.emf.ecore.InternalEObject;
 
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 
-import org.eclipse.papyrus.properties.ui.ReferenceAttribute;
-import org.eclipse.papyrus.properties.ui.UIComponent;
-import org.eclipse.papyrus.properties.ui.UiPackage;
+import org.eclipse.papyrus.views.properties.ui.ReferenceAttribute;
+import org.eclipse.papyrus.views.properties.ui.UIComponent;
+import org.eclipse.papyrus.views.properties.ui.UiPackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -30,7 +30,7 @@ import org.eclipse.papyrus.properties.ui.UiPackage;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.properties.ui.impl.ReferenceAttributeImpl#getValue <em>Value</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.ui.impl.ReferenceAttributeImpl#getValue <em>Value</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/ui/impl/StandardWidgetImpl.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/ui/impl/StandardWidgetImpl.java
index f34fd7f7b4b..e5429b17861 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/ui/impl/StandardWidgetImpl.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/ui/impl/StandardWidgetImpl.java
@@ -9,7 +9,7 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.ui.impl;
+package org.eclipse.papyrus.views.properties.ui.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -18,10 +18,10 @@ import org.eclipse.emf.ecore.InternalEObject;
 
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 
-import org.eclipse.papyrus.properties.environment.StandardWidgetType;
 
-import org.eclipse.papyrus.properties.ui.StandardWidget;
-import org.eclipse.papyrus.properties.ui.UiPackage;
+import org.eclipse.papyrus.views.properties.environment.StandardWidgetType;
+import org.eclipse.papyrus.views.properties.ui.StandardWidget;
+import org.eclipse.papyrus.views.properties.ui.UiPackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -30,7 +30,7 @@ import org.eclipse.papyrus.properties.ui.UiPackage;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.properties.ui.impl.StandardWidgetImpl#getWidgetType <em>Widget Type</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.ui.impl.StandardWidgetImpl#getWidgetType <em>Widget Type</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/ui/impl/UIComponentImpl.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/ui/impl/UIComponentImpl.java
index 149d72ca13c..16206e81b3b 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/ui/impl/UIComponentImpl.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/ui/impl/UIComponentImpl.java
@@ -9,7 +9,7 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.ui.impl;
+package org.eclipse.papyrus.views.properties.ui.impl;
 
 import java.util.Collection;
 
@@ -23,9 +23,9 @@ import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
 
-import org.eclipse.papyrus.properties.ui.UIComponent;
-import org.eclipse.papyrus.properties.ui.UiPackage;
-import org.eclipse.papyrus.properties.ui.WidgetAttribute;
+import org.eclipse.papyrus.views.properties.ui.UIComponent;
+import org.eclipse.papyrus.views.properties.ui.UiPackage;
+import org.eclipse.papyrus.views.properties.ui.WidgetAttribute;
 
 /**
  * <!-- begin-user-doc -->
@@ -34,7 +34,7 @@ import org.eclipse.papyrus.properties.ui.WidgetAttribute;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.properties.ui.impl.UIComponentImpl#getAttributes <em>Attributes</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.ui.impl.UIComponentImpl#getAttributes <em>Attributes</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/ui/impl/UiFactoryImpl.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/ui/impl/UiFactoryImpl.java
index f22c33146b5..3b6412de696 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/ui/impl/UiFactoryImpl.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/ui/impl/UiFactoryImpl.java
@@ -9,7 +9,7 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.ui.impl;
+package org.eclipse.papyrus.views.properties.ui.impl;
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
@@ -19,7 +19,7 @@ import org.eclipse.emf.ecore.impl.EFactoryImpl;
 
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
 
-import org.eclipse.papyrus.properties.ui.*;
+import org.eclipse.papyrus.views.properties.ui.*;
 
 /**
  * <!-- begin-user-doc -->
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/ui/impl/UiPackageImpl.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/ui/impl/UiPackageImpl.java
index e84810fc584..1bb390c245b 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/ui/impl/UiPackageImpl.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/ui/impl/UiPackageImpl.java
@@ -9,7 +9,7 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.ui.impl;
+package org.eclipse.papyrus.views.properties.ui.impl;
 
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
@@ -19,27 +19,27 @@ import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.ecore.EcorePackage;
 import org.eclipse.emf.ecore.impl.EPackageImpl;
 
-import org.eclipse.papyrus.properties.contexts.ContextsPackage;
 
-import org.eclipse.papyrus.properties.contexts.impl.ContextsPackageImpl;
 
-import org.eclipse.papyrus.properties.environment.EnvironmentPackage;
 
-import org.eclipse.papyrus.properties.environment.impl.EnvironmentPackageImpl;
 
-import org.eclipse.papyrus.properties.ui.CompositeWidget;
-import org.eclipse.papyrus.properties.ui.Element;
-import org.eclipse.papyrus.properties.ui.Layout;
-import org.eclipse.papyrus.properties.ui.PropertyEditor;
-import org.eclipse.papyrus.properties.ui.ReferenceAttribute;
-import org.eclipse.papyrus.properties.ui.StandardWidget;
-import org.eclipse.papyrus.properties.ui.UIComponent;
-import org.eclipse.papyrus.properties.ui.UiFactory;
-import org.eclipse.papyrus.properties.ui.UiPackage;
-import org.eclipse.papyrus.properties.ui.UnknownComponent;
-import org.eclipse.papyrus.properties.ui.ValueAttribute;
-import org.eclipse.papyrus.properties.ui.Widget;
-import org.eclipse.papyrus.properties.ui.WidgetAttribute;
+import org.eclipse.papyrus.views.properties.contexts.ContextsPackage;
+import org.eclipse.papyrus.views.properties.contexts.impl.ContextsPackageImpl;
+import org.eclipse.papyrus.views.properties.environment.EnvironmentPackage;
+import org.eclipse.papyrus.views.properties.environment.impl.EnvironmentPackageImpl;
+import org.eclipse.papyrus.views.properties.ui.CompositeWidget;
+import org.eclipse.papyrus.views.properties.ui.Element;
+import org.eclipse.papyrus.views.properties.ui.Layout;
+import org.eclipse.papyrus.views.properties.ui.PropertyEditor;
+import org.eclipse.papyrus.views.properties.ui.ReferenceAttribute;
+import org.eclipse.papyrus.views.properties.ui.StandardWidget;
+import org.eclipse.papyrus.views.properties.ui.UIComponent;
+import org.eclipse.papyrus.views.properties.ui.UiFactory;
+import org.eclipse.papyrus.views.properties.ui.UiPackage;
+import org.eclipse.papyrus.views.properties.ui.UnknownComponent;
+import org.eclipse.papyrus.views.properties.ui.ValueAttribute;
+import org.eclipse.papyrus.views.properties.ui.Widget;
+import org.eclipse.papyrus.views.properties.ui.WidgetAttribute;
 
 /**
  * <!-- begin-user-doc -->
@@ -136,7 +136,7 @@ public class UiPackageImpl extends EPackageImpl implements UiPackage {
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.eclipse.papyrus.properties.ui.UiPackage#eNS_URI
+	 * @see org.eclipse.papyrus.views.properties.ui.UiPackage#eNS_URI
 	 * @see #init()
 	 * @generated
 	 */
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/ui/impl/UnknownComponentImpl.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/ui/impl/UnknownComponentImpl.java
index 3b31084ac5f..cb0ade154bd 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/ui/impl/UnknownComponentImpl.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/ui/impl/UnknownComponentImpl.java
@@ -9,7 +9,7 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.ui.impl;
+package org.eclipse.papyrus.views.properties.ui.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -17,8 +17,8 @@ import org.eclipse.emf.ecore.EClass;
 
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 
-import org.eclipse.papyrus.properties.ui.UiPackage;
-import org.eclipse.papyrus.properties.ui.UnknownComponent;
+import org.eclipse.papyrus.views.properties.ui.UiPackage;
+import org.eclipse.papyrus.views.properties.ui.UnknownComponent;
 
 /**
  * <!-- begin-user-doc -->
@@ -27,7 +27,7 @@ import org.eclipse.papyrus.properties.ui.UnknownComponent;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.properties.ui.impl.UnknownComponentImpl#getTypeName <em>Type Name</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.ui.impl.UnknownComponentImpl#getTypeName <em>Type Name</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/ui/impl/ValueAttributeImpl.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/ui/impl/ValueAttributeImpl.java
index 457f159784d..76270992e5f 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/ui/impl/ValueAttributeImpl.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/ui/impl/ValueAttributeImpl.java
@@ -9,7 +9,7 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.ui.impl;
+package org.eclipse.papyrus.views.properties.ui.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -17,8 +17,8 @@ import org.eclipse.emf.ecore.EClass;
 
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 
-import org.eclipse.papyrus.properties.ui.UiPackage;
-import org.eclipse.papyrus.properties.ui.ValueAttribute;
+import org.eclipse.papyrus.views.properties.ui.UiPackage;
+import org.eclipse.papyrus.views.properties.ui.ValueAttribute;
 
 /**
  * <!-- begin-user-doc -->
@@ -27,7 +27,7 @@ import org.eclipse.papyrus.properties.ui.ValueAttribute;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.properties.ui.impl.ValueAttributeImpl#getValue <em>Value</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.ui.impl.ValueAttributeImpl#getValue <em>Value</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/ui/impl/WidgetAttributeImpl.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/ui/impl/WidgetAttributeImpl.java
index e689365e0bd..0ddf4cd4690 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/ui/impl/WidgetAttributeImpl.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/ui/impl/WidgetAttributeImpl.java
@@ -9,7 +9,7 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.ui.impl;
+package org.eclipse.papyrus.views.properties.ui.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -17,8 +17,8 @@ import org.eclipse.emf.ecore.EClass;
 
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 
-import org.eclipse.papyrus.properties.ui.UiPackage;
-import org.eclipse.papyrus.properties.ui.WidgetAttribute;
+import org.eclipse.papyrus.views.properties.ui.UiPackage;
+import org.eclipse.papyrus.views.properties.ui.WidgetAttribute;
 
 /**
  * <!-- begin-user-doc -->
@@ -27,7 +27,7 @@ import org.eclipse.papyrus.properties.ui.WidgetAttribute;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.properties.ui.impl.WidgetAttributeImpl#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.views.properties.ui.impl.WidgetAttributeImpl#getName <em>Name</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/ui/impl/WidgetImpl.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/ui/impl/WidgetImpl.java
index 6942e6bd6b6..f1d61794a77 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/ui/impl/WidgetImpl.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/ui/impl/WidgetImpl.java
@@ -9,12 +9,12 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.ui.impl;
+package org.eclipse.papyrus.views.properties.ui.impl;
 
 import org.eclipse.emf.ecore.EClass;
 
-import org.eclipse.papyrus.properties.ui.UiPackage;
-import org.eclipse.papyrus.properties.ui.Widget;
+import org.eclipse.papyrus.views.properties.ui.UiPackage;
+import org.eclipse.papyrus.views.properties.ui.Widget;
 
 /**
  * <!-- begin-user-doc -->
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/ui/util/UiAdapterFactory.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/ui/util/UiAdapterFactory.java
index 22b6884198b..1504c27f046 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/ui/util/UiAdapterFactory.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/ui/util/UiAdapterFactory.java
@@ -9,7 +9,7 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.ui.util;
+package org.eclipse.papyrus.views.properties.ui.util;
 
 import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.notify.Notifier;
@@ -18,14 +18,14 @@ import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
 
 import org.eclipse.emf.ecore.EObject;
 
-import org.eclipse.papyrus.properties.ui.*;
+import org.eclipse.papyrus.views.properties.ui.*;
 
 /**
  * <!-- begin-user-doc -->
  * The <b>Adapter Factory</b> for the model.
  * It provides an adapter <code>createXXX</code> method for each class of the model.
  * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.properties.ui.UiPackage
+ * @see org.eclipse.papyrus.views.properties.ui.UiPackage
  * @generated
  */
 public class UiAdapterFactory extends AdapterFactoryImpl {
@@ -141,13 +141,13 @@ public class UiAdapterFactory extends AdapterFactoryImpl {
 
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.properties.ui.Element <em>Element</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.views.properties.ui.Element <em>Element</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.properties.ui.Element
+	 * @see org.eclipse.papyrus.views.properties.ui.Element
 	 * @generated
 	 */
 	public Adapter createElementAdapter() {
@@ -155,13 +155,13 @@ public class UiAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.properties.ui.UIComponent <em>UI Component</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.views.properties.ui.UIComponent <em>UI Component</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.properties.ui.UIComponent
+	 * @see org.eclipse.papyrus.views.properties.ui.UIComponent
 	 * @generated
 	 */
 	public Adapter createUIComponentAdapter() {
@@ -169,13 +169,13 @@ public class UiAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.properties.ui.Widget <em>Widget</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.views.properties.ui.Widget <em>Widget</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.properties.ui.Widget
+	 * @see org.eclipse.papyrus.views.properties.ui.Widget
 	 * @generated
 	 */
 	public Adapter createWidgetAdapter() {
@@ -183,13 +183,13 @@ public class UiAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.properties.ui.StandardWidget <em>Standard Widget</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.views.properties.ui.StandardWidget <em>Standard Widget</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.properties.ui.StandardWidget
+	 * @see org.eclipse.papyrus.views.properties.ui.StandardWidget
 	 * @generated
 	 */
 	public Adapter createStandardWidgetAdapter() {
@@ -197,13 +197,13 @@ public class UiAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.properties.ui.PropertyEditor <em>Property Editor</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.views.properties.ui.PropertyEditor <em>Property Editor</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.properties.ui.PropertyEditor
+	 * @see org.eclipse.papyrus.views.properties.ui.PropertyEditor
 	 * @generated
 	 */
 	public Adapter createPropertyEditorAdapter() {
@@ -211,13 +211,13 @@ public class UiAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.properties.ui.CompositeWidget <em>Composite Widget</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.views.properties.ui.CompositeWidget <em>Composite Widget</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.properties.ui.CompositeWidget
+	 * @see org.eclipse.papyrus.views.properties.ui.CompositeWidget
 	 * @generated
 	 */
 	public Adapter createCompositeWidgetAdapter() {
@@ -225,13 +225,13 @@ public class UiAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.properties.ui.Layout <em>Layout</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.views.properties.ui.Layout <em>Layout</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.properties.ui.Layout
+	 * @see org.eclipse.papyrus.views.properties.ui.Layout
 	 * @generated
 	 */
 	public Adapter createLayoutAdapter() {
@@ -239,13 +239,13 @@ public class UiAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.properties.ui.WidgetAttribute <em>Widget Attribute</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.views.properties.ui.WidgetAttribute <em>Widget Attribute</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.properties.ui.WidgetAttribute
+	 * @see org.eclipse.papyrus.views.properties.ui.WidgetAttribute
 	 * @generated
 	 */
 	public Adapter createWidgetAttributeAdapter() {
@@ -253,13 +253,13 @@ public class UiAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.properties.ui.ValueAttribute <em>Value Attribute</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.views.properties.ui.ValueAttribute <em>Value Attribute</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.properties.ui.ValueAttribute
+	 * @see org.eclipse.papyrus.views.properties.ui.ValueAttribute
 	 * @generated
 	 */
 	public Adapter createValueAttributeAdapter() {
@@ -267,13 +267,13 @@ public class UiAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.properties.ui.ReferenceAttribute <em>Reference Attribute</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.views.properties.ui.ReferenceAttribute <em>Reference Attribute</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.properties.ui.ReferenceAttribute
+	 * @see org.eclipse.papyrus.views.properties.ui.ReferenceAttribute
 	 * @generated
 	 */
 	public Adapter createReferenceAttributeAdapter() {
@@ -281,13 +281,13 @@ public class UiAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.properties.ui.UnknownComponent <em>Unknown Component</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.views.properties.ui.UnknownComponent <em>Unknown Component</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.properties.ui.UnknownComponent
+	 * @see org.eclipse.papyrus.views.properties.ui.UnknownComponent
 	 * @generated
 	 */
 	public Adapter createUnknownComponentAdapter() {
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/ui/util/UiSwitch.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/ui/util/UiSwitch.java
index dade9e55509..0932d73ea5e 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/properties/ui/util/UiSwitch.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/src-gen/org/eclipse/papyrus/views/properties/ui/util/UiSwitch.java
@@ -9,7 +9,7 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.properties.ui.util;
+package org.eclipse.papyrus.views.properties.ui.util;
 
 import java.util.List;
 
@@ -18,7 +18,7 @@ import org.eclipse.emf.ecore.EObject;
 
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.util.Switch;
-import org.eclipse.papyrus.properties.ui.*;
+import org.eclipse.papyrus.views.properties.ui.*;
 
 /**
  * <!-- begin-user-doc -->
@@ -30,7 +30,7 @@ import org.eclipse.papyrus.properties.ui.*;
  * until a non-null result is returned,
  * which is the result of the switch.
  * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.properties.ui.UiPackage
+ * @see org.eclipse.papyrus.views.properties.ui.UiPackage
  * @generated
  */
 public class UiSwitch<T> extends Switch<T> {
author	cletavernie	2011-11-10 09:16:09 +0000
committer	cletavernie	2011-11-10 09:16:09 +0000
commit	28db7def625d0aa14f3d0ade72045023481686c4 (patch)
tree	5166a21e25d823ac768d85939fc0bd35181b56da /plugins/views/properties/org.eclipse.papyrus.views.properties.model
parent	760e03be3cac41d0e1c96ff28f3bfd9a6350dab9 (diff)
download	org.eclipse.papyrus-28db7def625d0aa14f3d0ade72045023481686c4.tar.gz org.eclipse.papyrus-28db7def625d0aa14f3d0ade72045023481686c4.tar.xz org.eclipse.papyrus-28db7def625d0aa14f3d0ade72045023481686c4.zip