329 files changed, 620 insertions, 564 deletions

diff --git a/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/META-INF/MANIFEST.MF b/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/META-INF/MANIFEST.MF
index 9bb83bd1cbd..8009aa2e0e8 100644
--- a/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/META-INF/MANIFEST.MF
+++ b/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",

  org.eclipse.papyrus.views.properties;bundle-version="1.2.0",

  org.eclipse.papyrus.infra.properties;bundle-version="1.2.0",

- org.eclipse.papyrus.customization.properties;bundle-version="1.2.0",

+ org.eclipse.papyrus.views.properties.toolsmiths;bundle-version="1.2.0",

  org.eclipse.papyrus.cdo.core;bundle-version="1.2.0",

  org.eclipse.emf.edit.ui;bundle-version="2.8.0",

  org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",

diff --git a/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/plugin.xml b/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/plugin.xml
index 2b1b899097a..52c585602d0 100644
--- a/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/plugin.xml
+++ b/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/plugin.xml
@@ -9,7 +9,7 @@
    </extension>
    
    <extension
-         point="org.eclipse.papyrus.customization.properties.contextStorage">
+         point="org.eclipse.papyrus.views.properties.toolsmiths.contextStorage">
       <actionProvider
             class="org.eclipse.papyrus.cdo.internal.ui.customization.properties.storage.action.CDOContextStorageActionProvider">
       </actionProvider>
diff --git a/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/action/CDOContextCopyAction.java b/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/action/CDOContextCopyAction.java
index 76d14a80abf..0f658427b2c 100644
--- a/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/action/CDOContextCopyAction.java
+++ b/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/action/CDOContextCopyAction.java
@@ -16,7 +16,7 @@ package org.eclipse.papyrus.cdo.internal.ui.customization.properties.storage.act
 
 import static org.eclipse.papyrus.cdo.internal.ui.customization.properties.storage.CDOContextStorageProvider.CONTEXTS_PATH;
 import static org.eclipse.papyrus.cdo.internal.ui.customization.properties.storage.CDOContextStorageProvider.CONTEXT_EXTENSION;
-import static org.eclipse.papyrus.customization.properties.storage.actions.ContextStorageActionUtil.isRelative;
+import static org.eclipse.papyrus.views.properties.toolsmiths.storage.actions.ContextStorageActionUtil.isRelative;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -55,14 +55,14 @@ import org.eclipse.papyrus.cdo.internal.ui.customization.properties.Activator;
 import org.eclipse.papyrus.cdo.internal.ui.customization.properties.messages.Messages;
 import org.eclipse.papyrus.cdo.internal.ui.customization.properties.storage.CDOTextURIHandler;
 import org.eclipse.papyrus.cdo.internal.ui.dialogs.CheckoutSelectionDialog;
-import org.eclipse.papyrus.customization.properties.storage.actions.ContextStorageActionUtil;
-import org.eclipse.papyrus.customization.properties.storage.actions.IContextCopyAction;
 import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
 import org.eclipse.papyrus.infra.properties.catalog.PropertiesURIHandler;
 import org.eclipse.papyrus.infra.properties.contexts.Context;
 import org.eclipse.papyrus.infra.properties.contexts.Section;
 import org.eclipse.papyrus.infra.properties.contexts.Tab;
 import org.eclipse.papyrus.infra.properties.ui.util.PropertiesUtil;
+import org.eclipse.papyrus.views.properties.toolsmiths.storage.actions.ContextStorageActionUtil;
+import org.eclipse.papyrus.views.properties.toolsmiths.storage.actions.IContextCopyAction;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Shell;
 
diff --git a/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/action/CDOContextDeleteAction.java b/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/action/CDOContextDeleteAction.java
index 2a012364797..ea43dd32483 100644
--- a/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/action/CDOContextDeleteAction.java
+++ b/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/action/CDOContextDeleteAction.java
@@ -20,8 +20,8 @@ import org.eclipse.emf.cdo.transaction.CDOTransaction;
 import org.eclipse.osgi.util.NLS;

 import org.eclipse.papyrus.cdo.internal.ui.customization.properties.Activator;

 import org.eclipse.papyrus.cdo.internal.ui.customization.properties.messages.Messages;

-import org.eclipse.papyrus.customization.properties.storage.actions.IContextDeleteAction;

 import org.eclipse.papyrus.infra.properties.contexts.Context;

+import org.eclipse.papyrus.views.properties.toolsmiths.storage.actions.IContextDeleteAction;

 

 /**

  * This is the CDOContextDeleteAction type. Enjoy.

diff --git a/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/action/CDOContextEditAction.java b/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/action/CDOContextEditAction.java
index 4d94d6fb29c..29d6c4b3444 100644
--- a/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/action/CDOContextEditAction.java
+++ b/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/action/CDOContextEditAction.java
@@ -23,8 +23,8 @@ import org.eclipse.emf.cdo.view.CDOView;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.papyrus.cdo.internal.ui.customization.properties.Activator;
 import org.eclipse.papyrus.cdo.internal.ui.customization.properties.messages.Messages;
-import org.eclipse.papyrus.customization.properties.storage.actions.IContextEditAction;
 import org.eclipse.papyrus.infra.properties.contexts.Context;
+import org.eclipse.papyrus.views.properties.toolsmiths.storage.actions.IContextEditAction;
 import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.IPartListener;
diff --git a/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/action/CDOContextStorageActionProvider.java b/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/action/CDOContextStorageActionProvider.java
index b5802246222..03fbe31d05a 100644
--- a/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/action/CDOContextStorageActionProvider.java
+++ b/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/action/CDOContextStorageActionProvider.java
@@ -17,11 +17,11 @@ import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.papyrus.cdo.internal.core.CDOUtils;
 import org.eclipse.papyrus.cdo.internal.ui.customization.properties.storage.CDOTextURIHandler;
-import org.eclipse.papyrus.customization.properties.storage.actions.AbstractContextStorageActionProvider;
-import org.eclipse.papyrus.customization.properties.storage.actions.IContextCopyAction;
-import org.eclipse.papyrus.customization.properties.storage.actions.IContextDeleteAction;
-import org.eclipse.papyrus.customization.properties.storage.actions.IContextEditAction;
 import org.eclipse.papyrus.infra.properties.contexts.Context;
+import org.eclipse.papyrus.views.properties.toolsmiths.storage.actions.AbstractContextStorageActionProvider;
+import org.eclipse.papyrus.views.properties.toolsmiths.storage.actions.IContextCopyAction;
+import org.eclipse.papyrus.views.properties.toolsmiths.storage.actions.IContextDeleteAction;
+import org.eclipse.papyrus.views.properties.toolsmiths.storage.actions.IContextEditAction;
 
 
 /**
diff --git a/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/action/CDOResourceEditorInput.java b/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/action/CDOResourceEditorInput.java
index 46ab6f1129e..6106b585488 100644
--- a/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/action/CDOResourceEditorInput.java
+++ b/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/action/CDOResourceEditorInput.java
@@ -13,7 +13,7 @@ package org.eclipse.papyrus.cdo.internal.ui.customization.properties.storage.act
 
 import org.eclipse.emf.cdo.eresource.CDOResourceNode;
 import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.papyrus.customization.properties.editor.ResourceEditorInput;
+import org.eclipse.papyrus.views.properties.toolsmiths.editor.ResourceEditorInput;
 
 
 /**
diff --git a/tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/.settings/org.eclipse.m2e.core.prefs b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/.settings/org.eclipse.m2e.core.prefs
index f897a7f1cb2..f897a7f1cb2 100644
--- a/tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/.settings/org.eclipse.m2e.core.prefs
+++ b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/.settings/org.eclipse.m2e.core.prefs
diff --git a/features/papyrus-toolsmiths-features/org.eclipse.papyrus.toolsmiths.feature/feature.xml b/features/papyrus-toolsmiths-features/org.eclipse.papyrus.toolsmiths.feature/feature.xml
index e5101eaedf2..72a924847e4 100644
--- a/features/papyrus-toolsmiths-features/org.eclipse.papyrus.toolsmiths.feature/feature.xml
+++ b/features/papyrus-toolsmiths-features/org.eclipse.papyrus.toolsmiths.feature/feature.xml
@@ -52,19 +52,19 @@
   <!--Properties-->
 
    <plugin
-         id="org.eclipse.papyrus.customization.properties"
+         id="org.eclipse.papyrus.views.properties.toolsmiths"
          download-size="0"
          install-size="0"
          version="0.0.0"/>
 
    <plugin
-         id="org.eclipse.papyrus.customization.properties.generation"
+         id="org.eclipse.papyrus.uml.properties.generation"
          download-size="0"
          install-size="0"
          version="0.0.0"/>
 
    <plugin
-         id="org.eclipse.papyrus.customization.properties.model.xwt"
+         id="org.eclipse.papyrus.views.properties.model.xwt"
          download-size="0"
          install-size="0"
          version="0.0.0"
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/.settings/org.eclipse.core.resources.prefs b/plugins/customization/org.eclipse.papyrus.customization.properties/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index bcf749cfe4b..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Fri Nov 04 13:26:28 CET 2011

-eclipse.preferences.version=1

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

diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/META-INF/MANIFEST.MF b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/META-INF/MANIFEST.MF
index 7b533edbce7..c76f12a6498 100644
--- a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/META-INF/MANIFEST.MF
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Export-Package: org.eclipse.papyrus.infra.properties.internal.ui;x-internal:=tru
  org.eclipse.papyrus.infra.properties.internal.ui.extensions;x-friends:="org.eclipse.papyrus.views.properties",
  org.eclipse.papyrus.infra.properties.internal.ui.messages;x-internal:=true,
  org.eclipse.papyrus.infra.properties.internal.ui.observable;x-internal:=true,
- org.eclipse.papyrus.infra.properties.internal.ui.runtime;x-friends:="org.eclipse.papyrus.customization.properties,org.eclipse.papyrus.views.properties",
+ org.eclipse.papyrus.infra.properties.internal.ui.runtime;x-friends:="org.eclipse.papyrus.views.properties.toolsmiths,org.eclipse.papyrus.views.properties",
  org.eclipse.papyrus.infra.properties.ui.creation,
  org.eclipse.papyrus.infra.properties.ui.modelelement,
  org.eclipse.papyrus.infra.properties.ui.preferences,
diff --git a/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths/.settings/org.eclipse.m2e.core.prefs b/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 00000000000..f897a7f1cb2
--- /dev/null
+++ b/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/toolsmiths/pom.xml b/plugins/toolsmiths/pom.xml
index 8d8e85824cd..560c92ef04d 100644
--- a/plugins/toolsmiths/pom.xml
+++ b/plugins/toolsmiths/pom.xml
@@ -16,8 +16,5 @@
 	<modules>
 		<module>../customization/org.eclipse.papyrus.customization.palette</module>
 		<module>../customization/org.eclipse.papyrus.customization.paletteconfiguration</module>
-		<module>../customization/org.eclipse.papyrus.customization.properties</module>
-		<module>../customization/org.eclipse.papyrus.customization.properties.generation</module>
-		<module>../customization/org.eclipse.papyrus.customization.properties.model.xwt</module>
 	</modules>
 </project>
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/.classpath b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/.classpath
index afb9bb46ef3..afb9bb46ef3 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/.classpath
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/.classpath
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/.project b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/.project
index 6d6510228aa..5d10c22d1f5 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/.project
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.papyrus.customization.properties.generation</name>
+	<name>org.eclipse.papyrus.uml.properties.generation</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/.settings/org.eclipse.core.resources.prefs b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/.settings/org.eclipse.core.resources.prefs
index 5c5769cb2b7..5c5769cb2b7 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/.settings/org.eclipse.core.resources.prefs
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/.settings/org.eclipse.core.resources.prefs
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/.settings/org.eclipse.jdt.core.prefs
index 4759947300a..4759947300a 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/.settings/org.eclipse.jdt.ui.prefs b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/.settings/org.eclipse.jdt.ui.prefs
index 954281dbc31..954281dbc31 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/.settings/org.eclipse.ltk.core.refactoring.prefs b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/.settings/org.eclipse.ltk.core.refactoring.prefs
index 97424a1b74b..97424a1b74b 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/.settings/org.eclipse.ltk.core.refactoring.prefs
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/.settings/org.eclipse.m2m.qvt.oml.mmodel.urimap b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/.settings/org.eclipse.m2m.qvt.oml.mmodel.urimap
index eefc2508728..eefc2508728 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/.settings/org.eclipse.m2m.qvt.oml.mmodel.urimap
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/.settings/org.eclipse.m2m.qvt.oml.mmodel.urimap
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/.settings/org.eclipse.pde.api.tools.prefs b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/.settings/org.eclipse.pde.api.tools.prefs
index 23fb95e120f..23fb95e120f 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/.settings/org.eclipse.pde.api.tools.prefs
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/.settings/org.eclipse.pde.api.tools.prefs
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/META-INF/MANIFEST.MF b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/META-INF/MANIFEST.MF
index 4ef8e8e314a..53670858819 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/META-INF/MANIFEST.MF
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/META-INF/MANIFEST.MF
@@ -8,9 +8,9 @@ Require-Bundle: org.eclipse.m2m.qvt.oml;bundle-version="[3.6.0,4.0.0)";visibilit
  org.eclipse.papyrus.infra.properties.edit;bundle-version="[1.2.0,2.0.0)",
  org.eclipse.uml2.uml;bundle-version="[5.2.0,6.0.0)";visibility:=reexport,
  org.eclipse.papyrus.views.properties;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.customization.properties.model.xwt;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.views.properties.model.xwt;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.m2m.qvt.oml.project;bundle-version="[3.6.0,4.0.0)",
- org.eclipse.papyrus.customization.properties;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.views.properties.toolsmiths;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.jface.databinding;bundle-version="[1.8.0,2.0.0)"
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ActivationPolicy: lazy
@@ -22,5 +22,5 @@ Bundle-Name: %Bundle-Name
 Bundle-ManifestVersion: 2
 Bundle-Activator: org.eclipse.papyrus.customization.properties.generation.Activator
 Bundle-Description: %pluginDescription
-Bundle-SymbolicName: org.eclipse.papyrus.customization.properties.generation;singleton:=true
+Bundle-SymbolicName: org.eclipse.papyrus.uml.properties.generation;singleton:=true
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/OSGI-INF/l10n/bundle.properties b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/OSGI-INF/l10n/bundle.properties
index 6c2bdc083c1..6c2bdc083c1 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/OSGI-INF/l10n/bundle.properties
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/OSGI-INF/l10n/bundle.properties
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/about.html b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/about.html
index 82d49bf5f81..82d49bf5f81 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/about.html
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/about.html
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/build.properties b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/build.properties
index b98a78a64b7..b98a78a64b7 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/build.properties
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/build.properties
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/icons/Context.gif b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/icons/Context.gif
index 9b09a7e4986..9b09a7e4986 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/icons/Context.gif
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/icons/Context.gif
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/icons/default_false.gif b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/icons/default_false.gif
index 2877ea2c81e..2877ea2c81e 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/icons/default_false.gif
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/icons/default_false.gif
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/icons/default_true.gif b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/icons/default_true.gif
index 8202d32d009..8202d32d009 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/icons/default_true.gif
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/icons/default_true.gif
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/icons/false.gif b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/icons/false.gif
index 2877ea2c81e..2877ea2c81e 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/icons/false.gif
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/icons/false.gif
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/icons/new_customization.png b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/icons/new_customization.png
index b1f55327fe4..b1f55327fe4 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/icons/new_customization.png
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/icons/new_customization.png
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/icons/true.gif b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/icons/true.gif
index 8202d32d009..8202d32d009 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/icons/true.gif
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/icons/true.gif
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/icons/wizban-custom.png b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/icons/wizban-custom.png
index 7de87d3526f..7de87d3526f 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/icons/wizban-custom.png
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/icons/wizban-custom.png
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/model/FieldSelection.ecore b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/model/FieldSelection.ecore
index 1c396cdf130..1c396cdf130 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/model/FieldSelection.ecore
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/model/FieldSelection.ecore
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/model/FieldSelection.genmodel b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/model/FieldSelection.genmodel
index 29fde5c4db8..29fde5c4db8 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/model/FieldSelection.genmodel
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/model/FieldSelection.genmodel
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/model/LayoutEuristic.ecore b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/model/LayoutEuristic.ecore
index e693c82623c..e693c82623c 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/model/LayoutEuristic.ecore
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/model/LayoutEuristic.ecore
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/plugin.properties b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/plugin.properties
index a98692aeeb6..a98692aeeb6 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/plugin.properties
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/plugin.properties
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/plugin.xml b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/plugin.xml
index 79fa9226086..79fa9226086 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/plugin.xml
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/plugin.xml
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/pom.xml b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/pom.xml
index 7a12c408faf..77991d4c9ac 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/pom.xml
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/pom.xml
@@ -3,12 +3,11 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.eclipse.papyrus</groupId>
-		<artifactId>org.eclipse.papyrus.toolsmiths</artifactId>
-		<version>0.0.1-SNAPSHOT</version>
-		<relativePath>../../toolsmiths/pom.xml</relativePath>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.uml-properties</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
 	</parent>
-	<artifactId>org.eclipse.papyrus.customization.properties.model.xwt</artifactId>
-	<version>1.2.0-SNAPSHOT</version>
+	<artifactId>org.eclipse.papyrus.uml.properties.generation</artifactId>
+	<version>2.0.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
+</project>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/schema/org.eclipse.papyrus.customization.properties.generation.generator.exsd b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/schema/org.eclipse.papyrus.customization.properties.generation.generator.exsd
index 635073b5c3e..635073b5c3e 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/schema/org.eclipse.papyrus.customization.properties.generation.generator.exsd
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/schema/org.eclipse.papyrus.customization.properties.generation.generator.exsd
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/schema/org.eclipse.papyrus.customization.properties.generation.layout.exsd b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/schema/org.eclipse.papyrus.customization.properties.generation.layout.exsd
index 042d3f9e9a9..042d3f9e9a9 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/schema/org.eclipse.papyrus.customization.properties.generation.layout.exsd
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/schema/org.eclipse.papyrus.customization.properties.generation.layout.exsd
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src-gen/org/eclipse/papyrus/customization/properties/generation/fieldselection/ContextElement.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/src-gen/org/eclipse/papyrus/customization/properties/generation/fieldselection/ContextElement.java
index aa985272179..aa985272179 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src-gen/org/eclipse/papyrus/customization/properties/generation/fieldselection/ContextElement.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/src-gen/org/eclipse/papyrus/customization/properties/generation/fieldselection/ContextElement.java
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src-gen/org/eclipse/papyrus/customization/properties/generation/fieldselection/FieldSelection.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/src-gen/org/eclipse/papyrus/customization/properties/generation/fieldselection/FieldSelection.java
index 16addfaf4e3..16addfaf4e3 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src-gen/org/eclipse/papyrus/customization/properties/generation/fieldselection/FieldSelection.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/src-gen/org/eclipse/papyrus/customization/properties/generation/fieldselection/FieldSelection.java
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src-gen/org/eclipse/papyrus/customization/properties/generation/fieldselection/FieldSelectionFactory.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/src-gen/org/eclipse/papyrus/customization/properties/generation/fieldselection/FieldSelectionFactory.java
index 5632454f329..5632454f329 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src-gen/org/eclipse/papyrus/customization/properties/generation/fieldselection/FieldSelectionFactory.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/src-gen/org/eclipse/papyrus/customization/properties/generation/fieldselection/FieldSelectionFactory.java
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src-gen/org/eclipse/papyrus/customization/properties/generation/fieldselection/FieldSelectionPackage.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/src-gen/org/eclipse/papyrus/customization/properties/generation/fieldselection/FieldSelectionPackage.java
index 287e0c608ee..287e0c608ee 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src-gen/org/eclipse/papyrus/customization/properties/generation/fieldselection/FieldSelectionPackage.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/src-gen/org/eclipse/papyrus/customization/properties/generation/fieldselection/FieldSelectionPackage.java
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src-gen/org/eclipse/papyrus/customization/properties/generation/fieldselection/PropertyDefinition.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/src-gen/org/eclipse/papyrus/customization/properties/generation/fieldselection/PropertyDefinition.java
index 694011b2fa3..694011b2fa3 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src-gen/org/eclipse/papyrus/customization/properties/generation/fieldselection/PropertyDefinition.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/src-gen/org/eclipse/papyrus/customization/properties/generation/fieldselection/PropertyDefinition.java
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src-gen/org/eclipse/papyrus/customization/properties/generation/fieldselection/impl/ContextElementImpl.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/src-gen/org/eclipse/papyrus/customization/properties/generation/fieldselection/impl/ContextElementImpl.java
index 8080c9c7f8f..8080c9c7f8f 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src-gen/org/eclipse/papyrus/customization/properties/generation/fieldselection/impl/ContextElementImpl.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/src-gen/org/eclipse/papyrus/customization/properties/generation/fieldselection/impl/ContextElementImpl.java
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src-gen/org/eclipse/papyrus/customization/properties/generation/fieldselection/impl/FieldSelectionFactoryImpl.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/src-gen/org/eclipse/papyrus/customization/properties/generation/fieldselection/impl/FieldSelectionFactoryImpl.java
index f7c62389c69..f7c62389c69 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src-gen/org/eclipse/papyrus/customization/properties/generation/fieldselection/impl/FieldSelectionFactoryImpl.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/src-gen/org/eclipse/papyrus/customization/properties/generation/fieldselection/impl/FieldSelectionFactoryImpl.java
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src-gen/org/eclipse/papyrus/customization/properties/generation/fieldselection/impl/FieldSelectionImpl.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/src-gen/org/eclipse/papyrus/customization/properties/generation/fieldselection/impl/FieldSelectionImpl.java
index 949e6317da9..949e6317da9 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src-gen/org/eclipse/papyrus/customization/properties/generation/fieldselection/impl/FieldSelectionImpl.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/src-gen/org/eclipse/papyrus/customization/properties/generation/fieldselection/impl/FieldSelectionImpl.java
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src-gen/org/eclipse/papyrus/customization/properties/generation/fieldselection/impl/FieldSelectionPackageImpl.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/src-gen/org/eclipse/papyrus/customization/properties/generation/fieldselection/impl/FieldSelectionPackageImpl.java
index 45cdfa65c55..45cdfa65c55 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src-gen/org/eclipse/papyrus/customization/properties/generation/fieldselection/impl/FieldSelectionPackageImpl.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/src-gen/org/eclipse/papyrus/customization/properties/generation/fieldselection/impl/FieldSelectionPackageImpl.java
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src-gen/org/eclipse/papyrus/customization/properties/generation/fieldselection/impl/PropertyDefinitionImpl.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/src-gen/org/eclipse/papyrus/customization/properties/generation/fieldselection/impl/PropertyDefinitionImpl.java
index 26a72221bb2..26a72221bb2 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src-gen/org/eclipse/papyrus/customization/properties/generation/fieldselection/impl/PropertyDefinitionImpl.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/src-gen/org/eclipse/papyrus/customization/properties/generation/fieldselection/impl/PropertyDefinitionImpl.java
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src-gen/org/eclipse/papyrus/customization/properties/generation/fieldselection/util/FieldSelectionAdapterFactory.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/src-gen/org/eclipse/papyrus/customization/properties/generation/fieldselection/util/FieldSelectionAdapterFactory.java
index 6aafbe1766f..6aafbe1766f 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src-gen/org/eclipse/papyrus/customization/properties/generation/fieldselection/util/FieldSelectionAdapterFactory.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/src-gen/org/eclipse/papyrus/customization/properties/generation/fieldselection/util/FieldSelectionAdapterFactory.java
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src-gen/org/eclipse/papyrus/customization/properties/generation/fieldselection/util/FieldSelectionSwitch.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/src-gen/org/eclipse/papyrus/customization/properties/generation/fieldselection/util/FieldSelectionSwitch.java
index 1151b7c653c..1151b7c653c 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src-gen/org/eclipse/papyrus/customization/properties/generation/fieldselection/util/FieldSelectionSwitch.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/src-gen/org/eclipse/papyrus/customization/properties/generation/fieldselection/util/FieldSelectionSwitch.java
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/Activator.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/Activator.java
index 8b0c4fdf072..8b0c4fdf072 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/Activator.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/Activator.java
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/extensionpoint/GeneratorExtensionPoint.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/extensionpoint/GeneratorExtensionPoint.java
index 8a7a011a201..8a7a011a201 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/extensionpoint/GeneratorExtensionPoint.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/extensionpoint/GeneratorExtensionPoint.java
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/extensionpoint/LayoutExtensionPoint.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/extensionpoint/LayoutExtensionPoint.java
index a04720cdf5e..a04720cdf5e 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/extensionpoint/LayoutExtensionPoint.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/extensionpoint/LayoutExtensionPoint.java
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/generators/AbstractQVTGenerator.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/generators/AbstractQVTGenerator.java
index 7e664840de4..7e664840de4 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/generators/AbstractQVTGenerator.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/generators/AbstractQVTGenerator.java
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/generators/EcoreGenerator.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/generators/EcoreGenerator.java
index c9d1b229e7a..c9d1b229e7a 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/generators/EcoreGenerator.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/generators/EcoreGenerator.java
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/generators/EditContextGenerator.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/generators/EditContextGenerator.java
index 7c23a341749..7c23a341749 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/generators/EditContextGenerator.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/generators/EditContextGenerator.java
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/generators/IGenerator.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/generators/IGenerator.java
index 683ab418956..683ab418956 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/generators/IGenerator.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/generators/IGenerator.java
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/generators/ProfileGenerator.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/generators/ProfileGenerator.java
index 92066951805..92066951805 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/generators/ProfileGenerator.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/generators/ProfileGenerator.java
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/layout/GeneratorProfileDataType.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/layout/GeneratorProfileDataType.java
index bac11eb282b..bac11eb282b 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/layout/GeneratorProfileDataType.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/layout/GeneratorProfileDataType.java
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/layout/ILayoutGenerator.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/layout/ILayoutGenerator.java
index b20c6034afc..b20c6034afc 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/layout/ILayoutGenerator.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/layout/ILayoutGenerator.java
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/layout/ProfileWithDatatypes.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/layout/ProfileWithDatatypes.java
index e516e887b6d..e516e887b6d 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/layout/ProfileWithDatatypes.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/layout/ProfileWithDatatypes.java
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/layout/StandardLayoutGenerator.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/layout/StandardLayoutGenerator.java
index 7ebf1c589f2..7ebf1c589f2 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/layout/StandardLayoutGenerator.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/layout/StandardLayoutGenerator.java
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/messages/Messages.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/messages/Messages.java
index 8ee5b92666d..8ee5b92666d 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/messages/Messages.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/messages/Messages.java
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/messages/messages.properties b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/messages/messages.properties
index abe6c8fc5ba..abe6c8fc5ba 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/messages/messages.properties
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/messages/messages.properties
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/providers/DataContextPropertiesContentProvider.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/providers/DataContextPropertiesContentProvider.java
index fb0de1742e3..326ca6c37cc 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/providers/DataContextPropertiesContentProvider.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/providers/DataContextPropertiesContentProvider.java
@@ -13,8 +13,8 @@ package org.eclipse.papyrus.customization.properties.generation.providers;
 

 import java.util.List;

 

-import org.eclipse.papyrus.customization.properties.providers.PropertyContentProvider;

 import org.eclipse.papyrus.infra.properties.contexts.Context;

+import org.eclipse.papyrus.views.properties.toolsmiths.providers.PropertyContentProvider;

 

 

 public class DataContextPropertiesContentProvider extends PropertyContentProvider {

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/providers/DataContextPropertiesLabelProvider.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/providers/DataContextPropertiesLabelProvider.java
index db9154adf96..2bbaa125c9a 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/providers/DataContextPropertiesLabelProvider.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/providers/DataContextPropertiesLabelProvider.java
@@ -18,9 +18,9 @@ import org.eclipse.jface.viewers.StyledCellLabelProvider;
 import org.eclipse.jface.viewers.StyledString;

 import org.eclipse.jface.viewers.ViewerCell;

 import org.eclipse.papyrus.customization.properties.generation.wizard.SelectFieldsPage;

-import org.eclipse.papyrus.customization.properties.providers.ContextLabelProvider;

 import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

 import org.eclipse.papyrus.infra.properties.contexts.Property;

+import org.eclipse.papyrus.views.properties.toolsmiths.providers.ContextLabelProvider;

 import org.eclipse.swt.graphics.Image;

 

 public class DataContextPropertiesLabelProvider extends StyledCellLabelProvider {

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/validators/AbstractValidator.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/validators/AbstractValidator.java
index 0aa404ec6e0..0aa404ec6e0 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/validators/AbstractValidator.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/validators/AbstractValidator.java
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/validators/SourceValidator.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/validators/SourceValidator.java
index 3273dd876dd..3273dd876dd 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/validators/SourceValidator.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/validators/SourceValidator.java
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/validators/TargetValidator.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/validators/TargetValidator.java
index 7aae8904862..7aae8904862 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/validators/TargetValidator.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/validators/TargetValidator.java
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/wizard/AbstractCreateContextPage.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/wizard/AbstractCreateContextPage.java
index 53a460ee9d4..53a460ee9d4 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/wizard/AbstractCreateContextPage.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/wizard/AbstractCreateContextPage.java
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/wizard/CreateContextMainPage.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/wizard/CreateContextMainPage.java
index bffba34409c..bffba34409c 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/wizard/CreateContextMainPage.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/wizard/CreateContextMainPage.java
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/wizard/CreateContextWizard.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/wizard/CreateContextWizard.java
index 3edf5e288ee..3edf5e288ee 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/wizard/CreateContextWizard.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/wizard/CreateContextWizard.java
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/wizard/GeneratorPage.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/wizard/GeneratorPage.java
index 5870cec6b0e..5870cec6b0e 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/wizard/GeneratorPage.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/wizard/GeneratorPage.java
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/wizard/SelectFieldsPage.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/wizard/SelectFieldsPage.java
index 631eacbb11c..631eacbb11c 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/wizard/SelectFieldsPage.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/wizard/SelectFieldsPage.java
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/wizard/SelectOutputPage.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/wizard/SelectOutputPage.java
index 3ad07dde918..3ad07dde918 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/wizard/SelectOutputPage.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/wizard/SelectOutputPage.java
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/wizard/widget/ExtensionFilter.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/wizard/widget/ExtensionFilter.java
index e1fe42399ef..e1fe42399ef 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/wizard/widget/ExtensionFilter.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/wizard/widget/ExtensionFilter.java
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/wizard/widget/FileChooser.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/wizard/widget/FileChooser.java
index 04cdd1414af..04cdd1414af 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/wizard/widget/FileChooser.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/wizard/widget/FileChooser.java
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/wizard/widget/TernaryButton.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/wizard/widget/TernaryButton.java
index f6613aaa6e5..f6613aaa6e5 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/wizard/widget/TernaryButton.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/wizard/widget/TernaryButton.java
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/transforms/ecore2datacontext.qvto b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/transforms/ecore2datacontext.qvto
index 37372e14e84..37372e14e84 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/transforms/ecore2datacontext.qvto
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/transforms/ecore2datacontext.qvto
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/transforms/profile2datacontext.qvto b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/transforms/profile2datacontext.qvto
index d1a1552c36e..d1a1552c36e 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/transforms/profile2datacontext.qvto
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/transforms/profile2datacontext.qvto
diff --git a/plugins/uml/properties/pom.xml b/plugins/uml/properties/pom.xml
index 023e7bfcdf9..71ceb700020 100644
--- a/plugins/uml/properties/pom.xml
+++ b/plugins/uml/properties/pom.xml
@@ -1,18 +1,21 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	<artifactId>org.eclipse.papyrus.uml-properties</artifactId>
-	<packaging>pom</packaging>
+	
 	<parent>
 	    <groupId>org.eclipse.papyrus</groupId>
 	    <artifactId>org.eclipse.papyrus.uml</artifactId>
 	    <version>0.0.1-SNAPSHOT</version>
     </parent>
+    <artifactId>org.eclipse.papyrus.uml-properties</artifactId>
+	<packaging>pom</packaging>
 	<name>Papyrus UML Properties</name>
 	<description>Properties View models for the UML semantics in the Papyrus Properties framework.</description>
 
 	<modules>
 		<module>org.eclipse.papyrus.uml.properties</module>
 		<module>org.eclipse.papyrus.uml.properties.xtext</module>
+		<module>org.eclipse.papyrus.uml.properties.generation</module>
 	</modules>
 </project>
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/.classpath b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/.classpath
index 74056ab23ec..74056ab23ec 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/.classpath
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/.classpath
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/.project b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/.project
index 18d8a87d13e..14d1d43347d 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/.project
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.papyrus.customization.properties.model.xwt</name>
+	<name>org.eclipse.papyrus.views.properties.model.xwt</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/.settings/org.eclipse.jdt.core.prefs b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/.settings/org.eclipse.jdt.core.prefs
index 410244d65a6..410244d65a6 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/.settings/org.eclipse.jdt.ui.prefs b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/.settings/org.eclipse.jdt.ui.prefs
index 954281dbc31..954281dbc31 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/.settings/org.eclipse.m2m.qvt.oml.mmodel.urimap b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/.settings/org.eclipse.m2m.qvt.oml.mmodel.urimap
index 8fb2b8eb4eb..8fb2b8eb4eb 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/.settings/org.eclipse.m2m.qvt.oml.mmodel.urimap
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/.settings/org.eclipse.m2m.qvt.oml.mmodel.urimap
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/.settings/org.eclipse.pde.api.tools.prefs b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/.settings/org.eclipse.pde.api.tools.prefs
index 23fb95e120f..23fb95e120f 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/.settings/org.eclipse.pde.api.tools.prefs
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/.settings/org.eclipse.pde.api.tools.prefs
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/META-INF/MANIFEST.MF b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/META-INF/MANIFEST.MF
index 65bbb0d5aba..821ea99b359 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/META-INF/MANIFEST.MF
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
 Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.customization.properties.model.xwt.resource,
- org.eclipse.papyrus.customization.properties.model.xwt.xwtxml,
- org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.impl,
- org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.util
+Export-Package: org.eclipse.papyrus.views.properties.model.xwt.resource,
+ org.eclipse.papyrus.views.properties.model.xwt.xwtxml,
+ org.eclipse.papyrus.views.properties.model.xwt.xwtxml.impl,
+ org.eclipse.papyrus.views.properties.model.xwt.xwtxml.util
 Require-Bundle: org.eclipse.m2m.qvt.oml;bundle-version="[3.6.0,4.0.0)",
  org.eclipse.papyrus.views.properties;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.wst.xml.core;bundle-version="[1.1.0,2.0.0)",
@@ -11,10 +11,10 @@ Require-Bundle: org.eclipse.m2m.qvt.oml;bundle-version="[3.6.0,4.0.0)",
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .
-Bundle-Version: 1.2.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Name: %Bundle-Name
-Bundle-Activator: org.eclipse.papyrus.customization.properties.model.xwt.Activator
+Bundle-Activator: org.eclipse.papyrus.views.properties.model.xwt.Activator
 Bundle-ManifestVersion: 2
 Bundle-Description: %pluginDescription
-Bundle-SymbolicName: org.eclipse.papyrus.customization.properties.model.xwt;singleton:=true
+Bundle-SymbolicName: org.eclipse.papyrus.views.properties.model.xwt;singleton:=true
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/OSGI-INF/l10n/bundle.properties b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/OSGI-INF/l10n/bundle.properties
index ee4f0e575f2..ee4f0e575f2 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/OSGI-INF/l10n/bundle.properties
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/OSGI-INF/l10n/bundle.properties
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/Transformation/UIToXML.qvto b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/Transformation/UIToXML.qvto
index c84c2640efb..c84c2640efb 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/Transformation/UIToXML.qvto
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/Transformation/UIToXML.qvto
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/Transformation/XMLToUI.qvto b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/Transformation/XMLToUI.qvto
index 4622d426385..4622d426385 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/Transformation/XMLToUI.qvto
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/Transformation/XMLToUI.qvto
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/about.html b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/about.html
index 82d49bf5f81..82d49bf5f81 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/about.html
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/about.html
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/build.properties b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/build.properties
index eb0549dd11b..eb0549dd11b 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/build.properties
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/build.properties
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/model/xml.ecore b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/models/xml.ecore
index 5d171fd3645..5d171fd3645 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/model/xml.ecore
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/models/xml.ecore
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/model/xml.genmodel b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/models/xml.genmodel
index 5c36c07b9fe..54c241238a5 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/model/xml.genmodel
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/models/xml.genmodel
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"

-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.papyrus.customization.properties.model.xwt/src-gen"

-    editDirectory="/org.eclipse.papyrus.customization.properties.model.xwt.edit/src-gen"

-    editorDirectory="/org.eclipse.papyrus.customization.properties.model.xwt.editor/src-gen"

-    modelPluginID="org.eclipse.papyrus.customization.properties.model.xwt" modelName="Xml"

+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.papyrus.views.properties.model.xwt/src-gen"

+    editDirectory="/org.eclipse.papyrus.views.properties.model.xwt.edit/src-gen" editorDirectory="/org.eclipse.papyrus.views.properties.model.xwt.editor/src-gen"

+    modelPluginID="org.eclipse.papyrus.views.properties.model.xwt" modelName="Xml"

+    editPluginClass="org.eclipse.papyrus.views.properties.model.xwt.xwtxml.provider.XmlEditPlugin"

+    editorPluginClass="org.eclipse.papyrus.views.properties.model.xwt.xwtxml.presentation.XmlEditorPlugin"

     rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" testsDirectory="/org.eclipse.papyrus.customization.properties.model.xwt.tests/src-gen"

     importerID="org.eclipse.emf.importer.ecore" complianceLevel="6.0" copyrightFields="false"

+    editPluginID="org.eclipse.papyrus.views.properties.model.xwt.edit" editorPluginID="org.eclipse.papyrus.views.properties.model.xwt.editor"

     operationReflection="true" importOrganizing="true">

   <foreignModel>xml.ecore</foreignModel>

   <genPackages prefix="Xwtxml" basePackage="org.eclipse.papyrus.customization.properties.model.xwt"

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/plugin.properties b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/plugin.properties
index c8f09daf30b..c8f09daf30b 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/plugin.properties
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/plugin.properties
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/plugin.xml b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/plugin.xml
index 51531413ee9..6f2d1209fee 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/plugin.xml
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/plugin.xml
@@ -2,7 +2,7 @@
 <?eclipse version="3.4"?>

 <plugin>

  	<extension point="org.eclipse.emf.ecore.extension_parser">

-      <parser class="org.eclipse.papyrus.customization.properties.model.xwt.resource.XWTModelFactory" type="xwt">

+      <parser class="org.eclipse.papyrus.views.properties.model.xwt.resource.XWTModelFactory" type="xwt">

       </parser>

    </extension>

   <extension

@@ -16,8 +16,8 @@
       <!-- @generated xml -->

       <package

             uri="http://www.eclipse.org/papyrus/xwt/XML"

-            class="org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.XwtxmlPackage"

-            genModel="model/xml.genmodel"/>

+            class="org.eclipse.papyrus.views.properties.model.xwt.xwtxml.XwtxmlPackage"

+            genModel="models/xml.genmodel"/>

    </extension>

 

 </plugin>

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/pom.xml b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/pom.xml
index 5b0f1fe4dd2..5fe338a3270 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/pom.xml
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/pom.xml
@@ -2,13 +2,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
+	
 	<parent>
+		<artifactId>org.eclipse.papyrus.views-properties</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<artifactId>org.eclipse.papyrus.toolsmiths</artifactId>
 		<version>0.0.1-SNAPSHOT</version>
-		<relativePath>../../toolsmiths/pom.xml</relativePath>
 	</parent>
-	<artifactId>org.eclipse.papyrus.customization.properties</artifactId>
+	<artifactId>org.eclipse.papyrus.views.properties.model.xwt</artifactId>
 	<version>2.0.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/src-gen/org/eclipse/papyrus/customization/properties/model/xwt/xwtxml/Attribute.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/src-gen/org/eclipse/papyrus/views/properties/model/xwt/xwtxml/Attribute.java
index a06b854f661..afa4a978424 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/src-gen/org/eclipse/papyrus/customization/properties/model/xwt/xwtxml/Attribute.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/src-gen/org/eclipse/papyrus/views/properties/model/xwt/xwtxml/Attribute.java
@@ -12,7 +12,7 @@
  * *******************************************************************************

  *

  */

-package org.eclipse.papyrus.customization.properties.model.xwt.xwtxml;

+package org.eclipse.papyrus.views.properties.model.xwt.xwtxml;

 

 

 /**

@@ -23,11 +23,11 @@ package org.eclipse.papyrus.customization.properties.model.xwt.xwtxml;
  * <p>

  * The following features are supported:

  * <ul>

- * <li>{@link org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Attribute#getValue <em>Value</em>}</li>

+ * <li>{@link org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Attribute#getValue <em>Value</em>}</li>

  * </ul>

  * </p>

  *

- * @see org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.XwtxmlPackage#getAttribute()

+ * @see org.eclipse.papyrus.views.properties.model.xwt.xwtxml.XwtxmlPackage#getAttribute()

  * @model

  * @generated

  */

@@ -42,14 +42,14 @@ public interface Attribute extends Node {
 	 *

 	 * @return the value of the '<em>Value</em>' attribute.

 	 * @see #setValue(String)

-	 * @see org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.XwtxmlPackage#getAttribute_Value()

+	 * @see org.eclipse.papyrus.views.properties.model.xwt.xwtxml.XwtxmlPackage#getAttribute_Value()

 	 * @model unique="false" required="true" ordered="false"

 	 * @generated

 	 */

 	String getValue();

 

 	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Attribute#getValue <em>Value</em>}' attribute.

+	 * Sets the value of the '{@link org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Attribute#getValue <em>Value</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 *

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/src-gen/org/eclipse/papyrus/customization/properties/model/xwt/xwtxml/CDATA.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/src-gen/org/eclipse/papyrus/views/properties/model/xwt/xwtxml/CDATA.java
index 92c6197c520..2e9bdb13472 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/src-gen/org/eclipse/papyrus/customization/properties/model/xwt/xwtxml/CDATA.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/src-gen/org/eclipse/papyrus/views/properties/model/xwt/xwtxml/CDATA.java
@@ -12,7 +12,7 @@
  * *******************************************************************************

  *

  */

-package org.eclipse.papyrus.customization.properties.model.xwt.xwtxml;

+package org.eclipse.papyrus.views.properties.model.xwt.xwtxml;

 

 

 /**

@@ -21,7 +21,7 @@ package org.eclipse.papyrus.customization.properties.model.xwt.xwtxml;
  * <!-- end-user-doc -->

  *

  *

- * @see org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.XwtxmlPackage#getCDATA()

+ * @see org.eclipse.papyrus.views.properties.model.xwt.xwtxml.XwtxmlPackage#getCDATA()

  * @model

  * @generated

  */

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/src-gen/org/eclipse/papyrus/customization/properties/model/xwt/xwtxml/Comment.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/src-gen/org/eclipse/papyrus/views/properties/model/xwt/xwtxml/Comment.java
index 3a8201b4aa9..9e8a08d0ae4 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/src-gen/org/eclipse/papyrus/customization/properties/model/xwt/xwtxml/Comment.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/src-gen/org/eclipse/papyrus/views/properties/model/xwt/xwtxml/Comment.java
@@ -12,7 +12,7 @@
  * *******************************************************************************

  *

  */

-package org.eclipse.papyrus.customization.properties.model.xwt.xwtxml;

+package org.eclipse.papyrus.views.properties.model.xwt.xwtxml;

 

 

 /**

@@ -21,7 +21,7 @@ package org.eclipse.papyrus.customization.properties.model.xwt.xwtxml;
  * <!-- end-user-doc -->

  *

  *

- * @see org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.XwtxmlPackage#getComment()

+ * @see org.eclipse.papyrus.views.properties.model.xwt.xwtxml.XwtxmlPackage#getComment()

  * @model

  * @generated

  */

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/src-gen/org/eclipse/papyrus/customization/properties/model/xwt/xwtxml/DocumentTypeDeclaration.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/src-gen/org/eclipse/papyrus/views/properties/model/xwt/xwtxml/DocumentTypeDeclaration.java
index aa8b9454b24..69b72638cc4 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/src-gen/org/eclipse/papyrus/customization/properties/model/xwt/xwtxml/DocumentTypeDeclaration.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/src-gen/org/eclipse/papyrus/views/properties/model/xwt/xwtxml/DocumentTypeDeclaration.java
@@ -12,7 +12,7 @@
  * *******************************************************************************

  *

  */

-package org.eclipse.papyrus.customization.properties.model.xwt.xwtxml;

+package org.eclipse.papyrus.views.properties.model.xwt.xwtxml;

 

 

 /**

@@ -23,12 +23,12 @@ package org.eclipse.papyrus.customization.properties.model.xwt.xwtxml;
  * <p>

  * The following features are supported:

  * <ul>

- * <li>{@link org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.DocumentTypeDeclaration#getPublicID <em>Public ID</em>}</li>

- * <li>{@link org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.DocumentTypeDeclaration#getSystemID <em>System ID</em>}</li>

+ * <li>{@link org.eclipse.papyrus.views.properties.model.xwt.xwtxml.DocumentTypeDeclaration#getPublicID <em>Public ID</em>}</li>

+ * <li>{@link org.eclipse.papyrus.views.properties.model.xwt.xwtxml.DocumentTypeDeclaration#getSystemID <em>System ID</em>}</li>

  * </ul>

  * </p>

  *

- * @see org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.XwtxmlPackage#getDocumentTypeDeclaration()

+ * @see org.eclipse.papyrus.views.properties.model.xwt.xwtxml.XwtxmlPackage#getDocumentTypeDeclaration()

  * @model

  * @generated

  */

@@ -43,14 +43,14 @@ public interface DocumentTypeDeclaration extends Node {
 	 *

 	 * @return the value of the '<em>Public ID</em>' attribute.

 	 * @see #setPublicID(String)

-	 * @see org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.XwtxmlPackage#getDocumentTypeDeclaration_PublicID()

+	 * @see org.eclipse.papyrus.views.properties.model.xwt.xwtxml.XwtxmlPackage#getDocumentTypeDeclaration_PublicID()

 	 * @model

 	 * @generated

 	 */

 	String getPublicID();

 

 	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.DocumentTypeDeclaration#getPublicID <em>Public ID</em>}' attribute.

+	 * Sets the value of the '{@link org.eclipse.papyrus.views.properties.model.xwt.xwtxml.DocumentTypeDeclaration#getPublicID <em>Public ID</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 *

@@ -71,14 +71,14 @@ public interface DocumentTypeDeclaration extends Node {
 	 *

 	 * @return the value of the '<em>System ID</em>' attribute.

 	 * @see #setSystemID(String)

-	 * @see org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.XwtxmlPackage#getDocumentTypeDeclaration_SystemID()

+	 * @see org.eclipse.papyrus.views.properties.model.xwt.xwtxml.XwtxmlPackage#getDocumentTypeDeclaration_SystemID()

 	 * @model

 	 * @generated

 	 */

 	String getSystemID();

 

 	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.DocumentTypeDeclaration#getSystemID <em>System ID</em>}' attribute.

+	 * Sets the value of the '{@link org.eclipse.papyrus.views.properties.model.xwt.xwtxml.DocumentTypeDeclaration#getSystemID <em>System ID</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 *

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/src-gen/org/eclipse/papyrus/customization/properties/model/xwt/xwtxml/Element.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/src-gen/org/eclipse/papyrus/views/properties/model/xwt/xwtxml/Element.java
index 672183d7459..50e748f4728 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/src-gen/org/eclipse/papyrus/customization/properties/model/xwt/xwtxml/Element.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/src-gen/org/eclipse/papyrus/views/properties/model/xwt/xwtxml/Element.java
@@ -12,7 +12,7 @@
  * *******************************************************************************

  *

  */

-package org.eclipse.papyrus.customization.properties.model.xwt.xwtxml;

+package org.eclipse.papyrus.views.properties.model.xwt.xwtxml;

 

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

 

@@ -24,19 +24,19 @@ import org.eclipse.emf.common.util.EList;
  * <p>

  * The following features are supported:

  * <ul>

- * <li>{@link org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Element#getChildren <em>Children</em>}</li>

+ * <li>{@link org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Element#getChildren <em>Children</em>}</li>

  * </ul>

  * </p>

  *

- * @see org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.XwtxmlPackage#getElement()

+ * @see org.eclipse.papyrus.views.properties.model.xwt.xwtxml.XwtxmlPackage#getElement()

  * @model

  * @generated

  */

 public interface Element extends Node {

 	/**

 	 * Returns the value of the '<em><b>Children</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Node}.

-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Node#getParent <em>Parent</em>}'.

+	 * The list contents are of type {@link org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Node}.

+	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Node#getParent <em>Parent</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <p>

 	 * If the meaning of the '<em>Children</em>' containment reference list isn't clear, there really should be more of a description here...

@@ -44,8 +44,8 @@ public interface Element extends Node {
 	 * <!-- end-user-doc -->

 	 *

 	 * @return the value of the '<em>Children</em>' containment reference list.

-	 * @see org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.XwtxmlPackage#getElement_Children()

-	 * @see org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Node#getParent

+	 * @see org.eclipse.papyrus.views.properties.model.xwt.xwtxml.XwtxmlPackage#getElement_Children()

+	 * @see org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Node#getParent

 	 * @model opposite="parent" containment="true"

 	 * @generated

 	 */

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/src-gen/org/eclipse/papyrus/customization/properties/model/xwt/xwtxml/Namespace.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/src-gen/org/eclipse/papyrus/views/properties/model/xwt/xwtxml/Namespace.java
index 9be6fa28e6e..9bfcbc6ae48 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/src-gen/org/eclipse/papyrus/customization/properties/model/xwt/xwtxml/Namespace.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/src-gen/org/eclipse/papyrus/views/properties/model/xwt/xwtxml/Namespace.java
@@ -12,7 +12,7 @@
  * *******************************************************************************

  *

  */

-package org.eclipse.papyrus.customization.properties.model.xwt.xwtxml;

+package org.eclipse.papyrus.views.properties.model.xwt.xwtxml;

 

 

 /**

@@ -21,7 +21,7 @@ package org.eclipse.papyrus.customization.properties.model.xwt.xwtxml;
  * <!-- end-user-doc -->

  *

  *

- * @see org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.XwtxmlPackage#getNamespace()

+ * @see org.eclipse.papyrus.views.properties.model.xwt.xwtxml.XwtxmlPackage#getNamespace()

  * @model

  * @generated

  */

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/src-gen/org/eclipse/papyrus/customization/properties/model/xwt/xwtxml/Node.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/src-gen/org/eclipse/papyrus/views/properties/model/xwt/xwtxml/Node.java
index e33dfc546da..b5ae9e69299 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/src-gen/org/eclipse/papyrus/customization/properties/model/xwt/xwtxml/Node.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/src-gen/org/eclipse/papyrus/views/properties/model/xwt/xwtxml/Node.java
@@ -12,7 +12,7 @@
  * *******************************************************************************

  *

  */

-package org.eclipse.papyrus.customization.properties.model.xwt.xwtxml;

+package org.eclipse.papyrus.views.properties.model.xwt.xwtxml;

 

 import org.eclipse.emf.ecore.EObject;

 

@@ -24,12 +24,12 @@ import org.eclipse.emf.ecore.EObject;
  * <p>

  * The following features are supported:

  * <ul>

- * <li>{@link org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Node#getName <em>Name</em>}</li>

- * <li>{@link org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Node#getParent <em>Parent</em>}</li>

+ * <li>{@link org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Node#getName <em>Name</em>}</li>

+ * <li>{@link org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Node#getParent <em>Parent</em>}</li>

  * </ul>

  * </p>

  *

- * @see org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.XwtxmlPackage#getNode()

+ * @see org.eclipse.papyrus.views.properties.model.xwt.xwtxml.XwtxmlPackage#getNode()

  * @model abstract="true"

  * @generated

  */

@@ -44,14 +44,14 @@ public interface Node extends EObject {
 	 *

 	 * @return the value of the '<em>Name</em>' attribute.

 	 * @see #setName(String)

-	 * @see org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.XwtxmlPackage#getNode_Name()

+	 * @see org.eclipse.papyrus.views.properties.model.xwt.xwtxml.XwtxmlPackage#getNode_Name()

 	 * @model unique="false" required="true" ordered="false"

 	 * @generated

 	 */

 	String getName();

 

 	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Node#getName <em>Name</em>}' attribute.

+	 * Sets the value of the '{@link org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Node#getName <em>Name</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 *

@@ -64,7 +64,7 @@ public interface Node extends EObject {
 

 	/**

 	 * Returns the value of the '<em><b>Parent</b></em>' container reference.

-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Element#getChildren <em>Children</em>}'.

+	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Element#getChildren <em>Children</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <p>

 	 * If the meaning of the '<em>Parent</em>' container reference isn't clear, there really should be more of a description here...

@@ -73,15 +73,15 @@ public interface Node extends EObject {
 	 *

 	 * @return the value of the '<em>Parent</em>' container reference.

 	 * @see #setParent(Element)

-	 * @see org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.XwtxmlPackage#getNode_Parent()

-	 * @see org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Element#getChildren

+	 * @see org.eclipse.papyrus.views.properties.model.xwt.xwtxml.XwtxmlPackage#getNode_Parent()

+	 * @see org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Element#getChildren

 	 * @model opposite="children" transient="false" ordered="false"

 	 * @generated

 	 */

 	Element getParent();

 

 	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Node#getParent <em>Parent</em>}' container reference.

+	 * Sets the value of the '{@link org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Node#getParent <em>Parent</em>}' container reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 *

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/src-gen/org/eclipse/papyrus/customization/properties/model/xwt/xwtxml/ProcessingInstruction.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/src-gen/org/eclipse/papyrus/views/properties/model/xwt/xwtxml/ProcessingInstruction.java
index cd957f67d68..505dbef4b23 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/src-gen/org/eclipse/papyrus/customization/properties/model/xwt/xwtxml/ProcessingInstruction.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/src-gen/org/eclipse/papyrus/views/properties/model/xwt/xwtxml/ProcessingInstruction.java
@@ -12,7 +12,7 @@
  * *******************************************************************************

  *

  */

-package org.eclipse.papyrus.customization.properties.model.xwt.xwtxml;

+package org.eclipse.papyrus.views.properties.model.xwt.xwtxml;

 

 

 /**

@@ -23,11 +23,11 @@ package org.eclipse.papyrus.customization.properties.model.xwt.xwtxml;
  * <p>

  * The following features are supported:

  * <ul>

- * <li>{@link org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.ProcessingInstruction#getData <em>Data</em>}</li>

+ * <li>{@link org.eclipse.papyrus.views.properties.model.xwt.xwtxml.ProcessingInstruction#getData <em>Data</em>}</li>

  * </ul>

  * </p>

  *

- * @see org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.XwtxmlPackage#getProcessingInstruction()

+ * @see org.eclipse.papyrus.views.properties.model.xwt.xwtxml.XwtxmlPackage#getProcessingInstruction()

  * @model

  * @generated

  */

@@ -42,14 +42,14 @@ public interface ProcessingInstruction extends Node {
 	 *

 	 * @return the value of the '<em>Data</em>' attribute.

 	 * @see #setData(String)

-	 * @see org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.XwtxmlPackage#getProcessingInstruction_Data()

+	 * @see org.eclipse.papyrus.views.properties.model.xwt.xwtxml.XwtxmlPackage#getProcessingInstruction_Data()

 	 * @model required="true"

 	 * @generated

 	 */

 	String getData();

 

 	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.ProcessingInstruction#getData <em>Data</em>}' attribute.

+	 * Sets the value of the '{@link org.eclipse.papyrus.views.properties.model.xwt.xwtxml.ProcessingInstruction#getData <em>Data</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 *

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/src-gen/org/eclipse/papyrus/customization/properties/model/xwt/xwtxml/Root.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/src-gen/org/eclipse/papyrus/views/properties/model/xwt/xwtxml/Root.java
index f7dfe854a4b..ef52ed208f7 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/src-gen/org/eclipse/papyrus/customization/properties/model/xwt/xwtxml/Root.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/src-gen/org/eclipse/papyrus/views/properties/model/xwt/xwtxml/Root.java
@@ -12,7 +12,7 @@
  * *******************************************************************************

  *

  */

-package org.eclipse.papyrus.customization.properties.model.xwt.xwtxml;

+package org.eclipse.papyrus.views.properties.model.xwt.xwtxml;

 

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

 

@@ -24,20 +24,20 @@ import org.eclipse.emf.common.util.EList;
  * <p>

  * The following features are supported:

  * <ul>

- * <li>{@link org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Root#getNamespaces <em>Namespaces</em>}</li>

- * <li>{@link org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Root#getDtd <em>Dtd</em>}</li>

- * <li>{@link org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Root#getLeadingPIs <em>Leading PIs</em>}</li>

+ * <li>{@link org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Root#getNamespaces <em>Namespaces</em>}</li>

+ * <li>{@link org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Root#getDtd <em>Dtd</em>}</li>

+ * <li>{@link org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Root#getLeadingPIs <em>Leading PIs</em>}</li>

  * </ul>

  * </p>

  *

- * @see org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.XwtxmlPackage#getRoot()

+ * @see org.eclipse.papyrus.views.properties.model.xwt.xwtxml.XwtxmlPackage#getRoot()

  * @model

  * @generated

  */

 public interface Root extends Element {

 	/**

 	 * Returns the value of the '<em><b>Namespaces</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Namespace}.

+	 * The list contents are of type {@link org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Namespace}.

 	 * <!-- begin-user-doc -->

 	 * <p>

 	 * If the meaning of the '<em>Namespaces</em>' containment reference list isn't clear, there really should be more of a description here...

@@ -45,7 +45,7 @@ public interface Root extends Element {
 	 * <!-- end-user-doc -->

 	 *

 	 * @return the value of the '<em>Namespaces</em>' containment reference list.

-	 * @see org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.XwtxmlPackage#getRoot_Namespaces()

+	 * @see org.eclipse.papyrus.views.properties.model.xwt.xwtxml.XwtxmlPackage#getRoot_Namespaces()

 	 * @model containment="true"

 	 * @generated

 	 */

@@ -61,14 +61,14 @@ public interface Root extends Element {
 	 *

 	 * @return the value of the '<em>Dtd</em>' containment reference.

 	 * @see #setDtd(DocumentTypeDeclaration)

-	 * @see org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.XwtxmlPackage#getRoot_Dtd()

+	 * @see org.eclipse.papyrus.views.properties.model.xwt.xwtxml.XwtxmlPackage#getRoot_Dtd()

 	 * @model containment="true"

 	 * @generated

 	 */

 	DocumentTypeDeclaration getDtd();

 

 	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Root#getDtd <em>Dtd</em>}' containment reference.

+	 * Sets the value of the '{@link org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Root#getDtd <em>Dtd</em>}' containment reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 *

@@ -81,7 +81,7 @@ public interface Root extends Element {
 

 	/**

 	 * Returns the value of the '<em><b>Leading PIs</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.ProcessingInstruction}.

+	 * The list contents are of type {@link org.eclipse.papyrus.views.properties.model.xwt.xwtxml.ProcessingInstruction}.

 	 * <!-- begin-user-doc -->

 	 * <p>

 	 * If the meaning of the '<em>Leading PIs</em>' containment reference list isn't clear, there really should be more of a description here...

@@ -89,7 +89,7 @@ public interface Root extends Element {
 	 * <!-- end-user-doc -->

 	 *

 	 * @return the value of the '<em>Leading PIs</em>' containment reference list.

-	 * @see org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.XwtxmlPackage#getRoot_LeadingPIs()

+	 * @see org.eclipse.papyrus.views.properties.model.xwt.xwtxml.XwtxmlPackage#getRoot_LeadingPIs()

 	 * @model containment="true"

 	 * @generated

 	 */

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/src-gen/org/eclipse/papyrus/customization/properties/model/xwt/xwtxml/Text.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/src-gen/org/eclipse/papyrus/views/properties/model/xwt/xwtxml/Text.java
index b5eccaad6f3..d100dff3af5 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/src-gen/org/eclipse/papyrus/customization/properties/model/xwt/xwtxml/Text.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/src-gen/org/eclipse/papyrus/views/properties/model/xwt/xwtxml/Text.java
@@ -12,7 +12,7 @@
  * *******************************************************************************

  *

  */

-package org.eclipse.papyrus.customization.properties.model.xwt.xwtxml;

+package org.eclipse.papyrus.views.properties.model.xwt.xwtxml;

 

 

 /**

@@ -21,7 +21,7 @@ package org.eclipse.papyrus.customization.properties.model.xwt.xwtxml;
  * <!-- end-user-doc -->

  *

  *

- * @see org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.XwtxmlPackage#getText()

+ * @see org.eclipse.papyrus.views.properties.model.xwt.xwtxml.XwtxmlPackage#getText()

  * @model

  * @generated

  */

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/src-gen/org/eclipse/papyrus/customization/properties/model/xwt/xwtxml/XwtxmlFactory.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/src-gen/org/eclipse/papyrus/views/properties/model/xwt/xwtxml/XwtxmlFactory.java
index d00866ebec1..8ecbb773c68 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/src-gen/org/eclipse/papyrus/customization/properties/model/xwt/xwtxml/XwtxmlFactory.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/src-gen/org/eclipse/papyrus/views/properties/model/xwt/xwtxml/XwtxmlFactory.java
@@ -12,7 +12,7 @@
  * *******************************************************************************

  *

  */

-package org.eclipse.papyrus.customization.properties.model.xwt.xwtxml;

+package org.eclipse.papyrus.views.properties.model.xwt.xwtxml;

 

 import org.eclipse.emf.ecore.EFactory;

 

@@ -22,7 +22,7 @@ import org.eclipse.emf.ecore.EFactory;
  * It provides a create method for each non-abstract class of the model.

  * <!-- end-user-doc -->

  *

- * @see org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.XwtxmlPackage

+ * @see org.eclipse.papyrus.views.properties.model.xwt.xwtxml.XwtxmlPackage

  * @generated

  */

 public interface XwtxmlFactory extends EFactory {

@@ -33,7 +33,7 @@ public interface XwtxmlFactory extends EFactory {
 	 *

 	 * @generated

 	 */

-	XwtxmlFactory eINSTANCE = org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.impl.XwtxmlFactoryImpl.init();

+	XwtxmlFactory eINSTANCE = org.eclipse.papyrus.views.properties.model.xwt.xwtxml.impl.XwtxmlFactoryImpl.init();

 

 	/**

 	 * Returns a new object of class '<em>Attribute</em>'.

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/src-gen/org/eclipse/papyrus/customization/properties/model/xwt/xwtxml/XwtxmlPackage.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/src-gen/org/eclipse/papyrus/views/properties/model/xwt/xwtxml/XwtxmlPackage.java
index 7acdbaa7a78..58c20df8a1c 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/src-gen/org/eclipse/papyrus/customization/properties/model/xwt/xwtxml/XwtxmlPackage.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/src-gen/org/eclipse/papyrus/views/properties/model/xwt/xwtxml/XwtxmlPackage.java
@@ -12,7 +12,7 @@
  * *******************************************************************************

  *

  */

-package org.eclipse.papyrus.customization.properties.model.xwt.xwtxml;

+package org.eclipse.papyrus.views.properties.model.xwt.xwtxml;

 

 import org.eclipse.emf.ecore.EAttribute;

 import org.eclipse.emf.ecore.EClass;

@@ -32,7 +32,7 @@ import org.eclipse.emf.ecore.EReference;
  * </ul>

  * <!-- end-user-doc -->

  *

- * @see org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.XwtxmlFactory

+ * @see org.eclipse.papyrus.views.properties.model.xwt.xwtxml.XwtxmlFactory

  * @model kind="package"

  * @generated

  */

@@ -71,15 +71,15 @@ public interface XwtxmlPackage extends EPackage {
 	 *

 	 * @generated

 	 */

-	XwtxmlPackage eINSTANCE = org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.impl.XwtxmlPackageImpl.init();

+	XwtxmlPackage eINSTANCE = org.eclipse.papyrus.views.properties.model.xwt.xwtxml.impl.XwtxmlPackageImpl.init();

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.impl.NodeImpl <em>Node</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.views.properties.model.xwt.xwtxml.impl.NodeImpl <em>Node</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 *

-	 * @see org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.impl.NodeImpl

-	 * @see org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.impl.XwtxmlPackageImpl#getNode()

+	 * @see org.eclipse.papyrus.views.properties.model.xwt.xwtxml.impl.NodeImpl

+	 * @see org.eclipse.papyrus.views.properties.model.xwt.xwtxml.impl.XwtxmlPackageImpl#getNode()

 	 * @generated

 	 */

 	int NODE = 0;

@@ -125,12 +125,12 @@ public interface XwtxmlPackage extends EPackage {
 	int NODE_OPERATION_COUNT = 0;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.impl.AttributeImpl <em>Attribute</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.views.properties.model.xwt.xwtxml.impl.AttributeImpl <em>Attribute</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 *

-	 * @see org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.impl.AttributeImpl

-	 * @see org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.impl.XwtxmlPackageImpl#getAttribute()

+	 * @see org.eclipse.papyrus.views.properties.model.xwt.xwtxml.impl.AttributeImpl

+	 * @see org.eclipse.papyrus.views.properties.model.xwt.xwtxml.impl.XwtxmlPackageImpl#getAttribute()

 	 * @generated

 	 */

 	int ATTRIBUTE = 1;

@@ -186,12 +186,12 @@ public interface XwtxmlPackage extends EPackage {
 	int ATTRIBUTE_OPERATION_COUNT = NODE_OPERATION_COUNT + 0;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.impl.TextImpl <em>Text</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.views.properties.model.xwt.xwtxml.impl.TextImpl <em>Text</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 *

-	 * @see org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.impl.TextImpl

-	 * @see org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.impl.XwtxmlPackageImpl#getText()

+	 * @see org.eclipse.papyrus.views.properties.model.xwt.xwtxml.impl.TextImpl

+	 * @see org.eclipse.papyrus.views.properties.model.xwt.xwtxml.impl.XwtxmlPackageImpl#getText()

 	 * @generated

 	 */

 	int TEXT = 2;

@@ -237,12 +237,12 @@ public interface XwtxmlPackage extends EPackage {
 	int TEXT_OPERATION_COUNT = NODE_OPERATION_COUNT + 0;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.impl.ElementImpl <em>Element</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.views.properties.model.xwt.xwtxml.impl.ElementImpl <em>Element</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 *

-	 * @see org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.impl.ElementImpl

-	 * @see org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.impl.XwtxmlPackageImpl#getElement()

+	 * @see org.eclipse.papyrus.views.properties.model.xwt.xwtxml.impl.ElementImpl

+	 * @see org.eclipse.papyrus.views.properties.model.xwt.xwtxml.impl.XwtxmlPackageImpl#getElement()

 	 * @generated

 	 */

 	int ELEMENT = 3;

@@ -298,12 +298,12 @@ public interface XwtxmlPackage extends EPackage {
 	int ELEMENT_OPERATION_COUNT = NODE_OPERATION_COUNT + 0;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.impl.RootImpl <em>Root</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.views.properties.model.xwt.xwtxml.impl.RootImpl <em>Root</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 *

-	 * @see org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.impl.RootImpl

-	 * @see org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.impl.XwtxmlPackageImpl#getRoot()

+	 * @see org.eclipse.papyrus.views.properties.model.xwt.xwtxml.impl.RootImpl

+	 * @see org.eclipse.papyrus.views.properties.model.xwt.xwtxml.impl.XwtxmlPackageImpl#getRoot()

 	 * @generated

 	 */

 	int ROOT = 4;

@@ -389,12 +389,12 @@ public interface XwtxmlPackage extends EPackage {
 	int ROOT_OPERATION_COUNT = ELEMENT_OPERATION_COUNT + 0;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.impl.NamespaceImpl <em>Namespace</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.views.properties.model.xwt.xwtxml.impl.NamespaceImpl <em>Namespace</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 *

-	 * @see org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.impl.NamespaceImpl

-	 * @see org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.impl.XwtxmlPackageImpl#getNamespace()

+	 * @see org.eclipse.papyrus.views.properties.model.xwt.xwtxml.impl.NamespaceImpl

+	 * @see org.eclipse.papyrus.views.properties.model.xwt.xwtxml.impl.XwtxmlPackageImpl#getNamespace()

 	 * @generated

 	 */

 	int NAMESPACE = 5;

@@ -450,12 +450,12 @@ public interface XwtxmlPackage extends EPackage {
 	int NAMESPACE_OPERATION_COUNT = ATTRIBUTE_OPERATION_COUNT + 0;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.impl.CommentImpl <em>Comment</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.views.properties.model.xwt.xwtxml.impl.CommentImpl <em>Comment</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 *

-	 * @see org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.impl.CommentImpl

-	 * @see org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.impl.XwtxmlPackageImpl#getComment()

+	 * @see org.eclipse.papyrus.views.properties.model.xwt.xwtxml.impl.CommentImpl

+	 * @see org.eclipse.papyrus.views.properties.model.xwt.xwtxml.impl.XwtxmlPackageImpl#getComment()

 	 * @generated

 	 */

 	int COMMENT = 6;

@@ -501,12 +501,12 @@ public interface XwtxmlPackage extends EPackage {
 	int COMMENT_OPERATION_COUNT = NODE_OPERATION_COUNT + 0;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.impl.DocumentTypeDeclarationImpl <em>Document Type Declaration</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.views.properties.model.xwt.xwtxml.impl.DocumentTypeDeclarationImpl <em>Document Type Declaration</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 *

-	 * @see org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.impl.DocumentTypeDeclarationImpl

-	 * @see org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.impl.XwtxmlPackageImpl#getDocumentTypeDeclaration()

+	 * @see org.eclipse.papyrus.views.properties.model.xwt.xwtxml.impl.DocumentTypeDeclarationImpl

+	 * @see org.eclipse.papyrus.views.properties.model.xwt.xwtxml.impl.XwtxmlPackageImpl#getDocumentTypeDeclaration()

 	 * @generated

 	 */

 	int DOCUMENT_TYPE_DECLARATION = 7;

@@ -572,12 +572,12 @@ public interface XwtxmlPackage extends EPackage {
 	int DOCUMENT_TYPE_DECLARATION_OPERATION_COUNT = NODE_OPERATION_COUNT + 0;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.impl.CDATAImpl <em>CDATA</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.views.properties.model.xwt.xwtxml.impl.CDATAImpl <em>CDATA</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 *

-	 * @see org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.impl.CDATAImpl

-	 * @see org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.impl.XwtxmlPackageImpl#getCDATA()

+	 * @see org.eclipse.papyrus.views.properties.model.xwt.xwtxml.impl.CDATAImpl

+	 * @see org.eclipse.papyrus.views.properties.model.xwt.xwtxml.impl.XwtxmlPackageImpl#getCDATA()

 	 * @generated

 	 */

 	int CDATA = 8;

@@ -623,12 +623,12 @@ public interface XwtxmlPackage extends EPackage {
 	int CDATA_OPERATION_COUNT = TEXT_OPERATION_COUNT + 0;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.impl.ProcessingInstructionImpl <em>Processing Instruction</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.views.properties.model.xwt.xwtxml.impl.ProcessingInstructionImpl <em>Processing Instruction</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 *

-	 * @see org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.impl.ProcessingInstructionImpl

-	 * @see org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.impl.XwtxmlPackageImpl#getProcessingInstruction()

+	 * @see org.eclipse.papyrus.views.properties.model.xwt.xwtxml.impl.ProcessingInstructionImpl

+	 * @see org.eclipse.papyrus.views.properties.model.xwt.xwtxml.impl.XwtxmlPackageImpl#getProcessingInstruction()

 	 * @generated

 	 */

 	int PROCESSING_INSTRUCTION = 9;

@@ -685,230 +685,230 @@ public interface XwtxmlPackage extends EPackage {
 

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Node <em>Node</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Node <em>Node</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 *

 	 * @return the meta object for class '<em>Node</em>'.

-	 * @see org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Node

+	 * @see org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Node

 	 * @generated

 	 */

 	EClass getNode();

 

 	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Node#getName <em>Name</em>}'.

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Node#getName <em>Name</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 *

 	 * @return the meta object for the attribute '<em>Name</em>'.

-	 * @see org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Node#getName()

+	 * @see org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Node#getName()

 	 * @see #getNode()

 	 * @generated

 	 */

 	EAttribute getNode_Name();

 

 	/**

-	 * Returns the meta object for the container reference '{@link org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Node#getParent <em>Parent</em>}'.

+	 * Returns the meta object for the container reference '{@link org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Node#getParent <em>Parent</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 *

 	 * @return the meta object for the container reference '<em>Parent</em>'.

-	 * @see org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Node#getParent()

+	 * @see org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Node#getParent()

 	 * @see #getNode()

 	 * @generated

 	 */

 	EReference getNode_Parent();

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Attribute <em>Attribute</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Attribute <em>Attribute</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 *

 	 * @return the meta object for class '<em>Attribute</em>'.

-	 * @see org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Attribute

+	 * @see org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Attribute

 	 * @generated

 	 */

 	EClass getAttribute();

 

 	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Attribute#getValue <em>Value</em>}'.

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Attribute#getValue <em>Value</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 *

 	 * @return the meta object for the attribute '<em>Value</em>'.

-	 * @see org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Attribute#getValue()

+	 * @see org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Attribute#getValue()

 	 * @see #getAttribute()

 	 * @generated

 	 */

 	EAttribute getAttribute_Value();

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Text <em>Text</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Text <em>Text</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 *

 	 * @return the meta object for class '<em>Text</em>'.

-	 * @see org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Text

+	 * @see org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Text

 	 * @generated

 	 */

 	EClass getText();

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Element <em>Element</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Element <em>Element</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 *

 	 * @return the meta object for class '<em>Element</em>'.

-	 * @see org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Element

+	 * @see org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Element

 	 * @generated

 	 */

 	EClass getElement();

 

 	/**

-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Element#getChildren <em>Children</em>}'.

+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Element#getChildren <em>Children</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 *

 	 * @return the meta object for the containment reference list '<em>Children</em>'.

-	 * @see org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Element#getChildren()

+	 * @see org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Element#getChildren()

 	 * @see #getElement()

 	 * @generated

 	 */

 	EReference getElement_Children();

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Root <em>Root</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Root <em>Root</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 *

 	 * @return the meta object for class '<em>Root</em>'.

-	 * @see org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Root

+	 * @see org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Root

 	 * @generated

 	 */

 	EClass getRoot();

 

 	/**

-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Root#getNamespaces <em>Namespaces</em>}'.

+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Root#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.customization.properties.model.xwt.xwtxml.Root#getNamespaces()

+	 * @see org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Root#getNamespaces()

 	 * @see #getRoot()

 	 * @generated

 	 */

 	EReference getRoot_Namespaces();

 

 	/**

-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Root#getDtd <em>Dtd</em>}'.

+	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Root#getDtd <em>Dtd</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 *

 	 * @return the meta object for the containment reference '<em>Dtd</em>'.

-	 * @see org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Root#getDtd()

+	 * @see org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Root#getDtd()

 	 * @see #getRoot()

 	 * @generated

 	 */

 	EReference getRoot_Dtd();

 

 	/**

-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Root#getLeadingPIs <em>Leading PIs</em>}'.

+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Root#getLeadingPIs <em>Leading PIs</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 *

 	 * @return the meta object for the containment reference list '<em>Leading PIs</em>'.

-	 * @see org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Root#getLeadingPIs()

+	 * @see org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Root#getLeadingPIs()

 	 * @see #getRoot()

 	 * @generated

 	 */

 	EReference getRoot_LeadingPIs();

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Namespace <em>Namespace</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Namespace <em>Namespace</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 *

 	 * @return the meta object for class '<em>Namespace</em>'.

-	 * @see org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Namespace

+	 * @see org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Namespace

 	 * @generated

 	 */

 	EClass getNamespace();

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Comment <em>Comment</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Comment <em>Comment</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 *

 	 * @return the meta object for class '<em>Comment</em>'.

-	 * @see org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Comment

+	 * @see org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Comment

 	 * @generated

 	 */

 	EClass getComment();

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.DocumentTypeDeclaration <em>Document Type Declaration</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.views.properties.model.xwt.xwtxml.DocumentTypeDeclaration <em>Document Type Declaration</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 *

 	 * @return the meta object for class '<em>Document Type Declaration</em>'.

-	 * @see org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.DocumentTypeDeclaration

+	 * @see org.eclipse.papyrus.views.properties.model.xwt.xwtxml.DocumentTypeDeclaration

 	 * @generated

 	 */

 	EClass getDocumentTypeDeclaration();

 

 	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.DocumentTypeDeclaration#getPublicID <em>Public ID</em>}'.

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.views.properties.model.xwt.xwtxml.DocumentTypeDeclaration#getPublicID <em>Public ID</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 *

 	 * @return the meta object for the attribute '<em>Public ID</em>'.

-	 * @see org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.DocumentTypeDeclaration#getPublicID()

+	 * @see org.eclipse.papyrus.views.properties.model.xwt.xwtxml.DocumentTypeDeclaration#getPublicID()

 	 * @see #getDocumentTypeDeclaration()

 	 * @generated

 	 */

 	EAttribute getDocumentTypeDeclaration_PublicID();

 

 	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.DocumentTypeDeclaration#getSystemID <em>System ID</em>}'.

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.views.properties.model.xwt.xwtxml.DocumentTypeDeclaration#getSystemID <em>System ID</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 *

 	 * @return the meta object for the attribute '<em>System ID</em>'.

-	 * @see org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.DocumentTypeDeclaration#getSystemID()

+	 * @see org.eclipse.papyrus.views.properties.model.xwt.xwtxml.DocumentTypeDeclaration#getSystemID()

 	 * @see #getDocumentTypeDeclaration()

 	 * @generated

 	 */

 	EAttribute getDocumentTypeDeclaration_SystemID();

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.CDATA <em>CDATA</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.views.properties.model.xwt.xwtxml.CDATA <em>CDATA</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 *

 	 * @return the meta object for class '<em>CDATA</em>'.

-	 * @see org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.CDATA

+	 * @see org.eclipse.papyrus.views.properties.model.xwt.xwtxml.CDATA

 	 * @generated

 	 */

 	EClass getCDATA();

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.ProcessingInstruction <em>Processing Instruction</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.views.properties.model.xwt.xwtxml.ProcessingInstruction <em>Processing Instruction</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 *

 	 * @return the meta object for class '<em>Processing Instruction</em>'.

-	 * @see org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.ProcessingInstruction

+	 * @see org.eclipse.papyrus.views.properties.model.xwt.xwtxml.ProcessingInstruction

 	 * @generated

 	 */

 	EClass getProcessingInstruction();

 

 	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.ProcessingInstruction#getData <em>Data</em>}'.

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.views.properties.model.xwt.xwtxml.ProcessingInstruction#getData <em>Data</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 *

 	 * @return the meta object for the attribute '<em>Data</em>'.

-	 * @see org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.ProcessingInstruction#getData()

+	 * @see org.eclipse.papyrus.views.properties.model.xwt.xwtxml.ProcessingInstruction#getData()

 	 * @see #getProcessingInstruction()

 	 * @generated

 	 */

@@ -940,12 +940,12 @@ public interface XwtxmlPackage extends EPackage {
 	 */

 	interface Literals {

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.impl.NodeImpl <em>Node</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.views.properties.model.xwt.xwtxml.impl.NodeImpl <em>Node</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

 		 *

-		 * @see org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.impl.NodeImpl

-		 * @see org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.impl.XwtxmlPackageImpl#getNode()

+		 * @see org.eclipse.papyrus.views.properties.model.xwt.xwtxml.impl.NodeImpl

+		 * @see org.eclipse.papyrus.views.properties.model.xwt.xwtxml.impl.XwtxmlPackageImpl#getNode()

 		 * @generated

 		 */

 		EClass NODE = eINSTANCE.getNode();

@@ -969,12 +969,12 @@ public interface XwtxmlPackage extends EPackage {
 		EReference NODE__PARENT = eINSTANCE.getNode_Parent();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.impl.AttributeImpl <em>Attribute</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.views.properties.model.xwt.xwtxml.impl.AttributeImpl <em>Attribute</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

 		 *

-		 * @see org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.impl.AttributeImpl

-		 * @see org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.impl.XwtxmlPackageImpl#getAttribute()

+		 * @see org.eclipse.papyrus.views.properties.model.xwt.xwtxml.impl.AttributeImpl

+		 * @see org.eclipse.papyrus.views.properties.model.xwt.xwtxml.impl.XwtxmlPackageImpl#getAttribute()

 		 * @generated

 		 */

 		EClass ATTRIBUTE = eINSTANCE.getAttribute();

@@ -989,23 +989,23 @@ public interface XwtxmlPackage extends EPackage {
 		EAttribute ATTRIBUTE__VALUE = eINSTANCE.getAttribute_Value();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.impl.TextImpl <em>Text</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.views.properties.model.xwt.xwtxml.impl.TextImpl <em>Text</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

 		 *

-		 * @see org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.impl.TextImpl

-		 * @see org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.impl.XwtxmlPackageImpl#getText()

+		 * @see org.eclipse.papyrus.views.properties.model.xwt.xwtxml.impl.TextImpl

+		 * @see org.eclipse.papyrus.views.properties.model.xwt.xwtxml.impl.XwtxmlPackageImpl#getText()

 		 * @generated

 		 */

 		EClass TEXT = eINSTANCE.getText();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.impl.ElementImpl <em>Element</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.views.properties.model.xwt.xwtxml.impl.ElementImpl <em>Element</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

 		 *

-		 * @see org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.impl.ElementImpl

-		 * @see org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.impl.XwtxmlPackageImpl#getElement()

+		 * @see org.eclipse.papyrus.views.properties.model.xwt.xwtxml.impl.ElementImpl

+		 * @see org.eclipse.papyrus.views.properties.model.xwt.xwtxml.impl.XwtxmlPackageImpl#getElement()

 		 * @generated

 		 */

 		EClass ELEMENT = eINSTANCE.getElement();

@@ -1020,12 +1020,12 @@ public interface XwtxmlPackage extends EPackage {
 		EReference ELEMENT__CHILDREN = eINSTANCE.getElement_Children();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.impl.RootImpl <em>Root</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.views.properties.model.xwt.xwtxml.impl.RootImpl <em>Root</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

 		 *

-		 * @see org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.impl.RootImpl

-		 * @see org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.impl.XwtxmlPackageImpl#getRoot()

+		 * @see org.eclipse.papyrus.views.properties.model.xwt.xwtxml.impl.RootImpl

+		 * @see org.eclipse.papyrus.views.properties.model.xwt.xwtxml.impl.XwtxmlPackageImpl#getRoot()

 		 * @generated

 		 */

 		EClass ROOT = eINSTANCE.getRoot();

@@ -1058,34 +1058,34 @@ public interface XwtxmlPackage extends EPackage {
 		EReference ROOT__LEADING_PIS = eINSTANCE.getRoot_LeadingPIs();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.impl.NamespaceImpl <em>Namespace</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.views.properties.model.xwt.xwtxml.impl.NamespaceImpl <em>Namespace</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

 		 *

-		 * @see org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.impl.NamespaceImpl

-		 * @see org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.impl.XwtxmlPackageImpl#getNamespace()

+		 * @see org.eclipse.papyrus.views.properties.model.xwt.xwtxml.impl.NamespaceImpl

+		 * @see org.eclipse.papyrus.views.properties.model.xwt.xwtxml.impl.XwtxmlPackageImpl#getNamespace()

 		 * @generated

 		 */

 		EClass NAMESPACE = eINSTANCE.getNamespace();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.impl.CommentImpl <em>Comment</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.views.properties.model.xwt.xwtxml.impl.CommentImpl <em>Comment</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

 		 *

-		 * @see org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.impl.CommentImpl

-		 * @see org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.impl.XwtxmlPackageImpl#getComment()

+		 * @see org.eclipse.papyrus.views.properties.model.xwt.xwtxml.impl.CommentImpl

+		 * @see org.eclipse.papyrus.views.properties.model.xwt.xwtxml.impl.XwtxmlPackageImpl#getComment()

 		 * @generated

 		 */

 		EClass COMMENT = eINSTANCE.getComment();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.impl.DocumentTypeDeclarationImpl <em>Document Type Declaration</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.views.properties.model.xwt.xwtxml.impl.DocumentTypeDeclarationImpl <em>Document Type Declaration</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

 		 *

-		 * @see org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.impl.DocumentTypeDeclarationImpl

-		 * @see org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.impl.XwtxmlPackageImpl#getDocumentTypeDeclaration()

+		 * @see org.eclipse.papyrus.views.properties.model.xwt.xwtxml.impl.DocumentTypeDeclarationImpl

+		 * @see org.eclipse.papyrus.views.properties.model.xwt.xwtxml.impl.XwtxmlPackageImpl#getDocumentTypeDeclaration()

 		 * @generated

 		 */

 		EClass DOCUMENT_TYPE_DECLARATION = eINSTANCE.getDocumentTypeDeclaration();

@@ -1109,23 +1109,23 @@ public interface XwtxmlPackage extends EPackage {
 		EAttribute DOCUMENT_TYPE_DECLARATION__SYSTEM_ID = eINSTANCE.getDocumentTypeDeclaration_SystemID();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.impl.CDATAImpl <em>CDATA</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.views.properties.model.xwt.xwtxml.impl.CDATAImpl <em>CDATA</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

 		 *

-		 * @see org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.impl.CDATAImpl

-		 * @see org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.impl.XwtxmlPackageImpl#getCDATA()

+		 * @see org.eclipse.papyrus.views.properties.model.xwt.xwtxml.impl.CDATAImpl

+		 * @see org.eclipse.papyrus.views.properties.model.xwt.xwtxml.impl.XwtxmlPackageImpl#getCDATA()

 		 * @generated

 		 */

 		EClass CDATA = eINSTANCE.getCDATA();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.impl.ProcessingInstructionImpl <em>Processing Instruction</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.views.properties.model.xwt.xwtxml.impl.ProcessingInstructionImpl <em>Processing Instruction</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

 		 *

-		 * @see org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.impl.ProcessingInstructionImpl

-		 * @see org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.impl.XwtxmlPackageImpl#getProcessingInstruction()

+		 * @see org.eclipse.papyrus.views.properties.model.xwt.xwtxml.impl.ProcessingInstructionImpl

+		 * @see org.eclipse.papyrus.views.properties.model.xwt.xwtxml.impl.XwtxmlPackageImpl#getProcessingInstruction()

 		 * @generated

 		 */

 		EClass PROCESSING_INSTRUCTION = eINSTANCE.getProcessingInstruction();

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/src-gen/org/eclipse/papyrus/customization/properties/model/xwt/xwtxml/impl/AttributeImpl.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/src-gen/org/eclipse/papyrus/views/properties/model/xwt/xwtxml/impl/AttributeImpl.java
index 6914a15d7b4..484abc9659b 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/src-gen/org/eclipse/papyrus/customization/properties/model/xwt/xwtxml/impl/AttributeImpl.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/src-gen/org/eclipse/papyrus/views/properties/model/xwt/xwtxml/impl/AttributeImpl.java
@@ -12,13 +12,13 @@
  * *******************************************************************************

  *

  */

-package org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.impl;

+package org.eclipse.papyrus.views.properties.model.xwt.xwtxml.impl;

 

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

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Attribute;

-import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.XwtxmlPackage;

+import org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Attribute;

+import org.eclipse.papyrus.views.properties.model.xwt.xwtxml.XwtxmlPackage;

 

 /**

  * <!-- begin-user-doc -->

@@ -27,7 +27,7 @@ import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.XwtxmlPacka
  * <p>

  * The following features are implemented:

  * <ul>

- * <li>{@link org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.impl.AttributeImpl#getValue <em>Value</em>}</li>

+ * <li>{@link org.eclipse.papyrus.views.properties.model.xwt.xwtxml.impl.AttributeImpl#getValue <em>Value</em>}</li>

  * </ul>

  * </p>

  *

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/src-gen/org/eclipse/papyrus/customization/properties/model/xwt/xwtxml/impl/CDATAImpl.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/src-gen/org/eclipse/papyrus/views/properties/model/xwt/xwtxml/impl/CDATAImpl.java
index e30fd65c922..958e6e6544e 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/src-gen/org/eclipse/papyrus/customization/properties/model/xwt/xwtxml/impl/CDATAImpl.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/src-gen/org/eclipse/papyrus/views/properties/model/xwt/xwtxml/impl/CDATAImpl.java
@@ -12,11 +12,11 @@
  * *******************************************************************************

  *

  */

-package org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.impl;

+package org.eclipse.papyrus.views.properties.model.xwt.xwtxml.impl;

 

 import org.eclipse.emf.ecore.EClass;

-import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.CDATA;

-import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.XwtxmlPackage;

+import org.eclipse.papyrus.views.properties.model.xwt.xwtxml.CDATA;

+import org.eclipse.papyrus.views.properties.model.xwt.xwtxml.XwtxmlPackage;

 

 /**

  * <!-- begin-user-doc -->

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/src-gen/org/eclipse/papyrus/customization/properties/model/xwt/xwtxml/impl/CommentImpl.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/src-gen/org/eclipse/papyrus/views/properties/model/xwt/xwtxml/impl/CommentImpl.java
index b16f5cdb124..142b64c2f2c 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/src-gen/org/eclipse/papyrus/customization/properties/model/xwt/xwtxml/impl/CommentImpl.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/src-gen/org/eclipse/papyrus/views/properties/model/xwt/xwtxml/impl/CommentImpl.java
@@ -12,11 +12,11 @@
  * *******************************************************************************

  *

  */

-package org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.impl;

+package org.eclipse.papyrus.views.properties.model.xwt.xwtxml.impl;

 

 import org.eclipse.emf.ecore.EClass;

-import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Comment;

-import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.XwtxmlPackage;

+import org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Comment;

+import org.eclipse.papyrus.views.properties.model.xwt.xwtxml.XwtxmlPackage;

 

 /**

  * <!-- begin-user-doc -->

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/src-gen/org/eclipse/papyrus/customization/properties/model/xwt/xwtxml/impl/DocumentTypeDeclarationImpl.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/src-gen/org/eclipse/papyrus/views/properties/model/xwt/xwtxml/impl/DocumentTypeDeclarationImpl.java
index 4e968d5e5ee..7b254856dbf 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/src-gen/org/eclipse/papyrus/customization/properties/model/xwt/xwtxml/impl/DocumentTypeDeclarationImpl.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/src-gen/org/eclipse/papyrus/views/properties/model/xwt/xwtxml/impl/DocumentTypeDeclarationImpl.java
@@ -12,13 +12,13 @@
  * *******************************************************************************

  *

  */

-package org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.impl;

+package org.eclipse.papyrus.views.properties.model.xwt.xwtxml.impl;

 

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

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.DocumentTypeDeclaration;

-import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.XwtxmlPackage;

+import org.eclipse.papyrus.views.properties.model.xwt.xwtxml.DocumentTypeDeclaration;

+import org.eclipse.papyrus.views.properties.model.xwt.xwtxml.XwtxmlPackage;

 

 /**

  * <!-- begin-user-doc -->

@@ -27,8 +27,8 @@ import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.XwtxmlPacka
  * <p>

  * The following features are implemented:

  * <ul>

- * <li>{@link org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.impl.DocumentTypeDeclarationImpl#getPublicID <em>Public ID</em>}</li>

- * <li>{@link org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.impl.DocumentTypeDeclarationImpl#getSystemID <em>System ID</em>}</li>

+ * <li>{@link org.eclipse.papyrus.views.properties.model.xwt.xwtxml.impl.DocumentTypeDeclarationImpl#getPublicID <em>Public ID</em>}</li>

+ * <li>{@link org.eclipse.papyrus.views.properties.model.xwt.xwtxml.impl.DocumentTypeDeclarationImpl#getSystemID <em>System ID</em>}</li>

  * </ul>

  * </p>

  *

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/src-gen/org/eclipse/papyrus/customization/properties/model/xwt/xwtxml/impl/ElementImpl.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/src-gen/org/eclipse/papyrus/views/properties/model/xwt/xwtxml/impl/ElementImpl.java
index c3ca8954b6a..36128ebfcf5 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/src-gen/org/eclipse/papyrus/customization/properties/model/xwt/xwtxml/impl/ElementImpl.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/src-gen/org/eclipse/papyrus/views/properties/model/xwt/xwtxml/impl/ElementImpl.java
@@ -12,7 +12,7 @@
  * *******************************************************************************

  *

  */

-package org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.impl;

+package org.eclipse.papyrus.views.properties.model.xwt.xwtxml.impl;

 

 import java.util.Collection;

 

@@ -22,9 +22,9 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;

 import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;

 import org.eclipse.emf.ecore.util.InternalEList;

-import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Element;

-import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Node;

-import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.XwtxmlPackage;

+import org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Element;

+import org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Node;

+import org.eclipse.papyrus.views.properties.model.xwt.xwtxml.XwtxmlPackage;

 

 /**

  * <!-- begin-user-doc -->

@@ -33,7 +33,7 @@ import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.XwtxmlPacka
  * <p>

  * The following features are implemented:

  * <ul>

- * <li>{@link org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.impl.ElementImpl#getChildren <em>Children</em>}</li>

+ * <li>{@link org.eclipse.papyrus.views.properties.model.xwt.xwtxml.impl.ElementImpl#getChildren <em>Children</em>}</li>

  * </ul>

  * </p>

  *

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/src-gen/org/eclipse/papyrus/customization/properties/model/xwt/xwtxml/impl/NamespaceImpl.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/src-gen/org/eclipse/papyrus/views/properties/model/xwt/xwtxml/impl/NamespaceImpl.java
index 4d7a27ab147..678f3f768bf 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/src-gen/org/eclipse/papyrus/customization/properties/model/xwt/xwtxml/impl/NamespaceImpl.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/src-gen/org/eclipse/papyrus/views/properties/model/xwt/xwtxml/impl/NamespaceImpl.java
@@ -12,11 +12,11 @@
  * *******************************************************************************

  *

  */

-package org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.impl;

+package org.eclipse.papyrus.views.properties.model.xwt.xwtxml.impl;

 

 import org.eclipse.emf.ecore.EClass;

-import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Namespace;

-import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.XwtxmlPackage;

+import org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Namespace;

+import org.eclipse.papyrus.views.properties.model.xwt.xwtxml.XwtxmlPackage;

 

 /**

  * <!-- begin-user-doc -->

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/src-gen/org/eclipse/papyrus/customization/properties/model/xwt/xwtxml/impl/NodeImpl.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/src-gen/org/eclipse/papyrus/views/properties/model/xwt/xwtxml/impl/NodeImpl.java
index ae2fa07f102..9e91da1fcd6 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/src-gen/org/eclipse/papyrus/customization/properties/model/xwt/xwtxml/impl/NodeImpl.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/src-gen/org/eclipse/papyrus/views/properties/model/xwt/xwtxml/impl/NodeImpl.java
@@ -12,7 +12,7 @@
  * *******************************************************************************

  *

  */

-package org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.impl;

+package org.eclipse.papyrus.views.properties.model.xwt.xwtxml.impl;

 

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

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

@@ -21,9 +21,9 @@ import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;

 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

 import org.eclipse.emf.ecore.util.EcoreUtil;

-import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Element;

-import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Node;

-import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.XwtxmlPackage;

+import org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Element;

+import org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Node;

+import org.eclipse.papyrus.views.properties.model.xwt.xwtxml.XwtxmlPackage;

 

 /**

  * <!-- begin-user-doc -->

@@ -32,8 +32,8 @@ import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.XwtxmlPacka
  * <p>

  * The following features are implemented:

  * <ul>

- * <li>{@link org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.impl.NodeImpl#getName <em>Name</em>}</li>

- * <li>{@link org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.impl.NodeImpl#getParent <em>Parent</em>}</li>

+ * <li>{@link org.eclipse.papyrus.views.properties.model.xwt.xwtxml.impl.NodeImpl#getName <em>Name</em>}</li>

+ * <li>{@link org.eclipse.papyrus.views.properties.model.xwt.xwtxml.impl.NodeImpl#getParent <em>Parent</em>}</li>

  * </ul>

  * </p>

  *

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/src-gen/org/eclipse/papyrus/customization/properties/model/xwt/xwtxml/impl/ProcessingInstructionImpl.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/src-gen/org/eclipse/papyrus/views/properties/model/xwt/xwtxml/impl/ProcessingInstructionImpl.java
index 1f5cc116fdc..98293843398 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/src-gen/org/eclipse/papyrus/customization/properties/model/xwt/xwtxml/impl/ProcessingInstructionImpl.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/src-gen/org/eclipse/papyrus/views/properties/model/xwt/xwtxml/impl/ProcessingInstructionImpl.java
@@ -12,13 +12,13 @@
  * *******************************************************************************

  *

  */

-package org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.impl;

+package org.eclipse.papyrus.views.properties.model.xwt.xwtxml.impl;

 

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

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.ProcessingInstruction;

-import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.XwtxmlPackage;

+import org.eclipse.papyrus.views.properties.model.xwt.xwtxml.ProcessingInstruction;

+import org.eclipse.papyrus.views.properties.model.xwt.xwtxml.XwtxmlPackage;

 

 /**

  * <!-- begin-user-doc -->

@@ -27,7 +27,7 @@ import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.XwtxmlPacka
  * <p>

  * The following features are implemented:

  * <ul>

- * <li>{@link org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.impl.ProcessingInstructionImpl#getData <em>Data</em>}</li>

+ * <li>{@link org.eclipse.papyrus.views.properties.model.xwt.xwtxml.impl.ProcessingInstructionImpl#getData <em>Data</em>}</li>

  * </ul>

  * </p>

  *

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/src-gen/org/eclipse/papyrus/customization/properties/model/xwt/xwtxml/impl/RootImpl.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/src-gen/org/eclipse/papyrus/views/properties/model/xwt/xwtxml/impl/RootImpl.java
index f5b0c35fe8a..4743defc6b5 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/src-gen/org/eclipse/papyrus/customization/properties/model/xwt/xwtxml/impl/RootImpl.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/src-gen/org/eclipse/papyrus/views/properties/model/xwt/xwtxml/impl/RootImpl.java
@@ -12,7 +12,7 @@
  * *******************************************************************************

  *

  */

-package org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.impl;

+package org.eclipse.papyrus.views.properties.model.xwt.xwtxml.impl;

 

 import java.util.Collection;

 

@@ -24,11 +24,11 @@ import org.eclipse.emf.ecore.InternalEObject;
 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.customization.properties.model.xwt.xwtxml.DocumentTypeDeclaration;

-import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Namespace;

-import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.ProcessingInstruction;

-import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Root;

-import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.XwtxmlPackage;

+import org.eclipse.papyrus.views.properties.model.xwt.xwtxml.DocumentTypeDeclaration;

+import org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Namespace;

+import org.eclipse.papyrus.views.properties.model.xwt.xwtxml.ProcessingInstruction;

+import org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Root;

+import org.eclipse.papyrus.views.properties.model.xwt.xwtxml.XwtxmlPackage;

 

 /**

  * <!-- begin-user-doc -->

@@ -37,9 +37,9 @@ import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.XwtxmlPacka
  * <p>

  * The following features are implemented:

  * <ul>

- * <li>{@link org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.impl.RootImpl#getNamespaces <em>Namespaces</em>}</li>

- * <li>{@link org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.impl.RootImpl#getDtd <em>Dtd</em>}</li>

- * <li>{@link org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.impl.RootImpl#getLeadingPIs <em>Leading PIs</em>}</li>

+ * <li>{@link org.eclipse.papyrus.views.properties.model.xwt.xwtxml.impl.RootImpl#getNamespaces <em>Namespaces</em>}</li>

+ * <li>{@link org.eclipse.papyrus.views.properties.model.xwt.xwtxml.impl.RootImpl#getDtd <em>Dtd</em>}</li>

+ * <li>{@link org.eclipse.papyrus.views.properties.model.xwt.xwtxml.impl.RootImpl#getLeadingPIs <em>Leading PIs</em>}</li>

  * </ul>

  * </p>

  *

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/src-gen/org/eclipse/papyrus/customization/properties/model/xwt/xwtxml/impl/TextImpl.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/src-gen/org/eclipse/papyrus/views/properties/model/xwt/xwtxml/impl/TextImpl.java
index 380173ea748..20e86bf12b1 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/src-gen/org/eclipse/papyrus/customization/properties/model/xwt/xwtxml/impl/TextImpl.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/src-gen/org/eclipse/papyrus/views/properties/model/xwt/xwtxml/impl/TextImpl.java
@@ -12,11 +12,11 @@
  * *******************************************************************************

  *

  */

-package org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.impl;

+package org.eclipse.papyrus.views.properties.model.xwt.xwtxml.impl;

 

 import org.eclipse.emf.ecore.EClass;

-import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Text;

-import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.XwtxmlPackage;

+import org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Text;

+import org.eclipse.papyrus.views.properties.model.xwt.xwtxml.XwtxmlPackage;

 

 /**

  * <!-- begin-user-doc -->

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/src-gen/org/eclipse/papyrus/customization/properties/model/xwt/xwtxml/impl/XwtxmlFactoryImpl.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/src-gen/org/eclipse/papyrus/views/properties/model/xwt/xwtxml/impl/XwtxmlFactoryImpl.java
index e8620036205..7e20ba4ab15 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/src-gen/org/eclipse/papyrus/customization/properties/model/xwt/xwtxml/impl/XwtxmlFactoryImpl.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/src-gen/org/eclipse/papyrus/views/properties/model/xwt/xwtxml/impl/XwtxmlFactoryImpl.java
@@ -12,24 +12,24 @@
  * *******************************************************************************

  *

  */

-package org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.impl;

+package org.eclipse.papyrus.views.properties.model.xwt.xwtxml.impl;

 

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.ecore.EPackage;

 import org.eclipse.emf.ecore.impl.EFactoryImpl;

 import org.eclipse.emf.ecore.plugin.EcorePlugin;

-import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Attribute;

-import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.CDATA;

-import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Comment;

-import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.DocumentTypeDeclaration;

-import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Element;

-import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Namespace;

-import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.ProcessingInstruction;

-import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Root;

-import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Text;

-import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.XwtxmlFactory;

-import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.XwtxmlPackage;

+import org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Attribute;

+import org.eclipse.papyrus.views.properties.model.xwt.xwtxml.CDATA;

+import org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Comment;

+import org.eclipse.papyrus.views.properties.model.xwt.xwtxml.DocumentTypeDeclaration;

+import org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Element;

+import org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Namespace;

+import org.eclipse.papyrus.views.properties.model.xwt.xwtxml.ProcessingInstruction;

+import org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Root;

+import org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Text;

+import org.eclipse.papyrus.views.properties.model.xwt.xwtxml.XwtxmlFactory;

+import org.eclipse.papyrus.views.properties.model.xwt.xwtxml.XwtxmlPackage;

 

 /**

  * <!-- begin-user-doc -->

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/src-gen/org/eclipse/papyrus/customization/properties/model/xwt/xwtxml/impl/XwtxmlPackageImpl.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/src-gen/org/eclipse/papyrus/views/properties/model/xwt/xwtxml/impl/XwtxmlPackageImpl.java
index b4d521f6252..2ece98dbe02 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/src-gen/org/eclipse/papyrus/customization/properties/model/xwt/xwtxml/impl/XwtxmlPackageImpl.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/src-gen/org/eclipse/papyrus/views/properties/model/xwt/xwtxml/impl/XwtxmlPackageImpl.java
@@ -12,24 +12,24 @@
  * *******************************************************************************

  *

  */

-package org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.impl;

+package org.eclipse.papyrus.views.properties.model.xwt.xwtxml.impl;

 

 import org.eclipse.emf.ecore.EAttribute;

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.EPackage;

 import org.eclipse.emf.ecore.EReference;

 import org.eclipse.emf.ecore.impl.EPackageImpl;

-import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Attribute;

-import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Comment;

-import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.DocumentTypeDeclaration;

-import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Element;

-import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Namespace;

-import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Node;

-import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.ProcessingInstruction;

-import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Root;

-import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Text;

-import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.XwtxmlFactory;

-import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.XwtxmlPackage;

+import org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Attribute;

+import org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Comment;

+import org.eclipse.papyrus.views.properties.model.xwt.xwtxml.DocumentTypeDeclaration;

+import org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Element;

+import org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Namespace;

+import org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Node;

+import org.eclipse.papyrus.views.properties.model.xwt.xwtxml.ProcessingInstruction;

+import org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Root;

+import org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Text;

+import org.eclipse.papyrus.views.properties.model.xwt.xwtxml.XwtxmlFactory;

+import org.eclipse.papyrus.views.properties.model.xwt.xwtxml.XwtxmlPackage;

 

 /**

  * <!-- begin-user-doc -->

@@ -126,7 +126,7 @@ public class XwtxmlPackageImpl extends EPackageImpl implements XwtxmlPackage {
 	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->

 	 *

 	 * @see org.eclipse.emf.ecore.EPackage.Registry

-	 * @see org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.XwtxmlPackage#eNS_URI

+	 * @see org.eclipse.papyrus.views.properties.model.xwt.xwtxml.XwtxmlPackage#eNS_URI

 	 * @see #init()

 	 * @generated

 	 */

@@ -531,7 +531,7 @@ public class XwtxmlPackageImpl extends EPackageImpl implements XwtxmlPackage {
 		initEAttribute(getDocumentTypeDeclaration_PublicID(), ecorePackage.getEString(), "publicID", null, 0, 1, DocumentTypeDeclaration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

 		initEAttribute(getDocumentTypeDeclaration_SystemID(), ecorePackage.getEString(), "systemID", null, 0, 1, DocumentTypeDeclaration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

 

-		initEClass(cdataEClass, org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.CDATA.class, "CDATA", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEClass(cdataEClass, org.eclipse.papyrus.views.properties.model.xwt.xwtxml.CDATA.class, "CDATA", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

 

 		initEClass(processingInstructionEClass, ProcessingInstruction.class, "ProcessingInstruction", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

 		initEAttribute(getProcessingInstruction_Data(), ecorePackage.getEString(), "data", null, 1, 1, ProcessingInstruction.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/src-gen/org/eclipse/papyrus/customization/properties/model/xwt/xwtxml/util/XwtxmlAdapterFactory.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/src-gen/org/eclipse/papyrus/views/properties/model/xwt/xwtxml/util/XwtxmlAdapterFactory.java
index d7c58a4e8cb..c4d5c2ca25b 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/src-gen/org/eclipse/papyrus/customization/properties/model/xwt/xwtxml/util/XwtxmlAdapterFactory.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/src-gen/org/eclipse/papyrus/views/properties/model/xwt/xwtxml/util/XwtxmlAdapterFactory.java
@@ -12,23 +12,23 @@
  * *******************************************************************************

  *

  */

-package org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.util;

+package org.eclipse.papyrus.views.properties.model.xwt.xwtxml.util;

 

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

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

 import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;

 import org.eclipse.emf.ecore.EObject;

-import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Attribute;

-import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.CDATA;

-import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Comment;

-import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.DocumentTypeDeclaration;

-import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Element;

-import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Namespace;

-import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Node;

-import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.ProcessingInstruction;

-import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Root;

-import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Text;

-import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.XwtxmlPackage;

+import org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Attribute;

+import org.eclipse.papyrus.views.properties.model.xwt.xwtxml.CDATA;

+import org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Comment;

+import org.eclipse.papyrus.views.properties.model.xwt.xwtxml.DocumentTypeDeclaration;

+import org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Element;

+import org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Namespace;

+import org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Node;

+import org.eclipse.papyrus.views.properties.model.xwt.xwtxml.ProcessingInstruction;

+import org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Root;

+import org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Text;

+import org.eclipse.papyrus.views.properties.model.xwt.xwtxml.XwtxmlPackage;

 

 /**

  * <!-- begin-user-doc -->

@@ -36,7 +36,7 @@ import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.XwtxmlPacka
  * It provides an adapter <code>createXXX</code> method for each class of the model.

  * <!-- end-user-doc -->

  *

- * @see org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.XwtxmlPackage

+ * @see org.eclipse.papyrus.views.properties.model.xwt.xwtxml.XwtxmlPackage

  * @generated

  */

 public class XwtxmlAdapterFactory extends AdapterFactoryImpl {

@@ -164,14 +164,14 @@ public class XwtxmlAdapterFactory extends AdapterFactoryImpl {
 

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Node <em>Node</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Node <em>Node</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.customization.properties.model.xwt.xwtxml.Node

+	 * @see org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Node

 	 * @generated

 	 */

 	public Adapter createNodeAdapter() {

@@ -179,14 +179,14 @@ public class XwtxmlAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Attribute <em>Attribute</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Attribute <em>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.customization.properties.model.xwt.xwtxml.Attribute

+	 * @see org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Attribute

 	 * @generated

 	 */

 	public Adapter createAttributeAdapter() {

@@ -194,14 +194,14 @@ public class XwtxmlAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Text <em>Text</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Text <em>Text</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.customization.properties.model.xwt.xwtxml.Text

+	 * @see org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Text

 	 * @generated

 	 */

 	public Adapter createTextAdapter() {

@@ -209,14 +209,14 @@ public class XwtxmlAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Element <em>Element</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.views.properties.model.xwt.xwtxml.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.customization.properties.model.xwt.xwtxml.Element

+	 * @see org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Element

 	 * @generated

 	 */

 	public Adapter createElementAdapter() {

@@ -224,14 +224,14 @@ public class XwtxmlAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Root <em>Root</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Root <em>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.customization.properties.model.xwt.xwtxml.Root

+	 * @see org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Root

 	 * @generated

 	 */

 	public Adapter createRootAdapter() {

@@ -239,14 +239,14 @@ public class XwtxmlAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Namespace <em>Namespace</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.views.properties.model.xwt.xwtxml.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.customization.properties.model.xwt.xwtxml.Namespace

+	 * @see org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Namespace

 	 * @generated

 	 */

 	public Adapter createNamespaceAdapter() {

@@ -254,14 +254,14 @@ public class XwtxmlAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Comment <em>Comment</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Comment <em>Comment</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.customization.properties.model.xwt.xwtxml.Comment

+	 * @see org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Comment

 	 * @generated

 	 */

 	public Adapter createCommentAdapter() {

@@ -269,14 +269,14 @@ public class XwtxmlAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.DocumentTypeDeclaration <em>Document Type Declaration</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.views.properties.model.xwt.xwtxml.DocumentTypeDeclaration <em>Document Type Declaration</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.customization.properties.model.xwt.xwtxml.DocumentTypeDeclaration

+	 * @see org.eclipse.papyrus.views.properties.model.xwt.xwtxml.DocumentTypeDeclaration

 	 * @generated

 	 */

 	public Adapter createDocumentTypeDeclarationAdapter() {

@@ -284,14 +284,14 @@ public class XwtxmlAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.CDATA <em>CDATA</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.views.properties.model.xwt.xwtxml.CDATA <em>CDATA</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.customization.properties.model.xwt.xwtxml.CDATA

+	 * @see org.eclipse.papyrus.views.properties.model.xwt.xwtxml.CDATA

 	 * @generated

 	 */

 	public Adapter createCDATAAdapter() {

@@ -299,14 +299,14 @@ public class XwtxmlAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.ProcessingInstruction <em>Processing Instruction</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.views.properties.model.xwt.xwtxml.ProcessingInstruction <em>Processing Instruction</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.customization.properties.model.xwt.xwtxml.ProcessingInstruction

+	 * @see org.eclipse.papyrus.views.properties.model.xwt.xwtxml.ProcessingInstruction

 	 * @generated

 	 */

 	public Adapter createProcessingInstructionAdapter() {

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/src-gen/org/eclipse/papyrus/customization/properties/model/xwt/xwtxml/util/XwtxmlSwitch.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/src-gen/org/eclipse/papyrus/views/properties/model/xwt/xwtxml/util/XwtxmlSwitch.java
index eea3981bf2d..9ca34a74435 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/src-gen/org/eclipse/papyrus/customization/properties/model/xwt/xwtxml/util/XwtxmlSwitch.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/src-gen/org/eclipse/papyrus/views/properties/model/xwt/xwtxml/util/XwtxmlSwitch.java
@@ -12,22 +12,22 @@
  * *******************************************************************************

  *

  */

-package org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.util;

+package org.eclipse.papyrus.views.properties.model.xwt.xwtxml.util;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.ecore.EPackage;

 import org.eclipse.emf.ecore.util.Switch;

-import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Attribute;

-import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.CDATA;

-import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Comment;

-import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.DocumentTypeDeclaration;

-import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Element;

-import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Namespace;

-import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Node;

-import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.ProcessingInstruction;

-import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Root;

-import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Text;

-import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.XwtxmlPackage;

+import org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Attribute;

+import org.eclipse.papyrus.views.properties.model.xwt.xwtxml.CDATA;

+import org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Comment;

+import org.eclipse.papyrus.views.properties.model.xwt.xwtxml.DocumentTypeDeclaration;

+import org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Element;

+import org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Namespace;

+import org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Node;

+import org.eclipse.papyrus.views.properties.model.xwt.xwtxml.ProcessingInstruction;

+import org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Root;

+import org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Text;

+import org.eclipse.papyrus.views.properties.model.xwt.xwtxml.XwtxmlPackage;

 

 /**

  * <!-- begin-user-doc -->

@@ -39,7 +39,7 @@ import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.XwtxmlPacka
  * which is the result of the switch.

  * <!-- end-user-doc -->

  *

- * @see org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.XwtxmlPackage

+ * @see org.eclipse.papyrus.views.properties.model.xwt.xwtxml.XwtxmlPackage

  * @generated

  */

 public class XwtxmlSwitch<T> extends Switch<T> {

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/src/org/eclipse/papyrus/customization/properties/model/xwt/Activator.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/src/org/eclipse/papyrus/views/properties/model/xwt/Activator.java
index fa5de7f428b..38fffbafb00 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/src/org/eclipse/papyrus/customization/properties/model/xwt/Activator.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/src/org/eclipse/papyrus/views/properties/model/xwt/Activator.java
@@ -9,7 +9,7 @@
  * Contributors:

  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.customization.properties.model.xwt;

+package org.eclipse.papyrus.views.properties.model.xwt;

 

 import org.eclipse.papyrus.infra.core.log.LogHelper;

 import org.eclipse.ui.plugin.AbstractUIPlugin;

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/src/org/eclipse/papyrus/customization/properties/model/xwt/format/XMLFormatter.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/src/org/eclipse/papyrus/views/properties/model/xwt/format/XMLFormatter.java
index 041d8f89063..107560bd097 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/src/org/eclipse/papyrus/customization/properties/model/xwt/format/XMLFormatter.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/src/org/eclipse/papyrus/views/properties/model/xwt/format/XMLFormatter.java
@@ -9,13 +9,13 @@
  * Contributors:

  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.customization.properties.model.xwt.format;

+package org.eclipse.papyrus.views.properties.model.xwt.format;

 

 import java.io.IOException;

 

 import org.eclipse.core.resources.IFile;

 import org.eclipse.core.runtime.CoreException;

-import org.eclipse.papyrus.customization.properties.model.xwt.Activator;

+import org.eclipse.papyrus.views.properties.model.xwt.Activator;

 import org.eclipse.wst.xml.core.internal.formatter.XMLFormatterFormatProcessor;

 

 /**

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/src/org/eclipse/papyrus/customization/properties/model/xwt/modisco/GenericXMLHandler.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/src/org/eclipse/papyrus/views/properties/model/xwt/modisco/GenericXMLHandler.java
index 10dd40ee9bb..7707c298443 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/src/org/eclipse/papyrus/customization/properties/model/xwt/modisco/GenericXMLHandler.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/src/org/eclipse/papyrus/views/properties/model/xwt/modisco/GenericXMLHandler.java
@@ -12,22 +12,22 @@
  * *******************************************************************************

  *

  */

-package org.eclipse.papyrus.customization.properties.model.xwt.modisco;

+package org.eclipse.papyrus.views.properties.model.xwt.modisco;

 

 import java.util.ArrayList;

 import java.util.List;

 import java.util.Map;

 

 import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Attribute;

-import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Comment;

-import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.DocumentTypeDeclaration;

-import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Element;

-import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Namespace;

-import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.ProcessingInstruction;

-import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Root;

-import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Text;

-import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.XwtxmlFactory;

+import org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Attribute;

+import org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Comment;

+import org.eclipse.papyrus.views.properties.model.xwt.xwtxml.DocumentTypeDeclaration;

+import org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Element;

+import org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Namespace;

+import org.eclipse.papyrus.views.properties.model.xwt.xwtxml.ProcessingInstruction;

+import org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Root;

+import org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Text;

+import org.eclipse.papyrus.views.properties.model.xwt.xwtxml.XwtxmlFactory;

 import org.xml.sax.Attributes;

 import org.xml.sax.SAXException;

 import org.xml.sax.ext.LexicalHandler;

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/src/org/eclipse/papyrus/customization/properties/model/xwt/modisco/GenericXMLResourceImpl.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/src/org/eclipse/papyrus/views/properties/model/xwt/modisco/GenericXMLResourceImpl.java
index cd340eb1f2b..40d9314a7c8 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/src/org/eclipse/papyrus/customization/properties/model/xwt/modisco/GenericXMLResourceImpl.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/src/org/eclipse/papyrus/views/properties/model/xwt/modisco/GenericXMLResourceImpl.java
@@ -12,7 +12,7 @@
  * *******************************************************************************

  *

  */

-package org.eclipse.papyrus.customization.properties.model.xwt.modisco;

+package org.eclipse.papyrus.views.properties.model.xwt.modisco;

 

 import java.io.IOException;

 import java.io.InputStream;

@@ -26,8 +26,8 @@ import javax.xml.parsers.SAXParserFactory;
 import org.eclipse.emf.common.util.URI;

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.ecore.resource.impl.ResourceImpl;

-import org.eclipse.papyrus.customization.properties.model.xwt.Activator;

-import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Element;

+import org.eclipse.papyrus.views.properties.model.xwt.Activator;

+import org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Element;

 import org.xml.sax.SAXException;

 import org.xml.sax.SAXNotRecognizedException;

 import org.xml.sax.XMLReader;

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/src/org/eclipse/papyrus/customization/properties/model/xwt/modisco/GenericXMLWriter.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/src/org/eclipse/papyrus/views/properties/model/xwt/modisco/GenericXMLWriter.java
index f465a9189b3..03642616ea5 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/src/org/eclipse/papyrus/customization/properties/model/xwt/modisco/GenericXMLWriter.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/src/org/eclipse/papyrus/views/properties/model/xwt/modisco/GenericXMLWriter.java
@@ -12,23 +12,23 @@
  * *******************************************************************************

  *

  */

-package org.eclipse.papyrus.customization.properties.model.xwt.modisco;

+package org.eclipse.papyrus.views.properties.model.xwt.modisco;

 

 import java.io.OutputStream;

 import java.io.OutputStreamWriter;

 import java.io.PrintWriter;

 import java.io.UnsupportedEncodingException;

 

-import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Attribute;

-import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.CDATA;

-import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Comment;

-import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.DocumentTypeDeclaration;

-import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Element;

-import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Namespace;

-import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Node;

-import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.ProcessingInstruction;

-import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Root;

-import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Text;

+import org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Attribute;

+import org.eclipse.papyrus.views.properties.model.xwt.xwtxml.CDATA;

+import org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Comment;

+import org.eclipse.papyrus.views.properties.model.xwt.xwtxml.DocumentTypeDeclaration;

+import org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Element;

+import org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Namespace;

+import org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Node;

+import org.eclipse.papyrus.views.properties.model.xwt.xwtxml.ProcessingInstruction;

+import org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Root;

+import org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Text;

 

 /**

  *

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/src/org/eclipse/papyrus/customization/properties/model/xwt/resource/XWTModelFactory.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/src/org/eclipse/papyrus/views/properties/model/xwt/resource/XWTModelFactory.java
index b2b9145f545..77c7bbcb0cc 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/src/org/eclipse/papyrus/customization/properties/model/xwt/resource/XWTModelFactory.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/src/org/eclipse/papyrus/views/properties/model/xwt/resource/XWTModelFactory.java
@@ -9,7 +9,7 @@
  * Contributors:

  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.customization.properties.model.xwt.resource;

+package org.eclipse.papyrus.views.properties.model.xwt.resource;

 

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

 import org.eclipse.emf.ecore.resource.Resource;

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/src/org/eclipse/papyrus/customization/properties/model/xwt/resource/XWTResource.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/src/org/eclipse/papyrus/views/properties/model/xwt/resource/XWTResource.java
index cdc63f61bee..b470fcd5d76 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/src/org/eclipse/papyrus/customization/properties/model/xwt/resource/XWTResource.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/src/org/eclipse/papyrus/views/properties/model/xwt/resource/XWTResource.java
@@ -10,7 +10,7 @@
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - bug 402049
  *****************************************************************************/
-package org.eclipse.papyrus.customization.properties.model.xwt.resource;
+package org.eclipse.papyrus.views.properties.model.xwt.resource;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -44,17 +44,17 @@ import org.eclipse.m2m.qvt.oml.ExecutionDiagnostic;
 import org.eclipse.m2m.qvt.oml.ModelExtent;
 import org.eclipse.m2m.qvt.oml.TransformationExecutor;
 import org.eclipse.m2m.qvt.oml.util.Log;
-import org.eclipse.papyrus.customization.properties.model.xwt.Activator;
-import org.eclipse.papyrus.customization.properties.model.xwt.format.XMLFormatter;
-import org.eclipse.papyrus.customization.properties.model.xwt.modisco.GenericXMLResourceImpl;
-import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Namespace;
-import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Root;
 import org.eclipse.papyrus.infra.properties.contexts.Context;
 import org.eclipse.papyrus.infra.properties.ui.CompositeWidget;
 import org.eclipse.papyrus.infra.properties.ui.UiPackage;
 import org.eclipse.papyrus.infra.properties.ui.ValueAttribute;
 import org.eclipse.papyrus.infra.properties.ui.WidgetAttribute;
 import org.eclipse.papyrus.infra.properties.ui.util.PropertiesUtil;
+import org.eclipse.papyrus.views.properties.model.xwt.Activator;
+import org.eclipse.papyrus.views.properties.model.xwt.format.XMLFormatter;
+import org.eclipse.papyrus.views.properties.model.xwt.modisco.GenericXMLResourceImpl;
+import org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Namespace;
+import org.eclipse.papyrus.views.properties.model.xwt.xwtxml.Root;
 import org.eclipse.papyrus.views.properties.runtime.ConfigurationManager;
 
 /**
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/.classpath b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/.classpath
index d9f32c1698a..d9f32c1698a 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/.classpath
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/.classpath
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/.project b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/.project
index 2b3e1831080..38f39c47a45 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/.project
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.papyrus.customization.properties</name>
+	<name>org.eclipse.papyrus.views.properties.toolsmiths</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/.settings/org.eclipse.core.resources.prefs b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 00000000000..42399c9989d
--- /dev/null
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1

+encoding//src/org/eclipse/papyrus/views/properties/toolsmiths/messages/messages.properties=ISO-8859-1

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/.settings/org.eclipse.jdt.core.prefs b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/.settings/org.eclipse.jdt.core.prefs
index 62a08f4494d..62a08f4494d 100755
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/.settings/org.eclipse.jdt.ui.prefs b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/.settings/org.eclipse.jdt.ui.prefs
index 954281dbc31..954281dbc31 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/.settings/org.eclipse.pde.api.tools.prefs b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/.settings/org.eclipse.pde.api.tools.prefs
index 23fb95e120f..23fb95e120f 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/.settings/org.eclipse.pde.api.tools.prefs
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/.settings/org.eclipse.pde.api.tools.prefs
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/META-INF/MANIFEST.MF b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/META-INF/MANIFEST.MF
index 20e27347d4a..74d80f46186 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/META-INF/MANIFEST.MF
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/META-INF/MANIFEST.MF
@@ -1,11 +1,11 @@
 Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.customization.properties.editor,
- org.eclipse.papyrus.customization.properties.modelelement,
- org.eclipse.papyrus.customization.properties.providers,
- org.eclipse.papyrus.customization.properties.storage.actions
+Export-Package: org.eclipse.papyrus.views.properties.toolsmiths.editor,
+ org.eclipse.papyrus.views.properties.toolsmiths.modelelement,
+ org.eclipse.papyrus.views.properties.toolsmiths.providers,
+ org.eclipse.papyrus.views.properties.toolsmiths.storage.actions
 Require-Bundle: org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.papyrus.views.properties;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.customization.properties.model.xwt;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.views.properties.model.xwt;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.emf.ecore.editor;bundle-version="[2.11.0,3.0.0)";visibility:=reexport,
  org.eclipse.papyrus.infra.constraints.ui;bundle-version="[2.0.0,3.0.0)"
 Bundle-Vendor: %Bundle-Vendor
@@ -14,8 +14,8 @@ Bundle-ClassPath: .,
  bin
 Bundle-Version: 2.0.0.qualifier
 Bundle-Name: %Bundle-Name
-Bundle-Activator: org.eclipse.papyrus.customization.properties.Activator
+Bundle-Activator: org.eclipse.papyrus.views.properties.toolsmiths.Activator
 Bundle-ManifestVersion: 2
 Bundle-Description: %pluginDescription
-Bundle-SymbolicName: org.eclipse.papyrus.customization.properties;singleton:=true
+Bundle-SymbolicName: org.eclipse.papyrus.views.properties.toolsmiths;singleton:=true
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/Customization.ctx b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/Customization.ctx
index b9d829393c6..b9d829393c6 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/Customization.ctx
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/Customization.ctx
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/CustomizationEnvironment.xmi b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/CustomizationEnvironment.xmi
index 89723b198ad..89723b198ad 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/CustomizationEnvironment.xmi
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/CustomizationEnvironment.xmi
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/custom.querySet b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/custom.querySet
index 75254880e42..75254880e42 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/custom.querySet
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/custom.querySet
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/EcoreInstanceOf.xwt b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/EcoreInstanceOf.xwt
index 4f2ca209c7f..4f2ca209c7f 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/EcoreInstanceOf.xwt
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/EcoreInstanceOf.xwt
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/GridLayout.xwt b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/GridLayout.xwt
index 75552b3e77b..75552b3e77b 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/GridLayout.xwt
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/GridLayout.xwt
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/GroupAttributes.xwt b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/GroupAttributes.xwt
index 3457939042a..3457939042a 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/GroupAttributes.xwt
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/GroupAttributes.xwt
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/Label.xwt b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/Label.xwt
index 2f436234901..2f436234901 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/Label.xwt
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/Label.xwt
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/MultiValueEditor.xwt b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/MultiValueEditor.xwt
index ecfb345c842..ecfb345c842 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/MultiValueEditor.xwt
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/MultiValueEditor.xwt
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/MultipleCompositeConstraint.xwt b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/MultipleCompositeConstraint.xwt
index 9a7e1fa5a69..9a7e1fa5a69 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/MultipleCompositeConstraint.xwt
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/MultipleCompositeConstraint.xwt
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/MultipleCompositeWidget.xwt b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/MultipleCompositeWidget.xwt
index ea80dc152d3..ea80dc152d3 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/MultipleCompositeWidget.xwt
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/MultipleCompositeWidget.xwt
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/MultipleCompositeWidgetType.xwt b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/MultipleCompositeWidgetType.xwt
index f4901c841cb..f4901c841cb 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/MultipleCompositeWidgetType.xwt
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/MultipleCompositeWidgetType.xwt
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/MultipleConfigProperty.xwt b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/MultipleConfigProperty.xwt
index eeb57fccfee..eeb57fccfee 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/MultipleConfigProperty.xwt
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/MultipleConfigProperty.xwt
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/MultipleConstraintDescriptor.xwt b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/MultipleConstraintDescriptor.xwt
index 44e7668c57c..44e7668c57c 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/MultipleConstraintDescriptor.xwt
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/MultipleConstraintDescriptor.xwt
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/MultipleConstraintType.xwt b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/MultipleConstraintType.xwt
index b59dfca08dd..b59dfca08dd 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/MultipleConstraintType.xwt
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/MultipleConstraintType.xwt
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/MultipleContext.xwt b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/MultipleContext.xwt
index d29eb166273..d29eb166273 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/MultipleContext.xwt
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/MultipleContext.xwt
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/MultipleDataContextElement.xwt b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/MultipleDataContextElement.xwt
index b59dfca08dd..b59dfca08dd 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/MultipleDataContextElement.xwt
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/MultipleDataContextElement.xwt
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/MultipleDataContextPackage.xwt b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/MultipleDataContextPackage.xwt
index b326a599944..b326a599944 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/MultipleDataContextPackage.xwt
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/MultipleDataContextPackage.xwt
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/MultipleDataContextRoot.xwt b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/MultipleDataContextRoot.xwt
index 4823cb7f9f8..4823cb7f9f8 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/MultipleDataContextRoot.xwt
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/MultipleDataContextRoot.xwt
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/MultipleDisplayUnit.xwt b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/MultipleDisplayUnit.xwt
index 888d37c19e2..888d37c19e2 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/MultipleDisplayUnit.xwt
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/MultipleDisplayUnit.xwt
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/MultipleElement.xwt b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/MultipleElement.xwt
index 57a68696545..57a68696545 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/MultipleElement.xwt
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/MultipleElement.xwt
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/MultipleEnvironment.xwt b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/MultipleEnvironment.xwt
index ef9124f3f62..ef9124f3f62 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/MultipleEnvironment.xwt
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/MultipleEnvironment.xwt
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/MultipleLayout.xwt b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/MultipleLayout.xwt
index c0874fd4a4e..c0874fd4a4e 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/MultipleLayout.xwt
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/MultipleLayout.xwt
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/MultipleLayoutType.xwt b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/MultipleLayoutType.xwt
index 2d855ce6e31..2d855ce6e31 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/MultipleLayoutType.xwt
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/MultipleLayoutType.xwt
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/MultipleModelElementFactoryDescriptor.xwt b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/MultipleModelElementFactoryDescriptor.xwt
index 888d37c19e2..888d37c19e2 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/MultipleModelElementFactoryDescriptor.xwt
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/MultipleModelElementFactoryDescriptor.xwt
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/MultipleProperty.xwt b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/MultipleProperty.xwt
index 5a2bff87d5d..5a2bff87d5d 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/MultipleProperty.xwt
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/MultipleProperty.xwt
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/MultiplePropertyEditor.xwt b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/MultiplePropertyEditor.xwt
index 85b22d1b9fc..85b22d1b9fc 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/MultiplePropertyEditor.xwt
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/MultiplePropertyEditor.xwt
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/MultiplePropertyEditorType.xwt b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/MultiplePropertyEditorType.xwt
index 1e1ce55c893..1e1ce55c893 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/MultiplePropertyEditorType.xwt
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/MultiplePropertyEditorType.xwt
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/MultipleReferenceAttribute.xwt b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/MultipleReferenceAttribute.xwt
index 2aa17dec317..2aa17dec317 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/MultipleReferenceAttribute.xwt
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/MultipleReferenceAttribute.xwt
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/MultipleReferenceProperty.xwt b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/MultipleReferenceProperty.xwt
index 2aa17dec317..2aa17dec317 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/MultipleReferenceProperty.xwt
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/MultipleReferenceProperty.xwt
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/MultipleSection.xwt b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/MultipleSection.xwt
index ef9124f3f62..ef9124f3f62 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/MultipleSection.xwt
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/MultipleSection.xwt
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/MultipleStandardWidget.xwt b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/MultipleStandardWidget.xwt
index 999006b6a5d..999006b6a5d 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/MultipleStandardWidget.xwt
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/MultipleStandardWidget.xwt
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/MultipleStandardWidgetType.xwt b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/MultipleStandardWidgetType.xwt
index 888d37c19e2..888d37c19e2 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/MultipleStandardWidgetType.xwt
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/MultipleStandardWidgetType.xwt
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/MultipleTab.xwt b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/MultipleTab.xwt
index c01f4920e23..c01f4920e23 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/MultipleTab.xwt
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/MultipleTab.xwt
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/MultipleUIComponent.xwt b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/MultipleUIComponent.xwt
index d724e35c8f6..d724e35c8f6 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/MultipleUIComponent.xwt
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/MultipleUIComponent.xwt
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/MultipleUnknownComponent.xwt b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/MultipleUnknownComponent.xwt
index aca6adeb591..aca6adeb591 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/MultipleUnknownComponent.xwt
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/MultipleUnknownComponent.xwt
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/MultipleUnknownProperty.xwt b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/MultipleUnknownProperty.xwt
index 194176bba2a..194176bba2a 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/MultipleUnknownProperty.xwt
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/MultipleUnknownProperty.xwt
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/MultipleValueAttribute.xwt b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/MultipleValueAttribute.xwt
index 2d855ce6e31..2d855ce6e31 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/MultipleValueAttribute.xwt
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/MultipleValueAttribute.xwt
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/MultipleValueProperty.xwt b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/MultipleValueProperty.xwt
index 4823cb7f9f8..4823cb7f9f8 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/MultipleValueProperty.xwt
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/MultipleValueProperty.xwt
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/MultipleView.xwt b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/MultipleView.xwt
index fcdc6cecc49..fcdc6cecc49 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/MultipleView.xwt
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/MultipleView.xwt
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/MultipleWidget.xwt b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/MultipleWidget.xwt
index ef9124f3f62..ef9124f3f62 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/MultipleWidget.xwt
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/MultipleWidget.xwt
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/MultipleWidgetAttribute.xwt b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/MultipleWidgetAttribute.xwt
index 1081dd3ca3e..1081dd3ca3e 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/MultipleWidgetAttribute.xwt
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/MultipleWidgetAttribute.xwt
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/MultipleWidgetType.xwt b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/MultipleWidgetType.xwt
index 889aedc1cd4..889aedc1cd4 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/MultipleWidgetType.xwt
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/MultipleWidgetType.xwt
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/OCLQuery.xwt b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/OCLQuery.xwt
index b05756714ad..b05756714ad 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/OCLQuery.xwt
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/OCLQuery.xwt
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/Single IntegerSpinner.xwt b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/Single IntegerSpinner.xwt
index 70d8d9ecc80..70d8d9ecc80 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/Single IntegerSpinner.xwt
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/Single IntegerSpinner.xwt
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/Single ToggleButton.xwt b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/Single ToggleButton.xwt
index 97d40d16114..97d40d16114 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/Single ToggleButton.xwt
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/Single ToggleButton.xwt
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/SingleCompositeConstraint.xwt b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/SingleCompositeConstraint.xwt
index ab46521e5d9..ab46521e5d9 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/SingleCompositeConstraint.xwt
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/SingleCompositeConstraint.xwt
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/SingleCompositeWidget.xwt b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/SingleCompositeWidget.xwt
index d7000a6af7f..d7000a6af7f 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/SingleCompositeWidget.xwt
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/SingleCompositeWidget.xwt
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/SingleCompositeWidgetType.xwt b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/SingleCompositeWidgetType.xwt
index 3e1923e230e..3e1923e230e 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/SingleCompositeWidgetType.xwt
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/SingleCompositeWidgetType.xwt
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/SingleConfigProperty.xwt b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/SingleConfigProperty.xwt
index 480290feda2..480290feda2 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/SingleConfigProperty.xwt
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/SingleConfigProperty.xwt
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/SingleConstraintDescriptor.xwt b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/SingleConstraintDescriptor.xwt
index 87325acdff8..87325acdff8 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/SingleConstraintDescriptor.xwt
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/SingleConstraintDescriptor.xwt
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/SingleConstraintType.xwt b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/SingleConstraintType.xwt
index d8e64c2144f..d8e64c2144f 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/SingleConstraintType.xwt
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/SingleConstraintType.xwt
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/SingleContext.xwt b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/SingleContext.xwt
index 6fa64a11192..6fa64a11192 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/SingleContext.xwt
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/SingleContext.xwt
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/SingleDataContextElement.xwt b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/SingleDataContextElement.xwt
index 95ccfe2f613..95ccfe2f613 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/SingleDataContextElement.xwt
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/SingleDataContextElement.xwt
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/SingleDataContextPackage.xwt b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/SingleDataContextPackage.xwt
index 640c285b3c8..640c285b3c8 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/SingleDataContextPackage.xwt
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/SingleDataContextPackage.xwt
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/SingleDataContextRoot.xwt b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/SingleDataContextRoot.xwt
index 6d0d25806b0..6d0d25806b0 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/SingleDataContextRoot.xwt
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/SingleDataContextRoot.xwt
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/SingleDisplayUnit.xwt b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/SingleDisplayUnit.xwt
index a3c1615504a..a3c1615504a 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/SingleDisplayUnit.xwt
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/SingleDisplayUnit.xwt
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/SingleElement.xwt b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/SingleElement.xwt
index b59dfca08dd..b59dfca08dd 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/SingleElement.xwt
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/SingleElement.xwt
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/SingleEnvironment.xwt b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/SingleEnvironment.xwt
index fe2fc17996b..fe2fc17996b 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/SingleEnvironment.xwt
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/SingleEnvironment.xwt
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/SingleFileSelector.xwt b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/SingleFileSelector.xwt
index 600af2b83f0..600af2b83f0 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/SingleFileSelector.xwt
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/SingleFileSelector.xwt
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/SingleLayout.xwt b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/SingleLayout.xwt
index 4412c18d910..4412c18d910 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/SingleLayout.xwt
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/SingleLayout.xwt
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/SingleLayoutType.xwt b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/SingleLayoutType.xwt
index dd712596e7b..dd712596e7b 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/SingleLayoutType.xwt
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/SingleLayoutType.xwt
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/SingleModelElementFactoryDescriptor.xwt b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/SingleModelElementFactoryDescriptor.xwt
index 74a6dad2fd5..74a6dad2fd5 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/SingleModelElementFactoryDescriptor.xwt
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/SingleModelElementFactoryDescriptor.xwt
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/SingleProperty.xwt b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/SingleProperty.xwt
index 2dfbcd6f32c..2dfbcd6f32c 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/SingleProperty.xwt
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/SingleProperty.xwt
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/SinglePropertyEditor.xwt b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/SinglePropertyEditor.xwt
index fd8856808d9..fd8856808d9 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/SinglePropertyEditor.xwt
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/SinglePropertyEditor.xwt
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/SinglePropertyEditorType.xwt b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/SinglePropertyEditorType.xwt
index 7afd55d2e18..7afd55d2e18 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/SinglePropertyEditorType.xwt
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/SinglePropertyEditorType.xwt
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/SingleReferenceAttribute.xwt b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/SingleReferenceAttribute.xwt
index c97e2d952c6..c97e2d952c6 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/SingleReferenceAttribute.xwt
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/SingleReferenceAttribute.xwt
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/SingleReferenceProperty.xwt b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/SingleReferenceProperty.xwt
index 8232bd6050c..8232bd6050c 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/SingleReferenceProperty.xwt
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/SingleReferenceProperty.xwt
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/SingleSection.xwt b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/SingleSection.xwt
index 8dfa1dff974..8dfa1dff974 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/SingleSection.xwt
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/SingleSection.xwt
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/SingleStandardWidget.xwt b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/SingleStandardWidget.xwt
index 71f471445c9..71f471445c9 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/SingleStandardWidget.xwt
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/SingleStandardWidget.xwt
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/SingleStandardWidgetType.xwt b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/SingleStandardWidgetType.xwt
index 7829d44c162..7829d44c162 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/SingleStandardWidgetType.xwt
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/SingleStandardWidgetType.xwt
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/SingleTab.xwt b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/SingleTab.xwt
index be2a5582b84..be2a5582b84 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/SingleTab.xwt
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/SingleTab.xwt
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/SingleUIComponent.xwt b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/SingleUIComponent.xwt
index 38d559f3a67..38d559f3a67 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/SingleUIComponent.xwt
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/SingleUIComponent.xwt
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/SingleUnknownComponent.xwt b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/SingleUnknownComponent.xwt
index 7e9310a3618..7e9310a3618 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/SingleUnknownComponent.xwt
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/SingleUnknownComponent.xwt
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/SingleUnknownProperty.xwt b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/SingleUnknownProperty.xwt
index e03bab652f1..e03bab652f1 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/SingleUnknownProperty.xwt
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/SingleUnknownProperty.xwt
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/SingleValueAttribute.xwt b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/SingleValueAttribute.xwt
index 74c45cd3024..74c45cd3024 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/SingleValueAttribute.xwt
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/SingleValueAttribute.xwt
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/SingleValueProperty.xwt b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/SingleValueProperty.xwt
index 7509693bb30..7509693bb30 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/SingleValueProperty.xwt
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/SingleValueProperty.xwt
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/SingleView.xwt b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/SingleView.xwt
index 0150bb6828d..0150bb6828d 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/SingleView.xwt
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/SingleView.xwt
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/SingleWidget.xwt b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/SingleWidget.xwt
index 7f560843155..7f560843155 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/SingleWidget.xwt
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/SingleWidget.xwt
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/SingleWidgetAttribute.xwt b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/SingleWidgetAttribute.xwt
index 80648fcca97..80648fcca97 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/SingleWidgetAttribute.xwt
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/SingleWidgetAttribute.xwt
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/SingleWidgetType.xwt b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/SingleWidgetType.xwt
index 150169e284b..150169e284b 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/SingleWidgetType.xwt
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/SingleWidgetType.xwt
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/Stereotype.xwt b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/Stereotype.xwt
index faa7aaa35fc..faa7aaa35fc 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/Stereotype.xwt
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/Stereotype.xwt
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/UMLInstanceOf.xwt b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/UMLInstanceOf.xwt
index 7f45c6f5769..7f45c6f5769 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/UMLInstanceOf.xwt
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Model/ui/UMLInstanceOf.xwt
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/OSGI-INF/l10n/bundle.properties b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/OSGI-INF/l10n/bundle.properties
index 969757d0342..969757d0342 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/OSGI-INF/l10n/bundle.properties
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/OSGI-INF/l10n/bundle.properties
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/Query/Contexts.querySet b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Query/Contexts.querySet
index 42d79112c23..42d79112c23 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/Query/Contexts.querySet
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Query/Contexts.querySet
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/Query/Ui.querySet b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Query/Ui.querySet
index b49354963c5..b49354963c5 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/Query/Ui.querySet
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/Query/Ui.querySet
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/UICustom/PropertiesContext.custom b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/UICustom/PropertiesContext.custom
index a9d2f9665f4..a9d2f9665f4 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/UICustom/PropertiesContext.custom
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/UICustom/PropertiesContext.custom
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/UICustom/PropertiesUI.custom b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/UICustom/PropertiesUI.custom
index 7cdc1aa342e..7cdc1aa342e 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/UICustom/PropertiesUI.custom
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/UICustom/PropertiesUI.custom
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/UICustom/environment.uiCustom b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/UICustom/environment.uiCustom
index a4524c6dc0a..a4524c6dc0a 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/UICustom/environment.uiCustom
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/UICustom/environment.uiCustom
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/about.html b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/about.html
index 82d49bf5f81..82d49bf5f81 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/about.html
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/about.html
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/build.properties b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/build.properties
index 01011f2809a..01011f2809a 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/build.properties
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/build.properties
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/icons/Context.gif b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/icons/Context.gif
index 9b09a7e4986..9b09a7e4986 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/icons/Context.gif
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/icons/Context.gif
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/icons/Customization.gif b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/icons/Customization.gif
index 0b1be97b8cf..0b1be97b8cf 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/icons/Customization.gif
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/icons/Customization.gif
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/icons/DataContext.gif b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/icons/DataContext.gif
index 48581fa9451..48581fa9451 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/icons/DataContext.gif
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/icons/DataContext.gif
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/icons/DataContexts.gif b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/icons/DataContexts.gif
index 94b389f9da0..94b389f9da0 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/icons/DataContexts.gif
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/icons/DataContexts.gif
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/icons/MultiView.gif b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/icons/MultiView.gif
index 2e85ba1b6f2..2e85ba1b6f2 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/icons/MultiView.gif
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/icons/MultiView.gif
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/icons/error.gif b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/icons/error.gif
index 9b048d60532..9b048d60532 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/icons/error.gif
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/icons/error.gif
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/icons/papyrus.png b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/icons/papyrus.png
index 0f74e27b483..0f74e27b483 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/icons/papyrus.png
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/icons/papyrus.png
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/icons/preview.png b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/icons/preview.png
index 4ccd82e526d..4ccd82e526d 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/icons/preview.png
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/icons/preview.png
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/icons/refresh.gif b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/icons/refresh.gif
index 634306d4c62..634306d4c62 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/icons/refresh.gif
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/icons/refresh.gif
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/plugin.properties b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/plugin.properties
index b362066cb46..b362066cb46 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/plugin.properties
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/plugin.properties
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/plugin.xml b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/plugin.xml
index 619fc2dcf0b..f1665ed105b 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/plugin.xml
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/plugin.xml
@@ -25,7 +25,7 @@
       </modelqueryset>
    </extension-->
    <extension point="org.eclipse.ui.editors">
-      <editor class="org.eclipse.papyrus.customization.properties.editor.UIEditor" contributorClass="org.eclipse.papyrus.customization.properties.editor.ContextEditorActionBarContributor" default="true" extensions="ctx" icon="platform:/plugin/org.eclipse.papyrus.infra.properties.edit/icons/full/obj16/Context.gif" id="org.eclipse.papyrus.customization.properties.UIEditor" name="%editor.name">
+      <editor class="org.eclipse.papyrus.views.properties.toolsmiths.editor.UIEditor" contributorClass="org.eclipse.papyrus.views.properties.toolsmiths.editor.ContextEditorActionBarContributor" default="true" extensions="ctx" icon="platform:/plugin/org.eclipse.papyrus.infra.properties.edit/icons/full/obj16/Context.gif" id="org.eclipse.papyrus.customization.properties.UIEditor" name="%editor.name">
       </editor>
    </extension>
    <extension point="org.eclipse.emf.ecore.uri_mapping">
@@ -52,7 +52,7 @@
       <view
             allowMultiple="true"
             category="org.eclipse.papyrus.views.category"
-            class="org.eclipse.papyrus.customization.properties.editor.preview.Preview"
+            class="org.eclipse.papyrus.views.properties.toolsmiths.editor.preview.Preview"
             icon="icons/preview.png"
             id="org.eclipse.papyrus.customization.properties.preview"
             name="%view.name"
@@ -62,7 +62,7 @@
    <extension
          point="org.eclipse.ui.perspectives">
       <perspective
-            class="org.eclipse.papyrus.customization.properties.perspective.CustomizationPerspectiveFactory"
+            class="org.eclipse.papyrus.views.properties.toolsmiths.perspective.CustomizationPerspectiveFactory"
             icon="icons/Customization.gif"
             id="org.eclipse.papyrus.customization.properties.perspective"
             name="%perspective.name">
@@ -71,14 +71,14 @@
    <extension
          point="org.eclipse.core.runtime.preferences">
       <initializer
-            class="org.eclipse.papyrus.customization.properties.preferences.CustomizationPreferencesInitializer">
+            class="org.eclipse.papyrus.views.properties.toolsmiths.preferences.CustomizationPreferencesInitializer">
       </initializer>
    </extension>
    <extension
          point="org.eclipse.ui.preferencePages">
       <page
             category="org.eclipse.papyrus.infra.core.sasheditor.preferences.generalcategory"
-            class="org.eclipse.papyrus.customization.properties.preferences.CustomizationPreferencePage"
+            class="org.eclipse.papyrus.views.properties.toolsmiths.preferences.CustomizationPreferencePage"
             id="org.eclipse.papyrus.customization.properties.preferences"
             name="%page.name">
       </page>
@@ -86,15 +86,15 @@
    <extension
          point="org.eclipse.ui.handlers">
       <handler
-            class="org.eclipse.papyrus.customization.properties.ui.OpenCustomization"
+            class="org.eclipse.papyrus.views.properties.toolsmiths.ui.OpenCustomization"
             commandId="org.eclipse.papyrus.customization.properties.customize">
       </handler>
       <handler
-            class="org.eclipse.papyrus.customization.properties.editor.actions.TogglePreviewAction"
+            class="org.eclipse.papyrus.views.properties.toolsmiths.editor.actions.TogglePreviewAction"
             commandId="org.eclipse.papyrus.customization.properties.TogglePreview">
       </handler>
       <handler
-            class="org.eclipse.papyrus.customization.properties.editor.actions.ToggleDataContextAction"
+            class="org.eclipse.papyrus.views.properties.toolsmiths.editor.actions.ToggleDataContextAction"
             commandId="org.eclipse.papyrus.customization.properties.ToggleDataContext">
       </handler>
    </extension>
@@ -110,7 +110,7 @@
             id="org.eclipse.papyrus.customization.properties.TogglePreview"
             name="%command.name.0">
          <state
-               class="org.eclipse.papyrus.customization.properties.editor.actions.TogglePreviewState"
+               class="org.eclipse.papyrus.views.properties.toolsmiths.editor.actions.TogglePreviewState"
                id="org.eclipse.ui.commands.toggleState">
          </state>
       </command>
@@ -119,7 +119,7 @@
             id="org.eclipse.papyrus.customization.properties.ToggleDataContext"
             name="%command.name.1">
             <state
-               class="org.eclipse.papyrus.customization.properties.editor.actions.ToggleDataContextState"
+               class="org.eclipse.papyrus.views.properties.toolsmiths.editor.actions.ToggleDataContextState"
                id="org.eclipse.papyrus.customizatio.propertiesn.displayContextState">
          </state>
       </command>
@@ -186,9 +186,9 @@
    </extension>
    
    <extension
-         point="org.eclipse.papyrus.customization.properties.contextStorage">
+         point="org.eclipse.papyrus.views.properties.toolsmiths.contextStorage">
       <actionProvider
-            class="org.eclipse.papyrus.customization.properties.storage.actions.workspace.WorkspaceContextStorageActionProvider">
+            class="org.eclipse.papyrus.views.properties.toolsmiths.storage.actions.workspace.WorkspaceContextStorageActionProvider">
       </actionProvider>
    </extension>
    <extension
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/pom.xml b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/pom.xml
index 44ddafaaea8..d7996460275 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/pom.xml
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/pom.xml
@@ -2,13 +2,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
+	
 	<parent>
+		<artifactId>org.eclipse.papyrus.views-properties</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<artifactId>org.eclipse.papyrus.toolsmiths</artifactId>
 		<version>0.0.1-SNAPSHOT</version>
-		<relativePath>../../toolsmiths/pom.xml</relativePath>
 	</parent>
-	<artifactId>org.eclipse.papyrus.customization.properties.generation</artifactId>
+	<artifactId>org.eclipse.papyrus.views.properties.toolsmiths</artifactId>
 	<version>2.0.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/schema/contextStorage.exsd b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/schema/contextStorage.exsd
index e1f8b356a81..e1f8b356a81 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/schema/contextStorage.exsd
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/schema/contextStorage.exsd
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/Activator.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/Activator.java
index e9c08f16029..0fd20b4326a 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/Activator.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/Activator.java
@@ -9,7 +9,7 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.customization.properties;
+package org.eclipse.papyrus.views.properties.toolsmiths;
 
 import java.util.List;
 import java.util.Set;
@@ -20,6 +20,7 @@ import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
 import org.eclipse.jface.resource.ImageRegistry;
+import org.eclipse.papyrus.views.properties.toolsmiths.Activator;
 import org.eclipse.papyrus.emf.facet.custom.core.ICustomizationCatalogManager;
 import org.eclipse.papyrus.emf.facet.custom.core.ICustomizationCatalogManagerFactory;
 import org.eclipse.papyrus.emf.facet.custom.core.ICustomizationManager;
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/ContextEditorActionBarContributor.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/editor/ContextEditorActionBarContributor.java
index e2545db2352..e713426f76f 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/ContextEditorActionBarContributor.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/editor/ContextEditorActionBarContributor.java
@@ -9,7 +9,7 @@
  * Contributors:

  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.customization.properties.editor;

+package org.eclipse.papyrus.views.properties.toolsmiths.editor;

 

 import java.util.Collection;

 import java.util.Iterator;

@@ -27,19 +27,19 @@ import org.eclipse.jface.action.IMenuManager;
 import org.eclipse.jface.viewers.ISelection;

 import org.eclipse.jface.viewers.IStructuredSelection;

 import org.eclipse.jface.viewers.SelectionChangedEvent;

-import org.eclipse.papyrus.customization.properties.editor.actions.CreateSectionAction;

-import org.eclipse.papyrus.customization.properties.editor.actions.CreateSectionWidgetAction;

-import org.eclipse.papyrus.customization.properties.editor.actions.MoDiscoCopyAction;

-import org.eclipse.papyrus.customization.properties.editor.actions.MoDiscoCutAction;

-import org.eclipse.papyrus.customization.properties.editor.actions.MoDiscoDeleteAction;

-import org.eclipse.papyrus.customization.properties.editor.actions.MoDiscoPasteAction;

-import org.eclipse.papyrus.customization.properties.editor.actions.ToggleDataContextAction;

-import org.eclipse.papyrus.customization.properties.editor.actions.ValidationAction;

-import org.eclipse.papyrus.customization.properties.util.ActionUtil;

 import org.eclipse.papyrus.infra.properties.contexts.Context;

 import org.eclipse.papyrus.infra.properties.contexts.Section;

 import org.eclipse.papyrus.infra.properties.contexts.Tab;

 import org.eclipse.papyrus.infra.properties.contexts.View;

+import org.eclipse.papyrus.views.properties.toolsmiths.editor.actions.CreateSectionAction;

+import org.eclipse.papyrus.views.properties.toolsmiths.editor.actions.CreateSectionWidgetAction;

+import org.eclipse.papyrus.views.properties.toolsmiths.editor.actions.MoDiscoCopyAction;

+import org.eclipse.papyrus.views.properties.toolsmiths.editor.actions.MoDiscoCutAction;

+import org.eclipse.papyrus.views.properties.toolsmiths.editor.actions.MoDiscoDeleteAction;

+import org.eclipse.papyrus.views.properties.toolsmiths.editor.actions.MoDiscoPasteAction;

+import org.eclipse.papyrus.views.properties.toolsmiths.editor.actions.ToggleDataContextAction;

+import org.eclipse.papyrus.views.properties.toolsmiths.editor.actions.ValidationAction;

+import org.eclipse.papyrus.views.properties.toolsmiths.util.ActionUtil;

 

 /**

  * The Action bar contributor for the Context Editor

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/MoDiscoDropAdapter.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/editor/MoDiscoDropAdapter.java
index 8883512cc84..073ec97eb5f 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/MoDiscoDropAdapter.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/editor/MoDiscoDropAdapter.java
@@ -9,7 +9,7 @@
  * Contributors:

  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.customization.properties.editor;

+package org.eclipse.papyrus.views.properties.toolsmiths.editor;

 

 import java.util.Collection;

 

@@ -18,8 +18,8 @@ import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.emf.edit.ui.dnd.EditingDomainViewerDropAdapter;

 import org.eclipse.jface.viewers.ISelection;

 import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.papyrus.customization.properties.util.ActionUtil;

 import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

+import org.eclipse.papyrus.views.properties.toolsmiths.util.ActionUtil;

 import org.eclipse.swt.widgets.Widget;

 

 /**

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/ResourceEditorInput.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/editor/ResourceEditorInput.java
index b68eccad2db..9c8ffed346c 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/ResourceEditorInput.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/editor/ResourceEditorInput.java
@@ -9,7 +9,7 @@
  * Contributors:
  *   CEA LIST - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.customization.properties.editor;
+package org.eclipse.papyrus.views.properties.toolsmiths.editor;
 
 import org.eclipse.emf.common.ui.URIEditorInput;
 import org.eclipse.emf.ecore.resource.Resource;
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/UIEditor.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/editor/UIEditor.java
index 52654c13bbe..f3360ca9383 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/UIEditor.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/editor/UIEditor.java
@@ -10,7 +10,7 @@
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *  Christian W. Damus (CEA) - Factor out workspace storage for pluggable storage providers (CDO)
  *****************************************************************************/
-package org.eclipse.papyrus.customization.properties.editor;
+package org.eclipse.papyrus.views.properties.toolsmiths.editor;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -56,11 +56,9 @@ import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.StructuredViewer;
 import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.papyrus.customization.properties.Activator;
-import org.eclipse.papyrus.customization.properties.editor.preview.Preview;
-import org.eclipse.papyrus.customization.properties.messages.Messages;
-import org.eclipse.papyrus.customization.properties.providers.ContextContentProvider;
-import org.eclipse.papyrus.customization.properties.providers.ContextLabelProvider;
+import org.eclipse.papyrus.views.properties.toolsmiths.editor.MoDiscoDropAdapter;
+import org.eclipse.papyrus.views.properties.toolsmiths.editor.ResourceEditorInput;
+import org.eclipse.papyrus.views.properties.toolsmiths.editor.ViewFilter;
 import org.eclipse.papyrus.infra.properties.catalog.PropertiesURIHandler;
 import org.eclipse.papyrus.infra.properties.contexts.Context;
 import org.eclipse.papyrus.infra.properties.internal.ui.runtime.IInternalConfigurationManager;
@@ -70,6 +68,11 @@ import org.eclipse.papyrus.infra.properties.ui.widgets.layout.PropertiesLayout;
 import org.eclipse.papyrus.infra.widgets.editors.AbstractEditor;
 import org.eclipse.papyrus.infra.widgets.editors.ICommitListener;
 import org.eclipse.papyrus.infra.widgets.editors.StringEditor;
+import org.eclipse.papyrus.views.properties.toolsmiths.Activator;
+import org.eclipse.papyrus.views.properties.toolsmiths.editor.preview.Preview;
+import org.eclipse.papyrus.views.properties.toolsmiths.messages.Messages;
+import org.eclipse.papyrus.views.properties.toolsmiths.providers.ContextContentProvider;
+import org.eclipse.papyrus.views.properties.toolsmiths.providers.ContextLabelProvider;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.dnd.DND;
 import org.eclipse.swt.dnd.Transfer;
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/ViewFilter.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/editor/ViewFilter.java
index 7a882562c3a..dff84105980 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/ViewFilter.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/editor/ViewFilter.java
@@ -9,7 +9,7 @@
  * Contributors:

  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.customization.properties.editor;

+package org.eclipse.papyrus.views.properties.toolsmiths.editor;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.jface.viewers.Viewer;

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/actions/CompoundCommandActionDelegate.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/editor/actions/CompoundCommandActionDelegate.java
index 0289d83afe9..6481d19b6eb 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/actions/CompoundCommandActionDelegate.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/editor/actions/CompoundCommandActionDelegate.java
@@ -9,7 +9,7 @@
  * Contributors:

  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.customization.properties.editor.actions;

+package org.eclipse.papyrus.views.properties.toolsmiths.editor.actions;

 

 import org.eclipse.emf.common.command.CompoundCommand;

 import org.eclipse.emf.edit.command.CommandActionDelegate;

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/actions/CreateResourceCommand.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/editor/actions/CreateResourceCommand.java
index 94337d44b18..e98e90f2195 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/actions/CreateResourceCommand.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/editor/actions/CreateResourceCommand.java
@@ -9,7 +9,7 @@
  * Contributors:

  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.customization.properties.editor.actions;

+package org.eclipse.papyrus.views.properties.toolsmiths.editor.actions;

 

 import java.io.IOException;

 import java.util.Collections;

@@ -20,7 +20,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource;

 import org.eclipse.emf.ecore.resource.ResourceSet;

 import org.eclipse.emf.edit.command.CommandActionDelegate;

-import org.eclipse.papyrus.customization.properties.Activator;

+import org.eclipse.papyrus.views.properties.toolsmiths.Activator;

 

 /**

  * A command to create an EMF resource

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/actions/CreateSectionAction.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/editor/actions/CreateSectionAction.java
index c8dac81905c..75d06c146c4 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/actions/CreateSectionAction.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/editor/actions/CreateSectionAction.java
@@ -9,7 +9,7 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.customization.properties.editor.actions;
+package org.eclipse.papyrus.views.properties.toolsmiths.editor.actions;
 
 import java.util.Collection;
 import java.util.HashMap;
@@ -29,6 +29,8 @@ import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.emf.edit.ui.action.StaticSelectionCommandAction;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.papyrus.views.properties.toolsmiths.editor.actions.CompoundCommandActionDelegate;
+import org.eclipse.papyrus.views.properties.toolsmiths.editor.actions.CreateResourceCommand;
 import org.eclipse.papyrus.infra.properties.contexts.Context;
 import org.eclipse.papyrus.infra.properties.contexts.ContextsFactory;
 import org.eclipse.papyrus.infra.properties.contexts.Section;
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/actions/CreateSectionWidgetAction.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/editor/actions/CreateSectionWidgetAction.java
index 93e6a1c58af..a373af3a2b5 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/actions/CreateSectionWidgetAction.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/editor/actions/CreateSectionWidgetAction.java
@@ -9,7 +9,7 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.customization.properties.editor.actions;
+package org.eclipse.papyrus.views.properties.toolsmiths.editor.actions;
 
 import java.util.Collection;
 import java.util.HashMap;
@@ -23,6 +23,8 @@ import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.emf.edit.ui.action.StaticSelectionCommandAction;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.papyrus.views.properties.toolsmiths.editor.actions.CompoundCommandActionDelegate;
+import org.eclipse.papyrus.views.properties.toolsmiths.editor.actions.CreateResourceCommand;
 import org.eclipse.papyrus.infra.properties.contexts.Section;
 import org.eclipse.papyrus.infra.properties.ui.CompositeWidget;
 import org.eclipse.papyrus.infra.properties.ui.Layout;
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/actions/MoDiscoCopyAction.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/editor/actions/MoDiscoCopyAction.java
index cc96a4acee2..e8642b486bd 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/actions/MoDiscoCopyAction.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/editor/actions/MoDiscoCopyAction.java
@@ -9,14 +9,14 @@
  * Contributors:

  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.customization.properties.editor.actions;

+package org.eclipse.papyrus.views.properties.toolsmiths.editor.actions;

 

 import java.util.Collection;

 

 import org.eclipse.emf.common.command.Command;

 import org.eclipse.emf.edit.domain.EditingDomain;

 import org.eclipse.emf.edit.ui.action.CopyAction;

-import org.eclipse.papyrus.customization.properties.util.ActionUtil;

+import org.eclipse.papyrus.views.properties.toolsmiths.util.ActionUtil;

 

 /**

  * An adapter for the EMF "Copy" Action, compatible with the

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/actions/MoDiscoCutAction.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/editor/actions/MoDiscoCutAction.java
index 456aff8fa05..6f521eae776 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/actions/MoDiscoCutAction.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/editor/actions/MoDiscoCutAction.java
@@ -9,14 +9,14 @@
  * Contributors:

  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.customization.properties.editor.actions;

+package org.eclipse.papyrus.views.properties.toolsmiths.editor.actions;

 

 import java.util.Collection;

 

 import org.eclipse.emf.common.command.Command;

 import org.eclipse.emf.edit.domain.EditingDomain;

 import org.eclipse.emf.edit.ui.action.CutAction;

-import org.eclipse.papyrus.customization.properties.util.ActionUtil;

+import org.eclipse.papyrus.views.properties.toolsmiths.util.ActionUtil;

 

 /**

  * An adapter for the EMF "Cut" Action, compatible with the

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/actions/MoDiscoDeleteAction.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/editor/actions/MoDiscoDeleteAction.java
index 68733f86f72..991ed1cda2e 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/actions/MoDiscoDeleteAction.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/editor/actions/MoDiscoDeleteAction.java
@@ -9,14 +9,14 @@
  * Contributors:

  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.customization.properties.editor.actions;

+package org.eclipse.papyrus.views.properties.toolsmiths.editor.actions;

 

 import java.util.Collection;

 

 import org.eclipse.emf.common.command.Command;

 import org.eclipse.emf.edit.domain.EditingDomain;

 import org.eclipse.emf.edit.ui.action.DeleteAction;

-import org.eclipse.papyrus.customization.properties.util.ActionUtil;

+import org.eclipse.papyrus.views.properties.toolsmiths.util.ActionUtil;

 

 /**

  * An adapter for the EMF "Delete" Action, compatible with the

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/actions/MoDiscoPasteAction.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/editor/actions/MoDiscoPasteAction.java
index a4e7a922504..95cdef769d1 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/actions/MoDiscoPasteAction.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/editor/actions/MoDiscoPasteAction.java
@@ -9,14 +9,14 @@
  * Contributors:

  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.customization.properties.editor.actions;

+package org.eclipse.papyrus.views.properties.toolsmiths.editor.actions;

 

 import java.util.Collection;

 

 import org.eclipse.emf.common.command.Command;

 import org.eclipse.emf.edit.domain.EditingDomain;

 import org.eclipse.emf.edit.ui.action.PasteAction;

-import org.eclipse.papyrus.customization.properties.util.ActionUtil;

+import org.eclipse.papyrus.views.properties.toolsmiths.util.ActionUtil;

 

 /**

  * An adapter for the EMF "Paste" Action, compatible with the

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/actions/StrictCompoundCommandActionDelegate.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/editor/actions/StrictCompoundCommandActionDelegate.java
index 43a4b08ab9c..51b4f0c696e 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/actions/StrictCompoundCommandActionDelegate.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/editor/actions/StrictCompoundCommandActionDelegate.java
@@ -9,7 +9,7 @@
  * Contributors:

  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.customization.properties.editor.actions;

+package org.eclipse.papyrus.views.properties.toolsmiths.editor.actions;

 

 import org.eclipse.emf.common.command.StrictCompoundCommand;

 import org.eclipse.emf.edit.command.CommandActionDelegate;

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/actions/ToggleDataContextAction.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/editor/actions/ToggleDataContextAction.java
index b9fd7660f98..d61dfeb6f5b 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/actions/ToggleDataContextAction.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/editor/actions/ToggleDataContextAction.java
@@ -9,12 +9,12 @@
  * Contributors:

  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.customization.properties.editor.actions;

+package org.eclipse.papyrus.views.properties.toolsmiths.editor.actions;

 

 import org.eclipse.core.commands.AbstractHandler;

 import org.eclipse.core.commands.ExecutionEvent;

 import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.papyrus.customization.properties.editor.UIEditor;

+import org.eclipse.papyrus.views.properties.toolsmiths.editor.UIEditor;

 import org.eclipse.ui.IEditorPart;

 import org.eclipse.ui.PlatformUI;

 

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/actions/ToggleDataContextState.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/editor/actions/ToggleDataContextState.java
index 46759e5aafe..2674dcbcac5 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/actions/ToggleDataContextState.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/editor/actions/ToggleDataContextState.java
@@ -9,7 +9,7 @@
  * Contributors:

  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.customization.properties.editor.actions;

+package org.eclipse.papyrus.views.properties.toolsmiths.editor.actions;

 

 import org.eclipse.core.commands.State;

 

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/actions/TogglePreviewAction.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/editor/actions/TogglePreviewAction.java
index dcf42eda113..0fb24f154b5 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/actions/TogglePreviewAction.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/editor/actions/TogglePreviewAction.java
@@ -9,12 +9,12 @@
  * Contributors:

  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.customization.properties.editor.actions;

+package org.eclipse.papyrus.views.properties.toolsmiths.editor.actions;

 

 import org.eclipse.core.commands.AbstractHandler;

 import org.eclipse.core.commands.ExecutionEvent;

 import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.papyrus.customization.properties.Activator;

+import org.eclipse.papyrus.views.properties.toolsmiths.Activator;

 import org.eclipse.ui.IViewReference;

 import org.eclipse.ui.IWorkbenchPage;

 import org.eclipse.ui.PartInitException;

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/actions/TogglePreviewState.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/editor/actions/TogglePreviewState.java
index afd4a3de093..dee7bd18e63 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/actions/TogglePreviewState.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/editor/actions/TogglePreviewState.java
@@ -9,10 +9,10 @@
  * Contributors:

  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.customization.properties.editor.actions;

+package org.eclipse.papyrus.views.properties.toolsmiths.editor.actions;

 

 import org.eclipse.core.commands.State;

-import org.eclipse.papyrus.customization.properties.editor.preview.Preview;

+import org.eclipse.papyrus.views.properties.toolsmiths.editor.preview.Preview;

 import org.eclipse.ui.IPartListener;

 import org.eclipse.ui.IWindowListener;

 import org.eclipse.ui.IWorkbenchPage;

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/actions/ValidationAction.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/editor/actions/ValidationAction.java
index 45dd7877775..b05ec80afb8 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/actions/ValidationAction.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/editor/actions/ValidationAction.java
@@ -9,11 +9,11 @@
  * Contributors:

  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.customization.properties.editor.actions;

+package org.eclipse.papyrus.views.properties.toolsmiths.editor.actions;

 

 import org.eclipse.emf.edit.ui.action.ValidateAction;

 import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.papyrus.customization.properties.util.ActionUtil;

+import org.eclipse.papyrus.views.properties.toolsmiths.util.ActionUtil;

 

 /**

  * An adapter for the EMF "Validate" Action, compatible with the

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/preview/Preview.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/editor/preview/Preview.java
index 812671d6485..0b3fc19f836 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/preview/Preview.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/editor/preview/Preview.java
@@ -12,7 +12,7 @@
  *  Christian W. Damus (CEA) - bug 417409
  *
  *****************************************************************************/
-package org.eclipse.papyrus.customization.properties.editor.preview;
+package org.eclipse.papyrus.views.properties.toolsmiths.editor.preview;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -35,10 +35,10 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.papyrus.customization.properties.Activator;
-import org.eclipse.papyrus.customization.properties.editor.UIEditor;
-import org.eclipse.papyrus.customization.properties.messages.Messages;
-import org.eclipse.papyrus.customization.properties.model.xwt.resource.XWTResource;
+import org.eclipse.papyrus.views.properties.model.xwt.resource.XWTResource;
+import org.eclipse.papyrus.views.properties.toolsmiths.Activator;
+import org.eclipse.papyrus.views.properties.toolsmiths.editor.UIEditor;
+import org.eclipse.papyrus.views.properties.toolsmiths.messages.Messages;
 import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.internal.treeproxy.TreeElement;
 import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
 import org.eclipse.papyrus.infra.properties.contexts.Section;
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/messages/Messages.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/messages/Messages.java
index 2018a645cf3..bb328c0ae7a 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/messages/Messages.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/messages/Messages.java
@@ -10,9 +10,10 @@
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

  *  Christian W. Damus (CEA) - Factor out workspace storage for pluggable storage providers (CDO)

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

-package org.eclipse.papyrus.customization.properties.messages;

+package org.eclipse.papyrus.views.properties.toolsmiths.messages;

 

 import org.eclipse.osgi.util.NLS;

+import org.eclipse.papyrus.views.properties.toolsmiths.messages.Messages;

 

 public class Messages extends NLS {

 

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/messages/messages.properties b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/messages/messages.properties
index 42177f86668..42177f86668 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/messages/messages.properties
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/messages/messages.properties
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/modelelement/CustomizationModelElement.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/modelelement/CustomizationModelElement.java
index dfd940d3ae7..08dbc22a159 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/modelelement/CustomizationModelElement.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/modelelement/CustomizationModelElement.java
@@ -11,7 +11,7 @@
  *  Christian W. Damus (CEA) - bug 417409
  *
  *****************************************************************************/
-package org.eclipse.papyrus.customization.properties.modelelement;
+package org.eclipse.papyrus.views.properties.toolsmiths.modelelement;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -22,14 +22,7 @@ import org.eclipse.emf.ecore.EClassifier;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.papyrus.customization.properties.providers.ConstraintDescriptorContentProvider;
-import org.eclipse.papyrus.customization.properties.providers.ContextLabelProvider;
-import org.eclipse.papyrus.customization.properties.providers.DataContextElementContentProvider;
-import org.eclipse.papyrus.customization.properties.providers.DependencyContentProvider;
-import org.eclipse.papyrus.customization.properties.providers.EnvironmentContentProvider;
-import org.eclipse.papyrus.customization.properties.providers.PropertyContentProvider;
-import org.eclipse.papyrus.customization.properties.providers.PropertyEditorTypeContentProvider;
-import org.eclipse.papyrus.customization.properties.providers.TabContentProvider;
+import org.eclipse.papyrus.views.properties.toolsmiths.modelelement.SectionNameObservableValue;
 import org.eclipse.papyrus.infra.constraints.ConstraintsPackage;
 import org.eclipse.papyrus.infra.constraints.ui.providers.ConstraintTypeContentProvider;
 import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
@@ -53,6 +46,14 @@ import org.eclipse.papyrus.infra.widgets.strategy.IStrategyBasedContentProvider;
 import org.eclipse.papyrus.infra.widgets.strategy.ProviderBasedBrowseStrategy;
 import org.eclipse.papyrus.infra.widgets.strategy.StrategyBasedContentProvider;
 import org.eclipse.papyrus.infra.widgets.strategy.TreeBrowseStrategy;
+import org.eclipse.papyrus.views.properties.toolsmiths.providers.ConstraintDescriptorContentProvider;
+import org.eclipse.papyrus.views.properties.toolsmiths.providers.ContextLabelProvider;
+import org.eclipse.papyrus.views.properties.toolsmiths.providers.DataContextElementContentProvider;
+import org.eclipse.papyrus.views.properties.toolsmiths.providers.DependencyContentProvider;
+import org.eclipse.papyrus.views.properties.toolsmiths.providers.EnvironmentContentProvider;
+import org.eclipse.papyrus.views.properties.toolsmiths.providers.PropertyContentProvider;
+import org.eclipse.papyrus.views.properties.toolsmiths.providers.PropertyEditorTypeContentProvider;
+import org.eclipse.papyrus.views.properties.toolsmiths.providers.TabContentProvider;
 
 /**
  * A {@link ModelElement} for customization specific properties
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/modelelement/CustomizationModelElementFactory.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/modelelement/CustomizationModelElementFactory.java
index 1e56331096d..a027f9ee674 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/modelelement/CustomizationModelElementFactory.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/modelelement/CustomizationModelElementFactory.java
@@ -11,9 +11,10 @@
  *  Christian W. Damus (CEA) - bug 417409
  *
  *****************************************************************************/
-package org.eclipse.papyrus.customization.properties.modelelement;
+package org.eclipse.papyrus.views.properties.toolsmiths.modelelement;
 
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.views.properties.toolsmiths.modelelement.CustomizationModelElement;
 import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
 import org.eclipse.papyrus.infra.properties.contexts.DataContextElement;
 import org.eclipse.papyrus.infra.properties.ui.modelelement.AbstractEMFModelElementFactory;
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/modelelement/GenericAttributeModelElement.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/modelelement/GenericAttributeModelElement.java
index 49809f83d76..8f3253965cd 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/modelelement/GenericAttributeModelElement.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/modelelement/GenericAttributeModelElement.java
@@ -11,7 +11,7 @@
  *  Christian W. Damus (CEA) - bug 417409
  *
  *****************************************************************************/
-package org.eclipse.papyrus.customization.properties.modelelement;
+package org.eclipse.papyrus.views.properties.toolsmiths.modelelement;
 
 import java.util.Collection;
 import java.util.Iterator;
@@ -26,6 +26,9 @@ import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.papyrus.views.properties.toolsmiths.modelelement.GenericAttributeModelElementFactory;
+import org.eclipse.papyrus.views.properties.toolsmiths.modelelement.GenericAttributeObservable;
+import org.eclipse.papyrus.views.properties.toolsmiths.modelelement.GenericPropertyModelElementFactory;
 import org.eclipse.papyrus.infra.constraints.ConfigProperty;
 import org.eclipse.papyrus.infra.core.services.ServiceException;
 import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForResource;
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/modelelement/GenericAttributeModelElementFactory.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/modelelement/GenericAttributeModelElementFactory.java
index 916707fddb1..513bd61d57f 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/modelelement/GenericAttributeModelElementFactory.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/modelelement/GenericAttributeModelElementFactory.java
@@ -11,20 +11,21 @@
  *  Christian W. Damus (CEA) - bug 417409
  *
  *****************************************************************************/
-package org.eclipse.papyrus.customization.properties.modelelement;
+package org.eclipse.papyrus.views.properties.toolsmiths.modelelement;
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
 import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.papyrus.customization.properties.Activator;
+import org.eclipse.papyrus.views.properties.toolsmiths.modelelement.GenericAttributeModelElement;
 import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
 import org.eclipse.papyrus.infra.properties.contexts.DataContextElement;
 import org.eclipse.papyrus.infra.properties.ui.UiFactory;
 import org.eclipse.papyrus.infra.properties.ui.UiPackage;
 import org.eclipse.papyrus.infra.properties.ui.WidgetAttribute;
 import org.eclipse.papyrus.infra.properties.ui.modelelement.AbstractModelElementFactory;
+import org.eclipse.papyrus.views.properties.toolsmiths.Activator;
 
 /**
  * A ModelElementFactory for handling {@link WidgetAttribute} properties
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/modelelement/GenericAttributeObservable.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/modelelement/GenericAttributeObservable.java
index 7af07b75af8..34d06864ea5 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/modelelement/GenericAttributeObservable.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/modelelement/GenericAttributeObservable.java
@@ -9,7 +9,7 @@
  * Contributors:

  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.customization.properties.modelelement;

+package org.eclipse.papyrus.views.properties.toolsmiths.modelelement;

 

 import org.eclipse.core.databinding.observable.value.AbstractObservableValue;

 import org.eclipse.core.databinding.observable.value.ValueDiff;

@@ -23,6 +23,7 @@ import org.eclipse.emf.edit.command.CreateChildCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;

 import org.eclipse.emf.edit.command.SetCommand;

 import org.eclipse.emf.edit.domain.EditingDomain;

+import org.eclipse.papyrus.views.properties.toolsmiths.modelelement.GenericAttributeModelElement;

 

 /**

  * An observable value for manipulating reflective properties

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/modelelement/GenericPropertyModelElementFactory.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/modelelement/GenericPropertyModelElementFactory.java
index 80a1641b6eb..7a5925a10c6 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/modelelement/GenericPropertyModelElementFactory.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/modelelement/GenericPropertyModelElementFactory.java
@@ -11,20 +11,21 @@
  *  Christian W. Damus (CEA) - bug 417409
  *
  *****************************************************************************/
-package org.eclipse.papyrus.customization.properties.modelelement;
+package org.eclipse.papyrus.views.properties.toolsmiths.modelelement;
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
 import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.papyrus.customization.properties.Activator;
+import org.eclipse.papyrus.views.properties.toolsmiths.modelelement.GenericAttributeModelElement;
 import org.eclipse.papyrus.infra.constraints.ConfigProperty;
 import org.eclipse.papyrus.infra.constraints.ConstraintsFactory;
 import org.eclipse.papyrus.infra.constraints.ConstraintsPackage;
 import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
 import org.eclipse.papyrus.infra.properties.contexts.DataContextElement;
 import org.eclipse.papyrus.infra.properties.ui.modelelement.AbstractModelElementFactory;
+import org.eclipse.papyrus.views.properties.toolsmiths.Activator;
 
 /**
  * A ModelElementFactory for handling {@link ConfigProperty} properties
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/modelelement/SectionNameObservableValue.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/modelelement/SectionNameObservableValue.java
index 59c5f867934..03dc6c016d3 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/modelelement/SectionNameObservableValue.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/modelelement/SectionNameObservableValue.java
@@ -9,7 +9,7 @@
  * Contributors:

  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.customization.properties.modelelement;

+package org.eclipse.papyrus.views.properties.toolsmiths.modelelement;

 

 import org.eclipse.emf.common.command.Command;

 import org.eclipse.emf.common.command.CompoundCommand;

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/perspective/CustomizationPerspectiveFactory.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/perspective/CustomizationPerspectiveFactory.java
index 4da66b1451b..b8aff816959 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/perspective/CustomizationPerspectiveFactory.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/perspective/CustomizationPerspectiveFactory.java
@@ -9,9 +9,9 @@
  * Contributors:

  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.customization.properties.perspective;

+package org.eclipse.papyrus.views.properties.toolsmiths.perspective;

 

-import org.eclipse.papyrus.customization.properties.Activator;

+import org.eclipse.papyrus.views.properties.toolsmiths.Activator;

 import org.eclipse.ui.IPageLayout;

 import org.eclipse.ui.IPerspectiveFactory;

 

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/preferences/CustomizationPreferencePage.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/preferences/CustomizationPreferencePage.java
index 3009b03476d..84a4ead60f0 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/preferences/CustomizationPreferencePage.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/preferences/CustomizationPreferencePage.java
@@ -20,13 +20,13 @@
  * Contributors:

  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.customization.properties.preferences;

+package org.eclipse.papyrus.views.properties.toolsmiths.preferences;

 

 import org.eclipse.jface.preference.BooleanFieldEditor;

 import org.eclipse.jface.preference.FieldEditorPreferencePage;

 import org.eclipse.jface.resource.ImageDescriptor;

-import org.eclipse.papyrus.customization.properties.Activator;

-import org.eclipse.papyrus.customization.properties.messages.Messages;

+import org.eclipse.papyrus.views.properties.toolsmiths.Activator;

+import org.eclipse.papyrus.views.properties.toolsmiths.messages.Messages;

 import org.eclipse.ui.IWorkbench;

 import org.eclipse.ui.IWorkbenchPreferencePage;

 

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/preferences/CustomizationPreferencesInitializer.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/preferences/CustomizationPreferencesInitializer.java
index 93b7fa24549..9f06fa2485d 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/preferences/CustomizationPreferencesInitializer.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/preferences/CustomizationPreferencesInitializer.java
@@ -9,11 +9,12 @@
  * Contributors:

  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.customization.properties.preferences;

+package org.eclipse.papyrus.views.properties.toolsmiths.preferences;

 

 import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.customization.properties.Activator;

+import org.eclipse.papyrus.views.properties.toolsmiths.preferences.CustomizationPreferencePage;

+import org.eclipse.papyrus.views.properties.toolsmiths.Activator;

 

 /**

  * The initializer for @see {@link CustomizationPreferencePage}

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/AbstractContextualContentProvider.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/providers/AbstractContextualContentProvider.java
index 97969594261..09e7cbc79f9 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/AbstractContextualContentProvider.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/providers/AbstractContextualContentProvider.java
@@ -11,7 +11,7 @@
  *  Christian W. Damus - bug 485220
  *
  *****************************************************************************/
-package org.eclipse.papyrus.customization.properties.providers;
+package org.eclipse.papyrus.views.properties.toolsmiths.providers;
 
 import java.util.Collection;
 import java.util.LinkedList;
@@ -19,12 +19,12 @@ import java.util.List;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.papyrus.customization.properties.Activator;
 import org.eclipse.papyrus.infra.properties.contexts.Context;
 import org.eclipse.papyrus.infra.properties.ui.util.PropertiesUtil;
 import org.eclipse.papyrus.infra.tools.util.ListHelper;
 import org.eclipse.papyrus.infra.ui.emf.providers.strategy.SemanticEMFContentProvider;
 import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;
+import org.eclipse.papyrus.views.properties.toolsmiths.Activator;
 
 /**
  * An abstract implementation of {@link IStaticContentProvider} for
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/ConstraintDescriptorContentProvider.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/providers/ConstraintDescriptorContentProvider.java
index b3d0f4f9acd..67f60130202 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/ConstraintDescriptorContentProvider.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/providers/ConstraintDescriptorContentProvider.java
@@ -9,13 +9,14 @@
  * Contributors:

  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.customization.properties.providers;

+package org.eclipse.papyrus.views.properties.toolsmiths.providers;

 

 import java.util.LinkedList;

 import java.util.List;

 

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.EObject;

+import org.eclipse.papyrus.views.properties.toolsmiths.providers.AbstractContextualContentProvider;

 import org.eclipse.papyrus.infra.constraints.ConstraintDescriptor;

 import org.eclipse.papyrus.infra.constraints.DisplayUnit;

 import org.eclipse.papyrus.infra.properties.contexts.Context;

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/ContextContentProvider.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/providers/ContextContentProvider.java
index 81b2a3e1d52..296f721888b 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/ContextContentProvider.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/providers/ContextContentProvider.java
@@ -11,17 +11,17 @@
  *  Christian W. Damus - bug 485220
  *
  *****************************************************************************/
-package org.eclipse.papyrus.customization.properties.providers;
+package org.eclipse.papyrus.views.properties.toolsmiths.providers;
 
 import java.util.LinkedHashSet;
 import java.util.Set;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.papyrus.customization.properties.Activator;
 import org.eclipse.papyrus.emf.facet.custom.ui.internal.CustomizedTreeContentProvider;
 import org.eclipse.papyrus.infra.properties.contexts.Context;
 import org.eclipse.papyrus.infra.properties.ui.util.PropertiesUtil;
+import org.eclipse.papyrus.views.properties.toolsmiths.Activator;
 
 /**
  * The customization editor's content provider. Based on the EMF Facet
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/ContextLabelProvider.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/providers/ContextLabelProvider.java
index 3f530445f0c..f870975cd79 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/ContextLabelProvider.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/providers/ContextLabelProvider.java
@@ -11,13 +11,13 @@
  *  Christian W. Damus - bug 485220

  *

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

-package org.eclipse.papyrus.customization.properties.providers;

+package org.eclipse.papyrus.views.properties.toolsmiths.providers;

 

 import org.eclipse.emf.ecore.EObject;

-import org.eclipse.papyrus.customization.properties.Activator;

 import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.internal.treeproxy.EObjectTreeElement;

 import org.eclipse.papyrus.emf.facet.custom.ui.internal.DecoratingCustomizedLabelProvider;

 import org.eclipse.papyrus.emf.facet.custom.ui.internal.ResolvingCustomizedLabelProvider;

+import org.eclipse.papyrus.views.properties.toolsmiths.Activator;

 import org.eclipse.swt.graphics.Image;

 

 /**

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/DataContextElementContentProvider.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/providers/DataContextElementContentProvider.java
index a462bab7d6a..a4cf983040e 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/DataContextElementContentProvider.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/providers/DataContextElementContentProvider.java
@@ -9,7 +9,7 @@
  * Contributors:

  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.customization.properties.providers;

+package org.eclipse.papyrus.views.properties.toolsmiths.providers;

 

 import java.text.Collator;

 import java.text.RuleBasedCollator;

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/DependencyContentProvider.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/providers/DependencyContentProvider.java
index 4c1f5715efc..517af6e6c29 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/DependencyContentProvider.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/providers/DependencyContentProvider.java
@@ -9,7 +9,7 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.customization.properties.providers;
+package org.eclipse.papyrus.views.properties.toolsmiths.providers;
 
 import java.util.LinkedList;
 import java.util.List;
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/EnvironmentContentProvider.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/providers/EnvironmentContentProvider.java
index ec0c5c19b1e..373e3e442de 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/EnvironmentContentProvider.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/providers/EnvironmentContentProvider.java
@@ -11,7 +11,7 @@
  *  Christian W. Damus - bug 485220

  *

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

-package org.eclipse.papyrus.customization.properties.providers;

+package org.eclipse.papyrus.views.properties.toolsmiths.providers;

 

 import java.util.LinkedList;

 import java.util.List;

@@ -19,11 +19,11 @@ import java.util.List;
 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.papyrus.customization.properties.Activator;

 import org.eclipse.papyrus.infra.properties.environment.Environment;

 import org.eclipse.papyrus.infra.ui.emf.providers.strategy.SemanticEMFContentProvider;

 import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;

 import org.eclipse.papyrus.views.properties.runtime.ConfigurationManager;

+import org.eclipse.papyrus.views.properties.toolsmiths.Activator;

 

 /**

  * A Content provider for returning objects for the registered environments

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/PropertyContentProvider.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/providers/PropertyContentProvider.java
index ee266b54158..f28aaba7df1 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/PropertyContentProvider.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/providers/PropertyContentProvider.java
@@ -9,13 +9,14 @@
  * Contributors:

  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.customization.properties.providers;

+package org.eclipse.papyrus.views.properties.toolsmiths.providers;

 

 import java.util.Iterator;

 import java.util.LinkedList;

 import java.util.List;

 

 import org.eclipse.emf.ecore.EObject;

+import org.eclipse.papyrus.views.properties.toolsmiths.providers.AbstractContextualContentProvider;

 import org.eclipse.papyrus.infra.properties.contexts.Context;

 import org.eclipse.papyrus.infra.properties.contexts.DataContextElement;

 import org.eclipse.papyrus.infra.properties.contexts.DataContextPackage;

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/PropertyEditorTypeContentProvider.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/providers/PropertyEditorTypeContentProvider.java
index cf7a3fdd9f8..58abd5af25d 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/PropertyEditorTypeContentProvider.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/providers/PropertyEditorTypeContentProvider.java
@@ -9,7 +9,7 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.customization.properties.providers;
+package org.eclipse.papyrus.views.properties.toolsmiths.providers;
 
 import org.eclipse.jface.viewers.IStructuredContentProvider;
 import org.eclipse.jface.viewers.Viewer;
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/TabContentProvider.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/providers/TabContentProvider.java
index db6563b1e11..16090fe62d8 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/TabContentProvider.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/providers/TabContentProvider.java
@@ -9,12 +9,13 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.customization.properties.providers;
+package org.eclipse.papyrus.views.properties.toolsmiths.providers;
 
 import java.util.LinkedList;
 import java.util.List;
 
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.views.properties.toolsmiths.providers.AbstractContextualContentProvider;
 import org.eclipse.papyrus.infra.properties.contexts.Context;
 import org.eclipse.papyrus.infra.properties.contexts.Tab;
 import org.eclipse.papyrus.infra.properties.ui.runtime.PropertiesRuntime;
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/query/DataContextsImageQuery.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/query/DataContextsImageQuery.java
index b9bc39cd05e..f789ff8c860 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/query/DataContextsImageQuery.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/query/DataContextsImageQuery.java
@@ -9,7 +9,7 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.customization.properties.query;
+package org.eclipse.papyrus.views.properties.toolsmiths.query;
 
 import org.eclipse.papyrus.emf.facet.custom.metamodel.custompt.IImage;
 import org.eclipse.papyrus.emf.facet.custom.ui.internal.custompt.URIImage;
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/query/GetVisibleFeaturesQuery.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/query/GetVisibleFeaturesQuery.java
index b583f648a93..10db604c395 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/query/GetVisibleFeaturesQuery.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/query/GetVisibleFeaturesQuery.java
@@ -11,7 +11,7 @@
  *
  *****************************************************************************/
 
-package org.eclipse.papyrus.customization.properties.query;
+package org.eclipse.papyrus.views.properties.toolsmiths.query;
 
 import java.util.Collections;
 import java.util.HashSet;
@@ -24,7 +24,6 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.papyrus.customization.properties.editor.actions.ToggleDataContextAction;
 import org.eclipse.papyrus.emf.facet.efacet.core.IFacetManager;
 import org.eclipse.papyrus.emf.facet.efacet.core.exception.DerivedTypedElementException;
 import org.eclipse.papyrus.emf.facet.query.java.core.IJavaQuery2;
@@ -34,6 +33,7 @@ import org.eclipse.papyrus.infra.properties.contexts.Context;
 import org.eclipse.papyrus.infra.properties.contexts.ContextsPackage;
 import org.eclipse.papyrus.infra.properties.contexts.util.ContextsSwitch;
 import org.eclipse.papyrus.infra.properties.ui.UiPackage;
+import org.eclipse.papyrus.views.properties.toolsmiths.editor.actions.ToggleDataContextAction;
 
 /**
  * @author Camille Letavernier
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/query/ShowContextQuery.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/query/ShowContextQuery.java
index 96427d76c8f..2b4cc96e28d 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/query/ShowContextQuery.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/query/ShowContextQuery.java
@@ -9,14 +9,14 @@
  * Contributors:

  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.customization.properties.query;

+package org.eclipse.papyrus.views.properties.toolsmiths.query;

 

-import org.eclipse.papyrus.customization.properties.editor.actions.ToggleDataContextAction;

 import org.eclipse.papyrus.emf.facet.efacet.core.IFacetManager;

 import org.eclipse.papyrus.emf.facet.efacet.core.exception.DerivedTypedElementException;

 import org.eclipse.papyrus.emf.facet.query.java.core.IJavaQuery2;

 import org.eclipse.papyrus.emf.facet.query.java.core.IParameterValueList2;

 import org.eclipse.papyrus.infra.properties.contexts.Context;

+import org.eclipse.papyrus.views.properties.toolsmiths.editor.actions.ToggleDataContextAction;

 

 /**

  * A Query to test if the DataContextElements should be displayed in the UIEditor

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/query/ViewsImageQuery.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/query/ViewsImageQuery.java
index 4a4b29bd026..685e75bc15e 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/query/ViewsImageQuery.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/query/ViewsImageQuery.java
@@ -9,7 +9,7 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.customization.properties.query;
+package org.eclipse.papyrus.views.properties.toolsmiths.query;
 
 import org.eclipse.papyrus.emf.facet.custom.metamodel.custompt.IImage;
 import org.eclipse.papyrus.emf.facet.custom.ui.internal.custompt.URIImage;
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/storage/actions/AbstractContextStorageActionProvider.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/storage/actions/AbstractContextStorageActionProvider.java
index 4292164659c..efeca3b01a8 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/storage/actions/AbstractContextStorageActionProvider.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/storage/actions/AbstractContextStorageActionProvider.java
@@ -9,8 +9,12 @@
  * Contributors:
  *   CEA LIST - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.customization.properties.storage.actions;
+package org.eclipse.papyrus.views.properties.toolsmiths.storage.actions;
 
+import org.eclipse.papyrus.views.properties.toolsmiths.storage.actions.IContextCopyAction;
+import org.eclipse.papyrus.views.properties.toolsmiths.storage.actions.IContextDeleteAction;
+import org.eclipse.papyrus.views.properties.toolsmiths.storage.actions.IContextEditAction;
+import org.eclipse.papyrus.views.properties.toolsmiths.storage.actions.IContextStorageActionProvider;
 
 /**
  * This is the AbstractContextStorageActionProvider type. Enjoy.
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/storage/actions/ContextStorageActionRegistry.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/storage/actions/ContextStorageActionRegistry.java
index 48c297d8a54..6fb5264aa2d 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/storage/actions/ContextStorageActionRegistry.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/storage/actions/ContextStorageActionRegistry.java
@@ -11,7 +11,7 @@
  *   Christian W. Damus (CEA) - bug 422257
  *
  *****************************************************************************/
-package org.eclipse.papyrus.customization.properties.storage.actions;
+package org.eclipse.papyrus.views.properties.toolsmiths.storage.actions;
 
 import java.util.Collections;
 import java.util.Comparator;
@@ -20,9 +20,13 @@ import java.util.Map;
 
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.Platform;
-import org.eclipse.papyrus.customization.properties.Activator;
+import org.eclipse.papyrus.views.properties.toolsmiths.storage.actions.IContextCopyAction;
+import org.eclipse.papyrus.views.properties.toolsmiths.storage.actions.IContextDeleteAction;
+import org.eclipse.papyrus.views.properties.toolsmiths.storage.actions.IContextEditAction;
+import org.eclipse.papyrus.views.properties.toolsmiths.storage.actions.IContextStorageActionProvider;
 import org.eclipse.papyrus.infra.core.utils.OneTimeRegistryReader;
 import org.eclipse.papyrus.infra.properties.contexts.Context;
+import org.eclipse.papyrus.views.properties.toolsmiths.Activator;
 
 /**
  * This is the ContextStorageActionRegistry type. Enjoy.
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/storage/actions/ContextStorageActionUtil.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/storage/actions/ContextStorageActionUtil.java
index 05386f3e3d4..a693cc31b3c 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/storage/actions/ContextStorageActionUtil.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/storage/actions/ContextStorageActionUtil.java
@@ -11,7 +11,7 @@
  *  Christian W. Damus (CEA) - Factored out some methods from existing code for reuse (CDO)
  *  Christian W. Damus - bug 482927
  *****************************************************************************/
-package org.eclipse.papyrus.customization.properties.storage.actions;
+package org.eclipse.papyrus.views.properties.toolsmiths.storage.actions;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -22,9 +22,9 @@ import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.papyrus.customization.properties.messages.Messages;
 import org.eclipse.papyrus.infra.properties.contexts.Context;
 import org.eclipse.papyrus.infra.properties.contexts.ContextsPackage;
+import org.eclipse.papyrus.views.properties.toolsmiths.messages.Messages;
 
 
 /**
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/storage/actions/IContextCopyAction.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/storage/actions/IContextCopyAction.java
index 18e0a3ccfb3..961d2804eec 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/storage/actions/IContextCopyAction.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/storage/actions/IContextCopyAction.java
@@ -9,7 +9,7 @@
  * Contributors:
  *   CEA LIST - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.customization.properties.storage.actions;
+package org.eclipse.papyrus.views.properties.toolsmiths.storage.actions;
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/storage/actions/IContextDeleteAction.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/storage/actions/IContextDeleteAction.java
index 8fcafa49272..24577ba1c2e 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/storage/actions/IContextDeleteAction.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/storage/actions/IContextDeleteAction.java
@@ -9,7 +9,7 @@
  * Contributors:
  *   CEA LIST - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.customization.properties.storage.actions;
+package org.eclipse.papyrus.views.properties.toolsmiths.storage.actions;
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/storage/actions/IContextEditAction.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/storage/actions/IContextEditAction.java
index 722e92b5e3d..b9eeb32ec22 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/storage/actions/IContextEditAction.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/storage/actions/IContextEditAction.java
@@ -9,7 +9,7 @@
  * Contributors:
  *   CEA LIST - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.customization.properties.storage.actions;
+package org.eclipse.papyrus.views.properties.toolsmiths.storage.actions;
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/storage/actions/IContextStorageActionProvider.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/storage/actions/IContextStorageActionProvider.java
index 2893f0bd1a7..50e99a84884 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/storage/actions/IContextStorageActionProvider.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/storage/actions/IContextStorageActionProvider.java
@@ -9,8 +9,12 @@
  * Contributors:
  *   CEA LIST - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.customization.properties.storage.actions;
+package org.eclipse.papyrus.views.properties.toolsmiths.storage.actions;
 
+import org.eclipse.papyrus.views.properties.toolsmiths.storage.actions.IContextCopyAction;
+import org.eclipse.papyrus.views.properties.toolsmiths.storage.actions.IContextDeleteAction;
+import org.eclipse.papyrus.views.properties.toolsmiths.storage.actions.IContextEditAction;
+import org.eclipse.papyrus.views.properties.toolsmiths.storage.actions.IContextStorageActionProvider;
 import org.eclipse.papyrus.infra.properties.contexts.Context;
 
 
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/storage/actions/workspace/WorkspaceContextCopyAction.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/storage/actions/workspace/WorkspaceContextCopyAction.java
index 92d3782d77b..6b8f7a3a5c5 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/storage/actions/workspace/WorkspaceContextCopyAction.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/storage/actions/workspace/WorkspaceContextCopyAction.java
@@ -13,10 +13,10 @@
  *  Christian W. Damus - bug 482927
  *
  *****************************************************************************/
-package org.eclipse.papyrus.customization.properties.storage.actions.workspace;
+package org.eclipse.papyrus.views.properties.toolsmiths.storage.actions.workspace;
 
-import static org.eclipse.papyrus.customization.properties.storage.actions.ContextStorageActionUtil.initializeCopy;
-import static org.eclipse.papyrus.customization.properties.storage.actions.ContextStorageActionUtil.isRelative;
+import static org.eclipse.papyrus.views.properties.toolsmiths.storage.actions.ContextStorageActionUtil.initializeCopy;
+import static org.eclipse.papyrus.views.properties.toolsmiths.storage.actions.ContextStorageActionUtil.isRelative;
 
 import java.io.File;
 import java.io.FileWriter;
@@ -39,9 +39,6 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.papyrus.customization.properties.Activator;
-import org.eclipse.papyrus.customization.properties.messages.Messages;
-import org.eclipse.papyrus.customization.properties.storage.actions.IContextCopyAction;
 import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
 import org.eclipse.papyrus.infra.properties.catalog.PropertiesURIHandler;
 import org.eclipse.papyrus.infra.properties.contexts.Context;
@@ -50,6 +47,9 @@ import org.eclipse.papyrus.infra.properties.contexts.Tab;
 import org.eclipse.papyrus.infra.properties.ui.runtime.PropertiesRuntime;
 import org.eclipse.papyrus.infra.properties.ui.util.PropertiesUtil;
 import org.eclipse.papyrus.views.properties.runtime.ConfigurationManager;
+import org.eclipse.papyrus.views.properties.toolsmiths.Activator;
+import org.eclipse.papyrus.views.properties.toolsmiths.messages.Messages;
+import org.eclipse.papyrus.views.properties.toolsmiths.storage.actions.IContextCopyAction;
 
 /**
  * An action to build a new Property view context from an existing one.
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/storage/actions/workspace/WorkspaceContextDeleteAction.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/storage/actions/workspace/WorkspaceContextDeleteAction.java
index 6862604cf57..a211179a76c 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/storage/actions/workspace/WorkspaceContextDeleteAction.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/storage/actions/workspace/WorkspaceContextDeleteAction.java
@@ -11,17 +11,17 @@
  *  Christian W. Damus (CEA) - Factor out workspace storage for pluggable storage providers (CDO)
  *  Christian W. Damus - bug 482927
  *****************************************************************************/
-package org.eclipse.papyrus.customization.properties.storage.actions.workspace;
+package org.eclipse.papyrus.views.properties.toolsmiths.storage.actions.workspace;
 
 import java.io.File;
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.SubMonitor;
-import org.eclipse.papyrus.customization.properties.messages.Messages;
-import org.eclipse.papyrus.customization.properties.storage.actions.IContextDeleteAction;
 import org.eclipse.papyrus.infra.properties.contexts.Context;
 import org.eclipse.papyrus.infra.properties.internal.ui.runtime.IInternalConfigurationManager;
+import org.eclipse.papyrus.views.properties.toolsmiths.messages.Messages;
+import org.eclipse.papyrus.views.properties.toolsmiths.storage.actions.IContextDeleteAction;
 
 /**
  * An action to delete an existing context. This action cannot be undone.
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/storage/actions/workspace/WorkspaceContextEditAction.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/storage/actions/workspace/WorkspaceContextEditAction.java
index dd7061e7ead..7d1c5d5783d 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/storage/actions/workspace/WorkspaceContextEditAction.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/storage/actions/workspace/WorkspaceContextEditAction.java
@@ -11,16 +11,16 @@
  *  Christian W. Damus (CEA) - Factor out workspace storage for pluggable storage providers (CDO)

  *  Christian W. Damus - bug 482927

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

-package org.eclipse.papyrus.customization.properties.storage.actions.workspace;

+package org.eclipse.papyrus.views.properties.toolsmiths.storage.actions.workspace;

 

 import org.eclipse.core.resources.IFile;

 import org.eclipse.core.runtime.CoreException;

 import org.eclipse.core.runtime.IProgressMonitor;

 import org.eclipse.core.runtime.SubMonitor;

-import org.eclipse.papyrus.customization.properties.messages.Messages;

-import org.eclipse.papyrus.customization.properties.storage.actions.IContextEditAction;

-import org.eclipse.papyrus.customization.properties.util.ProjectUtil;

 import org.eclipse.papyrus.infra.properties.contexts.Context;

+import org.eclipse.papyrus.views.properties.toolsmiths.messages.Messages;

+import org.eclipse.papyrus.views.properties.toolsmiths.storage.actions.IContextEditAction;

+import org.eclipse.papyrus.views.properties.toolsmiths.util.ProjectUtil;

 import org.eclipse.ui.PlatformUI;

 import org.eclipse.ui.part.FileEditorInput;

 

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/storage/actions/workspace/WorkspaceContextStorageActionProvider.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/storage/actions/workspace/WorkspaceContextStorageActionProvider.java
index 61f2180a2ea..39490c81768 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/storage/actions/workspace/WorkspaceContextStorageActionProvider.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/storage/actions/workspace/WorkspaceContextStorageActionProvider.java
@@ -9,14 +9,17 @@
  * Contributors:
  *   CEA LIST - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.customization.properties.storage.actions.workspace;
+package org.eclipse.papyrus.views.properties.toolsmiths.storage.actions.workspace;
 
 import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.papyrus.customization.properties.storage.actions.AbstractContextStorageActionProvider;
-import org.eclipse.papyrus.customization.properties.storage.actions.IContextCopyAction;
-import org.eclipse.papyrus.customization.properties.storage.actions.IContextDeleteAction;
-import org.eclipse.papyrus.customization.properties.storage.actions.IContextEditAction;
+import org.eclipse.papyrus.views.properties.toolsmiths.storage.actions.workspace.WorkspaceContextCopyAction;
+import org.eclipse.papyrus.views.properties.toolsmiths.storage.actions.workspace.WorkspaceContextDeleteAction;
+import org.eclipse.papyrus.views.properties.toolsmiths.storage.actions.workspace.WorkspaceContextEditAction;
 import org.eclipse.papyrus.infra.properties.contexts.Context;
+import org.eclipse.papyrus.views.properties.toolsmiths.storage.actions.AbstractContextStorageActionProvider;
+import org.eclipse.papyrus.views.properties.toolsmiths.storage.actions.IContextCopyAction;
+import org.eclipse.papyrus.views.properties.toolsmiths.storage.actions.IContextDeleteAction;
+import org.eclipse.papyrus.views.properties.toolsmiths.storage.actions.IContextEditAction;
 
 
 /**
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/ui/CopyContextAction.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/ui/CopyContextAction.java
index 848fa136e7a..bbc72b759e5 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/ui/CopyContextAction.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/ui/CopyContextAction.java
@@ -10,7 +10,7 @@
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *  Christian W. Damus (CEA) - Factor out workspace storage for pluggable storage providers (CDO)
  *****************************************************************************/
-package org.eclipse.papyrus.customization.properties.ui;
+package org.eclipse.papyrus.views.properties.toolsmiths.ui;
 
 import java.lang.reflect.InvocationTargetException;
 
@@ -18,11 +18,11 @@ import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jface.dialogs.ProgressMonitorDialog;
 import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.papyrus.customization.properties.Activator;
-import org.eclipse.papyrus.customization.properties.storage.actions.IContextCopyAction;
 import org.eclipse.papyrus.infra.properties.contexts.Context;
 import org.eclipse.papyrus.infra.properties.internal.ui.runtime.IInternalConfigurationManager;
 import org.eclipse.papyrus.infra.properties.ui.runtime.PropertiesRuntime;
+import org.eclipse.papyrus.views.properties.toolsmiths.Activator;
+import org.eclipse.papyrus.views.properties.toolsmiths.storage.actions.IContextCopyAction;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.statushandlers.StatusManager;
 
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/ui/CustomizationDialog.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/ui/CustomizationDialog.java
index cf2024373c3..eb95a5a898c 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/ui/CustomizationDialog.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/ui/CustomizationDialog.java
@@ -11,7 +11,7 @@
  *  Christian W. Damus (CEA) - Factor out workspace storage for pluggable storage providers (CDO)
  *  Christian W. Damus - bug 482927
  *****************************************************************************/
-package org.eclipse.papyrus.customization.properties.ui;
+package org.eclipse.papyrus.views.properties.toolsmiths.ui;
 
 import java.util.Collection;
 
@@ -26,17 +26,20 @@ import org.eclipse.jface.viewers.ListViewer;
 import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.customization.properties.Activator;
-import org.eclipse.papyrus.customization.properties.messages.Messages;
-import org.eclipse.papyrus.customization.properties.storage.actions.ContextStorageActionRegistry;
-import org.eclipse.papyrus.customization.properties.storage.actions.IContextCopyAction;
-import org.eclipse.papyrus.customization.properties.storage.actions.IContextDeleteAction;
-import org.eclipse.papyrus.customization.properties.storage.actions.IContextEditAction;
-import org.eclipse.papyrus.customization.properties.storage.actions.IContextStorageActionProvider;
+import org.eclipse.papyrus.views.properties.toolsmiths.ui.CopyContextAction;
+import org.eclipse.papyrus.views.properties.toolsmiths.ui.EditContextAction;
+import org.eclipse.papyrus.views.properties.toolsmiths.ui.RemoveContextAction;
 import org.eclipse.papyrus.infra.properties.contexts.Context;
 import org.eclipse.papyrus.infra.properties.ui.runtime.PropertiesRuntime;
 import org.eclipse.papyrus.infra.widgets.editors.InputDialog;
 import org.eclipse.papyrus.infra.widgets.providers.CollectionContentProvider;
+import org.eclipse.papyrus.views.properties.toolsmiths.Activator;
+import org.eclipse.papyrus.views.properties.toolsmiths.messages.Messages;
+import org.eclipse.papyrus.views.properties.toolsmiths.storage.actions.ContextStorageActionRegistry;
+import org.eclipse.papyrus.views.properties.toolsmiths.storage.actions.IContextCopyAction;
+import org.eclipse.papyrus.views.properties.toolsmiths.storage.actions.IContextDeleteAction;
+import org.eclipse.papyrus.views.properties.toolsmiths.storage.actions.IContextEditAction;
+import org.eclipse.papyrus.views.properties.toolsmiths.storage.actions.IContextStorageActionProvider;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.events.SelectionListener;
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/ui/EditContextAction.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/ui/EditContextAction.java
index 2c501d2023d..b9533301da1 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/ui/EditContextAction.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/ui/EditContextAction.java
@@ -10,7 +10,7 @@
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

  * Christian W. Damus (CEA) - Factor out workspace storage for pluggable storage providers (CDO)

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

-package org.eclipse.papyrus.customization.properties.ui;

+package org.eclipse.papyrus.views.properties.toolsmiths.ui;

 

 import java.lang.reflect.InvocationTargetException;

 

@@ -18,9 +18,9 @@ import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;

 import org.eclipse.jface.dialogs.ProgressMonitorDialog;

 import org.eclipse.jface.operation.IRunnableWithProgress;

-import org.eclipse.papyrus.customization.properties.Activator;

-import org.eclipse.papyrus.customization.properties.storage.actions.IContextEditAction;

 import org.eclipse.papyrus.infra.properties.contexts.Context;

+import org.eclipse.papyrus.views.properties.toolsmiths.Activator;

+import org.eclipse.papyrus.views.properties.toolsmiths.storage.actions.IContextEditAction;

 import org.eclipse.swt.widgets.Display;

 

 /**

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/ui/OpenCustomization.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/ui/OpenCustomization.java
index cef934f39e8..6cb70731827 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/ui/OpenCustomization.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/ui/OpenCustomization.java
@@ -9,7 +9,7 @@
  * Contributors:

  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.customization.properties.ui;

+package org.eclipse.papyrus.views.properties.toolsmiths.ui;

 

 import java.lang.reflect.InvocationTargetException;

 

@@ -20,7 +20,8 @@ import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jface.dialogs.Dialog;

 import org.eclipse.jface.dialogs.ProgressMonitorDialog;

 import org.eclipse.jface.operation.IRunnableWithProgress;

-import org.eclipse.papyrus.customization.properties.Activator;

+import org.eclipse.papyrus.views.properties.toolsmiths.ui.CustomizationDialog;

+import org.eclipse.papyrus.views.properties.toolsmiths.Activator;

 import org.eclipse.swt.widgets.Shell;

 import org.eclipse.ui.handlers.HandlerUtil;

 

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/ui/RemoveContextAction.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/ui/RemoveContextAction.java
index 5cb28328245..971b7890a46 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/ui/RemoveContextAction.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/ui/RemoveContextAction.java
@@ -10,7 +10,7 @@
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *  Christian W. Damus (CEA) - Factor out workspace storage for pluggable storage providers (CDO)
  *****************************************************************************/
-package org.eclipse.papyrus.customization.properties.ui;
+package org.eclipse.papyrus.views.properties.toolsmiths.ui;
 
 import java.lang.reflect.InvocationTargetException;
 
@@ -18,11 +18,11 @@ import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jface.dialogs.ProgressMonitorDialog;
 import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.papyrus.customization.properties.Activator;
-import org.eclipse.papyrus.customization.properties.storage.actions.IContextDeleteAction;
 import org.eclipse.papyrus.infra.properties.contexts.Context;
 import org.eclipse.papyrus.infra.properties.internal.ui.runtime.IInternalConfigurationManager;
 import org.eclipse.papyrus.infra.properties.ui.runtime.PropertiesRuntime;
+import org.eclipse.papyrus.views.properties.toolsmiths.Activator;
+import org.eclipse.papyrus.views.properties.toolsmiths.storage.actions.IContextDeleteAction;
 import org.eclipse.swt.widgets.Display;
 
 /**
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/util/ActionUtil.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/util/ActionUtil.java
index bd4e57b0241..4033fec91ad 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/util/ActionUtil.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/util/ActionUtil.java
@@ -9,7 +9,7 @@
  * Contributors:

  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.customization.properties.util;

+package org.eclipse.papyrus.views.properties.toolsmiths.util;

 

 import java.util.Collection;

 import java.util.Iterator;

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/util/ProjectUtil.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/util/ProjectUtil.java
index 849e33ccc3c..7ac3b142998 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/util/ProjectUtil.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/util/ProjectUtil.java
@@ -10,7 +10,7 @@
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

  *  Christian W. Damus (CEA) - Factor out workspace storage for pluggable storage providers (CDO)

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

-package org.eclipse.papyrus.customization.properties.util;

+package org.eclipse.papyrus.views.properties.toolsmiths.util;

 

 import java.io.File;

 

@@ -24,10 +24,10 @@ import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;

 import org.eclipse.core.runtime.IPath;

 import org.eclipse.core.runtime.Path;

-import org.eclipse.papyrus.customization.properties.Activator;

-import org.eclipse.papyrus.customization.properties.storage.actions.workspace.WorkspaceContextCopyAction;

 import org.eclipse.papyrus.infra.properties.contexts.Context;

 import org.eclipse.papyrus.infra.properties.contexts.Section;

+import org.eclipse.papyrus.views.properties.toolsmiths.Activator;

+import org.eclipse.papyrus.views.properties.toolsmiths.storage.actions.workspace.WorkspaceContextCopyAction;

 

 /**

  * The Eclipse Editors can only handle files from the workspace. However, when

diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties/pom.xml b/plugins/views/properties/org.eclipse.papyrus.views.properties/pom.xml
index 974dcd1395c..5819fd470bc 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties/pom.xml
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties/pom.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>

-	<modelVersion>4.0.0</modelVersion>

+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	

 	<parent>

 		<artifactId>org.eclipse.papyrus.views-properties</artifactId>

 		<groupId>org.eclipse.papyrus</groupId>

 		<version>0.0.1-SNAPSHOT</version>

-	</parent>

+	</parent>
+	

 	<artifactId>org.eclipse.papyrus.views.properties</artifactId>

 	<version>3.0.0-SNAPSHOT</version>

 	<packaging>eclipse-plugin</packaging>

diff --git a/plugins/views/properties/pom.xml b/plugins/views/properties/pom.xml
index e7405bfdb60..319428527b5 100644
--- a/plugins/views/properties/pom.xml
+++ b/plugins/views/properties/pom.xml
@@ -1,17 +1,22 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	<artifactId>org.eclipse.papyrus.views-properties</artifactId>
-	<packaging>pom</packaging>
+	
 	<parent>
 	    <groupId>org.eclipse.papyrus</groupId>
 	    <artifactId>org.eclipse.papyrus.views</artifactId>
 	    <version>0.0.1-SNAPSHOT</version>
     </parent>
+    <artifactId>org.eclipse.papyrus.views-properties</artifactId>
+	<packaging>pom</packaging>
+	
 	<name>Papyrus Properties View</name>
 	<description>The plug-ins comprising the Papyrus Properties view configuration management and storage.  For the Properties UI framework, refer to the /plugins/infra/properties module.</description>
 
 	<modules>
 		<module>org.eclipse.papyrus.views.properties</module>
+		<module>org.eclipse.papyrus.views.properties.model.xwt</module>
+		<module>org.eclipse.papyrus.views.properties.toolsmiths</module>
 	</modules>
 </project>
diff --git a/releng/main-tests/pom.xml b/releng/main-tests/pom.xml
index 0b261f9e3fc..c0fde6dd475 100644
--- a/releng/main-tests/pom.xml
+++ b/releng/main-tests/pom.xml
@@ -34,7 +34,7 @@
 		<module>../../tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests</module>
 		<module>../../tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests</module>
 		<module>../../tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests</module>
-		<module>../../tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests</module>
+		<module>../../tests/junit/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths.tests</module>
 		<module>../../tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests</module>
 		<module>../../tests/junit/plugins/infra/org.eclipse.papyrus.infra.filters.tests</module>
 		<module>../../tests/junit/plugins/infra/org.eclipse.papyrus.infra.newchild.tests</module>
diff --git a/tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/.classpath b/tests/junit/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths.tests/.classpath
index 288a78080ea..288a78080ea 100644
--- a/tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/.classpath
+++ b/tests/junit/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths.tests/.classpath
diff --git a/tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/.project b/tests/junit/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths.tests/.project
index 7e0acc0ba57..f35041356d9 100644
--- a/tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/.project
+++ b/tests/junit/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths.tests/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.papyrus.customization.properties.tests</name>
+	<name>org.eclipse.papyrus.views.properties.toolsmiths.tests</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths.tests/.settings/org.eclipse.jdt.core.prefs
index 4759947300a..4759947300a 100644
--- a/tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/junit/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths.tests/.settings/org.eclipse.jdt.core.prefs
diff --git a/tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/.settings/org.eclipse.jdt.ui.prefs b/tests/junit/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths.tests/.settings/org.eclipse.jdt.ui.prefs
index 954281dbc31..954281dbc31 100644
--- a/tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/.settings/org.eclipse.jdt.ui.prefs
+++ b/tests/junit/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths.tests/.settings/org.eclipse.jdt.ui.prefs
diff --git a/tests/junit/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths.tests/.settings/org.eclipse.m2e.core.prefs b/tests/junit/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths.tests/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 00000000000..f897a7f1cb2
--- /dev/null
+++ b/tests/junit/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths.tests/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths.tests/META-INF/MANIFEST.MF
index 7e6aac3cc54..2fd68d58604 100644
--- a/tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths.tests/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- org.eclipse.papyrus.customization.properties.model.xwt;bundle-version="1.2.0",

- org.eclipse.papyrus.customization.properties.generation;bundle-version="1.2.0",

+ org.eclipse.papyrus.views.properties.model.xwt;bundle-version="[2.0.0,3.0.0)",

+ org.eclipse.papyrus.uml.properties.generation;bundle-version="[2.0.0,3.0.0)",

  org.eclipse.emf.ecore;bundle-version="2.8.0",

  org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",

  org.eclipse.papyrus.views.properties;bundle-version="1.2.0",

@@ -16,13 +16,13 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.core.databinding;bundle-version="1.4.1",

  org.eclipse.papyrus.junit.framework;bundle-version="1.2.0",

  org.eclipse.papyrus.junit.utils;bundle-version="1.2.0"

-Export-Package: org.eclipse.papyrus.customization.properties.tests,

- org.eclipse.papyrus.customization.properties.tests.qvt

+Export-Package: org.eclipse.papyrus.views.properties.toolsmiths.tests,

+ org.eclipse.papyrus.views.properties.toolsmiths.tests.qvt

 Bundle-Vendor: Eclipse Modeling Project

 Bundle-ActivationPolicy: lazy

 Bundle-Version: 1.2.0.qualifier

 Bundle-Name: Properties view customization Tests

 Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.customization.properties.tests.Activator

-Bundle-SymbolicName: org.eclipse.papyrus.customization.properties.tests

+Bundle-Activator: org.eclipse.papyrus.views.properties.toolsmiths.tests.Activator

+Bundle-SymbolicName: org.eclipse.papyrus.views.properties.toolsmiths.tests

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

diff --git a/tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/about.html b/tests/junit/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths.tests/about.html
index 5ddc72c177f..5ddc72c177f 100644
--- a/tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/about.html
+++ b/tests/junit/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths.tests/about.html
diff --git a/tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/build.properties b/tests/junit/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths.tests/build.properties
index fdd2cc92d34..fdd2cc92d34 100644
--- a/tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/build.properties
+++ b/tests/junit/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths.tests/build.properties
diff --git a/tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/org.eclipse.papyrus.customization.properties.tests.launch b/tests/junit/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths.tests/org.eclipse.papyrus.views.properties.toolsmiths.tests.launch
index c461ea9bd33..96eecc2f8fc 100644
--- a/tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/org.eclipse.papyrus.customization.properties.tests.launch
+++ b/tests/junit/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths.tests/org.eclipse.papyrus.views.properties.toolsmiths.tests.launch
@@ -14,7 +14,7 @@
 <booleanAttribute key="includeOptional" value="true"/>
 <stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.papyrus.customization.properties.tests/src/org/eclipse/papyrus/customization/properties/tests/AllTest.java"/>
+<listEntry value="/org.eclipse.papyrus.views.properties.toolsmiths.tests/src/org/eclipse/papyrus/views/properties/toolsmiths/tests/AllTest.java"/>
 </listAttribute>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
 <listEntry value="1"/>
@@ -24,16 +24,16 @@
 <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
 <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
 <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.customization.properties.tests.AllTest"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.views.properties.toolsmiths.tests.AllTest"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.customization.properties.tests"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.views.properties.toolsmiths.tests"/>
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.7"/>
 <stringAttribute key="pde.version" value="3.3"/>
 <stringAttribute key="product" value="org.eclipse.platform.ide"/>
 <booleanAttribute key="run_in_ui_thread" value="true"/>
 <stringAttribute key="selected_target_plugins" value="com.google.guava@default:default,com.google.inject@default:default,com.ibm.icu@default:default,com.jcraft.jsch@default:default,com.sun.el@default:default,javax.annotation@default:default,javax.el@default:default,javax.inject@default:default,javax.servlet*3.0.0.v201112011016@default:default,javax.servlet*3.1.0.v201410161800@default:default,javax.servlet.jsp@default:default,javax.xml@default:default,lpg.runtime.java@default:default,org.antlr.runtime@default:default,org.apache.ant@default:default,org.apache.batik.bridge@default:default,org.apache.batik.css*1.6.0.v201011041432@default:default,org.apache.batik.css*1.7.0.v201011041433@default:default,org.apache.batik.dom.svg@default:default,org.apache.batik.dom@default:default,org.apache.batik.ext.awt@default:default,org.apache.batik.parser@default:default,org.apache.batik.pdf@default:default,org.apache.batik.svggen@default:default,org.apache.batik.transcoder@default:default,org.apache.batik.util*1.6.0.v201011041432@default:default,org.apache.batik.util*1.7.0.v201011041433@default:default,org.apache.batik.util.gui*1.6.0.v201011041432@default:default,org.apache.batik.util.gui*1.7.0.v200903091627@default:default,org.apache.batik.xml@default:default,org.apache.commons.cli@default:default,org.apache.commons.codec@default:default,org.apache.commons.httpclient@default:default,org.apache.commons.io@default:default,org.apache.commons.lang@default:default,org.apache.commons.logging@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.apache.httpcomponents.httpclient@default:default,org.apache.httpcomponents.httpcore@default:default,org.apache.jasper.glassfish@default:default,org.apache.log4j@default:default,org.apache.lucene.analysis@default:default,org.apache.lucene.core@default:default,org.apache.ws.commons.util@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.apache.xmlrpc@default:default,org.eclipse.ant.core@default:default,org.eclipse.ant.launching@default:default,org.eclipse.ant.ui@default:default,org.eclipse.compare.core@default:default,org.eclipse.compare.win32@default:default,org.eclipse.compare@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.externaltools@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.debug.core@default:default,org.eclipse.debug.ui@default:default,org.eclipse.draw2d.doc.isv@default:default,org.eclipse.draw2d@default:default,org.eclipse.e4.core.commands@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.ui.bindings@default:default,org.eclipse.e4.ui.css.core@default:default,org.eclipse.e4.ui.css.swt.theme@default:default,org.eclipse.e4.ui.css.swt@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.e4.ui.widgets@default:default,org.eclipse.e4.ui.workbench.addons.swt@default:default,org.eclipse.e4.ui.workbench.renderers.swt@default:default,org.eclipse.e4.ui.workbench.swt@default:default,org.eclipse.e4.ui.workbench3@default:default,org.eclipse.e4.ui.workbench@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ecf@default:default,org.eclipse.egit.core@default:default,org.eclipse.egit.doc@default:default,org.eclipse.egit.ui@default:default,org.eclipse.egit@default:default,org.eclipse.emf.ant@default:default,org.eclipse.emf.cheatsheets@default:default,org.eclipse.emf.codegen.ecore.ui@default:default,org.eclipse.emf.codegen.ecore@default:default,org.eclipse.emf.codegen.ui@default:default,org.eclipse.emf.codegen@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.compare@default:default,org.eclipse.emf.converter@default:default,org.eclipse.emf.databinding.edit@default:default,org.eclipse.emf.databinding@default:default,org.eclipse.emf.doc@default:default,org.eclipse.emf.ecore.change.edit@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.emf.ecore.editor@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.emf.edit@default:default,org.eclipse.emf.example.installer@default:default,org.eclipse.emf.exporter@default:default,org.eclipse.emf.importer.ecore@default:default,org.eclipse.emf.importer.java@default:default,org.eclipse.emf.importer.rose@default:default,org.eclipse.emf.importer@default:default,org.eclipse.emf.mapping.ecore.editor@default:default,org.eclipse.emf.mapping.ecore2ecore.editor@default:default,org.eclipse.emf.mapping.ecore2ecore@default:default,org.eclipse.emf.mapping.ecore2xml.ui@default:default,org.eclipse.emf.mapping.ecore2xml@default:default,org.eclipse.emf.mapping.ecore@default:default,org.eclipse.emf.mapping.ui@default:default,org.eclipse.emf.mapping@default:default,org.eclipse.emf.mwe.core@default:default,org.eclipse.emf.mwe.utils@default:default,org.eclipse.emf.mwe2.language.ui@default:default,org.eclipse.emf.mwe2.language@default:default,org.eclipse.emf.mwe2.launch@default:default,org.eclipse.emf.mwe2.lib@default:default,org.eclipse.emf.mwe2.runtime@default:default,org.eclipse.emf.transaction.doc@default:default,org.eclipse.emf.transaction.examples@default:default,org.eclipse.emf.transaction.ui@default:default,org.eclipse.emf.transaction@default:default,org.eclipse.emf.validation.doc@default:default,org.eclipse.emf.validation.examples@default:default,org.eclipse.emf.validation.ocl@default:default,org.eclipse.emf.validation.ui.ide@default:default,org.eclipse.emf.validation.ui@default:default,org.eclipse.emf.validation@default:default,org.eclipse.emf.workspace.doc@default:default,org.eclipse.emf.workspace.ui@default:default,org.eclipse.emf.workspace@default:default,org.eclipse.emf@default:default,org.eclipse.epp.mpc.core@default:default,org.eclipse.epp.mpc.help.ui@default:default,org.eclipse.epp.mpc.ui@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.bidi@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.console@default:default,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.jsp.jasper.registry@default:default,org.eclipse.equinox.jsp.jasper@default:default,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.directorywatcher@default:default,org.eclipse.equinox.p2.discovery.compatibility@default:default,org.eclipse.equinox.p2.discovery@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.extensionlocation@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.equinox.p2.publisher.eclipse@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.reconciler.dropins@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.equinox.p2.transport.ecf@default:default,org.eclipse.equinox.p2.ui.discovery@default:default,org.eclipse.equinox.p2.ui.importexport@default:default,org.eclipse.equinox.p2.ui.sdk.scheduler@default:default,org.eclipse.equinox.p2.ui.sdk@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.equinox.p2.updatechecker@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security.ui@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.gef.doc.isv@default:default,org.eclipse.gef.examples.ui.pde@default:default,org.eclipse.gef@default:default,org.eclipse.gmf.bridge.trace@default:default,org.eclipse.gmf.bridge.ui.dashboard@default:default,org.eclipse.gmf.bridge.ui@default:default,org.eclipse.gmf.bridge@default:default,org.eclipse.gmf.codegen.edit@default:default,org.eclipse.gmf.codegen.ui@default:default,org.eclipse.gmf.codegen@default:default,org.eclipse.gmf.common@default:default,org.eclipse.gmf.ecore.editor@default:default,org.eclipse.gmf.examples.runtime.ui.pde@default:default,org.eclipse.gmf.graphdef.codegen.ui@default:default,org.eclipse.gmf.graphdef.codegen@default:default,org.eclipse.gmf.graphdef.edit@default:default,org.eclipse.gmf.graphdef@default:default,org.eclipse.gmf.map.edit@default:default,org.eclipse.gmf.map@default:default,org.eclipse.gmf.runtime.common.core@default:default,org.eclipse.gmf.runtime.common.ui.action.ide@default:default,org.eclipse.gmf.runtime.common.ui.action@default:default,org.eclipse.gmf.runtime.common.ui.printing.win32@default:false,org.eclipse.gmf.runtime.common.ui.printing@default:default,org.eclipse.gmf.runtime.common.ui.services.action@default:default,org.eclipse.gmf.runtime.common.ui.services.dnd.ide@default:default,org.eclipse.gmf.runtime.common.ui.services.dnd@default:default,org.eclipse.gmf.runtime.common.ui.services.properties@default:default,org.eclipse.gmf.runtime.common.ui.services@default:default,org.eclipse.gmf.runtime.common.ui@default:default,org.eclipse.gmf.runtime.diagram.core@default:default,org.eclipse.gmf.runtime.diagram.ui.actions@default:default,org.eclipse.gmf.runtime.diagram.ui.dnd@default:default,org.eclipse.gmf.runtime.diagram.ui.geoshapes@default:default,org.eclipse.gmf.runtime.diagram.ui.printing.render@default:default,org.eclipse.gmf.runtime.diagram.ui.printing@default:default,org.eclipse.gmf.runtime.diagram.ui.properties@default:default,org.eclipse.gmf.runtime.diagram.ui.providers.ide@default:default,org.eclipse.gmf.runtime.diagram.ui.providers@default:default,org.eclipse.gmf.runtime.diagram.ui.render@default:default,org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide@default:default,org.eclipse.gmf.runtime.diagram.ui.resources.editor@default:default,org.eclipse.gmf.runtime.diagram.ui@default:default,org.eclipse.gmf.runtime.draw2d.ui.render.awt@default:default,org.eclipse.gmf.runtime.draw2d.ui.render@default:default,org.eclipse.gmf.runtime.draw2d.ui@default:default,org.eclipse.gmf.runtime.emf.clipboard.core@default:default,org.eclipse.gmf.runtime.emf.commands.core@default:default,org.eclipse.gmf.runtime.emf.core@default:default,org.eclipse.gmf.runtime.emf.type.core@default:default,org.eclipse.gmf.runtime.emf.type.ui@default:default,org.eclipse.gmf.runtime.emf.ui.properties@default:default,org.eclipse.gmf.runtime.emf.ui@default:default,org.eclipse.gmf.runtime.gef.ui@default:default,org.eclipse.gmf.runtime.notation.edit@default:default,org.eclipse.gmf.runtime.notation.providers@default:default,org.eclipse.gmf.runtime.notation.sdk@default:default,org.eclipse.gmf.runtime.notation@default:default,org.eclipse.gmf.runtime.sdk@default:default,org.eclipse.gmf.tooldef.edit@default:default,org.eclipse.gmf.tooldef@default:default,org.eclipse.gmf.tooling@default:default,org.eclipse.gmf.validate@default:default,org.eclipse.gmf.xpand.editor@default:default,org.eclipse.gmf.xpand.qvtlibrary@default:default,org.eclipse.gmf.xpand@default:default,org.eclipse.gmf@default:default,org.eclipse.help.base@default:default,org.eclipse.help.ui@default:default,org.eclipse.help.webapp@default:default,org.eclipse.help@default:default,org.eclipse.jdt.annotation*1.1.100.v20140704-0625@default:default,org.eclipse.jdt.annotation*2.0.100.v20150311-1658@default:default,org.eclipse.jdt.apt.core@default:default,org.eclipse.jdt.apt.pluggable.core@default:default,org.eclipse.jdt.apt.ui@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.jdt.core@default:default,org.eclipse.jdt.debug.ui@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.jdt.doc.user@default:default,org.eclipse.jdt.junit.core@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.jdt.junit4.runtime@default:default,org.eclipse.jdt.junit@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.jdt@default:default,org.eclipse.jem.util@default:default,org.eclipse.jetty.continuation@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface.text@default:default,org.eclipse.jface@default:default,org.eclipse.jgit@default:default,org.eclipse.jsch.core@default:default,org.eclipse.jsch.ui@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.m2m.qvt.oml.common.ui@default:default,org.eclipse.m2m.qvt.oml.common@default:default,org.eclipse.m2m.qvt.oml.cst.parser@default:default,org.eclipse.m2m.qvt.oml.debug.core@default:default,org.eclipse.m2m.qvt.oml.debug.ui@default:default,org.eclipse.m2m.qvt.oml.doc@default:default,org.eclipse.m2m.qvt.oml.ecore.imperativeocl@default:default,org.eclipse.m2m.qvt.oml.editor.ui@default:default,org.eclipse.m2m.qvt.oml.emf.util.ui@default:default,org.eclipse.m2m.qvt.oml.emf.util@default:default,org.eclipse.m2m.qvt.oml.ocl@default:default,org.eclipse.m2m.qvt.oml.project@default:default,org.eclipse.m2m.qvt.oml.runtime.ui@default:default,org.eclipse.m2m.qvt.oml.runtime@default:default,org.eclipse.m2m.qvt.oml.samples@default:default,org.eclipse.m2m.qvt.oml.trace.edit@default:default,org.eclipse.m2m.qvt.oml.ui@default:default,org.eclipse.m2m.qvt.oml@default:default,org.eclipse.mylyn.bugzilla.core@default:default,org.eclipse.mylyn.bugzilla.ui@default:default,org.eclipse.mylyn.commons.core@default:default,org.eclipse.mylyn.commons.identity.core@default:default,org.eclipse.mylyn.commons.net@default:default,org.eclipse.mylyn.commons.notifications.core@default:default,org.eclipse.mylyn.commons.notifications.feed@default:default,org.eclipse.mylyn.commons.notifications.ui@default:default,org.eclipse.mylyn.commons.repositories.core@default:default,org.eclipse.mylyn.commons.repositories.ui@default:default,org.eclipse.mylyn.commons.screenshots@default:default,org.eclipse.mylyn.commons.ui@default:default,org.eclipse.mylyn.commons.workbench@default:default,org.eclipse.mylyn.commons.xmlrpc@default:default,org.eclipse.mylyn.context.core@default:default,org.eclipse.mylyn.context.ui@default:default,org.eclipse.mylyn.discovery.core@default:default,org.eclipse.mylyn.discovery.ui@default:default,org.eclipse.mylyn.git.core@default:default,org.eclipse.mylyn.git.ui@default:default,org.eclipse.mylyn.monitor.core@default:default,org.eclipse.mylyn.monitor.ui@default:default,org.eclipse.mylyn.tasks.core@default:default,org.eclipse.mylyn.tasks.index.core@default:default,org.eclipse.mylyn.tasks.index.ui@default:default,org.eclipse.mylyn.tasks.search@default:default,org.eclipse.mylyn.tasks.ui@default:default,org.eclipse.mylyn.versions.core@default:default,org.eclipse.mylyn.versions.ui@default:default,org.eclipse.mylyn.wikitext.confluence.core@default:default,org.eclipse.mylyn.wikitext.confluence.ui@default:default,org.eclipse.mylyn.wikitext.core@default:default,org.eclipse.mylyn.wikitext.help.ui@default:default,org.eclipse.mylyn.wikitext.mediawiki.core@default:default,org.eclipse.mylyn.wikitext.mediawiki.ui@default:default,org.eclipse.mylyn.wikitext.tasks.ui@default:default,org.eclipse.mylyn.wikitext.textile.core@default:default,org.eclipse.mylyn.wikitext.textile.ui@default:default,org.eclipse.mylyn.wikitext.tracwiki.core@default:default,org.eclipse.mylyn.wikitext.tracwiki.ui@default:default,org.eclipse.mylyn.wikitext.twiki.core@default:default,org.eclipse.mylyn.wikitext.twiki.ui@default:default,org.eclipse.mylyn.wikitext.ui@default:default,org.eclipse.ocl.common.ui@default:default,org.eclipse.ocl.common@default:default,org.eclipse.ocl.ecore@default:default,org.eclipse.ocl.examples.domain@default:default,org.eclipse.ocl.examples.library@default:default,org.eclipse.ocl.examples.pivot@default:default,org.eclipse.ocl.examples.xtext.base@default:default,org.eclipse.ocl.examples.xtext.console@default:default,org.eclipse.ocl.examples.xtext.essentialocl.ui@default:default,org.eclipse.ocl.examples.xtext.essentialocl@default:default,org.eclipse.ocl.examples.xtext.markup.ui@default:default,org.eclipse.ocl.examples.xtext.markup@default:default,org.eclipse.ocl.uml@default:default,org.eclipse.ocl@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true,org.eclipse.pde.api.tools.ui@default:default,org.eclipse.pde.api.tools@default:default,org.eclipse.pde.build@default:default,org.eclipse.pde.core@default:default,org.eclipse.pde.doc.user@default:default,org.eclipse.pde.ds.core@default:default,org.eclipse.pde.ds.ui@default:default,org.eclipse.pde.junit.runtime@default:default,org.eclipse.pde.launching@default:default,org.eclipse.pde.runtime@default:default,org.eclipse.pde.ua.core@default:default,org.eclipse.pde.ua.ui@default:default,org.eclipse.pde.ui.templates@default:default,org.eclipse.pde.ui@default:default,org.eclipse.pde@default:default,org.eclipse.platform.doc.user@default:default,org.eclipse.platform@default:default,org.eclipse.rcp@default:default,org.eclipse.search@default:default,org.eclipse.swt@default:default,org.eclipse.team.core@default:default,org.eclipse.team.ui@default:default,org.eclipse.text@default:default,org.eclipse.ui.browser@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.ui.console@default:default,org.eclipse.ui.editors@default:default,org.eclipse.ui.externaltools@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.ui.intro@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.ui.net@default:default,org.eclipse.ui.trace@default:default,org.eclipse.ui.views.log@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.win32@default:false,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.eclipse.uml2.codegen.ecore.ui@default:default,org.eclipse.uml2.codegen.ecore@default:default,org.eclipse.uml2.common.edit@default:default,org.eclipse.uml2.common@default:default,org.eclipse.uml2.doc@default:default,org.eclipse.uml2.examples.uml.ui@default:default,org.eclipse.uml2.examples@default:default,org.eclipse.uml2.types@default:default,org.eclipse.uml2.uml.ecore.exporter@default:default,org.eclipse.uml2.uml.ecore.importer@default:default,org.eclipse.uml2.uml.edit@default:default,org.eclipse.uml2.uml.editor@default:default,org.eclipse.uml2.uml.resources@default:default,org.eclipse.uml2.uml@default:default,org.eclipse.uml2@default:default,org.eclipse.update.configurator@3:true,org.eclipse.wst.common.core@default:default,org.eclipse.wst.common.emf@default:default,org.eclipse.wst.common.emfworkbench.integration@default:default,org.eclipse.wst.common.environment@default:default,org.eclipse.wst.common.frameworks.ui@default:default,org.eclipse.wst.common.frameworks@default:default,org.eclipse.wst.common.infopop@default:default,org.eclipse.wst.common.modulecore.ui@default:default,org.eclipse.wst.common.modulecore@default:default,org.eclipse.wst.common.project.facet.core@default:default,org.eclipse.wst.common.snippets@default:default,org.eclipse.wst.common.ui@default:default,org.eclipse.wst.common.uriresolver@default:default,org.eclipse.wst.dtd.core@default:default,org.eclipse.wst.dtd.ui.infopop@default:default,org.eclipse.wst.dtd.ui@default:default,org.eclipse.wst.dtdeditor.doc.user@default:default,org.eclipse.wst.internet.cache@default:default,org.eclipse.wst.server.core@default:default,org.eclipse.wst.sse.core@default:default,org.eclipse.wst.sse.doc.user@default:default,org.eclipse.wst.sse.ui.infopop@default:default,org.eclipse.wst.sse.ui@default:default,org.eclipse.wst.standard.schemas@default:default,org.eclipse.wst.validation.infopop@default:default,org.eclipse.wst.validation.ui@default:default,org.eclipse.wst.validation@default:default,org.eclipse.wst.xml.core@default:default,org.eclipse.wst.xml.ui.infopop@default:default,org.eclipse.wst.xml.ui@default:default,org.eclipse.wst.xmleditor.doc.user@default:default,org.eclipse.wst.xsd.core@default:default,org.eclipse.wst.xsd.ui@default:default,org.eclipse.wst.xsdeditor.doc.user@default:default,org.eclipse.xpand@default:default,org.eclipse.xsd.edit@default:default,org.eclipse.xsd@default:default,org.eclipse.xtend.core@default:default,org.eclipse.xtend.ide@default:default,org.eclipse.xtend.lib@default:default,org.eclipse.xtend.typesystem.emf@default:default,org.eclipse.xtend@default:default,org.eclipse.xtext.activities@default:default,org.eclipse.xtext.builder@default:default,org.eclipse.xtext.common.types.edit@default:default,org.eclipse.xtext.common.types.shared.jdt38@default:false,org.eclipse.xtext.common.types.shared@default:default,org.eclipse.xtext.common.types.ui@default:default,org.eclipse.xtext.common.types@default:default,org.eclipse.xtext.doc@default:default,org.eclipse.xtext.ecore@default:default,org.eclipse.xtext.generator@default:default,org.eclipse.xtext.junit4@default:default,org.eclipse.xtext.logging@default:false,org.eclipse.xtext.purexbase.ui@default:default,org.eclipse.xtext.purexbase@default:default,org.eclipse.xtext.smap@default:default,org.eclipse.xtext.ui.codetemplates.ui@default:default,org.eclipse.xtext.ui.codetemplates@default:default,org.eclipse.xtext.ui.ecore@default:default,org.eclipse.xtext.ui.shared@default:default,org.eclipse.xtext.ui@default:default,org.eclipse.xtext.util@default:default,org.eclipse.xtext.xbase.junit@default:default,org.eclipse.xtext.xbase.lib@default:default,org.eclipse.xtext.xbase.ui@default:default,org.eclipse.xtext.xbase@default:default,org.eclipse.xtext.xtext.ui.graph@default:default,org.eclipse.xtext.xtext.ui@default:default,org.eclipse.xtext@default:default,org.hamcrest.core@default:default,org.jsoup@default:default,org.junit@default:default,org.objectweb.asm@default:default,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.w3c.css.sac@default:default,org.w3c.dom.events@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="com.ericsson.papyrus.bbi.vhive.profile@default:default,com.phloc.commons@default:default,com.phloc.css@default:default,deployedLibrary@default:default,org.eclipse.papyrus.customization.properties.generation@default:default,org.eclipse.papyrus.customization.properties.tests@default:default,org.eclipse.papyrus.junit.framework@default:default,org.eclipse.papyrus.junit.utils@default:default,org.eclipse.xwt@default:default,org.w3c.css.sac@default:default,testUML@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="com.ericsson.papyrus.bbi.vhive.profile@default:default,com.phloc.commons@default:default,com.phloc.css@default:default,deployedLibrary@default:default,org.eclipse.papyrus.customization.properties.generation@default:default,org.eclipse.papyrus.views.properties.toolsmiths.tests@default:default,org.eclipse.papyrus.junit.framework@default:default,org.eclipse.papyrus.junit.utils@default:default,org.eclipse.xwt@default:default,org.w3c.css.sac@default:default,testUML@default:default"/>
 <booleanAttribute key="show_selected_only" value="false"/>
 <booleanAttribute key="tracing" value="false"/>
 <booleanAttribute key="useCustomFeatures" value="false"/>
diff --git a/tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/pom.xml b/tests/junit/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths.tests/pom.xml
index 861567fdd2d..8794d3c537e 100644
--- a/tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/pom.xml
+++ b/tests/junit/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths.tests/pom.xml
@@ -7,10 +7,10 @@
 		<groupId>org.eclipse.papyrus</groupId>
 		<artifactId>org.eclipse.papyrus.tests.releng</artifactId>
 		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../../../releng/main-tests/pom.xml</relativePath>
+		<relativePath>../../../../../../releng/main-tests/pom.xml</relativePath>
 	</parent>
 	<groupId>org.eclipse.papyrus</groupId>
-	<artifactId>org.eclipse.papyrus.customization.properties.tests</artifactId>
+	<artifactId>org.eclipse.papyrus.views.properties.toolsmiths.tests</artifactId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/resources/Sample.ecore b/tests/junit/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths.tests/resources/Sample.ecore
index e49fe4fb198..e49fe4fb198 100644
--- a/tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/resources/Sample.ecore
+++ b/tests/junit/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths.tests/resources/Sample.ecore
diff --git a/tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/resources/SingleClass.xwt b/tests/junit/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths.tests/resources/SingleClass.xwt
index d9017e62de7..d9017e62de7 100644
--- a/tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/resources/SingleClass.xwt
+++ b/tests/junit/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths.tests/resources/SingleClass.xwt
diff --git a/tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/resources/profile/model3.profile.di b/tests/junit/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths.tests/resources/profile/model3.profile.di
index db51c0f9812..db51c0f9812 100644
--- a/tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/resources/profile/model3.profile.di
+++ b/tests/junit/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths.tests/resources/profile/model3.profile.di
diff --git a/tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/resources/profile/model3.profile.notation b/tests/junit/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths.tests/resources/profile/model3.profile.notation
index 0dba8ee24fc..0dba8ee24fc 100644
--- a/tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/resources/profile/model3.profile.notation
+++ b/tests/junit/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths.tests/resources/profile/model3.profile.notation
diff --git a/tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/resources/profile/model3.profile.uml b/tests/junit/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths.tests/resources/profile/model3.profile.uml
index 7f61cf16282..7f61cf16282 100644
--- a/tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/resources/profile/model3.profile.uml
+++ b/tests/junit/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths.tests/resources/profile/model3.profile.uml
diff --git a/tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/src/org/eclipse/papyrus/customization/properties/tests/Activator.java b/tests/junit/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths.tests/src/org/eclipse/papyrus/views/properties/toolsmiths/tests/Activator.java
index 6df00f28dd5..ed501f609e6 100644
--- a/tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/src/org/eclipse/papyrus/customization/properties/tests/Activator.java
+++ b/tests/junit/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths.tests/src/org/eclipse/papyrus/views/properties/toolsmiths/tests/Activator.java
@@ -9,7 +9,7 @@
  * Contributors:

  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.customization.properties.tests;

+package org.eclipse.papyrus.views.properties.toolsmiths.tests;

 

 import org.eclipse.papyrus.infra.core.log.LogHelper;

 import org.eclipse.ui.plugin.AbstractUIPlugin;

@@ -21,7 +21,7 @@ import org.osgi.framework.BundleContext;
 public class Activator extends AbstractUIPlugin {

 

 	// The plug-in ID

-	public static final String PLUGIN_ID = "org.eclipse.papyrus.customization.properties.tests"; //$NON-NLS-1$

+	public static final String PLUGIN_ID = "org.eclipse.papyrus.views.properties.toolsmiths.tests"; //$NON-NLS-1$

 

 	public static LogHelper log;

 

diff --git a/tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/src/org/eclipse/papyrus/customization/properties/tests/AllTest.java b/tests/junit/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths.tests/src/org/eclipse/papyrus/views/properties/toolsmiths/tests/AllTest.java
index 8f289511f74..d3b7bc57ab1 100644
--- a/tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/src/org/eclipse/papyrus/customization/properties/tests/AllTest.java
+++ b/tests/junit/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths.tests/src/org/eclipse/papyrus/views/properties/toolsmiths/tests/AllTest.java
@@ -9,11 +9,11 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.customization.properties.tests;
+package org.eclipse.papyrus.views.properties.toolsmiths.tests;
 
-import org.eclipse.papyrus.customization.properties.tests.qvt.TransformationsTests;
 import org.junit.runner.RunWith;
 import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
+import org.eclipse.papyrus.views.properties.toolsmiths.tests.qvt.TransformationsTests;
 import org.junit.runners.Suite.SuiteClasses;
 
 
diff --git a/tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/src/org/eclipse/papyrus/customization/properties/tests/qvt/TransformationsTests.java b/tests/junit/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths.tests/src/org/eclipse/papyrus/views/properties/toolsmiths/tests/qvt/TransformationsTests.java
index 166df296e62..71197e112e0 100644
--- a/tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/src/org/eclipse/papyrus/customization/properties/tests/qvt/TransformationsTests.java
+++ b/tests/junit/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths.tests/src/org/eclipse/papyrus/views/properties/toolsmiths/tests/qvt/TransformationsTests.java
@@ -11,7 +11,7 @@
  *  Christian W. Damus (CEA) - bug 422257
  *  Slimane El Ouadi - elouadi.slimane@yahoo.fr - Bug 507633
  *****************************************************************************/
-package org.eclipse.papyrus.customization.properties.tests.qvt;
+package org.eclipse.papyrus.views.properties.toolsmiths.tests.qvt;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -34,8 +34,7 @@ import org.eclipse.m2m.qvt.oml.ModelExtent;
 import org.eclipse.papyrus.customization.properties.generation.generators.EcoreGenerator;
 import org.eclipse.papyrus.customization.properties.generation.generators.IGenerator;
 import org.eclipse.papyrus.customization.properties.generation.generators.ProfileGenerator;
-import org.eclipse.papyrus.customization.properties.model.xwt.resource.XWTResource;
-import org.eclipse.papyrus.customization.properties.tests.Activator;
+import org.eclipse.papyrus.views.properties.model.xwt.resource.XWTResource;
 import org.eclipse.papyrus.infra.properties.contexts.Context;
 import org.eclipse.papyrus.infra.properties.contexts.DataContextElement;
 import org.eclipse.papyrus.infra.properties.ui.CompositeWidget;
@@ -43,6 +42,7 @@ import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusT
 import org.eclipse.papyrus.junit.utils.ProjectUtils;
 import org.eclipse.papyrus.views.properties.root.PropertiesRoot;
 import org.eclipse.papyrus.views.properties.runtime.ConfigurationManager;
+import org.eclipse.papyrus.views.properties.toolsmiths.tests.Activator;
 import org.eclipse.uml2.uml.Profile;
 import org.junit.After;
 import org.junit.AfterClass;